intel: Move the Intel wired LAN drivers
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 7 Apr 2011 14:42:33 +0000 (07:42 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 11 Aug 2011 03:03:27 +0000 (20:03 -0700)
Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
195 files changed:
MAINTAINERS
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/e100.c [deleted file]
drivers/net/e1000/Makefile [deleted file]
drivers/net/e1000/e1000.h [deleted file]
drivers/net/e1000/e1000_ethtool.c [deleted file]
drivers/net/e1000/e1000_hw.c [deleted file]
drivers/net/e1000/e1000_hw.h [deleted file]
drivers/net/e1000/e1000_main.c [deleted file]
drivers/net/e1000/e1000_osdep.h [deleted file]
drivers/net/e1000/e1000_param.c [deleted file]
drivers/net/e1000e/82571.c [deleted file]
drivers/net/e1000e/Makefile [deleted file]
drivers/net/e1000e/defines.h [deleted file]
drivers/net/e1000e/e1000.h [deleted file]
drivers/net/e1000e/es2lan.c [deleted file]
drivers/net/e1000e/ethtool.c [deleted file]
drivers/net/e1000e/hw.h [deleted file]
drivers/net/e1000e/ich8lan.c [deleted file]
drivers/net/e1000e/lib.c [deleted file]
drivers/net/e1000e/netdev.c [deleted file]
drivers/net/e1000e/param.c [deleted file]
drivers/net/e1000e/phy.c [deleted file]
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/intel/Kconfig [new file with mode: 0644]
drivers/net/ethernet/intel/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/e100.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/e1000.h [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/e1000_ethtool.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/e1000_hw.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/e1000_hw.h [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/e1000_main.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/e1000_osdep.h [new file with mode: 0644]
drivers/net/ethernet/intel/e1000/e1000_param.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/80003es2lan.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/82571.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/defines.h [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/e1000.h [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/ethtool.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/hw.h [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/ich8lan.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/lib.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/netdev.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/param.c [new file with mode: 0644]
drivers/net/ethernet/intel/e1000e/phy.c [new file with mode: 0644]
drivers/net/ethernet/intel/igb/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_82575.c [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_82575.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_defines.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_hw.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_mac.c [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_mac.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_mbx.c [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_mbx.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_nvm.c [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_nvm.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_phy.c [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_phy.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/e1000_regs.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/igb.h [new file with mode: 0644]
drivers/net/ethernet/intel/igb/igb_ethtool.c [new file with mode: 0644]
drivers/net/ethernet/intel/igb/igb_main.c [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/defines.h [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/ethtool.c [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/igbvf.h [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/mbx.c [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/mbx.h [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/netdev.c [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/regs.h [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/vf.c [new file with mode: 0644]
drivers/net/ethernet/intel/igbvf/vf.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_ee.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_ee.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_hw.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_hw.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_ids.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_main.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_osdep.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgb/ixgb_param.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/defines.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/ethtool.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/mbx.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/mbx.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/regs.h [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/vf.c [new file with mode: 0644]
drivers/net/ethernet/intel/ixgbevf/vf.h [new file with mode: 0644]
drivers/net/igb/Makefile [deleted file]
drivers/net/igb/e1000_82575.c [deleted file]
drivers/net/igb/e1000_82575.h [deleted file]
drivers/net/igb/e1000_defines.h [deleted file]
drivers/net/igb/e1000_hw.h [deleted file]
drivers/net/igb/e1000_mac.c [deleted file]
drivers/net/igb/e1000_mac.h [deleted file]
drivers/net/igb/e1000_mbx.c [deleted file]
drivers/net/igb/e1000_mbx.h [deleted file]
drivers/net/igb/e1000_nvm.c [deleted file]
drivers/net/igb/e1000_nvm.h [deleted file]
drivers/net/igb/e1000_phy.c [deleted file]
drivers/net/igb/e1000_phy.h [deleted file]
drivers/net/igb/e1000_regs.h [deleted file]
drivers/net/igb/igb.h [deleted file]
drivers/net/igb/igb_ethtool.c [deleted file]
drivers/net/igb/igb_main.c [deleted file]
drivers/net/igbvf/Makefile [deleted file]
drivers/net/igbvf/defines.h [deleted file]
drivers/net/igbvf/ethtool.c [deleted file]
drivers/net/igbvf/igbvf.h [deleted file]
drivers/net/igbvf/mbx.c [deleted file]
drivers/net/igbvf/mbx.h [deleted file]
drivers/net/igbvf/netdev.c [deleted file]
drivers/net/igbvf/regs.h [deleted file]
drivers/net/igbvf/vf.c [deleted file]
drivers/net/igbvf/vf.h [deleted file]
drivers/net/ixgb/Makefile [deleted file]
drivers/net/ixgb/ixgb.h [deleted file]
drivers/net/ixgb/ixgb_ee.c [deleted file]
drivers/net/ixgb/ixgb_ee.h [deleted file]
drivers/net/ixgb/ixgb_ethtool.c [deleted file]
drivers/net/ixgb/ixgb_hw.c [deleted file]
drivers/net/ixgb/ixgb_hw.h [deleted file]
drivers/net/ixgb/ixgb_ids.h [deleted file]
drivers/net/ixgb/ixgb_main.c [deleted file]
drivers/net/ixgb/ixgb_osdep.h [deleted file]
drivers/net/ixgb/ixgb_param.c [deleted file]
drivers/net/ixgbe/Makefile [deleted file]
drivers/net/ixgbe/ixgbe.h [deleted file]
drivers/net/ixgbe/ixgbe_82598.c [deleted file]
drivers/net/ixgbe/ixgbe_82599.c [deleted file]
drivers/net/ixgbe/ixgbe_common.c [deleted file]
drivers/net/ixgbe/ixgbe_common.h [deleted file]
drivers/net/ixgbe/ixgbe_dcb.c [deleted file]
drivers/net/ixgbe/ixgbe_dcb.h [deleted file]
drivers/net/ixgbe/ixgbe_dcb_82598.c [deleted file]
drivers/net/ixgbe/ixgbe_dcb_82598.h [deleted file]
drivers/net/ixgbe/ixgbe_dcb_82599.c [deleted file]
drivers/net/ixgbe/ixgbe_dcb_82599.h [deleted file]
drivers/net/ixgbe/ixgbe_dcb_nl.c [deleted file]
drivers/net/ixgbe/ixgbe_ethtool.c [deleted file]
drivers/net/ixgbe/ixgbe_fcoe.c [deleted file]
drivers/net/ixgbe/ixgbe_fcoe.h [deleted file]
drivers/net/ixgbe/ixgbe_main.c [deleted file]
drivers/net/ixgbe/ixgbe_mbx.c [deleted file]
drivers/net/ixgbe/ixgbe_mbx.h [deleted file]
drivers/net/ixgbe/ixgbe_phy.c [deleted file]
drivers/net/ixgbe/ixgbe_phy.h [deleted file]
drivers/net/ixgbe/ixgbe_sriov.c [deleted file]
drivers/net/ixgbe/ixgbe_sriov.h [deleted file]
drivers/net/ixgbe/ixgbe_type.h [deleted file]
drivers/net/ixgbe/ixgbe_x540.c [deleted file]
drivers/net/ixgbevf/Makefile [deleted file]
drivers/net/ixgbevf/defines.h [deleted file]
drivers/net/ixgbevf/ethtool.c [deleted file]
drivers/net/ixgbevf/ixgbevf.h [deleted file]
drivers/net/ixgbevf/ixgbevf_main.c [deleted file]
drivers/net/ixgbevf/mbx.c [deleted file]
drivers/net/ixgbevf/mbx.h [deleted file]
drivers/net/ixgbevf/regs.h [deleted file]
drivers/net/ixgbevf/vf.c [deleted file]
drivers/net/ixgbevf/vf.h [deleted file]

index 0853d00c7d48c68487f54da9144ad9613f6a058c..f4838da520c35ca32d6b24b4d63d52beb2ce424c 100644 (file)
@@ -3340,13 +3340,13 @@ M:      Bruce Allan <bruce.w.allan@intel.com>
 M:     Carolyn Wyborny <carolyn.wyborny@intel.com>
 M:     Don Skidmore <donald.c.skidmore@intel.com>
 M:     Greg Rose <gregory.v.rose@intel.com>
-M:     PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
+M:     Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
 M:     Alex Duyck <alexander.h.duyck@intel.com>
 M:     John Ronciak <john.ronciak@intel.com>
 L:     e1000-devel@lists.sourceforge.net
 W:     http://e1000.sourceforge.net/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
 S:     Supported
 F:     Documentation/networking/e100.txt
 F:     Documentation/networking/e1000.txt
@@ -3356,14 +3356,7 @@ F:       Documentation/networking/igbvf.txt
 F:     Documentation/networking/ixgb.txt
 F:     Documentation/networking/ixgbe.txt
 F:     Documentation/networking/ixgbevf.txt
-F:     drivers/net/e100.c
-F:     drivers/net/e1000/
-F:     drivers/net/e1000e/
-F:     drivers/net/igb/
-F:     drivers/net/igbvf/
-F:     drivers/net/ixgb/
-F:     drivers/net/ixgbe/
-F:     drivers/net/ixgbevf/
+F:     drivers/net/ethernet/intel/
 
 INTEL MRST PMU DRIVER
 M:     Len Brown <len.brown@intel.com>
index 77ab2e189475374d4f761fbf8505a1a34724d613..e6491169cc6fee8df1d7fe020834620ef56c8b91 100644 (file)
@@ -1032,32 +1032,6 @@ config TC35815
        depends on NET_PCI && PCI && MIPS
        select PHYLIB
 
-config E100
-       tristate "Intel(R) PRO/100+ support"
-       depends on NET_PCI && PCI
-       select MII
-       ---help---
-         This driver supports Intel(R) PRO/100 family of adapters.
-         To verify that your adapter is supported, find the board ID number 
-         on the adapter. Look for a label that has a barcode and a number 
-         in the format 123456-001 (six digits hyphen three digits). 
-
-         Use the above information and the Adapter & Driver ID Guide at:
-
-         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-         to identify the adapter.
-
-         For the latest Intel PRO/100 network driver for Linux, see:
-
-         <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
-
-         More specific information on configuring the driver is in 
-         <file:Documentation/networking/e100.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called e100.
-
 config FEALNX
        tristate "Myson MTD-8xx PCI Ethernet support"
        depends on NET_PCI && PCI
@@ -1490,47 +1464,6 @@ config DL2K
          To compile this driver as a module, choose M here: the
          module will be called dl2k.
 
-config E1000
-       tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
-       depends on PCI
-       ---help---
-         This driver supports Intel(R) PRO/1000 gigabit ethernet family of
-         adapters.  For more information on how to identify your adapter, go 
-         to the Adapter & Driver ID Guide at:
-
-         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-         For general information and support, go to the Intel support
-         website at:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in 
-         <file:Documentation/networking/e1000.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called e1000.
-
-config E1000E
-       tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
-       depends on PCI && (!SPARC32 || BROKEN)
-       select CRC32
-       ---help---
-         This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
-         ethernet family of adapters. For PCI or PCI-X e1000 adapters,
-         use the regular e1000 driver For more information on how to
-         identify your adapter, go to the Adapter & Driver ID Guide at:
-
-         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-         For general information and support, go to the Intel support
-         website at:
-
-         <http://support.intel.com>
-
-         To compile this driver as a module, choose M here. The module
-         will be called e1000e.
-
 config IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL
@@ -1541,57 +1474,6 @@ config IP1000
          To compile this driver as a module, choose M here: the module
          will be called ipg.  This is recommended.
 
-config IGB
-       tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
-       depends on PCI
-       ---help---
-         This driver supports Intel(R) 82575/82576 gigabit ethernet family of
-         adapters.  For more information on how to identify your adapter, go
-         to the Adapter & Driver ID Guide at:
-
-         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-         For general information and support, go to the Intel support
-         website at:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in
-         <file:Documentation/networking/e1000.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called igb.
-
-config IGB_DCA
-       bool "Direct Cache Access (DCA) Support"
-       default y
-       depends on IGB && DCA && !(IGB=y && DCA=m)
-       ---help---
-         Say Y here if you want to use Direct Cache Access (DCA) in the
-         driver.  DCA is a method for warming the CPU cache before data
-         is used, with the intent of lessening the impact of cache misses.
-
-config IGBVF
-       tristate "Intel(R) 82576 Virtual Function Ethernet support"
-       depends on PCI
-       ---help---
-         This driver supports Intel(R) 82576 virtual functions.  For more
-         information on how to identify your adapter, go to the Adapter &
-         Driver ID Guide at:
-
-         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-         For general information and support, go to the Intel support
-         website at:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in
-         <file:Documentation/networking/e1000.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called igbvf.
-
 source "drivers/net/ixp2000/Kconfig"
 
 config NS83820
@@ -1958,88 +1840,6 @@ config ENIC
        help
          This enables the support for the Cisco VIC Ethernet card.
 
-config IXGBE
-       tristate "Intel(R) 10GbE PCI Express adapters support"
-       depends on PCI && INET
-       select MDIO
-       ---help---
-         This driver supports Intel(R) 10GbE PCI Express family of
-         adapters.  For more information on how to identify your adapter, go
-         to the Adapter & Driver ID Guide at:
-
-         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-         For general information and support, go to the Intel support
-         website at:
-
-         <http://support.intel.com>
-
-         To compile this driver as a module, choose M here. The module
-         will be called ixgbe.
-
-config IXGBE_DCA
-       bool "Direct Cache Access (DCA) Support"
-       default y
-       depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
-       ---help---
-         Say Y here if you want to use Direct Cache Access (DCA) in the
-         driver.  DCA is a method for warming the CPU cache before data
-         is used, with the intent of lessening the impact of cache misses.
-
-config IXGBE_DCB
-       bool "Data Center Bridging (DCB) Support"
-       default n
-       depends on IXGBE && DCB
-       ---help---
-         Say Y here if you want to use Data Center Bridging (DCB) in the
-         driver.
-
-         If unsure, say N.
-
-config IXGBEVF
-       tristate "Intel(R) 82599 Virtual Function Ethernet support"
-       depends on PCI_MSI
-       ---help---
-         This driver supports Intel(R) 82599 virtual functions.  For more
-         information on how to identify your adapter, go to the Adapter &
-         Driver ID Guide at:
-
-         <http://support.intel.com/support/network/sb/CS-008441.htm>
-
-         For general information and support, go to the Intel support
-         website at:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in
-         <file:Documentation/networking/ixgbevf.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called ixgbevf.  MSI-X interrupt support is required
-         for this driver to work correctly.
-
-config IXGB
-       tristate "Intel(R) PRO/10GbE support"
-       depends on PCI
-       ---help---
-         This driver supports Intel(R) PRO/10GbE family of adapters for
-         PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
-         instead. For more information on how to identify your adapter, go
-         to the Adapter & Driver ID Guide at:
-
-         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-         For general information and support, go to the Intel support
-         website at:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in 
-         <file:Documentation/networking/ixgb.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called ixgb.
-
 config S2IO
        tristate "Exar Xframe 10Gb Ethernet Adapter"
        depends on PCI
index a987d46bf67b4ad667d741652250e68534d1bb98..84b986004385008c4651e2d0c4466ba477f213ca 100644 (file)
@@ -10,14 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
 obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
 
-obj-$(CONFIG_E1000) += e1000/
-obj-$(CONFIG_E1000E) += e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
-obj-$(CONFIG_IGB) += igb/
-obj-$(CONFIG_IGBVF) += igbvf/
-obj-$(CONFIG_IXGBE) += ixgbe/
-obj-$(CONFIG_IXGBEVF) += ixgbevf/
-obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
@@ -61,7 +54,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
-obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
deleted file mode 100644 (file)
index c1352c6..0000000
+++ /dev/null
@@ -1,3109 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/100 Linux driver
-  Copyright(c) 1999 - 2006 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
-
-*******************************************************************************/
-
-/*
- *     e100.c: Intel(R) PRO/100 ethernet driver
- *
- *     (Re)written 2003 by scott.feldman@intel.com.  Based loosely on
- *     original e100 driver, but better described as a munging of
- *     e100, e1000, eepro100, tg3, 8139cp, and other drivers.
- *
- *     References:
- *             Intel 8255x 10/100 Mbps Ethernet Controller Family,
- *             Open Source Software Developers Manual,
- *             http://sourceforge.net/projects/e1000
- *
- *
- *                           Theory of Operation
- *
- *     I.   General
- *
- *     The driver supports Intel(R) 10/100 Mbps PCI Fast Ethernet
- *     controller family, which includes the 82557, 82558, 82559, 82550,
- *     82551, and 82562 devices.  82558 and greater controllers
- *     integrate the Intel 82555 PHY.  The controllers are used in
- *     server and client network interface cards, as well as in
- *     LAN-On-Motherboard (LOM), CardBus, MiniPCI, and ICHx
- *     configurations.  8255x supports a 32-bit linear addressing
- *     mode and operates at 33Mhz PCI clock rate.
- *
- *     II.  Driver Operation
- *
- *     Memory-mapped mode is used exclusively to access the device's
- *     shared-memory structure, the Control/Status Registers (CSR). All
- *     setup, configuration, and control of the device, including queuing
- *     of Tx, Rx, and configuration commands is through the CSR.
- *     cmd_lock serializes accesses to the CSR command register.  cb_lock
- *     protects the shared Command Block List (CBL).
- *
- *     8255x is highly MII-compliant and all access to the PHY go
- *     through the Management Data Interface (MDI).  Consequently, the
- *     driver leverages the mii.c library shared with other MII-compliant
- *     devices.
- *
- *     Big- and Little-Endian byte order as well as 32- and 64-bit
- *     archs are supported.  Weak-ordered memory and non-cache-coherent
- *     archs are supported.
- *
- *     III. Transmit
- *
- *     A Tx skb is mapped and hangs off of a TCB.  TCBs are linked
- *     together in a fixed-size ring (CBL) thus forming the flexible mode
- *     memory structure.  A TCB marked with the suspend-bit indicates
- *     the end of the ring.  The last TCB processed suspends the
- *     controller, and the controller can be restarted by issue a CU
- *     resume command to continue from the suspend point, or a CU start
- *     command to start at a given position in the ring.
- *
- *     Non-Tx commands (config, multicast setup, etc) are linked
- *     into the CBL ring along with Tx commands.  The common structure
- *     used for both Tx and non-Tx commands is the Command Block (CB).
- *
- *     cb_to_use is the next CB to use for queuing a command; cb_to_clean
- *     is the next CB to check for completion; cb_to_send is the first
- *     CB to start on in case of a previous failure to resume.  CB clean
- *     up happens in interrupt context in response to a CU interrupt.
- *     cbs_avail keeps track of number of free CB resources available.
- *
- *     Hardware padding of short packets to minimum packet size is
- *     enabled.  82557 pads with 7Eh, while the later controllers pad
- *     with 00h.
- *
- *     IV.  Receive
- *
- *     The Receive Frame Area (RFA) comprises a ring of Receive Frame
- *     Descriptors (RFD) + data buffer, thus forming the simplified mode
- *     memory structure.  Rx skbs are allocated to contain both the RFD
- *     and the data buffer, but the RFD is pulled off before the skb is
- *     indicated.  The data buffer is aligned such that encapsulated
- *     protocol headers are u32-aligned.  Since the RFD is part of the
- *     mapped shared memory, and completion status is contained within
- *     the RFD, the RFD must be dma_sync'ed to maintain a consistent
- *     view from software and hardware.
- *
- *     In order to keep updates to the RFD link field from colliding with
- *     hardware writes to mark packets complete, we use the feature that
- *     hardware will not write to a size 0 descriptor and mark the previous
- *     packet as end-of-list (EL).   After updating the link, we remove EL
- *     and only then restore the size such that hardware may use the
- *     previous-to-end RFD.
- *
- *     Under typical operation, the  receive unit (RU) is start once,
- *     and the controller happily fills RFDs as frames arrive.  If
- *     replacement RFDs cannot be allocated, or the RU goes non-active,
- *     the RU must be restarted.  Frame arrival generates an interrupt,
- *     and Rx indication and re-allocation happen in the same context,
- *     therefore no locking is required.  A software-generated interrupt
- *     is generated from the watchdog to recover from a failed allocation
- *     scenario where all Rx resources have been indicated and none re-
- *     placed.
- *
- *     V.   Miscellaneous
- *
- *     VLAN offloading of tagging, stripping and filtering is not
- *     supported, but driver will accommodate the extra 4-byte VLAN tag
- *     for processing by upper layers.  Tx/Rx Checksum offloading is not
- *     supported.  Tx Scatter/Gather is not supported.  Jumbo Frames is
- *     not supported (hardware limitation).
- *
- *     MagicPacket(tm) WoL support is enabled/disabled via ethtool.
- *
- *     Thanks to JC (jchapman@katalix.com) for helping with
- *     testing/troubleshooting the development driver.
- *
- *     TODO:
- *     o several entry points race with dev->close
- *     o check for tx-no-resources/stop Q races with tx clean/wake Q
- *
- *     FIXES:
- * 2005/12/02 - Michael O'Donnell <Michael.ODonnell at stratus dot com>
- *     - Stratus87247: protect MDI control register manipulations
- * 2009/06/01 - Andreas Mohr <andi at lisas dot de>
- *      - add clean lowlevel I/O emulation for cards with MII-lacking PHYs
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/hardirq.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/dmapool.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/mii.h>
-#include <linux/if_vlan.h>
-#include <linux/skbuff.h>
-#include <linux/ethtool.h>
-#include <linux/string.h>
-#include <linux/firmware.h>
-#include <linux/rtnetlink.h>
-#include <asm/unaligned.h>
-
-
-#define DRV_NAME               "e100"
-#define DRV_EXT                        "-NAPI"
-#define DRV_VERSION            "3.5.24-k2"DRV_EXT
-#define DRV_DESCRIPTION                "Intel(R) PRO/100 Network Driver"
-#define DRV_COPYRIGHT          "Copyright(c) 1999-2006 Intel Corporation"
-
-#define E100_WATCHDOG_PERIOD   (2 * HZ)
-#define E100_NAPI_WEIGHT       16
-
-#define FIRMWARE_D101M         "e100/d101m_ucode.bin"
-#define FIRMWARE_D101S         "e100/d101s_ucode.bin"
-#define FIRMWARE_D102E         "e100/d102e_ucode.bin"
-
-MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_AUTHOR(DRV_COPYRIGHT);
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-MODULE_FIRMWARE(FIRMWARE_D101M);
-MODULE_FIRMWARE(FIRMWARE_D101S);
-MODULE_FIRMWARE(FIRMWARE_D102E);
-
-static int debug = 3;
-static int eeprom_bad_csum_allow = 0;
-static int use_io = 0;
-module_param(debug, int, 0);
-module_param(eeprom_bad_csum_allow, int, 0);
-module_param(use_io, int, 0);
-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
-MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
-MODULE_PARM_DESC(use_io, "Force use of i/o access mode");
-
-#define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\
-       PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \
-       PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich }
-static DEFINE_PCI_DEVICE_TABLE(e100_id_table) = {
-       INTEL_8255X_ETHERNET_DEVICE(0x1029, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1030, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1031, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1032, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1033, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1034, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1038, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1039, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103A, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103B, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103C, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103D, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103E, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x1050, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1051, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1052, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1053, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1054, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1055, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1056, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1057, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1059, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1064, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1065, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1066, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1067, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1068, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1069, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x106A, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x106B, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1091, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1092, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1093, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1094, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1095, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x10fe, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1209, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1229, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x2449, 2),
-       INTEL_8255X_ETHERNET_DEVICE(0x2459, 2),
-       INTEL_8255X_ETHERNET_DEVICE(0x245D, 2),
-       INTEL_8255X_ETHERNET_DEVICE(0x27DC, 7),
-       { 0, }
-};
-MODULE_DEVICE_TABLE(pci, e100_id_table);
-
-enum mac {
-       mac_82557_D100_A  = 0,
-       mac_82557_D100_B  = 1,
-       mac_82557_D100_C  = 2,
-       mac_82558_D101_A4 = 4,
-       mac_82558_D101_B0 = 5,
-       mac_82559_D101M   = 8,
-       mac_82559_D101S   = 9,
-       mac_82550_D102    = 12,
-       mac_82550_D102_C  = 13,
-       mac_82551_E       = 14,
-       mac_82551_F       = 15,
-       mac_82551_10      = 16,
-       mac_unknown       = 0xFF,
-};
-
-enum phy {
-       phy_100a     = 0x000003E0,
-       phy_100c     = 0x035002A8,
-       phy_82555_tx = 0x015002A8,
-       phy_nsc_tx   = 0x5C002000,
-       phy_82562_et = 0x033002A8,
-       phy_82562_em = 0x032002A8,
-       phy_82562_ek = 0x031002A8,
-       phy_82562_eh = 0x017002A8,
-       phy_82552_v  = 0xd061004d,
-       phy_unknown  = 0xFFFFFFFF,
-};
-
-/* CSR (Control/Status Registers) */
-struct csr {
-       struct {
-               u8 status;
-               u8 stat_ack;
-               u8 cmd_lo;
-               u8 cmd_hi;
-               u32 gen_ptr;
-       } scb;
-       u32 port;
-       u16 flash_ctrl;
-       u8 eeprom_ctrl_lo;
-       u8 eeprom_ctrl_hi;
-       u32 mdi_ctrl;
-       u32 rx_dma_count;
-};
-
-enum scb_status {
-       rus_no_res       = 0x08,
-       rus_ready        = 0x10,
-       rus_mask         = 0x3C,
-};
-
-enum ru_state  {
-       RU_SUSPENDED = 0,
-       RU_RUNNING       = 1,
-       RU_UNINITIALIZED = -1,
-};
-
-enum scb_stat_ack {
-       stat_ack_not_ours    = 0x00,
-       stat_ack_sw_gen      = 0x04,
-       stat_ack_rnr         = 0x10,
-       stat_ack_cu_idle     = 0x20,
-       stat_ack_frame_rx    = 0x40,
-       stat_ack_cu_cmd_done = 0x80,
-       stat_ack_not_present = 0xFF,
-       stat_ack_rx = (stat_ack_sw_gen | stat_ack_rnr | stat_ack_frame_rx),
-       stat_ack_tx = (stat_ack_cu_idle | stat_ack_cu_cmd_done),
-};
-
-enum scb_cmd_hi {
-       irq_mask_none = 0x00,
-       irq_mask_all  = 0x01,
-       irq_sw_gen    = 0x02,
-};
-
-enum scb_cmd_lo {
-       cuc_nop        = 0x00,
-       ruc_start      = 0x01,
-       ruc_load_base  = 0x06,
-       cuc_start      = 0x10,
-       cuc_resume     = 0x20,
-       cuc_dump_addr  = 0x40,
-       cuc_dump_stats = 0x50,
-       cuc_load_base  = 0x60,
-       cuc_dump_reset = 0x70,
-};
-
-enum cuc_dump {
-       cuc_dump_complete       = 0x0000A005,
-       cuc_dump_reset_complete = 0x0000A007,
-};
-
-enum port {
-       software_reset  = 0x0000,
-       selftest        = 0x0001,
-       selective_reset = 0x0002,
-};
-
-enum eeprom_ctrl_lo {
-       eesk = 0x01,
-       eecs = 0x02,
-       eedi = 0x04,
-       eedo = 0x08,
-};
-
-enum mdi_ctrl {
-       mdi_write = 0x04000000,
-       mdi_read  = 0x08000000,
-       mdi_ready = 0x10000000,
-};
-
-enum eeprom_op {
-       op_write = 0x05,
-       op_read  = 0x06,
-       op_ewds  = 0x10,
-       op_ewen  = 0x13,
-};
-
-enum eeprom_offsets {
-       eeprom_cnfg_mdix  = 0x03,
-       eeprom_phy_iface  = 0x06,
-       eeprom_id         = 0x0A,
-       eeprom_config_asf = 0x0D,
-       eeprom_smbus_addr = 0x90,
-};
-
-enum eeprom_cnfg_mdix {
-       eeprom_mdix_enabled = 0x0080,
-};
-
-enum eeprom_phy_iface {
-       NoSuchPhy = 0,
-       I82553AB,
-       I82553C,
-       I82503,
-       DP83840,
-       S80C240,
-       S80C24,
-       I82555,
-       DP83840A = 10,
-};
-
-enum eeprom_id {
-       eeprom_id_wol = 0x0020,
-};
-
-enum eeprom_config_asf {
-       eeprom_asf = 0x8000,
-       eeprom_gcl = 0x4000,
-};
-
-enum cb_status {
-       cb_complete = 0x8000,
-       cb_ok       = 0x2000,
-};
-
-enum cb_command {
-       cb_nop    = 0x0000,
-       cb_iaaddr = 0x0001,
-       cb_config = 0x0002,
-       cb_multi  = 0x0003,
-       cb_tx     = 0x0004,
-       cb_ucode  = 0x0005,
-       cb_dump   = 0x0006,
-       cb_tx_sf  = 0x0008,
-       cb_cid    = 0x1f00,
-       cb_i      = 0x2000,
-       cb_s      = 0x4000,
-       cb_el     = 0x8000,
-};
-
-struct rfd {
-       __le16 status;
-       __le16 command;
-       __le32 link;
-       __le32 rbd;
-       __le16 actual_size;
-       __le16 size;
-};
-
-struct rx {
-       struct rx *next, *prev;
-       struct sk_buff *skb;
-       dma_addr_t dma_addr;
-};
-
-#if defined(__BIG_ENDIAN_BITFIELD)
-#define X(a,b) b,a
-#else
-#define X(a,b) a,b
-#endif
-struct config {
-/*0*/  u8 X(byte_count:6, pad0:2);
-/*1*/  u8 X(X(rx_fifo_limit:4, tx_fifo_limit:3), pad1:1);
-/*2*/  u8 adaptive_ifs;
-/*3*/  u8 X(X(X(X(mwi_enable:1, type_enable:1), read_align_enable:1),
-          term_write_cache_line:1), pad3:4);
-/*4*/  u8 X(rx_dma_max_count:7, pad4:1);
-/*5*/  u8 X(tx_dma_max_count:7, dma_max_count_enable:1);
-/*6*/  u8 X(X(X(X(X(X(X(late_scb_update:1, direct_rx_dma:1),
-          tno_intr:1), cna_intr:1), standard_tcb:1), standard_stat_counter:1),
-          rx_discard_overruns:1), rx_save_bad_frames:1);
-/*7*/  u8 X(X(X(X(X(rx_discard_short_frames:1, tx_underrun_retry:2),
-          pad7:2), rx_extended_rfd:1), tx_two_frames_in_fifo:1),
-          tx_dynamic_tbd:1);
-/*8*/  u8 X(X(mii_mode:1, pad8:6), csma_disabled:1);
-/*9*/  u8 X(X(X(X(X(rx_tcpudp_checksum:1, pad9:3), vlan_arp_tco:1),
-          link_status_wake:1), arp_wake:1), mcmatch_wake:1);
-/*10*/ u8 X(X(X(pad10:3, no_source_addr_insertion:1), preamble_length:2),
-          loopback:2);
-/*11*/ u8 X(linear_priority:3, pad11:5);
-/*12*/ u8 X(X(linear_priority_mode:1, pad12:3), ifs:4);
-/*13*/ u8 ip_addr_lo;
-/*14*/ u8 ip_addr_hi;
-/*15*/ u8 X(X(X(X(X(X(X(promiscuous_mode:1, broadcast_disabled:1),
-          wait_after_win:1), pad15_1:1), ignore_ul_bit:1), crc_16_bit:1),
-          pad15_2:1), crs_or_cdt:1);
-/*16*/ u8 fc_delay_lo;
-/*17*/ u8 fc_delay_hi;
-/*18*/ u8 X(X(X(X(X(rx_stripping:1, tx_padding:1), rx_crc_transfer:1),
-          rx_long_ok:1), fc_priority_threshold:3), pad18:1);
-/*19*/ u8 X(X(X(X(X(X(X(addr_wake:1, magic_packet_disable:1),
-          fc_disable:1), fc_restop:1), fc_restart:1), fc_reject:1),
-          full_duplex_force:1), full_duplex_pin:1);
-/*20*/ u8 X(X(X(pad20_1:5, fc_priority_location:1), multi_ia:1), pad20_2:1);
-/*21*/ u8 X(X(pad21_1:3, multicast_all:1), pad21_2:4);
-/*22*/ u8 X(X(rx_d102_mode:1, rx_vlan_drop:1), pad22:6);
-       u8 pad_d102[9];
-};
-
-#define E100_MAX_MULTICAST_ADDRS       64
-struct multi {
-       __le16 count;
-       u8 addr[E100_MAX_MULTICAST_ADDRS * ETH_ALEN + 2/*pad*/];
-};
-
-/* Important: keep total struct u32-aligned */
-#define UCODE_SIZE                     134
-struct cb {
-       __le16 status;
-       __le16 command;
-       __le32 link;
-       union {
-               u8 iaaddr[ETH_ALEN];
-               __le32 ucode[UCODE_SIZE];
-               struct config config;
-               struct multi multi;
-               struct {
-                       u32 tbd_array;
-                       u16 tcb_byte_count;
-                       u8 threshold;
-                       u8 tbd_count;
-                       struct {
-                               __le32 buf_addr;
-                               __le16 size;
-                               u16 eol;
-                       } tbd;
-               } tcb;
-               __le32 dump_buffer_addr;
-       } u;
-       struct cb *next, *prev;
-       dma_addr_t dma_addr;
-       struct sk_buff *skb;
-};
-
-enum loopback {
-       lb_none = 0, lb_mac = 1, lb_phy = 3,
-};
-
-struct stats {
-       __le32 tx_good_frames, tx_max_collisions, tx_late_collisions,
-               tx_underruns, tx_lost_crs, tx_deferred, tx_single_collisions,
-               tx_multiple_collisions, tx_total_collisions;
-       __le32 rx_good_frames, rx_crc_errors, rx_alignment_errors,
-               rx_resource_errors, rx_overrun_errors, rx_cdt_errors,
-               rx_short_frame_errors;
-       __le32 fc_xmt_pause, fc_rcv_pause, fc_rcv_unsupported;
-       __le16 xmt_tco_frames, rcv_tco_frames;
-       __le32 complete;
-};
-
-struct mem {
-       struct {
-               u32 signature;
-               u32 result;
-       } selftest;
-       struct stats stats;
-       u8 dump_buf[596];
-};
-
-struct param_range {
-       u32 min;
-       u32 max;
-       u32 count;
-};
-
-struct params {
-       struct param_range rfds;
-       struct param_range cbs;
-};
-
-struct nic {
-       /* Begin: frequently used values: keep adjacent for cache effect */
-       u32 msg_enable                          ____cacheline_aligned;
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-       u16 (*mdio_ctrl)(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data);
-
-       struct rx *rxs                          ____cacheline_aligned;
-       struct rx *rx_to_use;
-       struct rx *rx_to_clean;
-       struct rfd blank_rfd;
-       enum ru_state ru_running;
-
-       spinlock_t cb_lock                      ____cacheline_aligned;
-       spinlock_t cmd_lock;
-       struct csr __iomem *csr;
-       enum scb_cmd_lo cuc_cmd;
-       unsigned int cbs_avail;
-       struct napi_struct napi;
-       struct cb *cbs;
-       struct cb *cb_to_use;
-       struct cb *cb_to_send;
-       struct cb *cb_to_clean;
-       __le16 tx_command;
-       /* End: frequently used values: keep adjacent for cache effect */
-
-       enum {
-               ich                = (1 << 0),
-               promiscuous        = (1 << 1),
-               multicast_all      = (1 << 2),
-               wol_magic          = (1 << 3),
-               ich_10h_workaround = (1 << 4),
-       } flags                                 ____cacheline_aligned;
-
-       enum mac mac;
-       enum phy phy;
-       struct params params;
-       struct timer_list watchdog;
-       struct mii_if_info mii;
-       struct work_struct tx_timeout_task;
-       enum loopback loopback;
-
-       struct mem *mem;
-       dma_addr_t dma_addr;
-
-       struct pci_pool *cbs_pool;
-       dma_addr_t cbs_dma_addr;
-       u8 adaptive_ifs;
-       u8 tx_threshold;
-       u32 tx_frames;
-       u32 tx_collisions;
-       u32 tx_deferred;
-       u32 tx_single_collisions;
-       u32 tx_multiple_collisions;
-       u32 tx_fc_pause;
-       u32 tx_tco_frames;
-
-       u32 rx_fc_pause;
-       u32 rx_fc_unsupported;
-       u32 rx_tco_frames;
-       u32 rx_over_length_errors;
-
-       u16 eeprom_wc;
-       __le16 eeprom[256];
-       spinlock_t mdio_lock;
-       const struct firmware *fw;
-};
-
-static inline void e100_write_flush(struct nic *nic)
-{
-       /* Flush previous PCI writes through intermediate bridges
-        * by doing a benign read */
-       (void)ioread8(&nic->csr->scb.status);
-}
-
-static void e100_enable_irq(struct nic *nic)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&nic->cmd_lock, flags);
-       iowrite8(irq_mask_none, &nic->csr->scb.cmd_hi);
-       e100_write_flush(nic);
-       spin_unlock_irqrestore(&nic->cmd_lock, flags);
-}
-
-static void e100_disable_irq(struct nic *nic)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&nic->cmd_lock, flags);
-       iowrite8(irq_mask_all, &nic->csr->scb.cmd_hi);
-       e100_write_flush(nic);
-       spin_unlock_irqrestore(&nic->cmd_lock, flags);
-}
-
-static void e100_hw_reset(struct nic *nic)
-{
-       /* Put CU and RU into idle with a selective reset to get
-        * device off of PCI bus */
-       iowrite32(selective_reset, &nic->csr->port);
-       e100_write_flush(nic); udelay(20);
-
-       /* Now fully reset device */
-       iowrite32(software_reset, &nic->csr->port);
-       e100_write_flush(nic); udelay(20);
-
-       /* Mask off our interrupt line - it's unmasked after reset */
-       e100_disable_irq(nic);
-}
-
-static int e100_self_test(struct nic *nic)
-{
-       u32 dma_addr = nic->dma_addr + offsetof(struct mem, selftest);
-
-       /* Passing the self-test is a pretty good indication
-        * that the device can DMA to/from host memory */
-
-       nic->mem->selftest.signature = 0;
-       nic->mem->selftest.result = 0xFFFFFFFF;
-
-       iowrite32(selftest | dma_addr, &nic->csr->port);
-       e100_write_flush(nic);
-       /* Wait 10 msec for self-test to complete */
-       msleep(10);
-
-       /* Interrupts are enabled after self-test */
-       e100_disable_irq(nic);
-
-       /* Check results of self-test */
-       if (nic->mem->selftest.result != 0) {
-               netif_err(nic, hw, nic->netdev,
-                         "Self-test failed: result=0x%08X\n",
-                         nic->mem->selftest.result);
-               return -ETIMEDOUT;
-       }
-       if (nic->mem->selftest.signature == 0) {
-               netif_err(nic, hw, nic->netdev, "Self-test failed: timed out\n");
-               return -ETIMEDOUT;
-       }
-
-       return 0;
-}
-
-static void e100_eeprom_write(struct nic *nic, u16 addr_len, u16 addr, __le16 data)
-{
-       u32 cmd_addr_data[3];
-       u8 ctrl;
-       int i, j;
-
-       /* Three cmds: write/erase enable, write data, write/erase disable */
-       cmd_addr_data[0] = op_ewen << (addr_len - 2);
-       cmd_addr_data[1] = (((op_write << addr_len) | addr) << 16) |
-               le16_to_cpu(data);
-       cmd_addr_data[2] = op_ewds << (addr_len - 2);
-
-       /* Bit-bang cmds to write word to eeprom */
-       for (j = 0; j < 3; j++) {
-
-               /* Chip select */
-               iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-
-               for (i = 31; i >= 0; i--) {
-                       ctrl = (cmd_addr_data[j] & (1 << i)) ?
-                               eecs | eedi : eecs;
-                       iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
-                       e100_write_flush(nic); udelay(4);
-
-                       iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
-                       e100_write_flush(nic); udelay(4);
-               }
-               /* Wait 10 msec for cmd to complete */
-               msleep(10);
-
-               /* Chip deselect */
-               iowrite8(0, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-       }
-};
-
-/* General technique stolen from the eepro100 driver - very clever */
-static __le16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
-{
-       u32 cmd_addr_data;
-       u16 data = 0;
-       u8 ctrl;
-       int i;
-
-       cmd_addr_data = ((op_read << *addr_len) | addr) << 16;
-
-       /* Chip select */
-       iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
-       e100_write_flush(nic); udelay(4);
-
-       /* Bit-bang to read word from eeprom */
-       for (i = 31; i >= 0; i--) {
-               ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs;
-               iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-
-               iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-
-               /* Eeprom drives a dummy zero to EEDO after receiving
-                * complete address.  Use this to adjust addr_len. */
-               ctrl = ioread8(&nic->csr->eeprom_ctrl_lo);
-               if (!(ctrl & eedo) && i > 16) {
-                       *addr_len -= (i - 16);
-                       i = 17;
-               }
-
-               data = (data << 1) | (ctrl & eedo ? 1 : 0);
-       }
-
-       /* Chip deselect */
-       iowrite8(0, &nic->csr->eeprom_ctrl_lo);
-       e100_write_flush(nic); udelay(4);
-
-       return cpu_to_le16(data);
-};
-
-/* Load entire EEPROM image into driver cache and validate checksum */
-static int e100_eeprom_load(struct nic *nic)
-{
-       u16 addr, addr_len = 8, checksum = 0;
-
-       /* Try reading with an 8-bit addr len to discover actual addr len */
-       e100_eeprom_read(nic, &addr_len, 0);
-       nic->eeprom_wc = 1 << addr_len;
-
-       for (addr = 0; addr < nic->eeprom_wc; addr++) {
-               nic->eeprom[addr] = e100_eeprom_read(nic, &addr_len, addr);
-               if (addr < nic->eeprom_wc - 1)
-                       checksum += le16_to_cpu(nic->eeprom[addr]);
-       }
-
-       /* The checksum, stored in the last word, is calculated such that
-        * the sum of words should be 0xBABA */
-       if (cpu_to_le16(0xBABA - checksum) != nic->eeprom[nic->eeprom_wc - 1]) {
-               netif_err(nic, probe, nic->netdev, "EEPROM corrupted\n");
-               if (!eeprom_bad_csum_allow)
-                       return -EAGAIN;
-       }
-
-       return 0;
-}
-
-/* Save (portion of) driver EEPROM cache to device and update checksum */
-static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
-{
-       u16 addr, addr_len = 8, checksum = 0;
-
-       /* Try reading with an 8-bit addr len to discover actual addr len */
-       e100_eeprom_read(nic, &addr_len, 0);
-       nic->eeprom_wc = 1 << addr_len;
-
-       if (start + count >= nic->eeprom_wc)
-               return -EINVAL;
-
-       for (addr = start; addr < start + count; addr++)
-               e100_eeprom_write(nic, addr_len, addr, nic->eeprom[addr]);
-
-       /* The checksum, stored in the last word, is calculated such that
-        * the sum of words should be 0xBABA */
-       for (addr = 0; addr < nic->eeprom_wc - 1; addr++)
-               checksum += le16_to_cpu(nic->eeprom[addr]);
-       nic->eeprom[nic->eeprom_wc - 1] = cpu_to_le16(0xBABA - checksum);
-       e100_eeprom_write(nic, addr_len, nic->eeprom_wc - 1,
-               nic->eeprom[nic->eeprom_wc - 1]);
-
-       return 0;
-}
-
-#define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */
-#define E100_WAIT_SCB_FAST 20       /* delay like the old code */
-static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
-{
-       unsigned long flags;
-       unsigned int i;
-       int err = 0;
-
-       spin_lock_irqsave(&nic->cmd_lock, flags);
-
-       /* Previous command is accepted when SCB clears */
-       for (i = 0; i < E100_WAIT_SCB_TIMEOUT; i++) {
-               if (likely(!ioread8(&nic->csr->scb.cmd_lo)))
-                       break;
-               cpu_relax();
-               if (unlikely(i > E100_WAIT_SCB_FAST))
-                       udelay(5);
-       }
-       if (unlikely(i == E100_WAIT_SCB_TIMEOUT)) {
-               err = -EAGAIN;
-               goto err_unlock;
-       }
-
-       if (unlikely(cmd != cuc_resume))
-               iowrite32(dma_addr, &nic->csr->scb.gen_ptr);
-       iowrite8(cmd, &nic->csr->scb.cmd_lo);
-
-err_unlock:
-       spin_unlock_irqrestore(&nic->cmd_lock, flags);
-
-       return err;
-}
-
-static int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
-       void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *))
-{
-       struct cb *cb;
-       unsigned long flags;
-       int err = 0;
-
-       spin_lock_irqsave(&nic->cb_lock, flags);
-
-       if (unlikely(!nic->cbs_avail)) {
-               err = -ENOMEM;
-               goto err_unlock;
-       }
-
-       cb = nic->cb_to_use;
-       nic->cb_to_use = cb->next;
-       nic->cbs_avail--;
-       cb->skb = skb;
-
-       if (unlikely(!nic->cbs_avail))
-               err = -ENOSPC;
-
-       cb_prepare(nic, cb, skb);
-
-       /* Order is important otherwise we'll be in a race with h/w:
-        * set S-bit in current first, then clear S-bit in previous. */
-       cb->command |= cpu_to_le16(cb_s);
-       wmb();
-       cb->prev->command &= cpu_to_le16(~cb_s);
-
-       while (nic->cb_to_send != nic->cb_to_use) {
-               if (unlikely(e100_exec_cmd(nic, nic->cuc_cmd,
-                       nic->cb_to_send->dma_addr))) {
-                       /* Ok, here's where things get sticky.  It's
-                        * possible that we can't schedule the command
-                        * because the controller is too busy, so
-                        * let's just queue the command and try again
-                        * when another command is scheduled. */
-                       if (err == -ENOSPC) {
-                               //request a reset
-                               schedule_work(&nic->tx_timeout_task);
-                       }
-                       break;
-               } else {
-                       nic->cuc_cmd = cuc_resume;
-                       nic->cb_to_send = nic->cb_to_send->next;
-               }
-       }
-
-err_unlock:
-       spin_unlock_irqrestore(&nic->cb_lock, flags);
-
-       return err;
-}
-
-static int mdio_read(struct net_device *netdev, int addr, int reg)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return nic->mdio_ctrl(nic, addr, mdi_read, reg, 0);
-}
-
-static void mdio_write(struct net_device *netdev, int addr, int reg, int data)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       nic->mdio_ctrl(nic, addr, mdi_write, reg, data);
-}
-
-/* the standard mdio_ctrl() function for usual MII-compliant hardware */
-static u16 mdio_ctrl_hw(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
-{
-       u32 data_out = 0;
-       unsigned int i;
-       unsigned long flags;
-
-
-       /*
-        * Stratus87247: we shouldn't be writing the MDI control
-        * register until the Ready bit shows True.  Also, since
-        * manipulation of the MDI control registers is a multi-step
-        * procedure it should be done under lock.
-        */
-       spin_lock_irqsave(&nic->mdio_lock, flags);
-       for (i = 100; i; --i) {
-               if (ioread32(&nic->csr->mdi_ctrl) & mdi_ready)
-                       break;
-               udelay(20);
-       }
-       if (unlikely(!i)) {
-               netdev_err(nic->netdev, "e100.mdio_ctrl won't go Ready\n");
-               spin_unlock_irqrestore(&nic->mdio_lock, flags);
-               return 0;               /* No way to indicate timeout error */
-       }
-       iowrite32((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
-
-       for (i = 0; i < 100; i++) {
-               udelay(20);
-               if ((data_out = ioread32(&nic->csr->mdi_ctrl)) & mdi_ready)
-                       break;
-       }
-       spin_unlock_irqrestore(&nic->mdio_lock, flags);
-       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                    "%s:addr=%d, reg=%d, data_in=0x%04X, data_out=0x%04X\n",
-                    dir == mdi_read ? "READ" : "WRITE",
-                    addr, reg, data, data_out);
-       return (u16)data_out;
-}
-
-/* slightly tweaked mdio_ctrl() function for phy_82552_v specifics */
-static u16 mdio_ctrl_phy_82552_v(struct nic *nic,
-                                u32 addr,
-                                u32 dir,
-                                u32 reg,
-                                u16 data)
-{
-       if ((reg == MII_BMCR) && (dir == mdi_write)) {
-               if (data & (BMCR_ANRESTART | BMCR_ANENABLE)) {
-                       u16 advert = mdio_read(nic->netdev, nic->mii.phy_id,
-                                                       MII_ADVERTISE);
-
-                       /*
-                        * Workaround Si issue where sometimes the part will not
-                        * autoneg to 100Mbps even when advertised.
-                        */
-                       if (advert & ADVERTISE_100FULL)
-                               data |= BMCR_SPEED100 | BMCR_FULLDPLX;
-                       else if (advert & ADVERTISE_100HALF)
-                               data |= BMCR_SPEED100;
-               }
-       }
-       return mdio_ctrl_hw(nic, addr, dir, reg, data);
-}
-
-/* Fully software-emulated mdio_ctrl() function for cards without
- * MII-compliant PHYs.
- * For now, this is mainly geared towards 80c24 support; in case of further
- * requirements for other types (i82503, ...?) either extend this mechanism
- * or split it, whichever is cleaner.
- */
-static u16 mdio_ctrl_phy_mii_emulated(struct nic *nic,
-                                     u32 addr,
-                                     u32 dir,
-                                     u32 reg,
-                                     u16 data)
-{
-       /* might need to allocate a netdev_priv'ed register array eventually
-        * to be able to record state changes, but for now
-        * some fully hardcoded register handling ought to be ok I guess. */
-
-       if (dir == mdi_read) {
-               switch (reg) {
-               case MII_BMCR:
-                       /* Auto-negotiation, right? */
-                       return  BMCR_ANENABLE |
-                               BMCR_FULLDPLX;
-               case MII_BMSR:
-                       return  BMSR_LSTATUS /* for mii_link_ok() */ |
-                               BMSR_ANEGCAPABLE |
-                               BMSR_10FULL;
-               case MII_ADVERTISE:
-                       /* 80c24 is a "combo card" PHY, right? */
-                       return  ADVERTISE_10HALF |
-                               ADVERTISE_10FULL;
-               default:
-                       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                                    "%s:addr=%d, reg=%d, data=0x%04X: unimplemented emulation!\n",
-                                    dir == mdi_read ? "READ" : "WRITE",
-                                    addr, reg, data);
-                       return 0xFFFF;
-               }
-       } else {
-               switch (reg) {
-               default:
-                       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                                    "%s:addr=%d, reg=%d, data=0x%04X: unimplemented emulation!\n",
-                                    dir == mdi_read ? "READ" : "WRITE",
-                                    addr, reg, data);
-                       return 0xFFFF;
-               }
-       }
-}
-static inline int e100_phy_supports_mii(struct nic *nic)
-{
-       /* for now, just check it by comparing whether we
-          are using MII software emulation.
-       */
-       return (nic->mdio_ctrl != mdio_ctrl_phy_mii_emulated);
-}
-
-static void e100_get_defaults(struct nic *nic)
-{
-       struct param_range rfds = { .min = 16, .max = 256, .count = 256 };
-       struct param_range cbs  = { .min = 64, .max = 256, .count = 128 };
-
-       /* MAC type is encoded as rev ID; exception: ICH is treated as 82559 */
-       nic->mac = (nic->flags & ich) ? mac_82559_D101M : nic->pdev->revision;
-       if (nic->mac == mac_unknown)
-               nic->mac = mac_82557_D100_A;
-
-       nic->params.rfds = rfds;
-       nic->params.cbs = cbs;
-
-       /* Quadwords to DMA into FIFO before starting frame transmit */
-       nic->tx_threshold = 0xE0;
-
-       /* no interrupt for every tx completion, delay = 256us if not 557 */
-       nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf |
-               ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
-
-       /* Template for a freshly allocated RFD */
-       nic->blank_rfd.command = 0;
-       nic->blank_rfd.rbd = cpu_to_le32(0xFFFFFFFF);
-       nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
-
-       /* MII setup */
-       nic->mii.phy_id_mask = 0x1F;
-       nic->mii.reg_num_mask = 0x1F;
-       nic->mii.dev = nic->netdev;
-       nic->mii.mdio_read = mdio_read;
-       nic->mii.mdio_write = mdio_write;
-}
-
-static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
-{
-       struct config *config = &cb->u.config;
-       u8 *c = (u8 *)config;
-
-       cb->command = cpu_to_le16(cb_config);
-
-       memset(config, 0, sizeof(struct config));
-
-       config->byte_count = 0x16;              /* bytes in this struct */
-       config->rx_fifo_limit = 0x8;            /* bytes in FIFO before DMA */
-       config->direct_rx_dma = 0x1;            /* reserved */
-       config->standard_tcb = 0x1;             /* 1=standard, 0=extended */
-       config->standard_stat_counter = 0x1;    /* 1=standard, 0=extended */
-       config->rx_discard_short_frames = 0x1;  /* 1=discard, 0=pass */
-       config->tx_underrun_retry = 0x3;        /* # of underrun retries */
-       if (e100_phy_supports_mii(nic))
-               config->mii_mode = 1;           /* 1=MII mode, 0=i82503 mode */
-       config->pad10 = 0x6;
-       config->no_source_addr_insertion = 0x1; /* 1=no, 0=yes */
-       config->preamble_length = 0x2;          /* 0=1, 1=3, 2=7, 3=15 bytes */
-       config->ifs = 0x6;                      /* x16 = inter frame spacing */
-       config->ip_addr_hi = 0xF2;              /* ARP IP filter - not used */
-       config->pad15_1 = 0x1;
-       config->pad15_2 = 0x1;
-       config->crs_or_cdt = 0x0;               /* 0=CRS only, 1=CRS or CDT */
-       config->fc_delay_hi = 0x40;             /* time delay for fc frame */
-       config->tx_padding = 0x1;               /* 1=pad short frames */
-       config->fc_priority_threshold = 0x7;    /* 7=priority fc disabled */
-       config->pad18 = 0x1;
-       config->full_duplex_pin = 0x1;          /* 1=examine FDX# pin */
-       config->pad20_1 = 0x1F;
-       config->fc_priority_location = 0x1;     /* 1=byte#31, 0=byte#19 */
-       config->pad21_1 = 0x5;
-
-       config->adaptive_ifs = nic->adaptive_ifs;
-       config->loopback = nic->loopback;
-
-       if (nic->mii.force_media && nic->mii.full_duplex)
-               config->full_duplex_force = 0x1;        /* 1=force, 0=auto */
-
-       if (nic->flags & promiscuous || nic->loopback) {
-               config->rx_save_bad_frames = 0x1;       /* 1=save, 0=discard */
-               config->rx_discard_short_frames = 0x0;  /* 1=discard, 0=save */
-               config->promiscuous_mode = 0x1;         /* 1=on, 0=off */
-       }
-
-       if (nic->flags & multicast_all)
-               config->multicast_all = 0x1;            /* 1=accept, 0=no */
-
-       /* disable WoL when up */
-       if (netif_running(nic->netdev) || !(nic->flags & wol_magic))
-               config->magic_packet_disable = 0x1;     /* 1=off, 0=on */
-
-       if (nic->mac >= mac_82558_D101_A4) {
-               config->fc_disable = 0x1;       /* 1=Tx fc off, 0=Tx fc on */
-               config->mwi_enable = 0x1;       /* 1=enable, 0=disable */
-               config->standard_tcb = 0x0;     /* 1=standard, 0=extended */
-               config->rx_long_ok = 0x1;       /* 1=VLANs ok, 0=standard */
-               if (nic->mac >= mac_82559_D101M) {
-                       config->tno_intr = 0x1;         /* TCO stats enable */
-                       /* Enable TCO in extended config */
-                       if (nic->mac >= mac_82551_10) {
-                               config->byte_count = 0x20; /* extended bytes */
-                               config->rx_d102_mode = 0x1; /* GMRC for TCO */
-                       }
-               } else {
-                       config->standard_stat_counter = 0x0;
-               }
-       }
-
-       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                    "[00-07]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-                    c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
-       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                    "[08-15]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-                    c[8], c[9], c[10], c[11], c[12], c[13], c[14], c[15]);
-       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                    "[16-23]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-                    c[16], c[17], c[18], c[19], c[20], c[21], c[22], c[23]);
-}
-
-/*************************************************************************
-*  CPUSaver parameters
-*
-*  All CPUSaver parameters are 16-bit literals that are part of a
-*  "move immediate value" instruction.  By changing the value of
-*  the literal in the instruction before the code is loaded, the
-*  driver can change the algorithm.
-*
-*  INTDELAY - This loads the dead-man timer with its initial value.
-*    When this timer expires the interrupt is asserted, and the
-*    timer is reset each time a new packet is received.  (see
-*    BUNDLEMAX below to set the limit on number of chained packets)
-*    The current default is 0x600 or 1536.  Experiments show that
-*    the value should probably stay within the 0x200 - 0x1000.
-*
-*  BUNDLEMAX -
-*    This sets the maximum number of frames that will be bundled.  In
-*    some situations, such as the TCP windowing algorithm, it may be
-*    better to limit the growth of the bundle size than let it go as
-*    high as it can, because that could cause too much added latency.
-*    The default is six, because this is the number of packets in the
-*    default TCP window size.  A value of 1 would make CPUSaver indicate
-*    an interrupt for every frame received.  If you do not want to put
-*    a limit on the bundle size, set this value to xFFFF.
-*
-*  BUNDLESMALL -
-*    This contains a bit-mask describing the minimum size frame that
-*    will be bundled.  The default masks the lower 7 bits, which means
-*    that any frame less than 128 bytes in length will not be bundled,
-*    but will instead immediately generate an interrupt.  This does
-*    not affect the current bundle in any way.  Any frame that is 128
-*    bytes or large will be bundled normally.  This feature is meant
-*    to provide immediate indication of ACK frames in a TCP environment.
-*    Customers were seeing poor performance when a machine with CPUSaver
-*    enabled was sending but not receiving.  The delay introduced when
-*    the ACKs were received was enough to reduce total throughput, because
-*    the sender would sit idle until the ACK was finally seen.
-*
-*    The current default is 0xFF80, which masks out the lower 7 bits.
-*    This means that any frame which is x7F (127) bytes or smaller
-*    will cause an immediate interrupt.  Because this value must be a
-*    bit mask, there are only a few valid values that can be used.  To
-*    turn this feature off, the driver can write the value xFFFF to the
-*    lower word of this instruction (in the same way that the other
-*    parameters are used).  Likewise, a value of 0xF800 (2047) would
-*    cause an interrupt to be generated for every frame, because all
-*    standard Ethernet frames are <= 2047 bytes in length.
-*************************************************************************/
-
-/* if you wish to disable the ucode functionality, while maintaining the
- * workarounds it provides, set the following defines to:
- * BUNDLESMALL 0
- * BUNDLEMAX 1
- * INTDELAY 1
- */
-#define BUNDLESMALL 1
-#define BUNDLEMAX (u16)6
-#define INTDELAY (u16)1536 /* 0x600 */
-
-/* Initialize firmware */
-static const struct firmware *e100_request_firmware(struct nic *nic)
-{
-       const char *fw_name;
-       const struct firmware *fw = nic->fw;
-       u8 timer, bundle, min_size;
-       int err = 0;
-
-       /* do not load u-code for ICH devices */
-       if (nic->flags & ich)
-               return NULL;
-
-       /* Search for ucode match against h/w revision */
-       if (nic->mac == mac_82559_D101M)
-               fw_name = FIRMWARE_D101M;
-       else if (nic->mac == mac_82559_D101S)
-               fw_name = FIRMWARE_D101S;
-       else if (nic->mac == mac_82551_F || nic->mac == mac_82551_10)
-               fw_name = FIRMWARE_D102E;
-       else /* No ucode on other devices */
-               return NULL;
-
-       /* If the firmware has not previously been loaded, request a pointer
-        * to it. If it was previously loaded, we are reinitializing the
-        * adapter, possibly in a resume from hibernate, in which case
-        * request_firmware() cannot be used.
-        */
-       if (!fw)
-               err = request_firmware(&fw, fw_name, &nic->pdev->dev);
-
-       if (err) {
-               netif_err(nic, probe, nic->netdev,
-                         "Failed to load firmware \"%s\": %d\n",
-                         fw_name, err);
-               return ERR_PTR(err);
-       }
-
-       /* Firmware should be precisely UCODE_SIZE (words) plus three bytes
-          indicating the offsets for BUNDLESMALL, BUNDLEMAX, INTDELAY */
-       if (fw->size != UCODE_SIZE * 4 + 3) {
-               netif_err(nic, probe, nic->netdev,
-                         "Firmware \"%s\" has wrong size %zu\n",
-                         fw_name, fw->size);
-               release_firmware(fw);
-               return ERR_PTR(-EINVAL);
-       }
-
-       /* Read timer, bundle and min_size from end of firmware blob */
-       timer = fw->data[UCODE_SIZE * 4];
-       bundle = fw->data[UCODE_SIZE * 4 + 1];
-       min_size = fw->data[UCODE_SIZE * 4 + 2];
-
-       if (timer >= UCODE_SIZE || bundle >= UCODE_SIZE ||
-           min_size >= UCODE_SIZE) {
-               netif_err(nic, probe, nic->netdev,
-                         "\"%s\" has bogus offset values (0x%x,0x%x,0x%x)\n",
-                         fw_name, timer, bundle, min_size);
-               release_firmware(fw);
-               return ERR_PTR(-EINVAL);
-       }
-
-       /* OK, firmware is validated and ready to use. Save a pointer
-        * to it in the nic */
-       nic->fw = fw;
-       return fw;
-}
-
-static void e100_setup_ucode(struct nic *nic, struct cb *cb,
-                            struct sk_buff *skb)
-{
-       const struct firmware *fw = (void *)skb;
-       u8 timer, bundle, min_size;
-
-       /* It's not a real skb; we just abused the fact that e100_exec_cb
-          will pass it through to here... */
-       cb->skb = NULL;
-
-       /* firmware is stored as little endian already */
-       memcpy(cb->u.ucode, fw->data, UCODE_SIZE * 4);
-
-       /* Read timer, bundle and min_size from end of firmware blob */
-       timer = fw->data[UCODE_SIZE * 4];
-       bundle = fw->data[UCODE_SIZE * 4 + 1];
-       min_size = fw->data[UCODE_SIZE * 4 + 2];
-
-       /* Insert user-tunable settings in cb->u.ucode */
-       cb->u.ucode[timer] &= cpu_to_le32(0xFFFF0000);
-       cb->u.ucode[timer] |= cpu_to_le32(INTDELAY);
-       cb->u.ucode[bundle] &= cpu_to_le32(0xFFFF0000);
-       cb->u.ucode[bundle] |= cpu_to_le32(BUNDLEMAX);
-       cb->u.ucode[min_size] &= cpu_to_le32(0xFFFF0000);
-       cb->u.ucode[min_size] |= cpu_to_le32((BUNDLESMALL) ? 0xFFFF : 0xFF80);
-
-       cb->command = cpu_to_le16(cb_ucode | cb_el);
-}
-
-static inline int e100_load_ucode_wait(struct nic *nic)
-{
-       const struct firmware *fw;
-       int err = 0, counter = 50;
-       struct cb *cb = nic->cb_to_clean;
-
-       fw = e100_request_firmware(nic);
-       /* If it's NULL, then no ucode is required */
-       if (!fw || IS_ERR(fw))
-               return PTR_ERR(fw);
-
-       if ((err = e100_exec_cb(nic, (void *)fw, e100_setup_ucode)))
-               netif_err(nic, probe, nic->netdev,
-                         "ucode cmd failed with error %d\n", err);
-
-       /* must restart cuc */
-       nic->cuc_cmd = cuc_start;
-
-       /* wait for completion */
-       e100_write_flush(nic);
-       udelay(10);
-
-       /* wait for possibly (ouch) 500ms */
-       while (!(cb->status & cpu_to_le16(cb_complete))) {
-               msleep(10);
-               if (!--counter) break;
-       }
-
-       /* ack any interrupts, something could have been set */
-       iowrite8(~0, &nic->csr->scb.stat_ack);
-
-       /* if the command failed, or is not OK, notify and return */
-       if (!counter || !(cb->status & cpu_to_le16(cb_ok))) {
-               netif_err(nic, probe, nic->netdev, "ucode load failed\n");
-               err = -EPERM;
-       }
-
-       return err;
-}
-
-static void e100_setup_iaaddr(struct nic *nic, struct cb *cb,
-       struct sk_buff *skb)
-{
-       cb->command = cpu_to_le16(cb_iaaddr);
-       memcpy(cb->u.iaaddr, nic->netdev->dev_addr, ETH_ALEN);
-}
-
-static void e100_dump(struct nic *nic, struct cb *cb, struct sk_buff *skb)
-{
-       cb->command = cpu_to_le16(cb_dump);
-       cb->u.dump_buffer_addr = cpu_to_le32(nic->dma_addr +
-               offsetof(struct mem, dump_buf));
-}
-
-static int e100_phy_check_without_mii(struct nic *nic)
-{
-       u8 phy_type;
-       int without_mii;
-
-       phy_type = (nic->eeprom[eeprom_phy_iface] >> 8) & 0x0f;
-
-       switch (phy_type) {
-       case NoSuchPhy: /* Non-MII PHY; UNTESTED! */
-       case I82503: /* Non-MII PHY; UNTESTED! */
-       case S80C24: /* Non-MII PHY; tested and working */
-               /* paragraph from the FreeBSD driver, "FXP_PHY_80C24":
-                * The Seeq 80c24 AutoDUPLEX(tm) Ethernet Interface Adapter
-                * doesn't have a programming interface of any sort.  The
-                * media is sensed automatically based on how the link partner
-                * is configured.  This is, in essence, manual configuration.
-                */
-               netif_info(nic, probe, nic->netdev,
-                          "found MII-less i82503 or 80c24 or other PHY\n");
-
-               nic->mdio_ctrl = mdio_ctrl_phy_mii_emulated;
-               nic->mii.phy_id = 0; /* is this ok for an MII-less PHY? */
-
-               /* these might be needed for certain MII-less cards...
-                * nic->flags |= ich;
-                * nic->flags |= ich_10h_workaround; */
-
-               without_mii = 1;
-               break;
-       default:
-               without_mii = 0;
-               break;
-       }
-       return without_mii;
-}
-
-#define NCONFIG_AUTO_SWITCH    0x0080
-#define MII_NSC_CONG           MII_RESV1
-#define NSC_CONG_ENABLE                0x0100
-#define NSC_CONG_TXREADY       0x0400
-#define ADVERTISE_FC_SUPPORTED 0x0400
-static int e100_phy_init(struct nic *nic)
-{
-       struct net_device *netdev = nic->netdev;
-       u32 addr;
-       u16 bmcr, stat, id_lo, id_hi, cong;
-
-       /* Discover phy addr by searching addrs in order {1,0,2,..., 31} */
-       for (addr = 0; addr < 32; addr++) {
-               nic->mii.phy_id = (addr == 0) ? 1 : (addr == 1) ? 0 : addr;
-               bmcr = mdio_read(netdev, nic->mii.phy_id, MII_BMCR);
-               stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
-               stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
-               if (!((bmcr == 0xFFFF) || ((stat == 0) && (bmcr == 0))))
-                       break;
-       }
-       if (addr == 32) {
-               /* uhoh, no PHY detected: check whether we seem to be some
-                * weird, rare variant which is *known* to not have any MII.
-                * But do this AFTER MII checking only, since this does
-                * lookup of EEPROM values which may easily be unreliable. */
-               if (e100_phy_check_without_mii(nic))
-                       return 0; /* simply return and hope for the best */
-               else {
-                       /* for unknown cases log a fatal error */
-                       netif_err(nic, hw, nic->netdev,
-                                 "Failed to locate any known PHY, aborting\n");
-                       return -EAGAIN;
-               }
-       } else
-               netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                            "phy_addr = %d\n", nic->mii.phy_id);
-
-       /* Get phy ID */
-       id_lo = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID1);
-       id_hi = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID2);
-       nic->phy = (u32)id_hi << 16 | (u32)id_lo;
-       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                    "phy ID = 0x%08X\n", nic->phy);
-
-       /* Select the phy and isolate the rest */
-       for (addr = 0; addr < 32; addr++) {
-               if (addr != nic->mii.phy_id) {
-                       mdio_write(netdev, addr, MII_BMCR, BMCR_ISOLATE);
-               } else if (nic->phy != phy_82552_v) {
-                       bmcr = mdio_read(netdev, addr, MII_BMCR);
-                       mdio_write(netdev, addr, MII_BMCR,
-                               bmcr & ~BMCR_ISOLATE);
-               }
-       }
-       /*
-        * Workaround for 82552:
-        * Clear the ISOLATE bit on selected phy_id last (mirrored on all
-        * other phy_id's) using bmcr value from addr discovery loop above.
-        */
-       if (nic->phy == phy_82552_v)
-               mdio_write(netdev, nic->mii.phy_id, MII_BMCR,
-                       bmcr & ~BMCR_ISOLATE);
-
-       /* Handle National tx phys */
-#define NCS_PHY_MODEL_MASK     0xFFF0FFFF
-       if ((nic->phy & NCS_PHY_MODEL_MASK) == phy_nsc_tx) {
-               /* Disable congestion control */
-               cong = mdio_read(netdev, nic->mii.phy_id, MII_NSC_CONG);
-               cong |= NSC_CONG_TXREADY;
-               cong &= ~NSC_CONG_ENABLE;
-               mdio_write(netdev, nic->mii.phy_id, MII_NSC_CONG, cong);
-       }
-
-       if (nic->phy == phy_82552_v) {
-               u16 advert = mdio_read(netdev, nic->mii.phy_id, MII_ADVERTISE);
-
-               /* assign special tweaked mdio_ctrl() function */
-               nic->mdio_ctrl = mdio_ctrl_phy_82552_v;
-
-               /* Workaround Si not advertising flow-control during autoneg */
-               advert |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
-               mdio_write(netdev, nic->mii.phy_id, MII_ADVERTISE, advert);
-
-               /* Reset for the above changes to take effect */
-               bmcr = mdio_read(netdev, nic->mii.phy_id, MII_BMCR);
-               bmcr |= BMCR_RESET;
-               mdio_write(netdev, nic->mii.phy_id, MII_BMCR, bmcr);
-       } else if ((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&
-          (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&
-               !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {
-               /* enable/disable MDI/MDI-X auto-switching. */
-               mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,
-                               nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);
-       }
-
-       return 0;
-}
-
-static int e100_hw_init(struct nic *nic)
-{
-       int err = 0;
-
-       e100_hw_reset(nic);
-
-       netif_err(nic, hw, nic->netdev, "e100_hw_init\n");
-       if (!in_interrupt() && (err = e100_self_test(nic)))
-               return err;
-
-       if ((err = e100_phy_init(nic)))
-               return err;
-       if ((err = e100_exec_cmd(nic, cuc_load_base, 0)))
-               return err;
-       if ((err = e100_exec_cmd(nic, ruc_load_base, 0)))
-               return err;
-       if ((err = e100_load_ucode_wait(nic)))
-               return err;
-       if ((err = e100_exec_cb(nic, NULL, e100_configure)))
-               return err;
-       if ((err = e100_exec_cb(nic, NULL, e100_setup_iaaddr)))
-               return err;
-       if ((err = e100_exec_cmd(nic, cuc_dump_addr,
-               nic->dma_addr + offsetof(struct mem, stats))))
-               return err;
-       if ((err = e100_exec_cmd(nic, cuc_dump_reset, 0)))
-               return err;
-
-       e100_disable_irq(nic);
-
-       return 0;
-}
-
-static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb)
-{
-       struct net_device *netdev = nic->netdev;
-       struct netdev_hw_addr *ha;
-       u16 i, count = min(netdev_mc_count(netdev), E100_MAX_MULTICAST_ADDRS);
-
-       cb->command = cpu_to_le16(cb_multi);
-       cb->u.multi.count = cpu_to_le16(count * ETH_ALEN);
-       i = 0;
-       netdev_for_each_mc_addr(ha, netdev) {
-               if (i == count)
-                       break;
-               memcpy(&cb->u.multi.addr[i++ * ETH_ALEN], &ha->addr,
-                       ETH_ALEN);
-       }
-}
-
-static void e100_set_multicast_list(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
-                    "mc_count=%d, flags=0x%04X\n",
-                    netdev_mc_count(netdev), netdev->flags);
-
-       if (netdev->flags & IFF_PROMISC)
-               nic->flags |= promiscuous;
-       else
-               nic->flags &= ~promiscuous;
-
-       if (netdev->flags & IFF_ALLMULTI ||
-               netdev_mc_count(netdev) > E100_MAX_MULTICAST_ADDRS)
-               nic->flags |= multicast_all;
-       else
-               nic->flags &= ~multicast_all;
-
-       e100_exec_cb(nic, NULL, e100_configure);
-       e100_exec_cb(nic, NULL, e100_multi);
-}
-
-static void e100_update_stats(struct nic *nic)
-{
-       struct net_device *dev = nic->netdev;
-       struct net_device_stats *ns = &dev->stats;
-       struct stats *s = &nic->mem->stats;
-       __le32 *complete = (nic->mac < mac_82558_D101_A4) ? &s->fc_xmt_pause :
-               (nic->mac < mac_82559_D101M) ? (__le32 *)&s->xmt_tco_frames :
-               &s->complete;
-
-       /* Device's stats reporting may take several microseconds to
-        * complete, so we're always waiting for results of the
-        * previous command. */
-
-       if (*complete == cpu_to_le32(cuc_dump_reset_complete)) {
-               *complete = 0;
-               nic->tx_frames = le32_to_cpu(s->tx_good_frames);
-               nic->tx_collisions = le32_to_cpu(s->tx_total_collisions);
-               ns->tx_aborted_errors += le32_to_cpu(s->tx_max_collisions);
-               ns->tx_window_errors += le32_to_cpu(s->tx_late_collisions);
-               ns->tx_carrier_errors += le32_to_cpu(s->tx_lost_crs);
-               ns->tx_fifo_errors += le32_to_cpu(s->tx_underruns);
-               ns->collisions += nic->tx_collisions;
-               ns->tx_errors += le32_to_cpu(s->tx_max_collisions) +
-                       le32_to_cpu(s->tx_lost_crs);
-               ns->rx_length_errors += le32_to_cpu(s->rx_short_frame_errors) +
-                       nic->rx_over_length_errors;
-               ns->rx_crc_errors += le32_to_cpu(s->rx_crc_errors);
-               ns->rx_frame_errors += le32_to_cpu(s->rx_alignment_errors);
-               ns->rx_over_errors += le32_to_cpu(s->rx_overrun_errors);
-               ns->rx_fifo_errors += le32_to_cpu(s->rx_overrun_errors);
-               ns->rx_missed_errors += le32_to_cpu(s->rx_resource_errors);
-               ns->rx_errors += le32_to_cpu(s->rx_crc_errors) +
-                       le32_to_cpu(s->rx_alignment_errors) +
-                       le32_to_cpu(s->rx_short_frame_errors) +
-                       le32_to_cpu(s->rx_cdt_errors);
-               nic->tx_deferred += le32_to_cpu(s->tx_deferred);
-               nic->tx_single_collisions +=
-                       le32_to_cpu(s->tx_single_collisions);
-               nic->tx_multiple_collisions +=
-                       le32_to_cpu(s->tx_multiple_collisions);
-               if (nic->mac >= mac_82558_D101_A4) {
-                       nic->tx_fc_pause += le32_to_cpu(s->fc_xmt_pause);
-                       nic->rx_fc_pause += le32_to_cpu(s->fc_rcv_pause);
-                       nic->rx_fc_unsupported +=
-                               le32_to_cpu(s->fc_rcv_unsupported);
-                       if (nic->mac >= mac_82559_D101M) {
-                               nic->tx_tco_frames +=
-                                       le16_to_cpu(s->xmt_tco_frames);
-                               nic->rx_tco_frames +=
-                                       le16_to_cpu(s->rcv_tco_frames);
-                       }
-               }
-       }
-
-
-       if (e100_exec_cmd(nic, cuc_dump_reset, 0))
-               netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
-                            "exec cuc_dump_reset failed\n");
-}
-
-static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex)
-{
-       /* Adjust inter-frame-spacing (IFS) between two transmits if
-        * we're getting collisions on a half-duplex connection. */
-
-       if (duplex == DUPLEX_HALF) {
-               u32 prev = nic->adaptive_ifs;
-               u32 min_frames = (speed == SPEED_100) ? 1000 : 100;
-
-               if ((nic->tx_frames / 32 < nic->tx_collisions) &&
-                  (nic->tx_frames > min_frames)) {
-                       if (nic->adaptive_ifs < 60)
-                               nic->adaptive_ifs += 5;
-               } else if (nic->tx_frames < min_frames) {
-                       if (nic->adaptive_ifs >= 5)
-                               nic->adaptive_ifs -= 5;
-               }
-               if (nic->adaptive_ifs != prev)
-                       e100_exec_cb(nic, NULL, e100_configure);
-       }
-}
-
-static void e100_watchdog(unsigned long data)
-{
-       struct nic *nic = (struct nic *)data;
-       struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
-       u32 speed;
-
-       netif_printk(nic, timer, KERN_DEBUG, nic->netdev,
-                    "right now = %ld\n", jiffies);
-
-       /* mii library handles link maintenance tasks */
-
-       mii_ethtool_gset(&nic->mii, &cmd);
-       speed = ethtool_cmd_speed(&cmd);
-
-       if (mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) {
-               netdev_info(nic->netdev, "NIC Link is Up %u Mbps %s Duplex\n",
-                           speed == SPEED_100 ? 100 : 10,
-                           cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
-       } else if (!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) {
-               netdev_info(nic->netdev, "NIC Link is Down\n");
-       }
-
-       mii_check_link(&nic->mii);
-
-       /* Software generated interrupt to recover from (rare) Rx
-        * allocation failure.
-        * Unfortunately have to use a spinlock to not re-enable interrupts
-        * accidentally, due to hardware that shares a register between the
-        * interrupt mask bit and the SW Interrupt generation bit */
-       spin_lock_irq(&nic->cmd_lock);
-       iowrite8(ioread8(&nic->csr->scb.cmd_hi) | irq_sw_gen,&nic->csr->scb.cmd_hi);
-       e100_write_flush(nic);
-       spin_unlock_irq(&nic->cmd_lock);
-
-       e100_update_stats(nic);
-       e100_adjust_adaptive_ifs(nic, speed, cmd.duplex);
-
-       if (nic->mac <= mac_82557_D100_C)
-               /* Issue a multicast command to workaround a 557 lock up */
-               e100_set_multicast_list(nic->netdev);
-
-       if (nic->flags & ich && speed == SPEED_10 && cmd.duplex == DUPLEX_HALF)
-               /* Need SW workaround for ICH[x] 10Mbps/half duplex Tx hang. */
-               nic->flags |= ich_10h_workaround;
-       else
-               nic->flags &= ~ich_10h_workaround;
-
-       mod_timer(&nic->watchdog,
-                 round_jiffies(jiffies + E100_WATCHDOG_PERIOD));
-}
-
-static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
-       struct sk_buff *skb)
-{
-       cb->command = nic->tx_command;
-       /* interrupt every 16 packets regardless of delay */
-       if ((nic->cbs_avail & ~15) == nic->cbs_avail)
-               cb->command |= cpu_to_le16(cb_i);
-       cb->u.tcb.tbd_array = cb->dma_addr + offsetof(struct cb, u.tcb.tbd);
-       cb->u.tcb.tcb_byte_count = 0;
-       cb->u.tcb.threshold = nic->tx_threshold;
-       cb->u.tcb.tbd_count = 1;
-       cb->u.tcb.tbd.buf_addr = cpu_to_le32(pci_map_single(nic->pdev,
-               skb->data, skb->len, PCI_DMA_TODEVICE));
-       /* check for mapping failure? */
-       cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
-}
-
-static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,
-                                  struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int err;
-
-       if (nic->flags & ich_10h_workaround) {
-               /* SW workaround for ICH[x] 10Mbps/half duplex Tx hang.
-                  Issue a NOP command followed by a 1us delay before
-                  issuing the Tx command. */
-               if (e100_exec_cmd(nic, cuc_nop, 0))
-                       netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
-                                    "exec cuc_nop failed\n");
-               udelay(1);
-       }
-
-       err = e100_exec_cb(nic, skb, e100_xmit_prepare);
-
-       switch (err) {
-       case -ENOSPC:
-               /* We queued the skb, but now we're out of space. */
-               netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
-                            "No space for CB\n");
-               netif_stop_queue(netdev);
-               break;
-       case -ENOMEM:
-               /* This is a hard error - log it. */
-               netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
-                            "Out of Tx resources, returning skb\n");
-               netif_stop_queue(netdev);
-               return NETDEV_TX_BUSY;
-       }
-
-       return NETDEV_TX_OK;
-}
-
-static int e100_tx_clean(struct nic *nic)
-{
-       struct net_device *dev = nic->netdev;
-       struct cb *cb;
-       int tx_cleaned = 0;
-
-       spin_lock(&nic->cb_lock);
-
-       /* Clean CBs marked complete */
-       for (cb = nic->cb_to_clean;
-           cb->status & cpu_to_le16(cb_complete);
-           cb = nic->cb_to_clean = cb->next) {
-               rmb(); /* read skb after status */
-               netif_printk(nic, tx_done, KERN_DEBUG, nic->netdev,
-                            "cb[%d]->status = 0x%04X\n",
-                            (int)(((void*)cb - (void*)nic->cbs)/sizeof(struct cb)),
-                            cb->status);
-
-               if (likely(cb->skb != NULL)) {
-                       dev->stats.tx_packets++;
-                       dev->stats.tx_bytes += cb->skb->len;
-
-                       pci_unmap_single(nic->pdev,
-                               le32_to_cpu(cb->u.tcb.tbd.buf_addr),
-                               le16_to_cpu(cb->u.tcb.tbd.size),
-                               PCI_DMA_TODEVICE);
-                       dev_kfree_skb_any(cb->skb);
-                       cb->skb = NULL;
-                       tx_cleaned = 1;
-               }
-               cb->status = 0;
-               nic->cbs_avail++;
-       }
-
-       spin_unlock(&nic->cb_lock);
-
-       /* Recover from running out of Tx resources in xmit_frame */
-       if (unlikely(tx_cleaned && netif_queue_stopped(nic->netdev)))
-               netif_wake_queue(nic->netdev);
-
-       return tx_cleaned;
-}
-
-static void e100_clean_cbs(struct nic *nic)
-{
-       if (nic->cbs) {
-               while (nic->cbs_avail != nic->params.cbs.count) {
-                       struct cb *cb = nic->cb_to_clean;
-                       if (cb->skb) {
-                               pci_unmap_single(nic->pdev,
-                                       le32_to_cpu(cb->u.tcb.tbd.buf_addr),
-                                       le16_to_cpu(cb->u.tcb.tbd.size),
-                                       PCI_DMA_TODEVICE);
-                               dev_kfree_skb(cb->skb);
-                       }
-                       nic->cb_to_clean = nic->cb_to_clean->next;
-                       nic->cbs_avail++;
-               }
-               pci_pool_free(nic->cbs_pool, nic->cbs, nic->cbs_dma_addr);
-               nic->cbs = NULL;
-               nic->cbs_avail = 0;
-       }
-       nic->cuc_cmd = cuc_start;
-       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean =
-               nic->cbs;
-}
-
-static int e100_alloc_cbs(struct nic *nic)
-{
-       struct cb *cb;
-       unsigned int i, count = nic->params.cbs.count;
-
-       nic->cuc_cmd = cuc_start;
-       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;
-       nic->cbs_avail = 0;
-
-       nic->cbs = pci_pool_alloc(nic->cbs_pool, GFP_KERNEL,
-                                 &nic->cbs_dma_addr);
-       if (!nic->cbs)
-               return -ENOMEM;
-       memset(nic->cbs, 0, count * sizeof(struct cb));
-
-       for (cb = nic->cbs, i = 0; i < count; cb++, i++) {
-               cb->next = (i + 1 < count) ? cb + 1 : nic->cbs;
-               cb->prev = (i == 0) ? nic->cbs + count - 1 : cb - 1;
-
-               cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb);
-               cb->link = cpu_to_le32(nic->cbs_dma_addr +
-                       ((i+1) % count) * sizeof(struct cb));
-       }
-
-       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs;
-       nic->cbs_avail = count;
-
-       return 0;
-}
-
-static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
-{
-       if (!nic->rxs) return;
-       if (RU_SUSPENDED != nic->ru_running) return;
-
-       /* handle init time starts */
-       if (!rx) rx = nic->rxs;
-
-       /* (Re)start RU if suspended or idle and RFA is non-NULL */
-       if (rx->skb) {
-               e100_exec_cmd(nic, ruc_start, rx->dma_addr);
-               nic->ru_running = RU_RUNNING;
-       }
-}
-
-#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
-static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
-{
-       if (!(rx->skb = netdev_alloc_skb_ip_align(nic->netdev, RFD_BUF_LEN)))
-               return -ENOMEM;
-
-       /* Init, and map the RFD. */
-       skb_copy_to_linear_data(rx->skb, &nic->blank_rfd, sizeof(struct rfd));
-       rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,
-               RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-
-       if (pci_dma_mapping_error(nic->pdev, rx->dma_addr)) {
-               dev_kfree_skb_any(rx->skb);
-               rx->skb = NULL;
-               rx->dma_addr = 0;
-               return -ENOMEM;
-       }
-
-       /* Link the RFD to end of RFA by linking previous RFD to
-        * this one.  We are safe to touch the previous RFD because
-        * it is protected by the before last buffer's el bit being set */
-       if (rx->prev->skb) {
-               struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data;
-               put_unaligned_le32(rx->dma_addr, &prev_rfd->link);
-               pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr,
-                       sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
-       }
-
-       return 0;
-}
-
-static int e100_rx_indicate(struct nic *nic, struct rx *rx,
-       unsigned int *work_done, unsigned int work_to_do)
-{
-       struct net_device *dev = nic->netdev;
-       struct sk_buff *skb = rx->skb;
-       struct rfd *rfd = (struct rfd *)skb->data;
-       u16 rfd_status, actual_size;
-
-       if (unlikely(work_done && *work_done >= work_to_do))
-               return -EAGAIN;
-
-       /* Need to sync before taking a peek at cb_complete bit */
-       pci_dma_sync_single_for_cpu(nic->pdev, rx->dma_addr,
-               sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
-       rfd_status = le16_to_cpu(rfd->status);
-
-       netif_printk(nic, rx_status, KERN_DEBUG, nic->netdev,
-                    "status=0x%04X\n", rfd_status);
-       rmb(); /* read size after status bit */
-
-       /* If data isn't ready, nothing to indicate */
-       if (unlikely(!(rfd_status & cb_complete))) {
-               /* If the next buffer has the el bit, but we think the receiver
-                * is still running, check to see if it really stopped while
-                * we had interrupts off.
-                * This allows for a fast restart without re-enabling
-                * interrupts */
-               if ((le16_to_cpu(rfd->command) & cb_el) &&
-                   (RU_RUNNING == nic->ru_running))
-
-                       if (ioread8(&nic->csr->scb.status) & rus_no_res)
-                               nic->ru_running = RU_SUSPENDED;
-               pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
-                                              sizeof(struct rfd),
-                                              PCI_DMA_FROMDEVICE);
-               return -ENODATA;
-       }
-
-       /* Get actual data size */
-       actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF;
-       if (unlikely(actual_size > RFD_BUF_LEN - sizeof(struct rfd)))
-               actual_size = RFD_BUF_LEN - sizeof(struct rfd);
-
-       /* Get data */
-       pci_unmap_single(nic->pdev, rx->dma_addr,
-               RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-
-       /* If this buffer has the el bit, but we think the receiver
-        * is still running, check to see if it really stopped while
-        * we had interrupts off.
-        * This allows for a fast restart without re-enabling interrupts.
-        * This can happen when the RU sees the size change but also sees
-        * the el bit set. */
-       if ((le16_to_cpu(rfd->command) & cb_el) &&
-           (RU_RUNNING == nic->ru_running)) {
-
-           if (ioread8(&nic->csr->scb.status) & rus_no_res)
-               nic->ru_running = RU_SUSPENDED;
-       }
-
-       /* Pull off the RFD and put the actual data (minus eth hdr) */
-       skb_reserve(skb, sizeof(struct rfd));
-       skb_put(skb, actual_size);
-       skb->protocol = eth_type_trans(skb, nic->netdev);
-
-       if (unlikely(!(rfd_status & cb_ok))) {
-               /* Don't indicate if hardware indicates errors */
-               dev_kfree_skb_any(skb);
-       } else if (actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN) {
-               /* Don't indicate oversized frames */
-               nic->rx_over_length_errors++;
-               dev_kfree_skb_any(skb);
-       } else {
-               dev->stats.rx_packets++;
-               dev->stats.rx_bytes += actual_size;
-               netif_receive_skb(skb);
-               if (work_done)
-                       (*work_done)++;
-       }
-
-       rx->skb = NULL;
-
-       return 0;
-}
-
-static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
-       unsigned int work_to_do)
-{
-       struct rx *rx;
-       int restart_required = 0, err = 0;
-       struct rx *old_before_last_rx, *new_before_last_rx;
-       struct rfd *old_before_last_rfd, *new_before_last_rfd;
-
-       /* Indicate newly arrived packets */
-       for (rx = nic->rx_to_clean; rx->skb; rx = nic->rx_to_clean = rx->next) {
-               err = e100_rx_indicate(nic, rx, work_done, work_to_do);
-               /* Hit quota or no more to clean */
-               if (-EAGAIN == err || -ENODATA == err)
-                       break;
-       }
-
-
-       /* On EAGAIN, hit quota so have more work to do, restart once
-        * cleanup is complete.
-        * Else, are we already rnr? then pay attention!!! this ensures that
-        * the state machine progression never allows a start with a
-        * partially cleaned list, avoiding a race between hardware
-        * and rx_to_clean when in NAPI mode */
-       if (-EAGAIN != err && RU_SUSPENDED == nic->ru_running)
-               restart_required = 1;
-
-       old_before_last_rx = nic->rx_to_use->prev->prev;
-       old_before_last_rfd = (struct rfd *)old_before_last_rx->skb->data;
-
-       /* Alloc new skbs to refill list */
-       for (rx = nic->rx_to_use; !rx->skb; rx = nic->rx_to_use = rx->next) {
-               if (unlikely(e100_rx_alloc_skb(nic, rx)))
-                       break; /* Better luck next time (see watchdog) */
-       }
-
-       new_before_last_rx = nic->rx_to_use->prev->prev;
-       if (new_before_last_rx != old_before_last_rx) {
-               /* Set the el-bit on the buffer that is before the last buffer.
-                * This lets us update the next pointer on the last buffer
-                * without worrying about hardware touching it.
-                * We set the size to 0 to prevent hardware from touching this
-                * buffer.
-                * When the hardware hits the before last buffer with el-bit
-                * and size of 0, it will RNR interrupt, the RUS will go into
-                * the No Resources state.  It will not complete nor write to
-                * this buffer. */
-               new_before_last_rfd =
-                       (struct rfd *)new_before_last_rx->skb->data;
-               new_before_last_rfd->size = 0;
-               new_before_last_rfd->command |= cpu_to_le16(cb_el);
-               pci_dma_sync_single_for_device(nic->pdev,
-                       new_before_last_rx->dma_addr, sizeof(struct rfd),
-                       PCI_DMA_BIDIRECTIONAL);
-
-               /* Now that we have a new stopping point, we can clear the old
-                * stopping point.  We must sync twice to get the proper
-                * ordering on the hardware side of things. */
-               old_before_last_rfd->command &= ~cpu_to_le16(cb_el);
-               pci_dma_sync_single_for_device(nic->pdev,
-                       old_before_last_rx->dma_addr, sizeof(struct rfd),
-                       PCI_DMA_BIDIRECTIONAL);
-               old_before_last_rfd->size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
-               pci_dma_sync_single_for_device(nic->pdev,
-                       old_before_last_rx->dma_addr, sizeof(struct rfd),
-                       PCI_DMA_BIDIRECTIONAL);
-       }
-
-       if (restart_required) {
-               // ack the rnr?
-               iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
-               e100_start_receiver(nic, nic->rx_to_clean);
-               if (work_done)
-                       (*work_done)++;
-       }
-}
-
-static void e100_rx_clean_list(struct nic *nic)
-{
-       struct rx *rx;
-       unsigned int i, count = nic->params.rfds.count;
-
-       nic->ru_running = RU_UNINITIALIZED;
-
-       if (nic->rxs) {
-               for (rx = nic->rxs, i = 0; i < count; rx++, i++) {
-                       if (rx->skb) {
-                               pci_unmap_single(nic->pdev, rx->dma_addr,
-                                       RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-                               dev_kfree_skb(rx->skb);
-                       }
-               }
-               kfree(nic->rxs);
-               nic->rxs = NULL;
-       }
-
-       nic->rx_to_use = nic->rx_to_clean = NULL;
-}
-
-static int e100_rx_alloc_list(struct nic *nic)
-{
-       struct rx *rx;
-       unsigned int i, count = nic->params.rfds.count;
-       struct rfd *before_last;
-
-       nic->rx_to_use = nic->rx_to_clean = NULL;
-       nic->ru_running = RU_UNINITIALIZED;
-
-       if (!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
-               return -ENOMEM;
-
-       for (rx = nic->rxs, i = 0; i < count; rx++, i++) {
-               rx->next = (i + 1 < count) ? rx + 1 : nic->rxs;
-               rx->prev = (i == 0) ? nic->rxs + count - 1 : rx - 1;
-               if (e100_rx_alloc_skb(nic, rx)) {
-                       e100_rx_clean_list(nic);
-                       return -ENOMEM;
-               }
-       }
-       /* Set the el-bit on the buffer that is before the last buffer.
-        * This lets us update the next pointer on the last buffer without
-        * worrying about hardware touching it.
-        * We set the size to 0 to prevent hardware from touching this buffer.
-        * When the hardware hits the before last buffer with el-bit and size
-        * of 0, it will RNR interrupt, the RU will go into the No Resources
-        * state.  It will not complete nor write to this buffer. */
-       rx = nic->rxs->prev->prev;
-       before_last = (struct rfd *)rx->skb->data;
-       before_last->command |= cpu_to_le16(cb_el);
-       before_last->size = 0;
-       pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
-               sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
-
-       nic->rx_to_use = nic->rx_to_clean = nic->rxs;
-       nic->ru_running = RU_SUSPENDED;
-
-       return 0;
-}
-
-static irqreturn_t e100_intr(int irq, void *dev_id)
-{
-       struct net_device *netdev = dev_id;
-       struct nic *nic = netdev_priv(netdev);
-       u8 stat_ack = ioread8(&nic->csr->scb.stat_ack);
-
-       netif_printk(nic, intr, KERN_DEBUG, nic->netdev,
-                    "stat_ack = 0x%02X\n", stat_ack);
-
-       if (stat_ack == stat_ack_not_ours ||    /* Not our interrupt */
-          stat_ack == stat_ack_not_present)    /* Hardware is ejected */
-               return IRQ_NONE;
-
-       /* Ack interrupt(s) */
-       iowrite8(stat_ack, &nic->csr->scb.stat_ack);
-
-       /* We hit Receive No Resource (RNR); restart RU after cleaning */
-       if (stat_ack & stat_ack_rnr)
-               nic->ru_running = RU_SUSPENDED;
-
-       if (likely(napi_schedule_prep(&nic->napi))) {
-               e100_disable_irq(nic);
-               __napi_schedule(&nic->napi);
-       }
-
-       return IRQ_HANDLED;
-}
-
-static int e100_poll(struct napi_struct *napi, int budget)
-{
-       struct nic *nic = container_of(napi, struct nic, napi);
-       unsigned int work_done = 0;
-
-       e100_rx_clean(nic, &work_done, budget);
-       e100_tx_clean(nic);
-
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               e100_enable_irq(nic);
-       }
-
-       return work_done;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void e100_netpoll(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       e100_disable_irq(nic);
-       e100_intr(nic->pdev->irq, netdev);
-       e100_tx_clean(nic);
-       e100_enable_irq(nic);
-}
-#endif
-
-static int e100_set_mac_address(struct net_device *netdev, void *p)
-{
-       struct nic *nic = netdev_priv(netdev);
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       e100_exec_cb(nic, NULL, e100_setup_iaaddr);
-
-       return 0;
-}
-
-static int e100_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       if (new_mtu < ETH_ZLEN || new_mtu > ETH_DATA_LEN)
-               return -EINVAL;
-       netdev->mtu = new_mtu;
-       return 0;
-}
-
-static int e100_asf(struct nic *nic)
-{
-       /* ASF can be enabled from eeprom */
-       return (nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1057) &&
-          (nic->eeprom[eeprom_config_asf] & eeprom_asf) &&
-          !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) &&
-          ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE);
-}
-
-static int e100_up(struct nic *nic)
-{
-       int err;
-
-       if ((err = e100_rx_alloc_list(nic)))
-               return err;
-       if ((err = e100_alloc_cbs(nic)))
-               goto err_rx_clean_list;
-       if ((err = e100_hw_init(nic)))
-               goto err_clean_cbs;
-       e100_set_multicast_list(nic->netdev);
-       e100_start_receiver(nic, NULL);
-       mod_timer(&nic->watchdog, jiffies);
-       if ((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
-               nic->netdev->name, nic->netdev)))
-               goto err_no_irq;
-       netif_wake_queue(nic->netdev);
-       napi_enable(&nic->napi);
-       /* enable ints _after_ enabling poll, preventing a race between
-        * disable ints+schedule */
-       e100_enable_irq(nic);
-       return 0;
-
-err_no_irq:
-       del_timer_sync(&nic->watchdog);
-err_clean_cbs:
-       e100_clean_cbs(nic);
-err_rx_clean_list:
-       e100_rx_clean_list(nic);
-       return err;
-}
-
-static void e100_down(struct nic *nic)
-{
-       /* wait here for poll to complete */
-       napi_disable(&nic->napi);
-       netif_stop_queue(nic->netdev);
-       e100_hw_reset(nic);
-       free_irq(nic->pdev->irq, nic->netdev);
-       del_timer_sync(&nic->watchdog);
-       netif_carrier_off(nic->netdev);
-       e100_clean_cbs(nic);
-       e100_rx_clean_list(nic);
-}
-
-static void e100_tx_timeout(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       /* Reset outside of interrupt context, to avoid request_irq
-        * in interrupt context */
-       schedule_work(&nic->tx_timeout_task);
-}
-
-static void e100_tx_timeout_task(struct work_struct *work)
-{
-       struct nic *nic = container_of(work, struct nic, tx_timeout_task);
-       struct net_device *netdev = nic->netdev;
-
-       netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
-                    "scb.status=0x%02X\n", ioread8(&nic->csr->scb.status));
-
-       rtnl_lock();
-       if (netif_running(netdev)) {
-               e100_down(netdev_priv(netdev));
-               e100_up(netdev_priv(netdev));
-       }
-       rtnl_unlock();
-}
-
-static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
-{
-       int err;
-       struct sk_buff *skb;
-
-       /* Use driver resources to perform internal MAC or PHY
-        * loopback test.  A single packet is prepared and transmitted
-        * in loopback mode, and the test passes if the received
-        * packet compares byte-for-byte to the transmitted packet. */
-
-       if ((err = e100_rx_alloc_list(nic)))
-               return err;
-       if ((err = e100_alloc_cbs(nic)))
-               goto err_clean_rx;
-
-       /* ICH PHY loopback is broken so do MAC loopback instead */
-       if (nic->flags & ich && loopback_mode == lb_phy)
-               loopback_mode = lb_mac;
-
-       nic->loopback = loopback_mode;
-       if ((err = e100_hw_init(nic)))
-               goto err_loopback_none;
-
-       if (loopback_mode == lb_phy)
-               mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR,
-                       BMCR_LOOPBACK);
-
-       e100_start_receiver(nic, NULL);
-
-       if (!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
-               err = -ENOMEM;
-               goto err_loopback_none;
-       }
-       skb_put(skb, ETH_DATA_LEN);
-       memset(skb->data, 0xFF, ETH_DATA_LEN);
-       e100_xmit_frame(skb, nic->netdev);
-
-       msleep(10);
-
-       pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr,
-                       RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-
-       if (memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd),
-          skb->data, ETH_DATA_LEN))
-               err = -EAGAIN;
-
-err_loopback_none:
-       mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0);
-       nic->loopback = lb_none;
-       e100_clean_cbs(nic);
-       e100_hw_reset(nic);
-err_clean_rx:
-       e100_rx_clean_list(nic);
-       return err;
-}
-
-#define MII_LED_CONTROL        0x1B
-#define E100_82552_LED_OVERRIDE 0x19
-#define E100_82552_LED_ON       0x000F /* LEDTX and LED_RX both on */
-#define E100_82552_LED_OFF      0x000A /* LEDTX and LED_RX both off */
-
-static int e100_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return mii_ethtool_gset(&nic->mii, cmd);
-}
-
-static int e100_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int err;
-
-       mdio_write(netdev, nic->mii.phy_id, MII_BMCR, BMCR_RESET);
-       err = mii_ethtool_sset(&nic->mii, cmd);
-       e100_exec_cb(nic, NULL, e100_configure);
-
-       return err;
-}
-
-static void e100_get_drvinfo(struct net_device *netdev,
-       struct ethtool_drvinfo *info)
-{
-       struct nic *nic = netdev_priv(netdev);
-       strcpy(info->driver, DRV_NAME);
-       strcpy(info->version, DRV_VERSION);
-       strcpy(info->fw_version, "N/A");
-       strcpy(info->bus_info, pci_name(nic->pdev));
-}
-
-#define E100_PHY_REGS 0x1C
-static int e100_get_regs_len(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return 1 + E100_PHY_REGS + sizeof(nic->mem->dump_buf);
-}
-
-static void e100_get_regs(struct net_device *netdev,
-       struct ethtool_regs *regs, void *p)
-{
-       struct nic *nic = netdev_priv(netdev);
-       u32 *buff = p;
-       int i;
-
-       regs->version = (1 << 24) | nic->pdev->revision;
-       buff[0] = ioread8(&nic->csr->scb.cmd_hi) << 24 |
-               ioread8(&nic->csr->scb.cmd_lo) << 16 |
-               ioread16(&nic->csr->scb.status);
-       for (i = E100_PHY_REGS; i >= 0; i--)
-               buff[1 + E100_PHY_REGS - i] =
-                       mdio_read(netdev, nic->mii.phy_id, i);
-       memset(nic->mem->dump_buf, 0, sizeof(nic->mem->dump_buf));
-       e100_exec_cb(nic, NULL, e100_dump);
-       msleep(10);
-       memcpy(&buff[2 + E100_PHY_REGS], nic->mem->dump_buf,
-               sizeof(nic->mem->dump_buf));
-}
-
-static void e100_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct nic *nic = netdev_priv(netdev);
-       wol->supported = (nic->mac >= mac_82558_D101_A4) ?  WAKE_MAGIC : 0;
-       wol->wolopts = (nic->flags & wol_magic) ? WAKE_MAGIC : 0;
-}
-
-static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       if ((wol->wolopts && wol->wolopts != WAKE_MAGIC) ||
-           !device_can_wakeup(&nic->pdev->dev))
-               return -EOPNOTSUPP;
-
-       if (wol->wolopts)
-               nic->flags |= wol_magic;
-       else
-               nic->flags &= ~wol_magic;
-
-       device_set_wakeup_enable(&nic->pdev->dev, wol->wolopts);
-
-       e100_exec_cb(nic, NULL, e100_configure);
-
-       return 0;
-}
-
-static u32 e100_get_msglevel(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return nic->msg_enable;
-}
-
-static void e100_set_msglevel(struct net_device *netdev, u32 value)
-{
-       struct nic *nic = netdev_priv(netdev);
-       nic->msg_enable = value;
-}
-
-static int e100_nway_reset(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return mii_nway_restart(&nic->mii);
-}
-
-static u32 e100_get_link(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return mii_link_ok(&nic->mii);
-}
-
-static int e100_get_eeprom_len(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return nic->eeprom_wc << 1;
-}
-
-#define E100_EEPROM_MAGIC      0x1234
-static int e100_get_eeprom(struct net_device *netdev,
-       struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       eeprom->magic = E100_EEPROM_MAGIC;
-       memcpy(bytes, &((u8 *)nic->eeprom)[eeprom->offset], eeprom->len);
-
-       return 0;
-}
-
-static int e100_set_eeprom(struct net_device *netdev,
-       struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       if (eeprom->magic != E100_EEPROM_MAGIC)
-               return -EINVAL;
-
-       memcpy(&((u8 *)nic->eeprom)[eeprom->offset], bytes, eeprom->len);
-
-       return e100_eeprom_save(nic, eeprom->offset >> 1,
-               (eeprom->len >> 1) + 1);
-}
-
-static void e100_get_ringparam(struct net_device *netdev,
-       struct ethtool_ringparam *ring)
-{
-       struct nic *nic = netdev_priv(netdev);
-       struct param_range *rfds = &nic->params.rfds;
-       struct param_range *cbs = &nic->params.cbs;
-
-       ring->rx_max_pending = rfds->max;
-       ring->tx_max_pending = cbs->max;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rfds->count;
-       ring->tx_pending = cbs->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int e100_set_ringparam(struct net_device *netdev,
-       struct ethtool_ringparam *ring)
-{
-       struct nic *nic = netdev_priv(netdev);
-       struct param_range *rfds = &nic->params.rfds;
-       struct param_range *cbs = &nic->params.cbs;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       if (netif_running(netdev))
-               e100_down(nic);
-       rfds->count = max(ring->rx_pending, rfds->min);
-       rfds->count = min(rfds->count, rfds->max);
-       cbs->count = max(ring->tx_pending, cbs->min);
-       cbs->count = min(cbs->count, cbs->max);
-       netif_info(nic, drv, nic->netdev, "Ring Param settings: rx: %d, tx %d\n",
-                  rfds->count, cbs->count);
-       if (netif_running(netdev))
-               e100_up(nic);
-
-       return 0;
-}
-
-static const char e100_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Link test     (on/offline)",
-       "Eeprom test   (on/offline)",
-       "Self test        (offline)",
-       "Mac loopback     (offline)",
-       "Phy loopback     (offline)",
-};
-#define E100_TEST_LEN  ARRAY_SIZE(e100_gstrings_test)
-
-static void e100_diag_test(struct net_device *netdev,
-       struct ethtool_test *test, u64 *data)
-{
-       struct ethtool_cmd cmd;
-       struct nic *nic = netdev_priv(netdev);
-       int i, err;
-
-       memset(data, 0, E100_TEST_LEN * sizeof(u64));
-       data[0] = !mii_link_ok(&nic->mii);
-       data[1] = e100_eeprom_load(nic);
-       if (test->flags & ETH_TEST_FL_OFFLINE) {
-
-               /* save speed, duplex & autoneg settings */
-               err = mii_ethtool_gset(&nic->mii, &cmd);
-
-               if (netif_running(netdev))
-                       e100_down(nic);
-               data[2] = e100_self_test(nic);
-               data[3] = e100_loopback_test(nic, lb_mac);
-               data[4] = e100_loopback_test(nic, lb_phy);
-
-               /* restore speed, duplex & autoneg settings */
-               err = mii_ethtool_sset(&nic->mii, &cmd);
-
-               if (netif_running(netdev))
-                       e100_up(nic);
-       }
-       for (i = 0; i < E100_TEST_LEN; i++)
-               test->flags |= data[i] ? ETH_TEST_FL_FAILED : 0;
-
-       msleep_interruptible(4 * 1000);
-}
-
-static int e100_set_phys_id(struct net_device *netdev,
-                           enum ethtool_phys_id_state state)
-{
-       struct nic *nic = netdev_priv(netdev);
-       enum led_state {
-               led_on     = 0x01,
-               led_off    = 0x04,
-               led_on_559 = 0x05,
-               led_on_557 = 0x07,
-       };
-       u16 led_reg = (nic->phy == phy_82552_v) ? E100_82552_LED_OVERRIDE :
-               MII_LED_CONTROL;
-       u16 leds = 0;
-
-       switch (state) {
-       case ETHTOOL_ID_ACTIVE:
-               return 2;
-
-       case ETHTOOL_ID_ON:
-               leds = (nic->phy == phy_82552_v) ? E100_82552_LED_ON :
-                      (nic->mac < mac_82559_D101M) ? led_on_557 : led_on_559;
-               break;
-
-       case ETHTOOL_ID_OFF:
-               leds = (nic->phy == phy_82552_v) ? E100_82552_LED_OFF : led_off;
-               break;
-
-       case ETHTOOL_ID_INACTIVE:
-               break;
-       }
-
-       mdio_write(netdev, nic->mii.phy_id, led_reg, leds);
-       return 0;
-}
-
-static const char e100_gstrings_stats[][ETH_GSTRING_LEN] = {
-       "rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",
-       "tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
-       "rx_length_errors", "rx_over_errors", "rx_crc_errors",
-       "rx_frame_errors", "rx_fifo_errors", "rx_missed_errors",
-       "tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
-       "tx_heartbeat_errors", "tx_window_errors",
-       /* device-specific stats */
-       "tx_deferred", "tx_single_collisions", "tx_multi_collisions",
-       "tx_flow_control_pause", "rx_flow_control_pause",
-       "rx_flow_control_unsupported", "tx_tco_packets", "rx_tco_packets",
-};
-#define E100_NET_STATS_LEN     21
-#define E100_STATS_LEN ARRAY_SIZE(e100_gstrings_stats)
-
-static int e100_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return E100_TEST_LEN;
-       case ETH_SS_STATS:
-               return E100_STATS_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void e100_get_ethtool_stats(struct net_device *netdev,
-       struct ethtool_stats *stats, u64 *data)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int i;
-
-       for (i = 0; i < E100_NET_STATS_LEN; i++)
-               data[i] = ((unsigned long *)&netdev->stats)[i];
-
-       data[i++] = nic->tx_deferred;
-       data[i++] = nic->tx_single_collisions;
-       data[i++] = nic->tx_multiple_collisions;
-       data[i++] = nic->tx_fc_pause;
-       data[i++] = nic->rx_fc_pause;
-       data[i++] = nic->rx_fc_unsupported;
-       data[i++] = nic->tx_tco_frames;
-       data[i++] = nic->rx_tco_frames;
-}
-
-static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
-{
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *e100_gstrings_test, sizeof(e100_gstrings_test));
-               break;
-       case ETH_SS_STATS:
-               memcpy(data, *e100_gstrings_stats, sizeof(e100_gstrings_stats));
-               break;
-       }
-}
-
-static const struct ethtool_ops e100_ethtool_ops = {
-       .get_settings           = e100_get_settings,
-       .set_settings           = e100_set_settings,
-       .get_drvinfo            = e100_get_drvinfo,
-       .get_regs_len           = e100_get_regs_len,
-       .get_regs               = e100_get_regs,
-       .get_wol                = e100_get_wol,
-       .set_wol                = e100_set_wol,
-       .get_msglevel           = e100_get_msglevel,
-       .set_msglevel           = e100_set_msglevel,
-       .nway_reset             = e100_nway_reset,
-       .get_link               = e100_get_link,
-       .get_eeprom_len         = e100_get_eeprom_len,
-       .get_eeprom             = e100_get_eeprom,
-       .set_eeprom             = e100_set_eeprom,
-       .get_ringparam          = e100_get_ringparam,
-       .set_ringparam          = e100_set_ringparam,
-       .self_test              = e100_diag_test,
-       .get_strings            = e100_get_strings,
-       .set_phys_id            = e100_set_phys_id,
-       .get_ethtool_stats      = e100_get_ethtool_stats,
-       .get_sset_count         = e100_get_sset_count,
-};
-
-static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       return generic_mii_ioctl(&nic->mii, if_mii(ifr), cmd, NULL);
-}
-
-static int e100_alloc(struct nic *nic)
-{
-       nic->mem = pci_alloc_consistent(nic->pdev, sizeof(struct mem),
-               &nic->dma_addr);
-       return nic->mem ? 0 : -ENOMEM;
-}
-
-static void e100_free(struct nic *nic)
-{
-       if (nic->mem) {
-               pci_free_consistent(nic->pdev, sizeof(struct mem),
-                       nic->mem, nic->dma_addr);
-               nic->mem = NULL;
-       }
-}
-
-static int e100_open(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int err = 0;
-
-       netif_carrier_off(netdev);
-       if ((err = e100_up(nic)))
-               netif_err(nic, ifup, nic->netdev, "Cannot open interface, aborting\n");
-       return err;
-}
-
-static int e100_close(struct net_device *netdev)
-{
-       e100_down(netdev_priv(netdev));
-       return 0;
-}
-
-static const struct net_device_ops e100_netdev_ops = {
-       .ndo_open               = e100_open,
-       .ndo_stop               = e100_close,
-       .ndo_start_xmit         = e100_xmit_frame,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_multicast_list = e100_set_multicast_list,
-       .ndo_set_mac_address    = e100_set_mac_address,
-       .ndo_change_mtu         = e100_change_mtu,
-       .ndo_do_ioctl           = e100_do_ioctl,
-       .ndo_tx_timeout         = e100_tx_timeout,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = e100_netpoll,
-#endif
-};
-
-static int __devinit e100_probe(struct pci_dev *pdev,
-       const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct nic *nic;
-       int err;
-
-       if (!(netdev = alloc_etherdev(sizeof(struct nic)))) {
-               if (((1 << debug) - 1) & NETIF_MSG_PROBE)
-                       pr_err("Etherdev alloc failed, aborting\n");
-               return -ENOMEM;
-       }
-
-       netdev->netdev_ops = &e100_netdev_ops;
-       SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
-       netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       nic = netdev_priv(netdev);
-       netif_napi_add(netdev, &nic->napi, e100_poll, E100_NAPI_WEIGHT);
-       nic->netdev = netdev;
-       nic->pdev = pdev;
-       nic->msg_enable = (1 << debug) - 1;
-       nic->mdio_ctrl = mdio_ctrl_hw;
-       pci_set_drvdata(pdev, netdev);
-
-       if ((err = pci_enable_device(pdev))) {
-               netif_err(nic, probe, nic->netdev, "Cannot enable PCI device, aborting\n");
-               goto err_out_free_dev;
-       }
-
-       if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-               netif_err(nic, probe, nic->netdev, "Cannot find proper PCI device base address, aborting\n");
-               err = -ENODEV;
-               goto err_out_disable_pdev;
-       }
-
-       if ((err = pci_request_regions(pdev, DRV_NAME))) {
-               netif_err(nic, probe, nic->netdev, "Cannot obtain PCI resources, aborting\n");
-               goto err_out_disable_pdev;
-       }
-
-       if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
-               netif_err(nic, probe, nic->netdev, "No usable DMA configuration, aborting\n");
-               goto err_out_free_res;
-       }
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       if (use_io)
-               netif_info(nic, probe, nic->netdev, "using i/o access mode\n");
-
-       nic->csr = pci_iomap(pdev, (use_io ? 1 : 0), sizeof(struct csr));
-       if (!nic->csr) {
-               netif_err(nic, probe, nic->netdev, "Cannot map device registers, aborting\n");
-               err = -ENOMEM;
-               goto err_out_free_res;
-       }
-
-       if (ent->driver_data)
-               nic->flags |= ich;
-       else
-               nic->flags &= ~ich;
-
-       e100_get_defaults(nic);
-
-       /* locks must be initialized before calling hw_reset */
-       spin_lock_init(&nic->cb_lock);
-       spin_lock_init(&nic->cmd_lock);
-       spin_lock_init(&nic->mdio_lock);
-
-       /* Reset the device before pci_set_master() in case device is in some
-        * funky state and has an interrupt pending - hint: we don't have the
-        * interrupt handler registered yet. */
-       e100_hw_reset(nic);
-
-       pci_set_master(pdev);
-
-       init_timer(&nic->watchdog);
-       nic->watchdog.function = e100_watchdog;
-       nic->watchdog.data = (unsigned long)nic;
-
-       INIT_WORK(&nic->tx_timeout_task, e100_tx_timeout_task);
-
-       if ((err = e100_alloc(nic))) {
-               netif_err(nic, probe, nic->netdev, "Cannot alloc driver memory, aborting\n");
-               goto err_out_iounmap;
-       }
-
-       if ((err = e100_eeprom_load(nic)))
-               goto err_out_free;
-
-       e100_phy_init(nic);
-
-       memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
-       memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
-       if (!is_valid_ether_addr(netdev->perm_addr)) {
-               if (!eeprom_bad_csum_allow) {
-                       netif_err(nic, probe, nic->netdev, "Invalid MAC address from EEPROM, aborting\n");
-                       err = -EAGAIN;
-                       goto err_out_free;
-               } else {
-                       netif_err(nic, probe, nic->netdev, "Invalid MAC address from EEPROM, you MUST configure one.\n");
-               }
-       }
-
-       /* Wol magic packet can be enabled from eeprom */
-       if ((nic->mac >= mac_82558_D101_A4) &&
-          (nic->eeprom[eeprom_id] & eeprom_id_wol)) {
-               nic->flags |= wol_magic;
-               device_set_wakeup_enable(&pdev->dev, true);
-       }
-
-       /* ack any pending wake events, disable PME */
-       pci_pme_active(pdev, false);
-
-       strcpy(netdev->name, "eth%d");
-       if ((err = register_netdev(netdev))) {
-               netif_err(nic, probe, nic->netdev, "Cannot register net device, aborting\n");
-               goto err_out_free;
-       }
-       nic->cbs_pool = pci_pool_create(netdev->name,
-                          nic->pdev,
-                          nic->params.cbs.max * sizeof(struct cb),
-                          sizeof(u32),
-                          0);
-       netif_info(nic, probe, nic->netdev,
-                  "addr 0x%llx, irq %d, MAC addr %pM\n",
-                  (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
-                  pdev->irq, netdev->dev_addr);
-
-       return 0;
-
-err_out_free:
-       e100_free(nic);
-err_out_iounmap:
-       pci_iounmap(pdev, nic->csr);
-err_out_free_res:
-       pci_release_regions(pdev);
-err_out_disable_pdev:
-       pci_disable_device(pdev);
-err_out_free_dev:
-       pci_set_drvdata(pdev, NULL);
-       free_netdev(netdev);
-       return err;
-}
-
-static void __devexit e100_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-
-       if (netdev) {
-               struct nic *nic = netdev_priv(netdev);
-               unregister_netdev(netdev);
-               e100_free(nic);
-               pci_iounmap(pdev, nic->csr);
-               pci_pool_destroy(nic->cbs_pool);
-               free_netdev(netdev);
-               pci_release_regions(pdev);
-               pci_disable_device(pdev);
-               pci_set_drvdata(pdev, NULL);
-       }
-}
-
-#define E100_82552_SMARTSPEED   0x14   /* SmartSpeed Ctrl register */
-#define E100_82552_REV_ANEG     0x0200 /* Reverse auto-negotiation */
-#define E100_82552_ANEG_NOW     0x0400 /* Auto-negotiate now */
-static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       if (netif_running(netdev))
-               e100_down(nic);
-       netif_device_detach(netdev);
-
-       pci_save_state(pdev);
-
-       if ((nic->flags & wol_magic) | e100_asf(nic)) {
-               /* enable reverse auto-negotiation */
-               if (nic->phy == phy_82552_v) {
-                       u16 smartspeed = mdio_read(netdev, nic->mii.phy_id,
-                                                  E100_82552_SMARTSPEED);
-
-                       mdio_write(netdev, nic->mii.phy_id,
-                                  E100_82552_SMARTSPEED, smartspeed |
-                                  E100_82552_REV_ANEG | E100_82552_ANEG_NOW);
-               }
-               *enable_wake = true;
-       } else {
-               *enable_wake = false;
-       }
-
-       pci_disable_device(pdev);
-}
-
-static int __e100_power_off(struct pci_dev *pdev, bool wake)
-{
-       if (wake)
-               return pci_prepare_to_sleep(pdev);
-
-       pci_wake_from_d3(pdev, false);
-       pci_set_power_state(pdev, PCI_D3hot);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       bool wake;
-       __e100_shutdown(pdev, &wake);
-       return __e100_power_off(pdev, wake);
-}
-
-static int e100_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       /* ack any pending wake events, disable PME */
-       pci_enable_wake(pdev, 0, 0);
-
-       /* disable reverse auto-negotiation */
-       if (nic->phy == phy_82552_v) {
-               u16 smartspeed = mdio_read(netdev, nic->mii.phy_id,
-                                          E100_82552_SMARTSPEED);
-
-               mdio_write(netdev, nic->mii.phy_id,
-                          E100_82552_SMARTSPEED,
-                          smartspeed & ~(E100_82552_REV_ANEG));
-       }
-
-       netif_device_attach(netdev);
-       if (netif_running(netdev))
-               e100_up(nic);
-
-       return 0;
-}
-#endif /* CONFIG_PM */
-
-static void e100_shutdown(struct pci_dev *pdev)
-{
-       bool wake;
-       __e100_shutdown(pdev, &wake);
-       if (system_state == SYSTEM_POWER_OFF)
-               __e100_power_off(pdev, wake);
-}
-
-/* ------------------ PCI Error Recovery infrastructure  -------------- */
-/**
- * e100_io_error_detected - called when PCI error is detected.
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- */
-static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (state == pci_channel_io_perm_failure)
-               return PCI_ERS_RESULT_DISCONNECT;
-
-       if (netif_running(netdev))
-               e100_down(nic);
-       pci_disable_device(pdev);
-
-       /* Request a slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * e100_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch.
- */
-static pci_ers_result_t e100_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       if (pci_enable_device(pdev)) {
-               pr_err("Cannot re-enable PCI device after reset\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-       pci_set_master(pdev);
-
-       /* Only one device per card can do a reset */
-       if (0 != PCI_FUNC(pdev->devfn))
-               return PCI_ERS_RESULT_RECOVERED;
-       e100_hw_reset(nic);
-       e100_phy_init(nic);
-
-       return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * e100_io_resume - resume normal operations
- * @pdev: Pointer to PCI device
- *
- * Resume normal operations after an error recovery
- * sequence has been completed.
- */
-static void e100_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       /* ack any pending wake events, disable PME */
-       pci_enable_wake(pdev, 0, 0);
-
-       netif_device_attach(netdev);
-       if (netif_running(netdev)) {
-               e100_open(netdev);
-               mod_timer(&nic->watchdog, jiffies);
-       }
-}
-
-static struct pci_error_handlers e100_err_handler = {
-       .error_detected = e100_io_error_detected,
-       .slot_reset = e100_io_slot_reset,
-       .resume = e100_io_resume,
-};
-
-static struct pci_driver e100_driver = {
-       .name =         DRV_NAME,
-       .id_table =     e100_id_table,
-       .probe =        e100_probe,
-       .remove =       __devexit_p(e100_remove),
-#ifdef CONFIG_PM
-       /* Power Management hooks */
-       .suspend =      e100_suspend,
-       .resume =       e100_resume,
-#endif
-       .shutdown =     e100_shutdown,
-       .err_handler = &e100_err_handler,
-};
-
-static int __init e100_init_module(void)
-{
-       if (((1 << debug) - 1) & NETIF_MSG_DRV) {
-               pr_info("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
-               pr_info("%s\n", DRV_COPYRIGHT);
-       }
-       return pci_register_driver(&e100_driver);
-}
-
-static void __exit e100_cleanup_module(void)
-{
-       pci_unregister_driver(&e100_driver);
-}
-
-module_init(e100_init_module);
-module_exit(e100_cleanup_module);
diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile
deleted file mode 100644 (file)
index 4a6ab15..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#
-# Intel PRO/1000 Linux driver
-# Copyright(c) 1999 - 2006 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
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) PRO/1000 ethernet driver
-#
-
-obj-$(CONFIG_E1000) += e1000.o
-
-e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
deleted file mode 100644 (file)
index 24f41da..0000000
+++ /dev/null
@@ -1,361 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 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
-
-*******************************************************************************/
-
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _E1000_H_
-#define _E1000_H_
-
-#include <linux/stddef.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/pagemap.h>
-#include <linux/dma-mapping.h>
-#include <linux/bitops.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <linux/capability.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <net/pkt_sched.h>
-#include <linux/list.h>
-#include <linux/reboot.h>
-#include <net/checksum.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-
-#define BAR_0          0
-#define BAR_1          1
-#define BAR_5          5
-
-#define INTEL_E1000_ETHERNET_DEVICE(device_id) {\
-       PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
-
-struct e1000_adapter;
-
-#include "e1000_hw.h"
-
-#define E1000_MAX_INTR 10
-
-/* TX/RX descriptor defines */
-#define E1000_DEFAULT_TXD                  256
-#define E1000_MAX_TXD                      256
-#define E1000_MIN_TXD                       48
-#define E1000_MAX_82544_TXD               4096
-
-#define E1000_DEFAULT_RXD                  256
-#define E1000_MAX_RXD                      256
-#define E1000_MIN_RXD                       48
-#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    /* Used for packet split */
-#define E1000_RXBUFFER_256   256    /* Used for packet split */
-#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
-
-/* Flow Control Watermarks */
-#define E1000_FC_HIGH_DIFF 0x1638  /* High: 5688 bytes below Rx FIFO size */
-#define E1000_FC_LOW_DIFF 0x1640   /* Low:  5696 bytes below Rx FIFO size */
-
-#define E1000_FC_PAUSE_TIME 0xFFFF /* pause for the max or until send xon */
-
-/* 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
-
-#ifndef E1000_MASTER_SLAVE
-/* Switch to override PHY master/slave setting */
-#define E1000_MASTER_SLAVE     e1000_ms_hw_default
-#endif
-
-#define E1000_MNG_VLAN_NONE (-1)
-
-/* 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;
-       struct page *page;
-       unsigned long time_stamp;
-       u16 length;
-       u16 next_to_watch;
-       u16 mapped_as_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;
-
-       u16 tdh;
-       u16 tdt;
-       bool last_tx_tso;
-};
-
-struct e1000_rx_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;
-       struct sk_buff *rx_skb_top;
-
-       /* cpu for rx queue */
-       int cpu;
-
-       u16 rdh;
-       u16 rdt;
-};
-
-#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 {
-       struct timer_list tx_fifo_stall_timer;
-       struct timer_list watchdog_timer;
-       struct timer_list phy_info_timer;
-       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-       u16 mng_vlan_id;
-       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;
-
-       struct work_struct reset_task;
-       u8 fc_autoneg;
-
-       /* TX */
-       struct e1000_tx_ring *tx_ring;      /* One per active queue */
-       unsigned int restart_queue;
-       u32 txd_cmd;
-       u32 tx_int_delay;
-       u32 tx_abs_int_delay;
-       u32 gotcl;
-       u64 gotcl_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;
-       atomic_t tx_fifo_stall;
-       bool pcix_82544;
-       bool detect_tx_hung;
-
-       /* RX */
-       bool (*clean_rx)(struct e1000_adapter *adapter,
-                        struct e1000_rx_ring *rx_ring,
-                        int *work_done, int work_to_do);
-       void (*alloc_rx_buf)(struct e1000_adapter *adapter,
-                            struct e1000_rx_ring *rx_ring,
-                            int cleaned_count);
-       struct e1000_rx_ring *rx_ring;      /* One per active queue */
-       struct napi_struct napi;
-
-       int num_tx_queues;
-       int num_rx_queues;
-
-       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 gorcl;
-       u64 gorcl_old;
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-
-       /* 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;
-
-       u32 test_icr;
-       struct e1000_tx_ring test_tx_ring;
-       struct e1000_rx_ring test_rx_ring;
-
-       int msg_enable;
-
-       /* to not mess up cache alignment, always add to the bottom */
-       bool tso_force;
-       bool smart_power_down;  /* phy smart power down */
-       bool quad_port_a;
-       unsigned long flags;
-       u32 eeprom_wol;
-
-       /* for ioport free */
-       int bars;
-       int need_ioport;
-
-       bool discarding;
-
-       struct work_struct fifo_stall_task;
-       struct work_struct phy_info_task;
-};
-
-enum e1000_state_t {
-       __E1000_TESTING,
-       __E1000_RESETTING,
-       __E1000_DOWN
-};
-
-#undef pr_fmt
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);
-#define e_dbg(format, arg...) \
-       netdev_dbg(e1000_get_hw_dev(hw), format, ## arg)
-#define e_err(msglvl, format, arg...) \
-       netif_err(adapter, msglvl, adapter->netdev, format, ## arg)
-#define e_info(msglvl, format, arg...) \
-       netif_info(adapter, msglvl, adapter->netdev, format, ## arg)
-#define e_warn(msglvl, format, arg...) \
-       netif_warn(adapter, msglvl, adapter->netdev, format, ## arg)
-#define e_notice(msglvl, format, arg...) \
-       netif_notice(adapter, msglvl, adapter->netdev, format, ## arg)
-#define e_dev_info(format, arg...) \
-       dev_info(&adapter->pdev->dev, format, ## arg)
-#define e_dev_warn(format, arg...) \
-       dev_warn(&adapter->pdev->dev, format, ## arg)
-#define e_dev_err(format, arg...) \
-       dev_err(&adapter->pdev->dev, format, ## arg)
-
-extern char e1000_driver_name[];
-extern const char e1000_driver_version[];
-
-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, u32 spd, u8 dplx);
-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);
-extern bool e1000_has_link(struct e1000_adapter *adapter);
-extern void e1000_power_up_phy(struct e1000_adapter *);
-extern void e1000_set_ethtool_ops(struct net_device *netdev);
-extern void e1000_check_options(struct e1000_adapter *adapter);
-extern char *e1000_get_hw_dev_name(struct e1000_hw *hw);
-
-#endif /* _E1000_H_ */
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
deleted file mode 100644 (file)
index 5548d46..0000000
+++ /dev/null
@@ -1,1863 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 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
-
-*******************************************************************************/
-
-/* ethtool support for e1000 */
-
-#include "e1000.h"
-#include <asm/uaccess.h>
-
-enum {NETDEV_STATS, E1000_STATS};
-
-struct e1000_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int type;
-       int sizeof_stat;
-       int stat_offset;
-};
-
-#define E1000_STAT(m)          E1000_STATS, \
-                               sizeof(((struct e1000_adapter *)0)->m), \
-                               offsetof(struct e1000_adapter, m)
-#define E1000_NETDEV_STAT(m)   NETDEV_STATS, \
-                               sizeof(((struct net_device *)0)->m), \
-                               offsetof(struct net_device, m)
-
-static const struct e1000_stats e1000_gstrings_stats[] = {
-       { "rx_packets", E1000_STAT(stats.gprc) },
-       { "tx_packets", E1000_STAT(stats.gptc) },
-       { "rx_bytes", E1000_STAT(stats.gorcl) },
-       { "tx_bytes", E1000_STAT(stats.gotcl) },
-       { "rx_broadcast", E1000_STAT(stats.bprc) },
-       { "tx_broadcast", E1000_STAT(stats.bptc) },
-       { "rx_multicast", E1000_STAT(stats.mprc) },
-       { "tx_multicast", E1000_STAT(stats.mptc) },
-       { "rx_errors", E1000_STAT(stats.rxerrc) },
-       { "tx_errors", E1000_STAT(stats.txerrc) },
-       { "tx_dropped", E1000_NETDEV_STAT(stats.tx_dropped) },
-       { "multicast", E1000_STAT(stats.mprc) },
-       { "collisions", E1000_STAT(stats.colc) },
-       { "rx_length_errors", E1000_STAT(stats.rlerrc) },
-       { "rx_over_errors", E1000_NETDEV_STAT(stats.rx_over_errors) },
-       { "rx_crc_errors", E1000_STAT(stats.crcerrs) },
-       { "rx_frame_errors", E1000_NETDEV_STAT(stats.rx_frame_errors) },
-       { "rx_no_buffer_count", E1000_STAT(stats.rnbc) },
-       { "rx_missed_errors", E1000_STAT(stats.mpc) },
-       { "tx_aborted_errors", E1000_STAT(stats.ecol) },
-       { "tx_carrier_errors", E1000_STAT(stats.tncrs) },
-       { "tx_fifo_errors", E1000_NETDEV_STAT(stats.tx_fifo_errors) },
-       { "tx_heartbeat_errors", E1000_NETDEV_STAT(stats.tx_heartbeat_errors) },
-       { "tx_window_errors", E1000_STAT(stats.latecol) },
-       { "tx_abort_late_coll", E1000_STAT(stats.latecol) },
-       { "tx_deferred_ok", E1000_STAT(stats.dc) },
-       { "tx_single_coll_ok", E1000_STAT(stats.scc) },
-       { "tx_multi_coll_ok", E1000_STAT(stats.mcc) },
-       { "tx_timeout_count", E1000_STAT(tx_timeout_count) },
-       { "tx_restart_queue", E1000_STAT(restart_queue) },
-       { "rx_long_length_errors", E1000_STAT(stats.roc) },
-       { "rx_short_length_errors", E1000_STAT(stats.ruc) },
-       { "rx_align_errors", E1000_STAT(stats.algnerrc) },
-       { "tx_tcp_seg_good", E1000_STAT(stats.tsctc) },
-       { "tx_tcp_seg_failed", E1000_STAT(stats.tsctfc) },
-       { "rx_flow_control_xon", E1000_STAT(stats.xonrxc) },
-       { "rx_flow_control_xoff", E1000_STAT(stats.xoffrxc) },
-       { "tx_flow_control_xon", E1000_STAT(stats.xontxc) },
-       { "tx_flow_control_xoff", E1000_STAT(stats.xofftxc) },
-       { "rx_long_byte_count", E1000_STAT(stats.gorcl) },
-       { "rx_csum_offload_good", E1000_STAT(hw_csum_good) },
-       { "rx_csum_offload_errors", E1000_STAT(hw_csum_err) },
-       { "alloc_rx_buff_failed", E1000_STAT(alloc_rx_buff_failed) },
-       { "tx_smbus", E1000_STAT(stats.mgptc) },
-       { "rx_smbus", E1000_STAT(stats.mgprc) },
-       { "dropped_smbus", E1000_STAT(stats.mgpdc) },
-};
-
-#define E1000_QUEUE_STATS_LEN 0
-#define E1000_GLOBAL_STATS_LEN ARRAY_SIZE(e1000_gstrings_stats)
-#define E1000_STATS_LEN (E1000_GLOBAL_STATS_LEN + E1000_QUEUE_STATS_LEN)
-static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Register test  (offline)", "Eeprom test    (offline)",
-       "Interrupt test (offline)", "Loopback test  (offline)",
-       "Link test   (on/offline)"
-};
-#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
-
-static int e1000_get_settings(struct net_device *netdev,
-                             struct ethtool_cmd *ecmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (hw->media_type == e1000_media_type_copper) {
-
-               ecmd->supported = (SUPPORTED_10baseT_Half |
-                                  SUPPORTED_10baseT_Full |
-                                  SUPPORTED_100baseT_Half |
-                                  SUPPORTED_100baseT_Full |
-                                  SUPPORTED_1000baseT_Full|
-                                  SUPPORTED_Autoneg |
-                                  SUPPORTED_TP);
-               ecmd->advertising = ADVERTISED_TP;
-
-               if (hw->autoneg == 1) {
-                       ecmd->advertising |= ADVERTISED_Autoneg;
-                       /* the e1000 autoneg seems to match ethtool nicely */
-                       ecmd->advertising |= hw->autoneg_advertised;
-               }
-
-               ecmd->port = PORT_TP;
-               ecmd->phy_address = hw->phy_addr;
-
-               if (hw->mac_type == e1000_82543)
-                       ecmd->transceiver = XCVR_EXTERNAL;
-               else
-                       ecmd->transceiver = XCVR_INTERNAL;
-
-       } else {
-               ecmd->supported   = (SUPPORTED_1000baseT_Full |
-                                    SUPPORTED_FIBRE |
-                                    SUPPORTED_Autoneg);
-
-               ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg);
-
-               ecmd->port = PORT_FIBRE;
-
-               if (hw->mac_type >= e1000_82545)
-                       ecmd->transceiver = XCVR_INTERNAL;
-               else
-                       ecmd->transceiver = XCVR_EXTERNAL;
-       }
-
-       if (er32(STATUS) & E1000_STATUS_LU) {
-
-               e1000_get_speed_and_duplex(hw, &adapter->link_speed,
-                                                  &adapter->link_duplex);
-               ethtool_cmd_speed_set(ecmd, adapter->link_speed);
-
-               /* unfortunately FULL_DUPLEX != DUPLEX_FULL
-                *          and HALF_DUPLEX != DUPLEX_HALF */
-
-               if (adapter->link_duplex == FULL_DUPLEX)
-                       ecmd->duplex = DUPLEX_FULL;
-               else
-                       ecmd->duplex = DUPLEX_HALF;
-       } else {
-               ethtool_cmd_speed_set(ecmd, -1);
-               ecmd->duplex = -1;
-       }
-
-       ecmd->autoneg = ((hw->media_type == e1000_media_type_fiber) ||
-                        hw->autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
-       return 0;
-}
-
-static int e1000_set_settings(struct net_device *netdev,
-                             struct ethtool_cmd *ecmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-
-       if (ecmd->autoneg == AUTONEG_ENABLE) {
-               hw->autoneg = 1;
-               if (hw->media_type == e1000_media_type_fiber)
-                       hw->autoneg_advertised = ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg;
-               else
-                       hw->autoneg_advertised = ecmd->advertising |
-                                                ADVERTISED_TP |
-                                                ADVERTISED_Autoneg;
-               ecmd->advertising = hw->autoneg_advertised;
-       } else {
-               u32 speed = ethtool_cmd_speed(ecmd);
-               if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {
-                       clear_bit(__E1000_RESETTING, &adapter->flags);
-                       return -EINVAL;
-               }
-       }
-
-       /* reset the link */
-
-       if (netif_running(adapter->netdev)) {
-               e1000_down(adapter);
-               e1000_up(adapter);
-       } else
-               e1000_reset(adapter);
-
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return 0;
-}
-
-static u32 e1000_get_link(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       /*
-        * If the link is not reported up to netdev, interrupts are disabled,
-        * and so the physical link state may have changed since we last
-        * looked. Set get_link_status to make sure that the true link
-        * state is interrogated, rather than pulling a cached and possibly
-        * stale link state from the driver.
-        */
-       if (!netif_carrier_ok(netdev))
-               adapter->hw.get_link_status = 1;
-
-       return e1000_has_link(adapter);
-}
-
-static void e1000_get_pauseparam(struct net_device *netdev,
-                                struct ethtool_pauseparam *pause)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       pause->autoneg =
-               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
-
-       if (hw->fc == E1000_FC_RX_PAUSE)
-               pause->rx_pause = 1;
-       else if (hw->fc == E1000_FC_TX_PAUSE)
-               pause->tx_pause = 1;
-       else if (hw->fc == E1000_FC_FULL) {
-               pause->rx_pause = 1;
-               pause->tx_pause = 1;
-       }
-}
-
-static int e1000_set_pauseparam(struct net_device *netdev,
-                               struct ethtool_pauseparam *pause)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int retval = 0;
-
-       adapter->fc_autoneg = pause->autoneg;
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-
-       if (pause->rx_pause && pause->tx_pause)
-               hw->fc = E1000_FC_FULL;
-       else if (pause->rx_pause && !pause->tx_pause)
-               hw->fc = E1000_FC_RX_PAUSE;
-       else if (!pause->rx_pause && pause->tx_pause)
-               hw->fc = E1000_FC_TX_PAUSE;
-       else if (!pause->rx_pause && !pause->tx_pause)
-               hw->fc = E1000_FC_NONE;
-
-       hw->original_fc = hw->fc;
-
-       if (adapter->fc_autoneg == AUTONEG_ENABLE) {
-               if (netif_running(adapter->netdev)) {
-                       e1000_down(adapter);
-                       e1000_up(adapter);
-               } else
-                       e1000_reset(adapter);
-       } else
-               retval = ((hw->media_type == e1000_media_type_fiber) ?
-                         e1000_setup_link(hw) : e1000_force_mac_fc(hw));
-
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return retval;
-}
-
-static u32 e1000_get_msglevel(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void e1000_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-
-static int e1000_get_regs_len(struct net_device *netdev)
-{
-#define E1000_REGS_LEN 32
-       return E1000_REGS_LEN * sizeof(u32);
-}
-
-static void e1000_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
-                          void *p)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 *regs_buff = p;
-       u16 phy_data;
-
-       memset(p, 0, E1000_REGS_LEN * sizeof(u32));
-
-       regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;
-
-       regs_buff[0]  = er32(CTRL);
-       regs_buff[1]  = er32(STATUS);
-
-       regs_buff[2]  = er32(RCTL);
-       regs_buff[3]  = er32(RDLEN);
-       regs_buff[4]  = er32(RDH);
-       regs_buff[5]  = er32(RDT);
-       regs_buff[6]  = er32(RDTR);
-
-       regs_buff[7]  = er32(TCTL);
-       regs_buff[8]  = er32(TDLEN);
-       regs_buff[9]  = er32(TDH);
-       regs_buff[10] = er32(TDT);
-       regs_buff[11] = er32(TIDV);
-
-       regs_buff[12] = hw->phy_type;  /* PHY type (IGP=1, M88=0) */
-       if (hw->phy_type == e1000_phy_igp) {
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_A);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_A &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[13] = (u32)phy_data; /* cable length */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_B);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_B &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[14] = (u32)phy_data; /* cable length */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_C);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_C &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[15] = (u32)phy_data; /* cable length */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_D);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_D &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[16] = (u32)phy_data; /* cable length */
-               regs_buff[17] = 0; /* extended 10bt distance (not needed) */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[18] = (u32)phy_data; /* cable polarity */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_PCS_INIT_REG);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[19] = (u32)phy_data; /* cable polarity */
-               regs_buff[20] = 0; /* polarity correction enabled (always) */
-               regs_buff[22] = 0; /* phy receive errors (unavailable) */
-               regs_buff[23] = regs_buff[18]; /* mdix mode */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
-       } else {
-               e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-               regs_buff[13] = (u32)phy_data; /* cable length */
-               regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-               regs_buff[17] = (u32)phy_data; /* extended 10bt distance */
-               regs_buff[18] = regs_buff[13]; /* cable polarity */
-               regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[20] = regs_buff[17]; /* polarity correction */
-               /* phy receive errors */
-               regs_buff[22] = adapter->phy_stats.receive_errors;
-               regs_buff[23] = regs_buff[13]; /* mdix mode */
-       }
-       regs_buff[21] = adapter->phy_stats.idle_errors;  /* phy idle errors */
-       e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
-       regs_buff[24] = (u32)phy_data;  /* phy local receiver status */
-       regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
-       if (hw->mac_type >= e1000_82540 &&
-           hw->media_type == e1000_media_type_copper) {
-               regs_buff[26] = er32(MANC);
-       }
-}
-
-static int e1000_get_eeprom_len(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       return hw->eeprom.word_size * 2;
-}
-
-static int e1000_get_eeprom(struct net_device *netdev,
-                           struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       int first_word, last_word;
-       int ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EINVAL;
-
-       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-
-       eeprom_buff = kmalloc(sizeof(u16) *
-                       (last_word - first_word + 1), GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       if (hw->eeprom.type == e1000_eeprom_spi)
-               ret_val = e1000_read_eeprom(hw, first_word,
-                                           last_word - first_word + 1,
-                                           eeprom_buff);
-       else {
-               for (i = 0; i < last_word - first_word + 1; i++) {
-                       ret_val = e1000_read_eeprom(hw, first_word + i, 1,
-                                                   &eeprom_buff[i]);
-                       if (ret_val)
-                               break;
-               }
-       }
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < last_word - first_word + 1; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
-                       eeprom->len);
-       kfree(eeprom_buff);
-
-       return ret_val;
-}
-
-static int e1000_set_eeprom(struct net_device *netdev,
-                           struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       void *ptr;
-       int max_len, first_word, last_word, ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EOPNOTSUPP;
-
-       if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
-               return -EFAULT;
-
-       max_len = hw->eeprom.word_size * 2;
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       ptr = (void *)eeprom_buff;
-
-       if (eeprom->offset & 1) {
-               /* need read/modify/write of first changed EEPROM word */
-               /* only the second byte of the word is being modified */
-               ret_val = e1000_read_eeprom(hw, first_word, 1,
-                                           &eeprom_buff[0]);
-               ptr++;
-       }
-       if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) {
-               /* need read/modify/write of last changed EEPROM word */
-               /* only the first byte of the word is being modified */
-               ret_val = e1000_read_eeprom(hw, last_word, 1,
-                                 &eeprom_buff[last_word - first_word]);
-       }
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < last_word - first_word + 1; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(ptr, bytes, eeprom->len);
-
-       for (i = 0; i < last_word - first_word + 1; i++)
-               eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
-
-       ret_val = e1000_write_eeprom(hw, first_word,
-                                    last_word - first_word + 1, eeprom_buff);
-
-       /* Update the checksum over the first part of the EEPROM if needed */
-       if ((ret_val == 0) && (first_word <= EEPROM_CHECKSUM_REG))
-               e1000_update_eeprom_checksum(hw);
-
-       kfree(eeprom_buff);
-       return ret_val;
-}
-
-static void e1000_get_drvinfo(struct net_device *netdev,
-                             struct ethtool_drvinfo *drvinfo)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       char firmware_version[32];
-
-       strncpy(drvinfo->driver,  e1000_driver_name, 32);
-       strncpy(drvinfo->version, e1000_driver_version, 32);
-
-       sprintf(firmware_version, "N/A");
-       strncpy(drvinfo->fw_version, firmware_version, 32);
-       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-       drvinfo->regdump_len = e1000_get_regs_len(netdev);
-       drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
-}
-
-static void e1000_get_ringparam(struct net_device *netdev,
-                               struct ethtool_ringparam *ring)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       e1000_mac_type mac_type = hw->mac_type;
-       struct e1000_tx_ring *txdr = adapter->tx_ring;
-       struct e1000_rx_ring *rxdr = adapter->rx_ring;
-
-       ring->rx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_RXD :
-               E1000_MAX_82544_RXD;
-       ring->tx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_TXD :
-               E1000_MAX_82544_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rxdr->count;
-       ring->tx_pending = txdr->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int e1000_set_ringparam(struct net_device *netdev,
-                              struct ethtool_ringparam *ring)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       e1000_mac_type mac_type = hw->mac_type;
-       struct e1000_tx_ring *txdr, *tx_old;
-       struct e1000_rx_ring *rxdr, *rx_old;
-       int i, err;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-
-       if (netif_running(adapter->netdev))
-               e1000_down(adapter);
-
-       tx_old = adapter->tx_ring;
-       rx_old = adapter->rx_ring;
-
-       err = -ENOMEM;
-       txdr = kcalloc(adapter->num_tx_queues, sizeof(struct e1000_tx_ring), GFP_KERNEL);
-       if (!txdr)
-               goto err_alloc_tx;
-
-       rxdr = kcalloc(adapter->num_rx_queues, sizeof(struct e1000_rx_ring), GFP_KERNEL);
-       if (!rxdr)
-               goto err_alloc_rx;
-
-       adapter->tx_ring = txdr;
-       adapter->rx_ring = rxdr;
-
-       rxdr->count = max(ring->rx_pending,(u32)E1000_MIN_RXD);
-       rxdr->count = min(rxdr->count,(u32)(mac_type < e1000_82544 ?
-               E1000_MAX_RXD : E1000_MAX_82544_RXD));
-       rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       txdr->count = max(ring->tx_pending,(u32)E1000_MIN_TXD);
-       txdr->count = min(txdr->count,(u32)(mac_type < e1000_82544 ?
-               E1000_MAX_TXD : E1000_MAX_82544_TXD));
-       txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               txdr[i].count = txdr->count;
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               rxdr[i].count = rxdr->count;
-
-       if (netif_running(adapter->netdev)) {
-               /* Try to get new resources before deleting old */
-               err = e1000_setup_all_rx_resources(adapter);
-               if (err)
-                       goto err_setup_rx;
-               err = e1000_setup_all_tx_resources(adapter);
-               if (err)
-                       goto err_setup_tx;
-
-               /* save the new, restore the old in order to free it,
-                * then restore the new back again */
-
-               adapter->rx_ring = rx_old;
-               adapter->tx_ring = tx_old;
-               e1000_free_all_rx_resources(adapter);
-               e1000_free_all_tx_resources(adapter);
-               kfree(tx_old);
-               kfree(rx_old);
-               adapter->rx_ring = rxdr;
-               adapter->tx_ring = txdr;
-               err = e1000_up(adapter);
-               if (err)
-                       goto err_setup;
-       }
-
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return 0;
-err_setup_tx:
-       e1000_free_all_rx_resources(adapter);
-err_setup_rx:
-       adapter->rx_ring = rx_old;
-       adapter->tx_ring = tx_old;
-       kfree(rxdr);
-err_alloc_rx:
-       kfree(txdr);
-err_alloc_tx:
-       e1000_up(adapter);
-err_setup:
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return err;
-}
-
-static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, int reg,
-                            u32 mask, u32 write)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       static const u32 test[] =
-               {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
-       u8 __iomem *address = hw->hw_addr + reg;
-       u32 read;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(test); i++) {
-               writel(write & test[i], address);
-               read = readl(address);
-               if (read != (write & test[i] & mask)) {
-                       e_err(drv, "pattern test reg %04X failed: "
-                             "got 0x%08X expected 0x%08X\n",
-                             reg, read, (write & test[i] & mask));
-                       *data = reg;
-                       return true;
-               }
-       }
-       return false;
-}
-
-static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, int reg,
-                             u32 mask, u32 write)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u8 __iomem *address = hw->hw_addr + reg;
-       u32 read;
-
-       writel(write & mask, address);
-       read = readl(address);
-       if ((read & mask) != (write & mask)) {
-               e_err(drv, "set/check reg %04X test failed: "
-                     "got 0x%08X expected 0x%08X\n",
-                     reg, (read & mask), (write & mask));
-               *data = reg;
-               return true;
-       }
-       return false;
-}
-
-#define REG_PATTERN_TEST(reg, mask, write)                          \
-       do {                                                         \
-               if (reg_pattern_test(adapter, data,                  \
-                            (hw->mac_type >= e1000_82543)   \
-                            ? E1000_##reg : E1000_82542_##reg,      \
-                            mask, write))                           \
-                       return 1;                                    \
-       } while (0)
-
-#define REG_SET_AND_CHECK(reg, mask, write)                         \
-       do {                                                         \
-               if (reg_set_and_check(adapter, data,                 \
-                             (hw->mac_type >= e1000_82543)  \
-                             ? E1000_##reg : E1000_82542_##reg,     \
-                             mask, write))                          \
-                       return 1;                                    \
-       } while (0)
-
-static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
-{
-       u32 value, before, after;
-       u32 i, toggle;
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* The status register is Read Only, so a write should fail.
-        * Some bits that get toggled are ignored.
-        */
-
-       /* there are several bits on newer hardware that are r/w */
-       toggle = 0xFFFFF833;
-
-       before = er32(STATUS);
-       value = (er32(STATUS) & toggle);
-       ew32(STATUS, toggle);
-       after = er32(STATUS) & toggle;
-       if (value != after) {
-               e_err(drv, "failed STATUS register test got: "
-                     "0x%08X expected: 0x%08X\n", after, value);
-               *data = 1;
-               return 1;
-       }
-       /* restore previous status */
-       ew32(STATUS, before);
-
-       REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(FCT, 0x0000FFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(VET, 0x0000FFFF, 0xFFFFFFFF);
-
-       REG_PATTERN_TEST(RDTR, 0x0000FFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(RDLEN, 0x000FFF80, 0x000FFFFF);
-       REG_PATTERN_TEST(RDH, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(RDT, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(FCRTH, 0x0000FFF8, 0x0000FFF8);
-       REG_PATTERN_TEST(FCTTV, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(TIPG, 0x3FFFFFFF, 0x3FFFFFFF);
-       REG_PATTERN_TEST(TDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(TDLEN, 0x000FFF80, 0x000FFFFF);
-
-       REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x00000000);
-
-       before = 0x06DFB3FE;
-       REG_SET_AND_CHECK(RCTL, before, 0x003FFFFB);
-       REG_SET_AND_CHECK(TCTL, 0xFFFFFFFF, 0x00000000);
-
-       if (hw->mac_type >= e1000_82543) {
-
-               REG_SET_AND_CHECK(RCTL, before, 0xFFFFFFFF);
-               REG_PATTERN_TEST(RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
-               REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);
-               REG_PATTERN_TEST(TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
-               REG_PATTERN_TEST(TIDV, 0x0000FFFF, 0x0000FFFF);
-               value = E1000_RAR_ENTRIES;
-               for (i = 0; i < value; i++) {
-                       REG_PATTERN_TEST(RA + (((i << 1) + 1) << 2), 0x8003FFFF,
-                                        0xFFFFFFFF);
-               }
-
-       } else {
-
-               REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x01FFFFFF);
-               REG_PATTERN_TEST(RDBAL, 0xFFFFF000, 0xFFFFFFFF);
-               REG_PATTERN_TEST(TXCW, 0x0000FFFF, 0x0000FFFF);
-               REG_PATTERN_TEST(TDBAL, 0xFFFFF000, 0xFFFFFFFF);
-
-       }
-
-       value = E1000_MC_TBL_SIZE;
-       for (i = 0; i < value; i++)
-               REG_PATTERN_TEST(MTA + (i << 2), 0xFFFFFFFF, 0xFFFFFFFF);
-
-       *data = 0;
-       return 0;
-}
-
-static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 temp;
-       u16 checksum = 0;
-       u16 i;
-
-       *data = 0;
-       /* Read and add up the contents of the EEPROM */
-       for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
-               if ((e1000_read_eeprom(hw, i, 1, &temp)) < 0) {
-                       *data = 1;
-                       break;
-               }
-               checksum += temp;
-       }
-
-       /* If Checksum is not Correct return error else test passed */
-       if ((checksum != (u16)EEPROM_SUM) && !(*data))
-               *data = 2;
-
-       return *data;
-}
-
-static irqreturn_t e1000_test_intr(int irq, void *data)
-{
-       struct net_device *netdev = (struct net_device *)data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       adapter->test_icr |= er32(ICR);
-
-       return IRQ_HANDLED;
-}
-
-static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct net_device *netdev = adapter->netdev;
-       u32 mask, i = 0;
-       bool shared_int = true;
-       u32 irq = adapter->pdev->irq;
-       struct e1000_hw *hw = &adapter->hw;
-
-       *data = 0;
-
-       /* NOTE: we don't test MSI interrupts here, yet */
-       /* Hook up test interrupt handler just for this test */
-       if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
-                        netdev))
-               shared_int = false;
-       else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
-                netdev->name, netdev)) {
-               *data = 1;
-               return -1;
-       }
-       e_info(hw, "testing %s interrupt\n", (shared_int ?
-              "shared" : "unshared"));
-
-       /* Disable all the interrupts */
-       ew32(IMC, 0xFFFFFFFF);
-       E1000_WRITE_FLUSH();
-       msleep(10);
-
-       /* Test each interrupt */
-       for (; i < 10; i++) {
-
-               /* Interrupt to test */
-               mask = 1 << i;
-
-               if (!shared_int) {
-                       /* Disable the interrupt to be reported in
-                        * the cause register and then force the same
-                        * interrupt and see if one gets posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       ew32(IMC, mask);
-                       ew32(ICS, mask);
-                       E1000_WRITE_FLUSH();
-                       msleep(10);
-
-                       if (adapter->test_icr & mask) {
-                               *data = 3;
-                               break;
-                       }
-               }
-
-               /* Enable the interrupt to be reported in
-                * the cause register and then force the same
-                * interrupt and see if one gets posted.  If
-                * an interrupt was not posted to the bus, the
-                * test failed.
-                */
-               adapter->test_icr = 0;
-               ew32(IMS, mask);
-               ew32(ICS, mask);
-               E1000_WRITE_FLUSH();
-               msleep(10);
-
-               if (!(adapter->test_icr & mask)) {
-                       *data = 4;
-                       break;
-               }
-
-               if (!shared_int) {
-                       /* Disable the other interrupts to be reported in
-                        * the cause register and then force the other
-                        * interrupts and see if any get posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       ew32(IMC, ~mask & 0x00007FFF);
-                       ew32(ICS, ~mask & 0x00007FFF);
-                       E1000_WRITE_FLUSH();
-                       msleep(10);
-
-                       if (adapter->test_icr) {
-                               *data = 5;
-                               break;
-                       }
-               }
-       }
-
-       /* Disable all the interrupts */
-       ew32(IMC, 0xFFFFFFFF);
-       E1000_WRITE_FLUSH();
-       msleep(10);
-
-       /* Unhook test interrupt handler */
-       free_irq(irq, netdev);
-
-       return *data;
-}
-
-static void e1000_free_desc_rings(struct e1000_adapter *adapter)
-{
-       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
-       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       int i;
-
-       if (txdr->desc && txdr->buffer_info) {
-               for (i = 0; i < txdr->count; i++) {
-                       if (txdr->buffer_info[i].dma)
-                               dma_unmap_single(&pdev->dev,
-                                                txdr->buffer_info[i].dma,
-                                                txdr->buffer_info[i].length,
-                                                DMA_TO_DEVICE);
-                       if (txdr->buffer_info[i].skb)
-                               dev_kfree_skb(txdr->buffer_info[i].skb);
-               }
-       }
-
-       if (rxdr->desc && rxdr->buffer_info) {
-               for (i = 0; i < rxdr->count; i++) {
-                       if (rxdr->buffer_info[i].dma)
-                               dma_unmap_single(&pdev->dev,
-                                                rxdr->buffer_info[i].dma,
-                                                rxdr->buffer_info[i].length,
-                                                DMA_FROM_DEVICE);
-                       if (rxdr->buffer_info[i].skb)
-                               dev_kfree_skb(rxdr->buffer_info[i].skb);
-               }
-       }
-
-       if (txdr->desc) {
-               dma_free_coherent(&pdev->dev, txdr->size, txdr->desc,
-                                 txdr->dma);
-               txdr->desc = NULL;
-       }
-       if (rxdr->desc) {
-               dma_free_coherent(&pdev->dev, rxdr->size, rxdr->desc,
-                                 rxdr->dma);
-               rxdr->desc = NULL;
-       }
-
-       kfree(txdr->buffer_info);
-       txdr->buffer_info = NULL;
-       kfree(rxdr->buffer_info);
-       rxdr->buffer_info = NULL;
-}
-
-static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
-       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       u32 rctl;
-       int i, ret_val;
-
-       /* Setup Tx descriptor ring and Tx buffers */
-
-       if (!txdr->count)
-               txdr->count = E1000_DEFAULT_TXD;
-
-       txdr->buffer_info = kcalloc(txdr->count, sizeof(struct e1000_buffer),
-                                   GFP_KERNEL);
-       if (!txdr->buffer_info) {
-               ret_val = 1;
-               goto err_nomem;
-       }
-
-       txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
-       txdr->size = ALIGN(txdr->size, 4096);
-       txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                       GFP_KERNEL);
-       if (!txdr->desc) {
-               ret_val = 2;
-               goto err_nomem;
-       }
-       memset(txdr->desc, 0, txdr->size);
-       txdr->next_to_use = txdr->next_to_clean = 0;
-
-       ew32(TDBAL, ((u64)txdr->dma & 0x00000000FFFFFFFF));
-       ew32(TDBAH, ((u64)txdr->dma >> 32));
-       ew32(TDLEN, txdr->count * sizeof(struct e1000_tx_desc));
-       ew32(TDH, 0);
-       ew32(TDT, 0);
-       ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN |
-            E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
-            E1000_FDX_COLLISION_DISTANCE << E1000_COLD_SHIFT);
-
-       for (i = 0; i < txdr->count; i++) {
-               struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*txdr, i);
-               struct sk_buff *skb;
-               unsigned int size = 1024;
-
-               skb = alloc_skb(size, GFP_KERNEL);
-               if (!skb) {
-                       ret_val = 3;
-                       goto err_nomem;
-               }
-               skb_put(skb, size);
-               txdr->buffer_info[i].skb = skb;
-               txdr->buffer_info[i].length = skb->len;
-               txdr->buffer_info[i].dma =
-                       dma_map_single(&pdev->dev, skb->data, skb->len,
-                                      DMA_TO_DEVICE);
-               tx_desc->buffer_addr = cpu_to_le64(txdr->buffer_info[i].dma);
-               tx_desc->lower.data = cpu_to_le32(skb->len);
-               tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
-                                                  E1000_TXD_CMD_IFCS |
-                                                  E1000_TXD_CMD_RPS);
-               tx_desc->upper.data = 0;
-       }
-
-       /* Setup Rx descriptor ring and Rx buffers */
-
-       if (!rxdr->count)
-               rxdr->count = E1000_DEFAULT_RXD;
-
-       rxdr->buffer_info = kcalloc(rxdr->count, sizeof(struct e1000_buffer),
-                                   GFP_KERNEL);
-       if (!rxdr->buffer_info) {
-               ret_val = 4;
-               goto err_nomem;
-       }
-
-       rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
-       rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
-                                       GFP_KERNEL);
-       if (!rxdr->desc) {
-               ret_val = 5;
-               goto err_nomem;
-       }
-       memset(rxdr->desc, 0, rxdr->size);
-       rxdr->next_to_use = rxdr->next_to_clean = 0;
-
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-       ew32(RDBAL, ((u64)rxdr->dma & 0xFFFFFFFF));
-       ew32(RDBAH, ((u64)rxdr->dma >> 32));
-       ew32(RDLEN, rxdr->size);
-       ew32(RDH, 0);
-       ew32(RDT, 0);
-       rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
-               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-               (hw->mc_filter_type << E1000_RCTL_MO_SHIFT);
-       ew32(RCTL, rctl);
-
-       for (i = 0; i < rxdr->count; i++) {
-               struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rxdr, i);
-               struct sk_buff *skb;
-
-               skb = alloc_skb(E1000_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL);
-               if (!skb) {
-                       ret_val = 6;
-                       goto err_nomem;
-               }
-               skb_reserve(skb, NET_IP_ALIGN);
-               rxdr->buffer_info[i].skb = skb;
-               rxdr->buffer_info[i].length = E1000_RXBUFFER_2048;
-               rxdr->buffer_info[i].dma =
-                       dma_map_single(&pdev->dev, skb->data,
-                                      E1000_RXBUFFER_2048, DMA_FROM_DEVICE);
-               rx_desc->buffer_addr = cpu_to_le64(rxdr->buffer_info[i].dma);
-               memset(skb->data, 0x00, skb->len);
-       }
-
-       return 0;
-
-err_nomem:
-       e1000_free_desc_rings(adapter);
-       return ret_val;
-}
-
-static void e1000_phy_disable_receiver(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
-       e1000_write_phy_reg(hw, 29, 0x001F);
-       e1000_write_phy_reg(hw, 30, 0x8FFC);
-       e1000_write_phy_reg(hw, 29, 0x001A);
-       e1000_write_phy_reg(hw, 30, 0x8FF0);
-}
-
-static void e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 phy_reg;
-
-       /* Because we reset the PHY above, we need to re-force TX_CLK in the
-        * Extended PHY Specific Control Register to 25MHz clock.  This
-        * value defaults back to a 2.5MHz clock when the PHY is reset.
-        */
-       e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
-       phy_reg |= M88E1000_EPSCR_TX_CLK_25;
-       e1000_write_phy_reg(hw,
-               M88E1000_EXT_PHY_SPEC_CTRL, phy_reg);
-
-       /* In addition, because of the s/w reset above, we need to enable
-        * CRS on TX.  This must be set for both full and half duplex
-        * operation.
-        */
-       e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_reg);
-       phy_reg |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-       e1000_write_phy_reg(hw,
-               M88E1000_PHY_SPEC_CTRL, phy_reg);
-}
-
-static int e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_reg;
-       u16 phy_reg;
-
-       /* Setup the Device Control Register for PHY loopback test. */
-
-       ctrl_reg = er32(CTRL);
-       ctrl_reg |= (E1000_CTRL_ILOS |          /* Invert Loss-Of-Signal */
-                    E1000_CTRL_FRCSPD |        /* Set the Force Speed Bit */
-                    E1000_CTRL_FRCDPX |        /* Set the Force Duplex Bit */
-                    E1000_CTRL_SPD_1000 |      /* Force Speed to 1000 */
-                    E1000_CTRL_FD);            /* Force Duplex to FULL */
-
-       ew32(CTRL, ctrl_reg);
-
-       /* Read the PHY Specific Control Register (0x10) */
-       e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_reg);
-
-       /* Clear Auto-Crossover bits in PHY Specific Control Register
-        * (bits 6:5).
-        */
-       phy_reg &= ~M88E1000_PSCR_AUTO_X_MODE;
-       e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_reg);
-
-       /* Perform software reset on the PHY */
-       e1000_phy_reset(hw);
-
-       /* Have to setup TX_CLK and TX_CRS after software reset */
-       e1000_phy_reset_clk_and_crs(adapter);
-
-       e1000_write_phy_reg(hw, PHY_CTRL, 0x8100);
-
-       /* Wait for reset to complete. */
-       udelay(500);
-
-       /* Have to setup TX_CLK and TX_CRS after software reset */
-       e1000_phy_reset_clk_and_crs(adapter);
-
-       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
-       e1000_phy_disable_receiver(adapter);
-
-       /* Set the loopback bit in the PHY control register. */
-       e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-       phy_reg |= MII_CR_LOOPBACK;
-       e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
-
-       /* Setup TX_CLK and TX_CRS one more time. */
-       e1000_phy_reset_clk_and_crs(adapter);
-
-       /* Check Phy Configuration */
-       e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-       if (phy_reg != 0x4100)
-                return 9;
-
-       e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
-       if (phy_reg != 0x0070)
-               return 10;
-
-       e1000_read_phy_reg(hw, 29, &phy_reg);
-       if (phy_reg != 0x001A)
-               return 11;
-
-       return 0;
-}
-
-static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_reg = 0;
-       u32 stat_reg = 0;
-
-       hw->autoneg = false;
-
-       if (hw->phy_type == e1000_phy_m88) {
-               /* Auto-MDI/MDIX Off */
-               e1000_write_phy_reg(hw,
-                                   M88E1000_PHY_SPEC_CTRL, 0x0808);
-               /* reset to update Auto-MDI/MDIX */
-               e1000_write_phy_reg(hw, PHY_CTRL, 0x9140);
-               /* autoneg off */
-               e1000_write_phy_reg(hw, PHY_CTRL, 0x8140);
-       }
-
-       ctrl_reg = er32(CTRL);
-
-       /* force 1000, set loopback */
-       e1000_write_phy_reg(hw, PHY_CTRL, 0x4140);
-
-       /* Now set up the MAC to the same speed/duplex as the PHY. */
-       ctrl_reg = er32(CTRL);
-       ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
-       ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
-                       E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
-                       E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
-                       E1000_CTRL_FD);  /* Force Duplex to FULL */
-
-       if (hw->media_type == e1000_media_type_copper &&
-          hw->phy_type == e1000_phy_m88)
-               ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
-       else {
-               /* Set the ILOS bit on the fiber Nic is half
-                * duplex link is detected. */
-               stat_reg = er32(STATUS);
-               if ((stat_reg & E1000_STATUS_FD) == 0)
-                       ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
-       }
-
-       ew32(CTRL, ctrl_reg);
-
-       /* Disable the receiver on the PHY so when a cable is plugged in, the
-        * PHY does not begin to autoneg when a cable is reconnected to the NIC.
-        */
-       if (hw->phy_type == e1000_phy_m88)
-               e1000_phy_disable_receiver(adapter);
-
-       udelay(500);
-
-       return 0;
-}
-
-static int e1000_set_phy_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 phy_reg = 0;
-       u16 count = 0;
-
-       switch (hw->mac_type) {
-       case e1000_82543:
-               if (hw->media_type == e1000_media_type_copper) {
-                       /* Attempt to setup Loopback mode on Non-integrated PHY.
-                        * Some PHY registers get corrupted at random, so
-                        * attempt this 10 times.
-                        */
-                       while (e1000_nonintegrated_phy_loopback(adapter) &&
-                             count++ < 10);
-                       if (count < 11)
-                               return 0;
-               }
-               break;
-
-       case e1000_82544:
-       case e1000_82540:
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-       case e1000_82541:
-       case e1000_82541_rev_2:
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               return e1000_integrated_phy_loopback(adapter);
-               break;
-       default:
-               /* Default PHY loopback work is to read the MII
-                * control register and assert bit 14 (loopback mode).
-                */
-               e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-               phy_reg |= MII_CR_LOOPBACK;
-               e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
-               return 0;
-               break;
-       }
-
-       return 8;
-}
-
-static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       if (hw->media_type == e1000_media_type_fiber ||
-           hw->media_type == e1000_media_type_internal_serdes) {
-               switch (hw->mac_type) {
-               case e1000_82545:
-               case e1000_82546:
-               case e1000_82545_rev_3:
-               case e1000_82546_rev_3:
-                       return e1000_set_phy_loopback(adapter);
-                       break;
-               default:
-                       rctl = er32(RCTL);
-                       rctl |= E1000_RCTL_LBM_TCVR;
-                       ew32(RCTL, rctl);
-                       return 0;
-               }
-       } else if (hw->media_type == e1000_media_type_copper)
-               return e1000_set_phy_loopback(adapter);
-
-       return 7;
-}
-
-static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-       u16 phy_reg;
-
-       rctl = er32(RCTL);
-       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
-       ew32(RCTL, rctl);
-
-       switch (hw->mac_type) {
-       case e1000_82545:
-       case e1000_82546:
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-       default:
-               hw->autoneg = true;
-               e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-               if (phy_reg & MII_CR_LOOPBACK) {
-                       phy_reg &= ~MII_CR_LOOPBACK;
-                       e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
-                       e1000_phy_reset(hw);
-               }
-               break;
-       }
-}
-
-static void e1000_create_lbtest_frame(struct sk_buff *skb,
-                                     unsigned int frame_size)
-{
-       memset(skb->data, 0xFF, frame_size);
-       frame_size &= ~1;
-       memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
-       memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
-       memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
-}
-
-static int e1000_check_lbtest_frame(struct sk_buff *skb,
-                                   unsigned int frame_size)
-{
-       frame_size &= ~1;
-       if (*(skb->data + 3) == 0xFF) {
-               if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
-                  (*(skb->data + frame_size / 2 + 12) == 0xAF)) {
-                       return 0;
-               }
-       }
-       return 13;
-}
-
-static int e1000_run_loopback_test(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
-       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       int i, j, k, l, lc, good_cnt, ret_val=0;
-       unsigned long time;
-
-       ew32(RDT, rxdr->count - 1);
-
-       /* Calculate the loop count based on the largest descriptor ring
-        * The idea is to wrap the largest ring a number of times using 64
-        * send/receive pairs during each loop
-        */
-
-       if (rxdr->count <= txdr->count)
-               lc = ((txdr->count / 64) * 2) + 1;
-       else
-               lc = ((rxdr->count / 64) * 2) + 1;
-
-       k = l = 0;
-       for (j = 0; j <= lc; j++) { /* loop count loop */
-               for (i = 0; i < 64; i++) { /* send the packets */
-                       e1000_create_lbtest_frame(txdr->buffer_info[i].skb,
-                                       1024);
-                       dma_sync_single_for_device(&pdev->dev,
-                                                  txdr->buffer_info[k].dma,
-                                                  txdr->buffer_info[k].length,
-                                                  DMA_TO_DEVICE);
-                       if (unlikely(++k == txdr->count)) k = 0;
-               }
-               ew32(TDT, k);
-               E1000_WRITE_FLUSH();
-               msleep(200);
-               time = jiffies; /* set the start time for the receive */
-               good_cnt = 0;
-               do { /* receive the sent packets */
-                       dma_sync_single_for_cpu(&pdev->dev,
-                                               rxdr->buffer_info[l].dma,
-                                               rxdr->buffer_info[l].length,
-                                               DMA_FROM_DEVICE);
-
-                       ret_val = e1000_check_lbtest_frame(
-                                       rxdr->buffer_info[l].skb,
-                                       1024);
-                       if (!ret_val)
-                               good_cnt++;
-                       if (unlikely(++l == rxdr->count)) l = 0;
-                       /* time + 20 msecs (200 msecs on 2.4) is more than
-                        * enough time to complete the receives, if it's
-                        * exceeded, break and error off
-                        */
-               } while (good_cnt < 64 && jiffies < (time + 20));
-               if (good_cnt != 64) {
-                       ret_val = 13; /* ret_val is the same as mis-compare */
-                       break;
-               }
-               if (jiffies >= (time + 2)) {
-                       ret_val = 14; /* error code for time out error */
-                       break;
-               }
-       } /* end loop count loop */
-       return ret_val;
-}
-
-static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
-{
-       *data = e1000_setup_desc_rings(adapter);
-       if (*data)
-               goto out;
-       *data = e1000_setup_loopback_test(adapter);
-       if (*data)
-               goto err_loopback;
-       *data = e1000_run_loopback_test(adapter);
-       e1000_loopback_cleanup(adapter);
-
-err_loopback:
-       e1000_free_desc_rings(adapter);
-out:
-       return *data;
-}
-
-static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       *data = 0;
-       if (hw->media_type == e1000_media_type_internal_serdes) {
-               int i = 0;
-               hw->serdes_has_link = false;
-
-               /* On some blade server designs, link establishment
-                * could take as long as 2-3 minutes */
-               do {
-                       e1000_check_for_link(hw);
-                       if (hw->serdes_has_link)
-                               return *data;
-                       msleep(20);
-               } while (i++ < 3750);
-
-               *data = 1;
-       } else {
-               e1000_check_for_link(hw);
-               if (hw->autoneg)  /* if auto_neg is set wait for it */
-                       msleep(4000);
-
-               if (!(er32(STATUS) & E1000_STATUS_LU)) {
-                       *data = 1;
-               }
-       }
-       return *data;
-}
-
-static int e1000_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return E1000_TEST_LEN;
-       case ETH_SS_STATS:
-               return E1000_STATS_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void e1000_diag_test(struct net_device *netdev,
-                           struct ethtool_test *eth_test, u64 *data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       bool if_running = netif_running(netdev);
-
-       set_bit(__E1000_TESTING, &adapter->flags);
-       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
-               /* Offline tests */
-
-               /* save speed, duplex, autoneg settings */
-               u16 autoneg_advertised = hw->autoneg_advertised;
-               u8 forced_speed_duplex = hw->forced_speed_duplex;
-               u8 autoneg = hw->autoneg;
-
-               e_info(hw, "offline testing starting\n");
-
-               /* Link test performed before hardware reset so autoneg doesn't
-                * interfere with test result */
-               if (e1000_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               if (if_running)
-                       /* indicate we're in test mode */
-                       dev_close(netdev);
-               else
-                       e1000_reset(adapter);
-
-               if (e1000_reg_test(adapter, &data[0]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000_reset(adapter);
-               if (e1000_eeprom_test(adapter, &data[1]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000_reset(adapter);
-               if (e1000_intr_test(adapter, &data[2]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000_reset(adapter);
-               /* make sure the phy is powered up */
-               e1000_power_up_phy(adapter);
-               if (e1000_loopback_test(adapter, &data[3]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* restore speed, duplex, autoneg settings */
-               hw->autoneg_advertised = autoneg_advertised;
-               hw->forced_speed_duplex = forced_speed_duplex;
-               hw->autoneg = autoneg;
-
-               e1000_reset(adapter);
-               clear_bit(__E1000_TESTING, &adapter->flags);
-               if (if_running)
-                       dev_open(netdev);
-       } else {
-               e_info(hw, "online testing starting\n");
-               /* Online tests */
-               if (e1000_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* Online tests aren't run; pass by default */
-               data[0] = 0;
-               data[1] = 0;
-               data[2] = 0;
-               data[3] = 0;
-
-               clear_bit(__E1000_TESTING, &adapter->flags);
-       }
-       msleep_interruptible(4 * 1000);
-}
-
-static int e1000_wol_exclusion(struct e1000_adapter *adapter,
-                              struct ethtool_wolinfo *wol)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int retval = 1; /* fail by default */
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82542:
-       case E1000_DEV_ID_82543GC_FIBER:
-       case E1000_DEV_ID_82543GC_COPPER:
-       case E1000_DEV_ID_82544EI_FIBER:
-       case E1000_DEV_ID_82546EB_QUAD_COPPER:
-       case E1000_DEV_ID_82545EM_FIBER:
-       case E1000_DEV_ID_82545EM_COPPER:
-       case E1000_DEV_ID_82546GB_QUAD_COPPER:
-       case E1000_DEV_ID_82546GB_PCIE:
-               /* these don't support WoL at all */
-               wol->supported = 0;
-               break;
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546GB_FIBER:
-               /* Wake events not supported on port B */
-               if (er32(STATUS) & E1000_STATUS_FUNC_1) {
-                       wol->supported = 0;
-                       break;
-               }
-               /* return success for non excluded adapter ports */
-               retval = 0;
-               break;
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               /* quad port adapters only support WoL on port A */
-               if (!adapter->quad_port_a) {
-                       wol->supported = 0;
-                       break;
-               }
-               /* return success for non excluded adapter ports */
-               retval = 0;
-               break;
-       default:
-               /* dual port cards only support WoL on port A from now on
-                * unless it was enabled in the eeprom for port B
-                * so exclude FUNC_1 ports from having WoL enabled */
-               if (er32(STATUS) & E1000_STATUS_FUNC_1 &&
-                   !adapter->eeprom_wol) {
-                       wol->supported = 0;
-                       break;
-               }
-
-               retval = 0;
-       }
-
-       return retval;
-}
-
-static void e1000_get_wol(struct net_device *netdev,
-                         struct ethtool_wolinfo *wol)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       wol->supported = WAKE_UCAST | WAKE_MCAST |
-                        WAKE_BCAST | WAKE_MAGIC;
-       wol->wolopts = 0;
-
-       /* this function will set ->supported = 0 and return 1 if wol is not
-        * supported by this hardware */
-       if (e1000_wol_exclusion(adapter, wol) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return;
-
-       /* apply any specific unsupported masks here */
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               /* KSP3 does not suppport UCAST wake-ups */
-               wol->supported &= ~WAKE_UCAST;
-
-               if (adapter->wol & E1000_WUFC_EX)
-                       e_err(drv, "Interface does not support directed "
-                             "(unicast) frame wake-up packets\n");
-               break;
-       default:
-               break;
-       }
-
-       if (adapter->wol & E1000_WUFC_EX)
-               wol->wolopts |= WAKE_UCAST;
-       if (adapter->wol & E1000_WUFC_MC)
-               wol->wolopts |= WAKE_MCAST;
-       if (adapter->wol & E1000_WUFC_BC)
-               wol->wolopts |= WAKE_BCAST;
-       if (adapter->wol & E1000_WUFC_MAG)
-               wol->wolopts |= WAKE_MAGIC;
-}
-
-static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
-               return -EOPNOTSUPP;
-
-       if (e1000_wol_exclusion(adapter, wol) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return wol->wolopts ? -EOPNOTSUPP : 0;
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               if (wol->wolopts & WAKE_UCAST) {
-                       e_err(drv, "Interface does not support directed "
-                             "(unicast) frame wake-up packets\n");
-                       return -EOPNOTSUPP;
-               }
-               break;
-       default:
-               break;
-       }
-
-       /* these settings will always override what we currently have */
-       adapter->wol = 0;
-
-       if (wol->wolopts & WAKE_UCAST)
-               adapter->wol |= E1000_WUFC_EX;
-       if (wol->wolopts & WAKE_MCAST)
-               adapter->wol |= E1000_WUFC_MC;
-       if (wol->wolopts & WAKE_BCAST)
-               adapter->wol |= E1000_WUFC_BC;
-       if (wol->wolopts & WAKE_MAGIC)
-               adapter->wol |= E1000_WUFC_MAG;
-
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       return 0;
-}
-
-static int e1000_set_phys_id(struct net_device *netdev,
-                            enum ethtool_phys_id_state state)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       switch (state) {
-       case ETHTOOL_ID_ACTIVE:
-               e1000_setup_led(hw);
-               return 2;
-
-       case ETHTOOL_ID_ON:
-               e1000_led_on(hw);
-               break;
-
-       case ETHTOOL_ID_OFF:
-               e1000_led_off(hw);
-               break;
-
-       case ETHTOOL_ID_INACTIVE:
-               e1000_cleanup_led(hw);
-       }
-
-       return 0;
-}
-
-static int e1000_get_coalesce(struct net_device *netdev,
-                             struct ethtool_coalesce *ec)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (adapter->hw.mac_type < e1000_82545)
-               return -EOPNOTSUPP;
-
-       if (adapter->itr_setting <= 4)
-               ec->rx_coalesce_usecs = adapter->itr_setting;
-       else
-               ec->rx_coalesce_usecs = 1000000 / adapter->itr_setting;
-
-       return 0;
-}
-
-static int e1000_set_coalesce(struct net_device *netdev,
-                             struct ethtool_coalesce *ec)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (hw->mac_type < e1000_82545)
-               return -EOPNOTSUPP;
-
-       if ((ec->rx_coalesce_usecs > E1000_MAX_ITR_USECS) ||
-           ((ec->rx_coalesce_usecs > 4) &&
-            (ec->rx_coalesce_usecs < E1000_MIN_ITR_USECS)) ||
-           (ec->rx_coalesce_usecs == 2))
-               return -EINVAL;
-
-       if (ec->rx_coalesce_usecs == 4) {
-               adapter->itr = adapter->itr_setting = 4;
-       } else if (ec->rx_coalesce_usecs <= 3) {
-               adapter->itr = 20000;
-               adapter->itr_setting = ec->rx_coalesce_usecs;
-       } else {
-               adapter->itr = (1000000 / ec->rx_coalesce_usecs);
-               adapter->itr_setting = adapter->itr & ~3;
-       }
-
-       if (adapter->itr_setting != 0)
-               ew32(ITR, 1000000000 / (adapter->itr * 256));
-       else
-               ew32(ITR, 0);
-
-       return 0;
-}
-
-static int e1000_nway_reset(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       if (netif_running(netdev))
-               e1000_reinit_locked(adapter);
-       return 0;
-}
-
-static void e1000_get_ethtool_stats(struct net_device *netdev,
-                                   struct ethtool_stats *stats, u64 *data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       int i;
-       char *p = NULL;
-
-       e1000_update_stats(adapter);
-       for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
-               switch (e1000_gstrings_stats[i].type) {
-               case NETDEV_STATS:
-                       p = (char *) netdev +
-                                       e1000_gstrings_stats[i].stat_offset;
-                       break;
-               case E1000_STATS:
-                       p = (char *) adapter +
-                                       e1000_gstrings_stats[i].stat_offset;
-                       break;
-               }
-
-               data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
-                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-       }
-/*     BUG_ON(i != E1000_STATS_LEN); */
-}
-
-static void e1000_get_strings(struct net_device *netdev, u32 stringset,
-                             u8 *data)
-{
-       u8 *p = data;
-       int i;
-
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *e1000_gstrings_test,
-                       sizeof(e1000_gstrings_test));
-               break;
-       case ETH_SS_STATS:
-               for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, e1000_gstrings_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-/*             BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */
-               break;
-       }
-}
-
-static const struct ethtool_ops e1000_ethtool_ops = {
-       .get_settings           = e1000_get_settings,
-       .set_settings           = e1000_set_settings,
-       .get_drvinfo            = e1000_get_drvinfo,
-       .get_regs_len           = e1000_get_regs_len,
-       .get_regs               = e1000_get_regs,
-       .get_wol                = e1000_get_wol,
-       .set_wol                = e1000_set_wol,
-       .get_msglevel           = e1000_get_msglevel,
-       .set_msglevel           = e1000_set_msglevel,
-       .nway_reset             = e1000_nway_reset,
-       .get_link               = e1000_get_link,
-       .get_eeprom_len         = e1000_get_eeprom_len,
-       .get_eeprom             = e1000_get_eeprom,
-       .set_eeprom             = e1000_set_eeprom,
-       .get_ringparam          = e1000_get_ringparam,
-       .set_ringparam          = e1000_set_ringparam,
-       .get_pauseparam         = e1000_get_pauseparam,
-       .set_pauseparam         = e1000_set_pauseparam,
-       .self_test              = e1000_diag_test,
-       .get_strings            = e1000_get_strings,
-       .set_phys_id            = e1000_set_phys_id,
-       .get_ethtool_stats      = e1000_get_ethtool_stats,
-       .get_sset_count         = e1000_get_sset_count,
-       .get_coalesce           = e1000_get_coalesce,
-       .set_coalesce           = e1000_set_coalesce,
-};
-
-void e1000_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
-}
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
deleted file mode 100644 (file)
index 8545c7a..0000000
+++ /dev/null
@@ -1,5824 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 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
-
- */
-
-/* e1000_hw.c
- * Shared functions for accessing and configuring the MAC
- */
-
-#include "e1000.h"
-
-static s32 e1000_check_downshift(struct e1000_hw *hw);
-static s32 e1000_check_polarity(struct e1000_hw *hw,
-                               e1000_rev_polarity *polarity);
-static void e1000_clear_hw_cntrs(struct e1000_hw *hw);
-static void e1000_clear_vfta(struct e1000_hw *hw);
-static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw,
-                                             bool link_up);
-static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw);
-static s32 e1000_detect_gig_phy(struct e1000_hw *hw);
-static s32 e1000_get_auto_rd_done(struct e1000_hw *hw);
-static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
-                                 u16 *max_length);
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
-static s32 e1000_id_led_init(struct e1000_hw *hw);
-static void e1000_init_rx_addrs(struct e1000_hw *hw);
-static s32 e1000_phy_igp_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info);
-static s32 e1000_phy_m88_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info);
-static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active);
-static s32 e1000_wait_autoneg(struct e1000_hw *hw);
-static void e1000_write_reg_io(struct e1000_hw *hw, u32 offset, u32 value);
-static s32 e1000_set_phy_type(struct e1000_hw *hw);
-static void e1000_phy_init_script(struct e1000_hw *hw);
-static s32 e1000_setup_copper_link(struct e1000_hw *hw);
-static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw);
-static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw);
-static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
-static s32 e1000_config_mac_to_phy(struct e1000_hw *hw);
-static void e1000_raise_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
-static void e1000_lower_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
-static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data, u16 count);
-static u16 e1000_shift_in_mdi_bits(struct e1000_hw *hw);
-static s32 e1000_phy_reset_dsp(struct e1000_hw *hw);
-static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset,
-                                 u16 words, u16 *data);
-static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw, u16 offset,
-                                       u16 words, u16 *data);
-static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw);
-static void e1000_raise_ee_clk(struct e1000_hw *hw, u32 *eecd);
-static void e1000_lower_ee_clk(struct e1000_hw *hw, u32 *eecd);
-static void e1000_shift_out_ee_bits(struct e1000_hw *hw, u16 data, u16 count);
-static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
-                                 u16 phy_data);
-static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
-                                u16 *phy_data);
-static u16 e1000_shift_in_ee_bits(struct e1000_hw *hw, u16 count);
-static s32 e1000_acquire_eeprom(struct e1000_hw *hw);
-static void e1000_release_eeprom(struct e1000_hw *hw);
-static void e1000_standby_eeprom(struct e1000_hw *hw);
-static s32 e1000_set_vco_speed(struct e1000_hw *hw);
-static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw);
-static s32 e1000_set_phy_mode(struct e1000_hw *hw);
-static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
-                               u16 *data);
-static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
-                                u16 *data);
-
-/* IGP cable length table */
-static const
-u16 e1000_igp_cable_length_table[IGP01E1000_AGC_LENGTH_TABLE_SIZE] = {
-       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
-};
-
-static DEFINE_SPINLOCK(e1000_eeprom_lock);
-
-/**
- * e1000_set_phy_type - Set the phy type member in the hw struct.
- * @hw: Struct containing variables accessed by shared code
- */
-static s32 e1000_set_phy_type(struct e1000_hw *hw)
-{
-       e_dbg("e1000_set_phy_type");
-
-       if (hw->mac_type == e1000_undefined)
-               return -E1000_ERR_PHY_TYPE;
-
-       switch (hw->phy_id) {
-       case M88E1000_E_PHY_ID:
-       case M88E1000_I_PHY_ID:
-       case M88E1011_I_PHY_ID:
-       case M88E1111_I_PHY_ID:
-       case M88E1118_E_PHY_ID:
-               hw->phy_type = e1000_phy_m88;
-               break;
-       case IGP01E1000_I_PHY_ID:
-               if (hw->mac_type == e1000_82541 ||
-                   hw->mac_type == e1000_82541_rev_2 ||
-                   hw->mac_type == e1000_82547 ||
-                   hw->mac_type == e1000_82547_rev_2)
-                       hw->phy_type = e1000_phy_igp;
-               break;
-       case RTL8211B_PHY_ID:
-               hw->phy_type = e1000_phy_8211;
-               break;
-       case RTL8201N_PHY_ID:
-               hw->phy_type = e1000_phy_8201;
-               break;
-       default:
-               /* Should never have loaded on this device */
-               hw->phy_type = e1000_phy_undefined;
-               return -E1000_ERR_PHY_TYPE;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_phy_init_script - IGP phy init script - initializes the GbE PHY
- * @hw: Struct containing variables accessed by shared code
- */
-static void e1000_phy_init_script(struct e1000_hw *hw)
-{
-       u32 ret_val;
-       u16 phy_saved_data;
-
-       e_dbg("e1000_phy_init_script");
-
-       if (hw->phy_init_script) {
-               msleep(20);
-
-               /* Save off the current value of register 0x2F5B to be restored at
-                * the end of this routine. */
-               ret_val = e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
-
-               /* Disabled the PHY transmitter */
-               e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
-               msleep(20);
-
-               e1000_write_phy_reg(hw, 0x0000, 0x0140);
-               msleep(5);
-
-               switch (hw->mac_type) {
-               case e1000_82541:
-               case e1000_82547:
-                       e1000_write_phy_reg(hw, 0x1F95, 0x0001);
-                       e1000_write_phy_reg(hw, 0x1F71, 0xBD21);
-                       e1000_write_phy_reg(hw, 0x1F79, 0x0018);
-                       e1000_write_phy_reg(hw, 0x1F30, 0x1600);
-                       e1000_write_phy_reg(hw, 0x1F31, 0x0014);
-                       e1000_write_phy_reg(hw, 0x1F32, 0x161C);
-                       e1000_write_phy_reg(hw, 0x1F94, 0x0003);
-                       e1000_write_phy_reg(hw, 0x1F96, 0x003F);
-                       e1000_write_phy_reg(hw, 0x2010, 0x0008);
-                       break;
-
-               case e1000_82541_rev_2:
-               case e1000_82547_rev_2:
-                       e1000_write_phy_reg(hw, 0x1F73, 0x0099);
-                       break;
-               default:
-                       break;
-               }
-
-               e1000_write_phy_reg(hw, 0x0000, 0x3300);
-               msleep(20);
-
-               /* Now enable the transmitter */
-               e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
-
-               if (hw->mac_type == e1000_82547) {
-                       u16 fused, fine, coarse;
-
-                       /* Move to analog registers page */
-                       e1000_read_phy_reg(hw,
-                                          IGP01E1000_ANALOG_SPARE_FUSE_STATUS,
-                                          &fused);
-
-                       if (!(fused & IGP01E1000_ANALOG_SPARE_FUSE_ENABLED)) {
-                               e1000_read_phy_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);
-
-                               e1000_write_phy_reg(hw,
-                                                   IGP01E1000_ANALOG_FUSE_CONTROL,
-                                                   fused);
-                               e1000_write_phy_reg(hw,
-                                                   IGP01E1000_ANALOG_FUSE_BYPASS,
-                                                   IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL);
-                       }
-               }
-       }
-}
-
-/**
- * e1000_set_mac_type - Set the mac type member in the hw struct.
- * @hw: Struct containing variables accessed by shared code
- */
-s32 e1000_set_mac_type(struct e1000_hw *hw)
-{
-       e_dbg("e1000_set_mac_type");
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82542:
-               switch (hw->revision_id) {
-               case E1000_82542_2_0_REV_ID:
-                       hw->mac_type = e1000_82542_rev2_0;
-                       break;
-               case E1000_82542_2_1_REV_ID:
-                       hw->mac_type = e1000_82542_rev2_1;
-                       break;
-               default:
-                       /* Invalid 82542 revision ID */
-                       return -E1000_ERR_MAC_TYPE;
-               }
-               break;
-       case E1000_DEV_ID_82543GC_FIBER:
-       case E1000_DEV_ID_82543GC_COPPER:
-               hw->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:
-               hw->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:
-               hw->mac_type = e1000_82540;
-               break;
-       case E1000_DEV_ID_82545EM_COPPER:
-       case E1000_DEV_ID_82545EM_FIBER:
-               hw->mac_type = e1000_82545;
-               break;
-       case E1000_DEV_ID_82545GM_COPPER:
-       case E1000_DEV_ID_82545GM_FIBER:
-       case E1000_DEV_ID_82545GM_SERDES:
-               hw->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:
-               hw->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:
-               hw->mac_type = e1000_82546_rev_3;
-               break;
-       case E1000_DEV_ID_82541EI:
-       case E1000_DEV_ID_82541EI_MOBILE:
-       case E1000_DEV_ID_82541ER_LOM:
-               hw->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:
-               hw->mac_type = e1000_82541_rev_2;
-               break;
-       case E1000_DEV_ID_82547EI:
-       case E1000_DEV_ID_82547EI_MOBILE:
-               hw->mac_type = e1000_82547;
-               break;
-       case E1000_DEV_ID_82547GI:
-               hw->mac_type = e1000_82547_rev_2;
-               break;
-       case E1000_DEV_ID_INTEL_CE4100_GBE:
-               hw->mac_type = e1000_ce4100;
-               break;
-       default:
-               /* Should never have loaded on this device */
-               return -E1000_ERR_MAC_TYPE;
-       }
-
-       switch (hw->mac_type) {
-       case e1000_82541:
-       case e1000_82547:
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               hw->asf_firmware_present = true;
-               break;
-       default:
-               break;
-       }
-
-       /* The 82543 chip does not count tx_carrier_errors properly in
-        * FD mode
-        */
-       if (hw->mac_type == e1000_82543)
-               hw->bad_tx_carr_stats_fd = true;
-
-       if (hw->mac_type > e1000_82544)
-               hw->has_smbus = true;
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_set_media_type - Set media type and TBI compatibility.
- * @hw: Struct containing variables accessed by shared code
- */
-void e1000_set_media_type(struct e1000_hw *hw)
-{
-       u32 status;
-
-       e_dbg("e1000_set_media_type");
-
-       if (hw->mac_type != e1000_82543) {
-               /* tbi_compatibility is only valid on 82543 */
-               hw->tbi_compatibility_en = false;
-       }
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82545GM_SERDES:
-       case E1000_DEV_ID_82546GB_SERDES:
-               hw->media_type = e1000_media_type_internal_serdes;
-               break;
-       default:
-               switch (hw->mac_type) {
-               case e1000_82542_rev2_0:
-               case e1000_82542_rev2_1:
-                       hw->media_type = e1000_media_type_fiber;
-                       break;
-               case e1000_ce4100:
-                       hw->media_type = e1000_media_type_copper;
-                       break;
-               default:
-                       status = er32(STATUS);
-                       if (status & E1000_STATUS_TBIMODE) {
-                               hw->media_type = e1000_media_type_fiber;
-                               /* tbi_compatibility not valid on fiber */
-                               hw->tbi_compatibility_en = false;
-                       } else {
-                               hw->media_type = e1000_media_type_copper;
-                       }
-                       break;
-               }
-       }
-}
-
-/**
- * e1000_reset_hw: reset the hardware completely
- * @hw: Struct containing variables accessed by shared code
- *
- * Reset the transmit and receive units; mask and clear all interrupts.
- */
-s32 e1000_reset_hw(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       u32 ctrl_ext;
-       u32 icr;
-       u32 manc;
-       u32 led_ctrl;
-       s32 ret_val;
-
-       e_dbg("e1000_reset_hw");
-
-       /* For 82542 (rev 2.0), disable MWI before issuing a device reset */
-       if (hw->mac_type == e1000_82542_rev2_0) {
-               e_dbg("Disabling MWI on 82542 rev 2.0\n");
-               e1000_pci_clear_mwi(hw);
-       }
-
-       /* Clear interrupt mask to stop board from generating interrupts */
-       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);
-       E1000_WRITE_FLUSH();
-
-       /* The tbi_compatibility_on Flag must be cleared when Rctl is cleared. */
-       hw->tbi_compatibility_on = false;
-
-       /* Delay to allow any outstanding PCI transactions to complete before
-        * resetting the device
-        */
-       msleep(10);
-
-       ctrl = er32(CTRL);
-
-       /* Must reset the PHY before resetting the MAC */
-       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-               ew32(CTRL, (ctrl | E1000_CTRL_PHY_RST));
-               E1000_WRITE_FLUSH();
-               msleep(5);
-       }
-
-       /* Issue a global reset to the MAC.  This will reset the chip's
-        * transmit, receive, DMA, and link units.  It will not effect
-        * the current PCI configuration.  The global reset bit is self-
-        * clearing, and should clear within a microsecond.
-        */
-       e_dbg("Issuing a global reset to MAC\n");
-
-       switch (hw->mac_type) {
-       case e1000_82544:
-       case e1000_82540:
-       case e1000_82545:
-       case e1000_82546:
-       case e1000_82541:
-       case e1000_82541_rev_2:
-               /* These controllers can't ack the 64-bit write when issuing the
-                * reset, so use IO-mapping as a workaround to issue the reset */
-               E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST));
-               break;
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-               /* Reset is performed on a shadow of the control register */
-               ew32(CTRL_DUP, (ctrl | E1000_CTRL_RST));
-               break;
-       case e1000_ce4100:
-       default:
-               ew32(CTRL, (ctrl | E1000_CTRL_RST));
-               break;
-       }
-
-       /* After MAC reset, force reload of EEPROM to restore power-on settings to
-        * device.  Later controllers reload the EEPROM automatically, so just wait
-        * for reload to complete.
-        */
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-       case e1000_82544:
-               /* Wait for reset to complete */
-               udelay(10);
-               ctrl_ext = er32(CTRL_EXT);
-               ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-               ew32(CTRL_EXT, ctrl_ext);
-               E1000_WRITE_FLUSH();
-               /* Wait for EEPROM reload */
-               msleep(2);
-               break;
-       case e1000_82541:
-       case e1000_82541_rev_2:
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               /* Wait for EEPROM reload */
-               msleep(20);
-               break;
-       default:
-               /* Auto read done will delay 5ms or poll based on mac type */
-               ret_val = e1000_get_auto_rd_done(hw);
-               if (ret_val)
-                       return ret_val;
-               break;
-       }
-
-       /* Disable HW ARPs on ASF enabled adapters */
-       if (hw->mac_type >= e1000_82540) {
-               manc = er32(MANC);
-               manc &= ~(E1000_MANC_ARP_EN);
-               ew32(MANC, manc);
-       }
-
-       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-               e1000_phy_init_script(hw);
-
-               /* Configure activity LED after PHY reset */
-               led_ctrl = er32(LEDCTL);
-               led_ctrl &= IGP_ACTIVITY_LED_MASK;
-               led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-               ew32(LEDCTL, led_ctrl);
-       }
-
-       /* Clear interrupt mask to stop board from generating interrupts */
-       e_dbg("Masking off all interrupts\n");
-       ew32(IMC, 0xffffffff);
-
-       /* Clear any pending interrupt events. */
-       icr = er32(ICR);
-
-       /* If MWI was previously enabled, reenable it. */
-       if (hw->mac_type == e1000_82542_rev2_0) {
-               if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
-                       e1000_pci_set_mwi(hw);
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_init_hw: Performs basic configuration of the adapter.
- * @hw: Struct containing variables accessed by shared code
- *
- * Assumes that the controller has previously been reset and is in a
- * post-reset uninitialized state. Initializes the receive address registers,
- * multicast table, and VLAN filter table. Calls routines to setup link
- * configuration and flow control settings. Clears all on-chip counters. Leaves
- * the transmit and receive units disabled and uninitialized.
- */
-s32 e1000_init_hw(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       u32 i;
-       s32 ret_val;
-       u32 mta_size;
-       u32 ctrl_ext;
-
-       e_dbg("e1000_init_hw");
-
-       /* Initialize Identification LED */
-       ret_val = e1000_id_led_init(hw);
-       if (ret_val) {
-               e_dbg("Error Initializing Identification LED\n");
-               return ret_val;
-       }
-
-       /* Set the media type and TBI compatibility */
-       e1000_set_media_type(hw);
-
-       /* Disabling VLAN filtering. */
-       e_dbg("Initializing the IEEE VLAN\n");
-       if (hw->mac_type < e1000_82545_rev_3)
-               ew32(VET, 0);
-       e1000_clear_vfta(hw);
-
-       /* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
-       if (hw->mac_type == e1000_82542_rev2_0) {
-               e_dbg("Disabling MWI on 82542 rev 2.0\n");
-               e1000_pci_clear_mwi(hw);
-               ew32(RCTL, E1000_RCTL_RST);
-               E1000_WRITE_FLUSH();
-               msleep(5);
-       }
-
-       /* Setup the receive address. This involves initializing all of the Receive
-        * Address Registers (RARs 0 - 15).
-        */
-       e1000_init_rx_addrs(hw);
-
-       /* For 82542 (rev 2.0), take the receiver out of reset and enable MWI */
-       if (hw->mac_type == e1000_82542_rev2_0) {
-               ew32(RCTL, 0);
-               E1000_WRITE_FLUSH();
-               msleep(1);
-               if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
-                       e1000_pci_set_mwi(hw);
-       }
-
-       /* Zero out the Multicast HASH table */
-       e_dbg("Zeroing the MTA\n");
-       mta_size = E1000_MC_TBL_SIZE;
-       for (i = 0; i < mta_size; i++) {
-               E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);
-               /* use write flush to prevent Memory Write Block (MWB) from
-                * occurring when accessing our register space */
-               E1000_WRITE_FLUSH();
-       }
-
-       /* 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.  Valid only on
-        * 82542 and 82543 silicon.
-        */
-       if (hw->dma_fairness && hw->mac_type <= e1000_82543) {
-               ctrl = er32(CTRL);
-               ew32(CTRL, ctrl | E1000_CTRL_PRIOR);
-       }
-
-       switch (hw->mac_type) {
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-               break;
-       default:
-               /* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */
-               if (hw->bus_type == e1000_bus_type_pcix
-                   && e1000_pcix_get_mmrbc(hw) > 2048)
-                       e1000_pcix_set_mmrbc(hw, 2048);
-               break;
-       }
-
-       /* Call a subroutine to configure the link and setup flow control. */
-       ret_val = e1000_setup_link(hw);
-
-       /* Set the transmit descriptor write-back policy */
-       if (hw->mac_type > e1000_82544) {
-               ctrl = er32(TXDCTL);
-               ctrl =
-                   (ctrl & ~E1000_TXDCTL_WTHRESH) |
-                   E1000_TXDCTL_FULL_TX_DESC_WB;
-               ew32(TXDCTL, ctrl);
-       }
-
-       /* 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(hw);
-
-       if (hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER ||
-           hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3) {
-               ctrl_ext = er32(CTRL_EXT);
-               /* Relaxed ordering must be disabled to avoid a parity
-                * error crash in a PCI slot. */
-               ctrl_ext |= E1000_CTRL_EXT_RO_DIS;
-               ew32(CTRL_EXT, ctrl_ext);
-       }
-
-       return ret_val;
-}
-
-/**
- * e1000_adjust_serdes_amplitude - Adjust SERDES output amplitude based on EEPROM setting.
- * @hw: Struct containing variables accessed by shared code.
- */
-static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
-{
-       u16 eeprom_data;
-       s32 ret_val;
-
-       e_dbg("e1000_adjust_serdes_amplitude");
-
-       if (hw->media_type != e1000_media_type_internal_serdes)
-               return E1000_SUCCESS;
-
-       switch (hw->mac_type) {
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-               break;
-       default:
-               return E1000_SUCCESS;
-       }
-
-       ret_val = e1000_read_eeprom(hw, EEPROM_SERDES_AMPLITUDE, 1,
-                                   &eeprom_data);
-       if (ret_val) {
-               return ret_val;
-       }
-
-       if (eeprom_data != EEPROM_RESERVED_WORD) {
-               /* Adjust SERDES output amplitude only. */
-               eeprom_data &= EEPROM_SERDES_AMPLITUDE_MASK;
-               ret_val =
-                   e1000_write_phy_reg(hw, M88E1000_PHY_EXT_CTRL, eeprom_data);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_setup_link - Configures flow control and link settings.
- * @hw: Struct containing variables accessed by shared code
- *
- * Determines which flow control settings to use. Calls the appropriate media-
- * specific link configuration function. Configures the flow control settings.
- * 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(struct e1000_hw *hw)
-{
-       u32 ctrl_ext;
-       s32 ret_val;
-       u16 eeprom_data;
-
-       e_dbg("e1000_setup_link");
-
-       /* 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.
-        */
-       if (hw->fc == E1000_FC_DEFAULT) {
-               ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG,
-                                           1, &eeprom_data);
-               if (ret_val) {
-                       e_dbg("EEPROM Read Error\n");
-                       return -E1000_ERR_EEPROM;
-               }
-               if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 0)
-                       hw->fc = E1000_FC_NONE;
-               else if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) ==
-                        EEPROM_WORD0F_ASM_DIR)
-                       hw->fc = E1000_FC_TX_PAUSE;
-               else
-                       hw->fc = E1000_FC_FULL;
-       }
-
-       /* We want to save off the original Flow Control configuration just
-        * in case we get disconnected and then reconnected into a different
-        * hub or switch with different Flow Control capabilities.
-        */
-       if (hw->mac_type == e1000_82542_rev2_0)
-               hw->fc &= (~E1000_FC_TX_PAUSE);
-
-       if ((hw->mac_type < e1000_82543) && (hw->report_tx_early == 1))
-               hw->fc &= (~E1000_FC_RX_PAUSE);
-
-       hw->original_fc = hw->fc;
-
-       e_dbg("After fix-ups FlowControl is now = %x\n", hw->fc);
-
-       /* Take the 4 bits from EEPROM word 0x0F 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 e1000_setup_pcs_link()
-        * or e1000_phy_setup() is called.
-        */
-       if (hw->mac_type == e1000_82543) {
-               ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG,
-                                           1, &eeprom_data);
-               if (ret_val) {
-                       e_dbg("EEPROM Read Error\n");
-                       return -E1000_ERR_EEPROM;
-               }
-               ctrl_ext = ((eeprom_data & EEPROM_WORD0F_SWPDIO_EXT) <<
-                           SWDPIO__EXT_SHIFT);
-               ew32(CTRL_EXT, ctrl_ext);
-       }
-
-       /* Call the necessary subroutine to configure the link. */
-       ret_val = (hw->media_type == e1000_media_type_copper) ?
-           e1000_setup_copper_link(hw) : e1000_setup_fiber_serdes_link(hw);
-
-       /* 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);
-
-       /* 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 in not enabled, then these
-        * registers will be set to 0.
-        */
-       if (!(hw->fc & E1000_FC_TX_PAUSE)) {
-               ew32(FCRTL, 0);
-               ew32(FCRTH, 0);
-       } else {
-               /* We need to set up the Receive Threshold high and low water marks
-                * as well as (optionally) enabling the transmission of XON frames.
-                */
-               if (hw->fc_send_xon) {
-                       ew32(FCRTL, (hw->fc_low_water | E1000_FCRTL_XONE));
-                       ew32(FCRTH, hw->fc_high_water);
-               } else {
-                       ew32(FCRTL, hw->fc_low_water);
-                       ew32(FCRTH, hw->fc_high_water);
-               }
-       }
-       return ret_val;
-}
-
-/**
- * e1000_setup_fiber_serdes_link - prepare fiber or serdes link
- * @hw: Struct containing variables accessed by shared code
- *
- * Manipulates Physical Coding Sublayer functions in order to configure
- * link. Assumes the hardware has been previously reset and the transmitter
- * and receiver are not enabled.
- */
-static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       u32 status;
-       u32 txcw = 0;
-       u32 i;
-       u32 signal = 0;
-       s32 ret_val;
-
-       e_dbg("e1000_setup_fiber_serdes_link");
-
-       /* On adapters with a MAC newer than 82544, SWDP 1 will be
-        * set when the optics detect a signal. On older adapters, it will be
-        * cleared when there is a signal.  This applies to fiber media only.
-        * If we're on serdes media, adjust the output amplitude to value
-        * set in the EEPROM.
-        */
-       ctrl = er32(CTRL);
-       if (hw->media_type == e1000_media_type_fiber)
-               signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
-
-       ret_val = e1000_adjust_serdes_amplitude(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* Take the link out of reset */
-       ctrl &= ~(E1000_CTRL_LRST);
-
-       /* Adjust VCO speed to improve BER performance */
-       ret_val = e1000_set_vco_speed(hw);
-       if (ret_val)
-               return ret_val;
-
-       e1000_config_collision_dist(hw);
-
-       /* 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 Tranmsit
-        * 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) {
-       case E1000_FC_NONE:
-               /* Flow control is 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");
-               return -E1000_ERR_CONFIG;
-               break;
-       }
-
-       /* 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(TXCW, txcw);
-       ew32(CTRL, ctrl);
-       E1000_WRITE_FLUSH();
-
-       hw->txcw = txcw;
-       msleep(1);
-
-       /* If we have a signal (the cable is plugged in) 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 internal serdes, we just assume a signal is present, then poll.
-        */
-       if (hw->media_type == e1000_media_type_internal_serdes ||
-           (er32(CTRL) & E1000_CTRL_SWDPIN1) == signal) {
-               e_dbg("Looking for Link\n");
-               for (i = 0; i < (LINK_UP_TIMEOUT / 10); i++) {
-                       msleep(10);
-                       status = er32(STATUS);
-                       if (status & E1000_STATUS_LU)
-                               break;
-               }
-               if (i == (LINK_UP_TIMEOUT / 10)) {
-                       e_dbg("Never got a valid link from auto-neg!!!\n");
-                       hw->autoneg_failed = 1;
-                       /* AutoNeg failed to achieve a link, so we'll call
-                        * e1000_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 = e1000_check_for_link(hw);
-                       if (ret_val) {
-                               e_dbg("Error while checking for link\n");
-                               return ret_val;
-                       }
-                       hw->autoneg_failed = 0;
-               } else {
-                       hw->autoneg_failed = 0;
-                       e_dbg("Valid Link Found\n");
-               }
-       } else {
-               e_dbg("No Signal Detected\n");
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_copper_link_rtl_setup - Copper link setup for e1000_phy_rtl series.
- * @hw: Struct containing variables accessed by shared code
- *
- * Commits changes to PHY configuration by calling e1000_phy_reset().
- */
-static s32 e1000_copper_link_rtl_setup(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       /* SW reset the PHY so all changes take effect */
-       ret_val = e1000_phy_reset(hw);
-       if (ret_val) {
-               e_dbg("Error Resetting the PHY\n");
-               return ret_val;
-       }
-
-       return E1000_SUCCESS;
-}
-
-static s32 gbe_dhg_phy_setup(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u32 ctrl_aux;
-
-       switch (hw->phy_type) {
-       case e1000_phy_8211:
-               ret_val = e1000_copper_link_rtl_setup(hw);
-               if (ret_val) {
-                       e_dbg("e1000_copper_link_rtl_setup failed!\n");
-                       return ret_val;
-               }
-               break;
-       case e1000_phy_8201:
-               /* Set RMII mode */
-               ctrl_aux = er32(CTL_AUX);
-               ctrl_aux |= E1000_CTL_AUX_RMII;
-               ew32(CTL_AUX, ctrl_aux);
-               E1000_WRITE_FLUSH();
-
-               /* Disable the J/K bits required for receive */
-               ctrl_aux = er32(CTL_AUX);
-               ctrl_aux |= 0x4;
-               ctrl_aux &= ~0x2;
-               ew32(CTL_AUX, ctrl_aux);
-               E1000_WRITE_FLUSH();
-               ret_val = e1000_copper_link_rtl_setup(hw);
-
-               if (ret_val) {
-                       e_dbg("e1000_copper_link_rtl_setup failed!\n");
-                       return ret_val;
-               }
-               break;
-       default:
-               e_dbg("Error Resetting the PHY\n");
-               return E1000_ERR_PHY_TYPE;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_copper_link_preconfig - early configuration for copper
- * @hw: Struct containing variables accessed by shared code
- *
- * Make sure we have a valid PHY and change PHY mode before link setup.
- */
-static s32 e1000_copper_link_preconfig(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_copper_link_preconfig");
-
-       ctrl = er32(CTRL);
-       /* 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_SLU;
-               ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-               ew32(CTRL, ctrl);
-       } else {
-               ctrl |=
-                   (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX | E1000_CTRL_SLU);
-               ew32(CTRL, ctrl);
-               ret_val = e1000_phy_hw_reset(hw);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* Make sure we have a valid PHY */
-       ret_val = e1000_detect_gig_phy(hw);
-       if (ret_val) {
-               e_dbg("Error, did not detect valid phy.\n");
-               return ret_val;
-       }
-       e_dbg("Phy ID = %x\n", hw->phy_id);
-
-       /* Set PHY to class A mode (if necessary) */
-       ret_val = e1000_set_phy_mode(hw);
-       if (ret_val)
-               return ret_val;
-
-       if ((hw->mac_type == e1000_82545_rev_3) ||
-           (hw->mac_type == e1000_82546_rev_3)) {
-               ret_val =
-                   e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-               phy_data |= 0x00000008;
-               ret_val =
-                   e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       }
-
-       if (hw->mac_type <= e1000_82543 ||
-           hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547 ||
-           hw->mac_type == e1000_82541_rev_2
-           || hw->mac_type == e1000_82547_rev_2)
-               hw->phy_reset_disable = false;
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_copper_link_igp_setup - Copper link setup for e1000_phy_igp series.
- * @hw: Struct containing variables accessed by shared code
- */
-static s32 e1000_copper_link_igp_setup(struct e1000_hw *hw)
-{
-       u32 led_ctrl;
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_copper_link_igp_setup");
-
-       if (hw->phy_reset_disable)
-               return E1000_SUCCESS;
-
-       ret_val = e1000_phy_reset(hw);
-       if (ret_val) {
-               e_dbg("Error Resetting the PHY\n");
-               return ret_val;
-       }
-
-       /* Wait 15ms for MAC to configure PHY from eeprom settings */
-       msleep(15);
-       /* Configure activity LED after PHY reset */
-       led_ctrl = er32(LEDCTL);
-       led_ctrl &= IGP_ACTIVITY_LED_MASK;
-       led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-       ew32(LEDCTL, led_ctrl);
-
-       /* The NVM settings will configure LPLU in D3 for IGP2 and IGP3 PHYs */
-       if (hw->phy_type == e1000_phy_igp) {
-               /* disable lplu d3 during driver init */
-               ret_val = e1000_set_d3_lplu_state(hw, false);
-               if (ret_val) {
-                       e_dbg("Error Disabling LPLU D3\n");
-                       return ret_val;
-               }
-       }
-
-       /* Configure mdi-mdix settings */
-       ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-               hw->dsp_config_state = e1000_dsp_config_disabled;
-               /* Force MDI for earlier revs of the IGP PHY */
-               phy_data &=
-                   ~(IGP01E1000_PSCR_AUTO_MDIX |
-                     IGP01E1000_PSCR_FORCE_MDI_MDIX);
-               hw->mdix = 1;
-
-       } else {
-               hw->dsp_config_state = e1000_dsp_config_enabled;
-               phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-
-               switch (hw->mdix) {
-               case 1:
-                       phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-                       break;
-               case 2:
-                       phy_data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
-                       break;
-               case 0:
-               default:
-                       phy_data |= IGP01E1000_PSCR_AUTO_MDIX;
-                       break;
-               }
-       }
-       ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       /* set auto-master slave resolution settings */
-       if (hw->autoneg) {
-               e1000_ms_type phy_ms_setting = hw->master_slave;
-
-               if (hw->ffe_config_state == e1000_ffe_config_active)
-                       hw->ffe_config_state = e1000_ffe_config_enabled;
-
-               if (hw->dsp_config_state == e1000_dsp_config_activated)
-                       hw->dsp_config_state = e1000_dsp_config_enabled;
-
-               /* when autonegotiation advertisement is only 1000Mbps then we
-                * should disable SmartSpeed and enable Auto MasterSlave
-                * resolution as hardware default. */
-               if (hw->autoneg_advertised == ADVERTISE_1000_FULL) {
-                       /* Disable SmartSpeed */
-                       ret_val =
-                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                              &phy_data);
-                       if (ret_val)
-                               return ret_val;
-                       phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val =
-                           e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                               phy_data);
-                       if (ret_val)
-                               return ret_val;
-                       /* Set auto Master/Slave resolution process */
-                       ret_val =
-                           e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_data);
-                       if (ret_val)
-                               return ret_val;
-                       phy_data &= ~CR_1000T_MS_ENABLE;
-                       ret_val =
-                           e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data);
-                       if (ret_val)
-                               return ret_val;
-               }
-
-               ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               /* load defaults for future use */
-               hw->original_master_slave = (phy_data & CR_1000T_MS_ENABLE) ?
-                   ((phy_data & CR_1000T_MS_VALUE) ?
-                    e1000_ms_force_master :
-                    e1000_ms_force_slave) : e1000_ms_auto;
-
-               switch (phy_ms_setting) {
-               case e1000_ms_force_master:
-                       phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_force_slave:
-                       phy_data |= CR_1000T_MS_ENABLE;
-                       phy_data &= ~(CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_auto:
-                       phy_data &= ~CR_1000T_MS_ENABLE;
-               default:
-                       break;
-               }
-               ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_copper_link_mgp_setup - Copper link setup for e1000_phy_m88 series.
- * @hw: Struct containing variables accessed by shared code
- */
-static s32 e1000_copper_link_mgp_setup(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_copper_link_mgp_setup");
-
-       if (hw->phy_reset_disable)
-               return E1000_SUCCESS;
-
-       /* Enable CRS on TX. This must be set for half-duplex operation. */
-       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       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 (hw->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 (hw->disable_polarity_correction == 1)
-               phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       if (hw->phy_revision < M88E1011_I_REV_4) {
-               /* Force TX_CLK in the Extended PHY Specific Control Register
-                * to 25MHz clock.
-                */
-               ret_val =
-                   e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                      &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_data |= M88E1000_EPSCR_TX_CLK_25;
-
-               if ((hw->phy_revision == E1000_REVISION_2) &&
-                   (hw->phy_id == M88E1111_I_PHY_ID)) {
-                       /* Vidalia Phy, set the downshift counter to 5x */
-                       phy_data &= ~(M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK);
-                       phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;
-                       ret_val = e1000_write_phy_reg(hw,
-                                                     M88E1000_EXT_PHY_SPEC_CTRL,
-                                                     phy_data);
-                       if (ret_val)
-                               return ret_val;
-               } 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 = e1000_write_phy_reg(hw,
-                                                     M88E1000_EXT_PHY_SPEC_CTRL,
-                                                     phy_data);
-                       if (ret_val)
-                               return ret_val;
-               }
-       }
-
-       /* SW Reset the PHY so all changes take effect */
-       ret_val = e1000_phy_reset(hw);
-       if (ret_val) {
-               e_dbg("Error Resetting the PHY\n");
-               return ret_val;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_copper_link_autoneg - setup auto-neg
- * @hw: Struct containing variables accessed by shared code
- *
- * Setup auto-negotiation and flow control advertisements,
- * and then perform auto-negotiation.
- */
-static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_copper_link_autoneg");
-
-       /* Perform some bounds checking on the hw->autoneg_advertised
-        * parameter.  If this variable is zero, then set it to the default.
-        */
-       hw->autoneg_advertised &= AUTONEG_ADVERTISE_SPEED_DEFAULT;
-
-       /* If autoneg_advertised is zero, we assume it was not defaulted
-        * by the calling code so we set to advertise full capability.
-        */
-       if (hw->autoneg_advertised == 0)
-               hw->autoneg_advertised = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-
-       /* IFE/RTL8201N PHY only supports 10/100 */
-       if (hw->phy_type == e1000_phy_8201)
-               hw->autoneg_advertised &= AUTONEG_ADVERTISE_10_100_ALL;
-
-       e_dbg("Reconfiguring auto-neg advertisement params\n");
-       ret_val = e1000_phy_setup_autoneg(hw);
-       if (ret_val) {
-               e_dbg("Error Setting up Auto-Negotiation\n");
-               return ret_val;
-       }
-       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 = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy_data |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-       ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       /* Does the user want to wait for Auto-Neg to complete here, or
-        * check at a later time (for example, callback routine).
-        */
-       if (hw->wait_autoneg_complete) {
-               ret_val = e1000_wait_autoneg(hw);
-               if (ret_val) {
-                       e_dbg
-                           ("Error while waiting for autoneg to complete\n");
-                       return ret_val;
-               }
-       }
-
-       hw->get_link_status = true;
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_copper_link_postconfig - post link setup
- * @hw: Struct containing variables accessed by shared code
- *
- * Config the MAC and the PHY after link is up.
- *   1) Set up the MAC to the current PHY speed/duplex
- *      if we are on 82543.  If we
- *      are on newer silicon, we only need to configure
- *      collision distance in the Transmit Control Register.
- *   2) Set up flow control on the MAC to that established with
- *      the link partner.
- *   3) Config DSP to improve Gigabit link quality for some PHY revisions.
- */
-static s32 e1000_copper_link_postconfig(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       e_dbg("e1000_copper_link_postconfig");
-
-       if ((hw->mac_type >= e1000_82544) && (hw->mac_type != e1000_ce4100)) {
-               e1000_config_collision_dist(hw);
-       } else {
-               ret_val = e1000_config_mac_to_phy(hw);
-               if (ret_val) {
-                       e_dbg("Error configuring MAC to PHY settings\n");
-                       return ret_val;
-               }
-       }
-       ret_val = e1000_config_fc_after_link_up(hw);
-       if (ret_val) {
-               e_dbg("Error Configuring Flow Control\n");
-               return ret_val;
-       }
-
-       /* Config DSP to improve Giga link quality */
-       if (hw->phy_type == e1000_phy_igp) {
-               ret_val = e1000_config_dsp_after_link_change(hw, true);
-               if (ret_val) {
-                       e_dbg("Error Configuring DSP after link up\n");
-                       return ret_val;
-               }
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_setup_copper_link - phy/speed/duplex setting
- * @hw: Struct containing variables accessed by shared code
- *
- * Detects which PHY is present and sets up the speed and duplex
- */
-static s32 e1000_setup_copper_link(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 i;
-       u16 phy_data;
-
-       e_dbg("e1000_setup_copper_link");
-
-       /* Check if it is a valid PHY and set PHY mode if necessary. */
-       ret_val = e1000_copper_link_preconfig(hw);
-       if (ret_val)
-               return ret_val;
-
-       if (hw->phy_type == e1000_phy_igp) {
-               ret_val = e1000_copper_link_igp_setup(hw);
-               if (ret_val)
-                       return ret_val;
-       } else if (hw->phy_type == e1000_phy_m88) {
-               ret_val = e1000_copper_link_mgp_setup(hw);
-               if (ret_val)
-                       return ret_val;
-       } else {
-               ret_val = gbe_dhg_phy_setup(hw);
-               if (ret_val) {
-                       e_dbg("gbe_dhg_phy_setup failed!\n");
-                       return ret_val;
-               }
-       }
-
-       if (hw->autoneg) {
-               /* Setup autoneg and flow control advertisement
-                * and perform autonegotiation */
-               ret_val = e1000_copper_link_autoneg(hw);
-               if (ret_val)
-                       return ret_val;
-       } else {
-               /* PHY will be set to 10H, 10F, 100H,or 100F
-                * depending on value from forced_speed_duplex. */
-               e_dbg("Forcing speed and duplex\n");
-               ret_val = e1000_phy_force_speed_duplex(hw);
-               if (ret_val) {
-                       e_dbg("Error Forcing Speed and Duplex\n");
-                       return ret_val;
-               }
-       }
-
-       /* Check link status. Wait up to 100 microseconds for link to become
-        * valid.
-        */
-       for (i = 0; i < 10; i++) {
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               if (phy_data & MII_SR_LINK_STATUS) {
-                       /* Config the MAC and PHY after link is up */
-                       ret_val = e1000_copper_link_postconfig(hw);
-                       if (ret_val)
-                               return ret_val;
-
-                       e_dbg("Valid link established!!!\n");
-                       return E1000_SUCCESS;
-               }
-               udelay(10);
-       }
-
-       e_dbg("Unable to establish link!!!\n");
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_phy_setup_autoneg - phy settings
- * @hw: Struct containing variables accessed by shared code
- *
- * Configures PHY autoneg and flow control advertisement settings
- */
-s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 mii_autoneg_adv_reg;
-       u16 mii_1000t_ctrl_reg;
-
-       e_dbg("e1000_phy_setup_autoneg");
-
-       /* Read the MII Auto-Neg Advertisement Register (Address 4). */
-       ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
-       if (ret_val)
-               return ret_val;
-
-       /* Read the MII 1000Base-T Control Register (Address 9). */
-       ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &mii_1000t_ctrl_reg);
-       if (ret_val)
-               return ret_val;
-       else if (hw->phy_type == e1000_phy_8201)
-               mii_1000t_ctrl_reg &= ~REG9_SPEED_MASK;
-
-       /* 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 &= ~REG4_SPEED_MASK;
-       mii_1000t_ctrl_reg &= ~REG9_SPEED_MASK;
-
-       e_dbg("autoneg_advertised %x\n", hw->autoneg_advertised);
-
-       /* Do we want to advertise 10 Mb Half Duplex? */
-       if (hw->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 (hw->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 (hw->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 (hw->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 (hw->autoneg_advertised & ADVERTISE_1000_HALF) {
-               e_dbg
-                   ("Advertise 1000mb Half duplex requested, request denied!\n");
-       }
-
-       /* Do we want to advertise 1000 Mb Full Duplex? */
-       if (hw->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) {
-       case E1000_FC_NONE:     /* 0 */
-               /* 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: /* 1 */
-               /* 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: /* 2 */
-               /* 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:     /* 3 */
-               /* 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");
-               return -E1000_ERR_CONFIG;
-       }
-
-       ret_val = e1000_write_phy_reg(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
-       if (ret_val)
-               return ret_val;
-
-       e_dbg("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
-
-       if (hw->phy_type == e1000_phy_8201) {
-               mii_1000t_ctrl_reg = 0;
-       } else {
-               ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL,
-                                             mii_1000t_ctrl_reg);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_phy_force_speed_duplex - force link settings
- * @hw: Struct containing variables accessed by shared code
- *
- * Force PHY speed and duplex settings to hw->forced_speed_duplex
- */
-static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-       u16 mii_ctrl_reg;
-       u16 mii_status_reg;
-       u16 phy_data;
-       u16 i;
-
-       e_dbg("e1000_phy_force_speed_duplex");
-
-       /* Turn off Flow control if we are forcing speed and duplex. */
-       hw->fc = E1000_FC_NONE;
-
-       e_dbg("hw->fc = %d\n", hw->fc);
-
-       /* Read the Device Control Register. */
-       ctrl = er32(CTRL);
-
-       /* Set the bits to Force Speed and Duplex in the Device Ctrl Reg. */
-       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ctrl &= ~(DEVICE_SPEED_MASK);
-
-       /* Clear the Auto Speed Detect Enable bit. */
-       ctrl &= ~E1000_CTRL_ASDE;
-
-       /* Read the MII Control Register. */
-       ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &mii_ctrl_reg);
-       if (ret_val)
-               return ret_val;
-
-       /* We need to disable autoneg in order to force link and duplex. */
-
-       mii_ctrl_reg &= ~MII_CR_AUTO_NEG_EN;
-
-       /* Are we forcing Full or Half Duplex? */
-       if (hw->forced_speed_duplex == e1000_100_full ||
-           hw->forced_speed_duplex == e1000_10_full) {
-               /* We want to force full duplex so we SET the full duplex bits in the
-                * Device and MII Control Registers.
-                */
-               ctrl |= E1000_CTRL_FD;
-               mii_ctrl_reg |= MII_CR_FULL_DUPLEX;
-               e_dbg("Full Duplex\n");
-       } else {
-               /* We want to force half duplex so we CLEAR the full duplex bits in
-                * the Device and MII Control Registers.
-                */
-               ctrl &= ~E1000_CTRL_FD;
-               mii_ctrl_reg &= ~MII_CR_FULL_DUPLEX;
-               e_dbg("Half Duplex\n");
-       }
-
-       /* Are we forcing 100Mbps??? */
-       if (hw->forced_speed_duplex == e1000_100_full ||
-           hw->forced_speed_duplex == e1000_100_half) {
-               /* Set the 100Mb bit and turn off the 1000Mb and 10Mb bits. */
-               ctrl |= E1000_CTRL_SPD_100;
-               mii_ctrl_reg |= MII_CR_SPEED_100;
-               mii_ctrl_reg &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
-               e_dbg("Forcing 100mb ");
-       } else {
-               /* Set the 10Mb bit and turn off the 1000Mb and 100Mb bits. */
-               ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-               mii_ctrl_reg |= MII_CR_SPEED_10;
-               mii_ctrl_reg &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
-               e_dbg("Forcing 10mb ");
-       }
-
-       e1000_config_collision_dist(hw);
-
-       /* Write the configured values back to the Device Control Reg. */
-       ew32(CTRL, ctrl);
-
-       if (hw->phy_type == e1000_phy_m88) {
-               ret_val =
-                   e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               /* Clear Auto-Crossover to force MDI manually. M88E1000 requires MDI
-                * forced whenever speed are duplex are forced.
-                */
-               phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-               ret_val =
-                   e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               e_dbg("M88E1000 PSCR: %x\n", phy_data);
-
-               /* Need to reset the PHY or these changes will be ignored */
-               mii_ctrl_reg |= MII_CR_RESET;
-
-               /* Disable MDI-X support for 10/100 */
-       } else {
-               /* Clear Auto-Crossover to force MDI manually.  IGP requires MDI
-                * forced whenever speed or duplex are forced.
-                */
-               ret_val =
-                   e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-               phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-
-               ret_val =
-                   e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* Write back the modified PHY MII control register. */
-       ret_val = e1000_write_phy_reg(hw, PHY_CTRL, mii_ctrl_reg);
-       if (ret_val)
-               return ret_val;
-
-       udelay(1);
-
-       /* The wait_autoneg_complete flag may be a little misleading here.
-        * Since we are forcing speed and duplex, Auto-Neg is not enabled.
-        * But we do want to delay for a period while forcing only so we
-        * don't generate false No Link messages.  So we will wait here
-        * only if the user has set wait_autoneg_complete to 1, which is
-        * the default.
-        */
-       if (hw->wait_autoneg_complete) {
-               /* We will wait for autoneg to complete. */
-               e_dbg("Waiting for forced speed/duplex link.\n");
-               mii_status_reg = 0;
-
-               /* We will wait for autoneg to complete or 4.5 seconds to expire. */
-               for (i = PHY_FORCE_TIME; i > 0; i--) {
-                       /* Read the MII Status Register and wait for Auto-Neg Complete bit
-                        * to be set.
-                        */
-                       ret_val =
-                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-                       if (ret_val)
-                               return ret_val;
-
-                       ret_val =
-                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-                       if (ret_val)
-                               return ret_val;
-
-                       if (mii_status_reg & MII_SR_LINK_STATUS)
-                               break;
-                       msleep(100);
-               }
-               if ((i == 0) && (hw->phy_type == e1000_phy_m88)) {
-                       /* We didn't get link.  Reset the DSP and wait again for link. */
-                       ret_val = e1000_phy_reset_dsp(hw);
-                       if (ret_val) {
-                               e_dbg("Error Resetting PHY DSP\n");
-                               return ret_val;
-                       }
-               }
-               /* This loop will early-out if the link condition has been met.  */
-               for (i = PHY_FORCE_TIME; i > 0; i--) {
-                       if (mii_status_reg & MII_SR_LINK_STATUS)
-                               break;
-                       msleep(100);
-                       /* Read the MII Status Register and wait for Auto-Neg Complete bit
-                        * to be set.
-                        */
-                       ret_val =
-                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-                       if (ret_val)
-                               return ret_val;
-
-                       ret_val =
-                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-                       if (ret_val)
-                               return ret_val;
-               }
-       }
-
-       if (hw->phy_type == e1000_phy_m88) {
-               /* Because we reset the PHY above, we need to re-force TX_CLK in the
-                * Extended PHY Specific Control Register to 25MHz clock.  This value
-                * defaults back to a 2.5MHz clock when the PHY is reset.
-                */
-               ret_val =
-                   e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                      &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_data |= M88E1000_EPSCR_TX_CLK_25;
-               ret_val =
-                   e1000_write_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                       phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               /* In addition, because of the s/w reset above, we need to enable CRS on
-                * TX.  This must be set for both full and half duplex operation.
-                */
-               ret_val =
-                   e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-               ret_val =
-                   e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               if ((hw->mac_type == e1000_82544 || hw->mac_type == e1000_82543)
-                   && (!hw->autoneg)
-                   && (hw->forced_speed_duplex == e1000_10_full
-                       || hw->forced_speed_duplex == e1000_10_half)) {
-                       ret_val = e1000_polarity_reversal_workaround(hw);
-                       if (ret_val)
-                               return ret_val;
-               }
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_config_collision_dist - set collision distance register
- * @hw: Struct containing variables accessed by shared code
- *
- * Sets the collision distance in the Transmit Control register.
- * Link should have been established previously. Reads the speed and duplex
- * information from the Device Status register.
- */
-void e1000_config_collision_dist(struct e1000_hw *hw)
-{
-       u32 tctl, coll_dist;
-
-       e_dbg("e1000_config_collision_dist");
-
-       if (hw->mac_type < e1000_82543)
-               coll_dist = E1000_COLLISION_DISTANCE_82542;
-       else
-               coll_dist = E1000_COLLISION_DISTANCE;
-
-       tctl = er32(TCTL);
-
-       tctl &= ~E1000_TCTL_COLD;
-       tctl |= coll_dist << E1000_COLD_SHIFT;
-
-       ew32(TCTL, tctl);
-       E1000_WRITE_FLUSH();
-}
-
-/**
- * e1000_config_mac_to_phy - sync phy and mac settings
- * @hw: Struct containing variables accessed by shared code
- * @mii_reg: data to write to the MII control register
- *
- * Sets MAC speed and duplex settings to reflect the those in the PHY
- * The contents of the PHY register containing the needed information need to
- * be passed in.
- */
-static s32 e1000_config_mac_to_phy(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_config_mac_to_phy");
-
-       /* 82544 or newer MAC, Auto Speed Detection takes care of
-        * MAC speed/duplex configuration.*/
-       if ((hw->mac_type >= e1000_82544) && (hw->mac_type != e1000_ce4100))
-               return E1000_SUCCESS;
-
-       /* Read the Device Control Register and set the bits to Force Speed
-        * and Duplex.
-        */
-       ctrl = er32(CTRL);
-       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ctrl &= ~(E1000_CTRL_SPD_SEL | E1000_CTRL_ILOS);
-
-       switch (hw->phy_type) {
-       case e1000_phy_8201:
-               ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               if (phy_data & RTL_PHY_CTRL_FD)
-                       ctrl |= E1000_CTRL_FD;
-               else
-                       ctrl &= ~E1000_CTRL_FD;
-
-               if (phy_data & RTL_PHY_CTRL_SPD_100)
-                       ctrl |= E1000_CTRL_SPD_100;
-               else
-                       ctrl |= E1000_CTRL_SPD_10;
-
-               e1000_config_collision_dist(hw);
-               break;
-       default:
-               /* Set up duplex in the Device Control and Transmit Control
-                * registers depending on negotiated values.
-                */
-               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-                                            &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               if (phy_data & M88E1000_PSSR_DPLX)
-                       ctrl |= E1000_CTRL_FD;
-               else
-                       ctrl &= ~E1000_CTRL_FD;
-
-               e1000_config_collision_dist(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;
-       }
-
-       /* Write the configured values back to the Device Control Reg. */
-       ew32(CTRL, ctrl);
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_force_mac_fc - force flow control settings
- * @hw: Struct containing variables accessed by shared code
- *
- * Forces 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(struct e1000_hw *hw)
-{
-       u32 ctrl;
-
-       e_dbg("e1000_force_mac_fc");
-
-       /* Get the current configuration of the Device Control Register */
-       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" 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.
-        */
-
-       switch (hw->fc) {
-       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");
-               return -E1000_ERR_CONFIG;
-       }
-
-       /* Disable TX Flow Control for 82542 (rev 2.0) */
-       if (hw->mac_type == e1000_82542_rev2_0)
-               ctrl &= (~E1000_CTRL_TFCE);
-
-       ew32(CTRL, ctrl);
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_config_fc_after_link_up - configure flow control after autoneg
- * @hw: Struct containing variables accessed by shared code
- *
- * Configures flow control settings after link is established
- * Should be called immediately after a valid link has been established.
- * Forces MAC flow control settings if link was forced. When in MII/GMII mode
- * and autonegotiation is enabled, the MAC flow control settings will be set
- * based on the flow control negotiated by the PHY. In TBI mode, the TFCE
- * and RFCE bits will be automatically set to the negotiated flow control mode.
- */
-static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 mii_status_reg;
-       u16 mii_nway_adv_reg;
-       u16 mii_nway_lp_ability_reg;
-       u16 speed;
-       u16 duplex;
-
-       e_dbg("e1000_config_fc_after_link_up");
-
-       /* 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 (((hw->media_type == e1000_media_type_fiber) && (hw->autoneg_failed))
-           || ((hw->media_type == e1000_media_type_internal_serdes)
-               && (hw->autoneg_failed))
-           || ((hw->media_type == e1000_media_type_copper)
-               && (!hw->autoneg))) {
-               ret_val = e1000_force_mac_fc(hw);
-               if (ret_val) {
-                       e_dbg("Error forcing flow control settings\n");
-                       return ret_val;
-               }
-       }
-
-       /* 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->media_type == e1000_media_type_copper) && hw->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 = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       return ret_val;
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       return ret_val;
-
-               if (mii_status_reg & MII_SR_AUTONEG_COMPLETE) {
-                       /* 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 = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV,
-                                                    &mii_nway_adv_reg);
-                       if (ret_val)
-                               return ret_val;
-                       ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY,
-                                                    &mii_nway_lp_ability_reg);
-                       if (ret_val)
-                               return ret_val;
-
-                       /* 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->original_fc == E1000_FC_FULL) {
-                                       hw->fc = E1000_FC_FULL;
-                                       e_dbg("Flow Control = FULL.\n");
-                               } else {
-                                       hw->fc = E1000_FC_RX_PAUSE;
-                                       e_dbg
-                                           ("Flow Control = RX PAUSE frames only.\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 = E1000_FC_TX_PAUSE;
-                               e_dbg
-                                   ("Flow Control = TX PAUSE frames only.\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 = E1000_FC_RX_PAUSE;
-                               e_dbg
-                                   ("Flow Control = RX PAUSE frames only.\n");
-                       }
-                       /* Per the IEEE spec, at this point flow control should be
-                        * disabled.  However, we want to consider that we could
-                        * be connected to a legacy switch that doesn't advertise
-                        * desired flow control, but can be forced on the link
-                        * partner.  So if we advertised no flow control, that is
-                        * what we will resolve to.  If we advertised some kind of
-                        * receive capability (Rx Pause Only or Full Flow Control)
-                        * and the link partner advertised none, we will configure
-                        * ourselves to enable Rx Flow Control only.  We can do
-                        * this safely for two reasons:  If the link partner really
-                        * didn't want flow control enabled, and we enable Rx, no
-                        * harm done since we won't be receiving any PAUSE frames
-                        * anyway.  If the intent on the link partner was to have
-                        * flow control enabled, then by us enabling RX only, we
-                        * can at least receive pause frames and process them.
-                        * This is a good idea because in most cases, since we are
-                        * predominantly a server NIC, more times than not we will
-                        * be asked to delay transmission of packets than asking
-                        * our link partner to pause transmission of frames.
-                        */
-                       else if ((hw->original_fc == E1000_FC_NONE ||
-                                 hw->original_fc == E1000_FC_TX_PAUSE) ||
-                                hw->fc_strict_ieee) {
-                               hw->fc = E1000_FC_NONE;
-                               e_dbg("Flow Control = NONE.\n");
-                       } else {
-                               hw->fc = E1000_FC_RX_PAUSE;
-                               e_dbg
-                                   ("Flow Control = RX PAUSE frames only.\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 =
-                           e1000_get_speed_and_duplex(hw, &speed, &duplex);
-                       if (ret_val) {
-                               e_dbg
-                                   ("Error getting link speed and duplex\n");
-                               return ret_val;
-                       }
-
-                       if (duplex == HALF_DUPLEX)
-                               hw->fc = 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(hw);
-                       if (ret_val) {
-                               e_dbg
-                                   ("Error forcing flow control settings\n");
-                               return ret_val;
-                       }
-               } else {
-                       e_dbg
-                           ("Copper PHY and Auto Neg has not completed.\n");
-               }
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * 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.
- */
-static s32 e1000_check_for_serdes_link_generic(struct e1000_hw *hw)
-{
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       e_dbg("e1000_check_for_serdes_link_generic");
-
-       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 (hw->autoneg_failed == 0) {
-                       hw->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, (hw->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 = e1000_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, hw->txcw);
-               ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               hw->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)) {
-                               hw->serdes_has_link = true;
-                               e_dbg("SERDES: Link up - forced.\n");
-                       }
-               } else {
-                       hw->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)) {
-                                       hw->serdes_has_link = true;
-                                       e_dbg("SERDES: Link up - autoneg "
-                                                "completed successfully.\n");
-                               } else {
-                                       hw->serdes_has_link = false;
-                                       e_dbg("SERDES: Link down - invalid"
-                                                "codewords detected in autoneg.\n");
-                               }
-                       } else {
-                               hw->serdes_has_link = false;
-                               e_dbg("SERDES: Link down - no sync.\n");
-                       }
-               } else {
-                       hw->serdes_has_link = false;
-                       e_dbg("SERDES: Link down - autoneg failed\n");
-               }
-       }
-
-      out:
-       return ret_val;
-}
-
-/**
- * e1000_check_for_link
- * @hw: Struct containing variables accessed by shared code
- *
- * Checks to see if the link status of the hardware has changed.
- * Called by any function that needs to check the link status of the adapter.
- */
-s32 e1000_check_for_link(struct e1000_hw *hw)
-{
-       u32 rxcw = 0;
-       u32 ctrl;
-       u32 status;
-       u32 rctl;
-       u32 icr;
-       u32 signal = 0;
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_check_for_link");
-
-       ctrl = er32(CTRL);
-       status = er32(STATUS);
-
-       /* On adapters with a MAC newer than 82544, SW Definable pin 1 will be
-        * set when the optics detect a signal. On older adapters, it will be
-        * cleared when there is a signal.  This applies to fiber media only.
-        */
-       if ((hw->media_type == e1000_media_type_fiber) ||
-           (hw->media_type == e1000_media_type_internal_serdes)) {
-               rxcw = er32(RXCW);
-
-               if (hw->media_type == e1000_media_type_fiber) {
-                       signal =
-                           (hw->mac_type >
-                            e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
-                       if (status & E1000_STATUS_LU)
-                               hw->get_link_status = false;
-               }
-       }
-
-       /* If we have a copper PHY then 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 will be set if we
-        * receive a Link Status Change interrupt or we have Rx Sequence
-        * Errors.
-        */
-       if ((hw->media_type == e1000_media_type_copper) && hw->get_link_status) {
-               /* 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.
-                * Read the register twice since the link bit is sticky.
-                */
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               if (phy_data & MII_SR_LINK_STATUS) {
-                       hw->get_link_status = false;
-                       /* Check if there was DownShift, must be checked immediately after
-                        * link-up */
-                       e1000_check_downshift(hw);
-
-                       /* If we are on 82544 or 82543 silicon and speed/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
-                        * happen due to the execution of this workaround.
-                        */
-
-                       if ((hw->mac_type == e1000_82544
-                            || hw->mac_type == e1000_82543) && (!hw->autoneg)
-                           && (hw->forced_speed_duplex == e1000_10_full
-                               || hw->forced_speed_duplex == e1000_10_half)) {
-                               ew32(IMC, 0xffffffff);
-                               ret_val =
-                                   e1000_polarity_reversal_workaround(hw);
-                               icr = er32(ICR);
-                               ew32(ICS, (icr & ~E1000_ICS_LSC));
-                               ew32(IMS, IMS_ENABLE_MASK);
-                       }
-
-               } else {
-                       /* No link detected */
-                       e1000_config_dsp_after_link_change(hw, false);
-                       return 0;
-               }
-
-               /* If we are forcing speed/duplex, then we simply return since
-                * we have already determined whether we have link or not.
-                */
-               if (!hw->autoneg)
-                       return -E1000_ERR_CONFIG;
-
-               /* optimize the dsp settings for the igp phy */
-               e1000_config_dsp_after_link_change(hw, true);
-
-               /* 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 ((hw->mac_type >= e1000_82544) &&
-                   (hw->mac_type != e1000_ce4100))
-                       e1000_config_collision_dist(hw);
-               else {
-                       ret_val = e1000_config_mac_to_phy(hw);
-                       if (ret_val) {
-                               e_dbg
-                                   ("Error configuring MAC to PHY settings\n");
-                               return ret_val;
-                       }
-               }
-
-               /* 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(hw);
-               if (ret_val) {
-                       e_dbg("Error configuring flow control\n");
-                       return ret_val;
-               }
-
-               /* 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 (hw->tbi_compatibility_en) {
-                       u16 speed, duplex;
-                       ret_val =
-                           e1000_get_speed_and_duplex(hw, &speed, &duplex);
-                       if (ret_val) {
-                               e_dbg
-                                   ("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 (hw->tbi_compatibility_on) {
-                                       /* If we previously were in the mode, turn it off. */
-                                       rctl = er32(RCTL);
-                                       rctl &= ~E1000_RCTL_SBP;
-                                       ew32(RCTL, rctl);
-                                       hw->tbi_compatibility_on = false;
-                               }
-                       } 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 (!hw->tbi_compatibility_on) {
-                                       hw->tbi_compatibility_on = true;
-                                       rctl = er32(RCTL);
-                                       rctl |= E1000_RCTL_SBP;
-                                       ew32(RCTL, rctl);
-                               }
-                       }
-               }
-       }
-
-       if ((hw->media_type == e1000_media_type_fiber) ||
-           (hw->media_type == e1000_media_type_internal_serdes))
-               e1000_check_for_serdes_link_generic(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_get_speed_and_duplex
- * @hw: Struct containing variables accessed by shared code
- * @speed: Speed of the connection
- * @duplex: Duplex setting of the connection
-
- * Detects the current speed and duplex settings of the hardware.
- */
-s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)
-{
-       u32 status;
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_get_speed_and_duplex");
-
-       if (hw->mac_type >= e1000_82543) {
-               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");
-               }
-       } else {
-               e_dbg("1000 Mbs, Full Duplex\n");
-               *speed = SPEED_1000;
-               *duplex = FULL_DUPLEX;
-       }
-
-       /* 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.
-        */
-       if (hw->phy_type == e1000_phy_igp && hw->speed_downgraded) {
-               ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_EXP, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               if (!(phy_data & NWAY_ER_LP_NWAY_CAPS))
-                       *duplex = HALF_DUPLEX;
-               else {
-                       ret_val =
-                           e1000_read_phy_reg(hw, PHY_LP_ABILITY, &phy_data);
-                       if (ret_val)
-                               return ret_val;
-                       if ((*speed == SPEED_100
-                            && !(phy_data & NWAY_LPAR_100TX_FD_CAPS))
-                           || (*speed == SPEED_10
-                               && !(phy_data & NWAY_LPAR_10T_FD_CAPS)))
-                               *duplex = HALF_DUPLEX;
-               }
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_wait_autoneg
- * @hw: Struct containing variables accessed by shared code
- *
- * Blocks until autoneg completes or times out (~4.5 seconds)
- */
-static s32 e1000_wait_autoneg(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 i;
-       u16 phy_data;
-
-       e_dbg("e1000_wait_autoneg");
-       e_dbg("Waiting for Auto-Neg to complete.\n");
-
-       /* We will wait for autoneg to complete or 4.5 seconds to expire. */
-       for (i = PHY_AUTO_NEG_TIME; i > 0; i--) {
-               /* Read the MII Status Register and wait for Auto-Neg
-                * Complete bit to be set.
-                */
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-               if (phy_data & MII_SR_AUTONEG_COMPLETE) {
-                       return E1000_SUCCESS;
-               }
-               msleep(100);
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_raise_mdi_clk - Raises the Management Data Clock
- * @hw: Struct containing variables accessed by shared code
- * @ctrl: Device control register's current value
- */
-static void e1000_raise_mdi_clk(struct e1000_hw *hw, u32 *ctrl)
-{
-       /* Raise the clock input to the Management Data Clock (by setting the MDC
-        * bit), and then delay 10 microseconds.
-        */
-       ew32(CTRL, (*ctrl | E1000_CTRL_MDC));
-       E1000_WRITE_FLUSH();
-       udelay(10);
-}
-
-/**
- * e1000_lower_mdi_clk - Lowers the Management Data Clock
- * @hw: Struct containing variables accessed by shared code
- * @ctrl: Device control register's current value
- */
-static void e1000_lower_mdi_clk(struct e1000_hw *hw, u32 *ctrl)
-{
-       /* Lower the clock input to the Management Data Clock (by clearing the MDC
-        * bit), and then delay 10 microseconds.
-        */
-       ew32(CTRL, (*ctrl & ~E1000_CTRL_MDC));
-       E1000_WRITE_FLUSH();
-       udelay(10);
-}
-
-/**
- * e1000_shift_out_mdi_bits - Shifts data bits out to the PHY
- * @hw: Struct containing variables accessed by shared code
- * @data: Data to send out to the PHY
- * @count: Number of bits to shift out
- *
- * Bits are shifted out in MSB to LSB order.
- */
-static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data, u16 count)
-{
-       u32 ctrl;
-       u32 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 = er32(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;
-
-               ew32(CTRL, ctrl);
-               E1000_WRITE_FLUSH();
-
-               udelay(10);
-
-               e1000_raise_mdi_clk(hw, &ctrl);
-               e1000_lower_mdi_clk(hw, &ctrl);
-
-               mask = mask >> 1;
-       }
-}
-
-/**
- * e1000_shift_in_mdi_bits - Shifts data bits in from the PHY
- * @hw: Struct containing variables accessed by shared code
- *
- * Bits are shifted in in MSB to LSB order.
- */
-static u16 e1000_shift_in_mdi_bits(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 = er32(CTRL);
-
-       /* Clear MDIO_DIR (SWDPIO1) to indicate this bit is to be used as input. */
-       ctrl &= ~E1000_CTRL_MDIO_DIR;
-       ctrl &= ~E1000_CTRL_MDIO;
-
-       ew32(CTRL, ctrl);
-       E1000_WRITE_FLUSH();
-
-       /* 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(hw, &ctrl);
-       e1000_lower_mdi_clk(hw, &ctrl);
-
-       for (data = 0, i = 0; i < 16; i++) {
-               data = data << 1;
-               e1000_raise_mdi_clk(hw, &ctrl);
-               ctrl = er32(CTRL);
-               /* Check to see if we shifted in a "1". */
-               if (ctrl & E1000_CTRL_MDIO)
-                       data |= 1;
-               e1000_lower_mdi_clk(hw, &ctrl);
-       }
-
-       e1000_raise_mdi_clk(hw, &ctrl);
-       e1000_lower_mdi_clk(hw, &ctrl);
-
-       return data;
-}
-
-
-/**
- * e1000_read_phy_reg - read a phy register
- * @hw: Struct containing variables accessed by shared code
- * @reg_addr: address of the PHY register to read
- *
- * Reads the value from a PHY register, if the value is on a specific non zero
- * page, sets the page first.
- */
-s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 *phy_data)
-{
-       u32 ret_val;
-
-       e_dbg("e1000_read_phy_reg");
-
-       if ((hw->phy_type == e1000_phy_igp) &&
-           (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
-               ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                                (u16) reg_addr);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       ret_val = e1000_read_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr,
-                                       phy_data);
-
-       return ret_val;
-}
-
-static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
-                                u16 *phy_data)
-{
-       u32 i;
-       u32 mdic = 0;
-       const u32 phy_addr = (hw->mac_type == e1000_ce4100) ? hw->phy_addr : 1;
-
-       e_dbg("e1000_read_phy_reg_ex");
-
-       if (reg_addr > MAX_PHY_REG_ADDRESS) {
-               e_dbg("PHY Address %d is out of range\n", reg_addr);
-               return -E1000_ERR_PARAM;
-       }
-
-       if (hw->mac_type > e1000_82543) {
-               /* Set up Op-code, Phy Address, and register address in the MDI
-                * Control register.  The MAC will take care of interfacing with the
-                * PHY to retrieve the desired data.
-                */
-               if (hw->mac_type == e1000_ce4100) {
-                       mdic = ((reg_addr << E1000_MDIC_REG_SHIFT) |
-                               (phy_addr << E1000_MDIC_PHY_SHIFT) |
-                               (INTEL_CE_GBE_MDIC_OP_READ) |
-                               (INTEL_CE_GBE_MDIC_GO));
-
-                       writel(mdic, E1000_MDIO_CMD);
-
-                       /* Poll the ready bit to see if the MDI read
-                        * completed
-                        */
-                       for (i = 0; i < 64; i++) {
-                               udelay(50);
-                               mdic = readl(E1000_MDIO_CMD);
-                               if (!(mdic & INTEL_CE_GBE_MDIC_GO))
-                                       break;
-                       }
-
-                       if (mdic & INTEL_CE_GBE_MDIC_GO) {
-                               e_dbg("MDI Read did not complete\n");
-                               return -E1000_ERR_PHY;
-                       }
-
-                       mdic = readl(E1000_MDIO_STS);
-                       if (mdic & INTEL_CE_GBE_MDIC_READ_ERROR) {
-                               e_dbg("MDI Read Error\n");
-                               return -E1000_ERR_PHY;
-                       }
-                       *phy_data = (u16) mdic;
-               } else {
-                       mdic = ((reg_addr << 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
-                        */
-                       for (i = 0; i < 64; 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");
-                               return -E1000_ERR_PHY;
-                       }
-                       if (mdic & E1000_MDIC_ERROR) {
-                               e_dbg("MDI Error\n");
-                               return -E1000_ERR_PHY;
-                       }
-                       *phy_data = (u16) mdic;
-               }
-       } else {
-               /* 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(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
-                * a MII read instruction consists of a shift out of 14 bits and is
-                * defined as follows:
-                *    <Preamble><SOF><Op Code><Phy Addr><Reg Addr>
-                * 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 = ((reg_addr) | (phy_addr << 5) |
-                       (PHY_OP_READ << 10) | (PHY_SOF << 12));
-
-               e1000_shift_out_mdi_bits(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.
-                */
-               *phy_data = e1000_shift_in_mdi_bits(hw);
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_write_phy_reg - write a phy register
- *
- * @hw: Struct containing variables accessed by shared code
- * @reg_addr: address of the PHY register to write
- * @data: data to write to the PHY
-
- * Writes a value to a PHY register
- */
-s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 phy_data)
-{
-       u32 ret_val;
-
-       e_dbg("e1000_write_phy_reg");
-
-       if ((hw->phy_type == e1000_phy_igp) &&
-           (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
-               ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                                (u16) reg_addr);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       ret_val = e1000_write_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr,
-                                        phy_data);
-
-       return ret_val;
-}
-
-static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
-                                 u16 phy_data)
-{
-       u32 i;
-       u32 mdic = 0;
-       const u32 phy_addr = (hw->mac_type == e1000_ce4100) ? hw->phy_addr : 1;
-
-       e_dbg("e1000_write_phy_reg_ex");
-
-       if (reg_addr > MAX_PHY_REG_ADDRESS) {
-               e_dbg("PHY Address %d is out of range\n", reg_addr);
-               return -E1000_ERR_PARAM;
-       }
-
-       if (hw->mac_type > e1000_82543) {
-               /* Set up Op-code, Phy Address, register address, and data
-                * intended for the PHY register in the MDI Control register.
-                * The MAC will take care of interfacing with the PHY to send
-                * the desired data.
-                */
-               if (hw->mac_type == e1000_ce4100) {
-                       mdic = (((u32) phy_data) |
-                               (reg_addr << E1000_MDIC_REG_SHIFT) |
-                               (phy_addr << E1000_MDIC_PHY_SHIFT) |
-                               (INTEL_CE_GBE_MDIC_OP_WRITE) |
-                               (INTEL_CE_GBE_MDIC_GO));
-
-                       writel(mdic, E1000_MDIO_CMD);
-
-                       /* Poll the ready bit to see if the MDI read
-                        * completed
-                        */
-                       for (i = 0; i < 640; i++) {
-                               udelay(5);
-                               mdic = readl(E1000_MDIO_CMD);
-                               if (!(mdic & INTEL_CE_GBE_MDIC_GO))
-                                       break;
-                       }
-                       if (mdic & INTEL_CE_GBE_MDIC_GO) {
-                               e_dbg("MDI Write did not complete\n");
-                               return -E1000_ERR_PHY;
-                       }
-               } else {
-                       mdic = (((u32) phy_data) |
-                               (reg_addr << 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
-                        */
-                       for (i = 0; i < 641; i++) {
-                               udelay(5);
-                               mdic = er32(MDIC);
-                               if (mdic & E1000_MDIC_READY)
-                                       break;
-                       }
-                       if (!(mdic & E1000_MDIC_READY)) {
-                               e_dbg("MDI Write did not complete\n");
-                               return -E1000_ERR_PHY;
-                       }
-               }
-       } else {
-               /* 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(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) | (reg_addr << 2) | (phy_addr << 7) |
-                       (PHY_OP_WRITE << 12) | (PHY_SOF << 14));
-               mdic <<= 16;
-               mdic |= (u32) phy_data;
-
-               e1000_shift_out_mdi_bits(hw, mdic, 32);
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_phy_hw_reset - reset the phy, hardware style
- * @hw: Struct containing variables accessed by shared code
- *
- * Returns the PHY to the power-on reset state
- */
-s32 e1000_phy_hw_reset(struct e1000_hw *hw)
-{
-       u32 ctrl, ctrl_ext;
-       u32 led_ctrl;
-
-       e_dbg("e1000_phy_hw_reset");
-
-       e_dbg("Resetting Phy...\n");
-
-       if (hw->mac_type > e1000_82543) {
-               /* Read the device control register and assert the E1000_CTRL_PHY_RST
-                * bit. Then, take it out of reset.
-                * For e1000 hardware, we delay for 10ms between the assert
-                * and deassert.
-                */
-               ctrl = er32(CTRL);
-               ew32(CTRL, ctrl | E1000_CTRL_PHY_RST);
-               E1000_WRITE_FLUSH();
-
-               msleep(10);
-
-               ew32(CTRL, ctrl);
-               E1000_WRITE_FLUSH();
-
-       } else {
-               /* Read the Extended Device Control Register, assert the PHY_RESET_DIR
-                * bit to put the PHY into reset. Then, take it out of reset.
-                */
-               ctrl_ext = er32(CTRL_EXT);
-               ctrl_ext |= E1000_CTRL_EXT_SDP4_DIR;
-               ctrl_ext &= ~E1000_CTRL_EXT_SDP4_DATA;
-               ew32(CTRL_EXT, ctrl_ext);
-               E1000_WRITE_FLUSH();
-               msleep(10);
-               ctrl_ext |= E1000_CTRL_EXT_SDP4_DATA;
-               ew32(CTRL_EXT, ctrl_ext);
-               E1000_WRITE_FLUSH();
-       }
-       udelay(150);
-
-       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-               /* Configure activity LED after PHY reset */
-               led_ctrl = er32(LEDCTL);
-               led_ctrl &= IGP_ACTIVITY_LED_MASK;
-               led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-               ew32(LEDCTL, led_ctrl);
-       }
-
-       /* Wait for FW to finish PHY configuration. */
-       return e1000_get_phy_cfg_done(hw);
-}
-
-/**
- * e1000_phy_reset - reset the phy to commit settings
- * @hw: Struct containing variables accessed by shared code
- *
- * Resets the PHY
- * Sets bit 15 of the MII Control register
- */
-s32 e1000_phy_reset(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_phy_reset");
-
-       switch (hw->phy_type) {
-       case e1000_phy_igp:
-               ret_val = e1000_phy_hw_reset(hw);
-               if (ret_val)
-                       return ret_val;
-               break;
-       default:
-               ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_data |= MII_CR_RESET;
-               ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               udelay(1);
-               break;
-       }
-
-       if (hw->phy_type == e1000_phy_igp)
-               e1000_phy_init_script(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_detect_gig_phy - check the phy type
- * @hw: Struct containing variables accessed by shared code
- *
- * Probes the expected PHY address for known PHY IDs
- */
-static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
-{
-       s32 phy_init_status, ret_val;
-       u16 phy_id_high, phy_id_low;
-       bool match = false;
-
-       e_dbg("e1000_detect_gig_phy");
-
-       if (hw->phy_id != 0)
-               return E1000_SUCCESS;
-
-       /* Read the PHY ID Registers to identify which PHY is onboard. */
-       ret_val = e1000_read_phy_reg(hw, PHY_ID1, &phy_id_high);
-       if (ret_val)
-               return ret_val;
-
-       hw->phy_id = (u32) (phy_id_high << 16);
-       udelay(20);
-       ret_val = e1000_read_phy_reg(hw, PHY_ID2, &phy_id_low);
-       if (ret_val)
-               return ret_val;
-
-       hw->phy_id |= (u32) (phy_id_low & PHY_REVISION_MASK);
-       hw->phy_revision = (u32) phy_id_low & ~PHY_REVISION_MASK;
-
-       switch (hw->mac_type) {
-       case e1000_82543:
-               if (hw->phy_id == M88E1000_E_PHY_ID)
-                       match = true;
-               break;
-       case e1000_82544:
-               if (hw->phy_id == M88E1000_I_PHY_ID)
-                       match = true;
-               break;
-       case e1000_82540:
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               if (hw->phy_id == M88E1011_I_PHY_ID)
-                       match = true;
-               break;
-       case e1000_ce4100:
-               if ((hw->phy_id == RTL8211B_PHY_ID) ||
-                   (hw->phy_id == RTL8201N_PHY_ID) ||
-                   (hw->phy_id == M88E1118_E_PHY_ID))
-                       match = true;
-               break;
-       case e1000_82541:
-       case e1000_82541_rev_2:
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               if (hw->phy_id == IGP01E1000_I_PHY_ID)
-                       match = true;
-               break;
-       default:
-               e_dbg("Invalid MAC type %d\n", hw->mac_type);
-               return -E1000_ERR_CONFIG;
-       }
-       phy_init_status = e1000_set_phy_type(hw);
-
-       if ((match) && (phy_init_status == E1000_SUCCESS)) {
-               e_dbg("PHY ID 0x%X detected\n", hw->phy_id);
-               return E1000_SUCCESS;
-       }
-       e_dbg("Invalid PHY ID 0x%X\n", hw->phy_id);
-       return -E1000_ERR_PHY;
-}
-
-/**
- * e1000_phy_reset_dsp - reset DSP
- * @hw: Struct containing variables accessed by shared code
- *
- * Resets the PHY's DSP
- */
-static s32 e1000_phy_reset_dsp(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       e_dbg("e1000_phy_reset_dsp");
-
-       do {
-               ret_val = e1000_write_phy_reg(hw, 29, 0x001d);
-               if (ret_val)
-                       break;
-               ret_val = e1000_write_phy_reg(hw, 30, 0x00c1);
-               if (ret_val)
-                       break;
-               ret_val = e1000_write_phy_reg(hw, 30, 0x0000);
-               if (ret_val)
-                       break;
-               ret_val = E1000_SUCCESS;
-       } while (0);
-
-       return ret_val;
-}
-
-/**
- * e1000_phy_igp_get_info - get igp specific registers
- * @hw: Struct containing variables accessed by shared code
- * @phy_info: PHY information structure
- *
- * Get PHY information from various PHY registers for igp PHY only.
- */
-static s32 e1000_phy_igp_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info)
-{
-       s32 ret_val;
-       u16 phy_data, min_length, max_length, average;
-       e1000_rev_polarity polarity;
-
-       e_dbg("e1000_phy_igp_get_info");
-
-       /* The downshift status is checked only once, after link is established,
-        * and it stored in the hw->speed_downgraded parameter. */
-       phy_info->downshift = (e1000_downshift) hw->speed_downgraded;
-
-       /* IGP01E1000 does not need to support it. */
-       phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_normal;
-
-       /* IGP01E1000 always correct polarity reversal */
-       phy_info->polarity_correction = e1000_polarity_reversal_enabled;
-
-       /* Check polarity status */
-       ret_val = e1000_check_polarity(hw, &polarity);
-       if (ret_val)
-               return ret_val;
-
-       phy_info->cable_polarity = polarity;
-
-       ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy_info->mdix_mode =
-           (e1000_auto_x_mode) ((phy_data & IGP01E1000_PSSR_MDIX) >>
-                                IGP01E1000_PSSR_MDIX_SHIFT);
-
-       if ((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-               /* Local/Remote Receiver Information are only valid at 1000 Mbps */
-               ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>
-                                     SR_1000T_LOCAL_RX_STATUS_SHIFT) ?
-                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
-               phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>
-                                      SR_1000T_REMOTE_RX_STATUS_SHIFT) ?
-                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
-
-               /* Get cable length */
-               ret_val = e1000_get_cable_length(hw, &min_length, &max_length);
-               if (ret_val)
-                       return ret_val;
-
-               /* Translate to old method */
-               average = (max_length + min_length) / 2;
-
-               if (average <= e1000_igp_cable_length_50)
-                       phy_info->cable_length = e1000_cable_length_50;
-               else if (average <= e1000_igp_cable_length_80)
-                       phy_info->cable_length = e1000_cable_length_50_80;
-               else if (average <= e1000_igp_cable_length_110)
-                       phy_info->cable_length = e1000_cable_length_80_110;
-               else if (average <= e1000_igp_cable_length_140)
-                       phy_info->cable_length = e1000_cable_length_110_140;
-               else
-                       phy_info->cable_length = e1000_cable_length_140;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_phy_m88_get_info - get m88 specific registers
- * @hw: Struct containing variables accessed by shared code
- * @phy_info: PHY information structure
- *
- * Get PHY information from various PHY registers for m88 PHY only.
- */
-static s32 e1000_phy_m88_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info)
-{
-       s32 ret_val;
-       u16 phy_data;
-       e1000_rev_polarity polarity;
-
-       e_dbg("e1000_phy_m88_get_info");
-
-       /* The downshift status is checked only once, after link is established,
-        * and it stored in the hw->speed_downgraded parameter. */
-       phy_info->downshift = (e1000_downshift) hw->speed_downgraded;
-
-       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy_info->extended_10bt_distance =
-           ((phy_data & M88E1000_PSCR_10BT_EXT_DIST_ENABLE) >>
-            M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT) ?
-           e1000_10bt_ext_dist_enable_lower :
-           e1000_10bt_ext_dist_enable_normal;
-
-       phy_info->polarity_correction =
-           ((phy_data & M88E1000_PSCR_POLARITY_REVERSAL) >>
-            M88E1000_PSCR_POLARITY_REVERSAL_SHIFT) ?
-           e1000_polarity_reversal_disabled : e1000_polarity_reversal_enabled;
-
-       /* Check polarity status */
-       ret_val = e1000_check_polarity(hw, &polarity);
-       if (ret_val)
-               return ret_val;
-       phy_info->cable_polarity = polarity;
-
-       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy_info->mdix_mode =
-           (e1000_auto_x_mode) ((phy_data & M88E1000_PSSR_MDIX) >>
-                                M88E1000_PSSR_MDIX_SHIFT);
-
-       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
-               /* Cable Length Estimation and Local/Remote Receiver Information
-                * are only valid at 1000 Mbps.
-                */
-               phy_info->cable_length =
-                   (e1000_cable_length) ((phy_data &
-                                          M88E1000_PSSR_CABLE_LENGTH) >>
-                                         M88E1000_PSSR_CABLE_LENGTH_SHIFT);
-
-               ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>
-                                     SR_1000T_LOCAL_RX_STATUS_SHIFT) ?
-                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
-               phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>
-                                      SR_1000T_REMOTE_RX_STATUS_SHIFT) ?
-                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
-
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_phy_get_info - request phy info
- * @hw: Struct containing variables accessed by shared code
- * @phy_info: PHY information structure
- *
- * Get PHY information from various PHY registers
- */
-s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info)
-{
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_phy_get_info");
-
-       phy_info->cable_length = e1000_cable_length_undefined;
-       phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_undefined;
-       phy_info->cable_polarity = e1000_rev_polarity_undefined;
-       phy_info->downshift = e1000_downshift_undefined;
-       phy_info->polarity_correction = e1000_polarity_reversal_undefined;
-       phy_info->mdix_mode = e1000_auto_x_mode_undefined;
-       phy_info->local_rx = e1000_1000t_rx_status_undefined;
-       phy_info->remote_rx = e1000_1000t_rx_status_undefined;
-
-       if (hw->media_type != e1000_media_type_copper) {
-               e_dbg("PHY info is only valid for copper media\n");
-               return -E1000_ERR_CONFIG;
-       }
-
-       ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       if ((phy_data & MII_SR_LINK_STATUS) != MII_SR_LINK_STATUS) {
-               e_dbg("PHY info is only valid if link is up\n");
-               return -E1000_ERR_CONFIG;
-       }
-
-       if (hw->phy_type == e1000_phy_igp)
-               return e1000_phy_igp_get_info(hw, phy_info);
-       else if ((hw->phy_type == e1000_phy_8211) ||
-                (hw->phy_type == e1000_phy_8201))
-               return E1000_SUCCESS;
-       else
-               return e1000_phy_m88_get_info(hw, phy_info);
-}
-
-s32 e1000_validate_mdi_setting(struct e1000_hw *hw)
-{
-       e_dbg("e1000_validate_mdi_settings");
-
-       if (!hw->autoneg && (hw->mdix == 0 || hw->mdix == 3)) {
-               e_dbg("Invalid MDI setting detected\n");
-               hw->mdix = 1;
-               return -E1000_ERR_CONFIG;
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_init_eeprom_params - initialize sw eeprom vars
- * @hw: Struct containing variables accessed by shared code
- *
- * Sets up eeprom variables in the hw struct.  Must be called after mac_type
- * is configured.
- */
-s32 e1000_init_eeprom_params(struct e1000_hw *hw)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       u32 eecd = er32(EECD);
-       s32 ret_val = E1000_SUCCESS;
-       u16 eeprom_size;
-
-       e_dbg("e1000_init_eeprom_params");
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-       case e1000_82544:
-               eeprom->type = e1000_eeprom_microwire;
-               eeprom->word_size = 64;
-               eeprom->opcode_bits = 3;
-               eeprom->address_bits = 6;
-               eeprom->delay_usec = 50;
-               break;
-       case e1000_82540:
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               eeprom->type = e1000_eeprom_microwire;
-               eeprom->opcode_bits = 3;
-               eeprom->delay_usec = 50;
-               if (eecd & E1000_EECD_SIZE) {
-                       eeprom->word_size = 256;
-                       eeprom->address_bits = 8;
-               } else {
-                       eeprom->word_size = 64;
-                       eeprom->address_bits = 6;
-               }
-               break;
-       case e1000_82541:
-       case e1000_82541_rev_2:
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               if (eecd & E1000_EECD_TYPE) {
-                       eeprom->type = e1000_eeprom_spi;
-                       eeprom->opcode_bits = 8;
-                       eeprom->delay_usec = 1;
-                       if (eecd & E1000_EECD_ADDR_BITS) {
-                               eeprom->page_size = 32;
-                               eeprom->address_bits = 16;
-                       } else {
-                               eeprom->page_size = 8;
-                               eeprom->address_bits = 8;
-                       }
-               } else {
-                       eeprom->type = e1000_eeprom_microwire;
-                       eeprom->opcode_bits = 3;
-                       eeprom->delay_usec = 50;
-                       if (eecd & E1000_EECD_ADDR_BITS) {
-                               eeprom->word_size = 256;
-                               eeprom->address_bits = 8;
-                       } else {
-                               eeprom->word_size = 64;
-                               eeprom->address_bits = 6;
-                       }
-               }
-               break;
-       default:
-               break;
-       }
-
-       if (eeprom->type == e1000_eeprom_spi) {
-               /* eeprom_size will be an enum [0..8] that maps to eeprom sizes 128B to
-                * 32KB (incremented by powers of 2).
-                */
-               /* Set to default value for initial eeprom read. */
-               eeprom->word_size = 64;
-               ret_val = e1000_read_eeprom(hw, EEPROM_CFG, 1, &eeprom_size);
-               if (ret_val)
-                       return ret_val;
-               eeprom_size =
-                   (eeprom_size & EEPROM_SIZE_MASK) >> EEPROM_SIZE_SHIFT;
-               /* 256B eeprom size was not supported in earlier hardware, so we
-                * bump eeprom_size up one to ensure that "1" (which maps to 256B)
-                * is never the result used in the shifting logic below. */
-               if (eeprom_size)
-                       eeprom_size++;
-
-               eeprom->word_size = 1 << (eeprom_size + EEPROM_WORD_SIZE_SHIFT);
-       }
-       return ret_val;
-}
-
-/**
- * e1000_raise_ee_clk - Raises the EEPROM's clock input.
- * @hw: Struct containing variables accessed by shared code
- * @eecd: EECD's current value
- */
-static void e1000_raise_ee_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       /* Raise the clock input to the EEPROM (by setting the SK bit), and then
-        * wait <delay> microseconds.
-        */
-       *eecd = *eecd | E1000_EECD_SK;
-       ew32(EECD, *eecd);
-       E1000_WRITE_FLUSH();
-       udelay(hw->eeprom.delay_usec);
-}
-
-/**
- * e1000_lower_ee_clk - Lowers the EEPROM's clock input.
- * @hw: Struct containing variables accessed by shared code
- * @eecd: EECD's current value
- */
-static void e1000_lower_ee_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
-        * wait 50 microseconds.
-        */
-       *eecd = *eecd & ~E1000_EECD_SK;
-       ew32(EECD, *eecd);
-       E1000_WRITE_FLUSH();
-       udelay(hw->eeprom.delay_usec);
-}
-
-/**
- * e1000_shift_out_ee_bits - Shift data bits out to the EEPROM.
- * @hw: Struct containing variables accessed by shared code
- * @data: data to send to the EEPROM
- * @count: number of bits to shift out
- */
-static void e1000_shift_out_ee_bits(struct e1000_hw *hw, u16 data, u16 count)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       u32 eecd;
-       u32 mask;
-
-       /* We need to shift "count" bits out to the EEPROM. So, 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.
-        */
-       mask = 0x01 << (count - 1);
-       eecd = er32(EECD);
-       if (eeprom->type == e1000_eeprom_microwire) {
-               eecd &= ~E1000_EECD_DO;
-       } else if (eeprom->type == e1000_eeprom_spi) {
-               eecd |= E1000_EECD_DO;
-       }
-       do {
-               /* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
-                * and then raising and then lowering the clock (the SK bit controls
-                * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
-                * by setting "DI" to "0" and then raising and then lowering the clock.
-                */
-               eecd &= ~E1000_EECD_DI;
-
-               if (data & mask)
-                       eecd |= E1000_EECD_DI;
-
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-
-               udelay(eeprom->delay_usec);
-
-               e1000_raise_ee_clk(hw, &eecd);
-               e1000_lower_ee_clk(hw, &eecd);
-
-               mask = mask >> 1;
-
-       } while (mask);
-
-       /* We leave the "DI" bit set to "0" when we leave this routine. */
-       eecd &= ~E1000_EECD_DI;
-       ew32(EECD, eecd);
-}
-
-/**
- * e1000_shift_in_ee_bits - Shift data bits in from the EEPROM
- * @hw: Struct containing variables accessed by shared code
- * @count: number of bits to shift in
- */
-static u16 e1000_shift_in_ee_bits(struct e1000_hw *hw, u16 count)
-{
-       u32 eecd;
-       u32 i;
-       u16 data;
-
-       /* 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 "DO" bit.  During this "shifting in" process the "DI" bit should
-        * always be clear.
-        */
-
-       eecd = er32(EECD);
-
-       eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
-       data = 0;
-
-       for (i = 0; i < count; i++) {
-               data = data << 1;
-               e1000_raise_ee_clk(hw, &eecd);
-
-               eecd = er32(EECD);
-
-               eecd &= ~(E1000_EECD_DI);
-               if (eecd & E1000_EECD_DO)
-                       data |= 1;
-
-               e1000_lower_ee_clk(hw, &eecd);
-       }
-
-       return data;
-}
-
-/**
- * e1000_acquire_eeprom - Prepares EEPROM for access
- * @hw: Struct containing variables accessed by shared code
- *
- * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This
- * function should be called before issuing a command to the EEPROM.
- */
-static s32 e1000_acquire_eeprom(struct e1000_hw *hw)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       u32 eecd, i = 0;
-
-       e_dbg("e1000_acquire_eeprom");
-
-       eecd = er32(EECD);
-
-       /* Request EEPROM Access */
-       if (hw->mac_type > e1000_82544) {
-               eecd |= E1000_EECD_REQ;
-               ew32(EECD, eecd);
-               eecd = er32(EECD);
-               while ((!(eecd & E1000_EECD_GNT)) &&
-                      (i < E1000_EEPROM_GRANT_ATTEMPTS)) {
-                       i++;
-                       udelay(5);
-                       eecd = er32(EECD);
-               }
-               if (!(eecd & E1000_EECD_GNT)) {
-                       eecd &= ~E1000_EECD_REQ;
-                       ew32(EECD, eecd);
-                       e_dbg("Could not acquire EEPROM grant\n");
-                       return -E1000_ERR_EEPROM;
-               }
-       }
-
-       /* Setup EEPROM for Read/Write */
-
-       if (eeprom->type == e1000_eeprom_microwire) {
-               /* Clear SK and DI */
-               eecd &= ~(E1000_EECD_DI | E1000_EECD_SK);
-               ew32(EECD, eecd);
-
-               /* Set CS */
-               eecd |= E1000_EECD_CS;
-               ew32(EECD, eecd);
-       } else if (eeprom->type == e1000_eeprom_spi) {
-               /* Clear SK and CS */
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(1);
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_standby_eeprom - Returns EEPROM to a "standby" state
- * @hw: Struct containing variables accessed by shared code
- */
-static void e1000_standby_eeprom(struct e1000_hw *hw)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       u32 eecd;
-
-       eecd = er32(EECD);
-
-       if (eeprom->type == e1000_eeprom_microwire) {
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(eeprom->delay_usec);
-
-               /* Clock high */
-               eecd |= E1000_EECD_SK;
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(eeprom->delay_usec);
-
-               /* Select EEPROM */
-               eecd |= E1000_EECD_CS;
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(eeprom->delay_usec);
-
-               /* Clock low */
-               eecd &= ~E1000_EECD_SK;
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(eeprom->delay_usec);
-       } else if (eeprom->type == e1000_eeprom_spi) {
-               /* Toggle CS to flush commands */
-               eecd |= E1000_EECD_CS;
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(eeprom->delay_usec);
-               eecd &= ~E1000_EECD_CS;
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(eeprom->delay_usec);
-       }
-}
-
-/**
- * e1000_release_eeprom - drop chip select
- * @hw: Struct containing variables accessed by shared code
- *
- * Terminates a command by inverting the EEPROM's chip select pin
- */
-static void e1000_release_eeprom(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       e_dbg("e1000_release_eeprom");
-
-       eecd = er32(EECD);
-
-       if (hw->eeprom.type == e1000_eeprom_spi) {
-               eecd |= E1000_EECD_CS;  /* Pull CS high */
-               eecd &= ~E1000_EECD_SK; /* Lower SCK */
-
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-
-               udelay(hw->eeprom.delay_usec);
-       } else if (hw->eeprom.type == e1000_eeprom_microwire) {
-               /* cleanup eeprom */
-
-               /* CS on Microwire is active-high */
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_DI);
-
-               ew32(EECD, eecd);
-
-               /* Rising edge of clock */
-               eecd |= E1000_EECD_SK;
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(hw->eeprom.delay_usec);
-
-               /* Falling edge of clock */
-               eecd &= ~E1000_EECD_SK;
-               ew32(EECD, eecd);
-               E1000_WRITE_FLUSH();
-               udelay(hw->eeprom.delay_usec);
-       }
-
-       /* Stop requesting EEPROM access */
-       if (hw->mac_type > e1000_82544) {
-               eecd &= ~E1000_EECD_REQ;
-               ew32(EECD, eecd);
-       }
-}
-
-/**
- * e1000_spi_eeprom_ready - Reads a 16 bit word from the EEPROM.
- * @hw: Struct containing variables accessed by shared code
- */
-static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw)
-{
-       u16 retry_count = 0;
-       u8 spi_stat_reg;
-
-       e_dbg("e1000_spi_eeprom_ready");
-
-       /* 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
-        * 5 milliseconds, then error out.
-        */
-       retry_count = 0;
-       do {
-               e1000_shift_out_ee_bits(hw, EEPROM_RDSR_OPCODE_SPI,
-                                       hw->eeprom.opcode_bits);
-               spi_stat_reg = (u8) e1000_shift_in_ee_bits(hw, 8);
-               if (!(spi_stat_reg & EEPROM_STATUS_RDY_SPI))
-                       break;
-
-               udelay(5);
-               retry_count += 5;
-
-               e1000_standby_eeprom(hw);
-       } while (retry_count < EEPROM_MAX_RETRY_SPI);
-
-       /* ATMEL SPI write time could vary from 0-20mSec on 3.3V devices (and
-        * only 0-5mSec on 5V devices)
-        */
-       if (retry_count >= EEPROM_MAX_RETRY_SPI) {
-               e_dbg("SPI EEPROM Status error\n");
-               return -E1000_ERR_EEPROM;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_read_eeprom - Reads a 16 bit word from the EEPROM.
- * @hw: Struct containing variables accessed by shared code
- * @offset: offset of  word in the EEPROM to read
- * @data: word read from the EEPROM
- * @words: number of words to read
- */
-s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       s32 ret;
-       spin_lock(&e1000_eeprom_lock);
-       ret = e1000_do_read_eeprom(hw, offset, words, data);
-       spin_unlock(&e1000_eeprom_lock);
-       return ret;
-}
-
-static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
-                               u16 *data)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       u32 i = 0;
-
-       e_dbg("e1000_read_eeprom");
-
-       if (hw->mac_type == e1000_ce4100) {
-               GBE_CONFIG_FLASH_READ(GBE_CONFIG_BASE_VIRT, offset, words,
-                                     data);
-               return E1000_SUCCESS;
-       }
-
-       /* If eeprom is not yet detected, do so now */
-       if (eeprom->word_size == 0)
-               e1000_init_eeprom_params(hw);
-
-       /* A check for invalid values:  offset too large, too many words, and not
-        * enough words.
-        */
-       if ((offset >= eeprom->word_size)
-           || (words > eeprom->word_size - offset) || (words == 0)) {
-               e_dbg("\"words\" parameter out of bounds. Words = %d,"
-                     "size = %d\n", offset, eeprom->word_size);
-               return -E1000_ERR_EEPROM;
-       }
-
-       /* EEPROM's that don't use EERD to read require us to bit-bang the SPI
-        * directly. In this case, we need to acquire the EEPROM so that
-        * FW or other port software does not interrupt.
-        */
-       /* Prepare the EEPROM for bit-bang reading */
-       if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
-               return -E1000_ERR_EEPROM;
-
-       /* Set up the SPI or Microwire EEPROM for bit-bang reading.  We have
-        * acquired the EEPROM at this point, so any returns should release it */
-       if (eeprom->type == e1000_eeprom_spi) {
-               u16 word_in;
-               u8 read_opcode = EEPROM_READ_OPCODE_SPI;
-
-               if (e1000_spi_eeprom_ready(hw)) {
-                       e1000_release_eeprom(hw);
-                       return -E1000_ERR_EEPROM;
-               }
-
-               e1000_standby_eeprom(hw);
-
-               /* Some SPI eeproms use the 8th address bit embedded in the opcode */
-               if ((eeprom->address_bits == 8) && (offset >= 128))
-                       read_opcode |= EEPROM_A8_OPCODE_SPI;
-
-               /* Send the READ command (opcode + addr)  */
-               e1000_shift_out_ee_bits(hw, read_opcode, eeprom->opcode_bits);
-               e1000_shift_out_ee_bits(hw, (u16) (offset * 2),
-                                       eeprom->address_bits);
-
-               /* Read the data.  The address of the eeprom internally increments with
-                * each byte (spi) being read, saving on the overhead of eeprom setup
-                * and tear-down.  The address counter will roll over if reading beyond
-                * the size of the eeprom, thus allowing the entire memory to be read
-                * starting from any offset. */
-               for (i = 0; i < words; i++) {
-                       word_in = e1000_shift_in_ee_bits(hw, 16);
-                       data[i] = (word_in >> 8) | (word_in << 8);
-               }
-       } else if (eeprom->type == e1000_eeprom_microwire) {
-               for (i = 0; i < words; i++) {
-                       /* Send the READ command (opcode + addr)  */
-                       e1000_shift_out_ee_bits(hw,
-                                               EEPROM_READ_OPCODE_MICROWIRE,
-                                               eeprom->opcode_bits);
-                       e1000_shift_out_ee_bits(hw, (u16) (offset + i),
-                                               eeprom->address_bits);
-
-                       /* Read the data.  For microwire, each word requires the overhead
-                        * of eeprom setup and tear-down. */
-                       data[i] = e1000_shift_in_ee_bits(hw, 16);
-                       e1000_standby_eeprom(hw);
-               }
-       }
-
-       /* End this read operation */
-       e1000_release_eeprom(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_validate_eeprom_checksum - Verifies that the EEPROM has a valid checksum
- * @hw: Struct containing variables accessed by shared code
- *
- * Reads the first 64 16 bit words of the EEPROM and sums the values read.
- * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
- * valid.
- */
-s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
-{
-       u16 checksum = 0;
-       u16 i, eeprom_data;
-
-       e_dbg("e1000_validate_eeprom_checksum");
-
-       for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
-               if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
-                       e_dbg("EEPROM Read Error\n");
-                       return -E1000_ERR_EEPROM;
-               }
-               checksum += eeprom_data;
-       }
-
-       if (checksum == (u16) EEPROM_SUM)
-               return E1000_SUCCESS;
-       else {
-               e_dbg("EEPROM Checksum Invalid\n");
-               return -E1000_ERR_EEPROM;
-       }
-}
-
-/**
- * e1000_update_eeprom_checksum - Calculates/writes the EEPROM checksum
- * @hw: Struct containing variables accessed by shared code
- *
- * Sums the first 63 16 bit words of the EEPROM. Subtracts the sum from 0xBABA.
- * Writes the difference to word offset 63 of the EEPROM.
- */
-s32 e1000_update_eeprom_checksum(struct e1000_hw *hw)
-{
-       u16 checksum = 0;
-       u16 i, eeprom_data;
-
-       e_dbg("e1000_update_eeprom_checksum");
-
-       for (i = 0; i < EEPROM_CHECKSUM_REG; i++) {
-               if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
-                       e_dbg("EEPROM Read Error\n");
-                       return -E1000_ERR_EEPROM;
-               }
-               checksum += eeprom_data;
-       }
-       checksum = (u16) EEPROM_SUM - checksum;
-       if (e1000_write_eeprom(hw, EEPROM_CHECKSUM_REG, 1, &checksum) < 0) {
-               e_dbg("EEPROM Write Error\n");
-               return -E1000_ERR_EEPROM;
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_write_eeprom - write words to the different EEPROM types.
- * @hw: Struct containing variables accessed by shared code
- * @offset: offset within the EEPROM to be written to
- * @words: number of words to write
- * @data: 16 bit word to be written to the EEPROM
- *
- * If e1000_update_eeprom_checksum is not called after this function, the
- * EEPROM will most likely contain an invalid checksum.
- */
-s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       s32 ret;
-       spin_lock(&e1000_eeprom_lock);
-       ret = e1000_do_write_eeprom(hw, offset, words, data);
-       spin_unlock(&e1000_eeprom_lock);
-       return ret;
-}
-
-static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
-                                u16 *data)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       s32 status = 0;
-
-       e_dbg("e1000_write_eeprom");
-
-       if (hw->mac_type == e1000_ce4100) {
-               GBE_CONFIG_FLASH_WRITE(GBE_CONFIG_BASE_VIRT, offset, words,
-                                      data);
-               return E1000_SUCCESS;
-       }
-
-       /* If eeprom is not yet detected, do so now */
-       if (eeprom->word_size == 0)
-               e1000_init_eeprom_params(hw);
-
-       /* A check for invalid values:  offset too large, too many words, and not
-        * enough words.
-        */
-       if ((offset >= eeprom->word_size)
-           || (words > eeprom->word_size - offset) || (words == 0)) {
-               e_dbg("\"words\" parameter out of bounds\n");
-               return -E1000_ERR_EEPROM;
-       }
-
-       /* Prepare the EEPROM for writing  */
-       if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
-               return -E1000_ERR_EEPROM;
-
-       if (eeprom->type == e1000_eeprom_microwire) {
-               status = e1000_write_eeprom_microwire(hw, offset, words, data);
-       } else {
-               status = e1000_write_eeprom_spi(hw, offset, words, data);
-               msleep(10);
-       }
-
-       /* Done with writing */
-       e1000_release_eeprom(hw);
-
-       return status;
-}
-
-/**
- * e1000_write_eeprom_spi - Writes a 16 bit word to a given offset in an SPI EEPROM.
- * @hw: Struct containing variables accessed by shared code
- * @offset: offset within the EEPROM to be written to
- * @words: number of words to write
- * @data: pointer to array of 8 bit words to be written to the EEPROM
- */
-static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset, u16 words,
-                                 u16 *data)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       u16 widx = 0;
-
-       e_dbg("e1000_write_eeprom_spi");
-
-       while (widx < words) {
-               u8 write_opcode = EEPROM_WRITE_OPCODE_SPI;
-
-               if (e1000_spi_eeprom_ready(hw))
-                       return -E1000_ERR_EEPROM;
-
-               e1000_standby_eeprom(hw);
-
-               /*  Send the WRITE ENABLE command (8 bit opcode )  */
-               e1000_shift_out_ee_bits(hw, EEPROM_WREN_OPCODE_SPI,
-                                       eeprom->opcode_bits);
-
-               e1000_standby_eeprom(hw);
-
-               /* Some SPI eeproms use the 8th address bit embedded in the opcode */
-               if ((eeprom->address_bits == 8) && (offset >= 128))
-                       write_opcode |= EEPROM_A8_OPCODE_SPI;
-
-               /* Send the Write command (8-bit opcode + addr) */
-               e1000_shift_out_ee_bits(hw, write_opcode, eeprom->opcode_bits);
-
-               e1000_shift_out_ee_bits(hw, (u16) ((offset + widx) * 2),
-                                       eeprom->address_bits);
-
-               /* Send the data */
-
-               /* Loop to allow for up to whole page write (32 bytes) of eeprom */
-               while (widx < words) {
-                       u16 word_out = data[widx];
-                       word_out = (word_out >> 8) | (word_out << 8);
-                       e1000_shift_out_ee_bits(hw, word_out, 16);
-                       widx++;
-
-                       /* Some larger eeprom sizes are capable of a 32-byte PAGE WRITE
-                        * operation, while the smaller eeproms are capable of an 8-byte
-                        * PAGE WRITE operation.  Break the inner loop to pass new address
-                        */
-                       if ((((offset + widx) * 2) % eeprom->page_size) == 0) {
-                               e1000_standby_eeprom(hw);
-                               break;
-                       }
-               }
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_write_eeprom_microwire - Writes a 16 bit word to a given offset in a Microwire EEPROM.
- * @hw: Struct containing variables accessed by shared code
- * @offset: offset within the EEPROM to be written to
- * @words: number of words to write
- * @data: pointer to array of 8 bit words to be written to the EEPROM
- */
-static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw, u16 offset,
-                                       u16 words, u16 *data)
-{
-       struct e1000_eeprom_info *eeprom = &hw->eeprom;
-       u32 eecd;
-       u16 words_written = 0;
-       u16 i = 0;
-
-       e_dbg("e1000_write_eeprom_microwire");
-
-       /* Send the write enable command to the EEPROM (3-bit opcode plus
-        * 6/8-bit dummy address beginning with 11).  It's less work to include
-        * the 11 of the dummy address as part of the opcode than it is to shift
-        * it over the correct number of bits for the address.  This puts the
-        * EEPROM into write/erase mode.
-        */
-       e1000_shift_out_ee_bits(hw, EEPROM_EWEN_OPCODE_MICROWIRE,
-                               (u16) (eeprom->opcode_bits + 2));
-
-       e1000_shift_out_ee_bits(hw, 0, (u16) (eeprom->address_bits - 2));
-
-       /* Prepare the EEPROM */
-       e1000_standby_eeprom(hw);
-
-       while (words_written < words) {
-               /* Send the Write command (3-bit opcode + addr) */
-               e1000_shift_out_ee_bits(hw, EEPROM_WRITE_OPCODE_MICROWIRE,
-                                       eeprom->opcode_bits);
-
-               e1000_shift_out_ee_bits(hw, (u16) (offset + words_written),
-                                       eeprom->address_bits);
-
-               /* Send the data */
-               e1000_shift_out_ee_bits(hw, data[words_written], 16);
-
-               /* Toggle the CS line.  This in effect tells the EEPROM to execute
-                * the previous command.
-                */
-               e1000_standby_eeprom(hw);
-
-               /* Read DO repeatedly until it is high (equal to '1').  The EEPROM will
-                * signal that the command has been completed by raising the DO signal.
-                * If DO does not go high in 10 milliseconds, then error out.
-                */
-               for (i = 0; i < 200; i++) {
-                       eecd = er32(EECD);
-                       if (eecd & E1000_EECD_DO)
-                               break;
-                       udelay(50);
-               }
-               if (i == 200) {
-                       e_dbg("EEPROM Write did not complete\n");
-                       return -E1000_ERR_EEPROM;
-               }
-
-               /* Recover from write */
-               e1000_standby_eeprom(hw);
-
-               words_written++;
-       }
-
-       /* Send the write disable command to the EEPROM (3-bit opcode plus
-        * 6/8-bit dummy address beginning with 10).  It's less work to include
-        * the 10 of the dummy address as part of the opcode than it is to shift
-        * it over the correct number of bits for the address.  This takes the
-        * EEPROM out of write/erase mode.
-        */
-       e1000_shift_out_ee_bits(hw, EEPROM_EWDS_OPCODE_MICROWIRE,
-                               (u16) (eeprom->opcode_bits + 2));
-
-       e1000_shift_out_ee_bits(hw, 0, (u16) (eeprom->address_bits - 2));
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_read_mac_addr - read the adapters MAC from eeprom
- * @hw: Struct containing variables accessed by shared code
- *
- * Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
- * second function of dual function devices
- */
-s32 e1000_read_mac_addr(struct e1000_hw *hw)
-{
-       u16 offset;
-       u16 eeprom_data, i;
-
-       e_dbg("e1000_read_mac_addr");
-
-       for (i = 0; i < NODE_ADDRESS_SIZE; i += 2) {
-               offset = i >> 1;
-               if (e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
-                       e_dbg("EEPROM Read Error\n");
-                       return -E1000_ERR_EEPROM;
-               }
-               hw->perm_mac_addr[i] = (u8) (eeprom_data & 0x00FF);
-               hw->perm_mac_addr[i + 1] = (u8) (eeprom_data >> 8);
-       }
-
-       switch (hw->mac_type) {
-       default:
-               break;
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               if (er32(STATUS) & E1000_STATUS_FUNC_1)
-                       hw->perm_mac_addr[5] ^= 0x01;
-               break;
-       }
-
-       for (i = 0; i < NODE_ADDRESS_SIZE; i++)
-               hw->mac_addr[i] = hw->perm_mac_addr[i];
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_init_rx_addrs - Initializes receive address filters.
- * @hw: Struct containing variables accessed by shared code
- *
- * Places the MAC address in receive address register 0 and clears the rest
- * of the receive address registers. Clears the multicast table. Assumes
- * the receiver is in reset when the routine is called.
- */
-static void e1000_init_rx_addrs(struct e1000_hw *hw)
-{
-       u32 i;
-       u32 rar_num;
-
-       e_dbg("e1000_init_rx_addrs");
-
-       /* Setup the receive address. */
-       e_dbg("Programming MAC Address into RAR[0]\n");
-
-       e1000_rar_set(hw, hw->mac_addr, 0);
-
-       rar_num = E1000_RAR_ENTRIES;
-
-       /* Zero out the other 15 receive addresses. */
-       e_dbg("Clearing RAR[1-15]\n");
-       for (i = 1; i < rar_num; i++) {
-               E1000_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
-               E1000_WRITE_FLUSH();
-               E1000_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
-               E1000_WRITE_FLUSH();
-       }
-}
-
-/**
- * e1000_hash_mc_addr - Hashes an address to determine its location in the multicast table
- * @hw: Struct containing variables accessed by shared code
- * @mc_addr: the multicast address to hash
- */
-u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
-{
-       u32 hash_value = 0;
-
-       /* The portion of the address that is used for the hash table is
-        * determined by the mc_filter_type setting.
-        */
-       switch (hw->mc_filter_type) {
-               /* [0] [1] [2] [3] [4] [5]
-                * 01  AA  00  12  34  56
-                * LSB                 MSB
-                */
-       case 0:
-               /* [47:36] i.e. 0x563 for above example address */
-               hash_value = ((mc_addr[4] >> 4) | (((u16) mc_addr[5]) << 4));
-               break;
-       case 1:
-               /* [46:35] i.e. 0xAC6 for above example address */
-               hash_value = ((mc_addr[4] >> 3) | (((u16) mc_addr[5]) << 5));
-               break;
-       case 2:
-               /* [45:34] i.e. 0x5D8 for above example address */
-               hash_value = ((mc_addr[4] >> 2) | (((u16) mc_addr[5]) << 6));
-               break;
-       case 3:
-               /* [43:32] i.e. 0x634 for above example address */
-               hash_value = ((mc_addr[4]) | (((u16) mc_addr[5]) << 8));
-               break;
-       }
-
-       hash_value &= 0xFFF;
-       return hash_value;
-}
-
-/**
- * e1000_rar_set - Puts an ethernet address into a receive address register.
- * @hw: Struct containing variables accessed by shared code
- * @addr: Address to put into receive address register
- * @index: Receive address register to write
- */
-void e1000_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));
-
-       /* Disable Rx and flush all Rx frames before enabling RSS to avoid Rx
-        * unit hang.
-        *
-        * Description:
-        * If there are any Rx frames queued up or otherwise present in the HW
-        * before RSS is enabled, and then we enable RSS, the HW Rx unit will
-        * hang.  To work around this issue, we have to disable receives and
-        * flush out all Rx frames before we enable RSS. To do so, we modify we
-        * redirect all Rx traffic to manageability and then reset the HW.
-        * This flushes away Rx frames, and (since the redirections to
-        * manageability persists across resets) keeps new ones from coming in
-        * while we work.  Then, we clear the Address Valid AV bit for all MAC
-        * addresses and undo the re-direction to manageability.
-        * Now, frames are coming in again, but the MAC won't accept them, so
-        * far so good.  We now proceed to initialize RSS (if necessary) and
-        * configure the Rx unit.  Last, we re-enable the AV bits and continue
-        * on our merry way.
-        */
-       switch (hw->mac_type) {
-       default:
-               /* Indicate to hardware the Address is Valid. */
-               rar_high |= E1000_RAH_AV;
-               break;
-       }
-
-       E1000_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
-       E1000_WRITE_FLUSH();
-       E1000_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
-       E1000_WRITE_FLUSH();
-}
-
-/**
- * e1000_write_vfta - Writes a value to the specified offset in the VLAN filter table.
- * @hw: Struct containing variables accessed by shared code
- * @offset: Offset in VLAN filer table to write
- * @value: Value to write into VLAN filter table
- */
-void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       u32 temp;
-
-       if ((hw->mac_type == e1000_82544) && ((offset & 0x1) == 1)) {
-               temp = E1000_READ_REG_ARRAY(hw, VFTA, (offset - 1));
-               E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);
-               E1000_WRITE_FLUSH();
-               E1000_WRITE_REG_ARRAY(hw, VFTA, (offset - 1), temp);
-               E1000_WRITE_FLUSH();
-       } else {
-               E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);
-               E1000_WRITE_FLUSH();
-       }
-}
-
-/**
- * e1000_clear_vfta - Clears the VLAN filer table
- * @hw: Struct containing variables accessed by shared code
- */
-static void e1000_clear_vfta(struct e1000_hw *hw)
-{
-       u32 offset;
-       u32 vfta_value = 0;
-       u32 vfta_offset = 0;
-       u32 vfta_bit_in_reg = 0;
-
-       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, VFTA, offset, vfta_value);
-               E1000_WRITE_FLUSH();
-       }
-}
-
-static s32 e1000_id_led_init(struct e1000_hw *hw)
-{
-       u32 ledctl;
-       const u32 ledctl_mask = 0x000000FF;
-       const u32 ledctl_on = E1000_LEDCTL_MODE_LED_ON;
-       const u32 ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
-       u16 eeprom_data, i, temp;
-       const u16 led_mask = 0x0F;
-
-       e_dbg("e1000_id_led_init");
-
-       if (hw->mac_type < e1000_82540) {
-               /* Nothing to do */
-               return E1000_SUCCESS;
-       }
-
-       ledctl = er32(LEDCTL);
-       hw->ledctl_default = ledctl;
-       hw->ledctl_mode1 = hw->ledctl_default;
-       hw->ledctl_mode2 = hw->ledctl_default;
-
-       if (e1000_read_eeprom(hw, EEPROM_ID_LED_SETTINGS, 1, &eeprom_data) < 0) {
-               e_dbg("EEPROM Read Error\n");
-               return -E1000_ERR_EEPROM;
-       }
-
-       if ((eeprom_data == ID_LED_RESERVED_0000) ||
-           (eeprom_data == ID_LED_RESERVED_FFFF)) {
-               eeprom_data = ID_LED_DEFAULT;
-       }
-
-       for (i = 0; i < 4; i++) {
-               temp = (eeprom_data >> (i << 2)) & led_mask;
-               switch (temp) {
-               case ID_LED_ON1_DEF2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_ON1_OFF2:
-                       hw->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       hw->ledctl_mode1 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_OFF1_DEF2:
-               case ID_LED_OFF1_ON2:
-               case ID_LED_OFF1_OFF2:
-                       hw->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       hw->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:
-                       hw->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       hw->ledctl_mode2 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_DEF1_OFF2:
-               case ID_LED_ON1_OFF2:
-               case ID_LED_OFF1_OFF2:
-                       hw->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       hw->ledctl_mode2 |= ledctl_off << (i << 3);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_setup_led
- * @hw: Struct containing variables accessed by shared code
- *
- * Prepares SW controlable LED for use and saves the current state of the LED.
- */
-s32 e1000_setup_led(struct e1000_hw *hw)
-{
-       u32 ledctl;
-       s32 ret_val = E1000_SUCCESS;
-
-       e_dbg("e1000_setup_led");
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-       case e1000_82544:
-               /* No setup necessary */
-               break;
-       case e1000_82541:
-       case e1000_82547:
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               /* Turn off PHY Smart Power Down (if enabled) */
-               ret_val = e1000_read_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                            &hw->phy_spd_default);
-               if (ret_val)
-                       return ret_val;
-               ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                             (u16) (hw->phy_spd_default &
-                                                    ~IGP01E1000_GMII_SPD));
-               if (ret_val)
-                       return ret_val;
-               /* Fall Through */
-       default:
-               if (hw->media_type == e1000_media_type_fiber) {
-                       ledctl = er32(LEDCTL);
-                       /* Save current LEDCTL settings */
-                       hw->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->media_type == e1000_media_type_copper)
-                       ew32(LEDCTL, hw->ledctl_mode1);
-               break;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_cleanup_led - Restores the saved state of the SW controlable LED.
- * @hw: Struct containing variables accessed by shared code
- */
-s32 e1000_cleanup_led(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       e_dbg("e1000_cleanup_led");
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-       case e1000_82544:
-               /* No cleanup necessary */
-               break;
-       case e1000_82541:
-       case e1000_82547:
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               /* Turn on PHY Smart Power Down (if previously enabled) */
-               ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                             hw->phy_spd_default);
-               if (ret_val)
-                       return ret_val;
-               /* Fall Through */
-       default:
-               /* Restore LEDCTL settings */
-               ew32(LEDCTL, hw->ledctl_default);
-               break;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_led_on - Turns on the software controllable LED
- * @hw: Struct containing variables accessed by shared code
- */
-s32 e1000_led_on(struct e1000_hw *hw)
-{
-       u32 ctrl = er32(CTRL);
-
-       e_dbg("e1000_led_on");
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-               /* Set SW Defineable Pin 0 to turn on the LED */
-               ctrl |= E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               break;
-       case e1000_82544:
-               if (hw->media_type == e1000_media_type_fiber) {
-                       /* Set SW Defineable Pin 0 to turn on the LED */
-                       ctrl |= E1000_CTRL_SWDPIN0;
-                       ctrl |= E1000_CTRL_SWDPIO0;
-               } else {
-                       /* Clear SW Defineable Pin 0 to turn on the LED */
-                       ctrl &= ~E1000_CTRL_SWDPIN0;
-                       ctrl |= E1000_CTRL_SWDPIO0;
-               }
-               break;
-       default:
-               if (hw->media_type == e1000_media_type_fiber) {
-                       /* Clear SW Defineable Pin 0 to turn on the LED */
-                       ctrl &= ~E1000_CTRL_SWDPIN0;
-                       ctrl |= E1000_CTRL_SWDPIO0;
-               } else if (hw->media_type == e1000_media_type_copper) {
-                       ew32(LEDCTL, hw->ledctl_mode2);
-                       return E1000_SUCCESS;
-               }
-               break;
-       }
-
-       ew32(CTRL, ctrl);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_led_off - Turns off the software controllable LED
- * @hw: Struct containing variables accessed by shared code
- */
-s32 e1000_led_off(struct e1000_hw *hw)
-{
-       u32 ctrl = er32(CTRL);
-
-       e_dbg("e1000_led_off");
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-               /* Clear SW Defineable Pin 0 to turn off the LED */
-               ctrl &= ~E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               break;
-       case e1000_82544:
-               if (hw->media_type == e1000_media_type_fiber) {
-                       /* Clear SW Defineable Pin 0 to turn off the LED */
-                       ctrl &= ~E1000_CTRL_SWDPIN0;
-                       ctrl |= E1000_CTRL_SWDPIO0;
-               } else {
-                       /* Set SW Defineable Pin 0 to turn off the LED */
-                       ctrl |= E1000_CTRL_SWDPIN0;
-                       ctrl |= E1000_CTRL_SWDPIO0;
-               }
-               break;
-       default:
-               if (hw->media_type == e1000_media_type_fiber) {
-                       /* Set SW Defineable Pin 0 to turn off the LED */
-                       ctrl |= E1000_CTRL_SWDPIN0;
-                       ctrl |= E1000_CTRL_SWDPIO0;
-               } else if (hw->media_type == e1000_media_type_copper) {
-                       ew32(LEDCTL, hw->ledctl_mode1);
-                       return E1000_SUCCESS;
-               }
-               break;
-       }
-
-       ew32(CTRL, ctrl);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_clear_hw_cntrs - Clears all hardware statistics counters.
- * @hw: Struct containing variables accessed by shared code
- */
-static void e1000_clear_hw_cntrs(struct e1000_hw *hw)
-{
-       volatile u32 temp;
-
-       temp = er32(CRCERRS);
-       temp = er32(SYMERRS);
-       temp = er32(MPC);
-       temp = er32(SCC);
-       temp = er32(ECOL);
-       temp = er32(MCC);
-       temp = er32(LATECOL);
-       temp = er32(COLC);
-       temp = er32(DC);
-       temp = er32(SEC);
-       temp = er32(RLEC);
-       temp = er32(XONRXC);
-       temp = er32(XONTXC);
-       temp = er32(XOFFRXC);
-       temp = er32(XOFFTXC);
-       temp = er32(FCRUC);
-
-       temp = er32(PRC64);
-       temp = er32(PRC127);
-       temp = er32(PRC255);
-       temp = er32(PRC511);
-       temp = er32(PRC1023);
-       temp = er32(PRC1522);
-
-       temp = er32(GPRC);
-       temp = er32(BPRC);
-       temp = er32(MPRC);
-       temp = er32(GPTC);
-       temp = er32(GORCL);
-       temp = er32(GORCH);
-       temp = er32(GOTCL);
-       temp = er32(GOTCH);
-       temp = er32(RNBC);
-       temp = er32(RUC);
-       temp = er32(RFC);
-       temp = er32(ROC);
-       temp = er32(RJC);
-       temp = er32(TORL);
-       temp = er32(TORH);
-       temp = er32(TOTL);
-       temp = er32(TOTH);
-       temp = er32(TPR);
-       temp = er32(TPT);
-
-       temp = er32(PTC64);
-       temp = er32(PTC127);
-       temp = er32(PTC255);
-       temp = er32(PTC511);
-       temp = er32(PTC1023);
-       temp = er32(PTC1522);
-
-       temp = er32(MPTC);
-       temp = er32(BPTC);
-
-       if (hw->mac_type < e1000_82543)
-               return;
-
-       temp = er32(ALGNERRC);
-       temp = er32(RXERRC);
-       temp = er32(TNCRS);
-       temp = er32(CEXTERR);
-       temp = er32(TSCTC);
-       temp = er32(TSCTFC);
-
-       if (hw->mac_type <= e1000_82544)
-               return;
-
-       temp = er32(MGTPRC);
-       temp = er32(MGTPDC);
-       temp = er32(MGTPTC);
-}
-
-/**
- * e1000_reset_adaptive - Resets Adaptive IFS to its default state.
- * @hw: Struct containing variables accessed by shared code
- *
- * Call this after e1000_init_hw. You may override the IFS defaults by setting
- * hw->ifs_params_forced to true. However, you must initialize hw->
- * current_ifs_val, ifs_min_val, ifs_max_val, ifs_step_size, and ifs_ratio
- * before calling this function.
- */
-void e1000_reset_adaptive(struct e1000_hw *hw)
-{
-       e_dbg("e1000_reset_adaptive");
-
-       if (hw->adaptive_ifs) {
-               if (!hw->ifs_params_forced) {
-                       hw->current_ifs_val = 0;
-                       hw->ifs_min_val = IFS_MIN;
-                       hw->ifs_max_val = IFS_MAX;
-                       hw->ifs_step_size = IFS_STEP;
-                       hw->ifs_ratio = IFS_RATIO;
-               }
-               hw->in_ifs_mode = false;
-               ew32(AIT, 0);
-       } else {
-               e_dbg("Not in Adaptive IFS mode!\n");
-       }
-}
-
-/**
- * e1000_update_adaptive - update adaptive IFS
- * @hw: Struct containing variables accessed by shared code
- * @tx_packets: Number of transmits since last callback
- * @total_collisions: Number of collisions since last callback
- *
- * Called during the callback/watchdog routine to update IFS value based on
- * the ratio of transmits to collisions.
- */
-void e1000_update_adaptive(struct e1000_hw *hw)
-{
-       e_dbg("e1000_update_adaptive");
-
-       if (hw->adaptive_ifs) {
-               if ((hw->collision_delta *hw->ifs_ratio) > hw->tx_packet_delta) {
-                       if (hw->tx_packet_delta > MIN_NUM_XMITS) {
-                               hw->in_ifs_mode = true;
-                               if (hw->current_ifs_val < hw->ifs_max_val) {
-                                       if (hw->current_ifs_val == 0)
-                                               hw->current_ifs_val =
-                                                   hw->ifs_min_val;
-                                       else
-                                               hw->current_ifs_val +=
-                                                   hw->ifs_step_size;
-                                       ew32(AIT, hw->current_ifs_val);
-                               }
-                       }
-               } else {
-                       if (hw->in_ifs_mode
-                           && (hw->tx_packet_delta <= MIN_NUM_XMITS)) {
-                               hw->current_ifs_val = 0;
-                               hw->in_ifs_mode = false;
-                               ew32(AIT, 0);
-                       }
-               }
-       } else {
-               e_dbg("Not in Adaptive IFS mode!\n");
-       }
-}
-
-/**
- * e1000_tbi_adjust_stats
- * @hw: Struct containing variables accessed by shared code
- * @frame_len: The length of the frame in question
- * @mac_addr: The Ethernet destination address of the frame in question
- *
- * Adjusts the statistic counters when a frame is accepted by TBI_ACCEPT
- */
-void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats,
-                           u32 frame_len, u8 *mac_addr)
-{
-       u64 carry_bit;
-
-       /* 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             */
-       carry_bit = 0x80000000 & stats->gorcl;
-       stats->gorcl += frame_len;
-       /* If the high bit of Gorcl (the low 32 bits of the Good Octets
-        * Received Count) was one before the addition,
-        * AND it is zero after, then we lost the carry out,
-        * need to add one to Gorch (Good Octets Received Count High).
-        * This could be simplified if all environments supported
-        * 64-bit integers.
-        */
-       if (carry_bit && ((stats->gorcl & 0x80000000) == 0))
-               stats->gorch++;
-       /* 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] == (u8) 0xff) && (mac_addr[1] == (u8) 0xff))
-               /* Broadcast packet */
-               stats->bprc++;
-       else if (*mac_addr & 0x01)
-               /* Multicast packet */
-               stats->mprc++;
-
-       if (frame_len == hw->max_frame_size) {
-               /* In this case, the hardware has overcounted the number of
-                * oversize frames.
-                */
-               if (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++;
-       }
-}
-
-/**
- * e1000_get_bus_info
- * @hw: Struct containing variables accessed by shared code
- *
- * Gets the current PCI bus type, speed, and width of the hardware
- */
-void e1000_get_bus_info(struct e1000_hw *hw)
-{
-       u32 status;
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-               hw->bus_type = e1000_bus_type_pci;
-               hw->bus_speed = e1000_bus_speed_unknown;
-               hw->bus_width = e1000_bus_width_unknown;
-               break;
-       default:
-               status = er32(STATUS);
-               hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ?
-                   e1000_bus_type_pcix : e1000_bus_type_pci;
-
-               if (hw->device_id == E1000_DEV_ID_82546EB_QUAD_COPPER) {
-                       hw->bus_speed = (hw->bus_type == e1000_bus_type_pci) ?
-                           e1000_bus_speed_66 : e1000_bus_speed_120;
-               } else if (hw->bus_type == e1000_bus_type_pci) {
-                       hw->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:
-                               hw->bus_speed = e1000_bus_speed_66;
-                               break;
-                       case E1000_STATUS_PCIX_SPEED_100:
-                               hw->bus_speed = e1000_bus_speed_100;
-                               break;
-                       case E1000_STATUS_PCIX_SPEED_133:
-                               hw->bus_speed = e1000_bus_speed_133;
-                               break;
-                       default:
-                               hw->bus_speed = e1000_bus_speed_reserved;
-                               break;
-                       }
-               }
-               hw->bus_width = (status & E1000_STATUS_BUS64) ?
-                   e1000_bus_width_64 : e1000_bus_width_32;
-               break;
-       }
-}
-
-/**
- * e1000_write_reg_io
- * @hw: Struct containing variables accessed by shared code
- * @offset: offset to write to
- * @value: value to write
- *
- * Writes a value to one of the devices registers using port I/O (as opposed to
- * memory mapped I/O). Only 82544 and newer devices support port I/O.
- */
-static void e1000_write_reg_io(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       unsigned long io_addr = hw->io_base;
-       unsigned long io_data = hw->io_base + 4;
-
-       e1000_io_write(hw, io_addr, offset);
-       e1000_io_write(hw, io_data, value);
-}
-
-/**
- * e1000_get_cable_length - Estimates the cable length.
- * @hw: Struct containing variables accessed by shared code
- * @min_length: The estimated minimum length
- * @max_length: The estimated maximum length
- *
- * returns: - E1000_ERR_XXX
- *            E1000_SUCCESS
- *
- * This function always returns a ranged length (minimum & maximum).
- * So for M88 phy's, this function interprets the one value returned from the
- * register to the minimum and maximum range.
- * For IGP phy's, the function calculates the range by the AGC registers.
- */
-static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
-                                 u16 *max_length)
-{
-       s32 ret_val;
-       u16 agc_value = 0;
-       u16 i, phy_data;
-       u16 cable_length;
-
-       e_dbg("e1000_get_cable_length");
-
-       *min_length = *max_length = 0;
-
-       /* Use old method for Phy older than IGP */
-       if (hw->phy_type == e1000_phy_m88) {
-
-               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-                                            &phy_data);
-               if (ret_val)
-                       return ret_val;
-               cable_length = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-                   M88E1000_PSSR_CABLE_LENGTH_SHIFT;
-
-               /* Convert the enum value to ranged values */
-               switch (cable_length) {
-               case e1000_cable_length_50:
-                       *min_length = 0;
-                       *max_length = e1000_igp_cable_length_50;
-                       break;
-               case e1000_cable_length_50_80:
-                       *min_length = e1000_igp_cable_length_50;
-                       *max_length = e1000_igp_cable_length_80;
-                       break;
-               case e1000_cable_length_80_110:
-                       *min_length = e1000_igp_cable_length_80;
-                       *max_length = e1000_igp_cable_length_110;
-                       break;
-               case e1000_cable_length_110_140:
-                       *min_length = e1000_igp_cable_length_110;
-                       *max_length = e1000_igp_cable_length_140;
-                       break;
-               case e1000_cable_length_140:
-                       *min_length = e1000_igp_cable_length_140;
-                       *max_length = e1000_igp_cable_length_170;
-                       break;
-               default:
-                       return -E1000_ERR_PHY;
-                       break;
-               }
-       } else if (hw->phy_type == e1000_phy_igp) {     /* For IGP PHY */
-               u16 cur_agc_value;
-               u16 min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
-               static const u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] = {
-                      IGP01E1000_PHY_AGC_A,
-                      IGP01E1000_PHY_AGC_B,
-                      IGP01E1000_PHY_AGC_C,
-                      IGP01E1000_PHY_AGC_D
-               };
-               /* Read the AGC registers for all channels */
-               for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-
-                       ret_val =
-                           e1000_read_phy_reg(hw, agc_reg_array[i], &phy_data);
-                       if (ret_val)
-                               return ret_val;
-
-                       cur_agc_value = phy_data >> IGP01E1000_AGC_LENGTH_SHIFT;
-
-                       /* Value bound check. */
-                       if ((cur_agc_value >=
-                            IGP01E1000_AGC_LENGTH_TABLE_SIZE - 1)
-                           || (cur_agc_value == 0))
-                               return -E1000_ERR_PHY;
-
-                       agc_value += cur_agc_value;
-
-                       /* Update minimal 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 * e1000_igp_cable_length_50) {
-                       agc_value -= min_agc_value;
-
-                       /* Get the average length of the remaining 3 channels */
-                       agc_value /= (IGP01E1000_PHY_CHANNEL_NUM - 1);
-               } else {
-                       /* Get the average length of all the 4 channels. */
-                       agc_value /= IGP01E1000_PHY_CHANNEL_NUM;
-               }
-
-               /* Set the range of the calculated length. */
-               *min_length = ((e1000_igp_cable_length_table[agc_value] -
-                               IGP01E1000_AGC_RANGE) > 0) ?
-                   (e1000_igp_cable_length_table[agc_value] -
-                    IGP01E1000_AGC_RANGE) : 0;
-               *max_length = e1000_igp_cable_length_table[agc_value] +
-                   IGP01E1000_AGC_RANGE;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_check_polarity - Check the cable polarity
- * @hw: Struct containing variables accessed by shared code
- * @polarity: output parameter : 0 - Polarity is not reversed
- *                               1 - Polarity is reversed.
- *
- * returns: - E1000_ERR_XXX
- *            E1000_SUCCESS
- *
- * For phy's older than IGP, this function simply reads the polarity bit in the
- * Phy Status register.  For IGP phy's, this bit is valid only if link speed is
- * 10 Mbps.  If the link speed is 100 Mbps there is no polarity so this bit will
- * return 0.  If the link speed is 1000 Mbps the polarity status is in the
- * IGP01E1000_PHY_PCS_INIT_REG.
- */
-static s32 e1000_check_polarity(struct e1000_hw *hw,
-                               e1000_rev_polarity *polarity)
-{
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_check_polarity");
-
-       if (hw->phy_type == e1000_phy_m88) {
-               /* return the Polarity bit in the Status register. */
-               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-                                            &phy_data);
-               if (ret_val)
-                       return ret_val;
-               *polarity = ((phy_data & M88E1000_PSSR_REV_POLARITY) >>
-                            M88E1000_PSSR_REV_POLARITY_SHIFT) ?
-                   e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
-
-       } else if (hw->phy_type == e1000_phy_igp) {
-               /* Read the Status register to check the speed */
-               ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS,
-                                            &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               /* If speed is 1000 Mbps, must read the IGP01E1000_PHY_PCS_INIT_REG to
-                * find the polarity status */
-               if ((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
-                   IGP01E1000_PSSR_SPEED_1000MBPS) {
-
-                       /* Read the GIG initialization PCS register (0x00B4) */
-                       ret_val =
-                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG,
-                                              &phy_data);
-                       if (ret_val)
-                               return ret_val;
-
-                       /* Check the polarity bits */
-                       *polarity = (phy_data & IGP01E1000_PHY_POLARITY_MASK) ?
-                           e1000_rev_polarity_reversed :
-                           e1000_rev_polarity_normal;
-               } else {
-                       /* For 10 Mbps, read the polarity bit in the status register. (for
-                        * 100 Mbps this bit is always 0) */
-                       *polarity =
-                           (phy_data & IGP01E1000_PSSR_POLARITY_REVERSED) ?
-                           e1000_rev_polarity_reversed :
-                           e1000_rev_polarity_normal;
-               }
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_check_downshift - Check if Downshift occurred
- * @hw: Struct containing variables accessed by shared code
- * @downshift: output parameter : 0 - No Downshift occurred.
- *                                1 - Downshift occurred.
- *
- * returns: - E1000_ERR_XXX
- *            E1000_SUCCESS
- *
- * For phy's older than IGP, this function reads the Downshift bit in the Phy
- * Specific Status register.  For IGP phy's, it reads the Downgrade bit in the
- * Link Health register.  In IGP this bit is latched high, so the driver must
- * read it immediately after link is established.
- */
-static s32 e1000_check_downshift(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 phy_data;
-
-       e_dbg("e1000_check_downshift");
-
-       if (hw->phy_type == e1000_phy_igp) {
-               ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_LINK_HEALTH,
-                                            &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               hw->speed_downgraded =
-                   (phy_data & IGP01E1000_PLHR_SS_DOWNGRADE) ? 1 : 0;
-       } else if (hw->phy_type == e1000_phy_m88) {
-               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-                                            &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               hw->speed_downgraded = (phy_data & M88E1000_PSSR_DOWNSHIFT) >>
-                   M88E1000_PSSR_DOWNSHIFT_SHIFT;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_config_dsp_after_link_change
- * @hw: Struct containing variables accessed by shared code
- * @link_up: was link up at the time this was called
- *
- * returns: - E1000_ERR_PHY if fail to read/write the PHY
- *            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(struct e1000_hw *hw, bool link_up)
-{
-       s32 ret_val;
-       u16 phy_data, phy_saved_data, speed, duplex, i;
-       static const 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
-       };
-       u16 min_length, max_length;
-
-       e_dbg("e1000_config_dsp_after_link_change");
-
-       if (hw->phy_type != e1000_phy_igp)
-               return E1000_SUCCESS;
-
-       if (link_up) {
-               ret_val = e1000_get_speed_and_duplex(hw, &speed, &duplex);
-               if (ret_val) {
-                       e_dbg("Error getting link speed and duplex\n");
-                       return ret_val;
-               }
-
-               if (speed == SPEED_1000) {
-
-                       ret_val =
-                           e1000_get_cable_length(hw, &min_length,
-                                                  &max_length);
-                       if (ret_val)
-                               return ret_val;
-
-                       if ((hw->dsp_config_state == e1000_dsp_config_enabled)
-                           && min_length >= e1000_igp_cable_length_50) {
-
-                               for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-                                       ret_val =
-                                           e1000_read_phy_reg(hw,
-                                                              dsp_reg_array[i],
-                                                              &phy_data);
-                                       if (ret_val)
-                                               return ret_val;
-
-                                       phy_data &=
-                                           ~IGP01E1000_PHY_EDAC_MU_INDEX;
-
-                                       ret_val =
-                                           e1000_write_phy_reg(hw,
-                                                               dsp_reg_array
-                                                               [i], phy_data);
-                                       if (ret_val)
-                                               return ret_val;
-                               }
-                               hw->dsp_config_state =
-                                   e1000_dsp_config_activated;
-                       }
-
-                       if ((hw->ffe_config_state == e1000_ffe_config_enabled)
-                           && (min_length < e1000_igp_cable_length_50)) {
-
-                               u16 ffe_idle_err_timeout =
-                                   FFE_IDLE_ERR_COUNT_TIMEOUT_20;
-                               u32 idle_errs = 0;
-
-                               /* clear previous idle error counts */
-                               ret_val =
-                                   e1000_read_phy_reg(hw, PHY_1000T_STATUS,
-                                                      &phy_data);
-                               if (ret_val)
-                                       return ret_val;
-
-                               for (i = 0; i < ffe_idle_err_timeout; i++) {
-                                       udelay(1000);
-                                       ret_val =
-                                           e1000_read_phy_reg(hw,
-                                                              PHY_1000T_STATUS,
-                                                              &phy_data);
-                                       if (ret_val)
-                                               return ret_val;
-
-                                       idle_errs +=
-                                           (phy_data &
-                                            SR_1000T_IDLE_ERROR_CNT);
-                                       if (idle_errs >
-                                           SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT)
-                                       {
-                                               hw->ffe_config_state =
-                                                   e1000_ffe_config_active;
-
-                                               ret_val =
-                                                   e1000_write_phy_reg(hw,
-                                                                       IGP01E1000_PHY_DSP_FFE,
-                                                                       IGP01E1000_PHY_DSP_FFE_CM_CP);
-                                               if (ret_val)
-                                                       return ret_val;
-                                               break;
-                                       }
-
-                                       if (idle_errs)
-                                               ffe_idle_err_timeout =
-                                                   FFE_IDLE_ERR_COUNT_TIMEOUT_100;
-                               }
-                       }
-               }
-       } else {
-               if (hw->dsp_config_state == e1000_dsp_config_activated) {
-                       /* Save off the current value of register 0x2F5B to be restored at
-                        * the end of the routines. */
-                       ret_val =
-                           e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
-
-                       if (ret_val)
-                               return ret_val;
-
-                       /* Disable the PHY transmitter */
-                       ret_val = e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
-
-                       if (ret_val)
-                               return ret_val;
-
-                       mdelay(20);
-
-                       ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                                     IGP01E1000_IEEE_FORCE_GIGA);
-                       if (ret_val)
-                               return ret_val;
-                       for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-                               ret_val =
-                                   e1000_read_phy_reg(hw, dsp_reg_array[i],
-                                                      &phy_data);
-                               if (ret_val)
-                                       return ret_val;
-
-                               phy_data &= ~IGP01E1000_PHY_EDAC_MU_INDEX;
-                               phy_data |= IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS;
-
-                               ret_val =
-                                   e1000_write_phy_reg(hw, dsp_reg_array[i],
-                                                       phy_data);
-                               if (ret_val)
-                                       return ret_val;
-                       }
-
-                       ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                                     IGP01E1000_IEEE_RESTART_AUTONEG);
-                       if (ret_val)
-                               return ret_val;
-
-                       mdelay(20);
-
-                       /* Now enable the transmitter */
-                       ret_val =
-                           e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
-
-                       if (ret_val)
-                               return ret_val;
-
-                       hw->dsp_config_state = e1000_dsp_config_enabled;
-               }
-
-               if (hw->ffe_config_state == e1000_ffe_config_active) {
-                       /* Save off the current value of register 0x2F5B to be restored at
-                        * the end of the routines. */
-                       ret_val =
-                           e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
-
-                       if (ret_val)
-                               return ret_val;
-
-                       /* Disable the PHY transmitter */
-                       ret_val = e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
-
-                       if (ret_val)
-                               return ret_val;
-
-                       mdelay(20);
-
-                       ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                                     IGP01E1000_IEEE_FORCE_GIGA);
-                       if (ret_val)
-                               return ret_val;
-                       ret_val =
-                           e1000_write_phy_reg(hw, IGP01E1000_PHY_DSP_FFE,
-                                               IGP01E1000_PHY_DSP_FFE_DEFAULT);
-                       if (ret_val)
-                               return ret_val;
-
-                       ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                                     IGP01E1000_IEEE_RESTART_AUTONEG);
-                       if (ret_val)
-                               return ret_val;
-
-                       mdelay(20);
-
-                       /* Now enable the transmitter */
-                       ret_val =
-                           e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
-
-                       if (ret_val)
-                               return ret_val;
-
-                       hw->ffe_config_state = e1000_ffe_config_enabled;
-               }
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_set_phy_mode - Set PHY to class A mode
- * @hw: Struct containing variables accessed by shared code
- *
- * 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(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 eeprom_data;
-
-       e_dbg("e1000_set_phy_mode");
-
-       if ((hw->mac_type == e1000_82545_rev_3) &&
-           (hw->media_type == e1000_media_type_copper)) {
-               ret_val =
-                   e1000_read_eeprom(hw, EEPROM_PHY_CLASS_WORD, 1,
-                                     &eeprom_data);
-               if (ret_val) {
-                       return ret_val;
-               }
-
-               if ((eeprom_data != EEPROM_RESERVED_WORD) &&
-                   (eeprom_data & EEPROM_PHY_CLASS_A)) {
-                       ret_val =
-                           e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT,
-                                               0x000B);
-                       if (ret_val)
-                               return ret_val;
-                       ret_val =
-                           e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL,
-                                               0x8104);
-                       if (ret_val)
-                               return ret_val;
-
-                       hw->phy_reset_disable = false;
-               }
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_set_d3_lplu_state - set d3 link power state
- * @hw: Struct containing variables accessed by shared code
- * @active: true to enable lplu false to disable lplu.
- *
- * This function sets the lplu state according to the active flag.  When
- * activating lplu this function also disables smart speed and vise 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.
- *
- * returns: - E1000_ERR_PHY if fail to read/write the PHY
- *            E1000_SUCCESS at any other case.
- */
-static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active)
-{
-       s32 ret_val;
-       u16 phy_data;
-       e_dbg("e1000_set_d3_lplu_state");
-
-       if (hw->phy_type != e1000_phy_igp)
-               return E1000_SUCCESS;
-
-       /* During driver activity LPLU should not be used or it will attain link
-        * from the lowest speeds starting from 10Mbps. The capability is used for
-        * Dx transitions and states */
-       if (hw->mac_type == e1000_82541_rev_2
-           || hw->mac_type == e1000_82547_rev_2) {
-               ret_val =
-                   e1000_read_phy_reg(hw, IGP01E1000_GMII_FIFO, &phy_data);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       if (!active) {
-               if (hw->mac_type == e1000_82541_rev_2 ||
-                   hw->mac_type == e1000_82547_rev_2) {
-                       phy_data &= ~IGP01E1000_GMII_FLEX_SPD;
-                       ret_val =
-                           e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                               phy_data);
-                       if (ret_val)
-                               return ret_val;
-               }
-
-               /* 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 (hw->smart_speed == e1000_smart_speed_on) {
-                       ret_val =
-                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                              &phy_data);
-                       if (ret_val)
-                               return ret_val;
-
-                       phy_data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val =
-                           e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                               phy_data);
-                       if (ret_val)
-                               return ret_val;
-               } else if (hw->smart_speed == e1000_smart_speed_off) {
-                       ret_val =
-                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                              &phy_data);
-                       if (ret_val)
-                               return ret_val;
-
-                       phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val =
-                           e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                               phy_data);
-                       if (ret_val)
-                               return ret_val;
-               }
-       } else if ((hw->autoneg_advertised == AUTONEG_ADVERTISE_SPEED_DEFAULT)
-                  || (hw->autoneg_advertised == AUTONEG_ADVERTISE_10_ALL)
-                  || (hw->autoneg_advertised ==
-                      AUTONEG_ADVERTISE_10_100_ALL)) {
-
-               if (hw->mac_type == e1000_82541_rev_2 ||
-                   hw->mac_type == e1000_82547_rev_2) {
-                       phy_data |= IGP01E1000_GMII_FLEX_SPD;
-                       ret_val =
-                           e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                               phy_data);
-                       if (ret_val)
-                               return ret_val;
-               }
-
-               /* When LPLU is enabled we should disable SmartSpeed */
-               ret_val =
-                   e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                      &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val =
-                   e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                       phy_data);
-               if (ret_val)
-                       return ret_val;
-
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_set_vco_speed
- * @hw: Struct containing variables accessed by shared code
- *
- * Change VCO speed register to improve Bit Error Rate performance of SERDES.
- */
-static s32 e1000_set_vco_speed(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 default_page = 0;
-       u16 phy_data;
-
-       e_dbg("e1000_set_vco_speed");
-
-       switch (hw->mac_type) {
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-               break;
-       default:
-               return E1000_SUCCESS;
-       }
-
-       /* Set PHY register 30, page 5, bit 8 to 0 */
-
-       ret_val =
-           e1000_read_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, &default_page);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0005);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy_data &= ~M88E1000_PHY_VCO_REG_BIT8;
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       /* Set PHY register 30, page 4, bit 11 to 1 */
-
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0004);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy_data |= M88E1000_PHY_VCO_REG_BIT11;
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       ret_val =
-           e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, default_page);
-       if (ret_val)
-               return ret_val;
-
-       return E1000_SUCCESS;
-}
-
-
-/**
- * e1000_enable_mng_pass_thru - check for bmc pass through
- * @hw: Struct containing variables accessed by shared code
- *
- * Verifies the hardware needs to allow ARPs to be processed by the host
- * returns: - true/false
- */
-u32 e1000_enable_mng_pass_thru(struct e1000_hw *hw)
-{
-       u32 manc;
-
-       if (hw->asf_firmware_present) {
-               manc = er32(MANC);
-
-               if (!(manc & E1000_MANC_RCV_TCO_EN) ||
-                   !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
-                       return false;
-               if ((manc & E1000_MANC_SMBUS_EN) && !(manc & E1000_MANC_ASF_EN))
-                       return true;
-       }
-       return false;
-}
-
-static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 mii_status_reg;
-       u16 i;
-
-       /* Polarity reversal workaround for forced 10F/10H links. */
-
-       /* Disable the transmitter on the PHY */
-
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
-       if (ret_val)
-               return ret_val;
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFFF);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
-       if (ret_val)
-               return ret_val;
-
-       /* This loop will early-out if the NO link condition has been met. */
-       for (i = PHY_FORCE_TIME; i > 0; i--) {
-               /* Read the MII Status Register and wait for Link Status bit
-                * to be clear.
-                */
-
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       return ret_val;
-
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       return ret_val;
-
-               if ((mii_status_reg & ~MII_SR_LINK_STATUS) == 0)
-                       break;
-               mdelay(100);
-       }
-
-       /* Recommended delay time after link has been lost */
-       mdelay(1000);
-
-       /* Now we will re-enable th transmitter on the PHY */
-
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
-       if (ret_val)
-               return ret_val;
-       mdelay(50);
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFF0);
-       if (ret_val)
-               return ret_val;
-       mdelay(50);
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFF00);
-       if (ret_val)
-               return ret_val;
-       mdelay(50);
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0x0000);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
-       if (ret_val)
-               return ret_val;
-
-       /* This loop will early-out if the link condition has been met. */
-       for (i = PHY_FORCE_TIME; i > 0; i--) {
-               /* Read the MII Status Register and wait for Link Status bit
-                * to be set.
-                */
-
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       return ret_val;
-
-               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       return ret_val;
-
-               if (mii_status_reg & MII_SR_LINK_STATUS)
-                       break;
-               mdelay(100);
-       }
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_get_auto_rd_done
- * @hw: Struct containing variables accessed by shared code
- *
- * Check for EEPROM Auto Read bit done.
- * returns: - E1000_ERR_RESET if fail to reset MAC
- *            E1000_SUCCESS at any other case.
- */
-static s32 e1000_get_auto_rd_done(struct e1000_hw *hw)
-{
-       e_dbg("e1000_get_auto_rd_done");
-       msleep(5);
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_get_phy_cfg_done
- * @hw: Struct containing variables accessed by shared code
- *
- * Checks if the PHY configuration is done
- * returns: - E1000_ERR_RESET if fail to reset MAC
- *            E1000_SUCCESS at any other case.
- */
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
-{
-       e_dbg("e1000_get_phy_cfg_done");
-       mdelay(10);
-       return E1000_SUCCESS;
-}
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
deleted file mode 100644 (file)
index 5c9a840..0000000
+++ /dev/null
@@ -1,3103 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 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
-
-*******************************************************************************/
-
-/* e1000_hw.h
- * Structures, enums, and macros for the MAC
- */
-
-#ifndef _E1000_HW_H_
-#define _E1000_HW_H_
-
-#include "e1000_osdep.h"
-
-
-/* Forward declarations of structures used by the shared code */
-struct e1000_hw;
-struct e1000_hw_stats;
-
-/* Enumerated types specific to the e1000 hardware */
-/* Media Access Controllers */
-typedef enum {
-       e1000_undefined = 0,
-       e1000_82542_rev2_0,
-       e1000_82542_rev2_1,
-       e1000_82543,
-       e1000_82544,
-       e1000_82540,
-       e1000_82545,
-       e1000_82545_rev_3,
-       e1000_82546,
-       e1000_ce4100,
-       e1000_82546_rev_3,
-       e1000_82541,
-       e1000_82541_rev_2,
-       e1000_82547,
-       e1000_82547_rev_2,
-       e1000_num_macs
-} e1000_mac_type;
-
-typedef enum {
-       e1000_eeprom_uninitialized = 0,
-       e1000_eeprom_spi,
-       e1000_eeprom_microwire,
-       e1000_eeprom_flash,
-       e1000_eeprom_none,      /* No NVM support */
-       e1000_num_eeprom_types
-} e1000_eeprom_type;
-
-/* Media Types */
-typedef enum {
-       e1000_media_type_copper = 0,
-       e1000_media_type_fiber = 1,
-       e1000_media_type_internal_serdes = 2,
-       e1000_num_media_types
-} e1000_media_type;
-
-typedef enum {
-       e1000_10_half = 0,
-       e1000_10_full = 1,
-       e1000_100_half = 2,
-       e1000_100_full = 3
-} e1000_speed_duplex_type;
-
-/* Flow Control Settings */
-typedef enum {
-       E1000_FC_NONE = 0,
-       E1000_FC_RX_PAUSE = 1,
-       E1000_FC_TX_PAUSE = 2,
-       E1000_FC_FULL = 3,
-       E1000_FC_DEFAULT = 0xFF
-} e1000_fc_type;
-
-struct e1000_shadow_ram {
-       u16 eeprom_word;
-       bool modified;
-};
-
-/* PCI bus types */
-typedef enum {
-       e1000_bus_type_unknown = 0,
-       e1000_bus_type_pci,
-       e1000_bus_type_pcix,
-       e1000_bus_type_reserved
-} e1000_bus_type;
-
-/* PCI bus speeds */
-typedef enum {
-       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_reserved
-} e1000_bus_speed;
-
-/* PCI bus widths */
-typedef enum {
-       e1000_bus_width_unknown = 0,
-       e1000_bus_width_32,
-       e1000_bus_width_64,
-       e1000_bus_width_reserved
-} e1000_bus_width;
-
-/* PHY status info structure and supporting enums */
-typedef enum {
-       e1000_cable_length_50 = 0,
-       e1000_cable_length_50_80,
-       e1000_cable_length_80_110,
-       e1000_cable_length_110_140,
-       e1000_cable_length_140,
-       e1000_cable_length_undefined = 0xFF
-} e1000_cable_length;
-
-typedef enum {
-       e1000_gg_cable_length_60 = 0,
-       e1000_gg_cable_length_60_115 = 1,
-       e1000_gg_cable_length_115_150 = 2,
-       e1000_gg_cable_length_150 = 4
-} e1000_gg_cable_length;
-
-typedef enum {
-       e1000_igp_cable_length_10 = 10,
-       e1000_igp_cable_length_20 = 20,
-       e1000_igp_cable_length_30 = 30,
-       e1000_igp_cable_length_40 = 40,
-       e1000_igp_cable_length_50 = 50,
-       e1000_igp_cable_length_60 = 60,
-       e1000_igp_cable_length_70 = 70,
-       e1000_igp_cable_length_80 = 80,
-       e1000_igp_cable_length_90 = 90,
-       e1000_igp_cable_length_100 = 100,
-       e1000_igp_cable_length_110 = 110,
-       e1000_igp_cable_length_115 = 115,
-       e1000_igp_cable_length_120 = 120,
-       e1000_igp_cable_length_130 = 130,
-       e1000_igp_cable_length_140 = 140,
-       e1000_igp_cable_length_150 = 150,
-       e1000_igp_cable_length_160 = 160,
-       e1000_igp_cable_length_170 = 170,
-       e1000_igp_cable_length_180 = 180
-} e1000_igp_cable_length;
-
-typedef enum {
-       e1000_10bt_ext_dist_enable_normal = 0,
-       e1000_10bt_ext_dist_enable_lower,
-       e1000_10bt_ext_dist_enable_undefined = 0xFF
-} e1000_10bt_ext_dist_enable;
-
-typedef enum {
-       e1000_rev_polarity_normal = 0,
-       e1000_rev_polarity_reversed,
-       e1000_rev_polarity_undefined = 0xFF
-} e1000_rev_polarity;
-
-typedef enum {
-       e1000_downshift_normal = 0,
-       e1000_downshift_activated,
-       e1000_downshift_undefined = 0xFF
-} e1000_downshift;
-
-typedef enum {
-       e1000_smart_speed_default = 0,
-       e1000_smart_speed_on,
-       e1000_smart_speed_off
-} e1000_smart_speed;
-
-typedef enum {
-       e1000_polarity_reversal_enabled = 0,
-       e1000_polarity_reversal_disabled,
-       e1000_polarity_reversal_undefined = 0xFF
-} e1000_polarity_reversal;
-
-typedef enum {
-       e1000_auto_x_mode_manual_mdi = 0,
-       e1000_auto_x_mode_manual_mdix,
-       e1000_auto_x_mode_auto1,
-       e1000_auto_x_mode_auto2,
-       e1000_auto_x_mode_undefined = 0xFF
-} e1000_auto_x_mode;
-
-typedef enum {
-       e1000_1000t_rx_status_not_ok = 0,
-       e1000_1000t_rx_status_ok,
-       e1000_1000t_rx_status_undefined = 0xFF
-} e1000_1000t_rx_status;
-
-typedef enum {
-       e1000_phy_m88 = 0,
-       e1000_phy_igp,
-       e1000_phy_8211,
-       e1000_phy_8201,
-       e1000_phy_undefined = 0xFF
-} e1000_phy_type;
-
-typedef enum {
-       e1000_ms_hw_default = 0,
-       e1000_ms_force_master,
-       e1000_ms_force_slave,
-       e1000_ms_auto
-} e1000_ms_type;
-
-typedef enum {
-       e1000_ffe_config_enabled = 0,
-       e1000_ffe_config_active,
-       e1000_ffe_config_blocked
-} e1000_ffe_config;
-
-typedef enum {
-       e1000_dsp_config_disabled = 0,
-       e1000_dsp_config_enabled,
-       e1000_dsp_config_activated,
-       e1000_dsp_config_undefined = 0xFF
-} e1000_dsp_config;
-
-struct e1000_phy_info {
-       e1000_cable_length cable_length;
-       e1000_10bt_ext_dist_enable extended_10bt_distance;
-       e1000_rev_polarity cable_polarity;
-       e1000_downshift downshift;
-       e1000_polarity_reversal polarity_correction;
-       e1000_auto_x_mode mdix_mode;
-       e1000_1000t_rx_status local_rx;
-       e1000_1000t_rx_status remote_rx;
-};
-
-struct e1000_phy_stats {
-       u32 idle_errors;
-       u32 receive_errors;
-};
-
-struct e1000_eeprom_info {
-       e1000_eeprom_type type;
-       u16 word_size;
-       u16 opcode_bits;
-       u16 address_bits;
-       u16 delay_usec;
-       u16 page_size;
-};
-
-/* Flex ASF Information */
-#define E1000_HOST_IF_MAX_SIZE  2048
-
-typedef enum {
-       e1000_byte_align = 0,
-       e1000_word_align = 1,
-       e1000_dword_align = 2
-} e1000_align_type;
-
-/* Error Codes */
-#define E1000_SUCCESS      0
-#define E1000_ERR_EEPROM   1
-#define E1000_ERR_PHY      2
-#define E1000_ERR_CONFIG   3
-#define E1000_ERR_PARAM    4
-#define E1000_ERR_MAC_TYPE 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_BYTE_SWAP_WORD(_value) ((((_value) & 0x00ff) << 8) | \
-                                     (((_value) & 0xff00) >> 8))
-
-/* Function prototypes */
-/* Initialization */
-s32 e1000_reset_hw(struct e1000_hw *hw);
-s32 e1000_init_hw(struct e1000_hw *hw);
-s32 e1000_set_mac_type(struct e1000_hw *hw);
-void e1000_set_media_type(struct e1000_hw *hw);
-
-/* Link Configuration */
-s32 e1000_setup_link(struct e1000_hw *hw);
-s32 e1000_phy_setup_autoneg(struct e1000_hw *hw);
-void e1000_config_collision_dist(struct e1000_hw *hw);
-s32 e1000_check_for_link(struct e1000_hw *hw);
-s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 * speed, u16 * duplex);
-s32 e1000_force_mac_fc(struct e1000_hw *hw);
-
-/* PHY */
-s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 * phy_data);
-s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 data);
-s32 e1000_phy_hw_reset(struct e1000_hw *hw);
-s32 e1000_phy_reset(struct e1000_hw *hw);
-s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-s32 e1000_validate_mdi_setting(struct e1000_hw *hw);
-
-/* EEPROM Functions */
-s32 e1000_init_eeprom_params(struct e1000_hw *hw);
-
-/* MNG HOST IF functions */
-u32 e1000_enable_mng_pass_thru(struct e1000_hw *hw);
-
-#define E1000_MNG_DHCP_TX_PAYLOAD_CMD   64
-#define E1000_HI_MAX_MNG_DATA_LENGTH    0x6F8  /* Host Interface data length */
-
-#define E1000_MNG_DHCP_COMMAND_TIMEOUT  10     /* Time in ms to process MNG command */
-#define E1000_MNG_DHCP_COOKIE_OFFSET    0x6F0  /* Cookie offset */
-#define E1000_MNG_DHCP_COOKIE_LENGTH    0x10   /* Cookie length */
-#define E1000_MNG_IAMT_MODE             0x3
-#define E1000_MNG_ICH_IAMT_MODE         0x2
-#define E1000_IAMT_SIGNATURE            0x544D4149     /* Intel(R) Active Management Technology signature */
-
-#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING_SUPPORT 0x1       /* DHCP parsing enabled */
-#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT    0x2       /* DHCP parsing enabled */
-#define E1000_VFTA_ENTRY_SHIFT                       0x5
-#define E1000_VFTA_ENTRY_MASK                        0x7F
-#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK              0x1F
-
-struct e1000_host_mng_command_header {
-       u8 command_id;
-       u8 checksum;
-       u16 reserved1;
-       u16 reserved2;
-       u16 command_length;
-};
-
-struct e1000_host_mng_command_info {
-       struct e1000_host_mng_command_header command_header;    /* Command Head/Command Result Head has 4 bytes */
-       u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];  /* Command data can length 0..0x658 */
-};
-#ifdef __BIG_ENDIAN
-struct e1000_host_mng_dhcp_cookie {
-       u32 signature;
-       u16 vlan_id;
-       u8 reserved0;
-       u8 status;
-       u32 reserved1;
-       u8 checksum;
-       u8 reserved3;
-       u16 reserved2;
-};
-#else
-struct e1000_host_mng_dhcp_cookie {
-       u32 signature;
-       u8 status;
-       u8 reserved0;
-       u16 vlan_id;
-       u32 reserved1;
-       u16 reserved2;
-       u8 reserved3;
-       u8 checksum;
-};
-#endif
-
-bool e1000_check_mng_mode(struct e1000_hw *hw);
-s32 e1000_read_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 * data);
-s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw);
-s32 e1000_update_eeprom_checksum(struct e1000_hw *hw);
-s32 e1000_write_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 * data);
-s32 e1000_read_mac_addr(struct e1000_hw *hw);
-
-/* Filters (multicast, vlan, receive) */
-u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 * mc_addr);
-void e1000_mta_set(struct e1000_hw *hw, u32 hash_value);
-void e1000_rar_set(struct e1000_hw *hw, u8 * mc_addr, u32 rar_index);
-void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value);
-
-/* LED functions */
-s32 e1000_setup_led(struct e1000_hw *hw);
-s32 e1000_cleanup_led(struct e1000_hw *hw);
-s32 e1000_led_on(struct e1000_hw *hw);
-s32 e1000_led_off(struct e1000_hw *hw);
-s32 e1000_blink_led_start(struct e1000_hw *hw);
-
-/* Adaptive IFS Functions */
-
-/* Everything else */
-void e1000_reset_adaptive(struct e1000_hw *hw);
-void e1000_update_adaptive(struct e1000_hw *hw);
-void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats,
-                           u32 frame_len, u8 * mac_addr);
-void e1000_get_bus_info(struct e1000_hw *hw);
-void e1000_pci_set_mwi(struct e1000_hw *hw);
-void e1000_pci_clear_mwi(struct e1000_hw *hw);
-void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc);
-int e1000_pcix_get_mmrbc(struct e1000_hw *hw);
-/* Port I/O is only supported on 82544 and newer */
-void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value);
-
-#define E1000_READ_REG_IO(a, reg) \
-    e1000_read_reg_io((a), E1000_##reg)
-#define E1000_WRITE_REG_IO(a, reg, val) \
-    e1000_write_reg_io((a), E1000_##reg, val)
-
-/* PCI Device IDs */
-#define E1000_DEV_ID_82542               0x1000
-#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_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_82547GI             0x1075
-#define E1000_DEV_ID_82541GI             0x1076
-#define E1000_DEV_ID_82541GI_MOBILE      0x1077
-#define E1000_DEV_ID_82541GI_LF          0x107C
-#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_82547EI             0x1019
-#define E1000_DEV_ID_82547EI_MOBILE      0x101A
-#define E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 0x10B5
-#define E1000_DEV_ID_INTEL_CE4100_GBE    0x2E6E
-
-#define NODE_ADDRESS_SIZE 6
-#define ETH_LENGTH_OF_ADDRESS 6
-
-/* MAC decode size is 128K - This is the size of BAR0 */
-#define MAC_DECODE_SIZE (128 * 1024)
-
-#define E1000_82542_2_0_REV_ID 2
-#define E1000_82542_2_1_REV_ID 3
-#define E1000_REVISION_0       0
-#define E1000_REVISION_1       1
-#define E1000_REVISION_2       2
-#define E1000_REVISION_3       3
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-/* The sizes (in bytes) of a ethernet packet */
-#define ENET_HEADER_SIZE             14
-#define MINIMUM_ETHERNET_FRAME_SIZE  64        /* With FCS */
-#define ETHERNET_FCS_SIZE            4
-#define MINIMUM_ETHERNET_PACKET_SIZE \
-    (MINIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
-#define CRC_LENGTH                   ETHERNET_FCS_SIZE
-#define MAX_JUMBO_FRAME_SIZE         0x3F00
-
-/* 802.1q VLAN Packet Sizes */
-#define VLAN_TAG_SIZE  4       /* 802.3ac tag (not DMAed) */
-
-/* Ethertype field values */
-#define ETHERNET_IEEE_VLAN_TYPE 0x8100 /* 802.3ac packet */
-#define ETHERNET_IP_TYPE        0x0800 /* IP packets */
-#define ETHERNET_ARP_TYPE       0x0806 /* Address Resolution Protocol (ARP) */
-
-/* Packet Header defines */
-#define IP_PROTOCOL_TCP    6
-#define IP_PROTOCOL_UDP    0x11
-
-/* 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)
-
-/* Number of high/low register pairs in the RAR. The RAR (Receive Address
- * Registers) holds the directed and multicast addresses that we monitor. We
- * reserve one of these spots for our directed address, allowing us room for
- * E1000_RAR_ENTRIES - 1 multicast addresses.
- */
-#define E1000_RAR_ENTRIES 15
-
-#define MIN_NUMBER_OF_DESCRIPTORS  8
-#define MAX_NUMBER_OF_DESCRIPTORS  0xFFF8
-
-/* 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 */
-};
-
-/* 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_IPIDV    0x200  /* IP identification valid */
-#define E1000_RXD_STAT_UDPV     0x400  /* Valid UDP checksum */
-#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_RXDPS_HDRSTAT_HDRSP        0x00008000
-#define E1000_RXDPS_HDRSTAT_HDRLEN_MASK  0x000003FF
-
-/* 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)
-
-/* 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;
-};
-
-/* Transmit Descriptor bit definitions */
-#define E1000_TXD_DTYP_D     0x00100000        /* Data Descriptor */
-#define E1000_TXD_DTYP_C     0x00000000        /* Context Descriptor */
-#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 */
-
-/* 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;
-};
-
-/* Filters */
-#define E1000_NUM_UNICAST          16  /* Unicast filter entries */
-#define E1000_MC_TBL_SIZE          128 /* Multicast Filter Table (4096 bits) */
-#define E1000_VLAN_FILTER_TBL_SIZE 128 /* VLAN Filter Table (4096 bits) */
-
-/* Receive Address Register */
-struct e1000_rar {
-       volatile __le32 low;    /* receive address low */
-       volatile __le32 high;   /* receive address high */
-};
-
-/* Number of entries in the Multicast Table Array (MTA). */
-#define E1000_NUM_MTA_REGISTERS 128
-
-/* IPv4 Address Table Entry */
-struct e1000_ipv4_at_entry {
-       volatile u32 ipv4_addr; /* IP Address (RW) */
-       volatile u32 reserved;
-};
-
-/* Four wakeup IP addresses are supported */
-#define E1000_WAKEUP_IP_ADDRESS_COUNT_MAX 4
-#define E1000_IP4AT_SIZE                  E1000_WAKEUP_IP_ADDRESS_COUNT_MAX
-#define E1000_IP6AT_SIZE                  1
-
-/* IPv6 Address Table Entry */
-struct e1000_ipv6_at_entry {
-       volatile u8 ipv6_addr[16];
-};
-
-/* Flexible Filter Length Table Entry */
-struct e1000_fflt_entry {
-       volatile u32 length;    /* Flexible Filter Length (RW) */
-       volatile u32 reserved;
-};
-
-/* Flexible Filter Mask Table Entry */
-struct e1000_ffmt_entry {
-       volatile u32 mask;      /* Flexible Filter Mask (RW) */
-       volatile u32 reserved;
-};
-
-/* Flexible Filter Value Table Entry */
-struct e1000_ffvt_entry {
-       volatile u32 value;     /* Flexible Filter Value (RW) */
-       volatile u32 reserved;
-};
-
-/* 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
-
-#define E1000_DISABLE_SERDES_LOOPBACK   0x0400
-
-/* Register Set. (82543, 82544)
- *
- * Registers are defined to be 32 bits and  should be accessed as 32 bit values.
- * These registers are physically located on the NIC, but are mapped into the
- * host memory address space.
- *
- * RW - register is both readable and writable
- * RO - register is read only
- * WO - register is write only
- * R/clr - register is read only and is cleared when read
- * A - register array
- */
-#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 */
-
-extern void __iomem *ce4100_gbe_mdio_base_virt;
-#define INTEL_CE_GBE_MDIO_RCOMP_BASE    (ce4100_gbe_mdio_base_virt)
-#define E1000_MDIO_STS  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0)
-#define E1000_MDIO_CMD  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 4)
-#define E1000_MDIO_DRV  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 8)
-#define E1000_MDC_CMD   (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0xC)
-#define E1000_RCOMP_CTL (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0x20)
-#define E1000_RCOMP_STS (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0x24)
-
-#define E1000_SCTL     0x00024 /* SerDes Control - RW */
-#define E1000_FEXTNVM  0x00028 /* Future Extended NVM register */
-#define E1000_FCAL     0x00028 /* Flow Control Address Low - RW */
-#define E1000_FCAH     0x0002C /* Flow Control Address High -RW */
-#define E1000_FCT      0x00030 /* Flow Control Type - 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 */
-
-/* Auxiliary Control Register. This register is CE4100 specific,
- * RMII/RGMII function is switched by this register - RW
- * Following are bits definitions of the Auxiliary Control Register
- */
-#define E1000_CTL_AUX  0x000E0
-#define E1000_CTL_AUX_END_SEL_SHIFT     10
-#define E1000_CTL_AUX_ENDIANESS_SHIFT   8
-#define E1000_CTL_AUX_RGMII_RMII_SHIFT  0
-
-/* descriptor and packet transfer use CTL_AUX.ENDIANESS */
-#define E1000_CTL_AUX_DES_PKT   (0x0 << E1000_CTL_AUX_END_SEL_SHIFT)
-/* descriptor use CTL_AUX.ENDIANESS, packet use default */
-#define E1000_CTL_AUX_DES       (0x1 << E1000_CTL_AUX_END_SEL_SHIFT)
-/* descriptor use default, packet use CTL_AUX.ENDIANESS */
-#define E1000_CTL_AUX_PKT       (0x2 << E1000_CTL_AUX_END_SEL_SHIFT)
-/* all use CTL_AUX.ENDIANESS */
-#define E1000_CTL_AUX_ALL       (0x3 << E1000_CTL_AUX_END_SEL_SHIFT)
-
-#define E1000_CTL_AUX_RGMII     (0x0 << E1000_CTL_AUX_RGMII_RMII_SHIFT)
-#define E1000_CTL_AUX_RMII      (0x1 << E1000_CTL_AUX_RGMII_RMII_SHIFT)
-
-/* LW little endian, Byte big endian */
-#define E1000_CTL_AUX_LWLE_BBE  (0x0 << E1000_CTL_AUX_ENDIANESS_SHIFT)
-#define E1000_CTL_AUX_LWLE_BLE  (0x1 << E1000_CTL_AUX_ENDIANESS_SHIFT)
-#define E1000_CTL_AUX_LWBE_BBE  (0x2 << E1000_CTL_AUX_ENDIANESS_SHIFT)
-#define E1000_CTL_AUX_LWBE_BLE  (0x3 << E1000_CTL_AUX_ENDIANESS_SHIFT)
-
-#define E1000_RCTL     0x00100 /* RX Control - RW */
-#define E1000_RDTR1    0x02820 /* RX Delay Timer (1) - RW */
-#define E1000_RDBAL1   0x02900 /* RX Descriptor Base Address Low (1) - RW */
-#define E1000_RDBAH1   0x02904 /* RX Descriptor Base Address High (1) - RW */
-#define E1000_RDLEN1   0x02908 /* RX Descriptor Length (1) - RW */
-#define E1000_RDH1     0x02910 /* RX Descriptor Head (1) - RW */
-#define E1000_RDT1     0x02918 /* RX Descriptor Tail (1) - 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 FEXTNVM_SW_CONFIG  0x0001
-#define E1000_PBA      0x01000 /* Packet Buffer Allocation - RW */
-#define E1000_PBS      0x01008 /* Packet Buffer Size */
-#define E1000_EEMNGCTL 0x01010 /* MNG EEprom Control */
-#define E1000_FLASH_UPDATES 1000
-#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_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_RDBAL    0x02800 /* RX Descriptor Base Address Low - RW */
-#define E1000_RDBAH    0x02804 /* RX Descriptor Base Address High - RW */
-#define E1000_RDLEN    0x02808 /* RX Descriptor Length - RW */
-#define E1000_RDH      0x02810 /* RX Descriptor Head - RW */
-#define E1000_RDT      0x02818 /* RX Descriptor Tail - RW */
-#define E1000_RDTR     0x02820 /* RX Delay Timer - RW */
-#define E1000_RDBAL0   E1000_RDBAL     /* RX Desc Base Address Low (0) - RW */
-#define E1000_RDBAH0   E1000_RDBAH     /* RX Desc Base Address High (0) - RW */
-#define E1000_RDLEN0   E1000_RDLEN     /* RX Desc Length (0) - RW */
-#define E1000_RDH0     E1000_RDH       /* RX Desc Head (0) - RW */
-#define E1000_RDT0     E1000_RDT       /* RX Desc Tail (0) - RW */
-#define E1000_RDTR0    E1000_RDTR      /* RX Delay Timer (0) - RW */
-#define E1000_RXDCTL   0x02828 /* RX Descriptor Control queue 0 - RW */
-#define E1000_RXDCTL1  0x02928 /* RX Descriptor Control queue 1 - RW */
-#define E1000_RADV     0x0282C /* RX Interrupt Absolute Delay Timer - RW */
-#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_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_TDBAL    0x03800 /* TX Descriptor Base Address Low - RW */
-#define E1000_TDBAH    0x03804 /* TX Descriptor Base Address High - RW */
-#define E1000_TDLEN    0x03808 /* TX Descriptor Length - RW */
-#define E1000_TDH      0x03810 /* TX Descriptor Head - RW */
-#define E1000_TDT      0x03818 /* TX Descripotr Tail - RW */
-#define E1000_TIDV     0x03820 /* TX Interrupt Delay Value - RW */
-#define E1000_TXDCTL   0x03828 /* TX Descriptor Control - RW */
-#define E1000_TADV     0x0382C /* TX Interrupt Absolute Delay Val - RW */
-#define E1000_TSPMT    0x03830 /* TCP Segmentation PAD & Min Threshold - RW */
-#define E1000_TARC0    0x03840 /* TX Arbitration Count (0) */
-#define E1000_TDBAL1   0x03900 /* TX Desc Base Address Low (1) - RW */
-#define E1000_TDBAH1   0x03904 /* TX Desc Base Address High (1) - RW */
-#define E1000_TDLEN1   0x03908 /* TX Desc Length (1) - RW */
-#define E1000_TDH1     0x03910 /* TX Desc Head (1) - RW */
-#define E1000_TDT1     0x03918 /* TX Desc Tail (1) - RW */
-#define E1000_TXDCTL1  0x03928 /* TX Descriptor Control (1) - RW */
-#define E1000_TARC1    0x03940 /* TX Arbitration Count (1) */
-#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 Packet Timer Expire Count */
-#define E1000_ICRXATC  0x04108 /* Interrupt Cause Rx Absolute Timer Expire Count */
-#define E1000_ICTXPTC  0x0410C /* Interrupt Cause Tx Packet Timer Expire Count */
-#define E1000_ICTXATC  0x04110 /* Interrupt Cause Tx Absolute Timer Expire Count */
-#define E1000_ICTXQEC  0x04118 /* Interrupt Cause Tx Queue Empty Count */
-#define E1000_ICTXQMTC 0x0411C /* Interrupt Cause Tx Queue Minimum Threshold Count */
-#define E1000_ICRXDMTC 0x04120 /* Interrupt Cause Rx Descriptor Minimum Threshold Count */
-#define E1000_ICRXOC   0x04124 /* Interrupt Cause Receiver Overrun Count */
-#define E1000_RXCSUM   0x05000 /* RX Checksum Control - RW */
-#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_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_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_KUMCTRLSTA 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_GCR       0x05B00        /* PCI-Ex Control */
-#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_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_RETA      0x05C00        /* Redirection Table - RW Array */
-#define E1000_RSSRK     0x05C80        /* RSS Random Key - RW Array */
-#define E1000_RSSIM     0x05864        /* RSS Interrupt Mask */
-#define E1000_RSSIR     0x05868        /* RSS Interrupt Request */
-/* Register Set (82542)
- *
- * Some of the 82542 registers are located at different offsets than they are
- * in more current versions of the 8254x. Despite the difference in location,
- * the registers function in the same manner.
- */
-#define E1000_82542_CTL_AUX  E1000_CTL_AUX
-#define E1000_82542_CTRL     E1000_CTRL
-#define E1000_82542_CTRL_DUP E1000_CTRL_DUP
-#define E1000_82542_STATUS   E1000_STATUS
-#define E1000_82542_EECD     E1000_EECD
-#define E1000_82542_EERD     E1000_EERD
-#define E1000_82542_CTRL_EXT E1000_CTRL_EXT
-#define E1000_82542_FLA      E1000_FLA
-#define E1000_82542_MDIC     E1000_MDIC
-#define E1000_82542_SCTL     E1000_SCTL
-#define E1000_82542_FEXTNVM  E1000_FEXTNVM
-#define E1000_82542_FCAL     E1000_FCAL
-#define E1000_82542_FCAH     E1000_FCAH
-#define E1000_82542_FCT      E1000_FCT
-#define E1000_82542_VET      E1000_VET
-#define E1000_82542_RA       0x00040
-#define E1000_82542_ICR      E1000_ICR
-#define E1000_82542_ITR      E1000_ITR
-#define E1000_82542_ICS      E1000_ICS
-#define E1000_82542_IMS      E1000_IMS
-#define E1000_82542_IMC      E1000_IMC
-#define E1000_82542_RCTL     E1000_RCTL
-#define E1000_82542_RDTR     0x00108
-#define E1000_82542_RDBAL    0x00110
-#define E1000_82542_RDBAH    0x00114
-#define E1000_82542_RDLEN    0x00118
-#define E1000_82542_RDH      0x00120
-#define E1000_82542_RDT      0x00128
-#define E1000_82542_RDTR0    E1000_82542_RDTR
-#define E1000_82542_RDBAL0   E1000_82542_RDBAL
-#define E1000_82542_RDBAH0   E1000_82542_RDBAH
-#define E1000_82542_RDLEN0   E1000_82542_RDLEN
-#define E1000_82542_RDH0     E1000_82542_RDH
-#define E1000_82542_RDT0     E1000_82542_RDT
-#define E1000_82542_SRRCTL(_n) (0x280C + ((_n) << 8))  /* Split and Replication
-                                                        * RX Control - RW */
-#define E1000_82542_DCA_RXCTRL(_n) (0x02814 + ((_n) << 8))
-#define E1000_82542_RDBAH3   0x02B04   /* RX Desc Base High Queue 3 - RW */
-#define E1000_82542_RDBAL3   0x02B00   /* RX Desc Low Queue 3 - RW */
-#define E1000_82542_RDLEN3   0x02B08   /* RX Desc Length Queue 3 - RW */
-#define E1000_82542_RDH3     0x02B10   /* RX Desc Head Queue 3 - RW */
-#define E1000_82542_RDT3     0x02B18   /* RX Desc Tail Queue 3 - RW */
-#define E1000_82542_RDBAL2   0x02A00   /* RX Desc Base Low Queue 2 - RW */
-#define E1000_82542_RDBAH2   0x02A04   /* RX Desc Base High Queue 2 - RW */
-#define E1000_82542_RDLEN2   0x02A08   /* RX Desc Length Queue 2 - RW */
-#define E1000_82542_RDH2     0x02A10   /* RX Desc Head Queue 2 - RW */
-#define E1000_82542_RDT2     0x02A18   /* RX Desc Tail Queue 2 - RW */
-#define E1000_82542_RDTR1    0x00130
-#define E1000_82542_RDBAL1   0x00138
-#define E1000_82542_RDBAH1   0x0013C
-#define E1000_82542_RDLEN1   0x00140
-#define E1000_82542_RDH1     0x00148
-#define E1000_82542_RDT1     0x00150
-#define E1000_82542_FCRTH    0x00160
-#define E1000_82542_FCRTL    0x00168
-#define E1000_82542_FCTTV    E1000_FCTTV
-#define E1000_82542_TXCW     E1000_TXCW
-#define E1000_82542_RXCW     E1000_RXCW
-#define E1000_82542_MTA      0x00200
-#define E1000_82542_TCTL     E1000_TCTL
-#define E1000_82542_TCTL_EXT E1000_TCTL_EXT
-#define E1000_82542_TIPG     E1000_TIPG
-#define E1000_82542_TDBAL    0x00420
-#define E1000_82542_TDBAH    0x00424
-#define E1000_82542_TDLEN    0x00428
-#define E1000_82542_TDH      0x00430
-#define E1000_82542_TDT      0x00438
-#define E1000_82542_TIDV     0x00440
-#define E1000_82542_TBT      E1000_TBT
-#define E1000_82542_AIT      E1000_AIT
-#define E1000_82542_VFTA     0x00600
-#define E1000_82542_LEDCTL   E1000_LEDCTL
-#define E1000_82542_PBA      E1000_PBA
-#define E1000_82542_PBS      E1000_PBS
-#define E1000_82542_EEMNGCTL E1000_EEMNGCTL
-#define E1000_82542_EEARBC   E1000_EEARBC
-#define E1000_82542_FLASHT   E1000_FLASHT
-#define E1000_82542_EEWR     E1000_EEWR
-#define E1000_82542_FLSWCTL  E1000_FLSWCTL
-#define E1000_82542_FLSWDATA E1000_FLSWDATA
-#define E1000_82542_FLSWCNT  E1000_FLSWCNT
-#define E1000_82542_FLOP     E1000_FLOP
-#define E1000_82542_EXTCNF_CTRL  E1000_EXTCNF_CTRL
-#define E1000_82542_EXTCNF_SIZE  E1000_EXTCNF_SIZE
-#define E1000_82542_PHY_CTRL E1000_PHY_CTRL
-#define E1000_82542_ERT      E1000_ERT
-#define E1000_82542_RXDCTL   E1000_RXDCTL
-#define E1000_82542_RXDCTL1  E1000_RXDCTL1
-#define E1000_82542_RADV     E1000_RADV
-#define E1000_82542_RSRPD    E1000_RSRPD
-#define E1000_82542_TXDMAC   E1000_TXDMAC
-#define E1000_82542_KABGTXD  E1000_KABGTXD
-#define E1000_82542_TDFHS    E1000_TDFHS
-#define E1000_82542_TDFTS    E1000_TDFTS
-#define E1000_82542_TDFPC    E1000_TDFPC
-#define E1000_82542_TXDCTL   E1000_TXDCTL
-#define E1000_82542_TADV     E1000_TADV
-#define E1000_82542_TSPMT    E1000_TSPMT
-#define E1000_82542_CRCERRS  E1000_CRCERRS
-#define E1000_82542_ALGNERRC E1000_ALGNERRC
-#define E1000_82542_SYMERRS  E1000_SYMERRS
-#define E1000_82542_RXERRC   E1000_RXERRC
-#define E1000_82542_MPC      E1000_MPC
-#define E1000_82542_SCC      E1000_SCC
-#define E1000_82542_ECOL     E1000_ECOL
-#define E1000_82542_MCC      E1000_MCC
-#define E1000_82542_LATECOL  E1000_LATECOL
-#define E1000_82542_COLC     E1000_COLC
-#define E1000_82542_DC       E1000_DC
-#define E1000_82542_TNCRS    E1000_TNCRS
-#define E1000_82542_SEC      E1000_SEC
-#define E1000_82542_CEXTERR  E1000_CEXTERR
-#define E1000_82542_RLEC     E1000_RLEC
-#define E1000_82542_XONRXC   E1000_XONRXC
-#define E1000_82542_XONTXC   E1000_XONTXC
-#define E1000_82542_XOFFRXC  E1000_XOFFRXC
-#define E1000_82542_XOFFTXC  E1000_XOFFTXC
-#define E1000_82542_FCRUC    E1000_FCRUC
-#define E1000_82542_PRC64    E1000_PRC64
-#define E1000_82542_PRC127   E1000_PRC127
-#define E1000_82542_PRC255   E1000_PRC255
-#define E1000_82542_PRC511   E1000_PRC511
-#define E1000_82542_PRC1023  E1000_PRC1023
-#define E1000_82542_PRC1522  E1000_PRC1522
-#define E1000_82542_GPRC     E1000_GPRC
-#define E1000_82542_BPRC     E1000_BPRC
-#define E1000_82542_MPRC     E1000_MPRC
-#define E1000_82542_GPTC     E1000_GPTC
-#define E1000_82542_GORCL    E1000_GORCL
-#define E1000_82542_GORCH    E1000_GORCH
-#define E1000_82542_GOTCL    E1000_GOTCL
-#define E1000_82542_GOTCH    E1000_GOTCH
-#define E1000_82542_RNBC     E1000_RNBC
-#define E1000_82542_RUC      E1000_RUC
-#define E1000_82542_RFC      E1000_RFC
-#define E1000_82542_ROC      E1000_ROC
-#define E1000_82542_RJC      E1000_RJC
-#define E1000_82542_MGTPRC   E1000_MGTPRC
-#define E1000_82542_MGTPDC   E1000_MGTPDC
-#define E1000_82542_MGTPTC   E1000_MGTPTC
-#define E1000_82542_TORL     E1000_TORL
-#define E1000_82542_TORH     E1000_TORH
-#define E1000_82542_TOTL     E1000_TOTL
-#define E1000_82542_TOTH     E1000_TOTH
-#define E1000_82542_TPR      E1000_TPR
-#define E1000_82542_TPT      E1000_TPT
-#define E1000_82542_PTC64    E1000_PTC64
-#define E1000_82542_PTC127   E1000_PTC127
-#define E1000_82542_PTC255   E1000_PTC255
-#define E1000_82542_PTC511   E1000_PTC511
-#define E1000_82542_PTC1023  E1000_PTC1023
-#define E1000_82542_PTC1522  E1000_PTC1522
-#define E1000_82542_MPTC     E1000_MPTC
-#define E1000_82542_BPTC     E1000_BPTC
-#define E1000_82542_TSCTC    E1000_TSCTC
-#define E1000_82542_TSCTFC   E1000_TSCTFC
-#define E1000_82542_RXCSUM   E1000_RXCSUM
-#define E1000_82542_WUC      E1000_WUC
-#define E1000_82542_WUFC     E1000_WUFC
-#define E1000_82542_WUS      E1000_WUS
-#define E1000_82542_MANC     E1000_MANC
-#define E1000_82542_IPAV     E1000_IPAV
-#define E1000_82542_IP4AT    E1000_IP4AT
-#define E1000_82542_IP6AT    E1000_IP6AT
-#define E1000_82542_WUPL     E1000_WUPL
-#define E1000_82542_WUPM     E1000_WUPM
-#define E1000_82542_FFLT     E1000_FFLT
-#define E1000_82542_TDFH     0x08010
-#define E1000_82542_TDFT     0x08018
-#define E1000_82542_FFMT     E1000_FFMT
-#define E1000_82542_FFVT     E1000_FFVT
-#define E1000_82542_HOST_IF  E1000_HOST_IF
-#define E1000_82542_IAM         E1000_IAM
-#define E1000_82542_EEMNGCTL    E1000_EEMNGCTL
-#define E1000_82542_PSRCTL      E1000_PSRCTL
-#define E1000_82542_RAID        E1000_RAID
-#define E1000_82542_TARC0       E1000_TARC0
-#define E1000_82542_TDBAL1      E1000_TDBAL1
-#define E1000_82542_TDBAH1      E1000_TDBAH1
-#define E1000_82542_TDLEN1      E1000_TDLEN1
-#define E1000_82542_TDH1        E1000_TDH1
-#define E1000_82542_TDT1        E1000_TDT1
-#define E1000_82542_TXDCTL1     E1000_TXDCTL1
-#define E1000_82542_TARC1       E1000_TARC1
-#define E1000_82542_RFCTL       E1000_RFCTL
-#define E1000_82542_GCR         E1000_GCR
-#define E1000_82542_GSCL_1      E1000_GSCL_1
-#define E1000_82542_GSCL_2      E1000_GSCL_2
-#define E1000_82542_GSCL_3      E1000_GSCL_3
-#define E1000_82542_GSCL_4      E1000_GSCL_4
-#define E1000_82542_FACTPS      E1000_FACTPS
-#define E1000_82542_SWSM        E1000_SWSM
-#define E1000_82542_FWSM        E1000_FWSM
-#define E1000_82542_FFLT_DBG    E1000_FFLT_DBG
-#define E1000_82542_IAC         E1000_IAC
-#define E1000_82542_ICRXPTC     E1000_ICRXPTC
-#define E1000_82542_ICRXATC     E1000_ICRXATC
-#define E1000_82542_ICTXPTC     E1000_ICTXPTC
-#define E1000_82542_ICTXATC     E1000_ICTXATC
-#define E1000_82542_ICTXQEC     E1000_ICTXQEC
-#define E1000_82542_ICTXQMTC    E1000_ICTXQMTC
-#define E1000_82542_ICRXDMTC    E1000_ICRXDMTC
-#define E1000_82542_ICRXOC      E1000_ICRXOC
-#define E1000_82542_HICR        E1000_HICR
-
-#define E1000_82542_CPUVEC      E1000_CPUVEC
-#define E1000_82542_MRQC        E1000_MRQC
-#define E1000_82542_RETA        E1000_RETA
-#define E1000_82542_RSSRK       E1000_RSSRK
-#define E1000_82542_RSSIM       E1000_RSSIM
-#define E1000_82542_RSSIR       E1000_RSSIR
-#define E1000_82542_KUMCTRLSTA E1000_KUMCTRLSTA
-#define E1000_82542_SW_FW_SYNC E1000_SW_FW_SYNC
-
-/* Statistics counters collected by the MAC */
-struct e1000_hw_stats {
-       u64 crcerrs;
-       u64 algnerrc;
-       u64 symerrs;
-       u64 rxerrc;
-       u64 txerrc;
-       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 gorcl;
-       u64 gorch;
-       u64 gotcl;
-       u64 gotch;
-       u64 rnbc;
-       u64 ruc;
-       u64 rfc;
-       u64 roc;
-       u64 rlerrc;
-       u64 rjc;
-       u64 mgprc;
-       u64 mgpdc;
-       u64 mgptc;
-       u64 torl;
-       u64 torh;
-       u64 totl;
-       u64 toth;
-       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;
-};
-
-/* Structure containing variables used by the shared code (e1000_hw.c) */
-struct e1000_hw {
-       u8 __iomem *hw_addr;
-       u8 __iomem *flash_address;
-       e1000_mac_type mac_type;
-       e1000_phy_type phy_type;
-       u32 phy_init_script;
-       e1000_media_type media_type;
-       void *back;
-       struct e1000_shadow_ram *eeprom_shadow_ram;
-       u32 flash_bank_size;
-       u32 flash_base_addr;
-       e1000_fc_type fc;
-       e1000_bus_speed bus_speed;
-       e1000_bus_width bus_width;
-       e1000_bus_type bus_type;
-       struct e1000_eeprom_info eeprom;
-       e1000_ms_type master_slave;
-       e1000_ms_type original_master_slave;
-       e1000_ffe_config ffe_config_state;
-       u32 asf_firmware_present;
-       u32 eeprom_semaphore_present;
-       unsigned long io_base;
-       u32 phy_id;
-       u32 phy_revision;
-       u32 phy_addr;
-       u32 original_fc;
-       u32 txcw;
-       u32 autoneg_failed;
-       u32 max_frame_size;
-       u32 min_frame_size;
-       u32 mc_filter_type;
-       u32 num_mc_addrs;
-       u32 collision_delta;
-       u32 tx_packet_delta;
-       u32 ledctl_default;
-       u32 ledctl_mode1;
-       u32 ledctl_mode2;
-       bool tx_pkt_filtering;
-       struct e1000_host_mng_dhcp_cookie mng_cookie;
-       u16 phy_spd_default;
-       u16 autoneg_advertised;
-       u16 pci_cmd_word;
-       u16 fc_high_water;
-       u16 fc_low_water;
-       u16 fc_pause_time;
-       u16 current_ifs_val;
-       u16 ifs_min_val;
-       u16 ifs_max_val;
-       u16 ifs_step_size;
-       u16 ifs_ratio;
-       u16 device_id;
-       u16 vendor_id;
-       u16 subsystem_id;
-       u16 subsystem_vendor_id;
-       u8 revision_id;
-       u8 autoneg;
-       u8 mdix;
-       u8 forced_speed_duplex;
-       u8 wait_autoneg_complete;
-       u8 dma_fairness;
-       u8 mac_addr[NODE_ADDRESS_SIZE];
-       u8 perm_mac_addr[NODE_ADDRESS_SIZE];
-       bool disable_polarity_correction;
-       bool speed_downgraded;
-       e1000_smart_speed smart_speed;
-       e1000_dsp_config dsp_config_state;
-       bool get_link_status;
-       bool serdes_has_link;
-       bool tbi_compatibility_en;
-       bool tbi_compatibility_on;
-       bool laa_is_present;
-       bool phy_reset_disable;
-       bool initialize_hw_bits_disable;
-       bool fc_send_xon;
-       bool fc_strict_ieee;
-       bool report_tx_early;
-       bool adaptive_ifs;
-       bool ifs_params_forced;
-       bool in_ifs_mode;
-       bool mng_reg_access_disabled;
-       bool leave_av_bit_off;
-       bool bad_tx_carr_stats_fd;
-       bool has_smbus;
-};
-
-#define E1000_EEPROM_SWDPIN0   0x0001  /* SWDPIN 0 EEPROM Value */
-#define E1000_EEPROM_LED_LOGIC 0x0020  /* Led Logic Word */
-#define E1000_EEPROM_RW_REG_DATA   16  /* Offset to data in EEPROM read/write registers */
-#define E1000_EEPROM_RW_REG_DONE   2   /* Offset to READ/WRITE done bit */
-#define E1000_EEPROM_RW_REG_START  1   /* First bit for telling part to start operation */
-#define E1000_EEPROM_RW_ADDR_SHIFT 2   /* Shift to the address bits */
-#define E1000_EEPROM_POLL_WRITE    1   /* Flag for polling for write complete */
-#define E1000_EEPROM_POLL_READ     0   /* Flag for polling for read complete */
-/* Register Bit Masks */
-/* 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 requests */
-#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 manageability engine */
-
-/* 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 EEPROM/Flash */
-#define E1000_STATUS_ASDV       0x00000300     /* Auto speed detect value */
-#define E1000_STATUS_DOCK_CI    0x00000800     /* Change in Dock/Undock state. Clear on write '0'. */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000      /* Status of Master requests. */
-#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 */
-
-/* EEPROM/Flash Control */
-#define E1000_EECD_SK        0x00000001        /* EEPROM Clock */
-#define E1000_EECD_CS        0x00000002        /* EEPROM Chip Select */
-#define E1000_EECD_DI        0x00000004        /* EEPROM Data In */
-#define E1000_EECD_DO        0x00000008        /* EEPROM 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        /* EEPROM Access Request */
-#define E1000_EECD_GNT       0x00000080        /* EEPROM Access Grant */
-#define E1000_EECD_PRES      0x00000100        /* EEPROM Present */
-#define E1000_EECD_SIZE      0x00000200        /* EEPROM Size (0=64 word 1=256 word) */
-#define E1000_EECD_ADDR_BITS 0x00000400        /* EEPROM Addressing bits based on type
-                                        * (0-small, 1-large) */
-#define E1000_EECD_TYPE      0x00002000        /* EEPROM Type (1-SPI, 0-Microwire) */
-#ifndef E1000_EEPROM_GRANT_ATTEMPTS
-#define E1000_EEPROM_GRANT_ATTEMPTS 1000       /* EEPROM # attempts to gain grant */
-#endif
-#define E1000_EECD_AUTO_RD          0x00000200 /* EEPROM Auto Read done */
-#define E1000_EECD_SIZE_EX_MASK     0x00007800 /* EEprom 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_STM_OPCODE     0xDB00
-#define E1000_HICR_FW_RESET  0xC0
-
-#define E1000_SHADOW_RAM_WORDS     2048
-#define E1000_ICH_NVM_SIG_WORD     0x13
-#define E1000_ICH_NVM_SIG_MASK     0xC0
-
-/* EEPROM Read */
-#define E1000_EERD_START      0x00000001       /* Start Read */
-#define E1000_EERD_DONE       0x00000010       /* Read Done */
-#define E1000_EERD_ADDR_SHIFT 8
-#define E1000_EERD_ADDR_MASK  0x0000FF00       /* Read Address */
-#define E1000_EERD_DATA_SHIFT 16
-#define E1000_EERD_DATA_MASK  0xFFFF0000       /* Read Data */
-
-/* SPI EEPROM Status Register */
-#define EEPROM_STATUS_RDY_SPI  0x01
-#define EEPROM_STATUS_WEN_SPI  0x02
-#define EEPROM_STATUS_BP0_SPI  0x04
-#define EEPROM_STATUS_BP1_SPI  0x08
-#define EEPROM_STATUS_WPEN_SPI 0x80
-
-/* 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 */
-#define E1000_CTRL_EXT_SDP4_DATA 0x00000010    /* Value of SW Defineable Pin 4 */
-#define E1000_CTRL_EXT_SDP5_DATA 0x00000020    /* Value of SW Defineable Pin 5 */
-#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
-#define E1000_CTRL_EXT_SDP6_DATA 0x00000040    /* Value of SW Defineable Pin 6 */
-#define E1000_CTRL_EXT_SDP7_DATA 0x00000080    /* Value of SW Defineable Pin 7 */
-#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_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_SERDES  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
-#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_DRV_LOAD       0x10000000       /* Driver loaded bit for FW */
-#define E1000_CTRL_EXT_IAME           0x08000000       /* Interrupt acknowledge Auto-mask */
-#define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000       /* Clear Interrupt timers after IMS clear */
-#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
-
-/* 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
-
-#define INTEL_CE_GBE_MDIC_OP_WRITE      0x04000000
-#define INTEL_CE_GBE_MDIC_OP_READ       0x00000000
-#define INTEL_CE_GBE_MDIC_GO            0x80000000
-#define INTEL_CE_GBE_MDIC_READ_ERROR    0x80000000
-
-#define E1000_KUMCTRLSTA_MASK           0x0000FFFF
-#define E1000_KUMCTRLSTA_OFFSET         0x001F0000
-#define E1000_KUMCTRLSTA_OFFSET_SHIFT   16
-#define E1000_KUMCTRLSTA_REN            0x00200000
-
-#define E1000_KUMCTRLSTA_OFFSET_FIFO_CTRL      0x00000000
-#define E1000_KUMCTRLSTA_OFFSET_CTRL           0x00000001
-#define E1000_KUMCTRLSTA_OFFSET_INB_CTRL       0x00000002
-#define E1000_KUMCTRLSTA_OFFSET_DIAG           0x00000003
-#define E1000_KUMCTRLSTA_OFFSET_TIMEOUTS       0x00000004
-#define E1000_KUMCTRLSTA_OFFSET_INB_PARAM      0x00000009
-#define E1000_KUMCTRLSTA_OFFSET_HD_CTRL        0x00000010
-#define E1000_KUMCTRLSTA_OFFSET_M2P_SERDES     0x0000001E
-#define E1000_KUMCTRLSTA_OFFSET_M2P_MODES      0x0000001F
-
-/* FIFO Control */
-#define E1000_KUMCTRLSTA_FIFO_CTRL_RX_BYPASS   0x00000008
-#define E1000_KUMCTRLSTA_FIFO_CTRL_TX_BYPASS   0x00000800
-
-/* In-Band Control */
-#define E1000_KUMCTRLSTA_INB_CTRL_LINK_STATUS_TX_TIMEOUT_DEFAULT    0x00000500
-#define E1000_KUMCTRLSTA_INB_CTRL_DIS_PADDING  0x00000010
-
-/* Half-Duplex Control */
-#define E1000_KUMCTRLSTA_HD_CTRL_10_100_DEFAULT 0x00000004
-#define E1000_KUMCTRLSTA_HD_CTRL_1000_DEFAULT  0x00000000
-
-#define E1000_KUMCTRLSTA_OFFSET_K0S_CTRL       0x0000001E
-
-#define E1000_KUMCTRLSTA_DIAG_FELPBK           0x2000
-#define E1000_KUMCTRLSTA_DIAG_NELPBK           0x1000
-
-#define E1000_KUMCTRLSTA_K0S_100_EN            0x2000
-#define E1000_KUMCTRLSTA_K0S_GBE_EN            0x1000
-#define E1000_KUMCTRLSTA_K0S_ENTRY_LATENCY_MASK   0x0003
-
-#define E1000_KABGTXD_BGSQLBIAS                0x00050000
-
-#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_PHY_CTRL_B2B_EN                  0x00000080
-
-/* LED Control */
-#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
-#define E1000_LEDCTL_LED0_MODE_SHIFT      0
-#define E1000_LEDCTL_LED0_BLINK_RATE      0x0000020
-#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      0x0002000
-#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
-
-/* Receive Address */
-#define E1000_RAH_AV  0x80000000       /* Receive descriptor valid */
-
-/* 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_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     /* queue 0 Rx descriptor FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR0 0x00200000     /* queue 0 Tx descriptor FIFO parity error */
-#define E1000_ICR_HOST_ARB_PAR  0x00400000     /* host arb read buffer parity error */
-#define E1000_ICR_PB_PAR        0x00800000     /* packet buffer parity error */
-#define E1000_ICR_RXD_FIFO_PAR1 0x01000000     /* queue 1 Rx descriptor FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR1 0x02000000     /* queue 1 Tx descriptor 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_EPRST         0x00100000     /* ME hardware reset occurs */
-
-/* Interrupt Cause Set */
-#define E1000_ICS_TXDW      E1000_ICR_TXDW     /* Transmit 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        /* queue 0 Rx descriptor FIFO parity error */
-#define E1000_ICS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0        /* queue 0 Tx descriptor 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        /* queue 1 Rx descriptor FIFO parity error */
-#define E1000_ICS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1        /* queue 1 Tx descriptor FIFO parity error */
-#define E1000_ICS_DSW       E1000_ICR_DSW
-#define E1000_ICS_PHYINT    E1000_ICR_PHYINT
-#define E1000_ICS_EPRST     E1000_ICR_EPRST
-
-/* Interrupt Mask Set */
-#define E1000_IMS_TXDW      E1000_ICR_TXDW     /* Transmit 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_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        /* queue 0 Rx descriptor FIFO parity error */
-#define E1000_IMS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0        /* queue 0 Tx descriptor 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        /* queue 1 Rx descriptor FIFO parity error */
-#define E1000_IMS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1        /* queue 1 Tx descriptor FIFO parity error */
-#define E1000_IMS_DSW       E1000_ICR_DSW
-#define E1000_IMS_PHYINT    E1000_ICR_PHYINT
-#define E1000_IMS_EPRST     E1000_ICR_EPRST
-
-/* Interrupt Mask Clear */
-#define E1000_IMC_TXDW      E1000_ICR_TXDW     /* Transmit desc written back */
-#define E1000_IMC_TXQE      E1000_ICR_TXQE     /* Transmit Queue empty */
-#define E1000_IMC_LSC       E1000_ICR_LSC      /* Link Status Change */
-#define E1000_IMC_RXSEQ     E1000_ICR_RXSEQ    /* rx sequence error */
-#define E1000_IMC_RXDMT0    E1000_ICR_RXDMT0   /* rx desc min. threshold */
-#define E1000_IMC_RXO       E1000_ICR_RXO      /* rx overrun */
-#define E1000_IMC_RXT0      E1000_ICR_RXT0     /* rx timer intr */
-#define E1000_IMC_MDAC      E1000_ICR_MDAC     /* MDIO access complete */
-#define E1000_IMC_RXCFG     E1000_ICR_RXCFG    /* RX /c/ ordered set */
-#define E1000_IMC_GPI_EN0   E1000_ICR_GPI_EN0  /* GP Int 0 */
-#define E1000_IMC_GPI_EN1   E1000_ICR_GPI_EN1  /* GP Int 1 */
-#define E1000_IMC_GPI_EN2   E1000_ICR_GPI_EN2  /* GP Int 2 */
-#define E1000_IMC_GPI_EN3   E1000_ICR_GPI_EN3  /* GP Int 3 */
-#define E1000_IMC_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_IMC_SRPD      E1000_ICR_SRPD
-#define E1000_IMC_ACK       E1000_ICR_ACK      /* Receive Ack frame */
-#define E1000_IMC_MNG       E1000_ICR_MNG      /* Manageability event */
-#define E1000_IMC_DOCK      E1000_ICR_DOCK     /* Dock/Undock */
-#define E1000_IMC_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0        /* queue 0 Rx descriptor FIFO parity error */
-#define E1000_IMC_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0        /* queue 0 Tx descriptor FIFO parity error */
-#define E1000_IMC_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR /* host arb read buffer parity error */
-#define E1000_IMC_PB_PAR        E1000_ICR_PB_PAR       /* packet buffer parity error */
-#define E1000_IMC_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1        /* queue 1 Rx descriptor FIFO parity error */
-#define E1000_IMC_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1        /* queue 1 Tx descriptor FIFO parity error */
-#define E1000_IMC_DSW       E1000_ICR_DSW
-#define E1000_IMC_PHYINT    E1000_ICR_PHYINT
-#define E1000_IMC_EPRST     E1000_ICR_EPRST
-
-/* 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 promiscuous enable */
-#define E1000_RCTL_MPE            0x00000010   /* multicast promiscuous enab */
-#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 threshold size */
-#define E1000_RCTL_RDMTS_QUAT     0x00000100   /* rx desc min threshold size */
-#define E1000_RCTL_RDMTS_EIGTH    0x00000200   /* rx desc min threshold 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 */
-
-/* SW_W_SYNC definitions */
-#define E1000_SWFW_EEP_SM     0x0001
-#define E1000_SWFW_PHY0_SM    0x0002
-#define E1000_SWFW_PHY1_SM    0x0004
-#define E1000_SWFW_MAC_CSR_SM 0x0008
-
-/* Receive Descriptor */
-#define E1000_RDT_DELAY 0x0000ffff     /* Delay timer (1=1024us) */
-#define E1000_RDT_FPDB  0x80000000     /* Flush descriptor block */
-#define E1000_RDLEN_LEN 0x0007ff80     /* descriptor length */
-#define E1000_RDH_RDH   0x0000ffff     /* receive descriptor head */
-#define E1000_RDT_RDT   0x0000ffff     /* receive descriptor tail */
-
-/* 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 */
-
-/* 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
-
-/* Receive Descriptor Control */
-#define E1000_RXDCTL_PTHRESH 0x0000003F        /* RXDCTL Prefetch Threshold */
-#define E1000_RXDCTL_HTHRESH 0x00003F00        /* RXDCTL Host Threshold */
-#define E1000_RXDCTL_WTHRESH 0x003F0000        /* RXDCTL Writeback Threshold */
-#define E1000_RXDCTL_GRAN    0x01000000        /* RXDCTL Granularity */
-
-/* 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_COUNT_DESC 0x00400000     /* Enable the counting of desc.
-                                                  still to be processed. */
-/* 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 */
-
-/* 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 */
-/* Extended Transmit Control */
-#define E1000_TCTL_EXT_BST_MASK  0x000003FF    /* Backoff Slot Time */
-#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00    /* Gigabit Carry Extend Padding */
-
-/* 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_IPPCSE    0x00001000      /* IP payload checksum enable */
-#define E1000_RXCSUM_PCSD      0x00002000      /* packet checksum disabled */
-
-/* Multiple Receive Queue Control */
-#define E1000_MRQC_ENABLE_MASK              0x00000003
-#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
-
-/* 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_SPM        0x80000000        /* Enable SPM */
-
-/* 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 0x00000001      /* Link Status Changed */
-#define E1000_WUS_MAG  0x00000002      /* Magic Packet Received */
-#define E1000_WUS_EX   0x00000004      /* Directed Exact Received */
-#define E1000_WUS_MC   0x00000008      /* Directed Multicast Received */
-#define E1000_WUS_BC   0x00000010      /* Broadcast Received */
-#define E1000_WUS_ARP  0x00000020      /* ARP Request Packet Received */
-#define E1000_WUS_IPV4 0x00000040      /* Directed IPv4 Packet Wakeup Received */
-#define E1000_WUS_IPV6 0x00000080      /* Directed IPv6 Packet Wakeup Received */
-#define E1000_WUS_FLX0 0x00010000      /* Flexible Filter 0 Match */
-#define E1000_WUS_FLX1 0x00020000      /* Flexible Filter 1 Match */
-#define E1000_WUS_FLX2 0x00040000      /* Flexible Filter 2 Match */
-#define E1000_WUS_FLX3 0x00080000      /* Flexible Filter 3 Match */
-#define E1000_WUS_FLX_FILTERS 0x000F0000       /* Mask for the 4 flexible filters */
-
-/* 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 */
-#define E1000_MANC_NEIGHBOR_EN   0x00004000    /* Enable Neighbor Discovery
-                                                * Filtering */
-#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 */
-#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000     /* Enable MAC address
-                                                        * filtering */
-#define E1000_MANC_EN_MNG2HOST   0x00200000    /* Enable MNG packets to host
-                                                * memory */
-#define E1000_MANC_EN_IP_ADDR_FILTER    0x00400000     /* Enable IP address
-                                                        * filtering */
-#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 */
-
-/* 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 */
-
-/* FW Semaphore Register */
-#define E1000_FWSM_MODE_MASK    0x0000000E     /* FW mode */
-#define E1000_FWSM_MODE_SHIFT            1
-#define E1000_FWSM_FW_VALID     0x00008000     /* FW established a valid mode */
-
-#define E1000_FWSM_RSPCIPHY        0x00000040  /* Reset PHY on PCI reset */
-#define E1000_FWSM_DISSW           0x10000000  /* FW disable SW Write Access */
-#define E1000_FWSM_SKUSEL_MASK     0x60000000  /* LAN SKU select */
-#define E1000_FWSM_SKUEL_SHIFT     29
-#define E1000_FWSM_SKUSEL_EMB      0x0 /* Embedded SKU */
-#define E1000_FWSM_SKUSEL_CONS     0x1 /* Consumer SKU */
-#define E1000_FWSM_SKUSEL_PERF_100 0x2 /* Perf & Corp 10/100 SKU */
-#define E1000_FWSM_SKUSEL_PERF_GBE 0x3 /* Perf & Copr GbE SKU */
-
-/* FFLT Debug Register */
-#define E1000_FFLT_DBG_INVC     0x00100000     /* Invalid /C/ code handling */
-
-typedef enum {
-       e1000_mng_mode_none = 0,
-       e1000_mng_mode_asf,
-       e1000_mng_mode_pt,
-       e1000_mng_mode_ipmi,
-       e1000_mng_mode_host_interface_only
-} e1000_mng_mode;
-
-/* Host Interface Control Register */
-#define E1000_HICR_EN           0x00000001     /* Enable Bit - RO */
-#define E1000_HICR_C            0x00000002     /* Driver sets this bit when done
-                                                * to put command in RAM */
-#define E1000_HICR_SV           0x00000004     /* Status Validity */
-#define E1000_HICR_FWR          0x00000080     /* FW reset. Set by the Host */
-
-/* Host Interface Command Interface - Address range 0x8800-0x8EFF */
-#define E1000_HI_MAX_DATA_LENGTH         252   /* Host Interface data length */
-#define E1000_HI_MAX_BLOCK_BYTE_LENGTH  1792   /* Number of bytes in range */
-#define E1000_HI_MAX_BLOCK_DWORD_LENGTH  448   /* Number of dwords in range */
-#define E1000_HI_COMMAND_TIMEOUT         500   /* Time in ms to process HI command */
-
-struct e1000_host_command_header {
-       u8 command_id;
-       u8 command_length;
-       u8 command_options;     /* I/F bits for command, status for return */
-       u8 checksum;
-};
-struct e1000_host_command_info {
-       struct e1000_host_command_header command_header;        /* Command Head/Command Result Head has 4 bytes */
-       u8 command_data[E1000_HI_MAX_DATA_LENGTH];      /* Command data can length 0..252 */
-};
-
-/* Host SMB register #0 */
-#define E1000_HSMC0R_CLKIN      0x00000001     /* SMB Clock in */
-#define E1000_HSMC0R_DATAIN     0x00000002     /* SMB Data in */
-#define E1000_HSMC0R_DATAOUT    0x00000004     /* SMB Data out */
-#define E1000_HSMC0R_CLKOUT     0x00000008     /* SMB Clock out */
-
-/* Host SMB register #1 */
-#define E1000_HSMC1R_CLKIN      E1000_HSMC0R_CLKIN
-#define E1000_HSMC1R_DATAIN     E1000_HSMC0R_DATAIN
-#define E1000_HSMC1R_DATAOUT    E1000_HSMC0R_DATAOUT
-#define E1000_HSMC1R_CLKOUT     E1000_HSMC0R_CLKOUT
-
-/* FW Status Register */
-#define E1000_FWSTS_FWS_MASK    0x000000FF     /* FW Status */
-
-/* Wake Up Packet Length */
-#define E1000_WUPL_LENGTH_MASK 0x0FFF  /* Only the lower 12 bits are valid */
-
-#define E1000_MDALIGN          4096
-
-/* PCI-Ex registers*/
-
-/* PCI-Ex Control Register */
-#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 PCI_EX_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)
-
-#define PCI_EX_82566_SNOOP_ALL PCI_EX_NO_SNOOP_ALL
-
-#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000
-/* Function Active and Power State to MNG */
-#define E1000_FACTPS_FUNC0_POWER_STATE_MASK         0x00000003
-#define E1000_FACTPS_LAN0_VALID                     0x00000004
-#define E1000_FACTPS_FUNC0_AUX_EN                   0x00000008
-#define E1000_FACTPS_FUNC1_POWER_STATE_MASK         0x000000C0
-#define E1000_FACTPS_FUNC1_POWER_STATE_SHIFT        6
-#define E1000_FACTPS_LAN1_VALID                     0x00000100
-#define E1000_FACTPS_FUNC1_AUX_EN                   0x00000200
-#define E1000_FACTPS_FUNC2_POWER_STATE_MASK         0x00003000
-#define E1000_FACTPS_FUNC2_POWER_STATE_SHIFT        12
-#define E1000_FACTPS_IDE_ENABLE                     0x00004000
-#define E1000_FACTPS_FUNC2_AUX_EN                   0x00008000
-#define E1000_FACTPS_FUNC3_POWER_STATE_MASK         0x000C0000
-#define E1000_FACTPS_FUNC3_POWER_STATE_SHIFT        18
-#define E1000_FACTPS_SP_ENABLE                      0x00100000
-#define E1000_FACTPS_FUNC3_AUX_EN                   0x00200000
-#define E1000_FACTPS_FUNC4_POWER_STATE_MASK         0x03000000
-#define E1000_FACTPS_FUNC4_POWER_STATE_SHIFT        24
-#define E1000_FACTPS_IPMI_ENABLE                    0x04000000
-#define E1000_FACTPS_FUNC4_AUX_EN                   0x08000000
-#define E1000_FACTPS_MNGCG                          0x20000000
-#define E1000_FACTPS_LAN_FUNC_SEL                   0x40000000
-#define E1000_FACTPS_PM_STATE_CHANGED               0x80000000
-
-/* PCI-Ex Config Space */
-#define PCI_EX_LINK_STATUS           0x12
-#define PCI_EX_LINK_WIDTH_MASK       0x3F0
-#define PCI_EX_LINK_WIDTH_SHIFT      4
-
-/* EEPROM Commands - Microwire */
-#define EEPROM_READ_OPCODE_MICROWIRE  0x6      /* EEPROM read opcode */
-#define EEPROM_WRITE_OPCODE_MICROWIRE 0x5      /* EEPROM write opcode */
-#define EEPROM_ERASE_OPCODE_MICROWIRE 0x7      /* EEPROM erase opcode */
-#define EEPROM_EWEN_OPCODE_MICROWIRE  0x13     /* EEPROM erase/write enable */
-#define EEPROM_EWDS_OPCODE_MICROWIRE  0x10     /* EEPROM erase/write disable */
-
-/* EEPROM Commands - SPI */
-#define EEPROM_MAX_RETRY_SPI        5000       /* Max wait of 5ms, for RDY signal */
-#define EEPROM_READ_OPCODE_SPI      0x03       /* EEPROM read opcode */
-#define EEPROM_WRITE_OPCODE_SPI     0x02       /* EEPROM write opcode */
-#define EEPROM_A8_OPCODE_SPI        0x08       /* opcode bit-3 = address bit-8 */
-#define EEPROM_WREN_OPCODE_SPI      0x06       /* EEPROM set Write Enable latch */
-#define EEPROM_WRDI_OPCODE_SPI      0x04       /* EEPROM reset Write Enable latch */
-#define EEPROM_RDSR_OPCODE_SPI      0x05       /* EEPROM read Status register */
-#define EEPROM_WRSR_OPCODE_SPI      0x01       /* EEPROM write Status register */
-#define EEPROM_ERASE4K_OPCODE_SPI   0x20       /* EEPROM ERASE 4KB */
-#define EEPROM_ERASE64K_OPCODE_SPI  0xD8       /* EEPROM ERASE 64KB */
-#define EEPROM_ERASE256_OPCODE_SPI  0xDB       /* EEPROM ERASE 256B */
-
-/* EEPROM Size definitions */
-#define EEPROM_WORD_SIZE_SHIFT  6
-#define EEPROM_SIZE_SHIFT       10
-#define EEPROM_SIZE_MASK        0x1C00
-
-/* EEPROM Word Offsets */
-#define EEPROM_COMPAT                 0x0003
-#define EEPROM_ID_LED_SETTINGS        0x0004
-#define EEPROM_VERSION                0x0005
-#define EEPROM_SERDES_AMPLITUDE       0x0006   /* For SERDES output amplitude adjustment. */
-#define EEPROM_PHY_CLASS_WORD         0x0007
-#define EEPROM_INIT_CONTROL1_REG      0x000A
-#define EEPROM_INIT_CONTROL2_REG      0x000F
-#define EEPROM_SWDEF_PINS_CTRL_PORT_1 0x0010
-#define EEPROM_INIT_CONTROL3_PORT_B   0x0014
-#define EEPROM_INIT_3GIO_3            0x001A
-#define EEPROM_SWDEF_PINS_CTRL_PORT_0 0x0020
-#define EEPROM_INIT_CONTROL3_PORT_A   0x0024
-#define EEPROM_CFG                    0x0012
-#define EEPROM_FLASH_VERSION          0x0032
-#define EEPROM_CHECKSUM_REG           0x003F
-
-#define E1000_EEPROM_CFG_DONE         0x00040000       /* MNG config cycle done */
-#define E1000_EEPROM_CFG_DONE_PORT_1  0x00080000       /* ...for second port */
-
-/* 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
-
-/* Mask bits for SERDES amplitude adjustment in Word 6 of the EEPROM */
-#define EEPROM_SERDES_AMPLITUDE_MASK  0x000F
-
-/* Mask bit for PHY class in Word 7 of the EEPROM */
-#define EEPROM_PHY_CLASS_A   0x8000
-
-/* Mask bits for fields in Word 0x0a of the EEPROM */
-#define EEPROM_WORD0A_ILOS   0x0010
-#define EEPROM_WORD0A_SWDPIO 0x01E0
-#define EEPROM_WORD0A_LRST   0x0200
-#define EEPROM_WORD0A_FD     0x0400
-#define EEPROM_WORD0A_66MHZ  0x0800
-
-/* Mask bits for fields in Word 0x0f of the EEPROM */
-#define EEPROM_WORD0F_PAUSE_MASK 0x3000
-#define EEPROM_WORD0F_PAUSE      0x1000
-#define EEPROM_WORD0F_ASM_DIR    0x2000
-#define EEPROM_WORD0F_ANE        0x0800
-#define EEPROM_WORD0F_SWPDIO_EXT 0x00F0
-#define EEPROM_WORD0F_LPLU       0x0001
-
-/* Mask bits for fields in Word 0x10/0x20 of the EEPROM */
-#define EEPROM_WORD1020_GIGA_DISABLE         0x0010
-#define EEPROM_WORD1020_GIGA_DISABLE_NON_D0A 0x0008
-
-/* Mask bits for fields in Word 0x1a of the EEPROM */
-#define EEPROM_WORD1A_ASPM_MASK  0x000C
-
-/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
-#define EEPROM_SUM 0xBABA
-
-/* EEPROM Map defines (WORD OFFSETS)*/
-#define EEPROM_NODE_ADDRESS_BYTE_0 0
-#define EEPROM_PBA_BYTE_1          8
-
-#define EEPROM_RESERVED_WORD          0xFFFF
-
-/* EEPROM Map Sizes (Byte Counts) */
-#define PBA_SIZE 4
-
-/* Collision related configuration parameters */
-#define E1000_COLLISION_THRESHOLD       15
-#define E1000_CT_SHIFT                  4
-/* Collision distance is a 0-based value that applies to
- * half-duplex-capable hardware only. */
-#define E1000_COLLISION_DISTANCE        63
-#define E1000_COLLISION_DISTANCE_82542  64
-#define E1000_FDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
-#define E1000_HDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
-#define E1000_COLD_SHIFT                12
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define REQ_RX_DESCRIPTOR_MULTIPLE  8
-
-/* 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 E1000_TIPG_IPGR2_SHIFT  20
-
-#define E1000_TXDMAC_DPP 0x00000001
-
-/* Adaptive IFS defines */
-#define TX_THRESHOLD_START     8
-#define TX_THRESHOLD_INCREMENT 10
-#define TX_THRESHOLD_DECREMENT 1
-#define TX_THRESHOLD_STOP      190
-#define TX_THRESHOLD_DISABLE   0
-#define TX_THRESHOLD_TIMER_MS  10000
-#define MIN_NUM_XMITS          1000
-#define IFS_MAX                80
-#define IFS_STEP               10
-#define IFS_MIN                40
-#define IFS_RATIO              4
-
-/* Extended Configuration Control and Size */
-#define E1000_EXTCNF_CTRL_PCIE_WRITE_ENABLE 0x00000001
-#define E1000_EXTCNF_CTRL_PHY_WRITE_ENABLE  0x00000002
-#define E1000_EXTCNF_CTRL_D_UD_ENABLE       0x00000004
-#define E1000_EXTCNF_CTRL_D_UD_LATENCY      0x00000008
-#define E1000_EXTCNF_CTRL_D_UD_OWNER        0x00000010
-#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP 0x00000020
-#define E1000_EXTCNF_CTRL_MDIO_HW_OWNERSHIP 0x00000040
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER   0x0FFF0000
-
-#define E1000_EXTCNF_SIZE_EXT_PHY_LENGTH    0x000000FF
-#define E1000_EXTCNF_SIZE_EXT_DOCK_LENGTH   0x0000FF00
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH   0x00FF0000
-#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE  0x00000001
-#define E1000_EXTCNF_CTRL_SWFLAG            0x00000020
-
-/* PBA constants */
-#define E1000_PBA_8K 0x0008    /* 8KB, default Rx allocation */
-#define E1000_PBA_12K 0x000C   /* 12KB, default Rx allocation */
-#define E1000_PBA_16K 0x0010   /* 16KB, default TX allocation */
-#define E1000_PBA_20K 0x0014
-#define E1000_PBA_22K 0x0016
-#define E1000_PBA_24K 0x0018
-#define E1000_PBA_30K 0x001E
-#define E1000_PBA_32K 0x0020
-#define E1000_PBA_34K 0x0022
-#define E1000_PBA_38K 0x0026
-#define E1000_PBA_40K 0x0028
-#define E1000_PBA_48K 0x0030   /* 48KB, default RX allocation */
-
-#define E1000_PBS_16K E1000_PBA_16K
-
-/* Flow Control Constants */
-#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
-#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
-#define FLOW_CONTROL_TYPE         0x8808
-
-/* The historical defaults for the flow control values are given below. */
-#define FC_DEFAULT_HI_THRESH        (0x8000)   /* 32KB */
-#define FC_DEFAULT_LO_THRESH        (0x4000)   /* 16KB */
-#define FC_DEFAULT_TX_TIMER         (0x100)    /* ~130 us */
-
-/* PCIX Config space */
-#define PCIX_COMMAND_REGISTER    0xE6
-#define PCIX_STATUS_REGISTER_LO  0xE8
-#define PCIX_STATUS_REGISTER_HI  0xEA
-
-#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
-
-/* Number of bits required to shift right the "pause" bits from the
- * EEPROM (bits 13:12) to the "pause" (bits 8:7) field in the TXCW register.
- */
-#define PAUSE_SHIFT 5
-
-/* Number of bits required to shift left the "SWDPIO" bits from the
- * EEPROM (bits 8:5) to the "SWDPIO" (bits 25:22) field in the CTRL register.
- */
-#define SWDPIO_SHIFT 17
-
-/* Number of bits required to shift left the "SWDPIO_EXT" bits from the
- * EEPROM word F (bits 7:4) to the bits 11:8 of The Extended CTRL register.
- */
-#define SWDPIO__EXT_SHIFT 4
-
-/* Number of bits required to shift left the "ILOS" bit from the EEPROM
- * (bit 4) to the "ILOS" (bit 7) field in the CTRL register.
- */
-#define ILOS_SHIFT  3
-
-#define RECEIVE_BUFFER_ALIGN_SIZE  (256)
-
-/* Number of milliseconds we wait for auto-negotiation to complete */
-#define LINK_UP_TIMEOUT             500
-
-/* Number of milliseconds we wait for Eeprom auto read bit done after MAC reset */
-#define AUTO_READ_DONE_TIMEOUT      10
-/* Number of milliseconds we wait for PHY configuration done after MAC reset */
-#define PHY_CFG_TIMEOUT             100
-
-#define E1000_TX_BUFFER_SIZE ((u32)1514)
-
-/* The carrier extension symbol, as received by the NIC. */
-#define CARRIER_EXTENSION   0x0F
-
-/* 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;
- *  }
- *  ...
- */
-
-#define TBI_ACCEPT(adapter, status, errors, length, last_byte) \
-    ((adapter)->tbi_compatibility_on && \
-     (((errors) & E1000_RXD_ERR_FRAME_ERR_MASK) == E1000_RXD_ERR_CE) && \
-     ((last_byte) == CARRIER_EXTENSION) && \
-     (((status) & E1000_RXD_STAT_VP) ? \
-          (((length) > ((adapter)->min_frame_size - VLAN_TAG_SIZE)) && \
-           ((length) <= ((adapter)->max_frame_size + 1))) : \
-          (((length) > (adapter)->min_frame_size) && \
-           ((length) <= ((adapter)->max_frame_size + VLAN_TAG_SIZE + 1)))))
-
-/* Structures, enums, and macros for the PHY */
-
-/* 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
-
-/* PHY 1000 MII Register/Bit Definitions */
-/* PHY Registers defined by IEEE */
-#define PHY_CTRL         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 MAX_PHY_REG_ADDRESS        0x1F        /* 5 bit address bus (0-0x1F) */
-#define MAX_PHY_MULTI_PAGE_REG     0xF /* Registers equal on all pages */
-
-/* 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 */
-
-#define IGP01E1000_IEEE_REGS_PAGE  0x0000
-#define IGP01E1000_IEEE_RESTART_AUTONEG 0x3300
-#define IGP01E1000_IEEE_FORCE_GIGA      0x0140
-
-/* IGP01E1000 Specific Registers */
-#define IGP01E1000_PHY_PORT_CONFIG 0x10        /* PHY Specific Port Config Register */
-#define IGP01E1000_PHY_PORT_STATUS 0x11        /* PHY Specific Status Register */
-#define IGP01E1000_PHY_PORT_CTRL   0x12        /* PHY Specific Control Register */
-#define IGP01E1000_PHY_LINK_HEALTH 0x13        /* PHY Link Health Register */
-#define IGP01E1000_GMII_FIFO       0x14        /* GMII FIFO Register */
-#define IGP01E1000_PHY_CHANNEL_QUALITY 0x15    /* PHY Channel Quality Register */
-#define IGP02E1000_PHY_POWER_MGMT      0x19
-#define IGP01E1000_PHY_PAGE_SELECT     0x1F    /* PHY Page Select Core Register */
-
-/* IGP01E1000 AGC Registers - stores the cable length values*/
-#define IGP01E1000_PHY_AGC_A        0x1172
-#define IGP01E1000_PHY_AGC_B        0x1272
-#define IGP01E1000_PHY_AGC_C        0x1472
-#define IGP01E1000_PHY_AGC_D        0x1872
-
-/* IGP02E1000 AGC Registers for cable length values */
-#define IGP02E1000_PHY_AGC_A        0x11B1
-#define IGP02E1000_PHY_AGC_B        0x12B1
-#define IGP02E1000_PHY_AGC_C        0x14B1
-#define IGP02E1000_PHY_AGC_D        0x18B1
-
-/* IGP01E1000 DSP Reset Register */
-#define IGP01E1000_PHY_DSP_RESET   0x1F33
-#define IGP01E1000_PHY_DSP_SET     0x1F71
-#define IGP01E1000_PHY_DSP_FFE     0x1F35
-
-#define IGP01E1000_PHY_CHANNEL_NUM    4
-#define IGP02E1000_PHY_CHANNEL_NUM    4
-
-#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_ANALOG_TX_STATE      0x2890
-#define IGP01E1000_PHY_ANALOG_CLASS_A       0x2000
-#define IGP01E1000_PHY_FORCE_ANALOG_ENABLE  0x0004
-#define IGP01E1000_PHY_DSP_FFE_CM_CP        0x0069
-
-#define IGP01E1000_PHY_DSP_FFE_DEFAULT      0x002A
-/* IGP01E1000 PCS Initialization register - stores the polarity status when
- * speed = 1000 Mbps. */
-#define IGP01E1000_PHY_PCS_INIT_REG  0x00B4
-#define IGP01E1000_PHY_PCS_CTRL_REG  0x00B5
-
-#define IGP01E1000_ANALOG_REGS_PAGE  0x20C0
-
-/* 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 */
-
-/* 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 */
-
-/* Next Page TX Register */
-#define NPTX_MSG_CODE_FIELD 0x0001     /* NP msg code or unformatted data */
-#define NPTX_TOGGLE         0x0800     /* Toggles between exchanges
-                                        * of different NP
-                                        */
-#define NPTX_ACKNOWLDGE2    0x1000     /* 1 = will comply with msg
-                                        * 0 = cannot comply with msg
-                                        */
-#define NPTX_MSG_PAGE       0x2000     /* formatted(1)/unformatted(0) pg */
-#define NPTX_NEXT_PAGE      0x8000     /* 1 = addition NP will follow
-                                        * 0 = sending last NP
-                                        */
-
-/* Link Partner Next Page Register */
-#define LP_RNPR_MSG_CODE_FIELD 0x0001  /* NP msg code or unformatted data */
-#define LP_RNPR_TOGGLE         0x0800  /* Toggles between exchanges
-                                        * of different NP
-                                        */
-#define LP_RNPR_ACKNOWLDGE2    0x1000  /* 1 = will comply with msg
-                                        * 0 = cannot comply with msg
-                                        */
-#define LP_RNPR_MSG_PAGE       0x2000  /* formatted(1)/unformatted(0) pg */
-#define LP_RNPR_ACKNOWLDGE     0x4000  /* 1 = ACK / 0 = NO ACK */
-#define LP_RNPR_NEXT_PAGE      0x8000  /* 1 = addition NP will follow
-                                        * 0 = sending last NP
-                                        */
-
-/* 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_REMOTE_RX_STATUS_SHIFT          12
-#define SR_1000T_LOCAL_RX_STATUS_SHIFT           13
-#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT    5
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_20            20
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_100           100
-
-/* Extended Status Register */
-#define IEEE_ESR_1000T_HD_CAPS 0x1000  /* 1000T HD capable */
-#define IEEE_ESR_1000T_FD_CAPS 0x2000  /* 1000T FD capable */
-#define IEEE_ESR_1000X_HD_CAPS 0x4000  /* 1000X HD capable */
-#define IEEE_ESR_1000X_FD_CAPS 0x8000  /* 1000X FD capable */
-
-#define PHY_TX_POLARITY_MASK   0x0100  /* register 10h bit 8 (polarity bit) */
-#define PHY_TX_NORMAL_POLARITY 0       /* register 10h bit 8 (normal polarity) */
-
-#define AUTO_POLARITY_DISABLE  0x0010  /* register 11h bit 4 */
-                                     /* (0=enable, 1=disable) */
-
-/* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
-#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
-#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
-#define M88E1000_PSCR_CLK125_DISABLE    0x0010 /* 1=CLK125 low,
-                                                * 0=CLK125 toggling
-                                                */
-#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 */
-#define M88E1000_PSCR_AUTO_X_1000T     0x0040  /* 1000BASE-T: Auto crossover,
-                                                *  100BASE-TX/10BASE-T:
-                                                *  MDI Mode
-                                                */
-#define M88E1000_PSCR_AUTO_X_MODE      0x0060  /* Auto crossover enabled
-                                                * all speeds.
-                                                */
-#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE 0x0080
-                                       /* 1=Enable Extended 10BASE-T distance
-                                        * (Lower 10BASE-T RX Threshold)
-                                        * 0=Normal 10BASE-T RX Threshold */
-#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
-                                       /* 1=5-Bit interface in 100BASE-TX
-                                        * 0=MII interface in 100BASE-TX */
-#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 Transmit */
-
-#define M88E1000_PSCR_POLARITY_REVERSAL_SHIFT    1
-#define M88E1000_PSCR_AUTO_X_MODE_SHIFT          5
-#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT 7
-
-/* 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 */
-#define M88E1000_PSSR_CABLE_LENGTH       0x0380        /* 0=<50M;1=50-80M;2=80-110M;
-                                                * 3=110-140M;4=>140M */
-#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_REV_POLARITY_SHIFT 1
-#define M88E1000_PSSR_DOWNSHIFT_SHIFT    5
-#define M88E1000_PSSR_MDIX_SHIFT         6
-#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-
-/* M88E1000 Extended PHY Specific Control Register */
-#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000   /* 1=Fiber loopback */
-#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000   /* 1=Lost lock detect enabled.
-                                                * Will assert lost lock and bring
-                                                * link down if idle not seen
-                                                * within 1ms in 1000BASE-T
-                                                */
-/* 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
-
-/* IGP01E1000 Specific Port Config Register - R/W */
-#define IGP01E1000_PSCFR_AUTO_MDIX_PAR_DETECT  0x0010
-#define IGP01E1000_PSCFR_PRE_EN                0x0020
-#define IGP01E1000_PSCFR_SMART_SPEED           0x0080
-#define IGP01E1000_PSCFR_DISABLE_TPLOOPBACK    0x0100
-#define IGP01E1000_PSCFR_DISABLE_JABBER        0x0400
-#define IGP01E1000_PSCFR_DISABLE_TRANSMIT      0x2000
-
-/* IGP01E1000 Specific Port Status Register - R/O */
-#define IGP01E1000_PSSR_AUTONEG_FAILED         0x0001  /* RO LH SC */
-#define IGP01E1000_PSSR_POLARITY_REVERSED      0x0002
-#define IGP01E1000_PSSR_CABLE_LENGTH           0x007C
-#define IGP01E1000_PSSR_FULL_DUPLEX            0x0200
-#define IGP01E1000_PSSR_LINK_UP                0x0400
-#define IGP01E1000_PSSR_MDIX                   0x0800
-#define IGP01E1000_PSSR_SPEED_MASK             0xC000  /* speed bits mask */
-#define IGP01E1000_PSSR_SPEED_10MBPS           0x4000
-#define IGP01E1000_PSSR_SPEED_100MBPS          0x8000
-#define IGP01E1000_PSSR_SPEED_1000MBPS         0xC000
-#define IGP01E1000_PSSR_CABLE_LENGTH_SHIFT     0x0002  /* shift right 2 */
-#define IGP01E1000_PSSR_MDIX_SHIFT             0x000B  /* shift right 11 */
-
-/* IGP01E1000 Specific Port Control Register - R/W */
-#define IGP01E1000_PSCR_TP_LOOPBACK            0x0010
-#define IGP01E1000_PSCR_CORRECT_NC_SCMBLR      0x0200
-#define IGP01E1000_PSCR_TEN_CRS_SELECT         0x0400
-#define IGP01E1000_PSCR_FLIP_CHIP              0x0800
-#define IGP01E1000_PSCR_AUTO_MDIX              0x1000
-#define IGP01E1000_PSCR_FORCE_MDI_MDIX         0x2000  /* 0-MDI, 1-MDIX */
-
-/* IGP01E1000 Specific Port Link Health Register */
-#define IGP01E1000_PLHR_SS_DOWNGRADE           0x8000
-#define IGP01E1000_PLHR_GIG_SCRAMBLER_ERROR    0x4000
-#define IGP01E1000_PLHR_MASTER_FAULT           0x2000
-#define IGP01E1000_PLHR_MASTER_RESOLUTION      0x1000
-#define IGP01E1000_PLHR_GIG_REM_RCVR_NOK       0x0800  /* LH */
-#define IGP01E1000_PLHR_IDLE_ERROR_CNT_OFLOW   0x0400  /* LH */
-#define IGP01E1000_PLHR_DATA_ERR_1             0x0200  /* LH */
-#define IGP01E1000_PLHR_DATA_ERR_0             0x0100
-#define IGP01E1000_PLHR_AUTONEG_FAULT          0x0040
-#define IGP01E1000_PLHR_AUTONEG_ACTIVE         0x0010
-#define IGP01E1000_PLHR_VALID_CHANNEL_D        0x0008
-#define IGP01E1000_PLHR_VALID_CHANNEL_C        0x0004
-#define IGP01E1000_PLHR_VALID_CHANNEL_B        0x0002
-#define IGP01E1000_PLHR_VALID_CHANNEL_A        0x0001
-
-/* IGP01E1000 Channel Quality Register */
-#define IGP01E1000_MSE_CHANNEL_D        0x000F
-#define IGP01E1000_MSE_CHANNEL_C        0x00F0
-#define IGP01E1000_MSE_CHANNEL_B        0x0F00
-#define IGP01E1000_MSE_CHANNEL_A        0xF000
-
-#define IGP02E1000_PM_SPD                         0x0001       /* Smart Power Down */
-#define IGP02E1000_PM_D3_LPLU                     0x0004       /* Enable LPLU in non-D0a modes */
-#define IGP02E1000_PM_D0_LPLU                     0x0002       /* Enable LPLU in D0a mode */
-
-/* IGP01E1000 DSP reset macros */
-#define DSP_RESET_ENABLE     0x0
-#define DSP_RESET_DISABLE    0x2
-#define E1000_MAX_DSP_RESETS 10
-
-/* IGP01E1000 & IGP02E1000 AGC Registers */
-
-#define IGP01E1000_AGC_LENGTH_SHIFT 7  /* Coarse - 13:11, Fine - 10:7 */
-#define IGP02E1000_AGC_LENGTH_SHIFT 9  /* Coarse - 15:13, Fine - 12:9 */
-
-/* IGP02E1000 AGC Register Length 9-bit mask */
-#define IGP02E1000_AGC_LENGTH_MASK  0x7F
-
-/* 7 bits (3 Coarse + 4 Fine) --> 128 optional values */
-#define IGP01E1000_AGC_LENGTH_TABLE_SIZE 128
-#define IGP02E1000_AGC_LENGTH_TABLE_SIZE 113
-
-/* The precision error of the cable length is +/- 10 meters */
-#define IGP01E1000_AGC_RANGE    10
-#define IGP02E1000_AGC_RANGE    15
-
-/* IGP01E1000 PCS Initialization register */
-/* bits 3:6 in the PCS registers stores the channels polarity */
-#define IGP01E1000_PHY_POLARITY_MASK    0x0078
-
-/* IGP01E1000 GMII FIFO Register */
-#define IGP01E1000_GMII_FLEX_SPD               0x10    /* Enable flexible speed
-                                                        * on Link-Up */
-#define IGP01E1000_GMII_SPD                    0x20    /* Enable SPD */
-
-/* IGP01E1000 Analog Register */
-#define IGP01E1000_ANALOG_SPARE_FUSE_STATUS       0x20D1
-#define IGP01E1000_ANALOG_FUSE_STATUS             0x20D0
-#define IGP01E1000_ANALOG_FUSE_CONTROL            0x20DC
-#define IGP01E1000_ANALOG_FUSE_BYPASS             0x20DE
-
-#define IGP01E1000_ANALOG_FUSE_POLY_MASK            0xF000
-#define IGP01E1000_ANALOG_FUSE_FINE_MASK            0x0F80
-#define IGP01E1000_ANALOG_FUSE_COARSE_MASK          0x0070
-#define IGP01E1000_ANALOG_SPARE_FUSE_ENABLED        0x0100
-#define IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL    0x0002
-
-#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
-
-/* Bit definitions for valid PHY IDs. */
-/* I = Integrated
- * E = External
- */
-#define M88_VENDOR         0x0141
-#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 M88E1000_12_PHY_ID M88E1000_E_PHY_ID
-#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
-#define M88E1011_I_REV_4   0x04
-#define M88E1111_I_PHY_ID  0x01410CC0
-#define M88E1118_E_PHY_ID  0x01410E40
-#define L1LXT971A_PHY_ID   0x001378E0
-
-#define RTL8211B_PHY_ID    0x001CC910
-#define RTL8201N_PHY_ID    0x8200
-#define RTL_PHY_CTRL_FD    0x0100 /* Full duplex.0=half; 1=full */
-#define RTL_PHY_CTRL_SPD_100    0x200000 /* Force 100Mb */
-
-/* Bits...
- * 15-5: page
- * 4-0: register offset
- */
-#define PHY_PAGE_SHIFT        5
-#define PHY_REG(page, reg)    \
-        (((page) << PHY_PAGE_SHIFT) | ((reg) & MAX_PHY_REG_ADDRESS))
-
-#define IGP3_PHY_PORT_CTRL           \
-        PHY_REG(769, 17)       /* Port General Configuration */
-#define IGP3_PHY_RATE_ADAPT_CTRL \
-        PHY_REG(769, 25)       /* Rate Adapter Control Register */
-
-#define IGP3_KMRN_FIFO_CTRL_STATS \
-        PHY_REG(770, 16)       /* KMRN FIFO's control/status register */
-#define IGP3_KMRN_POWER_MNG_CTRL \
-        PHY_REG(770, 17)       /* KMRN Power Management Control Register */
-#define IGP3_KMRN_INBAND_CTRL \
-        PHY_REG(770, 18)       /* KMRN Inband Control Register */
-#define IGP3_KMRN_DIAG \
-        PHY_REG(770, 19)       /* KMRN Diagnostic register */
-#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS 0x0002    /* RX PCS is not synced */
-#define IGP3_KMRN_ACK_TIMEOUT \
-        PHY_REG(770, 20)       /* KMRN Acknowledge Timeouts register */
-
-#define IGP3_VR_CTRL \
-        PHY_REG(776, 18)       /* Voltage regulator control register */
-#define IGP3_VR_CTRL_MODE_SHUT       0x0200    /* Enter powerdown, shutdown VRs */
-#define IGP3_VR_CTRL_MODE_MASK       0x0300    /* Shutdown VR Mask */
-
-#define IGP3_CAPABILITY \
-        PHY_REG(776, 19)       /* IGP3 Capability Register */
-
-/* Capabilities for SKU Control  */
-#define IGP3_CAP_INITIATE_TEAM       0x0001    /* Able to initiate a team */
-#define IGP3_CAP_WFM                 0x0002    /* Support WoL and PXE */
-#define IGP3_CAP_ASF                 0x0004    /* Support ASF */
-#define IGP3_CAP_LPLU                0x0008    /* Support Low Power Link Up */
-#define IGP3_CAP_DC_AUTO_SPEED       0x0010    /* Support AC/DC Auto Link Speed */
-#define IGP3_CAP_SPD                 0x0020    /* Support Smart Power Down */
-#define IGP3_CAP_MULT_QUEUE          0x0040    /* Support 2 tx & 2 rx queues */
-#define IGP3_CAP_RSS                 0x0080    /* Support RSS */
-#define IGP3_CAP_8021PQ              0x0100    /* Support 802.1Q & 802.1p */
-#define IGP3_CAP_AMT_CB              0x0200    /* Support active manageability and circuit breaker */
-
-#define IGP3_PPC_JORDAN_EN           0x0001
-#define IGP3_PPC_JORDAN_GIGA_SPEED   0x0002
-
-#define IGP3_KMRN_PMC_EE_IDLE_LINK_DIS         0x0001
-#define IGP3_KMRN_PMC_K0S_ENTRY_LATENCY_MASK   0x001E
-#define IGP3_KMRN_PMC_K0S_MODE1_EN_GIGA        0x0020
-#define IGP3_KMRN_PMC_K0S_MODE1_EN_100         0x0040
-
-#define IGP3E1000_PHY_MISC_CTRL                0x1B    /* Misc. Ctrl register */
-#define IGP3_PHY_MISC_DUPLEX_MANUAL_SET        0x1000  /* Duplex Manual Set */
-
-#define IGP3_KMRN_EXT_CTRL  PHY_REG(770, 18)
-#define IGP3_KMRN_EC_DIS_INBAND    0x0080
-
-#define IGP03E1000_E_PHY_ID  0x02A80390
-#define IFE_E_PHY_ID         0x02A80330        /* 10/100 PHY */
-#define IFE_PLUS_E_PHY_ID    0x02A80320
-#define IFE_C_E_PHY_ID       0x02A80310
-
-#define IFE_PHY_EXTENDED_STATUS_CONTROL   0x10 /* 100BaseTx Extended Status, Control and Address */
-#define IFE_PHY_SPECIAL_CONTROL           0x11 /* 100BaseTx PHY special control register */
-#define IFE_PHY_RCV_FALSE_CARRIER         0x13 /* 100BaseTx Receive False Carrier Counter */
-#define IFE_PHY_RCV_DISCONNECT            0x14 /* 100BaseTx Receive Disconnect Counter */
-#define IFE_PHY_RCV_ERROT_FRAME           0x15 /* 100BaseTx Receive Error Frame Counter */
-#define IFE_PHY_RCV_SYMBOL_ERR            0x16 /* Receive Symbol Error Counter */
-#define IFE_PHY_PREM_EOF_ERR              0x17 /* 100BaseTx Receive Premature End Of Frame Error Counter */
-#define IFE_PHY_RCV_EOF_ERR               0x18 /* 10BaseT Receive End Of Frame Error Counter */
-#define IFE_PHY_TX_JABBER_DETECT          0x19 /* 10BaseT Transmit Jabber Detect Counter */
-#define IFE_PHY_EQUALIZER                 0x1A /* PHY Equalizer Control and Status */
-#define IFE_PHY_SPECIAL_CONTROL_LED       0x1B /* PHY special control and LED configuration */
-#define IFE_PHY_MDIX_CONTROL              0x1C /* MDI/MDI-X Control register */
-#define IFE_PHY_HWI_CONTROL               0x1D /* Hardware Integrity Control (HWI) */
-
-#define IFE_PESC_REDUCED_POWER_DOWN_DISABLE  0x2000    /* Default 1 = Disable auto reduced power down */
-#define IFE_PESC_100BTX_POWER_DOWN           0x0400    /* Indicates the power state of 100BASE-TX */
-#define IFE_PESC_10BTX_POWER_DOWN            0x0200    /* Indicates the power state of 10BASE-T */
-#define IFE_PESC_POLARITY_REVERSED           0x0100    /* Indicates 10BASE-T polarity */
-#define IFE_PESC_PHY_ADDR_MASK               0x007C    /* Bit 6:2 for sampled PHY address */
-#define IFE_PESC_SPEED                       0x0002    /* Auto-negotiation speed result 1=100Mbs, 0=10Mbs */
-#define IFE_PESC_DUPLEX                      0x0001    /* Auto-negotiation duplex result 1=Full, 0=Half */
-#define IFE_PESC_POLARITY_REVERSED_SHIFT     8
-
-#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN   0x0100    /* 1 = Dynamic Power Down disabled */
-#define IFE_PSC_FORCE_POLARITY               0x0020    /* 1=Reversed Polarity, 0=Normal */
-#define IFE_PSC_AUTO_POLARITY_DISABLE        0x0010    /* 1=Auto Polarity Disabled, 0=Enabled */
-#define IFE_PSC_JABBER_FUNC_DISABLE          0x0001    /* 1=Jabber Disabled, 0=Normal Jabber Operation */
-#define IFE_PSC_FORCE_POLARITY_SHIFT         5
-#define IFE_PSC_AUTO_POLARITY_DISABLE_SHIFT  4
-
-#define IFE_PMC_AUTO_MDIX                    0x0080    /* 1=enable MDI/MDI-X feature, default 0=disabled */
-#define IFE_PMC_FORCE_MDIX                   0x0040    /* 1=force MDIX-X, 0=force MDI */
-#define IFE_PMC_MDIX_STATUS                  0x0020    /* 1=MDI-X, 0=MDI */
-#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010    /* Resolution algorithm is completed */
-#define IFE_PMC_MDIX_MODE_SHIFT              6
-#define IFE_PHC_MDIX_RESET_ALL_MASK          0x0000    /* Disable auto MDI-X */
-
-#define IFE_PHC_HWI_ENABLE                   0x8000    /* Enable the HWI feature */
-#define IFE_PHC_ABILITY_CHECK                0x4000    /* 1= Test Passed, 0=failed */
-#define IFE_PHC_TEST_EXEC                    0x2000    /* PHY launch test pulses on the wire */
-#define IFE_PHC_HIGHZ                        0x0200    /* 1 = Open Circuit */
-#define IFE_PHC_LOWZ                         0x0400    /* 1 = Short Circuit */
-#define IFE_PHC_LOW_HIGH_Z_MASK              0x0600    /* Mask for indication type of problem on the line */
-#define IFE_PHC_DISTANCE_MASK                0x01FF    /* Mask for distance to the cable problem, in 80cm granularity */
-#define IFE_PHC_RESET_ALL_MASK               0x0000    /* Disable HWI */
-#define IFE_PSCL_PROBE_MODE                  0x0020    /* LED Probe mode */
-#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 */
-
-#define ICH_FLASH_COMMAND_TIMEOUT            5000      /* 5000 uSecs - adjusted */
-#define ICH_FLASH_ERASE_TIMEOUT              3000000   /* Up to 3 seconds - worst case */
-#define ICH_FLASH_CYCLE_REPEAT_COUNT         10        /* 10 cycles */
-#define ICH_FLASH_SEG_SIZE_256               256
-#define ICH_FLASH_SEG_SIZE_4K                4096
-#define ICH_FLASH_SEG_SIZE_64K               65536
-
-#define ICH_CYCLE_READ                       0x0
-#define ICH_CYCLE_RESERVED                   0x1
-#define ICH_CYCLE_WRITE                      0x2
-#define ICH_CYCLE_ERASE                      0x3
-
-#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
-#define ICH_FLASH_FRACC    0x0050
-#define ICH_FLASH_FREG0    0x0054
-#define ICH_FLASH_FREG1    0x0058
-#define ICH_FLASH_FREG2    0x005C
-#define ICH_FLASH_FREG3    0x0060
-#define ICH_FLASH_FPR0     0x0074
-#define ICH_FLASH_FPR1     0x0078
-#define ICH_FLASH_SSFSTS   0x0090
-#define ICH_FLASH_SSFCTL   0x0092
-#define ICH_FLASH_PREOP    0x0094
-#define ICH_FLASH_OPTYPE   0x0096
-#define ICH_FLASH_OPMENU   0x0098
-
-#define ICH_FLASH_REG_MAPSIZE      0x00A0
-#define ICH_FLASH_SECTOR_SIZE      4096
-#define ICH_GFPREG_BASE_MASK       0x1FFF
-#define ICH_FLASH_LINEAR_ADDR_MASK 0x00FFFFFF
-
-/* Miscellaneous PHY bit definitions. */
-#define PHY_PREAMBLE        0xFFFFFFFF
-#define PHY_SOF             0x01
-#define PHY_OP_READ         0x02
-#define PHY_OP_WRITE        0x01
-#define PHY_TURNAROUND      0x02
-#define PHY_PREAMBLE_SIZE   32
-#define MII_CR_SPEED_1000   0x0040
-#define MII_CR_SPEED_100    0x2000
-#define MII_CR_SPEED_10     0x0000
-#define E1000_PHY_ADDRESS   0x01
-#define PHY_AUTO_NEG_TIME   45 /* 4.5 Seconds */
-#define PHY_FORCE_TIME      20 /* 2.0 Seconds */
-#define PHY_REVISION_MASK   0xFFFFFFF0
-#define DEVICE_SPEED_MASK   0x00000300 /* Device Ctrl Reg Speed Mask */
-#define REG4_SPEED_MASK     0x01E0
-#define REG9_SPEED_MASK     0x0300
-#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
-#define ADVERTISE_1000_FULL 0x0020
-#define AUTONEG_ADVERTISE_SPEED_DEFAULT 0x002F /* Everything but 1000-Half */
-#define AUTONEG_ADVERTISE_10_100_ALL    0x000F /* All 10/100 speeds */
-#define AUTONEG_ADVERTISE_10_ALL        0x0003 /* 10Mbps Full & Half speeds */
-
-#endif /* _E1000_HW_H_ */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
deleted file mode 100644 (file)
index f97afda..0000000
+++ /dev/null
@@ -1,4974 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 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
-
-*******************************************************************************/
-
-#include "e1000.h"
-#include <net/ip6_checksum.h>
-#include <linux/io.h>
-#include <linux/prefetch.h>
-#include <linux/bitops.h>
-#include <linux/if_vlan.h>
-
-/* Intel Media SOC GbE MDIO physical base address */
-static unsigned long ce4100_gbe_mdio_base_phy;
-/* Intel Media SOC GbE MDIO virtual base address */
-void __iomem *ce4100_gbe_mdio_base_virt;
-
-char e1000_driver_name[] = "e1000";
-static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-#define DRV_VERSION "7.3.21-k8-NAPI"
-const char e1000_driver_version[] = DRV_VERSION;
-static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
-
-/* e1000_pci_tbl - PCI Device ID Table
- *
- * Last entry must be all 0s
- *
- * Macro expands to...
- *   {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
- */
-static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
-       INTEL_E1000_ETHERNET_DEVICE(0x1000),
-       INTEL_E1000_ETHERNET_DEVICE(0x1001),
-       INTEL_E1000_ETHERNET_DEVICE(0x1004),
-       INTEL_E1000_ETHERNET_DEVICE(0x1008),
-       INTEL_E1000_ETHERNET_DEVICE(0x1009),
-       INTEL_E1000_ETHERNET_DEVICE(0x100C),
-       INTEL_E1000_ETHERNET_DEVICE(0x100D),
-       INTEL_E1000_ETHERNET_DEVICE(0x100E),
-       INTEL_E1000_ETHERNET_DEVICE(0x100F),
-       INTEL_E1000_ETHERNET_DEVICE(0x1010),
-       INTEL_E1000_ETHERNET_DEVICE(0x1011),
-       INTEL_E1000_ETHERNET_DEVICE(0x1012),
-       INTEL_E1000_ETHERNET_DEVICE(0x1013),
-       INTEL_E1000_ETHERNET_DEVICE(0x1014),
-       INTEL_E1000_ETHERNET_DEVICE(0x1015),
-       INTEL_E1000_ETHERNET_DEVICE(0x1016),
-       INTEL_E1000_ETHERNET_DEVICE(0x1017),
-       INTEL_E1000_ETHERNET_DEVICE(0x1018),
-       INTEL_E1000_ETHERNET_DEVICE(0x1019),
-       INTEL_E1000_ETHERNET_DEVICE(0x101A),
-       INTEL_E1000_ETHERNET_DEVICE(0x101D),
-       INTEL_E1000_ETHERNET_DEVICE(0x101E),
-       INTEL_E1000_ETHERNET_DEVICE(0x1026),
-       INTEL_E1000_ETHERNET_DEVICE(0x1027),
-       INTEL_E1000_ETHERNET_DEVICE(0x1028),
-       INTEL_E1000_ETHERNET_DEVICE(0x1075),
-       INTEL_E1000_ETHERNET_DEVICE(0x1076),
-       INTEL_E1000_ETHERNET_DEVICE(0x1077),
-       INTEL_E1000_ETHERNET_DEVICE(0x1078),
-       INTEL_E1000_ETHERNET_DEVICE(0x1079),
-       INTEL_E1000_ETHERNET_DEVICE(0x107A),
-       INTEL_E1000_ETHERNET_DEVICE(0x107B),
-       INTEL_E1000_ETHERNET_DEVICE(0x107C),
-       INTEL_E1000_ETHERNET_DEVICE(0x108A),
-       INTEL_E1000_ETHERNET_DEVICE(0x1099),
-       INTEL_E1000_ETHERNET_DEVICE(0x10B5),
-       INTEL_E1000_ETHERNET_DEVICE(0x2E6E),
-       /* required last entry */
-       {0,}
-};
-
-MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
-
-int e1000_up(struct e1000_adapter *adapter);
-void e1000_down(struct e1000_adapter *adapter);
-void e1000_reinit_locked(struct e1000_adapter *adapter);
-void e1000_reset(struct e1000_adapter *adapter);
-int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
-                             struct e1000_tx_ring *txdr);
-static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rxdr);
-static void e1000_free_tx_resources(struct e1000_adapter *adapter,
-                             struct e1000_tx_ring *tx_ring);
-static void e1000_free_rx_resources(struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rx_ring);
-void e1000_update_stats(struct e1000_adapter *adapter);
-
-static int e1000_init_module(void);
-static void e1000_exit_module(void);
-static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
-static void __devexit e1000_remove(struct pci_dev *pdev);
-static int e1000_alloc_queues(struct e1000_adapter *adapter);
-static int e1000_sw_init(struct e1000_adapter *adapter);
-static int e1000_open(struct net_device *netdev);
-static int e1000_close(struct net_device *netdev);
-static void e1000_configure_tx(struct e1000_adapter *adapter);
-static void e1000_configure_rx(struct e1000_adapter *adapter);
-static void e1000_setup_rctl(struct e1000_adapter *adapter);
-static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter);
-static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter);
-static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
-                                struct e1000_tx_ring *tx_ring);
-static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
-                                struct e1000_rx_ring *rx_ring);
-static void e1000_set_rx_mode(struct net_device *netdev);
-static void e1000_update_phy_info(unsigned long data);
-static void e1000_update_phy_info_task(struct work_struct *work);
-static void e1000_watchdog(unsigned long data);
-static void e1000_82547_tx_fifo_stall(unsigned long data);
-static void e1000_82547_tx_fifo_stall_task(struct work_struct *work);
-static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
-                                   struct net_device *netdev);
-static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
-static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
-static int e1000_set_mac(struct net_device *netdev, void *p);
-static irqreturn_t e1000_intr(int irq, void *data);
-static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
-                              struct e1000_tx_ring *tx_ring);
-static int e1000_clean(struct napi_struct *napi, int budget);
-static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                              struct e1000_rx_ring *rx_ring,
-                              int *work_done, int work_to_do);
-static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_rx_ring *rx_ring,
-                                    int *work_done, int work_to_do);
-static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
-                                  struct e1000_rx_ring *rx_ring,
-                                  int cleaned_count);
-static void e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
-                                        struct e1000_rx_ring *rx_ring,
-                                        int cleaned_count);
-static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
-static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
-                          int cmd);
-static void e1000_enter_82542_rst(struct e1000_adapter *adapter);
-static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
-static void e1000_tx_timeout(struct net_device *dev);
-static void e1000_reset_task(struct work_struct *work);
-static void e1000_smartspeed(struct e1000_adapter *adapter);
-static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
-                                       struct sk_buff *skb);
-
-static bool e1000_vlan_used(struct e1000_adapter *adapter);
-static void e1000_vlan_mode(struct net_device *netdev, u32 features);
-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
-static void e1000_restore_vlan(struct e1000_adapter *adapter);
-
-#ifdef CONFIG_PM
-static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
-static int e1000_resume(struct pci_dev *pdev);
-#endif
-static void e1000_shutdown(struct pci_dev *pdev);
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/* for netdump / net console */
-static void e1000_netpoll (struct net_device *netdev);
-#endif
-
-#define COPYBREAK_DEFAULT 256
-static unsigned int copybreak __read_mostly = COPYBREAK_DEFAULT;
-module_param(copybreak, uint, 0644);
-MODULE_PARM_DESC(copybreak,
-       "Maximum size of packet that is copied to a new buffer on receive");
-
-static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
-                     pci_channel_state_t state);
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev);
-static void e1000_io_resume(struct pci_dev *pdev);
-
-static struct pci_error_handlers e1000_err_handler = {
-       .error_detected = e1000_io_error_detected,
-       .slot_reset = e1000_io_slot_reset,
-       .resume = e1000_io_resume,
-};
-
-static struct pci_driver e1000_driver = {
-       .name     = e1000_driver_name,
-       .id_table = e1000_pci_tbl,
-       .probe    = e1000_probe,
-       .remove   = __devexit_p(e1000_remove),
-#ifdef CONFIG_PM
-       /* Power Management Hooks */
-       .suspend  = e1000_suspend,
-       .resume   = e1000_resume,
-#endif
-       .shutdown = e1000_shutdown,
-       .err_handler = &e1000_err_handler
-};
-
-MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
-MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
-
-/**
- * e1000_get_hw_dev - return device
- * used by hardware layer to print debugging information
- *
- **/
-struct net_device *e1000_get_hw_dev(struct e1000_hw *hw)
-{
-       struct e1000_adapter *adapter = hw->back;
-       return adapter->netdev;
-}
-
-/**
- * e1000_init_module - Driver Registration Routine
- *
- * e1000_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-
-static int __init e1000_init_module(void)
-{
-       int ret;
-       pr_info("%s - version %s\n", e1000_driver_string, e1000_driver_version);
-
-       pr_info("%s\n", e1000_copyright);
-
-       ret = pci_register_driver(&e1000_driver);
-       if (copybreak != COPYBREAK_DEFAULT) {
-               if (copybreak == 0)
-                       pr_info("copybreak disabled\n");
-               else
-                       pr_info("copybreak enabled for "
-                                  "packets <= %u bytes\n", copybreak);
-       }
-       return ret;
-}
-
-module_init(e1000_init_module);
-
-/**
- * e1000_exit_module - Driver Exit Cleanup Routine
- *
- * e1000_exit_module is called just before the driver is removed
- * from memory.
- **/
-
-static void __exit e1000_exit_module(void)
-{
-       pci_unregister_driver(&e1000_driver);
-}
-
-module_exit(e1000_exit_module);
-
-static int e1000_request_irq(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       irq_handler_t handler = e1000_intr;
-       int irq_flags = IRQF_SHARED;
-       int err;
-
-       err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
-                         netdev);
-       if (err) {
-               e_err(probe, "Unable to allocate interrupt Error: %d\n", err);
-       }
-
-       return err;
-}
-
-static void e1000_free_irq(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       free_irq(adapter->pdev->irq, netdev);
-}
-
-/**
- * e1000_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- **/
-
-static void e1000_irq_disable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(IMC, ~0);
-       E1000_WRITE_FLUSH();
-       synchronize_irq(adapter->pdev->irq);
-}
-
-/**
- * e1000_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- **/
-
-static void e1000_irq_enable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(IMS, IMS_ENABLE_MASK);
-       E1000_WRITE_FLUSH();
-}
-
-static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u16 vid = hw->mng_cookie.vlan_id;
-       u16 old_vid = adapter->mng_vlan_id;
-
-       if (!e1000_vlan_used(adapter))
-               return;
-
-       if (!test_bit(vid, adapter->active_vlans)) {
-               if (hw->mng_cookie.status &
-                   E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
-                       e1000_vlan_rx_add_vid(netdev, vid);
-                       adapter->mng_vlan_id = vid;
-               } else {
-                       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-               }
-               if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&
-                   (vid != old_vid) &&
-                   !test_bit(old_vid, adapter->active_vlans))
-                       e1000_vlan_rx_kill_vid(netdev, old_vid);
-       } else {
-               adapter->mng_vlan_id = vid;
-       }
-}
-
-static void e1000_init_manageability(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (adapter->en_mng_pt) {
-               u32 manc = er32(MANC);
-
-               /* disable hardware interception of ARP */
-               manc &= ~(E1000_MANC_ARP_EN);
-
-               ew32(MANC, manc);
-       }
-}
-
-static void e1000_release_manageability(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (adapter->en_mng_pt) {
-               u32 manc = er32(MANC);
-
-               /* re-enable hardware interception of ARP */
-               manc |= E1000_MANC_ARP_EN;
-
-               ew32(MANC, manc);
-       }
-}
-
-/**
- * e1000_configure - configure the hardware for RX and TX
- * @adapter = private board structure
- **/
-static void e1000_configure(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int i;
-
-       e1000_set_rx_mode(netdev);
-
-       e1000_restore_vlan(adapter);
-       e1000_init_manageability(adapter);
-
-       e1000_configure_tx(adapter);
-       e1000_setup_rctl(adapter);
-       e1000_configure_rx(adapter);
-       /* call E1000_DESC_UNUSED which always leaves
-        * at least 1 descriptor unused to make sure
-        * next_to_use != next_to_clean */
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct e1000_rx_ring *ring = &adapter->rx_ring[i];
-               adapter->alloc_rx_buf(adapter, ring,
-                                     E1000_DESC_UNUSED(ring));
-       }
-}
-
-int e1000_up(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* hardware has been reset, we need to reload some things */
-       e1000_configure(adapter);
-
-       clear_bit(__E1000_DOWN, &adapter->flags);
-
-       napi_enable(&adapter->napi);
-
-       e1000_irq_enable(adapter);
-
-       netif_wake_queue(adapter->netdev);
-
-       /* fire a link change interrupt to start the watchdog */
-       ew32(ICS, E1000_ICS_LSC);
-       return 0;
-}
-
-/**
- * e1000_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 e1000_reset ***
- *
- **/
-
-void e1000_power_up_phy(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 mii_reg = 0;
-
-       /* Just clear the power down bit to wake the phy back up */
-       if (hw->media_type == e1000_media_type_copper) {
-               /* according to the manual, the phy will retain its
-                * settings across a power-down/up cycle */
-               e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg);
-               mii_reg &= ~MII_CR_POWER_DOWN;
-               e1000_write_phy_reg(hw, PHY_CTRL, mii_reg);
-       }
-}
-
-static void e1000_power_down_phy(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Power down the PHY so no link is implied when interface is down *
-        * The PHY cannot be powered down if any of the following is true *
-        * (a) WoL is enabled
-        * (b) AMT is active
-        * (c) SoL/IDER session is active */
-       if (!adapter->wol && hw->mac_type >= e1000_82540 &&
-          hw->media_type == e1000_media_type_copper) {
-               u16 mii_reg = 0;
-
-               switch (hw->mac_type) {
-               case e1000_82540:
-               case e1000_82545:
-               case e1000_82545_rev_3:
-               case e1000_82546:
-               case e1000_ce4100:
-               case e1000_82546_rev_3:
-               case e1000_82541:
-               case e1000_82541_rev_2:
-               case e1000_82547:
-               case e1000_82547_rev_2:
-                       if (er32(MANC) & E1000_MANC_SMBUS_EN)
-                               goto out;
-                       break;
-               default:
-                       goto out;
-               }
-               e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg);
-               mii_reg |= MII_CR_POWER_DOWN;
-               e1000_write_phy_reg(hw, PHY_CTRL, mii_reg);
-               mdelay(1);
-       }
-out:
-       return;
-}
-
-void e1000_down(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 rctl, tctl;
-
-
-       /* disable receives in the hardware */
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-       /* flush and sleep below */
-
-       netif_tx_disable(netdev);
-
-       /* disable transmits in the hardware */
-       tctl = er32(TCTL);
-       tctl &= ~E1000_TCTL_EN;
-       ew32(TCTL, tctl);
-       /* flush both disables and wait for them to finish */
-       E1000_WRITE_FLUSH();
-       msleep(10);
-
-       napi_disable(&adapter->napi);
-
-       e1000_irq_disable(adapter);
-
-       /*
-        * Setting DOWN must be after irq_disable to prevent
-        * a screaming interrupt.  Setting DOWN also prevents
-        * timers and tasks from rescheduling.
-        */
-       set_bit(__E1000_DOWN, &adapter->flags);
-
-       del_timer_sync(&adapter->tx_fifo_stall_timer);
-       del_timer_sync(&adapter->watchdog_timer);
-       del_timer_sync(&adapter->phy_info_timer);
-
-       adapter->link_speed = 0;
-       adapter->link_duplex = 0;
-       netif_carrier_off(netdev);
-
-       e1000_reset(adapter);
-       e1000_clean_all_tx_rings(adapter);
-       e1000_clean_all_rx_rings(adapter);
-}
-
-static void e1000_reinit_safe(struct e1000_adapter *adapter)
-{
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-       rtnl_lock();
-       e1000_down(adapter);
-       e1000_up(adapter);
-       rtnl_unlock();
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-}
-
-void e1000_reinit_locked(struct e1000_adapter *adapter)
-{
-       /* if rtnl_lock is not held the call path is bogus */
-       ASSERT_RTNL();
-       WARN_ON(in_interrupt());
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-       e1000_down(adapter);
-       e1000_up(adapter);
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-}
-
-void e1000_reset(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 pba = 0, tx_space, min_tx_space, min_rx_space;
-       bool legacy_pba_adjust = false;
-       u16 hwm;
-
-       /* Repartition Pba for greater than 9k mtu
-        * To take effect CTRL.RST is required.
-        */
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-       case e1000_82544:
-       case e1000_82540:
-       case e1000_82541:
-       case e1000_82541_rev_2:
-               legacy_pba_adjust = true;
-               pba = E1000_PBA_48K;
-               break;
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_ce4100:
-       case e1000_82546_rev_3:
-               pba = E1000_PBA_48K;
-               break;
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               legacy_pba_adjust = true;
-               pba = E1000_PBA_30K;
-               break;
-       case e1000_undefined:
-       case e1000_num_macs:
-               break;
-       }
-
-       if (legacy_pba_adjust) {
-               if (hw->max_frame_size > E1000_RXBUFFER_8192)
-                       pba -= 8; /* allocate more FIFO for Tx */
-
-               if (hw->mac_type == e1000_82547) {
-                       adapter->tx_fifo_head = 0;
-                       adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT;
-                       adapter->tx_fifo_size =
-                               (E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT;
-                       atomic_set(&adapter->tx_fifo_stall, 0);
-               }
-       } else if (hw->max_frame_size >  ETH_FRAME_LEN + ETH_FCS_LEN) {
-               /* adjust PBA for jumbo frames */
-               ew32(PBA, pba);
-
-               /* To maintain wire speed transmits, the Tx FIFO should be
-                * large enough to accommodate two full transmit packets,
-                * rounded up to the next 1KB and expressed in KB.  Likewise,
-                * the Rx FIFO should be large enough to accommodate at least
-                * one full receive packet and is similarly rounded up and
-                * expressed in KB. */
-               pba = er32(PBA);
-               /* upper 16 bits has Tx packet buffer allocation size in KB */
-               tx_space = pba >> 16;
-               /* lower 16 bits has Rx packet buffer allocation size in KB */
-               pba &= 0xffff;
-               /*
-                * the tx fifo also stores 16 bytes of information about the tx
-                * but don't include ethernet FCS because hardware appends it
-                */
-               min_tx_space = (hw->max_frame_size +
-                               sizeof(struct e1000_tx_desc) -
-                               ETH_FCS_LEN) * 2;
-               min_tx_space = ALIGN(min_tx_space, 1024);
-               min_tx_space >>= 10;
-               /* software strips receive CRC, so leave room for it */
-               min_rx_space = hw->max_frame_size;
-               min_rx_space = ALIGN(min_rx_space, 1024);
-               min_rx_space >>= 10;
-
-               /* If current Tx allocation is less than the min Tx FIFO size,
-                * and the min Tx FIFO size is less than the current Rx FIFO
-                * allocation, take space away from current Rx allocation */
-               if (tx_space < min_tx_space &&
-                   ((min_tx_space - tx_space) < pba)) {
-                       pba = pba - (min_tx_space - tx_space);
-
-                       /* PCI/PCIx hardware has PBA alignment constraints */
-                       switch (hw->mac_type) {
-                       case e1000_82545 ... e1000_82546_rev_3:
-                               pba &= ~(E1000_PBA_8K - 1);
-                               break;
-                       default:
-                               break;
-                       }
-
-                       /* if short on rx space, rx wins and must trump tx
-                        * adjustment or use Early Receive if available */
-                       if (pba < min_rx_space)
-                               pba = min_rx_space;
-               }
-       }
-
-       ew32(PBA, pba);
-
-       /*
-        * 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, and
-        * - the full Rx FIFO size minus the early receive size (for parts
-        *   with ERT support assuming ERT set to E1000_ERT_2048), or
-        * - the full Rx FIFO size minus one full frame
-        */
-       hwm = min(((pba << 10) * 9 / 10),
-                 ((pba << 10) - hw->max_frame_size));
-
-       hw->fc_high_water = hwm & 0xFFF8;       /* 8-byte granularity */
-       hw->fc_low_water = hw->fc_high_water - 8;
-       hw->fc_pause_time = E1000_FC_PAUSE_TIME;
-       hw->fc_send_xon = 1;
-       hw->fc = hw->original_fc;
-
-       /* Allow time for pending master requests to run */
-       e1000_reset_hw(hw);
-       if (hw->mac_type >= e1000_82544)
-               ew32(WUC, 0);
-
-       if (e1000_init_hw(hw))
-               e_dev_err("Hardware Error\n");
-       e1000_update_mng_vlan(adapter);
-
-       /* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
-       if (hw->mac_type >= e1000_82544 &&
-           hw->autoneg == 1 &&
-           hw->autoneg_advertised == ADVERTISE_1000_FULL) {
-               u32 ctrl = er32(CTRL);
-               /* clear phy power management bit if we are in gig only mode,
-                * which if enabled will attempt negotiation to 100Mb, which
-                * can cause a loss of link at power off or driver unload */
-               ctrl &= ~E1000_CTRL_SWDPIN3;
-               ew32(CTRL, ctrl);
-       }
-
-       /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
-       ew32(VET, ETHERNET_IEEE_VLAN_TYPE);
-
-       e1000_reset_adaptive(hw);
-       e1000_phy_get_info(hw, &adapter->phy_info);
-
-       e1000_release_manageability(adapter);
-}
-
-/**
- *  Dump the eeprom for users having checksum issues
- **/
-static void e1000_dump_eeprom(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ethtool_eeprom eeprom;
-       const struct ethtool_ops *ops = netdev->ethtool_ops;
-       u8 *data;
-       int i;
-       u16 csum_old, csum_new = 0;
-
-       eeprom.len = ops->get_eeprom_len(netdev);
-       eeprom.offset = 0;
-
-       data = kmalloc(eeprom.len, GFP_KERNEL);
-       if (!data) {
-               pr_err("Unable to allocate memory to dump EEPROM data\n");
-               return;
-       }
-
-       ops->get_eeprom(netdev, &eeprom, data);
-
-       csum_old = (data[EEPROM_CHECKSUM_REG * 2]) +
-                  (data[EEPROM_CHECKSUM_REG * 2 + 1] << 8);
-       for (i = 0; i < EEPROM_CHECKSUM_REG * 2; i += 2)
-               csum_new += data[i] + (data[i + 1] << 8);
-       csum_new = EEPROM_SUM - csum_new;
-
-       pr_err("/*********************/\n");
-       pr_err("Current EEPROM Checksum : 0x%04x\n", csum_old);
-       pr_err("Calculated              : 0x%04x\n", csum_new);
-
-       pr_err("Offset    Values\n");
-       pr_err("========  ======\n");
-       print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, data, 128, 0);
-
-       pr_err("Include this output when contacting your support provider.\n");
-       pr_err("This is not a software error! Something bad happened to\n");
-       pr_err("your hardware or EEPROM image. Ignoring this problem could\n");
-       pr_err("result in further problems, possibly loss of data,\n");
-       pr_err("corruption or system hangs!\n");
-       pr_err("The MAC Address will be reset to 00:00:00:00:00:00,\n");
-       pr_err("which is invalid and requires you to set the proper MAC\n");
-       pr_err("address manually before continuing to enable this network\n");
-       pr_err("device. Please inspect the EEPROM dump and report the\n");
-       pr_err("issue to your hardware vendor or Intel Customer Support.\n");
-       pr_err("/*********************/\n");
-
-       kfree(data);
-}
-
-/**
- * e1000_is_need_ioport - determine if an adapter needs ioport resources or not
- * @pdev: PCI device information struct
- *
- * Return true if an adapter needs ioport resources
- **/
-static int e1000_is_need_ioport(struct pci_dev *pdev)
-{
-       switch (pdev->device) {
-       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:
-       case E1000_DEV_ID_82541EI:
-       case E1000_DEV_ID_82541EI_MOBILE:
-       case E1000_DEV_ID_82541ER:
-       case E1000_DEV_ID_82541ER_LOM:
-       case E1000_DEV_ID_82541GI:
-       case E1000_DEV_ID_82541GI_LF:
-       case E1000_DEV_ID_82541GI_MOBILE:
-       case E1000_DEV_ID_82544EI_COPPER:
-       case E1000_DEV_ID_82544EI_FIBER:
-       case E1000_DEV_ID_82544GC_COPPER:
-       case E1000_DEV_ID_82544GC_LOM:
-       case E1000_DEV_ID_82545EM_COPPER:
-       case E1000_DEV_ID_82545EM_FIBER:
-       case E1000_DEV_ID_82546EB_COPPER:
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546EB_QUAD_COPPER:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static u32 e1000_fix_features(struct net_device *netdev, u32 features)
-{
-       /*
-        * Since there is no support for separate rx/tx vlan accel
-        * enable/disable make sure tx flag is always in same state as rx.
-        */
-       if (features & NETIF_F_HW_VLAN_RX)
-               features |= NETIF_F_HW_VLAN_TX;
-       else
-               features &= ~NETIF_F_HW_VLAN_TX;
-
-       return features;
-}
-
-static int e1000_set_features(struct net_device *netdev, u32 features)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       u32 changed = features ^ netdev->features;
-
-       if (changed & NETIF_F_HW_VLAN_RX)
-               e1000_vlan_mode(netdev, features);
-
-       if (!(changed & NETIF_F_RXCSUM))
-               return 0;
-
-       adapter->rx_csum = !!(features & NETIF_F_RXCSUM);
-
-       if (netif_running(netdev))
-               e1000_reinit_locked(adapter);
-       else
-               e1000_reset(adapter);
-
-       return 0;
-}
-
-static const struct net_device_ops e1000_netdev_ops = {
-       .ndo_open               = e1000_open,
-       .ndo_stop               = e1000_close,
-       .ndo_start_xmit         = e1000_xmit_frame,
-       .ndo_get_stats          = e1000_get_stats,
-       .ndo_set_rx_mode        = e1000_set_rx_mode,
-       .ndo_set_mac_address    = e1000_set_mac,
-       .ndo_tx_timeout         = e1000_tx_timeout,
-       .ndo_change_mtu         = e1000_change_mtu,
-       .ndo_do_ioctl           = e1000_ioctl,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_vlan_rx_add_vid    = e1000_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = e1000_vlan_rx_kill_vid,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = e1000_netpoll,
-#endif
-       .ndo_fix_features       = e1000_fix_features,
-       .ndo_set_features       = e1000_set_features,
-};
-
-/**
- * e1000_init_hw_struct - initialize members of hw struct
- * @adapter: board private struct
- * @hw: structure used by e1000_hw.c
- *
- * Factors out initialization of the e1000_hw struct to its own function
- * that can be called very early at init (just after struct allocation).
- * Fields are initialized based on PCI device information and
- * OS network device settings (MTU size).
- * Returns negative error codes if MAC type setup fails.
- */
-static int e1000_init_hw_struct(struct e1000_adapter *adapter,
-                               struct e1000_hw *hw)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       /* PCI config space info */
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-       hw->subsystem_vendor_id = pdev->subsystem_vendor;
-       hw->subsystem_id = pdev->subsystem_device;
-       hw->revision_id = pdev->revision;
-
-       pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
-
-       hw->max_frame_size = adapter->netdev->mtu +
-                            ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
-       hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;
-
-       /* identify the MAC */
-       if (e1000_set_mac_type(hw)) {
-               e_err(probe, "Unknown MAC Type\n");
-               return -EIO;
-       }
-
-       switch (hw->mac_type) {
-       default:
-               break;
-       case e1000_82541:
-       case e1000_82547:
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               hw->phy_init_script = 1;
-               break;
-       }
-
-       e1000_set_media_type(hw);
-       e1000_get_bus_info(hw);
-
-       hw->wait_autoneg_complete = false;
-       hw->tbi_compatibility_en = true;
-       hw->adaptive_ifs = true;
-
-       /* Copper options */
-
-       if (hw->media_type == e1000_media_type_copper) {
-               hw->mdix = AUTO_ALL_MODES;
-               hw->disable_polarity_correction = false;
-               hw->master_slave = E1000_MASTER_SLAVE;
-       }
-
-       return 0;
-}
-
-/**
- * e1000_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in e1000_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * e1000_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-static int __devinit e1000_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct e1000_adapter *adapter;
-       struct e1000_hw *hw;
-
-       static int cards_found = 0;
-       static int global_quad_port_a = 0; /* global ksp3 port a indication */
-       int i, err, pci_using_dac;
-       u16 eeprom_data = 0;
-       u16 tmp = 0;
-       u16 eeprom_apme_mask = E1000_EEPROM_APME;
-       int bars, need_ioport;
-
-       /* do not allocate ioport bars when not needed */
-       need_ioport = e1000_is_need_ioport(pdev);
-       if (need_ioport) {
-               bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
-               err = pci_enable_device(pdev);
-       } else {
-               bars = pci_select_bars(pdev, IORESOURCE_MEM);
-               err = pci_enable_device_mem(pdev);
-       }
-       if (err)
-               return err;
-
-       err = pci_request_selected_regions(pdev, bars, e1000_driver_name);
-       if (err)
-               goto err_pci_reg;
-
-       pci_set_master(pdev);
-       err = pci_save_state(pdev);
-       if (err)
-               goto err_alloc_etherdev;
-
-       err = -ENOMEM;
-       netdev = alloc_etherdev(sizeof(struct e1000_adapter));
-       if (!netdev)
-               goto err_alloc_etherdev;
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       pci_set_drvdata(pdev, netdev);
-       adapter = netdev_priv(netdev);
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       adapter->msg_enable = (1 << debug) - 1;
-       adapter->bars = bars;
-       adapter->need_ioport = need_ioport;
-
-       hw = &adapter->hw;
-       hw->back = adapter;
-
-       err = -EIO;
-       hw->hw_addr = pci_ioremap_bar(pdev, BAR_0);
-       if (!hw->hw_addr)
-               goto err_ioremap;
-
-       if (adapter->need_ioport) {
-               for (i = BAR_1; i <= BAR_5; i++) {
-                       if (pci_resource_len(pdev, i) == 0)
-                               continue;
-                       if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
-                               hw->io_base = pci_resource_start(pdev, i);
-                               break;
-                       }
-               }
-       }
-
-       /* make ready for any if (hw->...) below */
-       err = e1000_init_hw_struct(adapter, hw);
-       if (err)
-               goto err_sw_init;
-
-       /*
-        * there is a workaround being applied below that limits
-        * 64-bit DMA addresses to 64-bit hardware.  There are some
-        * 32-bit adapters that Tx hang when given 64-bit DMA addresses
-        */
-       pci_using_dac = 0;
-       if ((hw->bus_type == e1000_bus_type_pcix) &&
-           !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-               /*
-                * according to DMA-API-HOWTO, coherent calls will always
-                * succeed if the set call did
-                */
-               dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-               pci_using_dac = 1;
-       } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-               if (err) {
-                       pr_err("No usable DMA config, aborting\n");
-                       goto err_dma;
-               }
-               dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-       }
-
-       netdev->netdev_ops = &e1000_netdev_ops;
-       e1000_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
-
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       adapter->bd_number = cards_found;
-
-       /* setup the private structure */
-
-       err = e1000_sw_init(adapter);
-       if (err)
-               goto err_sw_init;
-
-       err = -EIO;
-       if (hw->mac_type == e1000_ce4100) {
-               ce4100_gbe_mdio_base_phy = pci_resource_start(pdev, BAR_1);
-               ce4100_gbe_mdio_base_virt = ioremap(ce4100_gbe_mdio_base_phy,
-                                               pci_resource_len(pdev, BAR_1));
-
-               if (!ce4100_gbe_mdio_base_virt)
-                       goto err_mdio_ioremap;
-       }
-
-       if (hw->mac_type >= e1000_82543) {
-               netdev->hw_features = NETIF_F_SG |
-                                  NETIF_F_HW_CSUM |
-                                  NETIF_F_HW_VLAN_RX;
-               netdev->features = NETIF_F_HW_VLAN_TX |
-                                  NETIF_F_HW_VLAN_FILTER;
-       }
-
-       if ((hw->mac_type >= e1000_82544) &&
-          (hw->mac_type != e1000_82547))
-               netdev->hw_features |= NETIF_F_TSO;
-
-       netdev->features |= netdev->hw_features;
-       netdev->hw_features |= NETIF_F_RXCSUM;
-
-       if (pci_using_dac) {
-               netdev->features |= NETIF_F_HIGHDMA;
-               netdev->vlan_features |= NETIF_F_HIGHDMA;
-       }
-
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_HW_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
-
-       adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);
-
-       /* initialize eeprom parameters */
-       if (e1000_init_eeprom_params(hw)) {
-               e_err(probe, "EEPROM initialization failed\n");
-               goto err_eeprom;
-       }
-
-       /* before reading the EEPROM, reset the controller to
-        * put the device in a known good starting state */
-
-       e1000_reset_hw(hw);
-
-       /* make sure the EEPROM is good */
-       if (e1000_validate_eeprom_checksum(hw) < 0) {
-               e_err(probe, "The EEPROM Checksum Is Not Valid\n");
-               e1000_dump_eeprom(adapter);
-               /*
-                * set MAC address to all zeroes to invalidate and temporary
-                * disable this device for the user. This blocks regular
-                * traffic while still permitting ethtool ioctls from reaching
-                * the hardware as well as allowing the user to run the
-                * interface after manually setting a hw addr using
-                * `ip set address`
-                */
-               memset(hw->mac_addr, 0, netdev->addr_len);
-       } else {
-               /* copy the MAC address out of the EEPROM */
-               if (e1000_read_mac_addr(hw))
-                       e_err(probe, "EEPROM Read Error\n");
-       }
-       /* don't block initalization here due to bad MAC address */
-       memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len);
-       memcpy(netdev->perm_addr, hw->mac_addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->perm_addr))
-               e_err(probe, "Invalid MAC Address\n");
-
-       init_timer(&adapter->tx_fifo_stall_timer);
-       adapter->tx_fifo_stall_timer.function = e1000_82547_tx_fifo_stall;
-       adapter->tx_fifo_stall_timer.data = (unsigned long)adapter;
-
-       init_timer(&adapter->watchdog_timer);
-       adapter->watchdog_timer.function = e1000_watchdog;
-       adapter->watchdog_timer.data = (unsigned long) adapter;
-
-       init_timer(&adapter->phy_info_timer);
-       adapter->phy_info_timer.function = e1000_update_phy_info;
-       adapter->phy_info_timer.data = (unsigned long)adapter;
-
-       INIT_WORK(&adapter->fifo_stall_task, e1000_82547_tx_fifo_stall_task);
-       INIT_WORK(&adapter->reset_task, e1000_reset_task);
-       INIT_WORK(&adapter->phy_info_task, e1000_update_phy_info_task);
-
-       e1000_check_options(adapter);
-
-       /* Initial Wake on LAN setting
-        * If APM wake is enabled in the EEPROM,
-        * enable the ACPI Magic Packet filter
-        */
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-               break;
-       case e1000_82544:
-               e1000_read_eeprom(hw,
-                       EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data);
-               eeprom_apme_mask = E1000_EEPROM_82544_APM;
-               break;
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               if (er32(STATUS) & E1000_STATUS_FUNC_1){
-                       e1000_read_eeprom(hw,
-                               EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
-                       break;
-               }
-               /* Fall Through */
-       default:
-               e1000_read_eeprom(hw,
-                       EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
-               break;
-       }
-       if (eeprom_data & eeprom_apme_mask)
-               adapter->eeprom_wol |= E1000_WUFC_MAG;
-
-       /* now that we have the eeprom settings, apply the special cases
-        * where the eeprom may be wrong or the board simply won't support
-        * wake on lan on a particular port */
-       switch (pdev->device) {
-       case E1000_DEV_ID_82546GB_PCIE:
-               adapter->eeprom_wol = 0;
-               break;
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546GB_FIBER:
-               /* Wake events only supported on port A for dual fiber
-                * regardless of eeprom setting */
-               if (er32(STATUS) & E1000_STATUS_FUNC_1)
-                       adapter->eeprom_wol = 0;
-               break;
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               /* if quad port adapter, disable WoL on all but port A */
-               if (global_quad_port_a != 0)
-                       adapter->eeprom_wol = 0;
-               else
-                       adapter->quad_port_a = 1;
-               /* Reset for multiple quad port adapters */
-               if (++global_quad_port_a == 4)
-                       global_quad_port_a = 0;
-               break;
-       }
-
-       /* initialize the wol settings based on the eeprom settings */
-       adapter->wol = adapter->eeprom_wol;
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       /* Auto detect PHY address */
-       if (hw->mac_type == e1000_ce4100) {
-               for (i = 0; i < 32; i++) {
-                       hw->phy_addr = i;
-                       e1000_read_phy_reg(hw, PHY_ID2, &tmp);
-                       if (tmp == 0 || tmp == 0xFF) {
-                               if (i == 31)
-                                       goto err_eeprom;
-                               continue;
-                       } else
-                               break;
-               }
-       }
-
-       /* reset the hardware with the new settings */
-       e1000_reset(adapter);
-
-       strcpy(netdev->name, "eth%d");
-       err = register_netdev(netdev);
-       if (err)
-               goto err_register;
-
-       e1000_vlan_mode(netdev, netdev->features);
-
-       /* print bus type/speed/width info */
-       e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",
-              ((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""),
-              ((hw->bus_speed == e1000_bus_speed_133) ? 133 :
-               (hw->bus_speed == e1000_bus_speed_120) ? 120 :
-               (hw->bus_speed == e1000_bus_speed_100) ? 100 :
-               (hw->bus_speed == e1000_bus_speed_66) ? 66 : 33),
-              ((hw->bus_width == e1000_bus_width_64) ? 64 : 32),
-              netdev->dev_addr);
-
-       /* carrier off reporting is important to ethtool even BEFORE open */
-       netif_carrier_off(netdev);
-
-       e_info(probe, "Intel(R) PRO/1000 Network Connection\n");
-
-       cards_found++;
-       return 0;
-
-err_register:
-err_eeprom:
-       e1000_phy_hw_reset(hw);
-
-       if (hw->flash_address)
-               iounmap(hw->flash_address);
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-err_dma:
-err_sw_init:
-err_mdio_ioremap:
-       iounmap(ce4100_gbe_mdio_base_virt);
-       iounmap(hw->hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_selected_regions(pdev, bars);
-err_pci_reg:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * e1000_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * e1000_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-
-static void __devexit e1000_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       set_bit(__E1000_DOWN, &adapter->flags);
-       del_timer_sync(&adapter->tx_fifo_stall_timer);
-       del_timer_sync(&adapter->watchdog_timer);
-       del_timer_sync(&adapter->phy_info_timer);
-
-       cancel_work_sync(&adapter->reset_task);
-
-       e1000_release_manageability(adapter);
-
-       unregister_netdev(netdev);
-
-       e1000_phy_hw_reset(hw);
-
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-
-       iounmap(hw->hw_addr);
-       if (hw->flash_address)
-               iounmap(hw->flash_address);
-       pci_release_selected_regions(pdev, adapter->bars);
-
-       free_netdev(netdev);
-
-       pci_disable_device(pdev);
-}
-
-/**
- * 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.
- * e1000_init_hw_struct MUST be called before this function
- **/
-
-static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
-{
-       adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-
-       adapter->num_tx_queues = 1;
-       adapter->num_rx_queues = 1;
-
-       if (e1000_alloc_queues(adapter)) {
-               e_err(probe, "Unable to allocate memory for queues\n");
-               return -ENOMEM;
-       }
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       e1000_irq_disable(adapter);
-
-       spin_lock_init(&adapter->stats_lock);
-
-       set_bit(__E1000_DOWN, &adapter->flags);
-
-       return 0;
-}
-
-/**
- * e1000_alloc_queues - Allocate memory for all rings
- * @adapter: board private structure to initialize
- *
- * We allocate one ring per queue at run-time since we don't know the
- * number of queues at compile-time.
- **/
-
-static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
-{
-       adapter->tx_ring = kcalloc(adapter->num_tx_queues,
-                                  sizeof(struct e1000_tx_ring), GFP_KERNEL);
-       if (!adapter->tx_ring)
-               return -ENOMEM;
-
-       adapter->rx_ring = kcalloc(adapter->num_rx_queues,
-                                  sizeof(struct e1000_rx_ring), GFP_KERNEL);
-       if (!adapter->rx_ring) {
-               kfree(adapter->tx_ring);
-               return -ENOMEM;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-
-static int e1000_open(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int err;
-
-       /* disallow open during test */
-       if (test_bit(__E1000_TESTING, &adapter->flags))
-               return -EBUSY;
-
-       netif_carrier_off(netdev);
-
-       /* allocate transmit descriptors */
-       err = e1000_setup_all_tx_resources(adapter);
-       if (err)
-               goto err_setup_tx;
-
-       /* allocate receive descriptors */
-       err = e1000_setup_all_rx_resources(adapter);
-       if (err)
-               goto err_setup_rx;
-
-       e1000_power_up_phy(adapter);
-
-       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-       if ((hw->mng_cookie.status &
-                         E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) {
-               e1000_update_mng_vlan(adapter);
-       }
-
-       /* before we allocate an interrupt, we must be ready to handle it.
-        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
-        * as soon as we call pci_request_irq, so we have to setup our
-        * clean_rx handler before we do so.  */
-       e1000_configure(adapter);
-
-       err = e1000_request_irq(adapter);
-       if (err)
-               goto err_req_irq;
-
-       /* From here on the code is the same as e1000_up() */
-       clear_bit(__E1000_DOWN, &adapter->flags);
-
-       napi_enable(&adapter->napi);
-
-       e1000_irq_enable(adapter);
-
-       netif_start_queue(netdev);
-
-       /* fire a link status change interrupt to start the watchdog */
-       ew32(ICS, E1000_ICS_LSC);
-
-       return E1000_SUCCESS;
-
-err_req_irq:
-       e1000_power_down_phy(adapter);
-       e1000_free_all_rx_resources(adapter);
-err_setup_rx:
-       e1000_free_all_tx_resources(adapter);
-err_setup_tx:
-       e1000_reset(adapter);
-
-       return err;
-}
-
-/**
- * e1000_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-
-static int e1000_close(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
-       e1000_down(adapter);
-       e1000_power_down_phy(adapter);
-       e1000_free_irq(adapter);
-
-       e1000_free_all_tx_resources(adapter);
-       e1000_free_all_rx_resources(adapter);
-
-       /* kill manageability vlan ID if supported, but not if a vlan with
-        * the same ID is registered on the host OS (let 8021q kill it) */
-       if ((hw->mng_cookie.status &
-                         E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
-            !test_bit(adapter->mng_vlan_id, adapter->active_vlans)) {
-               e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
-       }
-
-       return 0;
-}
-
-/**
- * e1000_check_64k_bound - check that memory doesn't cross 64kB boundary
- * @adapter: address of board private structure
- * @start: address of beginning of memory
- * @len: length of memory
- **/
-static bool e1000_check_64k_bound(struct e1000_adapter *adapter, void *start,
-                                 unsigned long len)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       unsigned long begin = (unsigned long)start;
-       unsigned long end = begin + len;
-
-       /* First rev 82545 and 82546 need to not allow any memory
-        * write location to cross 64k boundary due to errata 23 */
-       if (hw->mac_type == e1000_82545 ||
-           hw->mac_type == e1000_ce4100 ||
-           hw->mac_type == e1000_82546) {
-               return ((begin ^ (end - 1)) >> 16) != 0 ? false : true;
-       }
-
-       return true;
-}
-
-/**
- * e1000_setup_tx_resources - allocate Tx resources (Descriptors)
- * @adapter: board private structure
- * @txdr:    tx descriptor ring (for a specific queue) to setup
- *
- * Return 0 on success, negative on failure
- **/
-
-static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_tx_ring *txdr)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int size;
-
-       size = sizeof(struct e1000_buffer) * txdr->count;
-       txdr->buffer_info = vzalloc(size);
-       if (!txdr->buffer_info) {
-               e_err(probe, "Unable to allocate memory for the Tx descriptor "
-                     "ring\n");
-               return -ENOMEM;
-       }
-
-       /* round up to nearest 4K */
-
-       txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
-       txdr->size = ALIGN(txdr->size, 4096);
-
-       txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                       GFP_KERNEL);
-       if (!txdr->desc) {
-setup_tx_desc_die:
-               vfree(txdr->buffer_info);
-               e_err(probe, "Unable to allocate memory for the Tx descriptor "
-                     "ring\n");
-               return -ENOMEM;
-       }
-
-       /* Fix for errata 23, can't cross 64kB boundary */
-       if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
-               void *olddesc = txdr->desc;
-               dma_addr_t olddma = txdr->dma;
-               e_err(tx_err, "txdr align check failed: %u bytes at %p\n",
-                     txdr->size, txdr->desc);
-               /* Try again, without freeing the previous */
-               txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size,
-                                               &txdr->dma, GFP_KERNEL);
-               /* Failed allocation, critical failure */
-               if (!txdr->desc) {
-                       dma_free_coherent(&pdev->dev, txdr->size, olddesc,
-                                         olddma);
-                       goto setup_tx_desc_die;
-               }
-
-               if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
-                       /* give up */
-                       dma_free_coherent(&pdev->dev, txdr->size, txdr->desc,
-                                         txdr->dma);
-                       dma_free_coherent(&pdev->dev, txdr->size, olddesc,
-                                         olddma);
-                       e_err(probe, "Unable to allocate aligned memory "
-                             "for the transmit descriptor ring\n");
-                       vfree(txdr->buffer_info);
-                       return -ENOMEM;
-               } else {
-                       /* Free old allocation, new allocation was successful */
-                       dma_free_coherent(&pdev->dev, txdr->size, olddesc,
-                                         olddma);
-               }
-       }
-       memset(txdr->desc, 0, txdr->size);
-
-       txdr->next_to_use = 0;
-       txdr->next_to_clean = 0;
-
-       return 0;
-}
-
-/**
- * e1000_setup_all_tx_resources - wrapper to allocate Tx resources
- *                               (Descriptors) for all queues
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-
-int e1000_setup_all_tx_resources(struct e1000_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               err = e1000_setup_tx_resources(adapter, &adapter->tx_ring[i]);
-               if (err) {
-                       e_err(probe, "Allocation for Tx Queue %u failed\n", i);
-                       for (i-- ; i >= 0; i--)
-                               e1000_free_tx_resources(adapter,
-                                                       &adapter->tx_ring[i]);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-/**
- * 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)
-{
-       u64 tdba;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tdlen, tctl, tipg;
-       u32 ipgr1, ipgr2;
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-
-       switch (adapter->num_tx_queues) {
-       case 1:
-       default:
-               tdba = adapter->tx_ring[0].dma;
-               tdlen = adapter->tx_ring[0].count *
-                       sizeof(struct e1000_tx_desc);
-               ew32(TDLEN, tdlen);
-               ew32(TDBAH, (tdba >> 32));
-               ew32(TDBAL, (tdba & 0x00000000ffffffffULL));
-               ew32(TDT, 0);
-               ew32(TDH, 0);
-               adapter->tx_ring[0].tdh = ((hw->mac_type >= e1000_82543) ? E1000_TDH : E1000_82542_TDH);
-               adapter->tx_ring[0].tdt = ((hw->mac_type >= e1000_82543) ? E1000_TDT : E1000_82542_TDT);
-               break;
-       }
-
-       /* Set the default values for the Tx Inter Packet Gap timer */
-       if ((hw->media_type == e1000_media_type_fiber ||
-            hw->media_type == e1000_media_type_internal_serdes))
-               tipg = DEFAULT_82543_TIPG_IPGT_FIBER;
-       else
-               tipg = DEFAULT_82543_TIPG_IPGT_COPPER;
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-               tipg = DEFAULT_82542_TIPG_IPGT;
-               ipgr1 = DEFAULT_82542_TIPG_IPGR1;
-               ipgr2 = DEFAULT_82542_TIPG_IPGR2;
-               break;
-       default:
-               ipgr1 = DEFAULT_82543_TIPG_IPGR1;
-               ipgr2 = DEFAULT_82543_TIPG_IPGR2;
-               break;
-       }
-       tipg |= ipgr1 << E1000_TIPG_IPGR1_SHIFT;
-       tipg |= ipgr2 << E1000_TIPG_IPGR2_SHIFT;
-       ew32(TIPG, tipg);
-
-       /* Set the Tx Interrupt Delay register */
-
-       ew32(TIDV, adapter->tx_int_delay);
-       if (hw->mac_type >= e1000_82540)
-               ew32(TADV, adapter->tx_abs_int_delay);
-
-       /* 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);
-
-       e1000_config_collision_dist(hw);
-
-       /* Setup Transmit Descriptor Settings for eop descriptor */
-       adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
-
-       /* only set IDE if we are delaying interrupts using the timers */
-       if (adapter->tx_int_delay)
-               adapter->txd_cmd |= E1000_TXD_CMD_IDE;
-
-       if (hw->mac_type < e1000_82543)
-               adapter->txd_cmd |= E1000_TXD_CMD_RPS;
-       else
-               adapter->txd_cmd |= E1000_TXD_CMD_RS;
-
-       /* Cache if we're 82544 running in PCI-X because we'll
-        * need this to apply a workaround later in the send path. */
-       if (hw->mac_type == e1000_82544 &&
-           hw->bus_type == e1000_bus_type_pcix)
-               adapter->pcix_82544 = 1;
-
-       ew32(TCTL, tctl);
-
-}
-
-/**
- * e1000_setup_rx_resources - allocate Rx resources (Descriptors)
- * @adapter: board private structure
- * @rxdr:    rx descriptor ring (for a specific queue) to setup
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_rx_ring *rxdr)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int size, desc_len;
-
-       size = sizeof(struct e1000_buffer) * rxdr->count;
-       rxdr->buffer_info = vzalloc(size);
-       if (!rxdr->buffer_info) {
-               e_err(probe, "Unable to allocate memory for the Rx descriptor "
-                     "ring\n");
-               return -ENOMEM;
-       }
-
-       desc_len = sizeof(struct e1000_rx_desc);
-
-       /* Round up to nearest 4K */
-
-       rxdr->size = rxdr->count * desc_len;
-       rxdr->size = ALIGN(rxdr->size, 4096);
-
-       rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
-                                       GFP_KERNEL);
-
-       if (!rxdr->desc) {
-               e_err(probe, "Unable to allocate memory for the Rx descriptor "
-                     "ring\n");
-setup_rx_desc_die:
-               vfree(rxdr->buffer_info);
-               return -ENOMEM;
-       }
-
-       /* Fix for errata 23, can't cross 64kB boundary */
-       if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
-               void *olddesc = rxdr->desc;
-               dma_addr_t olddma = rxdr->dma;
-               e_err(rx_err, "rxdr align check failed: %u bytes at %p\n",
-                     rxdr->size, rxdr->desc);
-               /* Try again, without freeing the previous */
-               rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size,
-                                               &rxdr->dma, GFP_KERNEL);
-               /* Failed allocation, critical failure */
-               if (!rxdr->desc) {
-                       dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
-                                         olddma);
-                       e_err(probe, "Unable to allocate memory for the Rx "
-                             "descriptor ring\n");
-                       goto setup_rx_desc_die;
-               }
-
-               if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
-                       /* give up */
-                       dma_free_coherent(&pdev->dev, rxdr->size, rxdr->desc,
-                                         rxdr->dma);
-                       dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
-                                         olddma);
-                       e_err(probe, "Unable to allocate aligned memory for "
-                             "the Rx descriptor ring\n");
-                       goto setup_rx_desc_die;
-               } else {
-                       /* Free old allocation, new allocation was successful */
-                       dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
-                                         olddma);
-               }
-       }
-       memset(rxdr->desc, 0, rxdr->size);
-
-       rxdr->next_to_clean = 0;
-       rxdr->next_to_use = 0;
-       rxdr->rx_skb_top = NULL;
-
-       return 0;
-}
-
-/**
- * e1000_setup_all_rx_resources - wrapper to allocate Rx resources
- *                               (Descriptors) for all queues
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-
-int e1000_setup_all_rx_resources(struct e1000_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               err = e1000_setup_rx_resources(adapter, &adapter->rx_ring[i]);
-               if (err) {
-                       e_err(probe, "Allocation for Rx Queue %u failed\n", i);
-                       for (i-- ; i >= 0; i--)
-                               e1000_free_rx_resources(adapter,
-                                                       &adapter->rx_ring[i]);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-/**
- * e1000_setup_rctl - configure the receive control registers
- * @adapter: Board private structure
- **/
-static void e1000_setup_rctl(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       rctl = er32(RCTL);
-
-       rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
-
-       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
-               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-               (hw->mc_filter_type << E1000_RCTL_MO_SHIFT);
-
-       if (hw->tbi_compatibility_on == 1)
-               rctl |= E1000_RCTL_SBP;
-       else
-               rctl &= ~E1000_RCTL_SBP;
-
-       if (adapter->netdev->mtu <= ETH_DATA_LEN)
-               rctl &= ~E1000_RCTL_LPE;
-       else
-               rctl |= E1000_RCTL_LPE;
-
-       /* Setup buffer sizes */
-       rctl &= ~E1000_RCTL_SZ_4096;
-       rctl |= E1000_RCTL_BSEX;
-       switch (adapter->rx_buffer_len) {
-               case E1000_RXBUFFER_2048:
-               default:
-                       rctl |= E1000_RCTL_SZ_2048;
-                       rctl &= ~E1000_RCTL_BSEX;
-                       break;
-               case E1000_RXBUFFER_4096:
-                       rctl |= E1000_RCTL_SZ_4096;
-                       break;
-               case E1000_RXBUFFER_8192:
-                       rctl |= E1000_RCTL_SZ_8192;
-                       break;
-               case E1000_RXBUFFER_16384:
-                       rctl |= E1000_RCTL_SZ_16384;
-                       break;
-       }
-
-       ew32(RCTL, rctl);
-}
-
-/**
- * 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)
-{
-       u64 rdba;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rdlen, rctl, rxcsum;
-
-       if (adapter->netdev->mtu > ETH_DATA_LEN) {
-               rdlen = adapter->rx_ring[0].count *
-                       sizeof(struct e1000_rx_desc);
-               adapter->clean_rx = e1000_clean_jumbo_rx_irq;
-               adapter->alloc_rx_buf = e1000_alloc_jumbo_rx_buffers;
-       } else {
-               rdlen = adapter->rx_ring[0].count *
-                       sizeof(struct e1000_rx_desc);
-               adapter->clean_rx = e1000_clean_rx_irq;
-               adapter->alloc_rx_buf = e1000_alloc_rx_buffers;
-       }
-
-       /* disable receives while setting up the descriptors */
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-
-       /* set the Receive Delay Timer Register */
-       ew32(RDTR, adapter->rx_int_delay);
-
-       if (hw->mac_type >= e1000_82540) {
-               ew32(RADV, adapter->rx_abs_int_delay);
-               if (adapter->itr_setting != 0)
-                       ew32(ITR, 1000000000 / (adapter->itr * 256));
-       }
-
-       /* Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring */
-       switch (adapter->num_rx_queues) {
-       case 1:
-       default:
-               rdba = adapter->rx_ring[0].dma;
-               ew32(RDLEN, rdlen);
-               ew32(RDBAH, (rdba >> 32));
-               ew32(RDBAL, (rdba & 0x00000000ffffffffULL));
-               ew32(RDT, 0);
-               ew32(RDH, 0);
-               adapter->rx_ring[0].rdh = ((hw->mac_type >= e1000_82543) ? E1000_RDH : E1000_82542_RDH);
-               adapter->rx_ring[0].rdt = ((hw->mac_type >= e1000_82543) ? E1000_RDT : E1000_82542_RDT);
-               break;
-       }
-
-       /* Enable 82543 Receive Checksum Offload for TCP and UDP */
-       if (hw->mac_type >= e1000_82543) {
-               rxcsum = er32(RXCSUM);
-               if (adapter->rx_csum)
-                       rxcsum |= E1000_RXCSUM_TUOFL;
-               else
-                       /* don't need to clear IPPCSE as it defaults to 0 */
-                       rxcsum &= ~E1000_RXCSUM_TUOFL;
-               ew32(RXCSUM, rxcsum);
-       }
-
-       /* Enable Receives */
-       ew32(RCTL, rctl);
-}
-
-/**
- * e1000_free_tx_resources - Free Tx Resources per Queue
- * @adapter: board private structure
- * @tx_ring: Tx descriptor ring for a specific queue
- *
- * Free all transmit software resources
- **/
-
-static void e1000_free_tx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_tx_ring *tx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       e1000_clean_tx_ring(adapter, tx_ring);
-
-       vfree(tx_ring->buffer_info);
-       tx_ring->buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
-                         tx_ring->dma);
-
-       tx_ring->desc = NULL;
-}
-
-/**
- * e1000_free_all_tx_resources - Free Tx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all transmit software resources
- **/
-
-void e1000_free_all_tx_resources(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               e1000_free_tx_resources(adapter, &adapter->tx_ring[i]);
-}
-
-static void e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
-                                            struct e1000_buffer *buffer_info)
-{
-       if (buffer_info->dma) {
-               if (buffer_info->mapped_as_page)
-                       dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
-                                      buffer_info->length, DMA_TO_DEVICE);
-               else
-                       dma_unmap_single(&adapter->pdev->dev, buffer_info->dma,
-                                        buffer_info->length,
-                                        DMA_TO_DEVICE);
-               buffer_info->dma = 0;
-       }
-       if (buffer_info->skb) {
-               dev_kfree_skb_any(buffer_info->skb);
-               buffer_info->skb = NULL;
-       }
-       buffer_info->time_stamp = 0;
-       /* buffer_info must be completely set up in the transmit path */
-}
-
-/**
- * e1000_clean_tx_ring - Free Tx Buffers
- * @adapter: board private structure
- * @tx_ring: ring to be cleaned
- **/
-
-static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
-                               struct e1000_tx_ring *tx_ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_buffer *buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       /* Free all the Tx ring sk_buffs */
-
-       for (i = 0; i < tx_ring->count; i++) {
-               buffer_info = &tx_ring->buffer_info[i];
-               e1000_unmap_and_free_tx_resource(adapter, buffer_info);
-       }
-
-       size = sizeof(struct e1000_buffer) * tx_ring->count;
-       memset(tx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-       tx_ring->last_tx_tso = 0;
-
-       writel(0, hw->hw_addr + tx_ring->tdh);
-       writel(0, hw->hw_addr + tx_ring->tdt);
-}
-
-/**
- * e1000_clean_all_tx_rings - Free Tx Buffers for all queues
- * @adapter: board private structure
- **/
-
-static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               e1000_clean_tx_ring(adapter, &adapter->tx_ring[i]);
-}
-
-/**
- * e1000_free_rx_resources - Free Rx Resources
- * @adapter: board private structure
- * @rx_ring: ring to clean the resources from
- *
- * Free all receive software resources
- **/
-
-static void e1000_free_rx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_rx_ring *rx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       e1000_clean_rx_ring(adapter, rx_ring);
-
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
-                         rx_ring->dma);
-
-       rx_ring->desc = NULL;
-}
-
-/**
- * e1000_free_all_rx_resources - Free Rx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all receive software resources
- **/
-
-void e1000_free_all_rx_resources(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               e1000_free_rx_resources(adapter, &adapter->rx_ring[i]);
-}
-
-/**
- * e1000_clean_rx_ring - Free Rx Buffers per Queue
- * @adapter: board private structure
- * @rx_ring: ring to free buffers from
- **/
-
-static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
-                               struct e1000_rx_ring *rx_ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_buffer *buffer_info;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned long size;
-       unsigned int i;
-
-       /* Free all the Rx ring sk_buffs */
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               if (buffer_info->dma &&
-                   adapter->clean_rx == e1000_clean_rx_irq) {
-                       dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                        buffer_info->length,
-                                        DMA_FROM_DEVICE);
-               } else if (buffer_info->dma &&
-                          adapter->clean_rx == e1000_clean_jumbo_rx_irq) {
-                       dma_unmap_page(&pdev->dev, buffer_info->dma,
-                                      buffer_info->length,
-                                      DMA_FROM_DEVICE);
-               }
-
-               buffer_info->dma = 0;
-               if (buffer_info->page) {
-                       put_page(buffer_info->page);
-                       buffer_info->page = NULL;
-               }
-               if (buffer_info->skb) {
-                       dev_kfree_skb(buffer_info->skb);
-                       buffer_info->skb = NULL;
-               }
-       }
-
-       /* there also may be some cached data from a chained receive */
-       if (rx_ring->rx_skb_top) {
-               dev_kfree_skb(rx_ring->rx_skb_top);
-               rx_ring->rx_skb_top = NULL;
-       }
-
-       size = sizeof(struct e1000_buffer) * rx_ring->count;
-       memset(rx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       writel(0, hw->hw_addr + rx_ring->rdh);
-       writel(0, hw->hw_addr + rx_ring->rdt);
-}
-
-/**
- * e1000_clean_all_rx_rings - Free Rx Buffers for all queues
- * @adapter: board private structure
- **/
-
-static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               e1000_clean_rx_ring(adapter, &adapter->rx_ring[i]);
-}
-
-/* The 82542 2.0 (revision 2) needs to have the receive unit in reset
- * and memory write and invalidate disabled for certain operations
- */
-static void e1000_enter_82542_rst(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 rctl;
-
-       e1000_pci_clear_mwi(hw);
-
-       rctl = er32(RCTL);
-       rctl |= E1000_RCTL_RST;
-       ew32(RCTL, rctl);
-       E1000_WRITE_FLUSH();
-       mdelay(5);
-
-       if (netif_running(netdev))
-               e1000_clean_all_rx_rings(adapter);
-}
-
-static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 rctl;
-
-       rctl = er32(RCTL);
-       rctl &= ~E1000_RCTL_RST;
-       ew32(RCTL, rctl);
-       E1000_WRITE_FLUSH();
-       mdelay(5);
-
-       if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
-               e1000_pci_set_mwi(hw);
-
-       if (netif_running(netdev)) {
-               /* No need to loop, because 82542 supports only 1 queue */
-               struct e1000_rx_ring *ring = &adapter->rx_ring[0];
-               e1000_configure_rx(adapter);
-               adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring));
-       }
-}
-
-/**
- * e1000_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int e1000_set_mac(struct net_device *netdev, void *p)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       /* 82542 2.0 needs to be in reset to write receive address registers */
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_enter_82542_rst(adapter);
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len);
-
-       e1000_rar_set(hw, hw->mac_addr, 0);
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_leave_82542_rst(adapter);
-
-       return 0;
-}
-
-/**
- * e1000_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_rx_mode entry point is called whenever the unicast or multicast
- * address lists or the network interface flags are updated. This routine is
- * responsible for configuring the hardware for proper unicast, multicast,
- * promiscuous mode, and all-multi behavior.
- **/
-
-static void e1000_set_rx_mode(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct netdev_hw_addr *ha;
-       bool use_uc = false;
-       u32 rctl;
-       u32 hash_value;
-       int i, rar_entries = E1000_RAR_ENTRIES;
-       int mta_reg_count = E1000_NUM_MTA_REGISTERS;
-       u32 *mcarray = kcalloc(mta_reg_count, sizeof(u32), GFP_ATOMIC);
-
-       if (!mcarray) {
-               e_err(probe, "memory allocation failed\n");
-               return;
-       }
-
-       /* Check for Promiscuous and All Multicast modes */
-
-       rctl = er32(RCTL);
-
-       if (netdev->flags & IFF_PROMISC) {
-               rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
-               rctl &= ~E1000_RCTL_VFE;
-       } else {
-               if (netdev->flags & IFF_ALLMULTI)
-                       rctl |= E1000_RCTL_MPE;
-               else
-                       rctl &= ~E1000_RCTL_MPE;
-               /* Enable VLAN filter if there is a VLAN */
-               if (e1000_vlan_used(adapter))
-                       rctl |= E1000_RCTL_VFE;
-       }
-
-       if (netdev_uc_count(netdev) > rar_entries - 1) {
-               rctl |= E1000_RCTL_UPE;
-       } else if (!(netdev->flags & IFF_PROMISC)) {
-               rctl &= ~E1000_RCTL_UPE;
-               use_uc = true;
-       }
-
-       ew32(RCTL, rctl);
-
-       /* 82542 2.0 needs to be in reset to write receive address registers */
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_enter_82542_rst(adapter);
-
-       /* load the first 14 addresses into the exact filters 1-14. Unicast
-        * addresses take precedence to avoid disabling unicast filtering
-        * when possible.
-        *
-        * RAR 0 is used for the station MAC address
-        * if there are not 14 addresses, go ahead and clear the filters
-        */
-       i = 1;
-       if (use_uc)
-               netdev_for_each_uc_addr(ha, netdev) {
-                       if (i == rar_entries)
-                               break;
-                       e1000_rar_set(hw, ha->addr, i++);
-               }
-
-       netdev_for_each_mc_addr(ha, netdev) {
-               if (i == rar_entries) {
-                       /* load any remaining addresses into the hash table */
-                       u32 hash_reg, hash_bit, mta;
-                       hash_value = e1000_hash_mc_addr(hw, ha->addr);
-                       hash_reg = (hash_value >> 5) & 0x7F;
-                       hash_bit = hash_value & 0x1F;
-                       mta = (1 << hash_bit);
-                       mcarray[hash_reg] |= mta;
-               } else {
-                       e1000_rar_set(hw, ha->addr, i++);
-               }
-       }
-
-       for (; i < rar_entries; i++) {
-               E1000_WRITE_REG_ARRAY(hw, RA, i << 1, 0);
-               E1000_WRITE_FLUSH();
-               E1000_WRITE_REG_ARRAY(hw, RA, (i << 1) + 1, 0);
-               E1000_WRITE_FLUSH();
-       }
-
-       /* write the hash table completely, write from bottom to avoid
-        * both stupid write combining chipsets, and flushing each write */
-       for (i = mta_reg_count - 1; i >= 0 ; i--) {
-               /*
-                * If we are on an 82544 has an errata where writing odd
-                * offsets overwrites the previous even offset, but writing
-                * backwards over the range solves the issue by always
-                * writing the odd offset first
-                */
-               E1000_WRITE_REG_ARRAY(hw, MTA, i, mcarray[i]);
-       }
-       E1000_WRITE_FLUSH();
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_leave_82542_rst(adapter);
-
-       kfree(mcarray);
-}
-
-/* Need to wait a few seconds after link up to get diagnostic information from
- * the phy */
-
-static void e1000_update_phy_info(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
-       schedule_work(&adapter->phy_info_task);
-}
-
-static void e1000_update_phy_info_task(struct work_struct *work)
-{
-       struct e1000_adapter *adapter = container_of(work,
-                                                    struct e1000_adapter,
-                                                    phy_info_task);
-       struct e1000_hw *hw = &adapter->hw;
-
-       rtnl_lock();
-       e1000_phy_get_info(hw, &adapter->phy_info);
-       rtnl_unlock();
-}
-
-/**
- * e1000_82547_tx_fifo_stall - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void e1000_82547_tx_fifo_stall(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
-       schedule_work(&adapter->fifo_stall_task);
-}
-
-/**
- * e1000_82547_tx_fifo_stall_task - task to complete work
- * @work: work struct contained inside adapter struct
- **/
-static void e1000_82547_tx_fifo_stall_task(struct work_struct *work)
-{
-       struct e1000_adapter *adapter = container_of(work,
-                                                    struct e1000_adapter,
-                                                    fifo_stall_task);
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 tctl;
-
-       rtnl_lock();
-       if (atomic_read(&adapter->tx_fifo_stall)) {
-               if ((er32(TDT) == er32(TDH)) &&
-                  (er32(TDFT) == er32(TDFH)) &&
-                  (er32(TDFTS) == er32(TDFHS))) {
-                       tctl = er32(TCTL);
-                       ew32(TCTL, tctl & ~E1000_TCTL_EN);
-                       ew32(TDFT, adapter->tx_head_addr);
-                       ew32(TDFH, adapter->tx_head_addr);
-                       ew32(TDFTS, adapter->tx_head_addr);
-                       ew32(TDFHS, adapter->tx_head_addr);
-                       ew32(TCTL, tctl);
-                       E1000_WRITE_FLUSH();
-
-                       adapter->tx_fifo_head = 0;
-                       atomic_set(&adapter->tx_fifo_stall, 0);
-                       netif_wake_queue(netdev);
-               } else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
-                       mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
-               }
-       }
-       rtnl_unlock();
-}
-
-bool e1000_has_link(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       bool link_active = false;
-
-       /* get_link_status is set on LSC (link status) interrupt or rx
-        * sequence error interrupt (except on intel ce4100).
-        * get_link_status will stay false until the
-        * e1000_check_for_link establishes link for copper adapters
-        * ONLY
-        */
-       switch (hw->media_type) {
-       case e1000_media_type_copper:
-               if (hw->mac_type == e1000_ce4100)
-                       hw->get_link_status = 1;
-               if (hw->get_link_status) {
-                       e1000_check_for_link(hw);
-                       link_active = !hw->get_link_status;
-               } else {
-                       link_active = true;
-               }
-               break;
-       case e1000_media_type_fiber:
-               e1000_check_for_link(hw);
-               link_active = !!(er32(STATUS) & E1000_STATUS_LU);
-               break;
-       case e1000_media_type_internal_serdes:
-               e1000_check_for_link(hw);
-               link_active = hw->serdes_has_link;
-               break;
-       default:
-               break;
-       }
-
-       return link_active;
-}
-
-/**
- * e1000_watchdog - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void e1000_watchdog(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_tx_ring *txdr = adapter->tx_ring;
-       u32 link, tctl;
-
-       link = e1000_has_link(adapter);
-       if ((netif_carrier_ok(netdev)) && link)
-               goto link_up;
-
-       if (link) {
-               if (!netif_carrier_ok(netdev)) {
-                       u32 ctrl;
-                       bool txb2b = true;
-                       /* update snapshot of PHY registers on LSC */
-                       e1000_get_speed_and_duplex(hw,
-                                                  &adapter->link_speed,
-                                                  &adapter->link_duplex);
-
-                       ctrl = er32(CTRL);
-                       pr_info("%s NIC Link is Up %d Mbps %s, "
-                               "Flow Control: %s\n",
-                               netdev->name,
-                               adapter->link_speed,
-                               adapter->link_duplex == FULL_DUPLEX ?
-                               "Full Duplex" : "Half Duplex",
-                               ((ctrl & E1000_CTRL_TFCE) && (ctrl &
-                               E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
-                               E1000_CTRL_RFCE) ? "RX" : ((ctrl &
-                               E1000_CTRL_TFCE) ? "TX" : "None")));
-
-                       /* adjust timeout factor according to speed/duplex */
-                       adapter->tx_timeout_factor = 1;
-                       switch (adapter->link_speed) {
-                       case SPEED_10:
-                               txb2b = false;
-                               adapter->tx_timeout_factor = 16;
-                               break;
-                       case SPEED_100:
-                               txb2b = false;
-                               /* maybe add some timeout factor ? */
-                               break;
-                       }
-
-                       /* enable transmits in the hardware */
-                       tctl = er32(TCTL);
-                       tctl |= E1000_TCTL_EN;
-                       ew32(TCTL, tctl);
-
-                       netif_carrier_on(netdev);
-                       if (!test_bit(__E1000_DOWN, &adapter->flags))
-                               mod_timer(&adapter->phy_info_timer,
-                                         round_jiffies(jiffies + 2 * HZ));
-                       adapter->smartspeed = 0;
-               }
-       } else {
-               if (netif_carrier_ok(netdev)) {
-                       adapter->link_speed = 0;
-                       adapter->link_duplex = 0;
-                       pr_info("%s NIC Link is Down\n",
-                               netdev->name);
-                       netif_carrier_off(netdev);
-
-                       if (!test_bit(__E1000_DOWN, &adapter->flags))
-                               mod_timer(&adapter->phy_info_timer,
-                                         round_jiffies(jiffies + 2 * HZ));
-               }
-
-               e1000_smartspeed(adapter);
-       }
-
-link_up:
-       e1000_update_stats(adapter);
-
-       hw->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
-       adapter->tpt_old = adapter->stats.tpt;
-       hw->collision_delta = adapter->stats.colc - adapter->colc_old;
-       adapter->colc_old = adapter->stats.colc;
-
-       adapter->gorcl = adapter->stats.gorcl - adapter->gorcl_old;
-       adapter->gorcl_old = adapter->stats.gorcl;
-       adapter->gotcl = adapter->stats.gotcl - adapter->gotcl_old;
-       adapter->gotcl_old = adapter->stats.gotcl;
-
-       e1000_update_adaptive(hw);
-
-       if (!netif_carrier_ok(netdev)) {
-               if (E1000_DESC_UNUSED(txdr) + 1 < txdr->count) {
-                       /* We've lost link, so the controller stops DMA,
-                        * but we've got queued Tx work that's never going
-                        * to get done, so reset controller to flush Tx.
-                        * (Do the reset outside of interrupt context). */
-                       adapter->tx_timeout_count++;
-                       schedule_work(&adapter->reset_task);
-                       /* return immediately since reset is imminent */
-                       return;
-               }
-       }
-
-       /* Simple mode for Interrupt Throttle Rate (ITR) */
-       if (hw->mac_type >= e1000_82540 && adapter->itr_setting == 4) {
-               /*
-                * Symmetric Tx/Rx gets a reduced ITR=2000;
-                * Total asymmetrical Tx or Rx gets ITR=8000;
-                * everyone else is between 2000-8000.
-                */
-               u32 goc = (adapter->gotcl + adapter->gorcl) / 10000;
-               u32 dif = (adapter->gotcl > adapter->gorcl ?
-                           adapter->gotcl - adapter->gorcl :
-                           adapter->gorcl - adapter->gotcl) / 10000;
-               u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
-
-               ew32(ITR, 1000000000 / (itr * 256));
-       }
-
-       /* Cause software interrupt to ensure rx ring is cleaned */
-       ew32(ICS, E1000_ICS_RXDMT0);
-
-       /* Force detection of hung controller every watchdog period */
-       adapter->detect_tx_hung = true;
-
-       /* Reset the timer */
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               mod_timer(&adapter->watchdog_timer,
-                         round_jiffies(jiffies + 2 * HZ));
-}
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-/**
- * e1000_update_itr - update the dynamic ITR value based on statistics
- * @adapter: pointer to adapter
- * @itr_setting: current adapter->itr
- * @packets: the number of packets during this measurement interval
- * @bytes: the number of bytes during this measurement interval
- *
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.
- *      this functionality is controlled by the InterruptThrottleRate module
- *      parameter (see e1000_param.c)
- **/
-static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
-                                    u16 itr_setting, int packets, int bytes)
-{
-       unsigned int retval = itr_setting;
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (unlikely(hw->mac_type < e1000_82540))
-               goto update_itr_done;
-
-       if (packets == 0)
-               goto update_itr_done;
-
-       switch (itr_setting) {
-       case lowest_latency:
-               /* jumbo frames get bulk treatment*/
-               if (bytes/packets > 8000)
-                       retval = bulk_latency;
-               else if ((packets < 5) && (bytes > 512))
-                       retval = low_latency;
-               break;
-       case low_latency:  /* 50 usec aka 20000 ints/s */
-               if (bytes > 10000) {
-                       /* jumbo frames need bulk latency setting */
-                       if (bytes/packets > 8000)
-                               retval = bulk_latency;
-                       else if ((packets < 10) || ((bytes/packets) > 1200))
-                               retval = bulk_latency;
-                       else if ((packets > 35))
-                               retval = lowest_latency;
-               } else if (bytes/packets > 2000)
-                       retval = bulk_latency;
-               else if (packets <= 2 && bytes < 512)
-                       retval = lowest_latency;
-               break;
-       case bulk_latency: /* 250 usec aka 4000 ints/s */
-               if (bytes > 25000) {
-                       if (packets > 35)
-                               retval = low_latency;
-               } else if (bytes < 6000) {
-                       retval = low_latency;
-               }
-               break;
-       }
-
-update_itr_done:
-       return retval;
-}
-
-static void e1000_set_itr(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 current_itr;
-       u32 new_itr = adapter->itr;
-
-       if (unlikely(hw->mac_type < e1000_82540))
-               return;
-
-       /* for non-gigabit speeds, just fix the interrupt rate at 4000 */
-       if (unlikely(adapter->link_speed != SPEED_1000)) {
-               current_itr = 0;
-               new_itr = 4000;
-               goto set_itr_now;
-       }
-
-       adapter->tx_itr = e1000_update_itr(adapter,
-                                   adapter->tx_itr,
-                                   adapter->total_tx_packets,
-                                   adapter->total_tx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
-               adapter->tx_itr = low_latency;
-
-       adapter->rx_itr = e1000_update_itr(adapter,
-                                   adapter->rx_itr,
-                                   adapter->total_rx_packets,
-                                   adapter->total_rx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
-               adapter->rx_itr = low_latency;
-
-       current_itr = max(adapter->rx_itr, adapter->tx_itr);
-
-       switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
-       case lowest_latency:
-               new_itr = 70000;
-               break;
-       case low_latency:
-               new_itr = 20000; /* aka hwitr = ~200 */
-               break;
-       case bulk_latency:
-               new_itr = 4000;
-               break;
-       default:
-               break;
-       }
-
-set_itr_now:
-       if (new_itr != adapter->itr) {
-               /* this attempts to bias the interrupt rate towards Bulk
-                * by adding intermediate steps when interrupt rate is
-                * increasing */
-               new_itr = new_itr > adapter->itr ?
-                            min(adapter->itr + (new_itr >> 2), new_itr) :
-                            new_itr;
-               adapter->itr = new_itr;
-               ew32(ITR, 1000000000 / (new_itr * 256));
-       }
-}
-
-#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
-
-static int e1000_tso(struct e1000_adapter *adapter,
-                    struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
-{
-       struct e1000_context_desc *context_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i;
-       u32 cmd_length = 0;
-       u16 ipcse = 0, tucse, mss;
-       u8 ipcss, ipcso, tucss, tucso, hdr_len;
-       int err;
-
-       if (skb_is_gso(skb)) {
-               if (skb_header_cloned(skb)) {
-                       err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                       if (err)
-                               return err;
-               }
-
-               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-               mss = skb_shinfo(skb)->gso_size;
-               if (skb->protocol == htons(ETH_P_IP)) {
-                       struct iphdr *iph = ip_hdr(skb);
-                       iph->tot_len = 0;
-                       iph->check = 0;
-                       tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                                iph->daddr, 0,
-                                                                IPPROTO_TCP,
-                                                                0);
-                       cmd_length = E1000_TXD_CMD_IP;
-                       ipcse = skb_transport_offset(skb) - 1;
-               } else if (skb->protocol == htons(ETH_P_IPV6)) {
-                       ipv6_hdr(skb)->payload_len = 0;
-                       tcp_hdr(skb)->check =
-                               ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                &ipv6_hdr(skb)->daddr,
-                                                0, IPPROTO_TCP, 0);
-                       ipcse = 0;
-               }
-               ipcss = skb_network_offset(skb);
-               ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
-               tucss = skb_transport_offset(skb);
-               tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
-               tucse = 0;
-
-               cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
-                              E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
-
-               i = tx_ring->next_to_use;
-               context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
-               buffer_info = &tx_ring->buffer_info[i];
-
-               context_desc->lower_setup.ip_fields.ipcss  = ipcss;
-               context_desc->lower_setup.ip_fields.ipcso  = ipcso;
-               context_desc->lower_setup.ip_fields.ipcse  = cpu_to_le16(ipcse);
-               context_desc->upper_setup.tcp_fields.tucss = tucss;
-               context_desc->upper_setup.tcp_fields.tucso = tucso;
-               context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
-               context_desc->tcp_seg_setup.fields.mss     = cpu_to_le16(mss);
-               context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
-               context_desc->cmd_and_length = cpu_to_le32(cmd_length);
-
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-
-               if (++i == tx_ring->count) i = 0;
-               tx_ring->next_to_use = i;
-
-               return true;
-       }
-       return false;
-}
-
-static bool e1000_tx_csum(struct e1000_adapter *adapter,
-                         struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
-{
-       struct e1000_context_desc *context_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i;
-       u8 css;
-       u32 cmd_len = E1000_TXD_CMD_DEXT;
-
-       if (skb->ip_summed != CHECKSUM_PARTIAL)
-               return false;
-
-       switch (skb->protocol) {
-       case cpu_to_be16(ETH_P_IP):
-               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
-                       cmd_len |= E1000_TXD_CMD_TCP;
-               break;
-       case cpu_to_be16(ETH_P_IPV6):
-               /* XXX not handling all IPV6 headers */
-               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                       cmd_len |= E1000_TXD_CMD_TCP;
-               break;
-       default:
-               if (unlikely(net_ratelimit()))
-                       e_warn(drv, "checksum_partial proto=%x!\n",
-                              skb->protocol);
-               break;
-       }
-
-       css = skb_checksum_start_offset(skb);
-
-       i = tx_ring->next_to_use;
-       buffer_info = &tx_ring->buffer_info[i];
-       context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
-
-       context_desc->lower_setup.ip_config = 0;
-       context_desc->upper_setup.tcp_fields.tucss = css;
-       context_desc->upper_setup.tcp_fields.tucso =
-               css + skb->csum_offset;
-       context_desc->upper_setup.tcp_fields.tucse = 0;
-       context_desc->tcp_seg_setup.data = 0;
-       context_desc->cmd_and_length = cpu_to_le32(cmd_len);
-
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-
-       if (unlikely(++i == tx_ring->count)) i = 0;
-       tx_ring->next_to_use = i;
-
-       return true;
-}
-
-#define E1000_MAX_TXD_PWR      12
-#define E1000_MAX_DATA_PER_TXD (1<<E1000_MAX_TXD_PWR)
-
-static int e1000_tx_map(struct e1000_adapter *adapter,
-                       struct e1000_tx_ring *tx_ring,
-                       struct sk_buff *skb, unsigned int first,
-                       unsigned int max_per_txd, unsigned int nr_frags,
-                       unsigned int mss)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_buffer *buffer_info;
-       unsigned int len = skb_headlen(skb);
-       unsigned int offset = 0, size, count = 0, i;
-       unsigned int f;
-
-       i = tx_ring->next_to_use;
-
-       while (len) {
-               buffer_info = &tx_ring->buffer_info[i];
-               size = min(len, max_per_txd);
-               /* Workaround for Controller erratum --
-                * descriptor for non-tso packet in a linear SKB that follows a
-                * tso gets written back prematurely before the data is fully
-                * DMA'd to the controller */
-               if (!skb->data_len && tx_ring->last_tx_tso &&
-                   !skb_is_gso(skb)) {
-                       tx_ring->last_tx_tso = 0;
-                       size -= 4;
-               }
-
-               /* Workaround for premature desc write-backs
-                * in TSO mode.  Append 4-byte sentinel desc */
-               if (unlikely(mss && !nr_frags && size == len && size > 8))
-                       size -= 4;
-               /* work-around for errata 10 and it applies
-                * to all controllers in PCI-X mode
-                * The fix is to make sure that the first descriptor of a
-                * packet is smaller than 2048 - 16 - 16 (or 2016) bytes
-                */
-               if (unlikely((hw->bus_type == e1000_bus_type_pcix) &&
-                               (size > 2015) && count == 0))
-                       size = 2015;
-
-               /* Workaround for potential 82544 hang in PCI-X.  Avoid
-                * terminating buffers within evenly-aligned dwords. */
-               if (unlikely(adapter->pcix_82544 &&
-                  !((unsigned long)(skb->data + offset + size - 1) & 4) &&
-                  size > 4))
-                       size -= 4;
-
-               buffer_info->length = size;
-               /* set time_stamp *before* dma to help avoid a possible race */
-               buffer_info->time_stamp = jiffies;
-               buffer_info->mapped_as_page = false;
-               buffer_info->dma = dma_map_single(&pdev->dev,
-                                                 skb->data + offset,
-                                                 size, DMA_TO_DEVICE);
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-                       goto dma_error;
-               buffer_info->next_to_watch = i;
-
-               len -= size;
-               offset += size;
-               count++;
-               if (len) {
-                       i++;
-                       if (unlikely(i == tx_ring->count))
-                               i = 0;
-               }
-       }
-
-       for (f = 0; f < nr_frags; f++) {
-               struct skb_frag_struct *frag;
-
-               frag = &skb_shinfo(skb)->frags[f];
-               len = frag->size;
-               offset = frag->page_offset;
-
-               while (len) {
-                       i++;
-                       if (unlikely(i == tx_ring->count))
-                               i = 0;
-
-                       buffer_info = &tx_ring->buffer_info[i];
-                       size = min(len, max_per_txd);
-                       /* Workaround for premature desc write-backs
-                        * in TSO mode.  Append 4-byte sentinel desc */
-                       if (unlikely(mss && f == (nr_frags-1) && size == len && size > 8))
-                               size -= 4;
-                       /* Workaround for potential 82544 hang in PCI-X.
-                        * Avoid terminating buffers within evenly-aligned
-                        * dwords. */
-                       if (unlikely(adapter->pcix_82544 &&
-                           !((unsigned long)(page_to_phys(frag->page) + offset
-                                             + size - 1) & 4) &&
-                           size > 4))
-                               size -= 4;
-
-                       buffer_info->length = size;
-                       buffer_info->time_stamp = jiffies;
-                       buffer_info->mapped_as_page = true;
-                       buffer_info->dma = dma_map_page(&pdev->dev, frag->page,
-                                                       offset, size,
-                                                       DMA_TO_DEVICE);
-                       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-                               goto dma_error;
-                       buffer_info->next_to_watch = i;
-
-                       len -= size;
-                       offset += size;
-                       count++;
-               }
-       }
-
-       tx_ring->buffer_info[i].skb = skb;
-       tx_ring->buffer_info[first].next_to_watch = i;
-
-       return count;
-
-dma_error:
-       dev_err(&pdev->dev, "TX DMA map failed\n");
-       buffer_info->dma = 0;
-       if (count)
-               count--;
-
-       while (count--) {
-               if (i==0)
-                       i += tx_ring->count;
-               i--;
-               buffer_info = &tx_ring->buffer_info[i];
-               e1000_unmap_and_free_tx_resource(adapter, buffer_info);
-       }
-
-       return 0;
-}
-
-static void e1000_tx_queue(struct e1000_adapter *adapter,
-                          struct e1000_tx_ring *tx_ring, int tx_flags,
-                          int count)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_desc *tx_desc = NULL;
-       struct e1000_buffer *buffer_info;
-       u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
-       unsigned int i;
-
-       if (likely(tx_flags & E1000_TX_FLAGS_TSO)) {
-               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
-                            E1000_TXD_CMD_TSE;
-               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
-
-               if (likely(tx_flags & E1000_TX_FLAGS_IPV4))
-                       txd_upper |= E1000_TXD_POPTS_IXSM << 8;
-       }
-
-       if (likely(tx_flags & E1000_TX_FLAGS_CSUM)) {
-               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
-               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
-       }
-
-       if (unlikely(tx_flags & E1000_TX_FLAGS_VLAN)) {
-               txd_lower |= E1000_TXD_CMD_VLE;
-               txd_upper |= (tx_flags & E1000_TX_FLAGS_VLAN_MASK);
-       }
-
-       i = tx_ring->next_to_use;
-
-       while (count--) {
-               buffer_info = &tx_ring->buffer_info[i];
-               tx_desc = E1000_TX_DESC(*tx_ring, i);
-               tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-               tx_desc->lower.data =
-                       cpu_to_le32(txd_lower | buffer_info->length);
-               tx_desc->upper.data = cpu_to_le32(txd_upper);
-               if (unlikely(++i == tx_ring->count)) i = 0;
-       }
-
-       tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
-
-       /* Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64). */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       writel(i, hw->hw_addr + tx_ring->tdt);
-       /* we need this if more than one processor can write to our tail
-        * at a time, it syncronizes IO on IA64/Altix systems */
-       mmiowb();
-}
-
-/**
- * 82547 workaround to avoid controller hang in half-duplex environment.
- * The workaround is to avoid queuing a large packet that would span
- * the internal Tx FIFO ring boundary by notifying the stack to resend
- * the packet at a later time.  This gives the Tx FIFO an opportunity to
- * flush all packets.  When that occurs, we reset the Tx FIFO pointers
- * to the beginning of the Tx FIFO.
- **/
-
-#define E1000_FIFO_HDR                 0x10
-#define E1000_82547_PAD_LEN            0x3E0
-
-static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
-                                      struct sk_buff *skb)
-{
-       u32 fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
-       u32 skb_fifo_len = skb->len + E1000_FIFO_HDR;
-
-       skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
-
-       if (adapter->link_duplex != HALF_DUPLEX)
-               goto no_fifo_stall_required;
-
-       if (atomic_read(&adapter->tx_fifo_stall))
-               return 1;
-
-       if (skb_fifo_len >= (E1000_82547_PAD_LEN + fifo_space)) {
-               atomic_set(&adapter->tx_fifo_stall, 1);
-               return 1;
-       }
-
-no_fifo_stall_required:
-       adapter->tx_fifo_head += skb_fifo_len;
-       if (adapter->tx_fifo_head >= adapter->tx_fifo_size)
-               adapter->tx_fifo_head -= adapter->tx_fifo_size;
-       return 0;
-}
-
-static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_tx_ring *tx_ring = adapter->tx_ring;
-
-       netif_stop_queue(netdev);
-       /* Herbert's original patch had:
-        *  smp_mb__after_netif_stop_queue();
-        * but since that doesn't exist yet, just open code it. */
-       smp_mb();
-
-       /* We need to check again in a case another CPU has just
-        * made room available. */
-       if (likely(E1000_DESC_UNUSED(tx_ring) < size))
-               return -EBUSY;
-
-       /* A reprieve! */
-       netif_start_queue(netdev);
-       ++adapter->restart_queue;
-       return 0;
-}
-
-static int e1000_maybe_stop_tx(struct net_device *netdev,
-                               struct e1000_tx_ring *tx_ring, int size)
-{
-       if (likely(E1000_DESC_UNUSED(tx_ring) >= size))
-               return 0;
-       return __e1000_maybe_stop_tx(netdev, size);
-}
-
-#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
-static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
-                                   struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_ring *tx_ring;
-       unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD;
-       unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
-       unsigned int tx_flags = 0;
-       unsigned int len = skb_headlen(skb);
-       unsigned int nr_frags;
-       unsigned int mss;
-       int count = 0;
-       int tso;
-       unsigned int f;
-
-       /* This goes back to the question of how to logically map a tx queue
-        * to a flow.  Right now, performance is impacted slightly negatively
-        * if using multiple tx queues.  If the stack breaks away from a
-        * single qdisc implementation, we can look at this again. */
-       tx_ring = adapter->tx_ring;
-
-       if (unlikely(skb->len <= 0)) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       mss = skb_shinfo(skb)->gso_size;
-       /* The controller does a simple calculation to
-        * make sure there is enough room in the FIFO before
-        * initiating the DMA for each buffer.  The calc is:
-        * 4 = ceil(buffer len/mss).  To make sure we don't
-        * overrun the FIFO, adjust the max buffer len if mss
-        * drops. */
-       if (mss) {
-               u8 hdr_len;
-               max_per_txd = min(mss << 2, max_per_txd);
-               max_txd_pwr = fls(max_per_txd) - 1;
-
-               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-               if (skb->data_len && hdr_len == len) {
-                       switch (hw->mac_type) {
-                               unsigned int pull_size;
-                       case e1000_82544:
-                               /* Make sure we have room to chop off 4 bytes,
-                                * and that the end alignment will work out to
-                                * this hardware's requirements
-                                * NOTE: this is a TSO only workaround
-                                * if end byte alignment not correct move us
-                                * into the next dword */
-                               if ((unsigned long)(skb_tail_pointer(skb) - 1) & 4)
-                                       break;
-                               /* fall through */
-                               pull_size = min((unsigned int)4, skb->data_len);
-                               if (!__pskb_pull_tail(skb, pull_size)) {
-                                       e_err(drv, "__pskb_pull_tail "
-                                             "failed.\n");
-                                       dev_kfree_skb_any(skb);
-                                       return NETDEV_TX_OK;
-                               }
-                               len = skb_headlen(skb);
-                               break;
-                       default:
-                               /* do nothing */
-                               break;
-                       }
-               }
-       }
-
-       /* reserve a descriptor for the offload context */
-       if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
-               count++;
-       count++;
-
-       /* Controller Erratum workaround */
-       if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
-               count++;
-
-       count += TXD_USE_COUNT(len, max_txd_pwr);
-
-       if (adapter->pcix_82544)
-               count++;
-
-       /* work-around for errata 10 and it applies to all controllers
-        * in PCI-X mode, so add one more descriptor to the count
-        */
-       if (unlikely((hw->bus_type == e1000_bus_type_pcix) &&
-                       (len > 2015)))
-               count++;
-
-       nr_frags = skb_shinfo(skb)->nr_frags;
-       for (f = 0; f < nr_frags; f++)
-               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
-                                      max_txd_pwr);
-       if (adapter->pcix_82544)
-               count += nr_frags;
-
-       /* need: count + 2 desc gap to keep tail from touching
-        * head, otherwise try next time */
-       if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2)))
-               return NETDEV_TX_BUSY;
-
-       if (unlikely(hw->mac_type == e1000_82547)) {
-               if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) {
-                       netif_stop_queue(netdev);
-                       if (!test_bit(__E1000_DOWN, &adapter->flags))
-                               mod_timer(&adapter->tx_fifo_stall_timer,
-                                         jiffies + 1);
-                       return NETDEV_TX_BUSY;
-               }
-       }
-
-       if (vlan_tx_tag_present(skb)) {
-               tx_flags |= E1000_TX_FLAGS_VLAN;
-               tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
-       }
-
-       first = tx_ring->next_to_use;
-
-       tso = e1000_tso(adapter, tx_ring, skb);
-       if (tso < 0) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (likely(tso)) {
-               if (likely(hw->mac_type != e1000_82544))
-                       tx_ring->last_tx_tso = 1;
-               tx_flags |= E1000_TX_FLAGS_TSO;
-       } else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))
-               tx_flags |= E1000_TX_FLAGS_CSUM;
-
-       if (likely(skb->protocol == htons(ETH_P_IP)))
-               tx_flags |= E1000_TX_FLAGS_IPV4;
-
-       count = e1000_tx_map(adapter, tx_ring, skb, first, max_per_txd,
-                            nr_frags, mss);
-
-       if (count) {
-               e1000_tx_queue(adapter, tx_ring, tx_flags, count);
-               /* Make sure there is space in the ring for the next send. */
-               e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
-
-       } else {
-               dev_kfree_skb_any(skb);
-               tx_ring->buffer_info[first].time_stamp = 0;
-               tx_ring->next_to_use = first;
-       }
-
-       return NETDEV_TX_OK;
-}
-
-/**
- * e1000_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-
-static void e1000_tx_timeout(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       /* Do the reset outside of interrupt context */
-       adapter->tx_timeout_count++;
-       schedule_work(&adapter->reset_task);
-}
-
-static void e1000_reset_task(struct work_struct *work)
-{
-       struct e1000_adapter *adapter =
-               container_of(work, struct e1000_adapter, reset_task);
-
-       e1000_reinit_safe(adapter);
-}
-
-/**
- * e1000_get_stats - Get System Network Statistics
- * @netdev: network interface device structure
- *
- * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
- **/
-
-static struct net_device_stats *e1000_get_stats(struct net_device *netdev)
-{
-       /* only return the current stats */
-       return &netdev->stats;
-}
-
-/**
- * e1000_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
-
-       if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
-           (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-               e_err(probe, "Invalid MTU setting\n");
-               return -EINVAL;
-       }
-
-       /* Adapter-specific max frame size limits. */
-       switch (hw->mac_type) {
-       case e1000_undefined ... e1000_82542_rev2_1:
-               if (max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN)) {
-                       e_err(probe, "Jumbo Frames not supported.\n");
-                       return -EINVAL;
-               }
-               break;
-       default:
-               /* Capable of supporting up to MAX_JUMBO_FRAME_SIZE limit. */
-               break;
-       }
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-       /* e1000_down has a dependency on max_frame_size */
-       hw->max_frame_size = max_frame;
-       if (netif_running(netdev))
-               e1000_down(adapter);
-
-       /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
-        * means we reserve 2 more, this pushes us to allocate from the next
-        * larger slab size.
-        * i.e. RXBUFFER_2048 --> size-4096 slab
-        *  however with the new *_jumbo_rx* routines, jumbo receives will use
-        *  fragmented skbs */
-
-       if (max_frame <= E1000_RXBUFFER_2048)
-               adapter->rx_buffer_len = E1000_RXBUFFER_2048;
-       else
-#if (PAGE_SIZE >= E1000_RXBUFFER_16384)
-               adapter->rx_buffer_len = E1000_RXBUFFER_16384;
-#elif (PAGE_SIZE >= E1000_RXBUFFER_4096)
-               adapter->rx_buffer_len = PAGE_SIZE;
-#endif
-
-       /* adjust allocation if LPE protects us, and we aren't using SBP */
-       if (!hw->tbi_compatibility_on &&
-           ((max_frame == (ETH_FRAME_LEN + ETH_FCS_LEN)) ||
-            (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE)))
-               adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-
-       pr_info("%s changing MTU from %d to %d\n",
-               netdev->name, netdev->mtu, new_mtu);
-       netdev->mtu = new_mtu;
-
-       if (netif_running(netdev))
-               e1000_up(adapter);
-       else
-               e1000_reset(adapter);
-
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-
-       return 0;
-}
-
-/**
- * e1000_update_stats - Update the board statistics counters
- * @adapter: board private structure
- **/
-
-void e1000_update_stats(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned long flags;
-       u16 phy_tmp;
-
-#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
-
-       /*
-        * Prevent stats update while adapter is being reset, or if the pci
-        * connection is down.
-        */
-       if (adapter->link_speed == 0)
-               return;
-       if (pci_channel_offline(pdev))
-               return;
-
-       spin_lock_irqsave(&adapter->stats_lock, flags);
-
-       /* these counters are modified from e1000_tbi_adjust_stats,
-        * called from the interrupt context, so they must only
-        * be written while holding adapter->stats_lock
-        */
-
-       adapter->stats.crcerrs += er32(CRCERRS);
-       adapter->stats.gprc += er32(GPRC);
-       adapter->stats.gorcl += er32(GORCL);
-       adapter->stats.gorch += er32(GORCH);
-       adapter->stats.bprc += er32(BPRC);
-       adapter->stats.mprc += er32(MPRC);
-       adapter->stats.roc += er32(ROC);
-
-       adapter->stats.prc64 += er32(PRC64);
-       adapter->stats.prc127 += er32(PRC127);
-       adapter->stats.prc255 += er32(PRC255);
-       adapter->stats.prc511 += er32(PRC511);
-       adapter->stats.prc1023 += er32(PRC1023);
-       adapter->stats.prc1522 += er32(PRC1522);
-
-       adapter->stats.symerrs += er32(SYMERRS);
-       adapter->stats.mpc += er32(MPC);
-       adapter->stats.scc += er32(SCC);
-       adapter->stats.ecol += er32(ECOL);
-       adapter->stats.mcc += er32(MCC);
-       adapter->stats.latecol += er32(LATECOL);
-       adapter->stats.dc += er32(DC);
-       adapter->stats.sec += er32(SEC);
-       adapter->stats.rlec += er32(RLEC);
-       adapter->stats.xonrxc += er32(XONRXC);
-       adapter->stats.xontxc += er32(XONTXC);
-       adapter->stats.xoffrxc += er32(XOFFRXC);
-       adapter->stats.xofftxc += er32(XOFFTXC);
-       adapter->stats.fcruc += er32(FCRUC);
-       adapter->stats.gptc += er32(GPTC);
-       adapter->stats.gotcl += er32(GOTCL);
-       adapter->stats.gotch += er32(GOTCH);
-       adapter->stats.rnbc += er32(RNBC);
-       adapter->stats.ruc += er32(RUC);
-       adapter->stats.rfc += er32(RFC);
-       adapter->stats.rjc += er32(RJC);
-       adapter->stats.torl += er32(TORL);
-       adapter->stats.torh += er32(TORH);
-       adapter->stats.totl += er32(TOTL);
-       adapter->stats.toth += er32(TOTH);
-       adapter->stats.tpr += er32(TPR);
-
-       adapter->stats.ptc64 += er32(PTC64);
-       adapter->stats.ptc127 += er32(PTC127);
-       adapter->stats.ptc255 += er32(PTC255);
-       adapter->stats.ptc511 += er32(PTC511);
-       adapter->stats.ptc1023 += er32(PTC1023);
-       adapter->stats.ptc1522 += er32(PTC1522);
-
-       adapter->stats.mptc += er32(MPTC);
-       adapter->stats.bptc += er32(BPTC);
-
-       /* used for adaptive IFS */
-
-       hw->tx_packet_delta = er32(TPT);
-       adapter->stats.tpt += hw->tx_packet_delta;
-       hw->collision_delta = er32(COLC);
-       adapter->stats.colc += hw->collision_delta;
-
-       if (hw->mac_type >= e1000_82543) {
-               adapter->stats.algnerrc += er32(ALGNERRC);
-               adapter->stats.rxerrc += er32(RXERRC);
-               adapter->stats.tncrs += er32(TNCRS);
-               adapter->stats.cexterr += er32(CEXTERR);
-               adapter->stats.tsctc += er32(TSCTC);
-               adapter->stats.tsctfc += er32(TSCTFC);
-       }
-
-       /* Fill out the OS statistics structure */
-       netdev->stats.multicast = adapter->stats.mprc;
-       netdev->stats.collisions = adapter->stats.colc;
-
-       /* Rx Errors */
-
-       /* RLEC on some newer hardware can be incorrect so build
-       * our own version based on RUC and ROC */
-       netdev->stats.rx_errors = adapter->stats.rxerrc +
-               adapter->stats.crcerrs + adapter->stats.algnerrc +
-               adapter->stats.ruc + adapter->stats.roc +
-               adapter->stats.cexterr;
-       adapter->stats.rlerrc = adapter->stats.ruc + adapter->stats.roc;
-       netdev->stats.rx_length_errors = adapter->stats.rlerrc;
-       netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
-       netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
-       netdev->stats.rx_missed_errors = adapter->stats.mpc;
-
-       /* Tx Errors */
-       adapter->stats.txerrc = adapter->stats.ecol + adapter->stats.latecol;
-       netdev->stats.tx_errors = adapter->stats.txerrc;
-       netdev->stats.tx_aborted_errors = adapter->stats.ecol;
-       netdev->stats.tx_window_errors = adapter->stats.latecol;
-       netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
-       if (hw->bad_tx_carr_stats_fd &&
-           adapter->link_duplex == FULL_DUPLEX) {
-               netdev->stats.tx_carrier_errors = 0;
-               adapter->stats.tncrs = 0;
-       }
-
-       /* Tx Dropped needs to be maintained elsewhere */
-
-       /* Phy Stats */
-       if (hw->media_type == e1000_media_type_copper) {
-               if ((adapter->link_speed == SPEED_1000) &&
-                  (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
-                       phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
-                       adapter->phy_stats.idle_errors += phy_tmp;
-               }
-
-               if ((hw->mac_type <= e1000_82546) &&
-                  (hw->phy_type == e1000_phy_m88) &&
-                  !e1000_read_phy_reg(hw, M88E1000_RX_ERR_CNTR, &phy_tmp))
-                       adapter->phy_stats.receive_errors += phy_tmp;
-       }
-
-       /* Management Stats */
-       if (hw->has_smbus) {
-               adapter->stats.mgptc += er32(MGTPTC);
-               adapter->stats.mgprc += er32(MGTPRC);
-               adapter->stats.mgpdc += er32(MGTPDC);
-       }
-
-       spin_unlock_irqrestore(&adapter->stats_lock, flags);
-}
-
-/**
- * e1000_intr - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-
-static irqreturn_t e1000_intr(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 icr = er32(ICR);
-
-       if (unlikely((!icr)))
-               return IRQ_NONE;  /* Not our interrupt */
-
-       /*
-        * we might have caused the interrupt, but the above
-        * read cleared it, and just in case the driver is
-        * down there is nothing to do so return handled
-        */
-       if (unlikely(test_bit(__E1000_DOWN, &adapter->flags)))
-               return IRQ_HANDLED;
-
-       if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
-               hw->get_link_status = 1;
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__E1000_DOWN, &adapter->flags))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       /* disable interrupts, without the synchronize_irq bit */
-       ew32(IMC, ~0);
-       E1000_WRITE_FLUSH();
-
-       if (likely(napi_schedule_prep(&adapter->napi))) {
-               adapter->total_tx_bytes = 0;
-               adapter->total_tx_packets = 0;
-               adapter->total_rx_bytes = 0;
-               adapter->total_rx_packets = 0;
-               __napi_schedule(&adapter->napi);
-       } else {
-               /* this really should not happen! if it does it is basically a
-                * bug, but not a hard error, so enable ints and continue */
-               if (!test_bit(__E1000_DOWN, &adapter->flags))
-                       e1000_irq_enable(adapter);
-       }
-
-       return IRQ_HANDLED;
-}
-
-/**
- * e1000_clean - NAPI Rx polling callback
- * @adapter: board private structure
- **/
-static int e1000_clean(struct napi_struct *napi, int budget)
-{
-       struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
-       int tx_clean_complete = 0, work_done = 0;
-
-       tx_clean_complete = e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]);
-
-       adapter->clean_rx(adapter, &adapter->rx_ring[0], &work_done, budget);
-
-       if (!tx_clean_complete)
-               work_done = budget;
-
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
-               if (likely(adapter->itr_setting & 3))
-                       e1000_set_itr(adapter);
-               napi_complete(napi);
-               if (!test_bit(__E1000_DOWN, &adapter->flags))
-                       e1000_irq_enable(adapter);
-       }
-
-       return work_done;
-}
-
-/**
- * e1000_clean_tx_irq - Reclaim resources after transmit completes
- * @adapter: board private structure
- **/
-static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
-                              struct e1000_tx_ring *tx_ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_tx_desc *tx_desc, *eop_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i, eop;
-       unsigned int count = 0;
-       unsigned int total_tx_bytes=0, total_tx_packets=0;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->buffer_info[i].next_to_watch;
-       eop_desc = E1000_TX_DESC(*tx_ring, eop);
-
-       while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) &&
-              (count < tx_ring->count)) {
-               bool cleaned = false;
-               rmb();  /* read buffer_info after eop_desc */
-               for ( ; !cleaned; count++) {
-                       tx_desc = E1000_TX_DESC(*tx_ring, i);
-                       buffer_info = &tx_ring->buffer_info[i];
-                       cleaned = (i == eop);
-
-                       if (cleaned) {
-                               struct sk_buff *skb = buffer_info->skb;
-                               unsigned int segs, bytecount;
-                               segs = skb_shinfo(skb)->gso_segs ?: 1;
-                               /* multiply data chunks by size of headers */
-                               bytecount = ((segs - 1) * skb_headlen(skb)) +
-                                           skb->len;
-                               total_tx_packets += segs;
-                               total_tx_bytes += bytecount;
-                       }
-                       e1000_unmap_and_free_tx_resource(adapter, buffer_info);
-                       tx_desc->upper.data = 0;
-
-                       if (unlikely(++i == tx_ring->count)) i = 0;
-               }
-
-               eop = tx_ring->buffer_info[i].next_to_watch;
-               eop_desc = E1000_TX_DESC(*tx_ring, eop);
-       }
-
-       tx_ring->next_to_clean = i;
-
-#define TX_WAKE_THRESHOLD 32
-       if (unlikely(count && netif_carrier_ok(netdev) &&
-                    E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean.
-                */
-               smp_mb();
-
-               if (netif_queue_stopped(netdev) &&
-                   !(test_bit(__E1000_DOWN, &adapter->flags))) {
-                       netif_wake_queue(netdev);
-                       ++adapter->restart_queue;
-               }
-       }
-
-       if (adapter->detect_tx_hung) {
-               /* Detect a transmit hang in hardware, this serializes the
-                * check with the clearing of time_stamp and movement of i */
-               adapter->detect_tx_hung = false;
-               if (tx_ring->buffer_info[eop].time_stamp &&
-                   time_after(jiffies, tx_ring->buffer_info[eop].time_stamp +
-                              (adapter->tx_timeout_factor * HZ)) &&
-                   !(er32(STATUS) & E1000_STATUS_TXOFF)) {
-
-                       /* detected Tx unit hang */
-                       e_err(drv, "Detected Tx Unit Hang\n"
-                             "  Tx Queue             <%lu>\n"
-                             "  TDH                  <%x>\n"
-                             "  TDT                  <%x>\n"
-                             "  next_to_use          <%x>\n"
-                             "  next_to_clean        <%x>\n"
-                             "buffer_info[next_to_clean]\n"
-                             "  time_stamp           <%lx>\n"
-                             "  next_to_watch        <%x>\n"
-                             "  jiffies              <%lx>\n"
-                             "  next_to_watch.status <%x>\n",
-                               (unsigned long)((tx_ring - adapter->tx_ring) /
-                                       sizeof(struct e1000_tx_ring)),
-                               readl(hw->hw_addr + tx_ring->tdh),
-                               readl(hw->hw_addr + tx_ring->tdt),
-                               tx_ring->next_to_use,
-                               tx_ring->next_to_clean,
-                               tx_ring->buffer_info[eop].time_stamp,
-                               eop,
-                               jiffies,
-                               eop_desc->upper.fields.status);
-                       netif_stop_queue(netdev);
-               }
-       }
-       adapter->total_tx_bytes += total_tx_bytes;
-       adapter->total_tx_packets += total_tx_packets;
-       netdev->stats.tx_bytes += total_tx_bytes;
-       netdev->stats.tx_packets += total_tx_packets;
-       return count < tx_ring->count;
-}
-
-/**
- * e1000_rx_checksum - Receive Checksum Offload for 82543
- * @adapter:     board private structure
- * @status_err:  receive descriptor status and error fields
- * @csum:        receive descriptor csum field
- * @sk_buff:     socket buffer with received data
- **/
-
-static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
-                             u32 csum, struct sk_buff *skb)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 status = (u16)status_err;
-       u8 errors = (u8)(status_err >> 24);
-
-       skb_checksum_none_assert(skb);
-
-       /* 82543 or newer only */
-       if (unlikely(hw->mac_type < e1000_82543)) return;
-       /* Ignore Checksum bit is set */
-       if (unlikely(status & E1000_RXD_STAT_IXSM)) return;
-       /* TCP/UDP checksum error bit is set */
-       if (unlikely(errors & E1000_RXD_ERR_TCPE)) {
-               /* let the stack verify checksum errors */
-               adapter->hw_csum_err++;
-               return;
-       }
-       /* TCP/UDP Checksum has not been calculated */
-       if (!(status & E1000_RXD_STAT_TCPCS))
-               return;
-
-       /* It must be a TCP or UDP packet with a valid checksum */
-       if (likely(status & E1000_RXD_STAT_TCPCS)) {
-               /* TCP checksum is good */
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-       }
-       adapter->hw_csum_good++;
-}
-
-/**
- * e1000_consume_page - helper function
- **/
-static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb,
-                               u16 length)
-{
-       bi->page = NULL;
-       skb->len += length;
-       skb->data_len += length;
-       skb->truesize += length;
-}
-
-/**
- * e1000_receive_skb - helper function to handle rx indications
- * @adapter: board private structure
- * @status: descriptor status field as written by hardware
- * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
- * @skb: pointer to sk_buff to be indicated to stack
- */
-static void e1000_receive_skb(struct e1000_adapter *adapter, u8 status,
-                             __le16 vlan, struct sk_buff *skb)
-{
-       skb->protocol = eth_type_trans(skb, adapter->netdev);
-
-       if (status & E1000_RXD_STAT_VP) {
-               u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
-
-               __vlan_hwaccel_put_tag(skb, vid);
-       }
-       napi_gro_receive(&adapter->napi, skb);
-}
-
-/**
- * e1000_clean_jumbo_rx_irq - Send received data up the network stack; legacy
- * @adapter: board private structure
- * @rx_ring: ring to clean
- * @work_done: amount of napi work completed this call
- * @work_to_do: max amount of work allowed for this call to do
- *
- * the return value indicates whether actual cleaning was done, there
- * is no guarantee that everything was cleaned
- */
-static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
-                                    struct e1000_rx_ring *rx_ring,
-                                    int *work_done, int work_to_do)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_rx_desc *rx_desc, *next_rxd;
-       struct e1000_buffer *buffer_info, *next_buffer;
-       unsigned long irq_flags;
-       u32 length;
-       unsigned int i;
-       int cleaned_count = 0;
-       bool cleaned = false;
-       unsigned int total_rx_bytes=0, total_rx_packets=0;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = E1000_RX_DESC(*rx_ring, i);
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (rx_desc->status & E1000_RXD_STAT_DD) {
-               struct sk_buff *skb;
-               u8 status;
-
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-               rmb(); /* read descriptor and rx_buffer_info after status DD */
-
-               status = rx_desc->status;
-               skb = buffer_info->skb;
-               buffer_info->skb = NULL;
-
-               if (++i == rx_ring->count) i = 0;
-               next_rxd = E1000_RX_DESC(*rx_ring, i);
-               prefetch(next_rxd);
-
-               next_buffer = &rx_ring->buffer_info[i];
-
-               cleaned = true;
-               cleaned_count++;
-               dma_unmap_page(&pdev->dev, buffer_info->dma,
-                              buffer_info->length, DMA_FROM_DEVICE);
-               buffer_info->dma = 0;
-
-               length = le16_to_cpu(rx_desc->length);
-
-               /* errors is only valid for DD + EOP descriptors */
-               if (unlikely((status & E1000_RXD_STAT_EOP) &&
-                   (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK))) {
-                       u8 last_byte = *(skb->data + length - 1);
-                       if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
-                                      last_byte)) {
-                               spin_lock_irqsave(&adapter->stats_lock,
-                                                 irq_flags);
-                               e1000_tbi_adjust_stats(hw, &adapter->stats,
-                                                      length, skb->data);
-                               spin_unlock_irqrestore(&adapter->stats_lock,
-                                                      irq_flags);
-                               length--;
-                       } else {
-                               /* recycle both page and skb */
-                               buffer_info->skb = skb;
-                               /* an error means any chain goes out the window
-                                * too */
-                               if (rx_ring->rx_skb_top)
-                                       dev_kfree_skb(rx_ring->rx_skb_top);
-                               rx_ring->rx_skb_top = NULL;
-                               goto next_desc;
-                       }
-               }
-
-#define rxtop rx_ring->rx_skb_top
-               if (!(status & E1000_RXD_STAT_EOP)) {
-                       /* this descriptor is only the beginning (or middle) */
-                       if (!rxtop) {
-                               /* this is the beginning of a chain */
-                               rxtop = skb;
-                               skb_fill_page_desc(rxtop, 0, buffer_info->page,
-                                                  0, length);
-                       } else {
-                               /* this is the middle of a chain */
-                               skb_fill_page_desc(rxtop,
-                                   skb_shinfo(rxtop)->nr_frags,
-                                   buffer_info->page, 0, length);
-                               /* re-use the skb, only consumed the page */
-                               buffer_info->skb = skb;
-                       }
-                       e1000_consume_page(buffer_info, rxtop, length);
-                       goto next_desc;
-               } else {
-                       if (rxtop) {
-                               /* end of the chain */
-                               skb_fill_page_desc(rxtop,
-                                   skb_shinfo(rxtop)->nr_frags,
-                                   buffer_info->page, 0, length);
-                               /* re-use the current skb, we only consumed the
-                                * page */
-                               buffer_info->skb = skb;
-                               skb = rxtop;
-                               rxtop = NULL;
-                               e1000_consume_page(buffer_info, skb, length);
-                       } else {
-                               /* no chain, got EOP, this buf is the packet
-                                * copybreak to save the put_page/alloc_page */
-                               if (length <= copybreak &&
-                                   skb_tailroom(skb) >= length) {
-                                       u8 *vaddr;
-                                       vaddr = kmap_atomic(buffer_info->page,
-                                                           KM_SKB_DATA_SOFTIRQ);
-                                       memcpy(skb_tail_pointer(skb), vaddr, length);
-                                       kunmap_atomic(vaddr,
-                                                     KM_SKB_DATA_SOFTIRQ);
-                                       /* re-use the page, so don't erase
-                                        * buffer_info->page */
-                                       skb_put(skb, length);
-                               } else {
-                                       skb_fill_page_desc(skb, 0,
-                                                          buffer_info->page, 0,
-                                                          length);
-                                       e1000_consume_page(buffer_info, skb,
-                                                          length);
-                               }
-                       }
-               }
-
-               /* Receive Checksum Offload XXX recompute due to CRC strip? */
-               e1000_rx_checksum(adapter,
-                                 (u32)(status) |
-                                 ((u32)(rx_desc->errors) << 24),
-                                 le16_to_cpu(rx_desc->csum), skb);
-
-               pskb_trim(skb, skb->len - 4);
-
-               /* probably a little skewed due to removing CRC */
-               total_rx_bytes += skb->len;
-               total_rx_packets++;
-
-               /* eth type trans needs skb->data to point to something */
-               if (!pskb_may_pull(skb, ETH_HLEN)) {
-                       e_err(drv, "pskb_may_pull failed.\n");
-                       dev_kfree_skb(skb);
-                       goto next_desc;
-               }
-
-               e1000_receive_skb(adapter, status, rx_desc->special, skb);
-
-next_desc:
-               rx_desc->status = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
-                       adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-       }
-       rx_ring->next_to_clean = i;
-
-       cleaned_count = E1000_DESC_UNUSED(rx_ring);
-       if (cleaned_count)
-               adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
-
-       adapter->total_rx_packets += total_rx_packets;
-       adapter->total_rx_bytes += total_rx_bytes;
-       netdev->stats.rx_bytes += total_rx_bytes;
-       netdev->stats.rx_packets += total_rx_packets;
-       return cleaned;
-}
-
-/*
- * this should improve performance for small packets with large amounts
- * of reassembly being done in the stack
- */
-static void e1000_check_copybreak(struct net_device *netdev,
-                                struct e1000_buffer *buffer_info,
-                                u32 length, struct sk_buff **skb)
-{
-       struct sk_buff *new_skb;
-
-       if (length > copybreak)
-               return;
-
-       new_skb = netdev_alloc_skb_ip_align(netdev, length);
-       if (!new_skb)
-               return;
-
-       skb_copy_to_linear_data_offset(new_skb, -NET_IP_ALIGN,
-                                      (*skb)->data - NET_IP_ALIGN,
-                                      length + NET_IP_ALIGN);
-       /* save the skb in buffer_info as good */
-       buffer_info->skb = *skb;
-       *skb = new_skb;
-}
-
-/**
- * e1000_clean_rx_irq - Send received data up the network stack; legacy
- * @adapter: board private structure
- * @rx_ring: ring to clean
- * @work_done: amount of napi work completed this call
- * @work_to_do: max amount of work allowed for this call to do
- */
-static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                              struct e1000_rx_ring *rx_ring,
-                              int *work_done, int work_to_do)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_rx_desc *rx_desc, *next_rxd;
-       struct e1000_buffer *buffer_info, *next_buffer;
-       unsigned long flags;
-       u32 length;
-       unsigned int i;
-       int cleaned_count = 0;
-       bool cleaned = false;
-       unsigned int total_rx_bytes=0, total_rx_packets=0;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = E1000_RX_DESC(*rx_ring, i);
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (rx_desc->status & E1000_RXD_STAT_DD) {
-               struct sk_buff *skb;
-               u8 status;
-
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-               rmb(); /* read descriptor and rx_buffer_info after status DD */
-
-               status = rx_desc->status;
-               skb = buffer_info->skb;
-               buffer_info->skb = NULL;
-
-               prefetch(skb->data - NET_IP_ALIGN);
-
-               if (++i == rx_ring->count) i = 0;
-               next_rxd = E1000_RX_DESC(*rx_ring, i);
-               prefetch(next_rxd);
-
-               next_buffer = &rx_ring->buffer_info[i];
-
-               cleaned = true;
-               cleaned_count++;
-               dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                buffer_info->length, DMA_FROM_DEVICE);
-               buffer_info->dma = 0;
-
-               length = le16_to_cpu(rx_desc->length);
-               /* !EOP means multiple descriptors were used to store a single
-                * packet, if thats the case we need to toss it.  In fact, we
-                * to toss every packet with the EOP bit clear and the next
-                * frame that _does_ have the EOP bit set, as it is by
-                * definition only a frame fragment
-                */
-               if (unlikely(!(status & E1000_RXD_STAT_EOP)))
-                       adapter->discarding = true;
-
-               if (adapter->discarding) {
-                       /* All receives must fit into a single buffer */
-                       e_dbg("Receive packet consumed multiple buffers\n");
-                       /* recycle */
-                       buffer_info->skb = skb;
-                       if (status & E1000_RXD_STAT_EOP)
-                               adapter->discarding = false;
-                       goto next_desc;
-               }
-
-               if (unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) {
-                       u8 last_byte = *(skb->data + length - 1);
-                       if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
-                                      last_byte)) {
-                               spin_lock_irqsave(&adapter->stats_lock, flags);
-                               e1000_tbi_adjust_stats(hw, &adapter->stats,
-                                                      length, skb->data);
-                               spin_unlock_irqrestore(&adapter->stats_lock,
-                                                      flags);
-                               length--;
-                       } else {
-                               /* recycle */
-                               buffer_info->skb = skb;
-                               goto next_desc;
-                       }
-               }
-
-               /* adjust length to remove Ethernet CRC, this must be
-                * done after the TBI_ACCEPT workaround above */
-               length -= 4;
-
-               /* probably a little skewed due to removing CRC */
-               total_rx_bytes += length;
-               total_rx_packets++;
-
-               e1000_check_copybreak(netdev, buffer_info, length, &skb);
-
-               skb_put(skb, length);
-
-               /* Receive Checksum Offload */
-               e1000_rx_checksum(adapter,
-                                 (u32)(status) |
-                                 ((u32)(rx_desc->errors) << 24),
-                                 le16_to_cpu(rx_desc->csum), skb);
-
-               e1000_receive_skb(adapter, status, rx_desc->special, skb);
-
-next_desc:
-               rx_desc->status = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
-                       adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-       }
-       rx_ring->next_to_clean = i;
-
-       cleaned_count = E1000_DESC_UNUSED(rx_ring);
-       if (cleaned_count)
-               adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
-
-       adapter->total_rx_packets += total_rx_packets;
-       adapter->total_rx_bytes += total_rx_bytes;
-       netdev->stats.rx_bytes += total_rx_bytes;
-       netdev->stats.rx_packets += total_rx_packets;
-       return cleaned;
-}
-
-/**
- * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers
- * @adapter: address of board private structure
- * @rx_ring: pointer to receive ring structure
- * @cleaned_count: number of buffers to allocate this pass
- **/
-
-static void
-e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rx_ring, int cleaned_count)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_rx_desc *rx_desc;
-       struct e1000_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       unsigned int bufsz = 256 - 16 /*for skb_reserve */ ;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (cleaned_count--) {
-               skb = buffer_info->skb;
-               if (skb) {
-                       skb_trim(skb, 0);
-                       goto check_page;
-               }
-
-               skb = netdev_alloc_skb_ip_align(netdev, bufsz);
-               if (unlikely(!skb)) {
-                       /* Better luck next round */
-                       adapter->alloc_rx_buff_failed++;
-                       break;
-               }
-
-               /* Fix for errata 23, can't cross 64kB boundary */
-               if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                       struct sk_buff *oldskb = skb;
-                       e_err(rx_err, "skb align check failed: %u bytes at "
-                             "%p\n", bufsz, skb->data);
-                       /* Try again, without freeing the previous */
-                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
-                       /* Failed allocation, critical failure */
-                       if (!skb) {
-                               dev_kfree_skb(oldskb);
-                               adapter->alloc_rx_buff_failed++;
-                               break;
-                       }
-
-                       if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                               /* give up */
-                               dev_kfree_skb(skb);
-                               dev_kfree_skb(oldskb);
-                               break; /* while (cleaned_count--) */
-                       }
-
-                       /* Use new allocation */
-                       dev_kfree_skb(oldskb);
-               }
-               buffer_info->skb = skb;
-               buffer_info->length = adapter->rx_buffer_len;
-check_page:
-               /* allocate a new page if necessary */
-               if (!buffer_info->page) {
-                       buffer_info->page = alloc_page(GFP_ATOMIC);
-                       if (unlikely(!buffer_info->page)) {
-                               adapter->alloc_rx_buff_failed++;
-                               break;
-                       }
-               }
-
-               if (!buffer_info->dma) {
-                       buffer_info->dma = dma_map_page(&pdev->dev,
-                                                       buffer_info->page, 0,
-                                                       buffer_info->length,
-                                                       DMA_FROM_DEVICE);
-                       if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
-                               put_page(buffer_info->page);
-                               dev_kfree_skb(skb);
-                               buffer_info->page = NULL;
-                               buffer_info->skb = NULL;
-                               buffer_info->dma = 0;
-                               adapter->alloc_rx_buff_failed++;
-                               break; /* while !buffer_info->skb */
-                       }
-               }
-
-               rx_desc = E1000_RX_DESC(*rx_ring, i);
-               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-
-               if (unlikely(++i == rx_ring->count))
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-       if (likely(rx_ring->next_to_use != i)) {
-               rx_ring->next_to_use = i;
-               if (unlikely(i-- == 0))
-                       i = (rx_ring->count - 1);
-
-               /* Force memory writes to complete before letting h/w
-                * know there are new descriptors to fetch.  (Only
-                * applicable for weak-ordered memory model archs,
-                * such as IA-64). */
-               wmb();
-               writel(i, adapter->hw.hw_addr + rx_ring->rdt);
-       }
-}
-
-/**
- * e1000_alloc_rx_buffers - Replace used receive buffers; legacy & extended
- * @adapter: address of board private structure
- **/
-
-static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
-                                  struct e1000_rx_ring *rx_ring,
-                                  int cleaned_count)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_rx_desc *rx_desc;
-       struct e1000_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       unsigned int bufsz = adapter->rx_buffer_len;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (cleaned_count--) {
-               skb = buffer_info->skb;
-               if (skb) {
-                       skb_trim(skb, 0);
-                       goto map_skb;
-               }
-
-               skb = netdev_alloc_skb_ip_align(netdev, bufsz);
-               if (unlikely(!skb)) {
-                       /* Better luck next round */
-                       adapter->alloc_rx_buff_failed++;
-                       break;
-               }
-
-               /* Fix for errata 23, can't cross 64kB boundary */
-               if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                       struct sk_buff *oldskb = skb;
-                       e_err(rx_err, "skb align check failed: %u bytes at "
-                             "%p\n", bufsz, skb->data);
-                       /* Try again, without freeing the previous */
-                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
-                       /* Failed allocation, critical failure */
-                       if (!skb) {
-                               dev_kfree_skb(oldskb);
-                               adapter->alloc_rx_buff_failed++;
-                               break;
-                       }
-
-                       if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                               /* give up */
-                               dev_kfree_skb(skb);
-                               dev_kfree_skb(oldskb);
-                               adapter->alloc_rx_buff_failed++;
-                               break; /* while !buffer_info->skb */
-                       }
-
-                       /* Use new allocation */
-                       dev_kfree_skb(oldskb);
-               }
-               buffer_info->skb = skb;
-               buffer_info->length = adapter->rx_buffer_len;
-map_skb:
-               buffer_info->dma = dma_map_single(&pdev->dev,
-                                                 skb->data,
-                                                 buffer_info->length,
-                                                 DMA_FROM_DEVICE);
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
-                       dev_kfree_skb(skb);
-                       buffer_info->skb = NULL;
-                       buffer_info->dma = 0;
-                       adapter->alloc_rx_buff_failed++;
-                       break; /* while !buffer_info->skb */
-               }
-
-               /*
-                * XXX if it was allocated cleanly it will never map to a
-                * boundary crossing
-                */
-
-               /* Fix for errata 23, can't cross 64kB boundary */
-               if (!e1000_check_64k_bound(adapter,
-                                       (void *)(unsigned long)buffer_info->dma,
-                                       adapter->rx_buffer_len)) {
-                       e_err(rx_err, "dma align check failed: %u bytes at "
-                             "%p\n", adapter->rx_buffer_len,
-                             (void *)(unsigned long)buffer_info->dma);
-                       dev_kfree_skb(skb);
-                       buffer_info->skb = NULL;
-
-                       dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                        adapter->rx_buffer_len,
-                                        DMA_FROM_DEVICE);
-                       buffer_info->dma = 0;
-
-                       adapter->alloc_rx_buff_failed++;
-                       break; /* while !buffer_info->skb */
-               }
-               rx_desc = E1000_RX_DESC(*rx_ring, i);
-               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-
-               if (unlikely(++i == rx_ring->count))
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-       if (likely(rx_ring->next_to_use != i)) {
-               rx_ring->next_to_use = i;
-               if (unlikely(i-- == 0))
-                       i = (rx_ring->count - 1);
-
-               /* Force memory writes to complete before letting h/w
-                * know there are new descriptors to fetch.  (Only
-                * applicable for weak-ordered memory model archs,
-                * such as IA-64). */
-               wmb();
-               writel(i, hw->hw_addr + rx_ring->rdt);
-       }
-}
-
-/**
- * e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers.
- * @adapter:
- **/
-
-static void e1000_smartspeed(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 phy_status;
-       u16 phy_ctrl;
-
-       if ((hw->phy_type != e1000_phy_igp) || !hw->autoneg ||
-          !(hw->autoneg_advertised & ADVERTISE_1000_FULL))
-               return;
-
-       if (adapter->smartspeed == 0) {
-               /* If Master/Slave config fault is asserted twice,
-                * we assume back-to-back */
-               e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);
-               if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
-               e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);
-               if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
-               e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);
-               if (phy_ctrl & CR_1000T_MS_ENABLE) {
-                       phy_ctrl &= ~CR_1000T_MS_ENABLE;
-                       e1000_write_phy_reg(hw, PHY_1000T_CTRL,
-                                           phy_ctrl);
-                       adapter->smartspeed++;
-                       if (!e1000_phy_setup_autoneg(hw) &&
-                          !e1000_read_phy_reg(hw, PHY_CTRL,
-                                              &phy_ctrl)) {
-                               phy_ctrl |= (MII_CR_AUTO_NEG_EN |
-                                            MII_CR_RESTART_AUTO_NEG);
-                               e1000_write_phy_reg(hw, PHY_CTRL,
-                                                   phy_ctrl);
-                       }
-               }
-               return;
-       } else if (adapter->smartspeed == E1000_SMARTSPEED_DOWNSHIFT) {
-               /* If still no link, perhaps using 2/3 pair cable */
-               e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);
-               phy_ctrl |= CR_1000T_MS_ENABLE;
-               e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_ctrl);
-               if (!e1000_phy_setup_autoneg(hw) &&
-                  !e1000_read_phy_reg(hw, PHY_CTRL, &phy_ctrl)) {
-                       phy_ctrl |= (MII_CR_AUTO_NEG_EN |
-                                    MII_CR_RESTART_AUTO_NEG);
-                       e1000_write_phy_reg(hw, PHY_CTRL, phy_ctrl);
-               }
-       }
-       /* Restart process after E1000_SMARTSPEED_MAX iterations */
-       if (adapter->smartspeed++ == E1000_SMARTSPEED_MAX)
-               adapter->smartspeed = 0;
-}
-
-/**
- * e1000_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- **/
-
-static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       switch (cmd) {
-       case SIOCGMIIPHY:
-       case SIOCGMIIREG:
-       case SIOCSMIIREG:
-               return e1000_mii_ioctl(netdev, ifr, cmd);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-/**
- * e1000_mii_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- **/
-
-static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
-                          int cmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct mii_ioctl_data *data = if_mii(ifr);
-       int retval;
-       u16 mii_reg;
-       unsigned long flags;
-
-       if (hw->media_type != e1000_media_type_copper)
-               return -EOPNOTSUPP;
-
-       switch (cmd) {
-       case SIOCGMIIPHY:
-               data->phy_id = hw->phy_addr;
-               break;
-       case SIOCGMIIREG:
-               spin_lock_irqsave(&adapter->stats_lock, flags);
-               if (e1000_read_phy_reg(hw, data->reg_num & 0x1F,
-                                  &data->val_out)) {
-                       spin_unlock_irqrestore(&adapter->stats_lock, flags);
-                       return -EIO;
-               }
-               spin_unlock_irqrestore(&adapter->stats_lock, flags);
-               break;
-       case SIOCSMIIREG:
-               if (data->reg_num & ~(0x1F))
-                       return -EFAULT;
-               mii_reg = data->val_in;
-               spin_lock_irqsave(&adapter->stats_lock, flags);
-               if (e1000_write_phy_reg(hw, data->reg_num,
-                                       mii_reg)) {
-                       spin_unlock_irqrestore(&adapter->stats_lock, flags);
-                       return -EIO;
-               }
-               spin_unlock_irqrestore(&adapter->stats_lock, flags);
-               if (hw->media_type == e1000_media_type_copper) {
-                       switch (data->reg_num) {
-                       case PHY_CTRL:
-                               if (mii_reg & MII_CR_POWER_DOWN)
-                                       break;
-                               if (mii_reg & MII_CR_AUTO_NEG_EN) {
-                                       hw->autoneg = 1;
-                                       hw->autoneg_advertised = 0x2F;
-                               } else {
-                                       u32 speed;
-                                       if (mii_reg & 0x40)
-                                               speed = SPEED_1000;
-                                       else if (mii_reg & 0x2000)
-                                               speed = SPEED_100;
-                                       else
-                                               speed = SPEED_10;
-                                       retval = e1000_set_spd_dplx(
-                                               adapter, speed,
-                                               ((mii_reg & 0x100)
-                                                ? DUPLEX_FULL :
-                                                DUPLEX_HALF));
-                                       if (retval)
-                                               return retval;
-                               }
-                               if (netif_running(adapter->netdev))
-                                       e1000_reinit_locked(adapter);
-                               else
-                                       e1000_reset(adapter);
-                               break;
-                       case M88E1000_PHY_SPEC_CTRL:
-                       case M88E1000_EXT_PHY_SPEC_CTRL:
-                               if (e1000_phy_reset(hw))
-                                       return -EIO;
-                               break;
-                       }
-               } else {
-                       switch (data->reg_num) {
-                       case PHY_CTRL:
-                               if (mii_reg & MII_CR_POWER_DOWN)
-                                       break;
-                               if (netif_running(adapter->netdev))
-                                       e1000_reinit_locked(adapter);
-                               else
-                                       e1000_reset(adapter);
-                               break;
-                       }
-               }
-               break;
-       default:
-               return -EOPNOTSUPP;
-       }
-       return E1000_SUCCESS;
-}
-
-void e1000_pci_set_mwi(struct e1000_hw *hw)
-{
-       struct e1000_adapter *adapter = hw->back;
-       int ret_val = pci_set_mwi(adapter->pdev);
-
-       if (ret_val)
-               e_err(probe, "Error in setting MWI\n");
-}
-
-void e1000_pci_clear_mwi(struct e1000_hw *hw)
-{
-       struct e1000_adapter *adapter = hw->back;
-
-       pci_clear_mwi(adapter->pdev);
-}
-
-int e1000_pcix_get_mmrbc(struct e1000_hw *hw)
-{
-       struct e1000_adapter *adapter = hw->back;
-       return pcix_get_mmrbc(adapter->pdev);
-}
-
-void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc)
-{
-       struct e1000_adapter *adapter = hw->back;
-       pcix_set_mmrbc(adapter->pdev, mmrbc);
-}
-
-void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value)
-{
-       outl(value, port);
-}
-
-static bool e1000_vlan_used(struct e1000_adapter *adapter)
-{
-       u16 vid;
-
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               return true;
-       return false;
-}
-
-static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
-                                    bool filter_on)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_disable(adapter);
-
-       if (filter_on) {
-               /* enable VLAN receive filtering */
-               rctl = er32(RCTL);
-               rctl &= ~E1000_RCTL_CFIEN;
-               if (!(adapter->netdev->flags & IFF_PROMISC))
-                       rctl |= E1000_RCTL_VFE;
-               ew32(RCTL, rctl);
-               e1000_update_mng_vlan(adapter);
-       } else {
-               /* disable VLAN receive filtering */
-               rctl = er32(RCTL);
-               rctl &= ~E1000_RCTL_VFE;
-               ew32(RCTL, rctl);
-       }
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_enable(adapter);
-}
-
-static void e1000_vlan_mode(struct net_device *netdev, u32 features)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl;
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_disable(adapter);
-
-       ctrl = er32(CTRL);
-       if (features & NETIF_F_HW_VLAN_RX) {
-               /* enable VLAN tag insert/strip */
-               ctrl |= E1000_CTRL_VME;
-       } else {
-               /* disable VLAN tag insert/strip */
-               ctrl &= ~E1000_CTRL_VME;
-       }
-       ew32(CTRL, ctrl);
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_enable(adapter);
-}
-
-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vfta, index;
-
-       if ((hw->mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
-           (vid == adapter->mng_vlan_id))
-               return;
-
-       if (!e1000_vlan_used(adapter))
-               e1000_vlan_filter_on_off(adapter, true);
-
-       /* add VID to filter table */
-       index = (vid >> 5) & 0x7F;
-       vfta = E1000_READ_REG_ARRAY(hw, VFTA, index);
-       vfta |= (1 << (vid & 0x1F));
-       e1000_write_vfta(hw, index, vfta);
-
-       set_bit(vid, adapter->active_vlans);
-}
-
-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vfta, index;
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_disable(adapter);
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_enable(adapter);
-
-       /* remove VID from filter table */
-       index = (vid >> 5) & 0x7F;
-       vfta = E1000_READ_REG_ARRAY(hw, VFTA, index);
-       vfta &= ~(1 << (vid & 0x1F));
-       e1000_write_vfta(hw, index, vfta);
-
-       clear_bit(vid, adapter->active_vlans);
-
-       if (!e1000_vlan_used(adapter))
-               e1000_vlan_filter_on_off(adapter, false);
-}
-
-static void e1000_restore_vlan(struct e1000_adapter *adapter)
-{
-       u16 vid;
-
-       if (!e1000_vlan_used(adapter))
-               return;
-
-       e1000_vlan_filter_on_off(adapter, true);
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               e1000_vlan_rx_add_vid(adapter->netdev, vid);
-}
-
-int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       hw->autoneg = 0;
-
-       /* Make sure dplx is at most 1 bit and lsb of speed is not set
-        * for the switch() below to work */
-       if ((spd & 1) || (dplx & ~1))
-               goto err_inval;
-
-       /* Fiber NICs only allow 1000 gbps Full duplex */
-       if ((hw->media_type == e1000_media_type_fiber) &&
-           spd != SPEED_1000 &&
-           dplx != DUPLEX_FULL)
-               goto err_inval;
-
-       switch (spd + dplx) {
-       case SPEED_10 + DUPLEX_HALF:
-               hw->forced_speed_duplex = e1000_10_half;
-               break;
-       case SPEED_10 + DUPLEX_FULL:
-               hw->forced_speed_duplex = e1000_10_full;
-               break;
-       case SPEED_100 + DUPLEX_HALF:
-               hw->forced_speed_duplex = e1000_100_half;
-               break;
-       case SPEED_100 + DUPLEX_FULL:
-               hw->forced_speed_duplex = e1000_100_full;
-               break;
-       case SPEED_1000 + DUPLEX_FULL:
-               hw->autoneg = 1;
-               hw->autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
-       case SPEED_1000 + DUPLEX_HALF: /* not supported */
-       default:
-               goto err_inval;
-       }
-       return 0;
-
-err_inval:
-       e_err(probe, "Unsupported Speed/Duplex configuration\n");
-       return -EINVAL;
-}
-
-static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl, ctrl_ext, rctl, status;
-       u32 wufc = adapter->wol;
-#ifdef CONFIG_PM
-       int retval = 0;
-#endif
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev)) {
-               WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
-               e1000_down(adapter);
-       }
-
-#ifdef CONFIG_PM
-       retval = pci_save_state(pdev);
-       if (retval)
-               return retval;
-#endif
-
-       status = er32(STATUS);
-       if (status & E1000_STATUS_LU)
-               wufc &= ~E1000_WUFC_LNKC;
-
-       if (wufc) {
-               e1000_setup_rctl(adapter);
-               e1000_set_rx_mode(netdev);
-
-               /* turn on all-multi mode if wake on multicast is enabled */
-               if (wufc & E1000_WUFC_MC) {
-                       rctl = er32(RCTL);
-                       rctl |= E1000_RCTL_MPE;
-                       ew32(RCTL, rctl);
-               }
-
-               if (hw->mac_type >= e1000_82540) {
-                       ctrl = er32(CTRL);
-                       /* advertise wake from D3Cold */
-                       #define E1000_CTRL_ADVD3WUC 0x00100000
-                       /* phy power management enable */
-                       #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
-                       ctrl |= E1000_CTRL_ADVD3WUC |
-                               E1000_CTRL_EN_PHY_PWR_MGMT;
-                       ew32(CTRL, ctrl);
-               }
-
-               if (hw->media_type == e1000_media_type_fiber ||
-                   hw->media_type == e1000_media_type_internal_serdes) {
-                       /* keep the laser running in D3 */
-                       ctrl_ext = er32(CTRL_EXT);
-                       ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA;
-                       ew32(CTRL_EXT, ctrl_ext);
-               }
-
-               ew32(WUC, E1000_WUC_PME_EN);
-               ew32(WUFC, wufc);
-       } else {
-               ew32(WUC, 0);
-               ew32(WUFC, 0);
-       }
-
-       e1000_release_manageability(adapter);
-
-       *enable_wake = !!wufc;
-
-       /* make sure adapter isn't asleep if manageability is enabled */
-       if (adapter->en_mng_pt)
-               *enable_wake = true;
-
-       if (netif_running(netdev))
-               e1000_free_irq(adapter);
-
-       pci_disable_device(pdev);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       int retval;
-       bool wake;
-
-       retval = __e1000_shutdown(pdev, &wake);
-       if (retval)
-               return retval;
-
-       if (wake) {
-               pci_prepare_to_sleep(pdev);
-       } else {
-               pci_wake_from_d3(pdev, false);
-               pci_set_power_state(pdev, PCI_D3hot);
-       }
-
-       return 0;
-}
-
-static int e1000_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 err;
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       pci_save_state(pdev);
-
-       if (adapter->need_ioport)
-               err = pci_enable_device(pdev);
-       else
-               err = pci_enable_device_mem(pdev);
-       if (err) {
-               pr_err("Cannot enable PCI device from suspend\n");
-               return err;
-       }
-       pci_set_master(pdev);
-
-       pci_enable_wake(pdev, PCI_D3hot, 0);
-       pci_enable_wake(pdev, PCI_D3cold, 0);
-
-       if (netif_running(netdev)) {
-               err = e1000_request_irq(adapter);
-               if (err)
-                       return err;
-       }
-
-       e1000_power_up_phy(adapter);
-       e1000_reset(adapter);
-       ew32(WUS, ~0);
-
-       e1000_init_manageability(adapter);
-
-       if (netif_running(netdev))
-               e1000_up(adapter);
-
-       netif_device_attach(netdev);
-
-       return 0;
-}
-#endif
-
-static void e1000_shutdown(struct pci_dev *pdev)
-{
-       bool wake;
-
-       __e1000_shutdown(pdev, &wake);
-
-       if (system_state == SYSTEM_POWER_OFF) {
-               pci_wake_from_d3(pdev, wake);
-               pci_set_power_state(pdev, PCI_D3hot);
-       }
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-static void e1000_netpoll(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       disable_irq(adapter->pdev->irq);
-       e1000_intr(adapter->pdev->irq, netdev);
-       enable_irq(adapter->pdev->irq);
-}
-#endif
-
-/**
- * e1000_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
-static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
-                                               pci_channel_state_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (state == pci_channel_io_perm_failure)
-               return PCI_ERS_RESULT_DISCONNECT;
-
-       if (netif_running(netdev))
-               e1000_down(adapter);
-       pci_disable_device(pdev);
-
-       /* Request a slot slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * e1000_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the e1000_resume routine.
- */
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int err;
-
-       if (adapter->need_ioport)
-               err = pci_enable_device(pdev);
-       else
-               err = pci_enable_device_mem(pdev);
-       if (err) {
-               pr_err("Cannot re-enable PCI device after reset.\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-       pci_set_master(pdev);
-
-       pci_enable_wake(pdev, PCI_D3hot, 0);
-       pci_enable_wake(pdev, PCI_D3cold, 0);
-
-       e1000_reset(adapter);
-       ew32(WUS, ~0);
-
-       return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * e1000_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the e1000_resume routine.
- */
-static void e1000_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       e1000_init_manageability(adapter);
-
-       if (netif_running(netdev)) {
-               if (e1000_up(adapter)) {
-                       pr_info("can't bring device back up after reset\n");
-                       return;
-               }
-       }
-
-       netif_device_attach(netdev);
-}
-
-/* e1000_main.c */
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
deleted file mode 100644 (file)
index 33e7c45..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 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
-
-*******************************************************************************/
-
-
-/* glue for the OS independent part of e1000
- * includes register access macros
- */
-
-#ifndef _E1000_OSDEP_H_
-#define _E1000_OSDEP_H_
-
-#include <asm/io.h>
-
-#define CONFIG_RAM_BASE         0x60000
-#define GBE_CONFIG_OFFSET       0x0
-
-#define GBE_CONFIG_RAM_BASE \
-       ((unsigned int)(CONFIG_RAM_BASE + GBE_CONFIG_OFFSET))
-
-#define GBE_CONFIG_BASE_VIRT \
-       ((void __iomem *)phys_to_virt(GBE_CONFIG_RAM_BASE))
-
-#define GBE_CONFIG_FLASH_WRITE(base, offset, count, data) \
-       (iowrite16_rep(base + offset, data, count))
-
-#define GBE_CONFIG_FLASH_READ(base, offset, count, data) \
-       (ioread16_rep(base + (offset << 1), data, count))
-
-#define er32(reg)                                                      \
-       (readl(hw->hw_addr + ((hw->mac_type >= e1000_82543)             \
-                              ? E1000_##reg : E1000_82542_##reg)))
-
-#define ew32(reg, value)                                               \
-       (writel((value), (hw->hw_addr + ((hw->mac_type >= e1000_82543)  \
-                                        ? E1000_##reg : E1000_82542_##reg))))
-
-#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-    writel((value), ((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        ((offset) << 2))))
-
-#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
-    readl((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##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 + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        ((offset) << 1))))
-
-#define E1000_READ_REG_ARRAY_WORD(a, reg, offset) ( \
-    readw((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        ((offset) << 1)))
-
-#define E1000_WRITE_REG_ARRAY_BYTE(a, reg, offset, value) ( \
-    writeb((value), ((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        (offset))))
-
-#define E1000_READ_REG_ARRAY_BYTE(a, reg, offset) ( \
-    readb((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        (offset)))
-
-#define E1000_WRITE_FLUSH() er32(STATUS)
-
-#define E1000_WRITE_ICH_FLASH_REG(a, reg, value) ( \
-    writel((value), ((a)->flash_address + reg)))
-
-#define E1000_READ_ICH_FLASH_REG(a, reg) ( \
-    readl((a)->flash_address + reg))
-
-#define E1000_WRITE_ICH_FLASH_REG16(a, reg, value) ( \
-    writew((value), ((a)->flash_address + reg)))
-
-#define E1000_READ_ICH_FLASH_REG16(a, reg) ( \
-    readw((a)->flash_address + reg))
-
-#endif /* _E1000_OSDEP_H_ */
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
deleted file mode 100644 (file)
index 1301eba..0000000
+++ /dev/null
@@ -1,755 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 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
-
-*******************************************************************************/
-
-#include "e1000.h"
-
-/* This is the only thing that needs to be changed to adjust the
- * maximum number of ports that the driver can manage.
- */
-
-#define E1000_MAX_NIC 32
-
-#define OPTION_UNSET   -1
-#define OPTION_DISABLED 0
-#define OPTION_ENABLED  1
-
-/* All parameters are treated the same, as an integer array of values.
- * This macro just reduces the need to repeat the same declaration code
- * over and over (plus this helps to avoid typo bugs).
- */
-
-#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
-#define E1000_PARAM(X, desc) \
-       static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
-       static unsigned int num_##X; \
-       module_param_array_named(X, X, int, &num_##X, 0); \
-       MODULE_PARM_DESC(X, desc);
-
-/* Transmit Descriptor Count
- *
- * Valid Range: 80-256 for 82542 and 82543 gigabit ethernet controllers
- * Valid Range: 80-4096 for 82544 and newer
- *
- * Default Value: 256
- */
-E1000_PARAM(TxDescriptors, "Number of transmit descriptors");
-
-/* Receive Descriptor Count
- *
- * Valid Range: 80-256 for 82542 and 82543 gigabit ethernet controllers
- * Valid Range: 80-4096 for 82544 and newer
- *
- * Default Value: 256
- */
-E1000_PARAM(RxDescriptors, "Number of receive descriptors");
-
-/* User Specified Speed Override
- *
- * Valid Range: 0, 10, 100, 1000
- *  - 0    - auto-negotiate at all supported speeds
- *  - 10   - only link at 10 Mbps
- *  - 100  - only link at 100 Mbps
- *  - 1000 - only link at 1000 Mbps
- *
- * Default Value: 0
- */
-E1000_PARAM(Speed, "Speed setting");
-
-/* User Specified Duplex Override
- *
- * Valid Range: 0-2
- *  - 0 - auto-negotiate for duplex
- *  - 1 - only link at half duplex
- *  - 2 - only link at full duplex
- *
- * Default Value: 0
- */
-E1000_PARAM(Duplex, "Duplex setting");
-
-/* Auto-negotiation Advertisement Override
- *
- * Valid Range: 0x01-0x0F, 0x20-0x2F (copper); 0x20 (fiber)
- *
- * The AutoNeg value is a bit mask describing which speed and duplex
- * combinations should be advertised during auto-negotiation.
- * The supported speed and duplex modes are listed below
- *
- * Bit           7     6     5      4      3     2     1      0
- * Speed (Mbps)  N/A   N/A   1000   N/A    100   100   10     10
- * Duplex                    Full          Full  Half  Full   Half
- *
- * Default Value: 0x2F (copper); 0x20 (fiber)
- */
-E1000_PARAM(AutoNeg, "Advertised auto-negotiation setting");
-#define AUTONEG_ADV_DEFAULT  0x2F
-#define AUTONEG_ADV_MASK     0x2F
-
-/* User Specified Flow Control Override
- *
- * Valid Range: 0-3
- *  - 0 - No Flow Control
- *  - 1 - Rx only, respond to PAUSE frames but do not generate them
- *  - 2 - Tx only, generate PAUSE frames but ignore them on receive
- *  - 3 - Full Flow Control Support
- *
- * Default Value: Read flow control settings from the EEPROM
- */
-E1000_PARAM(FlowControl, "Flow Control setting");
-#define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL
-
-/* XsumRX - Receive Checksum Offload Enable/Disable
- *
- * Valid Range: 0, 1
- *  - 0 - disables all checksum offload
- *  - 1 - enables receive IP/TCP/UDP checksum offload
- *        on 82543 and newer -based NICs
- *
- * Default Value: 1
- */
-E1000_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
-
-/* Transmit Interrupt Delay in units of 1.024 microseconds
- *  Tx interrupt delay needs to typically be set to something non zero
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(TxIntDelay, "Transmit Interrupt Delay");
-#define DEFAULT_TIDV                   8
-#define MAX_TXDELAY               0xFFFF
-#define MIN_TXDELAY                    0
-
-/* Transmit Absolute Interrupt Delay in units of 1.024 microseconds
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(TxAbsIntDelay, "Transmit Absolute Interrupt Delay");
-#define DEFAULT_TADV                  32
-#define MAX_TXABSDELAY            0xFFFF
-#define MIN_TXABSDELAY                 0
-
-/* Receive Interrupt Delay in units of 1.024 microseconds
- *   hardware will likely hang if you set this to anything but zero.
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(RxIntDelay, "Receive Interrupt Delay");
-#define DEFAULT_RDTR                   0
-#define MAX_RXDELAY               0xFFFF
-#define MIN_RXDELAY                    0
-
-/* Receive Absolute Interrupt Delay in units of 1.024 microseconds
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
-#define DEFAULT_RADV                   8
-#define MAX_RXABSDELAY            0xFFFF
-#define MIN_RXABSDELAY                 0
-
-/* Interrupt Throttle Rate (interrupts/sec)
- *
- * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
- */
-E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
-#define DEFAULT_ITR                    3
-#define MAX_ITR                   100000
-#define MIN_ITR                      100
-
-/* Enable Smart Power Down of the PHY
- *
- * Valid Range: 0, 1
- *
- * Default Value: 0 (disabled)
- */
-E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
-
-struct e1000_option {
-       enum { enable_option, range_option, list_option } type;
-       const char *name;
-       const char *err;
-       int def;
-       union {
-               struct { /* range_option info */
-                       int min;
-                       int max;
-               } r;
-               struct { /* list_option info */
-                       int nr;
-                       const struct e1000_opt_list { int i; char *str; } *p;
-               } l;
-       } arg;
-};
-
-static int __devinit e1000_validate_option(unsigned int *value,
-                                          const struct e1000_option *opt,
-                                          struct e1000_adapter *adapter)
-{
-       if (*value == OPTION_UNSET) {
-               *value = opt->def;
-               return 0;
-       }
-
-       switch (opt->type) {
-       case enable_option:
-               switch (*value) {
-               case OPTION_ENABLED:
-                       e_dev_info("%s Enabled\n", opt->name);
-                       return 0;
-               case OPTION_DISABLED:
-                       e_dev_info("%s Disabled\n", opt->name);
-                       return 0;
-               }
-               break;
-       case range_option:
-               if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
-                       e_dev_info("%s set to %i\n", opt->name, *value);
-                       return 0;
-               }
-               break;
-       case list_option: {
-               int i;
-               const struct e1000_opt_list *ent;
-
-               for (i = 0; i < opt->arg.l.nr; i++) {
-                       ent = &opt->arg.l.p[i];
-                       if (*value == ent->i) {
-                               if (ent->str[0] != '\0')
-                                       e_dev_info("%s\n", ent->str);
-                               return 0;
-                       }
-               }
-       }
-               break;
-       default:
-               BUG();
-       }
-
-       e_dev_info("Invalid %s value specified (%i) %s\n",
-              opt->name, *value, opt->err);
-       *value = opt->def;
-       return -1;
-}
-
-static void e1000_check_fiber_options(struct e1000_adapter *adapter);
-static void e1000_check_copper_options(struct e1000_adapter *adapter);
-
-/**
- * e1000_check_options - Range Checking for Command Line Parameters
- * @adapter: board private structure
- *
- * This routine checks all command line parameters for valid user
- * input.  If an invalid value is given, or if no user specified
- * value exists, a default value is used.  The final value is stored
- * in a variable in the adapter structure.
- **/
-
-void __devinit e1000_check_options(struct e1000_adapter *adapter)
-{
-       struct e1000_option opt;
-       int bd = adapter->bd_number;
-
-       if (bd >= E1000_MAX_NIC) {
-               e_dev_warn("Warning: no configuration for board #%i "
-                          "using defaults for all values\n", bd);
-       }
-
-       { /* Transmit Descriptor Count */
-               struct e1000_tx_ring *tx_ring = adapter->tx_ring;
-               int i;
-               e1000_mac_type mac_type = adapter->hw.mac_type;
-
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Transmit Descriptors",
-                       .err  = "using default of "
-                               __MODULE_STRING(E1000_DEFAULT_TXD),
-                       .def  = E1000_DEFAULT_TXD,
-                       .arg  = { .r = {
-                               .min = E1000_MIN_TXD,
-                               .max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD
-                               }}
-               };
-
-               if (num_TxDescriptors > bd) {
-                       tx_ring->count = TxDescriptors[bd];
-                       e1000_validate_option(&tx_ring->count, &opt, adapter);
-                       tx_ring->count = ALIGN(tx_ring->count,
-                                               REQ_TX_DESCRIPTOR_MULTIPLE);
-               } else {
-                       tx_ring->count = opt.def;
-               }
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       tx_ring[i].count = tx_ring->count;
-       }
-       { /* Receive Descriptor Count */
-               struct e1000_rx_ring *rx_ring = adapter->rx_ring;
-               int i;
-               e1000_mac_type mac_type = adapter->hw.mac_type;
-
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Receive Descriptors",
-                       .err  = "using default of "
-                               __MODULE_STRING(E1000_DEFAULT_RXD),
-                       .def  = E1000_DEFAULT_RXD,
-                       .arg  = { .r = {
-                               .min = E1000_MIN_RXD,
-                               .max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD
-                       }}
-               };
-
-               if (num_RxDescriptors > bd) {
-                       rx_ring->count = RxDescriptors[bd];
-                       e1000_validate_option(&rx_ring->count, &opt, adapter);
-                       rx_ring->count = ALIGN(rx_ring->count,
-                                               REQ_RX_DESCRIPTOR_MULTIPLE);
-               } else {
-                       rx_ring->count = opt.def;
-               }
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       rx_ring[i].count = rx_ring->count;
-       }
-       { /* Checksum Offload Enable/Disable */
-               opt = (struct e1000_option) {
-                       .type = enable_option,
-                       .name = "Checksum Offload",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (num_XsumRX > bd) {
-                       unsigned int rx_csum = XsumRX[bd];
-                       e1000_validate_option(&rx_csum, &opt, adapter);
-                       adapter->rx_csum = rx_csum;
-               } else {
-                       adapter->rx_csum = opt.def;
-               }
-       }
-       { /* Flow Control */
-
-               static const struct e1000_opt_list fc_list[] = {
-                      { E1000_FC_NONE, "Flow Control Disabled" },
-                      { E1000_FC_RX_PAUSE, "Flow Control Receive Only" },
-                      { E1000_FC_TX_PAUSE, "Flow Control Transmit Only" },
-                      { E1000_FC_FULL, "Flow Control Enabled" },
-                      { E1000_FC_DEFAULT, "Flow Control Hardware Default" }
-               };
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "Flow Control",
-                       .err  = "reading default settings from EEPROM",
-                       .def  = E1000_FC_DEFAULT,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(fc_list),
-                                        .p = fc_list }}
-               };
-
-               if (num_FlowControl > bd) {
-                       unsigned int fc = FlowControl[bd];
-                       e1000_validate_option(&fc, &opt, adapter);
-                       adapter->hw.fc = adapter->hw.original_fc = fc;
-               } else {
-                       adapter->hw.fc = adapter->hw.original_fc = opt.def;
-               }
-       }
-       { /* Transmit Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Transmit Interrupt Delay",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
-                       .def  = DEFAULT_TIDV,
-                       .arg  = { .r = { .min = MIN_TXDELAY,
-                                        .max = MAX_TXDELAY }}
-               };
-
-               if (num_TxIntDelay > bd) {
-                       adapter->tx_int_delay = TxIntDelay[bd];
-                       e1000_validate_option(&adapter->tx_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->tx_int_delay = opt.def;
-               }
-       }
-       { /* Transmit Absolute Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Transmit Absolute Interrupt Delay",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_TADV),
-                       .def  = DEFAULT_TADV,
-                       .arg  = { .r = { .min = MIN_TXABSDELAY,
-                                        .max = MAX_TXABSDELAY }}
-               };
-
-               if (num_TxAbsIntDelay > bd) {
-                       adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-                       e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->tx_abs_int_delay = opt.def;
-               }
-       }
-       { /* Receive Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Receive Interrupt Delay",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
-                       .def  = DEFAULT_RDTR,
-                       .arg  = { .r = { .min = MIN_RXDELAY,
-                                        .max = MAX_RXDELAY }}
-               };
-
-               if (num_RxIntDelay > bd) {
-                       adapter->rx_int_delay = RxIntDelay[bd];
-                       e1000_validate_option(&adapter->rx_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->rx_int_delay = opt.def;
-               }
-       }
-       { /* Receive Absolute Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Receive Absolute Interrupt Delay",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_RADV),
-                       .def  = DEFAULT_RADV,
-                       .arg  = { .r = { .min = MIN_RXABSDELAY,
-                                        .max = MAX_RXABSDELAY }}
-               };
-
-               if (num_RxAbsIntDelay > bd) {
-                       adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-                       e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->rx_abs_int_delay = opt.def;
-               }
-       }
-       { /* Interrupt Throttling Rate */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Interrupt Throttling Rate (ints/sec)",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_ITR),
-                       .def  = DEFAULT_ITR,
-                       .arg  = { .r = { .min = MIN_ITR,
-                                        .max = MAX_ITR }}
-               };
-
-               if (num_InterruptThrottleRate > bd) {
-                       adapter->itr = InterruptThrottleRate[bd];
-                       switch (adapter->itr) {
-                       case 0:
-                               e_dev_info("%s turned off\n", opt.name);
-                               break;
-                       case 1:
-                               e_dev_info("%s set to dynamic mode\n",
-                                          opt.name);
-                               adapter->itr_setting = adapter->itr;
-                               adapter->itr = 20000;
-                               break;
-                       case 3:
-                               e_dev_info("%s set to dynamic conservative "
-                                          "mode\n", opt.name);
-                               adapter->itr_setting = adapter->itr;
-                               adapter->itr = 20000;
-                               break;
-                       case 4:
-                               e_dev_info("%s set to simplified "
-                                          "(2000-8000) ints mode\n", opt.name);
-                               adapter->itr_setting = adapter->itr;
-                               break;
-                       default:
-                               e1000_validate_option(&adapter->itr, &opt,
-                                       adapter);
-                               /* save the setting, because the dynamic bits
-                                * change itr.
-                                * clear the lower two bits because they are
-                                * used as control */
-                               adapter->itr_setting = adapter->itr & ~3;
-                               break;
-                       }
-               } else {
-                       adapter->itr_setting = opt.def;
-                       adapter->itr = 20000;
-               }
-       }
-       { /* Smart Power Down */
-               opt = (struct e1000_option) {
-                       .type = enable_option,
-                       .name = "PHY Smart Power Down",
-                       .err  = "defaulting to Disabled",
-                       .def  = OPTION_DISABLED
-               };
-
-               if (num_SmartPowerDownEnable > bd) {
-                       unsigned int spd = SmartPowerDownEnable[bd];
-                       e1000_validate_option(&spd, &opt, adapter);
-                       adapter->smart_power_down = spd;
-               } else {
-                       adapter->smart_power_down = opt.def;
-               }
-       }
-
-       switch (adapter->hw.media_type) {
-       case e1000_media_type_fiber:
-       case e1000_media_type_internal_serdes:
-               e1000_check_fiber_options(adapter);
-               break;
-       case e1000_media_type_copper:
-               e1000_check_copper_options(adapter);
-               break;
-       default:
-               BUG();
-       }
-}
-
-/**
- * e1000_check_fiber_options - Range Checking for Link Options, Fiber Version
- * @adapter: board private structure
- *
- * Handles speed and duplex options on fiber adapters
- **/
-
-static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)
-{
-       int bd = adapter->bd_number;
-       if (num_Speed > bd) {
-               e_dev_info("Speed not valid for fiber adapters, parameter "
-                          "ignored\n");
-       }
-
-       if (num_Duplex > bd) {
-               e_dev_info("Duplex not valid for fiber adapters, parameter "
-                          "ignored\n");
-       }
-
-       if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
-               e_dev_info("AutoNeg other than 1000/Full is not valid for fiber"
-                          "adapters, parameter ignored\n");
-       }
-}
-
-/**
- * e1000_check_copper_options - Range Checking for Link Options, Copper Version
- * @adapter: board private structure
- *
- * Handles speed and duplex options on copper adapters
- **/
-
-static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
-{
-       struct e1000_option opt;
-       unsigned int speed, dplx, an;
-       int bd = adapter->bd_number;
-
-       { /* Speed */
-               static const struct e1000_opt_list speed_list[] = {
-                       {          0, "" },
-                       {   SPEED_10, "" },
-                       {  SPEED_100, "" },
-                       { SPEED_1000, "" }};
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "Speed",
-                       .err  = "parameter ignored",
-                       .def  = 0,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(speed_list),
-                                        .p = speed_list }}
-               };
-
-               if (num_Speed > bd) {
-                       speed = Speed[bd];
-                       e1000_validate_option(&speed, &opt, adapter);
-               } else {
-                       speed = opt.def;
-               }
-       }
-       { /* Duplex */
-               static const struct e1000_opt_list dplx_list[] = {
-                       {           0, "" },
-                       { HALF_DUPLEX, "" },
-                       { FULL_DUPLEX, "" }};
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "Duplex",
-                       .err  = "parameter ignored",
-                       .def  = 0,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(dplx_list),
-                                        .p = dplx_list }}
-               };
-
-               if (num_Duplex > bd) {
-                       dplx = Duplex[bd];
-                       e1000_validate_option(&dplx, &opt, adapter);
-               } else {
-                       dplx = opt.def;
-               }
-       }
-
-       if ((num_AutoNeg > bd) && (speed != 0 || dplx != 0)) {
-               e_dev_info("AutoNeg specified along with Speed or Duplex, "
-                          "parameter ignored\n");
-               adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT;
-       } else { /* Autoneg */
-               static const struct e1000_opt_list an_list[] =
-                       #define AA "AutoNeg advertising "
-                       {{ 0x01, AA "10/HD" },
-                        { 0x02, AA "10/FD" },
-                        { 0x03, AA "10/FD, 10/HD" },
-                        { 0x04, AA "100/HD" },
-                        { 0x05, AA "100/HD, 10/HD" },
-                        { 0x06, AA "100/HD, 10/FD" },
-                        { 0x07, AA "100/HD, 10/FD, 10/HD" },
-                        { 0x08, AA "100/FD" },
-                        { 0x09, AA "100/FD, 10/HD" },
-                        { 0x0a, AA "100/FD, 10/FD" },
-                        { 0x0b, AA "100/FD, 10/FD, 10/HD" },
-                        { 0x0c, AA "100/FD, 100/HD" },
-                        { 0x0d, AA "100/FD, 100/HD, 10/HD" },
-                        { 0x0e, AA "100/FD, 100/HD, 10/FD" },
-                        { 0x0f, AA "100/FD, 100/HD, 10/FD, 10/HD" },
-                        { 0x20, AA "1000/FD" },
-                        { 0x21, AA "1000/FD, 10/HD" },
-                        { 0x22, AA "1000/FD, 10/FD" },
-                        { 0x23, AA "1000/FD, 10/FD, 10/HD" },
-                        { 0x24, AA "1000/FD, 100/HD" },
-                        { 0x25, AA "1000/FD, 100/HD, 10/HD" },
-                        { 0x26, AA "1000/FD, 100/HD, 10/FD" },
-                        { 0x27, AA "1000/FD, 100/HD, 10/FD, 10/HD" },
-                        { 0x28, AA "1000/FD, 100/FD" },
-                        { 0x29, AA "1000/FD, 100/FD, 10/HD" },
-                        { 0x2a, AA "1000/FD, 100/FD, 10/FD" },
-                        { 0x2b, AA "1000/FD, 100/FD, 10/FD, 10/HD" },
-                        { 0x2c, AA "1000/FD, 100/FD, 100/HD" },
-                        { 0x2d, AA "1000/FD, 100/FD, 100/HD, 10/HD" },
-                        { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },
-                        { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }};
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "AutoNeg",
-                       .err  = "parameter ignored",
-                       .def  = AUTONEG_ADV_DEFAULT,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(an_list),
-                                        .p = an_list }}
-               };
-
-               if (num_AutoNeg > bd) {
-                       an = AutoNeg[bd];
-                       e1000_validate_option(&an, &opt, adapter);
-               } else {
-                       an = opt.def;
-               }
-               adapter->hw.autoneg_advertised = an;
-       }
-
-       switch (speed + dplx) {
-       case 0:
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               if ((num_Speed > bd) && (speed != 0 || dplx != 0))
-                       e_dev_info("Speed and duplex autonegotiation "
-                                  "enabled\n");
-               break;
-       case HALF_DUPLEX:
-               e_dev_info("Half Duplex specified without Speed\n");
-               e_dev_info("Using Autonegotiation at Half Duplex only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_10_HALF |
-                                                ADVERTISE_100_HALF;
-               break;
-       case FULL_DUPLEX:
-               e_dev_info("Full Duplex specified without Speed\n");
-               e_dev_info("Using Autonegotiation at Full Duplex only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_10_FULL |
-                                                ADVERTISE_100_FULL |
-                                                ADVERTISE_1000_FULL;
-               break;
-       case SPEED_10:
-               e_dev_info("10 Mbps Speed specified without Duplex\n");
-               e_dev_info("Using Autonegotiation at 10 Mbps only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_10_HALF |
-                                                ADVERTISE_10_FULL;
-               break;
-       case SPEED_10 + HALF_DUPLEX:
-               e_dev_info("Forcing to 10 Mbps Half Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_10_half;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_10 + FULL_DUPLEX:
-               e_dev_info("Forcing to 10 Mbps Full Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_10_full;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_100:
-               e_dev_info("100 Mbps Speed specified without Duplex\n");
-               e_dev_info("Using Autonegotiation at 100 Mbps only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_100_HALF |
-                                                ADVERTISE_100_FULL;
-               break;
-       case SPEED_100 + HALF_DUPLEX:
-               e_dev_info("Forcing to 100 Mbps Half Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_100_half;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_100 + FULL_DUPLEX:
-               e_dev_info("Forcing to 100 Mbps Full Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_100_full;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_1000:
-               e_dev_info("1000 Mbps Speed specified without Duplex\n");
-               goto full_duplex_only;
-       case SPEED_1000 + HALF_DUPLEX:
-               e_dev_info("Half Duplex is not supported at 1000 Mbps\n");
-               /* fall through */
-       case SPEED_1000 + FULL_DUPLEX:
-full_duplex_only:
-               e_dev_info("Using Autonegotiation at 1000 Mbps Full Duplex "
-                          "only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
-       default:
-               BUG();
-       }
-
-       /* Speed, AutoNeg and MDI/MDI-X must all play nice */
-       if (e1000_validate_mdi_setting(&(adapter->hw)) < 0) {
-               e_dev_info("Speed, AutoNeg and MDI-X specs are incompatible. "
-                          "Setting MDI-X to a compatible value.\n");
-       }
-}
-
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
deleted file mode 100644 (file)
index 480f259..0000000
+++ /dev/null
@@ -1,2115 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-/*
- * 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
- * 82583V Gigabit Network Connection
- */
-
-#include "e1000.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
-#define AN_RETRY_COUNT          5 /* Autoneg Retry Count value */
-#define E1000_BASE1000T_STATUS          10
-#define E1000_IDLE_ERROR_COUNT_MASK     0xFF
-#define E1000_RECEIVE_ERROR_COUNTER     21
-#define E1000_RECEIVE_ERROR_MAX         0xFFFF
-
-#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */
-
-static s32 e1000_get_phy_id_82571(struct e1000_hw *hw);
-static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw);
-static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw);
-static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw);
-static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
-                                     u16 words, u16 *data);
-static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw);
-static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw);
-static s32 e1000_setup_link_82571(struct e1000_hw *hw);
-static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw);
-static void e1000_clear_vfta_82571(struct e1000_hw *hw);
-static bool e1000_check_mng_mode_82574(struct e1000_hw *hw);
-static s32 e1000_led_on_82574(struct e1000_hw *hw);
-static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw);
-static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw);
-static void e1000_put_hw_semaphore_82573(struct e1000_hw *hw);
-static s32 e1000_get_hw_semaphore_82574(struct e1000_hw *hw);
-static void e1000_put_hw_semaphore_82574(struct e1000_hw *hw);
-static s32 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active);
-static s32 e1000_set_d3_lplu_state_82574(struct e1000_hw *hw, bool active);
-
-/**
- *  e1000_init_phy_params_82571 - Init PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               phy->type = e1000_phy_none;
-               return 0;
-       }
-
-       phy->addr                        = 1;
-       phy->autoneg_mask                = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us              = 100;
-
-       phy->ops.power_up                = e1000_power_up_phy_copper;
-       phy->ops.power_down              = e1000_power_down_phy_copper_82571;
-
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               phy->type                = e1000_phy_igp_2;
-               break;
-       case e1000_82573:
-               phy->type                = e1000_phy_m88;
-               break;
-       case e1000_82574:
-       case e1000_82583:
-               phy->type                = e1000_phy_bm;
-               phy->ops.acquire = e1000_get_hw_semaphore_82574;
-               phy->ops.release = e1000_put_hw_semaphore_82574;
-               phy->ops.set_d0_lplu_state = e1000_set_d0_lplu_state_82574;
-               phy->ops.set_d3_lplu_state = e1000_set_d3_lplu_state_82574;
-               break;
-       default:
-               return -E1000_ERR_PHY;
-               break;
-       }
-
-       /* This can only be done after all function pointers are setup. */
-       ret_val = e1000_get_phy_id_82571(hw);
-       if (ret_val) {
-               e_dbg("Error getting PHY ID\n");
-               return ret_val;
-       }
-
-       /* Verify phy id */
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               if (phy->id != IGP01E1000_I_PHY_ID)
-                       ret_val = -E1000_ERR_PHY;
-               break;
-       case e1000_82573:
-               if (phy->id != M88E1111_I_PHY_ID)
-                       ret_val = -E1000_ERR_PHY;
-               break;
-       case e1000_82574:
-       case e1000_82583:
-               if (phy->id != BME1000_E_PHY_ID_R2)
-                       ret_val = -E1000_ERR_PHY;
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               break;
-       }
-
-       if (ret_val)
-               e_dbg("PHY ID unknown: type = 0x%08x\n", phy->id);
-
-       return ret_val;
-}
-
-/**
- *  e1000_init_nvm_params_82571 - Init NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_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 */
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-               nvm->ops.acquire = e1000_get_hw_semaphore_82574;
-               nvm->ops.release = e1000_put_hw_semaphore_82574;
-               break;
-       default:
-               break;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_init_mac_params_82571 - Init MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_mac_operations *func = &mac->ops;
-       u32 swsm = 0;
-       u32 swsm2 = 0;
-       bool force_clear_smbi = false;
-
-       /* Set media type */
-       switch (adapter->pdev->device) {
-       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_82572EI_SERDES:
-       case E1000_DEV_ID_82571EB_SERDES_DUAL:
-       case E1000_DEV_ID_82571EB_SERDES_QUAD:
-               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;
-       /* Adaptive IFS supported */
-       mac->adaptive_ifs = true;
-
-       /* check for link */
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               func->setup_physical_interface = e1000_setup_copper_link_82571;
-               func->check_for_link = e1000e_check_for_copper_link;
-               func->get_link_up_info = e1000e_get_speed_and_duplex_copper;
-               break;
-       case e1000_media_type_fiber:
-               func->setup_physical_interface =
-                       e1000_setup_fiber_serdes_link_82571;
-               func->check_for_link = e1000e_check_for_fiber_link;
-               func->get_link_up_info =
-                       e1000e_get_speed_and_duplex_fiber_serdes;
-               break;
-       case e1000_media_type_internal_serdes:
-               func->setup_physical_interface =
-                       e1000_setup_fiber_serdes_link_82571;
-               func->check_for_link = e1000_check_for_serdes_link_82571;
-               func->get_link_up_info =
-                       e1000e_get_speed_and_duplex_fiber_serdes;
-               break;
-       default:
-               return -E1000_ERR_CONFIG;
-               break;
-       }
-
-       switch (hw->mac.type) {
-       case e1000_82573:
-               func->set_lan_id = e1000_set_lan_id_single_port;
-               func->check_mng_mode = e1000e_check_mng_mode_generic;
-               func->led_on = e1000e_led_on_generic;
-               func->blink_led = e1000e_blink_led_generic;
-
-               /* FWSM register */
-               mac->has_fwsm = true;
-               /*
-                * ARC supported; valid only if manageability features are
-                * enabled.
-                */
-               mac->arc_subsystem_valid =
-                       (er32(FWSM) & E1000_FWSM_MODE_MASK)
-                       ? true : false;
-               break;
-       case e1000_82574:
-       case e1000_82583:
-               func->set_lan_id = e1000_set_lan_id_single_port;
-               func->check_mng_mode = e1000_check_mng_mode_82574;
-               func->led_on = e1000_led_on_82574;
-               break;
-       default:
-               func->check_mng_mode = e1000e_check_mng_mode_generic;
-               func->led_on = e1000e_led_on_generic;
-               func->blink_led = e1000e_blink_led_generic;
-
-               /* FWSM register */
-               mac->has_fwsm = true;
-               break;
-       }
-
-       /*
-        * Ensure that the inter-port SWSM.SMBI lock bit is clear before
-        * first NVM or PHY access. 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);
-       }
-
-       /*
-        * Initialize device specific counter of SMBI acquisition
-        * timeouts.
-        */
-        hw->dev_spec.e82571.smb_counter = 0;
-
-       return 0;
-}
-
-static s32 e1000_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_dev *pdev = adapter->pdev;
-       int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1;
-       s32 rc;
-
-       rc = e1000_init_mac_params_82571(adapter);
-       if (rc)
-               return rc;
-
-       rc = e1000_init_nvm_params_82571(hw);
-       if (rc)
-               return rc;
-
-       rc = e1000_init_phy_params_82571(hw);
-       if (rc)
-               return rc;
-
-       /* 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) {
-                       adapter->flags |= FLAG_HAS_JUMBO_FRAMES;
-                       adapter->max_hw_frame_size = DEFAULT_JUMBO;
-               }
-               break;
-       default:
-               break;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_get_phy_id_82571(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       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:
-               return e1000e_get_phy_id(hw);
-               break;
-       case e1000_82574:
-       case e1000_82583:
-               ret_val = e1e_rphy(hw, PHY_ID1, &phy_id);
-               if (ret_val)
-                       return ret_val;
-
-               phy->id = (u32)(phy_id << 16);
-               udelay(20);
-               ret_val = e1e_rphy(hw, PHY_ID2, &phy_id);
-               if (ret_val)
-                       return ret_val;
-
-               phy->id |= (u32)(phy_id);
-               phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-               break;
-       default:
-               return -E1000_ERR_PHY;
-               break;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_get_hw_semaphore_82571 - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore to access the PHY or NVM
- **/
-static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
-{
-       u32 swsm;
-       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.e82571.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.e82571.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 */
-               e1000_put_hw_semaphore_82571(hw);
-               e_dbg("Driver can't access the NVM\n");
-               return -E1000_ERR_NVM;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_put_hw_semaphore_82571 - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- **/
-static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw)
-{
-       u32 swsm;
-
-       swsm = er32(SWSM);
-       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
-       ew32(SWSM, swsm);
-}
-/**
- *  e1000_get_hw_semaphore_82573 - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore during reset.
- *
- **/
-static s32 e1000_get_hw_semaphore_82573(struct e1000_hw *hw)
-{
-       u32 extcnf_ctrl;
-       s32 ret_val = 0;
-       s32 i = 0;
-
-       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;
-
-               usleep_range(2000, 4000);
-               i++;
-       } while (i < MDIO_OWNERSHIP_TIMEOUT);
-
-       if (i == MDIO_OWNERSHIP_TIMEOUT) {
-               /* Release semaphores */
-               e1000_put_hw_semaphore_82573(hw);
-               e_dbg("Driver can't access the PHY\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_put_hw_semaphore_82573 - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used during reset.
- *
- **/
-static void e1000_put_hw_semaphore_82573(struct e1000_hw *hw)
-{
-       u32 extcnf_ctrl;
-
-       extcnf_ctrl = er32(EXTCNF_CTRL);
-       extcnf_ctrl &= ~E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
-       ew32(EXTCNF_CTRL, extcnf_ctrl);
-}
-
-static DEFINE_MUTEX(swflag_mutex);
-
-/**
- *  e1000_get_hw_semaphore_82574 - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore to access the PHY or NVM.
- *
- **/
-static s32 e1000_get_hw_semaphore_82574(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       mutex_lock(&swflag_mutex);
-       ret_val = e1000_get_hw_semaphore_82573(hw);
-       if (ret_val)
-               mutex_unlock(&swflag_mutex);
-       return ret_val;
-}
-
-/**
- *  e1000_put_hw_semaphore_82574 - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- *
- **/
-static void e1000_put_hw_semaphore_82574(struct e1000_hw *hw)
-{
-       e1000_put_hw_semaphore_82573(hw);
-       mutex_unlock(&swflag_mutex);
-}
-
-/**
- *  e1000_set_d0_lplu_state_82574 - 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.
- *  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 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active)
-{
-       u16 data = er32(POEMB);
-
-       if (active)
-               data |= E1000_PHY_CTRL_D0A_LPLU;
-       else
-               data &= ~E1000_PHY_CTRL_D0A_LPLU;
-
-       ew32(POEMB, data);
-       return 0;
-}
-
-/**
- *  e1000_set_d3_lplu_state_82574 - Sets low power link up state for D3
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  The low power link up (lplu) state is set to the power management level D3
- *  when active is true, else clear lplu for D3. 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_82574(struct e1000_hw *hw, bool active)
-{
-       u16 data = er32(POEMB);
-
-       if (!active) {
-               data &= ~E1000_PHY_CTRL_NOND0A_LPLU;
-       } else if ((hw->phy.autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
-                  (hw->phy.autoneg_advertised == E1000_ALL_NOT_GIG) ||
-                  (hw->phy.autoneg_advertised == E1000_ALL_10_SPEED)) {
-               data |= E1000_PHY_CTRL_NOND0A_LPLU;
-       }
-
-       ew32(POEMB, data);
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_acquire_nvm_82571(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       ret_val = e1000_get_hw_semaphore_82571(hw);
-       if (ret_val)
-               return ret_val;
-
-       switch (hw->mac.type) {
-       case e1000_82573:
-               break;
-       default:
-               ret_val = e1000e_acquire_nvm(hw);
-               break;
-       }
-
-       if (ret_val)
-               e1000_put_hw_semaphore_82571(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_release_nvm_82571(struct e1000_hw *hw)
-{
-       e1000e_release_nvm(hw);
-       e1000_put_hw_semaphore_82571(hw);
-}
-
-/**
- *  e1000_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 e1000_write_nvm_82571(struct e1000_hw *hw, u16 offset, u16 words,
-                                u16 *data)
-{
-       s32 ret_val;
-
-       switch (hw->mac.type) {
-       case e1000_82573:
-       case e1000_82574:
-       case e1000_82583:
-               ret_val = e1000_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;
-}
-
-/**
- *  e1000_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 e1000_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)
-               return ret_val;
-
-       /*
-        * 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)
-               return ret_val;
-
-       /* Check for pending operations. */
-       for (i = 0; i < E1000_FLASH_UPDATES; i++) {
-               usleep_range(1000, 2000);
-               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
-                       break;
-       }
-
-       if (i == E1000_FLASH_UPDATES)
-               return -E1000_ERR_NVM;
-
-       /* 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++) {
-               usleep_range(1000, 2000);
-               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
-                       break;
-       }
-
-       if (i == E1000_FLASH_UPDATES)
-               return -E1000_ERR_NVM;
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_validate_nvm_checksum_82571(struct e1000_hw *hw)
-{
-       if (hw->nvm.type == e1000_nvm_flash_hw)
-               e1000_fix_nvm_checksum_82571(hw);
-
-       return e1000e_validate_nvm_checksum_generic(hw);
-}
-
-/**
- *  e1000_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 e1000_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");
-               return -E1000_ERR_NVM;
-       }
-
-       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;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_get_cfg_done_82571(struct e1000_hw *hw)
-{
-       s32 timeout = PHY_CFG_TIMEOUT;
-
-       while (timeout) {
-               if (er32(EEMNGCTL) &
-                   E1000_NVM_CFG_DONE_PORT_0)
-                       break;
-               usleep_range(1000, 2000);
-               timeout--;
-       }
-       if (!timeout) {
-               e_dbg("MNG configuration cycle has not completed.\n");
-               return -E1000_ERR_RESET;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       ret_val = e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &data);
-       if (ret_val)
-               return ret_val;
-
-       if (active) {
-               data |= IGP02E1000_PM_D0_LPLU;
-               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, data);
-               if (ret_val)
-                       return ret_val;
-
-               /* 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)
-                       return ret_val;
-       } 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)
-                               return ret_val;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
-                       if (ret_val)
-                               return ret_val;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_reset_hw_82571 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state.
- **/
-static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
-{
-       u32 ctrl, ctrl_ext;
-       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();
-
-       usleep_range(10000, 20000);
-
-       /*
-        * Must acquire the MDIO ownership before MAC reset.
-        * Ownership defaults to firmware after a reset.
-        */
-       switch (hw->mac.type) {
-       case e1000_82573:
-               ret_val = e1000_get_hw_semaphore_82573(hw);
-               break;
-       case e1000_82574:
-       case e1000_82583:
-               ret_val = e1000_get_hw_semaphore_82574(hw);
-               break;
-       default:
-               break;
-       }
-       if (ret_val)
-               e_dbg("Cannot acquire MDIO ownership\n");
-
-       ctrl = er32(CTRL);
-
-       e_dbg("Issuing a global reset to MAC\n");
-       ew32(CTRL, ctrl | E1000_CTRL_RST);
-
-       /* Must release MDIO ownership and mutex after MAC reset. */
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-               e1000_put_hw_semaphore_82574(hw);
-               break;
-       default:
-               break;
-       }
-
-       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. */
-               return ret_val;
-
-       /*
-        * 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_82573:
-       case e1000_82574:
-       case e1000_82583:
-               msleep(25);
-               break;
-       default:
-               break;
-       }
-
-       /* Clear any pending interrupt events. */
-       ew32(IMC, 0xffffffff);
-       er32(ICR);
-
-       if (hw->mac.type == e1000_82571) {
-               /* Install any alternate MAC address into RAR0 */
-               ret_val = e1000_check_alt_mac_addr_generic(hw);
-               if (ret_val)
-                       return ret_val;
-
-               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;
-
-       return 0;
-}
-
-/**
- *  e1000_init_hw_82571 - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation.
- **/
-static s32 e1000_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;
-
-       e1000_initialize_hw_bits_82571(hw);
-
-       /* Initialize identification LED */
-       ret_val = e1000e_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");
-       mac->ops.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 = e1000_setup_link_82571(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_82573:
-               e1000e_enable_tx_pkt_filtering(hw);
-               /* fall through */
-       case e1000_82574:
-       case e1000_82583:
-               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.
-        */
-       e1000_clear_hw_cntrs_82571(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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_82573:
-       case e1000_82574:
-       case e1000_82583:
-               reg = er32(CTRL);
-               reg &= ~(1 << 29);
-               ew32(CTRL, reg);
-               break;
-       default:
-               break;
-       }
-
-       /* Extended Device Control */
-       switch (hw->mac.type) {
-       case e1000_82573:
-       case e1000_82574:
-       case e1000_82583:
-               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;
-       }
-}
-
-/**
- *  e1000_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 e1000_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_82573:
-       case e1000_82574:
-       case e1000_82583:
-               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);
-               }
-               break;
-       default:
-               break;
-       }
-       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();
-       }
-}
-
-/**
- *  e1000_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 e1000_check_mng_mode_82574(struct e1000_hw *hw)
-{
-       u16 data;
-
-       e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
-       return (data & E1000_NVM_INIT_CTRL2_MNGM) != 0;
-}
-
-/**
- *  e1000_led_on_82574 - Turn LED on
- *  @hw: pointer to the HW structure
- *
- *  Turn LED on.
- **/
-static s32 e1000_led_on_82574(struct e1000_hw *hw)
-{
-       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);
-
-       return 0;
-}
-
-/**
- *  e1000_check_phy_82574 - check 82574 phy hung state
- *  @hw: pointer to the HW structure
- *
- *  Returns whether phy is hung or not
- **/
-bool e1000_check_phy_82574(struct e1000_hw *hw)
-{
-       u16 status_1kbt = 0;
-       u16 receive_errors = 0;
-       bool phy_hung = false;
-       s32 ret_val = 0;
-
-       /*
-        * Read PHY Receive Error counter first, if its is max - all F's then
-        * read the Base1000T status register If both are max then PHY is hung.
-        */
-       ret_val = e1e_rphy(hw, E1000_RECEIVE_ERROR_COUNTER, &receive_errors);
-
-       if (ret_val)
-               goto out;
-       if (receive_errors == E1000_RECEIVE_ERROR_MAX)  {
-               ret_val = e1e_rphy(hw, E1000_BASE1000T_STATUS, &status_1kbt);
-               if (ret_val)
-                       goto out;
-               if ((status_1kbt & E1000_IDLE_ERROR_COUNT_MASK) ==
-                   E1000_IDLE_ERROR_COUNT_MASK)
-                       phy_hung = true;
-       }
-out:
-       return phy_hung;
-}
-
-/**
- *  e1000_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 e1000_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_82573:
-       case e1000_82574:
-       case e1000_82583:
-               if (hw->fc.requested_mode == e1000_fc_default)
-                       hw->fc.requested_mode = e1000_fc_full;
-               break;
-       default:
-               break;
-       }
-
-       return e1000e_setup_link(hw);
-}
-
-/**
- *  e1000_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 e1000_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:
-               return -E1000_ERR_PHY;
-               break;
-       }
-
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000e_setup_copper_link(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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);
-}
-
-/**
- *  e1000_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 autonegotiation. 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 successfully autonegotiated)
- *  4) forced_up (the link has been forced up, it did not autonegotiate)
- *
- **/
-static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       u32 txcw;
-       u32 i;
-       s32 ret_val = 0;
-
-       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");
-                       } else {
-                               mac->serdes_has_link = true;
-                       }
-                       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 the partner code word is null, stop forcing
-                        * and restart auto negotiation.
-                        */
-                       if ((rxcw & E1000_RXCW_C) || !(rxcw & E1000_RXCW_CW))  {
-                               /* 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");
-                       } else {
-                               mac->serdes_has_link = true;
-                       }
-                       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;
-                       mac->serdes_has_link = false;
-                       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 {
-                       /*
-                        * Check several times, if Sync and Config
-                        * both are consistently 1 then simply ignore
-                        * the Invalid bit and restart Autoneg
-                        */
-                       for (i = 0; i < AN_RETRY_COUNT; i++) {
-                               udelay(10);
-                               rxcw = er32(RXCW);
-                               if ((rxcw & E1000_RXCW_IV) &&
-                                   !((rxcw & E1000_RXCW_SYNCH) &&
-                                     (rxcw & E1000_RXCW_C))) {
-                                       mac->serdes_has_link = false;
-                                       mac->serdes_link_state =
-                                           e1000_serdes_link_down;
-                                       e_dbg("ANYSTATE  -> DOWN\n");
-                                       break;
-                               }
-                       }
-
-                       if (i == AN_RETRY_COUNT) {
-                               txcw = er32(TXCW);
-                               txcw |= E1000_TXCW_ANE;
-                               ew32(TXCW, txcw);
-                               mac->serdes_link_state =
-                                   e1000_serdes_link_autoneg_progress;
-                               mac->serdes_has_link = false;
-                               e_dbg("ANYSTATE  -> AN_PROG\n");
-                       }
-               }
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               return ret_val;
-       }
-
-       switch (hw->mac.type) {
-       case e1000_82573:
-       case e1000_82574:
-       case e1000_82583:
-               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;
-       }
-
-       return 0;
-}
-
-/**
- *  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.e82571.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.e82571.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);
-}
-
-/**
- *  e1000_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 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       s32 ret_val;
-       u16 data;
-
-       if (nvm->type != e1000_nvm_flash_hw)
-               return 0;
-
-       /*
-        * Check bit 4 of word 10h.  If it is 0, firmware is done updating
-        * 10h-12h.  Checksum may need to be fixed.
-        */
-       ret_val = e1000_read_nvm(hw, 0x10, 1, &data);
-       if (ret_val)
-               return ret_val;
-
-       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 = e1000_read_nvm(hw, 0x23, 1, &data);
-               if (ret_val)
-                       return ret_val;
-
-               if (!(data & 0x8000)) {
-                       data |= 0x8000;
-                       ret_val = e1000_write_nvm(hw, 0x23, 1, &data);
-                       if (ret_val)
-                               return ret_val;
-                       ret_val = e1000e_update_nvm_checksum(hw);
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_read_mac_addr_82571 - Read device MAC address
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_read_mac_addr_82571(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-
-       if (hw->mac.type == e1000_82571) {
-               /*
-                * If there's an alternate MAC address place it in RAR0
-                * so that it will override the Si installed default perm
-                * address.
-                */
-               ret_val = e1000_check_alt_mac_addr_generic(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000_read_mac_addr_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_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 e1000_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) || phy->ops.check_reset_block(hw)))
-               e1000_power_down_phy_copper(hw);
-}
-
-/**
- *  e1000_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 e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
-{
-       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);
-}
-
-static struct e1000_mac_operations e82571_mac_ops = {
-       /* .check_mng_mode: mac type dependent */
-       /* .check_for_link: media type dependent */
-       .id_led_init            = e1000e_id_led_init,
-       .cleanup_led            = e1000e_cleanup_led_generic,
-       .clear_hw_cntrs         = e1000_clear_hw_cntrs_82571,
-       .get_bus_info           = e1000e_get_bus_info_pcie,
-       .set_lan_id             = e1000_set_lan_id_multi_port_pcie,
-       /* .get_link_up_info: media type dependent */
-       /* .led_on: mac type dependent */
-       .led_off                = e1000e_led_off_generic,
-       .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
-       .write_vfta             = e1000_write_vfta_generic,
-       .clear_vfta             = e1000_clear_vfta_82571,
-       .reset_hw               = e1000_reset_hw_82571,
-       .init_hw                = e1000_init_hw_82571,
-       .setup_link             = e1000_setup_link_82571,
-       /* .setup_physical_interface: media type dependent */
-       .setup_led              = e1000e_setup_led_generic,
-       .read_mac_addr          = e1000_read_mac_addr_82571,
-};
-
-static struct e1000_phy_operations e82_phy_ops_igp = {
-       .acquire                = e1000_get_hw_semaphore_82571,
-       .check_polarity         = e1000_check_polarity_igp,
-       .check_reset_block      = e1000e_check_reset_block_generic,
-       .commit                 = NULL,
-       .force_speed_duplex     = e1000e_phy_force_speed_duplex_igp,
-       .get_cfg_done           = e1000_get_cfg_done_82571,
-       .get_cable_length       = e1000e_get_cable_length_igp_2,
-       .get_info               = e1000e_get_phy_info_igp,
-       .read_reg               = e1000e_read_phy_reg_igp,
-       .release                = e1000_put_hw_semaphore_82571,
-       .reset                  = e1000e_phy_hw_reset_generic,
-       .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
-       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
-       .write_reg              = e1000e_write_phy_reg_igp,
-       .cfg_on_link_up         = NULL,
-};
-
-static struct e1000_phy_operations e82_phy_ops_m88 = {
-       .acquire                = e1000_get_hw_semaphore_82571,
-       .check_polarity         = e1000_check_polarity_m88,
-       .check_reset_block      = e1000e_check_reset_block_generic,
-       .commit                 = e1000e_phy_sw_reset,
-       .force_speed_duplex     = e1000e_phy_force_speed_duplex_m88,
-       .get_cfg_done           = e1000e_get_cfg_done,
-       .get_cable_length       = e1000e_get_cable_length_m88,
-       .get_info               = e1000e_get_phy_info_m88,
-       .read_reg               = e1000e_read_phy_reg_m88,
-       .release                = e1000_put_hw_semaphore_82571,
-       .reset                  = e1000e_phy_hw_reset_generic,
-       .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
-       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
-       .write_reg              = e1000e_write_phy_reg_m88,
-       .cfg_on_link_up         = NULL,
-};
-
-static struct e1000_phy_operations e82_phy_ops_bm = {
-       .acquire                = e1000_get_hw_semaphore_82571,
-       .check_polarity         = e1000_check_polarity_m88,
-       .check_reset_block      = e1000e_check_reset_block_generic,
-       .commit                 = e1000e_phy_sw_reset,
-       .force_speed_duplex     = e1000e_phy_force_speed_duplex_m88,
-       .get_cfg_done           = e1000e_get_cfg_done,
-       .get_cable_length       = e1000e_get_cable_length_m88,
-       .get_info               = e1000e_get_phy_info_m88,
-       .read_reg               = e1000e_read_phy_reg_bm2,
-       .release                = e1000_put_hw_semaphore_82571,
-       .reset                  = e1000e_phy_hw_reset_generic,
-       .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
-       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
-       .write_reg              = e1000e_write_phy_reg_bm2,
-       .cfg_on_link_up         = NULL,
-};
-
-static struct e1000_nvm_operations e82571_nvm_ops = {
-       .acquire                = e1000_acquire_nvm_82571,
-       .read                   = e1000e_read_nvm_eerd,
-       .release                = e1000_release_nvm_82571,
-       .update                 = e1000_update_nvm_checksum_82571,
-       .valid_led_default      = e1000_valid_led_default_82571,
-       .validate               = e1000_validate_nvm_checksum_82571,
-       .write                  = e1000_write_nvm_82571,
-};
-
-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,
-       .flags2                 = FLAG2_DISABLE_ASPM_L1 /* errata 13 */
-                                 | FLAG2_DMA_BURST,
-       .pba                    = 38,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .get_variants           = e1000_get_variants_82571,
-       .mac_ops                = &e82571_mac_ops,
-       .phy_ops                = &e82_phy_ops_igp,
-       .nvm_ops                = &e82571_nvm_ops,
-};
-
-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 */
-       .flags2                 = FLAG2_DISABLE_ASPM_L1 /* errata 13 */
-                                 | FLAG2_DMA_BURST,
-       .pba                    = 38,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .get_variants           = e1000_get_variants_82571,
-       .mac_ops                = &e82571_mac_ops,
-       .phy_ops                = &e82_phy_ops_igp,
-       .nvm_ops                = &e82571_nvm_ops,
-};
-
-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_SWSM_ON_LOAD,
-       .flags2                 = FLAG2_DISABLE_ASPM_L1
-                                 | FLAG2_DISABLE_ASPM_L0S,
-       .pba                    = 20,
-       .max_hw_frame_size      = ETH_FRAME_LEN + ETH_FCS_LEN,
-       .get_variants           = e1000_get_variants_82571,
-       .mac_ops                = &e82571_mac_ops,
-       .phy_ops                = &e82_phy_ops_m88,
-       .nvm_ops                = &e82571_nvm_ops,
-};
-
-struct e1000_info e1000_82574_info = {
-       .mac                    = e1000_82574,
-       .flags                  = FLAG_HAS_HW_VLAN_FILTER
-                                 | FLAG_HAS_MSIX
-                                 | 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,
-       .flags2                   = FLAG2_CHECK_PHY_HANG
-                                 | FLAG2_DISABLE_ASPM_L0S,
-       .pba                    = 32,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .get_variants           = e1000_get_variants_82571,
-       .mac_ops                = &e82571_mac_ops,
-       .phy_ops                = &e82_phy_ops_bm,
-       .nvm_ops                = &e82571_nvm_ops,
-};
-
-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_JUMBO_FRAMES
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD,
-       .flags2                 = FLAG2_DISABLE_ASPM_L0S,
-       .pba                    = 32,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .get_variants           = e1000_get_variants_82571,
-       .mac_ops                = &e82571_mac_ops,
-       .phy_ops                = &e82_phy_ops_bm,
-       .nvm_ops                = &e82571_nvm_ops,
-};
-
diff --git a/drivers/net/e1000e/Makefile b/drivers/net/e1000e/Makefile
deleted file mode 100644 (file)
index 28519ac..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#
-# Intel PRO/1000 Linux driver
-# Copyright(c) 1999 - 2011 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
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) PRO/1000 ethernet driver
-#
-
-obj-$(CONFIG_E1000E) += e1000e.o
-
-e1000e-objs := 82571.o ich8lan.o es2lan.o \
-              lib.o phy.o param.o ethtool.o netdev.o
-
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
deleted file mode 100644 (file)
index c516a74..0000000
+++ /dev/null
@@ -1,844 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_DEFINES_H_
-#define _E1000_DEFINES_H_
-
-#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 */
-
-/* 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_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 */
-
-/* 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
-
-/* Extended Device Control */
-#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
-#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
-#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_PCIE_SERDES  0x00C00000
-#define E1000_CTRL_EXT_EIAME          0x01000000
-#define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
-#define E1000_CTRL_EXT_IAME           0x08000000 /* Interrupt acknowledge Auto-mask */
-#define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000 /* Clear Interrupt timers after IMS clear */
-#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
-#define E1000_CTRL_EXT_LSECCK         0x00001000
-#define E1000_CTRL_EXT_PHYPDEN        0x00100000
-
-/* 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_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_RXE       0x80    /* Rx Data Error */
-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-
-#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_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_RXDPS_HDRSTAT_HDRSP              0x00008000
-
-/* Management Control */
-#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
-#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets 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
-
-#define E1000_MANC2H_PORT_623    0x00000020 /* Port 0x26f */
-#define E1000_MANC2H_PORT_664    0x00000040 /* Port 0x298 */
-#define E1000_MDEF_PORT_623      0x00000800 /* Port 0x26f */
-#define E1000_MDEF_PORT_664      0x00000400 /* Port 0x298 */
-
-/* Receive Control */
-#define E1000_RCTL_EN             0x00000002    /* enable */
-#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
-#define E1000_RCTL_UPE            0x00000008    /* unicast promiscuous enable */
-#define E1000_RCTL_MPE            0x00000010    /* multicast promiscuous enab */
-#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_TCVR       0x000000C0    /* tcvr loopback mode */
-#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */
-#define E1000_RCTL_RDMTS_HALF     0x00000000    /* Rx desc min threshold size */
-#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
-#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */
-#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_PMCF           0x00800000    /* pass MAC control frames */
-#define E1000_RCTL_BSEX           0x02000000    /* Buffer size extension */
-#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
-
-/*
- * 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   0x1
-#define E1000_SWFW_PHY0_SM  0x2
-#define E1000_SWFW_PHY1_SM  0x4
-#define E1000_SWFW_CSR_SM   0x8
-
-/* Device Control */
-#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master requests */
-#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
-#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_FRCSPD   0x00000800  /* Force Speed */
-#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
-#define E1000_CTRL_LANPHYPC_OVERRIDE 0x00010000 /* SW control of LANPHYPC */
-#define E1000_CTRL_LANPHYPC_VALUE    0x00020000 /* SW value of LANPHYPC */
-#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
-#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
-#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 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_VME      0x40000000  /* IEEE VLAN mode enable */
-#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
-
-/*
- * Bit definitions for the Management Data IO (MDIO) and Management Data
- * Clock (MDC) pins in the Device Control Register.
- */
-
-/* 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_1     0x00000004      /* Function 1 */
-#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-#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_PHYRA      0x00000400      /* PHY Reset Asserted */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */
-
-/* Constants used to interpret the masked PCI-X bus speed. */
-
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-
-#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_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_MASK               0x0000001F
-
-#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
-#define E1000_LEDCTL_LED0_MODE_SHIFT      0
-#define E1000_LEDCTL_LED0_IVRT            0x00000040
-#define E1000_LEDCTL_LED0_BLINK           0x00000080
-
-#define E1000_LEDCTL_MODE_LINK_UP       0x2
-#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_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 */
-
-/* Transmit Control */
-#define E1000_TCTL_EN     0x00000002    /* enable Tx */
-#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_RTLC   0x01000000    /* Re-transmit on late collision */
-#define E1000_TCTL_MULR   0x10000000    /* Multiple request support */
-
-/* Transmit Arbitration Count */
-
-/* SerDes Control */
-#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
-
-/* Receive Checksum Control */
-#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
-#define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
-
-/* Header split receive */
-#define E1000_RFCTL_NFSW_DIS            0x00000040
-#define E1000_RFCTL_NFSR_DIS            0x00000080
-#define E1000_RFCTL_ACK_DIS             0x00001000
-#define E1000_RFCTL_EXTEN               0x00008000
-#define E1000_RFCTL_IPV6_EX_DIS         0x00010000
-#define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000
-
-/* 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_COPPER 8
-
-#define E1000_TIPG_IPGT_MASK  0x000003FF
-
-#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
-
-#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_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_8K  0x0008    /* 8KB */
-#define E1000_PBA_16K 0x0010    /* 16KB */
-
-#define E1000_PBS_16K E1000_PBA_16K
-
-#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_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_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_RXT0          0x00000080 /* Rx timer intr (ring 0) */
-#define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver should claim the interrupt */
-#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 /* ECC correction enable */
-#define E1000_PBA_ECC_STAT_CLR      0x00000002 /* Clear ECC error counter */
-#define E1000_PBA_ECC_INT_EN        0x00000004 /* Enable ICR bit 5 for ECC */
-
-/*
- * 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      /* Transmit desc written back */
-#define E1000_IMS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */
-#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */
-#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* Rx timer intr */
-#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_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 */
-
-/* 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_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 desc. 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 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
-
-/* Error Codes */
-#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_INVALID_ARGUMENT  16
-#define E1000_ERR_NO_SPACE          17
-#define E1000_ERR_NVM_PBA_SECTION   18
-
-/* 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_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_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_ANE        0x80000000        /* Auto-neg enable */
-
-/* Receive Configuration Word */
-#define E1000_RXCW_CW         0x0000ffff        /* RxConfigWord mask */
-#define E1000_RXCW_IV         0x08000000        /* Receive config invalid */
-#define E1000_RXCW_C          0x20000000        /* Receive config */
-#define E1000_RXCW_SYNCH      0x40000000        /* Receive config synch */
-
-/* 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 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_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-#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_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-
-/* Autoneg Advertisement Register */
-#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_PAUSE            0x0400   /* Pause operation desired */
-#define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
-
-/* Link Partner Ability Register (Base Page) */
-#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-
-/* Autoneg Expansion Register */
-#define NWAY_ER_LP_NWAY_CAPS     0x0001 /* LP has Auto Neg Capability */
-
-/* 1000BASE-T Control Register */
-#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-                                       /* 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 */
-
-/* 1000BASE-T Status Register */
-#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-
-
-/* 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_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_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_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_FLUPD     0x00080000 /* Update FLASH */
-#define E1000_EECD_AUPDEN    0x00100000 /* Enable Autonomous FLASH update */
-#define E1000_EECD_SEC1VAL   0x00400000 /* Sector One Valid */
-#define E1000_EECD_SEC1VAL_VALID_MASK (E1000_EECD_AUTO_RD | E1000_EECD_PRES)
-
-#define E1000_NVM_RW_REG_DATA   16   /* Offset to data in NVM read/write registers */
-#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_INIT_CONTROL2_REG      0x000F
-#define NVM_INIT_CONTROL3_PORT_B   0x0014
-#define NVM_INIT_3GIO_3            0x001A
-#define NVM_INIT_CONTROL3_PORT_A   0x0024
-#define NVM_CFG                    0x0012
-#define NVM_ALT_MAC_ADDR_PTR       0x0037
-#define NVM_CHECKSUM_REG           0x003F
-
-#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */
-
-#define E1000_NVM_CFG_DONE_PORT_0  0x40000 /* MNG config cycle done */
-#define E1000_NVM_CFG_DONE_PORT_1  0x80000 /* ...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
-
-/* Mask bits for fields in Word 0x1a of the NVM */
-#define NVM_WORD1A_ASPM_MASK  0x000C
-
-/* Mask bits for fields in Word 0x03 of the EEPROM */
-#define NVM_COMPAT_LOM    0x0800
-
-/* length of string needed to store PBA number */
-#define E1000_PBANUM_LENGTH             11
-
-/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
-#define NVM_SUM                    0xBABA
-
-/* PBA (printed board assembly) number words */
-#define NVM_PBA_OFFSET_0           8
-#define NVM_PBA_OFFSET_1           9
-#define NVM_PBA_PTR_GUARD          0xFAFA
-#define NVM_WORD_SIZE_BASE_SHIFT   6
-
-/* 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_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
-
-/* SPI NVM Status Register */
-#define NVM_STATUS_RDY_SPI         0x01
-
-/* 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 PCI_HEADER_TYPE_MULTIFUNC    0x80
-#define PCIE_LINK_WIDTH_MASK         0x3F0
-#define PCIE_LINK_WIDTH_SHIFT        4
-
-#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 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
-
-/* 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_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
-
-#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
-#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
-
-/* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
-#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_ASSERT_CRS_ON_TX 0x0800 /* 1=Assert CRS on Transmit */
-
-/* M88E1000 PHY Specific Status Register */
-#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_SPEED              0xC000 /* Speed, bits 14:15 */
-#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
-
-#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-
-/*
- * 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
-/*
- * 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_1X    0x0100
-#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
-
-/* M88EC018 Rev 2 specific DownShift settings */
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
-
-#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 */
-
-
-#define PHY_PAGE_SHIFT 5
-#define PHY_REG(page, reg) (((page) << PHY_PAGE_SHIFT) | \
-                           ((reg) & MAX_PHY_REG_ADDRESS))
-
-/*
- * 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_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_MAC_SPEC_CTRL       \
-       GG82563_REG(2, 21) /* MAC Specific Control Register */
-
-#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_PWR_MGMT_CTRL       \
-       GG82563_REG(193, 20) /* Power Management Control */
-
-/* Page 194 - KMRN Registers */
-#define GG82563_PHY_INBAND_CTRL         \
-       GG82563_REG(194, 18) /* Inband Control */
-
-/* MDI Control */
-#define E1000_MDIC_REG_SHIFT 16
-#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_ERROR     0x40000000
-
-/* SerDes Control */
-#define E1000_GEN_POLL_TIMEOUT          640
-
-#endif /* _E1000_DEFINES_H_ */
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
deleted file mode 100644 (file)
index 638d175..0000000
+++ /dev/null
@@ -1,736 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _E1000_H_
-#define _E1000_H_
-
-#include <linux/bitops.h>
-#include <linux/types.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-#include <linux/io.h>
-#include <linux/netdevice.h>
-#include <linux/pci.h>
-#include <linux/pci-aspm.h>
-#include <linux/crc32.h>
-#include <linux/if_vlan.h>
-
-#include "hw.h"
-
-struct e1000_info;
-
-#define e_dbg(format, arg...) \
-       netdev_dbg(hw->adapter->netdev, format, ## arg)
-#define e_err(format, arg...) \
-       netdev_err(adapter->netdev, format, ## arg)
-#define e_info(format, arg...) \
-       netdev_info(adapter->netdev, format, ## arg)
-#define e_warn(format, arg...) \
-       netdev_warn(adapter->netdev, format, ## arg)
-#define e_notice(format, arg...) \
-       netdev_notice(adapter->netdev, format, ## arg)
-
-
-/* Interrupt modes, as used by the IntMode parameter */
-#define E1000E_INT_MODE_LEGACY         0
-#define E1000E_INT_MODE_MSI            1
-#define E1000E_INT_MODE_MSIX           2
-
-/* 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 DEFAULT_JUMBO                  9234
-
-/* BM/HV Specific Registers */
-#define BM_PORT_CTRL_PAGE                 769
-
-#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)))
-
-/* PHY Wakeup Registers and defines */
-#define BM_PORT_GEN_CFG PHY_REG(BM_PORT_CTRL_PAGE, 17)
-#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_STATS_PAGE  778
-#define HV_SCC_UPPER   PHY_REG(HV_STATS_PAGE, 16) /* Single Collision Count */
-#define HV_SCC_LOWER   PHY_REG(HV_STATS_PAGE, 17)
-#define HV_ECOL_UPPER  PHY_REG(HV_STATS_PAGE, 18) /* Excessive Coll. Count */
-#define HV_ECOL_LOWER  PHY_REG(HV_STATS_PAGE, 19)
-#define HV_MCC_UPPER   PHY_REG(HV_STATS_PAGE, 20) /* Multiple Coll. Count */
-#define HV_MCC_LOWER   PHY_REG(HV_STATS_PAGE, 21)
-#define HV_LATECOL_UPPER PHY_REG(HV_STATS_PAGE, 23) /* Late Collision Count */
-#define HV_LATECOL_LOWER PHY_REG(HV_STATS_PAGE, 24)
-#define HV_COLC_UPPER  PHY_REG(HV_STATS_PAGE, 25) /* Collision Count */
-#define HV_COLC_LOWER  PHY_REG(HV_STATS_PAGE, 26)
-#define HV_DC_UPPER    PHY_REG(HV_STATS_PAGE, 27) /* Defer Count */
-#define HV_DC_LOWER    PHY_REG(HV_STATS_PAGE, 28)
-#define HV_TNCRS_UPPER PHY_REG(HV_STATS_PAGE, 29) /* Transmit with no CRS */
-#define HV_TNCRS_LOWER PHY_REG(HV_STATS_PAGE, 30)
-
-#define E1000_FCRTV_PCH     0x05F40 /* PCH Flow Control Refresh Timer Value */
-
-/* BM PHY Copper Specific Status */
-#define BM_CS_STATUS                      17
-#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
-
-/* Time to wait before putting the device into D3 if there's no link (in ms). */
-#define LINK_TIMEOUT           100
-
-#define DEFAULT_RDTR                   0
-#define DEFAULT_RADV                   8
-#define BURST_RDTR                     0x20
-#define BURST_RADV                     0x20
-
-/*
- * in the case of WTHRESH, it appears at least the 82571/2 hardware
- * writes back 4 descriptors when WTHRESH=5, and 3 descriptors when
- * WTHRESH=4, and since we want 64 bytes at a time written back, set
- * it to 5
- */
-#define E1000_TXDCTL_DMA_BURST_ENABLE                          \
-       (E1000_TXDCTL_GRAN | /* set descriptor granularity */  \
-        E1000_TXDCTL_COUNT_DESC |                             \
-        (5 << 16) | /* wthresh must be +1 more than desired */\
-        (1 << 8)  | /* hthresh */                             \
-        0x1f)       /* pthresh */
-
-#define E1000_RXDCTL_DMA_BURST_ENABLE                          \
-       (0x01000000 | /* set descriptor granularity */         \
-        (4 << 16)  | /* set writeback threshold    */         \
-        (4 << 8)   | /* set prefetch threshold     */         \
-        0x20)        /* set hthresh                */
-
-#define E1000_TIDV_FPD (1 << 31)
-#define E1000_RDTR_FPD (1 << 31)
-
-enum e1000_boards {
-       board_82571,
-       board_82572,
-       board_82573,
-       board_82574,
-       board_82583,
-       board_80003es2lan,
-       board_ich8lan,
-       board_ich9lan,
-       board_ich10lan,
-       board_pchlan,
-       board_pch2lan,
-};
-
-struct e1000_ps_page {
-       struct page *page;
-       u64 dma; /* must be u64 - written to hw */
-};
-
-/*
- * wrappers around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer
- */
-struct e1000_buffer {
-       dma_addr_t dma;
-       struct sk_buff *skb;
-       union {
-               /* Tx */
-               struct {
-                       unsigned long time_stamp;
-                       u16 length;
-                       u16 next_to_watch;
-                       unsigned int segs;
-                       unsigned int bytecount;
-                       u16 mapped_as_page;
-               };
-               /* Rx */
-               struct {
-                       /* arrays of page information for packet split */
-                       struct e1000_ps_page *ps_pages;
-                       struct page *page;
-               };
-       };
-};
-
-struct e1000_ring {
-       void *desc;                     /* pointer to ring memory  */
-       dma_addr_t dma;                 /* phys address of ring    */
-       unsigned int size;              /* length of ring in bytes */
-       unsigned int count;             /* number of desc. in ring */
-
-       u16 next_to_use;
-       u16 next_to_clean;
-
-       u16 head;
-       u16 tail;
-
-       /* array of buffer information structs */
-       struct e1000_buffer *buffer_info;
-
-       char name[IFNAMSIZ + 5];
-       u32 ims_val;
-       u32 itr_val;
-       u16 itr_register;
-       int set_itr;
-
-       struct sk_buff *rx_skb_top;
-};
-
-/* PHY register snapshot values */
-struct e1000_phy_regs {
-       u16 bmcr;               /* basic mode control register    */
-       u16 bmsr;               /* basic mode status register     */
-       u16 advertise;          /* auto-negotiation advertisement */
-       u16 lpa;                /* link partner ability register  */
-       u16 expansion;          /* auto-negotiation expansion reg */
-       u16 ctrl1000;           /* 1000BASE-T control register    */
-       u16 stat1000;           /* 1000BASE-T status register     */
-       u16 estatus;            /* extended status register       */
-};
-
-/* board specific private data structure */
-struct e1000_adapter {
-       struct timer_list watchdog_timer;
-       struct timer_list phy_info_timer;
-       struct timer_list blink_timer;
-
-       struct work_struct reset_task;
-       struct work_struct watchdog_task;
-
-       const struct e1000_info *ei;
-
-       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-       u32 bd_number;
-       u32 rx_buffer_len;
-       u16 mng_vlan_id;
-       u16 link_speed;
-       u16 link_duplex;
-       u16 eeprom_vers;
-
-       /* track device up/down/testing state */
-       unsigned long state;
-
-       /* Interrupt Throttle Rate */
-       u32 itr;
-       u32 itr_setting;
-       u16 tx_itr;
-       u16 rx_itr;
-
-       /*
-        * Tx
-        */
-       struct e1000_ring *tx_ring /* One per active queue */
-                                               ____cacheline_aligned_in_smp;
-
-       struct napi_struct napi;
-
-       unsigned int restart_queue;
-       u32 txd_cmd;
-
-       bool detect_tx_hung;
-       u8 tx_timeout_factor;
-
-       u32 tx_int_delay;
-       u32 tx_abs_int_delay;
-
-       unsigned int total_tx_bytes;
-       unsigned int total_tx_packets;
-       unsigned int total_rx_bytes;
-       unsigned int total_rx_packets;
-
-       /* Tx stats */
-       u64 tpt_old;
-       u64 colc_old;
-       u32 gotc;
-       u64 gotc_old;
-       u32 tx_timeout_count;
-       u32 tx_fifo_head;
-       u32 tx_head_addr;
-       u32 tx_fifo_size;
-       u32 tx_dma_failed;
-
-       /*
-        * Rx
-        */
-       bool (*clean_rx) (struct e1000_adapter *adapter,
-                         int *work_done, int work_to_do)
-                                               ____cacheline_aligned_in_smp;
-       void (*alloc_rx_buf) (struct e1000_adapter *adapter,
-                             int cleaned_count, gfp_t gfp);
-       struct e1000_ring *rx_ring;
-
-       u32 rx_int_delay;
-       u32 rx_abs_int_delay;
-
-       /* Rx stats */
-       u64 hw_csum_err;
-       u64 hw_csum_good;
-       u64 rx_hdr_split;
-       u32 gorc;
-       u64 gorc_old;
-       u32 alloc_rx_buff_failed;
-       u32 rx_dma_failed;
-
-       unsigned int rx_ps_pages;
-       u16 rx_ps_bsize0;
-       u32 max_frame_size;
-       u32 min_frame_size;
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-
-       /* structs defined in e1000_hw.h */
-       struct e1000_hw hw;
-
-       spinlock_t stats64_lock;
-       struct e1000_hw_stats stats;
-       struct e1000_phy_info phy_info;
-       struct e1000_phy_stats phy_stats;
-
-       /* Snapshot of PHY registers */
-       struct e1000_phy_regs phy_regs;
-
-       struct e1000_ring test_tx_ring;
-       struct e1000_ring test_rx_ring;
-       u32 test_icr;
-
-       u32 msg_enable;
-       unsigned int num_vectors;
-       struct msix_entry *msix_entries;
-       int int_mode;
-       u32 eiac_mask;
-
-       u32 eeprom_wol;
-       u32 wol;
-       u32 pba;
-       u32 max_hw_frame_size;
-
-       bool fc_autoneg;
-
-       unsigned int flags;
-       unsigned int flags2;
-       struct work_struct downshift_task;
-       struct work_struct update_phy_task;
-       struct work_struct print_hang_task;
-
-       bool idle_check;
-       int phy_hang_count;
-};
-
-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 *);
-       struct e1000_mac_operations *mac_ops;
-       struct e1000_phy_operations *phy_ops;
-       struct e1000_nvm_operations *nvm_ops;
-};
-
-/* 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_READ_ONLY_NVM                (1 << 8)
-#define FLAG_IS_ICH                       (1 << 9)
-#define FLAG_HAS_MSIX                     (1 << 10)
-#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 FLAG2_IS_DISCARDING               (1 << 2)
-#define FLAG2_DISABLE_ASPM_L1             (1 << 3)
-#define FLAG2_HAS_PHY_STATS               (1 << 4)
-#define FLAG2_HAS_EEE                     (1 << 5)
-#define FLAG2_DMA_BURST                   (1 << 6)
-#define FLAG2_DISABLE_ASPM_L0S            (1 << 7)
-#define FLAG2_DISABLE_AIM                 (1 << 8)
-#define FLAG2_CHECK_PHY_HANG              (1 << 9)
-
-#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 {
-       __E1000_TESTING,
-       __E1000_RESETTING,
-       __E1000_DOWN
-};
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-extern char e1000e_driver_name[];
-extern const char e1000e_driver_version[];
-
-extern void e1000e_check_options(struct e1000_adapter *adapter);
-extern void e1000e_set_ethtool_ops(struct net_device *netdev);
-
-extern int e1000e_up(struct e1000_adapter *adapter);
-extern void e1000e_down(struct e1000_adapter *adapter);
-extern void e1000e_reinit_locked(struct e1000_adapter *adapter);
-extern void e1000e_reset(struct e1000_adapter *adapter);
-extern void e1000e_power_up_phy(struct e1000_adapter *adapter);
-extern int e1000e_setup_rx_resources(struct e1000_adapter *adapter);
-extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
-extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
-extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
-extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
-                                                    struct rtnl_link_stats64
-                                                    *stats);
-extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
-extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);
-extern void e1000e_get_hw_control(struct e1000_adapter *adapter);
-extern void e1000e_release_hw_control(struct e1000_adapter *adapter);
-
-extern unsigned int copybreak;
-
-extern char *e1000e_get_hw_dev_name(struct e1000_hw *hw);
-
-extern struct e1000_info e1000_82571_info;
-extern struct e1000_info e1000_82572_info;
-extern struct e1000_info e1000_82573_info;
-extern struct e1000_info e1000_82574_info;
-extern struct e1000_info e1000_82583_info;
-extern struct e1000_info e1000_ich8_info;
-extern struct e1000_info e1000_ich9_info;
-extern struct e1000_info e1000_ich10_info;
-extern struct e1000_info e1000_pch_info;
-extern struct e1000_info e1000_pch2_info;
-extern struct e1000_info e1000_es2_info;
-
-extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
-                                        u32 pba_num_size);
-
-extern s32  e1000e_commit_phy(struct e1000_hw *hw);
-
-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_write_protect_nvm_ich8lan(struct e1000_hw *hw);
-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 e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw);
-extern void e1000_resume_workarounds_pchlan(struct e1000_hw *hw);
-extern s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable);
-extern s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable);
-extern void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw);
-
-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_setup_led_generic(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 void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
-extern void e1000_set_lan_id_single_port(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);
-extern void e1000_clear_vfta_generic(struct e1000_hw *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_generic(struct e1000_hw *hw);
-extern void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
-extern s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw);
-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 s32 e1000e_get_phy_id(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);
-extern s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw);
-extern s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw);
-extern s32 e1000e_get_phy_info_igp(struct e1000_hw *hw);
-extern s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page);
-extern s32 e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
-extern s32 e1000e_read_phy_reg_igp_locked(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_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset,
-                                           u16 data);
-extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw);
-extern s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);
-extern s32 e1000e_get_cfg_done(struct e1000_hw *hw);
-extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);
-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 s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw);
-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);
-extern s32 e1000_enable_phy_wakeup_reg_access_bm(struct e1000_hw *hw,
-                                                u16 *phy_reg);
-extern s32 e1000_disable_phy_wakeup_reg_access_bm(struct e1000_hw *hw,
-                                                 u16 *phy_reg);
-extern s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data);
-extern s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);
-extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
-extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
-extern s32 e1000e_write_kmrn_reg_locked(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_read_kmrn_reg_locked(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 void e1000_power_up_phy_copper(struct e1000_hw *hw);
-extern void e1000_power_down_phy_copper(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);
-extern s32 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data);
-extern s32 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
-                                        u16 *data);
-extern s32 e1000_read_phy_reg_page_hv(struct e1000_hw *hw, u32 offset,
-                                     u16 *data);
-extern s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);
-extern s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
-                                         u16 data);
-extern s32 e1000_write_phy_reg_page_hv(struct e1000_hw *hw, u32 offset,
-                                      u16 data);
-extern s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw);
-extern s32 e1000_copper_link_setup_82577(struct e1000_hw *hw);
-extern s32 e1000_check_polarity_82577(struct e1000_hw *hw);
-extern s32 e1000_get_phy_info_82577(struct e1000_hw *hw);
-extern s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw);
-extern s32 e1000_get_cable_length_82577(struct e1000_hw *hw);
-
-extern s32 e1000_check_polarity_m88(struct e1000_hw *hw);
-extern s32 e1000_get_phy_info_ife(struct e1000_hw *hw);
-extern s32 e1000_check_polarity_ife(struct e1000_hw *hw);
-extern s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw);
-extern s32 e1000_check_polarity_igp(struct e1000_hw *hw);
-extern bool e1000_check_phy_82574(struct e1000_hw *hw);
-
-static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw)
-{
-       return hw->phy.ops.reset(hw);
-}
-
-static inline s32 e1000_check_reset_block(struct e1000_hw *hw)
-{
-       return hw->phy.ops.check_reset_block(hw);
-}
-
-static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return hw->phy.ops.read_reg(hw, offset, data);
-}
-
-static inline s32 e1e_wphy(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return hw->phy.ops.write_reg(hw, offset, data);
-}
-
-static inline s32 e1000_get_cable_length(struct e1000_hw *hw)
-{
-       return hw->phy.ops.get_cable_length(hw);
-}
-
-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);
-extern void e1000e_reload_nvm(struct e1000_hw *hw);
-extern s32 e1000_read_mac_addr_generic(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 e1000_read_mac_addr_generic(hw);
-}
-
-static inline s32 e1000_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 e1000_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       return hw->nvm.ops.read(hw, offset, words, data);
-}
-
-static inline s32 e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       return hw->nvm.ops.write(hw, offset, words, data);
-}
-
-static inline s32 e1000_get_phy_info(struct e1000_hw *hw)
-{
-       return hw->phy.ops.get_info(hw);
-}
-
-static inline s32 e1000e_check_mng_mode(struct e1000_hw *hw)
-{
-       return hw->mac.ops.check_mng_mode(hw);
-}
-
-extern bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);
-extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);
-extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);
-
-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);
-}
-
-#endif /* _E1000_H_ */
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
deleted file mode 100644 (file)
index e4f4225..0000000
+++ /dev/null
@@ -1,1516 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-/*
- * 80003ES2LAN Gigabit Ethernet Controller (Copper)
- * 80003ES2LAN Gigabit Ethernet Controller (Serdes)
- */
-
-#include "e1000.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 Disab. */
-#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_25                 0x0007
-
-#define GG82563_MSCR_ASSERT_CRS_ON_TX           0x0010 /* 1=Assert */
-
-/* DSP Distance Register (Page 5, Register 26) */
-#define GG82563_DSPD_CABLE_LENGTH               0x0007 /* 0 = <50M
-                                                          1 = 50-80M
-                                                          2 = 80-110M
-                                                          3 = 110-140M
-                                                          4 = >140M */
-
-/* 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 */
-
-/*
- * 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 \
-               ARRAY_SIZE(e1000_gg82563_cable_length_table)
-
-static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw);
-static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
-static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
-static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw);
-static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw);
-static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw);
-static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex);
-static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw);
-static s32  e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                            u16 *data);
-static s32  e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                             u16 data);
-static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw);
-
-/**
- *  e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               phy->type       = e1000_phy_none;
-               return 0;
-       } else {
-               phy->ops.power_up = e1000_power_up_phy_copper;
-               phy->ops.power_down = e1000_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;
-
-       /* 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)
-               return -E1000_ERR_PHY;
-
-       return ret_val;
-}
-
-/**
- *  e1000_init_nvm_params_80003es2lan - Init ESB2 NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_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;
-
-       return 0;
-}
-
-/**
- *  e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_mac_operations *func = &mac->ops;
-
-       /* Set media type */
-       switch (adapter->pdev->device) {
-       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;
-       /* FWSM register */
-       mac->has_fwsm = true;
-       /* ARC supported; valid only if manageability features are enabled. */
-       mac->arc_subsystem_valid =
-               (er32(FWSM) & E1000_FWSM_MODE_MASK)
-                       ? true : false;
-       /* Adaptive IFS not supported */
-       mac->adaptive_ifs = false;
-
-       /* check for link */
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
-               func->check_for_link = e1000e_check_for_copper_link;
-               break;
-       case e1000_media_type_fiber:
-               func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
-               func->check_for_link = e1000e_check_for_fiber_link;
-               break;
-       case e1000_media_type_internal_serdes:
-               func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
-               func->check_for_link = e1000e_check_for_serdes_link;
-               break;
-       default:
-               return -E1000_ERR_CONFIG;
-               break;
-       }
-
-       /* set lan id for port to determine which phy lock to use */
-       hw->mac.ops.set_lan_id(hw);
-
-       return 0;
-}
-
-static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       s32 rc;
-
-       rc = e1000_init_mac_params_80003es2lan(adapter);
-       if (rc)
-               return rc;
-
-       rc = e1000_init_nvm_params_80003es2lan(hw);
-       if (rc)
-               return rc;
-
-       rc = e1000_init_phy_params_80003es2lan(hw);
-       if (rc)
-               return rc;
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM;
-       return e1000_acquire_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000_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 e1000_release_phy_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM;
-       e1000_release_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000_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 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = E1000_SWFW_CSR_SM;
-
-       return e1000_acquire_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000_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 e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = E1000_SWFW_CSR_SM;
-
-       e1000_release_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000_acquire_nvm_80003es2lan - Acquire rights to access NVM
- *  @hw: pointer to the HW structure
- *
- *  Acquire the semaphore to access the EEPROM.
- **/
-static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       ret_val = e1000_acquire_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000e_acquire_nvm(hw);
-
-       if (ret_val)
-               e1000_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
-
-       return ret_val;
-}
-
-/**
- *  e1000_release_nvm_80003es2lan - Relinquish rights to access NVM
- *  @hw: pointer to the HW structure
- *
- *  Release the semaphore used to access the EEPROM.
- **/
-static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw)
-{
-       e1000e_release_nvm(hw);
-       e1000_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
-}
-
-/**
- *  e1000_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 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-       u32 swmask = mask;
-       u32 fwmask = mask << 16;
-       s32 i = 0;
-       s32 timeout = 50;
-
-       while (i < timeout) {
-               if (e1000e_get_hw_semaphore(hw))
-                       return -E1000_ERR_SWFW_SYNC;
-
-               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");
-               return -E1000_ERR_SWFW_SYNC;
-       }
-
-       swfw_sync |= swmask;
-       ew32(SW_FW_SYNC, swfw_sync);
-
-       e1000e_put_hw_semaphore(hw);
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-
-       while (e1000e_get_hw_semaphore(hw) != 0)
-               ; /* Empty */
-
-       swfw_sync = er32(SW_FW_SYNC);
-       swfw_sync &= ~mask;
-       ew32(SW_FW_SYNC, swfw_sync);
-
-       e1000e_put_hw_semaphore(hw);
-}
-
-/**
- *  e1000_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 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
-                                                 u32 offset, u16 *data)
-{
-       s32 ret_val;
-       u32 page_select;
-       u16 temp;
-
-       ret_val = e1000_acquire_phy_80003es2lan(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* 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) {
-               e1000_release_phy_80003es2lan(hw);
-               return ret_val;
-       }
-
-       if (hw->dev_spec.e80003es2lan.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;
-                       e1000_release_phy_80003es2lan(hw);
-                       return ret_val;
-               }
-
-               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);
-       }
-
-       e1000_release_phy_80003es2lan(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
-                                                  u32 offset, u16 data)
-{
-       s32 ret_val;
-       u32 page_select;
-       u16 temp;
-
-       ret_val = e1000_acquire_phy_80003es2lan(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* 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) {
-               e1000_release_phy_80003es2lan(hw);
-               return ret_val;
-       }
-
-       if (hw->dev_spec.e80003es2lan.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) {
-                       e1000_release_phy_80003es2lan(hw);
-                       return -E1000_ERR_PHY;
-               }
-
-               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);
-       }
-
-       e1000_release_phy_80003es2lan(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset,
-                                      u16 words, u16 *data)
-{
-       return e1000e_write_nvm_spi(hw, offset, words, data);
-}
-
-/**
- *  e1000_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 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw)
-{
-       s32 timeout = PHY_CFG_TIMEOUT;
-       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;
-               usleep_range(1000, 2000);
-               timeout--;
-       }
-       if (!timeout) {
-               e_dbg("MNG configuration cycle has not completed.\n");
-               return -E1000_ERR_RESET;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
-{
-       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)
-               return ret_val;
-
-       phy_data &= ~GG82563_PSCR_CROSSOVER_MODE_AUTO;
-       ret_val = e1e_wphy(hw, GG82563_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       e_dbg("GG82563 PSCR: %X\n", phy_data);
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       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)
-               return ret_val;
-
-       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)
-                       return ret_val;
-
-               if (!link) {
-                       /*
-                        * We didn't get link.
-                        * Reset the DSP and cross our fingers.
-                        */
-                       ret_val = e1000e_phy_reset_dsp(hw);
-                       if (ret_val)
-                               return ret_val;
-               }
-
-               /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       ret_val = e1e_rphy(hw, GG82563_PHY_MAC_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       /*
-        * 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);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = 0;
-       u16 phy_data, index;
-
-       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;
-}
-
-/**
- *  e1000_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 e1000_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;
-}
-
-/**
- *  e1000_reset_hw_80003es2lan - Reset the ESB2 controller
- *  @hw: pointer to the HW structure
- *
- *  Perform a global reset to the ESB2 controller.
- **/
-static s32 e1000_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();
-
-       usleep_range(10000, 20000);
-
-       ctrl = er32(CTRL);
-
-       ret_val = e1000_acquire_phy_80003es2lan(hw);
-       e_dbg("Issuing a global reset to MAC\n");
-       ew32(CTRL, ctrl | E1000_CTRL_RST);
-       e1000_release_phy_80003es2lan(hw);
-
-       ret_val = e1000e_get_auto_rd_done(hw);
-       if (ret_val)
-               /* We don't want to continue accessing MAC registers. */
-               return ret_val;
-
-       /* Clear any pending interrupt events. */
-       ew32(IMC, 0xffffffff);
-       er32(ICR);
-
-       ret_val = e1000_check_alt_mac_addr_generic(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 reg_data;
-       s32 ret_val;
-       u16 kum_reg_data;
-       u16 i;
-
-       e1000_initialize_hw_bits_80003es2lan(hw);
-
-       /* Initialize identification LED */
-       ret_val = e1000e_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");
-       mac->ops.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 = e1000e_setup_link(hw);
-
-       /* Disable IBIST slave mode (far-end loopback) */
-       e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                       &kum_reg_data);
-       kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
-       e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                        kum_reg_data);
-
-       /* 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.e80003es2lan.mdic_wa_enable = true;
-
-       ret_val = e1000_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.e80003es2lan.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.
-        */
-       e1000_clear_hw_cntrs_80003es2lan(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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);
-}
-
-/**
- *  e1000_copper_link_setup_gg82563_80003es2lan - Configure GG82563 Link
- *  @hw: pointer to the HW structure
- *
- *  Setup some GG82563 PHY registers for obtaining link
- **/
-static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u32 ctrl_ext;
-       u16 data;
-
-       ret_val = e1e_rphy(hw, GG82563_PHY_MAC_SPEC_CTRL, &data);
-       if (ret_val)
-               return ret_val;
-
-       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)
-               return ret_val;
-
-       /*
-        * 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)
-               return ret_val;
-
-       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)
-               return ret_val;
-
-       /* 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");
-               return ret_val;
-       }
-
-       /* Bypass Rx and Tx FIFO's */
-       ret_val = e1000_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)
-               return ret_val;
-
-       ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
-                                      &data);
-       if (ret_val)
-               return ret_val;
-       data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE;
-       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
-                                       data);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1e_rphy(hw, GG82563_PHY_SPEC_CTRL_2, &data);
-       if (ret_val)
-               return ret_val;
-
-       data &= ~GG82563_PSCR2_REVERSE_AUTO_NEG;
-       ret_val = e1e_wphy(hw, GG82563_PHY_SPEC_CTRL_2, data);
-       if (ret_val)
-               return ret_val;
-
-       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)
-               return ret_val;
-
-       /*
-        * 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 (!e1000e_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)
-                       return ret_val;
-
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL, &data);
-               if (ret_val)
-                       return ret_val;
-
-               data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-               ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, data);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /*
-        * 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)
-               return ret_val;
-
-       data |= GG82563_ICR_DIS_PADDING;
-       ret_val = e1e_wphy(hw, GG82563_PHY_INBAND_CTRL, data);
-       if (ret_val)
-               return ret_val;
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_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 = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4),
-                                                  0xFFFF);
-       if (ret_val)
-               return ret_val;
-       ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
-                                                 &reg_data);
-       if (ret_val)
-               return ret_val;
-       reg_data |= 0x3F;
-       ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
-                                                  reg_data);
-       if (ret_val)
-               return ret_val;
-       ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-                                     E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                     &reg_data);
-       if (ret_val)
-               return ret_val;
-       reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING;
-       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                       reg_data);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000_copper_link_setup_gg82563_80003es2lan(hw);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000e_setup_copper_link(hw);
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       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)
-                       return ret_val;
-
-               if (speed == SPEED_1000)
-                       ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw);
-               else
-                       ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, duplex);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
-{
-       s32 ret_val;
-       u32 tipg;
-       u32 i = 0;
-       u16 reg_data, reg_data2;
-
-       reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;
-       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                      reg_data);
-       if (ret_val)
-               return ret_val;
-
-       /* 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)
-                       return ret_val;
-
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL, &reg_data2);
-               if (ret_val)
-                       return ret_val;
-               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);
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 reg_data, reg_data2;
-       u32 tipg;
-       u32 i = 0;
-
-       reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
-       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                      reg_data);
-       if (ret_val)
-               return ret_val;
-
-       /* 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)
-                       return ret_val;
-
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL, &reg_data2);
-               if (ret_val)
-                       return ret_val;
-               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);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                          u16 *data)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = 0;
-
-       ret_val = e1000_acquire_mac_csr_80003es2lan(hw);
-       if (ret_val)
-               return ret_val;
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
-       ew32(KMRNCTRLSTA, kmrnctrlsta);
-       e1e_flush();
-
-       udelay(2);
-
-       kmrnctrlsta = er32(KMRNCTRLSTA);
-       *data = (u16)kmrnctrlsta;
-
-       e1000_release_mac_csr_80003es2lan(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                           u16 data)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = 0;
-
-       ret_val = e1000_acquire_mac_csr_80003es2lan(hw);
-       if (ret_val)
-               return ret_val;
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | data;
-       ew32(KMRNCTRLSTA, kmrnctrlsta);
-       e1e_flush();
-
-       udelay(2);
-
-       e1000_release_mac_csr_80003es2lan(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_read_mac_addr_80003es2lan - Read device MAC address
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-
-       /*
-        * If there's an alternate MAC address place it in RAR0
-        * so that it will override the Si installed default perm
-        * address.
-        */
-       ret_val = e1000_check_alt_mac_addr_generic(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_read_mac_addr_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_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 e1000_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) ||
-             hw->phy.ops.check_reset_block(hw)))
-               e1000_power_down_phy_copper(hw);
-}
-
-/**
- *  e1000_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 e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
-{
-       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);
-}
-
-static struct e1000_mac_operations es2_mac_ops = {
-       .read_mac_addr          = e1000_read_mac_addr_80003es2lan,
-       .id_led_init            = e1000e_id_led_init,
-       .blink_led              = e1000e_blink_led_generic,
-       .check_mng_mode         = e1000e_check_mng_mode_generic,
-       /* check_for_link dependent on media type */
-       .cleanup_led            = e1000e_cleanup_led_generic,
-       .clear_hw_cntrs         = e1000_clear_hw_cntrs_80003es2lan,
-       .get_bus_info           = e1000e_get_bus_info_pcie,
-       .set_lan_id             = e1000_set_lan_id_multi_port_pcie,
-       .get_link_up_info       = e1000_get_link_up_info_80003es2lan,
-       .led_on                 = e1000e_led_on_generic,
-       .led_off                = e1000e_led_off_generic,
-       .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
-       .write_vfta             = e1000_write_vfta_generic,
-       .clear_vfta             = e1000_clear_vfta_generic,
-       .reset_hw               = e1000_reset_hw_80003es2lan,
-       .init_hw                = e1000_init_hw_80003es2lan,
-       .setup_link             = e1000e_setup_link,
-       /* setup_physical_interface dependent on media type */
-       .setup_led              = e1000e_setup_led_generic,
-};
-
-static struct e1000_phy_operations es2_phy_ops = {
-       .acquire                = e1000_acquire_phy_80003es2lan,
-       .check_polarity         = e1000_check_polarity_m88,
-       .check_reset_block      = e1000e_check_reset_block_generic,
-       .commit                 = e1000e_phy_sw_reset,
-       .force_speed_duplex     = e1000_phy_force_speed_duplex_80003es2lan,
-       .get_cfg_done           = e1000_get_cfg_done_80003es2lan,
-       .get_cable_length       = e1000_get_cable_length_80003es2lan,
-       .get_info               = e1000e_get_phy_info_m88,
-       .read_reg               = e1000_read_phy_reg_gg82563_80003es2lan,
-       .release                = e1000_release_phy_80003es2lan,
-       .reset                  = e1000e_phy_hw_reset_generic,
-       .set_d0_lplu_state      = NULL,
-       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
-       .write_reg              = e1000_write_phy_reg_gg82563_80003es2lan,
-       .cfg_on_link_up         = e1000_cfg_on_link_up_80003es2lan,
-};
-
-static struct e1000_nvm_operations es2_nvm_ops = {
-       .acquire                = e1000_acquire_nvm_80003es2lan,
-       .read                   = e1000e_read_nvm_eerd,
-       .release                = e1000_release_nvm_80003es2lan,
-       .update                 = e1000e_update_nvm_checksum_generic,
-       .valid_led_default      = e1000e_valid_led_default,
-       .validate               = e1000e_validate_nvm_checksum_generic,
-       .write                  = e1000_write_nvm_80003es2lan,
-};
-
-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,
-       .flags2                 = FLAG2_DMA_BURST,
-       .pba                    = 38,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .get_variants           = e1000_get_variants_80003es2lan,
-       .mac_ops                = &es2_mac_ops,
-       .phy_ops                = &es2_phy_ops,
-       .nvm_ops                = &es2_nvm_ops,
-};
-
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
deleted file mode 100644 (file)
index 06d88f3..0000000
+++ /dev/null
@@ -1,2081 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-/* ethtool support for e1000 */
-
-#include <linux/netdevice.h>
-#include <linux/interrupt.h>
-#include <linux/ethtool.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-
-#include "e1000.h"
-
-enum {NETDEV_STATS, E1000_STATS};
-
-struct e1000_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int type;
-       int sizeof_stat;
-       int stat_offset;
-};
-
-#define E1000_STAT(str, m) { \
-               .stat_string = str, \
-               .type = E1000_STATS, \
-               .sizeof_stat = sizeof(((struct e1000_adapter *)0)->m), \
-               .stat_offset = offsetof(struct e1000_adapter, m) }
-#define E1000_NETDEV_STAT(str, m) { \
-               .stat_string = str, \
-               .type = NETDEV_STATS, \
-               .sizeof_stat = sizeof(((struct rtnl_link_stats64 *)0)->m), \
-               .stat_offset = offsetof(struct rtnl_link_stats64, m) }
-
-static const struct e1000_stats e1000_gstrings_stats[] = {
-       E1000_STAT("rx_packets", stats.gprc),
-       E1000_STAT("tx_packets", stats.gptc),
-       E1000_STAT("rx_bytes", stats.gorc),
-       E1000_STAT("tx_bytes", stats.gotc),
-       E1000_STAT("rx_broadcast", stats.bprc),
-       E1000_STAT("tx_broadcast", stats.bptc),
-       E1000_STAT("rx_multicast", stats.mprc),
-       E1000_STAT("tx_multicast", stats.mptc),
-       E1000_NETDEV_STAT("rx_errors", rx_errors),
-       E1000_NETDEV_STAT("tx_errors", tx_errors),
-       E1000_NETDEV_STAT("tx_dropped", tx_dropped),
-       E1000_STAT("multicast", stats.mprc),
-       E1000_STAT("collisions", stats.colc),
-       E1000_NETDEV_STAT("rx_length_errors", rx_length_errors),
-       E1000_NETDEV_STAT("rx_over_errors", rx_over_errors),
-       E1000_STAT("rx_crc_errors", stats.crcerrs),
-       E1000_NETDEV_STAT("rx_frame_errors", rx_frame_errors),
-       E1000_STAT("rx_no_buffer_count", stats.rnbc),
-       E1000_STAT("rx_missed_errors", stats.mpc),
-       E1000_STAT("tx_aborted_errors", stats.ecol),
-       E1000_STAT("tx_carrier_errors", stats.tncrs),
-       E1000_NETDEV_STAT("tx_fifo_errors", tx_fifo_errors),
-       E1000_NETDEV_STAT("tx_heartbeat_errors", tx_heartbeat_errors),
-       E1000_STAT("tx_window_errors", stats.latecol),
-       E1000_STAT("tx_abort_late_coll", stats.latecol),
-       E1000_STAT("tx_deferred_ok", stats.dc),
-       E1000_STAT("tx_single_coll_ok", stats.scc),
-       E1000_STAT("tx_multi_coll_ok", stats.mcc),
-       E1000_STAT("tx_timeout_count", tx_timeout_count),
-       E1000_STAT("tx_restart_queue", restart_queue),
-       E1000_STAT("rx_long_length_errors", stats.roc),
-       E1000_STAT("rx_short_length_errors", stats.ruc),
-       E1000_STAT("rx_align_errors", stats.algnerrc),
-       E1000_STAT("tx_tcp_seg_good", stats.tsctc),
-       E1000_STAT("tx_tcp_seg_failed", stats.tsctfc),
-       E1000_STAT("rx_flow_control_xon", stats.xonrxc),
-       E1000_STAT("rx_flow_control_xoff", stats.xoffrxc),
-       E1000_STAT("tx_flow_control_xon", stats.xontxc),
-       E1000_STAT("tx_flow_control_xoff", stats.xofftxc),
-       E1000_STAT("rx_long_byte_count", stats.gorc),
-       E1000_STAT("rx_csum_offload_good", hw_csum_good),
-       E1000_STAT("rx_csum_offload_errors", hw_csum_err),
-       E1000_STAT("rx_header_split", rx_hdr_split),
-       E1000_STAT("alloc_rx_buff_failed", alloc_rx_buff_failed),
-       E1000_STAT("tx_smbus", stats.mgptc),
-       E1000_STAT("rx_smbus", stats.mgprc),
-       E1000_STAT("dropped_smbus", stats.mgpdc),
-       E1000_STAT("rx_dma_failed", rx_dma_failed),
-       E1000_STAT("tx_dma_failed", tx_dma_failed),
-};
-
-#define E1000_GLOBAL_STATS_LEN ARRAY_SIZE(e1000_gstrings_stats)
-#define E1000_STATS_LEN (E1000_GLOBAL_STATS_LEN)
-static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Register test  (offline)", "Eeprom test    (offline)",
-       "Interrupt test (offline)", "Loopback test  (offline)",
-       "Link test   (on/offline)"
-};
-#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
-
-static int e1000_get_settings(struct net_device *netdev,
-                             struct ethtool_cmd *ecmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 speed;
-
-       if (hw->phy.media_type == e1000_media_type_copper) {
-
-               ecmd->supported = (SUPPORTED_10baseT_Half |
-                                  SUPPORTED_10baseT_Full |
-                                  SUPPORTED_100baseT_Half |
-                                  SUPPORTED_100baseT_Full |
-                                  SUPPORTED_1000baseT_Full |
-                                  SUPPORTED_Autoneg |
-                                  SUPPORTED_TP);
-               if (hw->phy.type == e1000_phy_ife)
-                       ecmd->supported &= ~SUPPORTED_1000baseT_Full;
-               ecmd->advertising = ADVERTISED_TP;
-
-               if (hw->mac.autoneg == 1) {
-                       ecmd->advertising |= ADVERTISED_Autoneg;
-                       /* the e1000 autoneg seems to match ethtool nicely */
-                       ecmd->advertising |= hw->phy.autoneg_advertised;
-               }
-
-               ecmd->port = PORT_TP;
-               ecmd->phy_address = hw->phy.addr;
-               ecmd->transceiver = XCVR_INTERNAL;
-
-       } else {
-               ecmd->supported   = (SUPPORTED_1000baseT_Full |
-                                    SUPPORTED_FIBRE |
-                                    SUPPORTED_Autoneg);
-
-               ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg);
-
-               ecmd->port = PORT_FIBRE;
-               ecmd->transceiver = XCVR_EXTERNAL;
-       }
-
-       speed = -1;
-       ecmd->duplex = -1;
-
-       if (netif_running(netdev)) {
-               if (netif_carrier_ok(netdev)) {
-                       speed = adapter->link_speed;
-                       ecmd->duplex = adapter->link_duplex - 1;
-               }
-       } else {
-               u32 status = er32(STATUS);
-               if (status & E1000_STATUS_LU) {
-                       if (status & E1000_STATUS_SPEED_1000)
-                               speed = SPEED_1000;
-                       else if (status & E1000_STATUS_SPEED_100)
-                               speed = SPEED_100;
-                       else
-                               speed = SPEED_10;
-
-                       if (status & E1000_STATUS_FD)
-                               ecmd->duplex = DUPLEX_FULL;
-                       else
-                               ecmd->duplex = DUPLEX_HALF;
-               }
-       }
-
-       ethtool_cmd_speed_set(ecmd, speed);
-       ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) ||
-                        hw->mac.autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
-
-       /* MDI-X => 2; MDI =>1; Invalid =>0 */
-       if ((hw->phy.media_type == e1000_media_type_copper) &&
-           netif_carrier_ok(netdev))
-               ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X :
-                                                     ETH_TP_MDI;
-       else
-               ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;
-
-       return 0;
-}
-
-static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
-{
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-
-       mac->autoneg = 0;
-
-       /* Make sure dplx is at most 1 bit and lsb of speed is not set
-        * for the switch() below to work */
-       if ((spd & 1) || (dplx & ~1))
-               goto err_inval;
-
-       /* Fiber NICs only allow 1000 gbps Full duplex */
-       if ((adapter->hw.phy.media_type == e1000_media_type_fiber) &&
-           spd != SPEED_1000 &&
-           dplx != DUPLEX_FULL) {
-               goto err_inval;
-       }
-
-       switch (spd + dplx) {
-       case SPEED_10 + DUPLEX_HALF:
-               mac->forced_speed_duplex = ADVERTISE_10_HALF;
-               break;
-       case SPEED_10 + DUPLEX_FULL:
-               mac->forced_speed_duplex = ADVERTISE_10_FULL;
-               break;
-       case SPEED_100 + DUPLEX_HALF:
-               mac->forced_speed_duplex = ADVERTISE_100_HALF;
-               break;
-       case SPEED_100 + DUPLEX_FULL:
-               mac->forced_speed_duplex = ADVERTISE_100_FULL;
-               break;
-       case SPEED_1000 + DUPLEX_FULL:
-               mac->autoneg = 1;
-               adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
-       case SPEED_1000 + DUPLEX_HALF: /* not supported */
-       default:
-               goto err_inval;
-       }
-       return 0;
-
-err_inval:
-       e_err("Unsupported Speed/Duplex configuration\n");
-       return -EINVAL;
-}
-
-static int e1000_set_settings(struct net_device *netdev,
-                             struct ethtool_cmd *ecmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       /*
-        * When SoL/IDER sessions are active, autoneg/speed/duplex
-        * cannot be changed
-        */
-       if (e1000_check_reset_block(hw)) {
-               e_err("Cannot change link characteristics when SoL/IDER is "
-                     "active.\n");
-               return -EINVAL;
-       }
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
-               usleep_range(1000, 2000);
-
-       if (ecmd->autoneg == AUTONEG_ENABLE) {
-               hw->mac.autoneg = 1;
-               if (hw->phy.media_type == e1000_media_type_fiber)
-                       hw->phy.autoneg_advertised = ADVERTISED_1000baseT_Full |
-                                                    ADVERTISED_FIBRE |
-                                                    ADVERTISED_Autoneg;
-               else
-                       hw->phy.autoneg_advertised = ecmd->advertising |
-                                                    ADVERTISED_TP |
-                                                    ADVERTISED_Autoneg;
-               ecmd->advertising = hw->phy.autoneg_advertised;
-               if (adapter->fc_autoneg)
-                       hw->fc.requested_mode = e1000_fc_default;
-       } else {
-               u32 speed = ethtool_cmd_speed(ecmd);
-               if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {
-                       clear_bit(__E1000_RESETTING, &adapter->state);
-                       return -EINVAL;
-               }
-       }
-
-       /* reset the link */
-
-       if (netif_running(adapter->netdev)) {
-               e1000e_down(adapter);
-               e1000e_up(adapter);
-       } else {
-               e1000e_reset(adapter);
-       }
-
-       clear_bit(__E1000_RESETTING, &adapter->state);
-       return 0;
-}
-
-static void e1000_get_pauseparam(struct net_device *netdev,
-                                struct ethtool_pauseparam *pause)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       pause->autoneg =
-               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
-
-       if (hw->fc.current_mode == e1000_fc_rx_pause) {
-               pause->rx_pause = 1;
-       } else if (hw->fc.current_mode == e1000_fc_tx_pause) {
-               pause->tx_pause = 1;
-       } else if (hw->fc.current_mode == e1000_fc_full) {
-               pause->rx_pause = 1;
-               pause->tx_pause = 1;
-       }
-}
-
-static int e1000_set_pauseparam(struct net_device *netdev,
-                               struct ethtool_pauseparam *pause)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int retval = 0;
-
-       adapter->fc_autoneg = pause->autoneg;
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
-               usleep_range(1000, 2000);
-
-       if (adapter->fc_autoneg == AUTONEG_ENABLE) {
-               hw->fc.requested_mode = e1000_fc_default;
-               if (netif_running(adapter->netdev)) {
-                       e1000e_down(adapter);
-                       e1000e_up(adapter);
-               } else {
-                       e1000e_reset(adapter);
-               }
-       } else {
-               if (pause->rx_pause && pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_full;
-               else if (pause->rx_pause && !pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_rx_pause;
-               else if (!pause->rx_pause && pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_tx_pause;
-               else if (!pause->rx_pause && !pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_none;
-
-               hw->fc.current_mode = hw->fc.requested_mode;
-
-               if (hw->phy.media_type == e1000_media_type_fiber) {
-                       retval = hw->mac.ops.setup_link(hw);
-                       /* implicit goto out */
-               } else {
-                       retval = e1000e_force_mac_fc(hw);
-                       if (retval)
-                               goto out;
-                       e1000e_set_fc_watermarks(hw);
-               }
-       }
-
-out:
-       clear_bit(__E1000_RESETTING, &adapter->state);
-       return retval;
-}
-
-static u32 e1000_get_rx_csum(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       return adapter->flags & FLAG_RX_CSUM_ENABLED;
-}
-
-static int e1000_set_rx_csum(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (data)
-               adapter->flags |= FLAG_RX_CSUM_ENABLED;
-       else
-               adapter->flags &= ~FLAG_RX_CSUM_ENABLED;
-
-       if (netif_running(netdev))
-               e1000e_reinit_locked(adapter);
-       else
-               e1000e_reset(adapter);
-       return 0;
-}
-
-static u32 e1000_get_tx_csum(struct net_device *netdev)
-{
-       return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
-static int e1000_set_tx_csum(struct net_device *netdev, u32 data)
-{
-       if (data)
-               netdev->features |= NETIF_F_HW_CSUM;
-       else
-               netdev->features &= ~NETIF_F_HW_CSUM;
-
-       return 0;
-}
-
-static int e1000_set_tso(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (data) {
-               netdev->features |= NETIF_F_TSO;
-               netdev->features |= NETIF_F_TSO6;
-       } else {
-               netdev->features &= ~NETIF_F_TSO;
-               netdev->features &= ~NETIF_F_TSO6;
-       }
-
-       adapter->flags |= FLAG_TSO_FORCE;
-       return 0;
-}
-
-static u32 e1000_get_msglevel(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void e1000_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-
-static int e1000_get_regs_len(struct net_device *netdev)
-{
-#define E1000_REGS_LEN 32 /* overestimate */
-       return E1000_REGS_LEN * sizeof(u32);
-}
-
-static void e1000_get_regs(struct net_device *netdev,
-                          struct ethtool_regs *regs, void *p)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 *regs_buff = p;
-       u16 phy_data;
-
-       memset(p, 0, E1000_REGS_LEN * sizeof(u32));
-
-       regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
-                       adapter->pdev->device;
-
-       regs_buff[0]  = er32(CTRL);
-       regs_buff[1]  = er32(STATUS);
-
-       regs_buff[2]  = er32(RCTL);
-       regs_buff[3]  = er32(RDLEN);
-       regs_buff[4]  = er32(RDH);
-       regs_buff[5]  = er32(RDT);
-       regs_buff[6]  = er32(RDTR);
-
-       regs_buff[7]  = er32(TCTL);
-       regs_buff[8]  = er32(TDLEN);
-       regs_buff[9]  = er32(TDH);
-       regs_buff[10] = er32(TDT);
-       regs_buff[11] = er32(TIDV);
-
-       regs_buff[12] = adapter->hw.phy.type;  /* PHY type (IGP=1, M88=0) */
-
-       /* ethtool doesn't use anything past this point, so all this
-        * code is likely legacy junk for apps that may or may not
-        * exist */
-       if (hw->phy.type == e1000_phy_m88) {
-               e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-               regs_buff[13] = (u32)phy_data; /* cable length */
-               regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-               regs_buff[17] = (u32)phy_data; /* extended 10bt distance */
-               regs_buff[18] = regs_buff[13]; /* cable polarity */
-               regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[20] = regs_buff[17]; /* polarity correction */
-               /* phy receive errors */
-               regs_buff[22] = adapter->phy_stats.receive_errors;
-               regs_buff[23] = regs_buff[13]; /* mdix mode */
-       }
-       regs_buff[21] = 0; /* was idle_errors */
-       e1e_rphy(hw, PHY_1000T_STATUS, &phy_data);
-       regs_buff[24] = (u32)phy_data;  /* phy local receiver status */
-       regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
-}
-
-static int e1000_get_eeprom_len(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       return adapter->hw.nvm.word_size * 2;
-}
-
-static int e1000_get_eeprom(struct net_device *netdev,
-                           struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       int first_word;
-       int last_word;
-       int ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EINVAL;
-
-       eeprom->magic = adapter->pdev->vendor | (adapter->pdev->device << 16);
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-
-       eeprom_buff = kmalloc(sizeof(u16) *
-                       (last_word - first_word + 1), GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       if (hw->nvm.type == e1000_nvm_eeprom_spi) {
-               ret_val = e1000_read_nvm(hw, first_word,
-                                        last_word - first_word + 1,
-                                        eeprom_buff);
-       } else {
-               for (i = 0; i < last_word - first_word + 1; i++) {
-                       ret_val = e1000_read_nvm(hw, first_word + i, 1,
-                                                     &eeprom_buff[i]);
-                       if (ret_val)
-                               break;
-               }
-       }
-
-       if (ret_val) {
-               /* a read error occurred, throw away the result */
-               memset(eeprom_buff, 0xff, sizeof(u16) *
-                      (last_word - first_word + 1));
-       } else {
-               /* Device's eeprom is always little-endian, word addressable */
-               for (i = 0; i < last_word - first_word + 1; i++)
-                       le16_to_cpus(&eeprom_buff[i]);
-       }
-
-       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
-       kfree(eeprom_buff);
-
-       return ret_val;
-}
-
-static int e1000_set_eeprom(struct net_device *netdev,
-                           struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       void *ptr;
-       int max_len;
-       int first_word;
-       int last_word;
-       int ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EOPNOTSUPP;
-
-       if (eeprom->magic != (adapter->pdev->vendor | (adapter->pdev->device << 16)))
-               return -EFAULT;
-
-       if (adapter->flags & FLAG_READ_ONLY_NVM)
-               return -EINVAL;
-
-       max_len = hw->nvm.word_size * 2;
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       ptr = (void *)eeprom_buff;
-
-       if (eeprom->offset & 1) {
-               /* need read/modify/write of first changed EEPROM word */
-               /* only the second byte of the word is being modified */
-               ret_val = e1000_read_nvm(hw, first_word, 1, &eeprom_buff[0]);
-               ptr++;
-       }
-       if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0))
-               /* need read/modify/write of last changed EEPROM word */
-               /* only the first byte of the word is being modified */
-               ret_val = e1000_read_nvm(hw, last_word, 1,
-                                 &eeprom_buff[last_word - first_word]);
-
-       if (ret_val)
-               goto out;
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < last_word - first_word + 1; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(ptr, bytes, eeprom->len);
-
-       for (i = 0; i < last_word - first_word + 1; i++)
-               eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
-
-       ret_val = e1000_write_nvm(hw, first_word,
-                                 last_word - first_word + 1, eeprom_buff);
-
-       if (ret_val)
-               goto out;
-
-       /*
-        * Update the checksum over the first part of the EEPROM if needed
-        * and flush shadow RAM for applicable controllers
-        */
-       if ((first_word <= NVM_CHECKSUM_REG) ||
-           (hw->mac.type == e1000_82583) ||
-           (hw->mac.type == e1000_82574) ||
-           (hw->mac.type == e1000_82573))
-               ret_val = e1000e_update_nvm_checksum(hw);
-
-out:
-       kfree(eeprom_buff);
-       return ret_val;
-}
-
-static void e1000_get_drvinfo(struct net_device *netdev,
-                             struct ethtool_drvinfo *drvinfo)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       char firmware_version[32];
-
-       strncpy(drvinfo->driver,  e1000e_driver_name,
-               sizeof(drvinfo->driver) - 1);
-       strncpy(drvinfo->version, e1000e_driver_version,
-               sizeof(drvinfo->version) - 1);
-
-       /*
-        * EEPROM image version # is reported as firmware version # for
-        * PCI-E controllers
-        */
-       snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
-               (adapter->eeprom_vers & 0xF000) >> 12,
-               (adapter->eeprom_vers & 0x0FF0) >> 4,
-               (adapter->eeprom_vers & 0x000F));
-
-       strncpy(drvinfo->fw_version, firmware_version,
-               sizeof(drvinfo->fw_version) - 1);
-       strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
-               sizeof(drvinfo->bus_info) - 1);
-       drvinfo->regdump_len = e1000_get_regs_len(netdev);
-       drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
-}
-
-static void e1000_get_ringparam(struct net_device *netdev,
-                               struct ethtool_ringparam *ring)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-
-       ring->rx_max_pending = E1000_MAX_RXD;
-       ring->tx_max_pending = E1000_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rx_ring->count;
-       ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int e1000_set_ringparam(struct net_device *netdev,
-                              struct ethtool_ringparam *ring)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_ring *tx_ring, *tx_old;
-       struct e1000_ring *rx_ring, *rx_old;
-       int err;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
-               usleep_range(1000, 2000);
-
-       if (netif_running(adapter->netdev))
-               e1000e_down(adapter);
-
-       tx_old = adapter->tx_ring;
-       rx_old = adapter->rx_ring;
-
-       err = -ENOMEM;
-       tx_ring = kmemdup(tx_old, sizeof(struct e1000_ring), GFP_KERNEL);
-       if (!tx_ring)
-               goto err_alloc_tx;
-
-       rx_ring = kmemdup(rx_old, sizeof(struct e1000_ring), GFP_KERNEL);
-       if (!rx_ring)
-               goto err_alloc_rx;
-
-       adapter->tx_ring = tx_ring;
-       adapter->rx_ring = rx_ring;
-
-       rx_ring->count = max(ring->rx_pending, (u32)E1000_MIN_RXD);
-       rx_ring->count = min(rx_ring->count, (u32)(E1000_MAX_RXD));
-       rx_ring->count = ALIGN(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       tx_ring->count = max(ring->tx_pending, (u32)E1000_MIN_TXD);
-       tx_ring->count = min(tx_ring->count, (u32)(E1000_MAX_TXD));
-       tx_ring->count = ALIGN(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       if (netif_running(adapter->netdev)) {
-               /* Try to get new resources before deleting old */
-               err = e1000e_setup_rx_resources(adapter);
-               if (err)
-                       goto err_setup_rx;
-               err = e1000e_setup_tx_resources(adapter);
-               if (err)
-                       goto err_setup_tx;
-
-               /*
-                * restore the old in order to free it,
-                * then add in the new
-                */
-               adapter->rx_ring = rx_old;
-               adapter->tx_ring = tx_old;
-               e1000e_free_rx_resources(adapter);
-               e1000e_free_tx_resources(adapter);
-               kfree(tx_old);
-               kfree(rx_old);
-               adapter->rx_ring = rx_ring;
-               adapter->tx_ring = tx_ring;
-               err = e1000e_up(adapter);
-               if (err)
-                       goto err_setup;
-       }
-
-       clear_bit(__E1000_RESETTING, &adapter->state);
-       return 0;
-err_setup_tx:
-       e1000e_free_rx_resources(adapter);
-err_setup_rx:
-       adapter->rx_ring = rx_old;
-       adapter->tx_ring = tx_old;
-       kfree(rx_ring);
-err_alloc_rx:
-       kfree(tx_ring);
-err_alloc_tx:
-       e1000e_up(adapter);
-err_setup:
-       clear_bit(__E1000_RESETTING, &adapter->state);
-       return err;
-}
-
-static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
-                            int reg, int offset, u32 mask, u32 write)
-{
-       u32 pat, val;
-       static const u32 test[] = {
-               0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
-       for (pat = 0; pat < ARRAY_SIZE(test); pat++) {
-               E1000_WRITE_REG_ARRAY(&adapter->hw, reg, offset,
-                                     (test[pat] & write));
-               val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
-               if (val != (test[pat] & write & mask)) {
-                       e_err("pattern test reg %04X failed: got 0x%08X "
-                             "expected 0x%08X\n", reg + offset, val,
-                             (test[pat] & write & mask));
-                       *data = reg;
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
-                             int reg, u32 mask, u32 write)
-{
-       u32 val;
-       __ew32(&adapter->hw, reg, write & mask);
-       val = __er32(&adapter->hw, reg);
-       if ((write & mask) != (val & mask)) {
-               e_err("set/check reg %04X test failed: got 0x%08X "
-                     "expected 0x%08X\n", reg, (val & mask), (write & mask));
-               *data = reg;
-               return 1;
-       }
-       return 0;
-}
-#define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write)                       \
-       do {                                                                   \
-               if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \
-                       return 1;                                              \
-       } while (0)
-#define REG_PATTERN_TEST(reg, mask, write)                                     \
-       REG_PATTERN_TEST_ARRAY(reg, 0, mask, write)
-
-#define REG_SET_AND_CHECK(reg, mask, write)                                    \
-       do {                                                                   \
-               if (reg_set_and_check(adapter, data, reg, mask, write))        \
-                       return 1;                                              \
-       } while (0)
-
-static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-       u32 value;
-       u32 before;
-       u32 after;
-       u32 i;
-       u32 toggle;
-       u32 mask;
-
-       /*
-        * The status register is Read Only, so a write should fail.
-        * Some bits that get toggled are ignored.
-        */
-       switch (mac->type) {
-       /* there are several bits on newer hardware that are r/w */
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_80003es2lan:
-               toggle = 0x7FFFF3FF;
-               break;
-        default:
-               toggle = 0x7FFFF033;
-               break;
-       }
-
-       before = er32(STATUS);
-       value = (er32(STATUS) & toggle);
-       ew32(STATUS, toggle);
-       after = er32(STATUS) & toggle;
-       if (value != after) {
-               e_err("failed STATUS register test got: 0x%08X expected: "
-                     "0x%08X\n", after, value);
-               *data = 1;
-               return 1;
-       }
-       /* restore previous status */
-       ew32(STATUS, before);
-
-       if (!(adapter->flags & FLAG_IS_ICH)) {
-               REG_PATTERN_TEST(E1000_FCAL, 0xFFFFFFFF, 0xFFFFFFFF);
-               REG_PATTERN_TEST(E1000_FCAH, 0x0000FFFF, 0xFFFFFFFF);
-               REG_PATTERN_TEST(E1000_FCT, 0x0000FFFF, 0xFFFFFFFF);
-               REG_PATTERN_TEST(E1000_VET, 0x0000FFFF, 0xFFFFFFFF);
-       }
-
-       REG_PATTERN_TEST(E1000_RDTR, 0x0000FFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(E1000_RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(E1000_RDLEN, 0x000FFF80, 0x000FFFFF);
-       REG_PATTERN_TEST(E1000_RDH, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(E1000_RDT, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(E1000_FCRTH, 0x0000FFF8, 0x0000FFF8);
-       REG_PATTERN_TEST(E1000_FCTTV, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(E1000_TIPG, 0x3FFFFFFF, 0x3FFFFFFF);
-       REG_PATTERN_TEST(E1000_TDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(E1000_TDLEN, 0x000FFF80, 0x000FFFFF);
-
-       REG_SET_AND_CHECK(E1000_RCTL, 0xFFFFFFFF, 0x00000000);
-
-       before = ((adapter->flags & FLAG_IS_ICH) ? 0x06C3B33E : 0x06DFB3FE);
-       REG_SET_AND_CHECK(E1000_RCTL, before, 0x003FFFFB);
-       REG_SET_AND_CHECK(E1000_TCTL, 0xFFFFFFFF, 0x00000000);
-
-       REG_SET_AND_CHECK(E1000_RCTL, before, 0xFFFFFFFF);
-       REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
-       if (!(adapter->flags & FLAG_IS_ICH))
-               REG_PATTERN_TEST(E1000_TXCW, 0xC000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
-       REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
-       mask = 0x8003FFFF;
-       switch (mac->type) {
-       case e1000_ich10lan:
-       case e1000_pchlan:
-       case e1000_pch2lan:
-               mask |= (1 << 18);
-               break;
-       default:
-               break;
-       }
-       for (i = 0; i < mac->rar_entry_count; i++)
-               REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
-                                      mask, 0xFFFFFFFF);
-
-       for (i = 0; i < mac->mta_reg_count; i++)
-               REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
-
-       *data = 0;
-       return 0;
-}
-
-static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
-{
-       u16 temp;
-       u16 checksum = 0;
-       u16 i;
-
-       *data = 0;
-       /* Read and add up the contents of the EEPROM */
-       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-               if ((e1000_read_nvm(&adapter->hw, i, 1, &temp)) < 0) {
-                       *data = 1;
-                       return *data;
-               }
-               checksum += temp;
-       }
-
-       /* If Checksum is not Correct return error else test passed */
-       if ((checksum != (u16) NVM_SUM) && !(*data))
-               *data = 2;
-
-       return *data;
-}
-
-static irqreturn_t e1000_test_intr(int irq, void *data)
-{
-       struct net_device *netdev = (struct net_device *) data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       adapter->test_icr |= er32(ICR);
-
-       return IRQ_HANDLED;
-}
-
-static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 mask;
-       u32 shared_int = 1;
-       u32 irq = adapter->pdev->irq;
-       int i;
-       int ret_val = 0;
-       int int_mode = E1000E_INT_MODE_LEGACY;
-
-       *data = 0;
-
-       /* NOTE: we don't test MSI/MSI-X interrupts here, yet */
-       if (adapter->int_mode == E1000E_INT_MODE_MSIX) {
-               int_mode = adapter->int_mode;
-               e1000e_reset_interrupt_capability(adapter);
-               adapter->int_mode = E1000E_INT_MODE_LEGACY;
-               e1000e_set_interrupt_capability(adapter);
-       }
-       /* Hook up test interrupt handler just for this test */
-       if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
-                        netdev)) {
-               shared_int = 0;
-       } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
-                netdev->name, netdev)) {
-               *data = 1;
-               ret_val = -1;
-               goto out;
-       }
-       e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));
-
-       /* Disable all the interrupts */
-       ew32(IMC, 0xFFFFFFFF);
-       e1e_flush();
-       usleep_range(10000, 20000);
-
-       /* Test each interrupt */
-       for (i = 0; i < 10; i++) {
-               /* Interrupt to test */
-               mask = 1 << i;
-
-               if (adapter->flags & FLAG_IS_ICH) {
-                       switch (mask) {
-                       case E1000_ICR_RXSEQ:
-                               continue;
-                       case 0x00000100:
-                               if (adapter->hw.mac.type == e1000_ich8lan ||
-                                   adapter->hw.mac.type == e1000_ich9lan)
-                                       continue;
-                               break;
-                       default:
-                               break;
-                       }
-               }
-
-               if (!shared_int) {
-                       /*
-                        * Disable the interrupt to be reported in
-                        * the cause register and then force the same
-                        * interrupt and see if one gets posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       ew32(IMC, mask);
-                       ew32(ICS, mask);
-                       e1e_flush();
-                       usleep_range(10000, 20000);
-
-                       if (adapter->test_icr & mask) {
-                               *data = 3;
-                               break;
-                       }
-               }
-
-               /*
-                * Enable the interrupt to be reported in
-                * the cause register and then force the same
-                * interrupt and see if one gets posted.  If
-                * an interrupt was not posted to the bus, the
-                * test failed.
-                */
-               adapter->test_icr = 0;
-               ew32(IMS, mask);
-               ew32(ICS, mask);
-               e1e_flush();
-               usleep_range(10000, 20000);
-
-               if (!(adapter->test_icr & mask)) {
-                       *data = 4;
-                       break;
-               }
-
-               if (!shared_int) {
-                       /*
-                        * Disable the other interrupts to be reported in
-                        * the cause register and then force the other
-                        * interrupts and see if any get posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       ew32(IMC, ~mask & 0x00007FFF);
-                       ew32(ICS, ~mask & 0x00007FFF);
-                       e1e_flush();
-                       usleep_range(10000, 20000);
-
-                       if (adapter->test_icr) {
-                               *data = 5;
-                               break;
-                       }
-               }
-       }
-
-       /* Disable all the interrupts */
-       ew32(IMC, 0xFFFFFFFF);
-       e1e_flush();
-       usleep_range(10000, 20000);
-
-       /* Unhook test interrupt handler */
-       free_irq(irq, netdev);
-
-out:
-       if (int_mode == E1000E_INT_MODE_MSIX) {
-               e1000e_reset_interrupt_capability(adapter);
-               adapter->int_mode = int_mode;
-               e1000e_set_interrupt_capability(adapter);
-       }
-
-       return ret_val;
-}
-
-static void e1000_free_desc_rings(struct e1000_adapter *adapter)
-{
-       struct e1000_ring *tx_ring = &adapter->test_tx_ring;
-       struct e1000_ring *rx_ring = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       int i;
-
-       if (tx_ring->desc && tx_ring->buffer_info) {
-               for (i = 0; i < tx_ring->count; i++) {
-                       if (tx_ring->buffer_info[i].dma)
-                               dma_unmap_single(&pdev->dev,
-                                       tx_ring->buffer_info[i].dma,
-                                       tx_ring->buffer_info[i].length,
-                                       DMA_TO_DEVICE);
-                       if (tx_ring->buffer_info[i].skb)
-                               dev_kfree_skb(tx_ring->buffer_info[i].skb);
-               }
-       }
-
-       if (rx_ring->desc && rx_ring->buffer_info) {
-               for (i = 0; i < rx_ring->count; i++) {
-                       if (rx_ring->buffer_info[i].dma)
-                               dma_unmap_single(&pdev->dev,
-                                       rx_ring->buffer_info[i].dma,
-                                       2048, DMA_FROM_DEVICE);
-                       if (rx_ring->buffer_info[i].skb)
-                               dev_kfree_skb(rx_ring->buffer_info[i].skb);
-               }
-       }
-
-       if (tx_ring->desc) {
-               dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
-                                 tx_ring->dma);
-               tx_ring->desc = NULL;
-       }
-       if (rx_ring->desc) {
-               dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
-                                 rx_ring->dma);
-               rx_ring->desc = NULL;
-       }
-
-       kfree(tx_ring->buffer_info);
-       tx_ring->buffer_info = NULL;
-       kfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-}
-
-static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
-{
-       struct e1000_ring *tx_ring = &adapter->test_tx_ring;
-       struct e1000_ring *rx_ring = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-       int i;
-       int ret_val;
-
-       /* Setup Tx descriptor ring and Tx buffers */
-
-       if (!tx_ring->count)
-               tx_ring->count = E1000_DEFAULT_TXD;
-
-       tx_ring->buffer_info = kcalloc(tx_ring->count,
-                                      sizeof(struct e1000_buffer),
-                                      GFP_KERNEL);
-       if (!(tx_ring->buffer_info)) {
-               ret_val = 1;
-               goto err_nomem;
-       }
-
-       tx_ring->size = tx_ring->count * sizeof(struct e1000_tx_desc);
-       tx_ring->size = ALIGN(tx_ring->size, 4096);
-       tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
-                                          &tx_ring->dma, GFP_KERNEL);
-       if (!tx_ring->desc) {
-               ret_val = 2;
-               goto err_nomem;
-       }
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-
-       ew32(TDBAL, ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
-       ew32(TDBAH, ((u64) tx_ring->dma >> 32));
-       ew32(TDLEN, tx_ring->count * sizeof(struct e1000_tx_desc));
-       ew32(TDH, 0);
-       ew32(TDT, 0);
-       ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN | E1000_TCTL_MULR |
-            E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
-            E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT);
-
-       for (i = 0; i < tx_ring->count; i++) {
-               struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*tx_ring, i);
-               struct sk_buff *skb;
-               unsigned int skb_size = 1024;
-
-               skb = alloc_skb(skb_size, GFP_KERNEL);
-               if (!skb) {
-                       ret_val = 3;
-                       goto err_nomem;
-               }
-               skb_put(skb, skb_size);
-               tx_ring->buffer_info[i].skb = skb;
-               tx_ring->buffer_info[i].length = skb->len;
-               tx_ring->buffer_info[i].dma =
-                       dma_map_single(&pdev->dev, skb->data, skb->len,
-                                      DMA_TO_DEVICE);
-               if (dma_mapping_error(&pdev->dev,
-                                     tx_ring->buffer_info[i].dma)) {
-                       ret_val = 4;
-                       goto err_nomem;
-               }
-               tx_desc->buffer_addr = cpu_to_le64(tx_ring->buffer_info[i].dma);
-               tx_desc->lower.data = cpu_to_le32(skb->len);
-               tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
-                                                  E1000_TXD_CMD_IFCS |
-                                                  E1000_TXD_CMD_RS);
-               tx_desc->upper.data = 0;
-       }
-
-       /* Setup Rx descriptor ring and Rx buffers */
-
-       if (!rx_ring->count)
-               rx_ring->count = E1000_DEFAULT_RXD;
-
-       rx_ring->buffer_info = kcalloc(rx_ring->count,
-                                      sizeof(struct e1000_buffer),
-                                      GFP_KERNEL);
-       if (!(rx_ring->buffer_info)) {
-               ret_val = 5;
-               goto err_nomem;
-       }
-
-       rx_ring->size = rx_ring->count * sizeof(struct e1000_rx_desc);
-       rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
-                                          &rx_ring->dma, GFP_KERNEL);
-       if (!rx_ring->desc) {
-               ret_val = 6;
-               goto err_nomem;
-       }
-       rx_ring->next_to_use = 0;
-       rx_ring->next_to_clean = 0;
-
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-       ew32(RDBAL, ((u64) rx_ring->dma & 0xFFFFFFFF));
-       ew32(RDBAH, ((u64) rx_ring->dma >> 32));
-       ew32(RDLEN, rx_ring->size);
-       ew32(RDH, 0);
-       ew32(RDT, 0);
-       rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
-               E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_LPE |
-               E1000_RCTL_SBP | E1000_RCTL_SECRC |
-               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-               (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
-       ew32(RCTL, rctl);
-
-       for (i = 0; i < rx_ring->count; i++) {
-               struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rx_ring, i);
-               struct sk_buff *skb;
-
-               skb = alloc_skb(2048 + NET_IP_ALIGN, GFP_KERNEL);
-               if (!skb) {
-                       ret_val = 7;
-                       goto err_nomem;
-               }
-               skb_reserve(skb, NET_IP_ALIGN);
-               rx_ring->buffer_info[i].skb = skb;
-               rx_ring->buffer_info[i].dma =
-                       dma_map_single(&pdev->dev, skb->data, 2048,
-                                      DMA_FROM_DEVICE);
-               if (dma_mapping_error(&pdev->dev,
-                                     rx_ring->buffer_info[i].dma)) {
-                       ret_val = 8;
-                       goto err_nomem;
-               }
-               rx_desc->buffer_addr =
-                       cpu_to_le64(rx_ring->buffer_info[i].dma);
-               memset(skb->data, 0x00, skb->len);
-       }
-
-       return 0;
-
-err_nomem:
-       e1000_free_desc_rings(adapter);
-       return ret_val;
-}
-
-static void e1000_phy_disable_receiver(struct e1000_adapter *adapter)
-{
-       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
-       e1e_wphy(&adapter->hw, 29, 0x001F);
-       e1e_wphy(&adapter->hw, 30, 0x8FFC);
-       e1e_wphy(&adapter->hw, 29, 0x001A);
-       e1e_wphy(&adapter->hw, 30, 0x8FF0);
-}
-
-static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_reg = 0;
-       u16 phy_reg = 0;
-       s32 ret_val = 0;
-
-       hw->mac.autoneg = 0;
-
-       if (hw->phy.type == e1000_phy_ife) {
-               /* force 100, set loopback */
-               e1e_wphy(hw, PHY_CONTROL, 0x6100);
-
-               /* Now set up the MAC to the same speed/duplex as the PHY. */
-               ctrl_reg = er32(CTRL);
-               ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
-               ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
-                            E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
-                            E1000_CTRL_SPD_100 |/* Force Speed to 100 */
-                            E1000_CTRL_FD);     /* Force Duplex to FULL */
-
-               ew32(CTRL, ctrl_reg);
-               e1e_flush();
-               udelay(500);
-
-               return 0;
-       }
-
-       /* Specific PHY configuration for loopback */
-       switch (hw->phy.type) {
-       case e1000_phy_m88:
-               /* Auto-MDI/MDIX Off */
-               e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
-               /* reset to update Auto-MDI/MDIX */
-               e1e_wphy(hw, PHY_CONTROL, 0x9140);
-               /* autoneg off */
-               e1e_wphy(hw, PHY_CONTROL, 0x8140);
-               break;
-       case e1000_phy_gg82563:
-               e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, 0x1CC);
-               break;
-       case e1000_phy_bm:
-               /* Set Default MAC Interface speed to 1GB */
-               e1e_rphy(hw, PHY_REG(2, 21), &phy_reg);
-               phy_reg &= ~0x0007;
-               phy_reg |= 0x006;
-               e1e_wphy(hw, PHY_REG(2, 21), phy_reg);
-               /* Assert SW reset for above settings to take effect */
-               e1000e_commit_phy(hw);
-               mdelay(1);
-               /* Force Full Duplex */
-               e1e_rphy(hw, PHY_REG(769, 16), &phy_reg);
-               e1e_wphy(hw, PHY_REG(769, 16), phy_reg | 0x000C);
-               /* Set Link Up (in force link) */
-               e1e_rphy(hw, PHY_REG(776, 16), &phy_reg);
-               e1e_wphy(hw, PHY_REG(776, 16), phy_reg | 0x0040);
-               /* Force Link */
-               e1e_rphy(hw, PHY_REG(769, 16), &phy_reg);
-               e1e_wphy(hw, PHY_REG(769, 16), phy_reg | 0x0040);
-               /* Set Early Link Enable */
-               e1e_rphy(hw, PHY_REG(769, 20), &phy_reg);
-               e1e_wphy(hw, PHY_REG(769, 20), phy_reg | 0x0400);
-               break;
-       case e1000_phy_82577:
-       case e1000_phy_82578:
-               /* Workaround: K1 must be disabled for stable 1Gbps operation */
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val) {
-                       e_err("Cannot setup 1Gbps loopback.\n");
-                       return ret_val;
-               }
-               e1000_configure_k1_ich8lan(hw, false);
-               hw->phy.ops.release(hw);
-               break;
-       case e1000_phy_82579:
-               /* Disable PHY energy detect power down */
-               e1e_rphy(hw, PHY_REG(0, 21), &phy_reg);
-               e1e_wphy(hw, PHY_REG(0, 21), phy_reg & ~(1 << 3));
-               /* Disable full chip energy detect */
-               e1e_rphy(hw, PHY_REG(776, 18), &phy_reg);
-               e1e_wphy(hw, PHY_REG(776, 18), phy_reg | 1);
-               /* Enable loopback on the PHY */
-#define I82577_PHY_LBK_CTRL          19
-               e1e_wphy(hw, I82577_PHY_LBK_CTRL, 0x8001);
-               break;
-       default:
-               break;
-       }
-
-       /* force 1000, set loopback */
-       e1e_wphy(hw, PHY_CONTROL, 0x4140);
-       mdelay(250);
-
-       /* Now set up the MAC to the same speed/duplex as the PHY. */
-       ctrl_reg = er32(CTRL);
-       ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
-       ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
-                    E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
-                    E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
-                    E1000_CTRL_FD);     /* Force Duplex to FULL */
-
-       if (adapter->flags & FLAG_IS_ICH)
-               ctrl_reg |= E1000_CTRL_SLU;     /* Set Link Up */
-
-       if (hw->phy.media_type == e1000_media_type_copper &&
-           hw->phy.type == e1000_phy_m88) {
-               ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
-       } else {
-               /*
-                * Set the ILOS bit on the fiber Nic if half duplex link is
-                * detected.
-                */
-               if ((er32(STATUS) & E1000_STATUS_FD) == 0)
-                       ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
-       }
-
-       ew32(CTRL, ctrl_reg);
-
-       /*
-        * Disable the receiver on the PHY so when a cable is plugged in, the
-        * PHY does not begin to autoneg when a cable is reconnected to the NIC.
-        */
-       if (hw->phy.type == e1000_phy_m88)
-               e1000_phy_disable_receiver(adapter);
-
-       udelay(500);
-
-       return 0;
-}
-
-static int e1000_set_82571_fiber_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl = er32(CTRL);
-       int link = 0;
-
-       /* special requirements for 82571/82572 fiber adapters */
-
-       /*
-        * jump through hoops to make sure link is up because serdes
-        * link is hardwired up
-        */
-       ctrl |= E1000_CTRL_SLU;
-       ew32(CTRL, ctrl);
-
-       /* disable autoneg */
-       ctrl = er32(TXCW);
-       ctrl &= ~(1 << 31);
-       ew32(TXCW, ctrl);
-
-       link = (er32(STATUS) & E1000_STATUS_LU);
-
-       if (!link) {
-               /* set invert loss of signal */
-               ctrl = er32(CTRL);
-               ctrl |= E1000_CTRL_ILOS;
-               ew32(CTRL, ctrl);
-       }
-
-       /*
-        * special write to serdes control register to enable SerDes analog
-        * loopback
-        */
-#define E1000_SERDES_LB_ON 0x410
-       ew32(SCTL, E1000_SERDES_LB_ON);
-       e1e_flush();
-       usleep_range(10000, 20000);
-
-       return 0;
-}
-
-/* only call this for fiber/serdes connections to es2lan */
-static int e1000_set_es2lan_mac_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrlext = er32(CTRL_EXT);
-       u32 ctrl = er32(CTRL);
-
-       /*
-        * save CTRL_EXT to restore later, reuse an empty variable (unused
-        * on mac_type 80003es2lan)
-        */
-       adapter->tx_fifo_head = ctrlext;
-
-       /* clear the serdes mode bits, putting the device into mac loopback */
-       ctrlext &= ~E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES;
-       ew32(CTRL_EXT, ctrlext);
-
-       /* force speed to 1000/FD, link up */
-       ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-       ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX |
-                E1000_CTRL_SPD_1000 | E1000_CTRL_FD);
-       ew32(CTRL, ctrl);
-
-       /* set mac loopback */
-       ctrl = er32(RCTL);
-       ctrl |= E1000_RCTL_LBM_MAC;
-       ew32(RCTL, ctrl);
-
-       /* set testing mode parameters (no need to reset later) */
-#define KMRNCTRLSTA_OPMODE (0x1F << 16)
-#define KMRNCTRLSTA_OPMODE_1GB_FD_GMII 0x0582
-       ew32(KMRNCTRLSTA,
-            (KMRNCTRLSTA_OPMODE | KMRNCTRLSTA_OPMODE_1GB_FD_GMII));
-
-       return 0;
-}
-
-static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       if (hw->phy.media_type == e1000_media_type_fiber ||
-           hw->phy.media_type == e1000_media_type_internal_serdes) {
-               switch (hw->mac.type) {
-               case e1000_80003es2lan:
-                       return e1000_set_es2lan_mac_loopback(adapter);
-                       break;
-               case e1000_82571:
-               case e1000_82572:
-                       return e1000_set_82571_fiber_loopback(adapter);
-                       break;
-               default:
-                       rctl = er32(RCTL);
-                       rctl |= E1000_RCTL_LBM_TCVR;
-                       ew32(RCTL, rctl);
-                       return 0;
-               }
-       } else if (hw->phy.media_type == e1000_media_type_copper) {
-               return e1000_integrated_phy_loopback(adapter);
-       }
-
-       return 7;
-}
-
-static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-       u16 phy_reg;
-
-       rctl = er32(RCTL);
-       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
-       ew32(RCTL, rctl);
-
-       switch (hw->mac.type) {
-       case e1000_80003es2lan:
-               if (hw->phy.media_type == e1000_media_type_fiber ||
-                   hw->phy.media_type == e1000_media_type_internal_serdes) {
-                       /* restore CTRL_EXT, stealing space from tx_fifo_head */
-                       ew32(CTRL_EXT, adapter->tx_fifo_head);
-                       adapter->tx_fifo_head = 0;
-               }
-               /* fall through */
-       case e1000_82571:
-       case e1000_82572:
-               if (hw->phy.media_type == e1000_media_type_fiber ||
-                   hw->phy.media_type == e1000_media_type_internal_serdes) {
-#define E1000_SERDES_LB_OFF 0x400
-                       ew32(SCTL, E1000_SERDES_LB_OFF);
-                       e1e_flush();
-                       usleep_range(10000, 20000);
-                       break;
-               }
-               /* Fall Through */
-       default:
-               hw->mac.autoneg = 1;
-               if (hw->phy.type == e1000_phy_gg82563)
-                       e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, 0x180);
-               e1e_rphy(hw, PHY_CONTROL, &phy_reg);
-               if (phy_reg & MII_CR_LOOPBACK) {
-                       phy_reg &= ~MII_CR_LOOPBACK;
-                       e1e_wphy(hw, PHY_CONTROL, phy_reg);
-                       e1000e_commit_phy(hw);
-               }
-               break;
-       }
-}
-
-static void e1000_create_lbtest_frame(struct sk_buff *skb,
-                                     unsigned int frame_size)
-{
-       memset(skb->data, 0xFF, frame_size);
-       frame_size &= ~1;
-       memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
-       memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
-       memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
-}
-
-static int e1000_check_lbtest_frame(struct sk_buff *skb,
-                                   unsigned int frame_size)
-{
-       frame_size &= ~1;
-       if (*(skb->data + 3) == 0xFF)
-               if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
-                  (*(skb->data + frame_size / 2 + 12) == 0xAF))
-                       return 0;
-       return 13;
-}
-
-static int e1000_run_loopback_test(struct e1000_adapter *adapter)
-{
-       struct e1000_ring *tx_ring = &adapter->test_tx_ring;
-       struct e1000_ring *rx_ring = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_hw *hw = &adapter->hw;
-       int i, j, k, l;
-       int lc;
-       int good_cnt;
-       int ret_val = 0;
-       unsigned long time;
-
-       ew32(RDT, rx_ring->count - 1);
-
-       /*
-        * Calculate the loop count based on the largest descriptor ring
-        * The idea is to wrap the largest ring a number of times using 64
-        * send/receive pairs during each loop
-        */
-
-       if (rx_ring->count <= tx_ring->count)
-               lc = ((tx_ring->count / 64) * 2) + 1;
-       else
-               lc = ((rx_ring->count / 64) * 2) + 1;
-
-       k = 0;
-       l = 0;
-       for (j = 0; j <= lc; j++) { /* loop count loop */
-               for (i = 0; i < 64; i++) { /* send the packets */
-                       e1000_create_lbtest_frame(tx_ring->buffer_info[k].skb,
-                                                 1024);
-                       dma_sync_single_for_device(&pdev->dev,
-                                       tx_ring->buffer_info[k].dma,
-                                       tx_ring->buffer_info[k].length,
-                                       DMA_TO_DEVICE);
-                       k++;
-                       if (k == tx_ring->count)
-                               k = 0;
-               }
-               ew32(TDT, k);
-               e1e_flush();
-               msleep(200);
-               time = jiffies; /* set the start time for the receive */
-               good_cnt = 0;
-               do { /* receive the sent packets */
-                       dma_sync_single_for_cpu(&pdev->dev,
-                                       rx_ring->buffer_info[l].dma, 2048,
-                                       DMA_FROM_DEVICE);
-
-                       ret_val = e1000_check_lbtest_frame(
-                                       rx_ring->buffer_info[l].skb, 1024);
-                       if (!ret_val)
-                               good_cnt++;
-                       l++;
-                       if (l == rx_ring->count)
-                               l = 0;
-                       /*
-                        * time + 20 msecs (200 msecs on 2.4) is more than
-                        * enough time to complete the receives, if it's
-                        * exceeded, break and error off
-                        */
-               } while ((good_cnt < 64) && !time_after(jiffies, time + 20));
-               if (good_cnt != 64) {
-                       ret_val = 13; /* ret_val is the same as mis-compare */
-                       break;
-               }
-               if (jiffies >= (time + 20)) {
-                       ret_val = 14; /* error code for time out error */
-                       break;
-               }
-       } /* end loop count loop */
-       return ret_val;
-}
-
-static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
-{
-       /*
-        * PHY loopback cannot be performed if SoL/IDER
-        * sessions are active
-        */
-       if (e1000_check_reset_block(&adapter->hw)) {
-               e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");
-               *data = 0;
-               goto out;
-       }
-
-       *data = e1000_setup_desc_rings(adapter);
-       if (*data)
-               goto out;
-
-       *data = e1000_setup_loopback_test(adapter);
-       if (*data)
-               goto err_loopback;
-
-       *data = e1000_run_loopback_test(adapter);
-       e1000_loopback_cleanup(adapter);
-
-err_loopback:
-       e1000_free_desc_rings(adapter);
-out:
-       return *data;
-}
-
-static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       *data = 0;
-       if (hw->phy.media_type == e1000_media_type_internal_serdes) {
-               int i = 0;
-               hw->mac.serdes_has_link = false;
-
-               /*
-                * On some blade server designs, link establishment
-                * could take as long as 2-3 minutes
-                */
-               do {
-                       hw->mac.ops.check_for_link(hw);
-                       if (hw->mac.serdes_has_link)
-                               return *data;
-                       msleep(20);
-               } while (i++ < 3750);
-
-               *data = 1;
-       } else {
-               hw->mac.ops.check_for_link(hw);
-               if (hw->mac.autoneg)
-                       /*
-                        * On some Phy/switch combinations, link establishment
-                        * can take a few seconds more than expected.
-                        */
-                       msleep(5000);
-
-               if (!(er32(STATUS) & E1000_STATUS_LU))
-                       *data = 1;
-       }
-       return *data;
-}
-
-static int e1000e_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return E1000_TEST_LEN;
-       case ETH_SS_STATS:
-               return E1000_STATS_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void e1000_diag_test(struct net_device *netdev,
-                           struct ethtool_test *eth_test, u64 *data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       u16 autoneg_advertised;
-       u8 forced_speed_duplex;
-       u8 autoneg;
-       bool if_running = netif_running(netdev);
-
-       set_bit(__E1000_TESTING, &adapter->state);
-
-       if (!if_running) {
-               /* Get control of and reset hardware */
-               if (adapter->flags & FLAG_HAS_AMT)
-                       e1000e_get_hw_control(adapter);
-
-               e1000e_power_up_phy(adapter);
-
-               adapter->hw.phy.autoneg_wait_to_complete = 1;
-               e1000e_reset(adapter);
-               adapter->hw.phy.autoneg_wait_to_complete = 0;
-       }
-
-       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
-               /* Offline tests */
-
-               /* save speed, duplex, autoneg settings */
-               autoneg_advertised = adapter->hw.phy.autoneg_advertised;
-               forced_speed_duplex = adapter->hw.mac.forced_speed_duplex;
-               autoneg = adapter->hw.mac.autoneg;
-
-               e_info("offline testing starting\n");
-
-               if (if_running)
-                       /* indicate we're in test mode */
-                       dev_close(netdev);
-
-               if (e1000_reg_test(adapter, &data[0]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000e_reset(adapter);
-               if (e1000_eeprom_test(adapter, &data[1]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000e_reset(adapter);
-               if (e1000_intr_test(adapter, &data[2]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000e_reset(adapter);
-               if (e1000_loopback_test(adapter, &data[3]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* force this routine to wait until autoneg complete/timeout */
-               adapter->hw.phy.autoneg_wait_to_complete = 1;
-               e1000e_reset(adapter);
-               adapter->hw.phy.autoneg_wait_to_complete = 0;
-
-               if (e1000_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* restore speed, duplex, autoneg settings */
-               adapter->hw.phy.autoneg_advertised = autoneg_advertised;
-               adapter->hw.mac.forced_speed_duplex = forced_speed_duplex;
-               adapter->hw.mac.autoneg = autoneg;
-               e1000e_reset(adapter);
-
-               clear_bit(__E1000_TESTING, &adapter->state);
-               if (if_running)
-                       dev_open(netdev);
-       } else {
-               /* Online tests */
-
-               e_info("online testing starting\n");
-
-               /* register, eeprom, intr and loopback tests not run online */
-               data[0] = 0;
-               data[1] = 0;
-               data[2] = 0;
-               data[3] = 0;
-
-               if (e1000_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               clear_bit(__E1000_TESTING, &adapter->state);
-       }
-
-       if (!if_running) {
-               e1000e_reset(adapter);
-
-               if (adapter->flags & FLAG_HAS_AMT)
-                       e1000e_release_hw_control(adapter);
-       }
-
-       msleep_interruptible(4 * 1000);
-}
-
-static void e1000_get_wol(struct net_device *netdev,
-                         struct ethtool_wolinfo *wol)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       wol->supported = 0;
-       wol->wolopts = 0;
-
-       if (!(adapter->flags & FLAG_HAS_WOL) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return;
-
-       wol->supported = WAKE_UCAST | WAKE_MCAST |
-           WAKE_BCAST | WAKE_MAGIC | WAKE_PHY;
-
-       /* apply any specific unsupported masks here */
-       if (adapter->flags & FLAG_NO_WAKE_UCAST) {
-               wol->supported &= ~WAKE_UCAST;
-
-               if (adapter->wol & E1000_WUFC_EX)
-                       e_err("Interface does not support directed (unicast) "
-                             "frame wake-up packets\n");
-       }
-
-       if (adapter->wol & E1000_WUFC_EX)
-               wol->wolopts |= WAKE_UCAST;
-       if (adapter->wol & E1000_WUFC_MC)
-               wol->wolopts |= WAKE_MCAST;
-       if (adapter->wol & E1000_WUFC_BC)
-               wol->wolopts |= WAKE_BCAST;
-       if (adapter->wol & E1000_WUFC_MAG)
-               wol->wolopts |= WAKE_MAGIC;
-       if (adapter->wol & E1000_WUFC_LNKC)
-               wol->wolopts |= WAKE_PHY;
-}
-
-static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (!(adapter->flags & FLAG_HAS_WOL) ||
-           !device_can_wakeup(&adapter->pdev->dev) ||
-           (wol->wolopts & ~(WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |
-                             WAKE_MAGIC | WAKE_PHY)))
-               return -EOPNOTSUPP;
-
-       /* these settings will always override what we currently have */
-       adapter->wol = 0;
-
-       if (wol->wolopts & WAKE_UCAST)
-               adapter->wol |= E1000_WUFC_EX;
-       if (wol->wolopts & WAKE_MCAST)
-               adapter->wol |= E1000_WUFC_MC;
-       if (wol->wolopts & WAKE_BCAST)
-               adapter->wol |= E1000_WUFC_BC;
-       if (wol->wolopts & WAKE_MAGIC)
-               adapter->wol |= E1000_WUFC_MAG;
-       if (wol->wolopts & WAKE_PHY)
-               adapter->wol |= E1000_WUFC_LNKC;
-
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       return 0;
-}
-
-static int e1000_set_phys_id(struct net_device *netdev,
-                            enum ethtool_phys_id_state state)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       switch (state) {
-       case ETHTOOL_ID_ACTIVE:
-               if (!hw->mac.ops.blink_led)
-                       return 2;       /* cycle on/off twice per second */
-
-               hw->mac.ops.blink_led(hw);
-               break;
-
-       case ETHTOOL_ID_INACTIVE:
-               if (hw->phy.type == e1000_phy_ife)
-                       e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
-               hw->mac.ops.led_off(hw);
-               hw->mac.ops.cleanup_led(hw);
-               break;
-
-       case ETHTOOL_ID_ON:
-               adapter->hw.mac.ops.led_on(&adapter->hw);
-               break;
-
-       case ETHTOOL_ID_OFF:
-               adapter->hw.mac.ops.led_off(&adapter->hw);
-               break;
-       }
-       return 0;
-}
-
-static int e1000_get_coalesce(struct net_device *netdev,
-                             struct ethtool_coalesce *ec)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (adapter->itr_setting <= 4)
-               ec->rx_coalesce_usecs = adapter->itr_setting;
-       else
-               ec->rx_coalesce_usecs = 1000000 / adapter->itr_setting;
-
-       return 0;
-}
-
-static int e1000_set_coalesce(struct net_device *netdev,
-                             struct ethtool_coalesce *ec)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if ((ec->rx_coalesce_usecs > E1000_MAX_ITR_USECS) ||
-           ((ec->rx_coalesce_usecs > 4) &&
-            (ec->rx_coalesce_usecs < E1000_MIN_ITR_USECS)) ||
-           (ec->rx_coalesce_usecs == 2))
-               return -EINVAL;
-
-       if (ec->rx_coalesce_usecs == 4) {
-               adapter->itr = adapter->itr_setting = 4;
-       } else if (ec->rx_coalesce_usecs <= 3) {
-               adapter->itr = 20000;
-               adapter->itr_setting = ec->rx_coalesce_usecs;
-       } else {
-               adapter->itr = (1000000 / ec->rx_coalesce_usecs);
-               adapter->itr_setting = adapter->itr & ~3;
-       }
-
-       if (adapter->itr_setting != 0)
-               ew32(ITR, 1000000000 / (adapter->itr * 256));
-       else
-               ew32(ITR, 0);
-
-       return 0;
-}
-
-static int e1000_nway_reset(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (!netif_running(netdev))
-               return -EAGAIN;
-
-       if (!adapter->hw.mac.autoneg)
-               return -EINVAL;
-
-       e1000e_reinit_locked(adapter);
-
-       return 0;
-}
-
-static void e1000_get_ethtool_stats(struct net_device *netdev,
-                                   struct ethtool_stats *stats,
-                                   u64 *data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct rtnl_link_stats64 net_stats;
-       int i;
-       char *p = NULL;
-
-       e1000e_get_stats64(netdev, &net_stats);
-       for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
-               switch (e1000_gstrings_stats[i].type) {
-               case NETDEV_STATS:
-                       p = (char *) &net_stats +
-                                       e1000_gstrings_stats[i].stat_offset;
-                       break;
-               case E1000_STATS:
-                       p = (char *) adapter +
-                                       e1000_gstrings_stats[i].stat_offset;
-                       break;
-               default:
-                       data[i] = 0;
-                       continue;
-               }
-
-               data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
-                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-       }
-}
-
-static void e1000_get_strings(struct net_device *netdev, u32 stringset,
-                             u8 *data)
-{
-       u8 *p = data;
-       int i;
-
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test));
-               break;
-       case ETH_SS_STATS:
-               for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, e1000_gstrings_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-               break;
-       }
-}
-
-static int e1000e_set_flags(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       bool need_reset = false;
-       int rc;
-
-       need_reset = (data & ETH_FLAG_RXVLAN) !=
-                    (netdev->features & NETIF_F_HW_VLAN_RX);
-
-       rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
-                                 ETH_FLAG_TXVLAN);
-
-       if (rc)
-               return rc;
-
-       if (need_reset) {
-               if (netif_running(netdev))
-                       e1000e_reinit_locked(adapter);
-               else
-                       e1000e_reset(adapter);
-       }
-
-       return 0;
-}
-
-static const struct ethtool_ops e1000_ethtool_ops = {
-       .get_settings           = e1000_get_settings,
-       .set_settings           = e1000_set_settings,
-       .get_drvinfo            = e1000_get_drvinfo,
-       .get_regs_len           = e1000_get_regs_len,
-       .get_regs               = e1000_get_regs,
-       .get_wol                = e1000_get_wol,
-       .set_wol                = e1000_set_wol,
-       .get_msglevel           = e1000_get_msglevel,
-       .set_msglevel           = e1000_set_msglevel,
-       .nway_reset             = e1000_nway_reset,
-       .get_link               = ethtool_op_get_link,
-       .get_eeprom_len         = e1000_get_eeprom_len,
-       .get_eeprom             = e1000_get_eeprom,
-       .set_eeprom             = e1000_set_eeprom,
-       .get_ringparam          = e1000_get_ringparam,
-       .set_ringparam          = e1000_set_ringparam,
-       .get_pauseparam         = e1000_get_pauseparam,
-       .set_pauseparam         = e1000_set_pauseparam,
-       .get_rx_csum            = e1000_get_rx_csum,
-       .set_rx_csum            = e1000_set_rx_csum,
-       .get_tx_csum            = e1000_get_tx_csum,
-       .set_tx_csum            = e1000_set_tx_csum,
-       .get_sg                 = ethtool_op_get_sg,
-       .set_sg                 = ethtool_op_set_sg,
-       .get_tso                = ethtool_op_get_tso,
-       .set_tso                = e1000_set_tso,
-       .self_test              = e1000_diag_test,
-       .get_strings            = e1000_get_strings,
-       .set_phys_id            = e1000_set_phys_id,
-       .get_ethtool_stats      = e1000_get_ethtool_stats,
-       .get_sset_count         = e1000e_get_sset_count,
-       .get_coalesce           = e1000_get_coalesce,
-       .set_coalesce           = e1000_set_coalesce,
-       .get_flags              = ethtool_op_get_flags,
-       .set_flags              = e1000e_set_flags,
-};
-
-void e1000e_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
-}
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
deleted file mode 100644 (file)
index 2967039..0000000
+++ /dev/null
@@ -1,984 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_HW_H_
-#define _E1000_HW_H_
-
-#include <linux/types.h>
-
-struct e1000_hw;
-struct e1000_adapter;
-
-#include "defines.h"
-
-#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_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)))
-
-enum e1e_registers {
-       E1000_CTRL     = 0x00000, /* Device Control - RW */
-       E1000_STATUS   = 0x00008, /* Device Status - RO */
-       E1000_EECD     = 0x00010, /* EEPROM/Flash Control - RW */
-       E1000_EERD     = 0x00014, /* EEPROM Read - RW */
-       E1000_CTRL_EXT = 0x00018, /* Extended Device Control - RW */
-       E1000_FLA      = 0x0001C, /* Flash Access - RW */
-       E1000_MDIC     = 0x00020, /* MDI Control - RW */
-       E1000_SCTL     = 0x00024, /* SerDes Control - RW */
-       E1000_FCAL     = 0x00028, /* Flow Control Address Low - RW */
-       E1000_FCAH     = 0x0002C, /* Flow Control Address High -RW */
-       E1000_FEXTNVM4 = 0x00024, /* Future Extended NVM 4 - RW */
-       E1000_FEXTNVM  = 0x00028, /* Future Extended NVM - RW */
-       E1000_FCT      = 0x00030, /* Flow Control Type - RW */
-       E1000_VET      = 0x00038, /* VLAN Ether Type - RW */
-       E1000_ICR      = 0x000C0, /* Interrupt Cause Read - R/clr */
-       E1000_ITR      = 0x000C4, /* Interrupt Throttling Rate - RW */
-       E1000_ICS      = 0x000C8, /* Interrupt Cause Set - WO */
-       E1000_IMS      = 0x000D0, /* Interrupt Mask Set - RW */
-       E1000_IMC      = 0x000D8, /* Interrupt Mask Clear - WO */
-       E1000_EIAC_82574 = 0x000DC, /* Ext. Interrupt Auto Clear - RW */
-       E1000_IAM      = 0x000E0, /* Interrupt Acknowledge Auto Mask */
-       E1000_IVAR     = 0x000E4, /* Interrupt Vector Allocation - RW */
-       E1000_EITR_82574_BASE = 0x000E8, /* Interrupt Throttling - RW */
-#define E1000_EITR_82574(_n) (E1000_EITR_82574_BASE + (_n << 2))
-       E1000_RCTL     = 0x00100, /* Rx Control - RW */
-       E1000_FCTTV    = 0x00170, /* Flow Control Transmit Timer Value - RW */
-       E1000_TXCW     = 0x00178, /* Tx Configuration Word - RW */
-       E1000_RXCW     = 0x00180, /* Rx Configuration Word - RO */
-       E1000_TCTL     = 0x00400, /* Tx Control - RW */
-       E1000_TCTL_EXT = 0x00404, /* Extended Tx Control - RW */
-       E1000_TIPG     = 0x00410, /* Tx Inter-packet gap -RW */
-       E1000_AIT      = 0x00458, /* Adaptive Interframe Spacing Throttle -RW */
-       E1000_LEDCTL   = 0x00E00, /* LED Control - RW */
-       E1000_EXTCNF_CTRL  = 0x00F00, /* Extended Configuration Control */
-       E1000_EXTCNF_SIZE  = 0x00F08, /* Extended Configuration Size */
-       E1000_PHY_CTRL     = 0x00F10, /* PHY Control Register in CSR */
-#define E1000_POEMB    E1000_PHY_CTRL  /* PHY OEM Bits */
-       E1000_PBA      = 0x01000, /* Packet Buffer Allocation - RW */
-       E1000_PBS      = 0x01008, /* Packet Buffer Size */
-       E1000_EEMNGCTL = 0x01010, /* MNG EEprom Control */
-       E1000_EEWR     = 0x0102C, /* EEPROM Write Register - RW */
-       E1000_FLOP     = 0x0103C, /* FLASH Opcode Register */
-       E1000_PBA_ECC  = 0x01100, /* PBA ECC Register */
-       E1000_ERT      = 0x02008, /* Early Rx Threshold - RW */
-       E1000_FCRTL    = 0x02160, /* Flow Control Receive Threshold Low - RW */
-       E1000_FCRTH    = 0x02168, /* Flow Control Receive Threshold High - RW */
-       E1000_PSRCTL   = 0x02170, /* Packet Split Receive Control - RW */
-       E1000_RDBAL    = 0x02800, /* Rx Descriptor Base Address Low - RW */
-       E1000_RDBAH    = 0x02804, /* Rx Descriptor Base Address High - RW */
-       E1000_RDLEN    = 0x02808, /* Rx Descriptor Length - RW */
-       E1000_RDH      = 0x02810, /* Rx Descriptor Head - RW */
-       E1000_RDT      = 0x02818, /* Rx Descriptor Tail - RW */
-       E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
-       E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */
-#define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))
-       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_REG(_n)   (E1000_RDBAL + (_n << 8))
-       E1000_KABGTXD  = 0x03004, /* AFE Band Gap Transmit Ref Data */
-       E1000_TDBAL    = 0x03800, /* Tx Descriptor Base Address Low - RW */
-       E1000_TDBAH    = 0x03804, /* Tx Descriptor Base Address High - RW */
-       E1000_TDLEN    = 0x03808, /* Tx Descriptor Length - RW */
-       E1000_TDH      = 0x03810, /* Tx Descriptor Head - RW */
-       E1000_TDT      = 0x03818, /* Tx Descriptor Tail - RW */
-       E1000_TIDV     = 0x03820, /* Tx Interrupt Delay Value - RW */
-       E1000_TXDCTL_BASE = 0x03828, /* Tx Descriptor Control - RW */
-#define E1000_TXDCTL(_n)   (E1000_TXDCTL_BASE + (_n << 8))
-       E1000_TADV     = 0x0382C, /* Tx Interrupt Absolute Delay Val - RW */
-       E1000_TARC_BASE = 0x03840, /* Tx Arbitration Count (0) */
-#define E1000_TARC(_n)   (E1000_TARC_BASE + (_n << 8))
-       E1000_CRCERRS  = 0x04000, /* CRC Error Count - R/clr */
-       E1000_ALGNERRC = 0x04004, /* Alignment Error Count - R/clr */
-       E1000_SYMERRS  = 0x04008, /* Symbol Error Count - R/clr */
-       E1000_RXERRC   = 0x0400C, /* Receive Error Count - R/clr */
-       E1000_MPC      = 0x04010, /* Missed Packet Count - R/clr */
-       E1000_SCC      = 0x04014, /* Single Collision Count - R/clr */
-       E1000_ECOL     = 0x04018, /* Excessive Collision Count - R/clr */
-       E1000_MCC      = 0x0401C, /* Multiple Collision Count - R/clr */
-       E1000_LATECOL  = 0x04020, /* Late Collision Count - R/clr */
-       E1000_COLC     = 0x04028, /* Collision Count - R/clr */
-       E1000_DC       = 0x04030, /* Defer Count - R/clr */
-       E1000_TNCRS    = 0x04034, /* Tx-No CRS - R/clr */
-       E1000_SEC      = 0x04038, /* Sequence Error Count - R/clr */
-       E1000_CEXTERR  = 0x0403C, /* Carrier Extension Error Count - R/clr */
-       E1000_RLEC     = 0x04040, /* Receive Length Error Count - R/clr */
-       E1000_XONRXC   = 0x04048, /* XON Rx Count - R/clr */
-       E1000_XONTXC   = 0x0404C, /* XON Tx Count - R/clr */
-       E1000_XOFFRXC  = 0x04050, /* XOFF Rx Count - R/clr */
-       E1000_XOFFTXC  = 0x04054, /* XOFF Tx Count - R/clr */
-       E1000_FCRUC    = 0x04058, /* Flow Control Rx Unsupported Count- R/clr */
-       E1000_PRC64    = 0x0405C, /* Packets Rx (64 bytes) - R/clr */
-       E1000_PRC127   = 0x04060, /* Packets Rx (65-127 bytes) - R/clr */
-       E1000_PRC255   = 0x04064, /* Packets Rx (128-255 bytes) - R/clr */
-       E1000_PRC511   = 0x04068, /* Packets Rx (255-511 bytes) - R/clr */
-       E1000_PRC1023  = 0x0406C, /* Packets Rx (512-1023 bytes) - R/clr */
-       E1000_PRC1522  = 0x04070, /* Packets Rx (1024-1522 bytes) - R/clr */
-       E1000_GPRC     = 0x04074, /* Good Packets Rx Count - R/clr */
-       E1000_BPRC     = 0x04078, /* Broadcast Packets Rx Count - R/clr */
-       E1000_MPRC     = 0x0407C, /* Multicast Packets Rx Count - R/clr */
-       E1000_GPTC     = 0x04080, /* Good Packets Tx Count - R/clr */
-       E1000_GORCL    = 0x04088, /* Good Octets Rx Count Low - R/clr */
-       E1000_GORCH    = 0x0408C, /* Good Octets Rx Count High - R/clr */
-       E1000_GOTCL    = 0x04090, /* Good Octets Tx Count Low - R/clr */
-       E1000_GOTCH    = 0x04094, /* Good Octets Tx Count High - R/clr */
-       E1000_RNBC     = 0x040A0, /* Rx No Buffers Count - R/clr */
-       E1000_RUC      = 0x040A4, /* Rx Undersize Count - R/clr */
-       E1000_RFC      = 0x040A8, /* Rx Fragment Count - R/clr */
-       E1000_ROC      = 0x040AC, /* Rx Oversize Count - R/clr */
-       E1000_RJC      = 0x040B0, /* Rx Jabber Count - R/clr */
-       E1000_MGTPRC   = 0x040B4, /* Management Packets Rx Count - R/clr */
-       E1000_MGTPDC   = 0x040B8, /* Management Packets Dropped Count - R/clr */
-       E1000_MGTPTC   = 0x040BC, /* Management Packets Tx Count - R/clr */
-       E1000_TORL     = 0x040C0, /* Total Octets Rx Low - R/clr */
-       E1000_TORH     = 0x040C4, /* Total Octets Rx High - R/clr */
-       E1000_TOTL     = 0x040C8, /* Total Octets Tx Low - R/clr */
-       E1000_TOTH     = 0x040CC, /* Total Octets Tx High - R/clr */
-       E1000_TPR      = 0x040D0, /* Total Packets Rx - R/clr */
-       E1000_TPT      = 0x040D4, /* Total Packets Tx - R/clr */
-       E1000_PTC64    = 0x040D8, /* Packets Tx (64 bytes) - R/clr */
-       E1000_PTC127   = 0x040DC, /* Packets Tx (65-127 bytes) - R/clr */
-       E1000_PTC255   = 0x040E0, /* Packets Tx (128-255 bytes) - R/clr */
-       E1000_PTC511   = 0x040E4, /* Packets Tx (256-511 bytes) - R/clr */
-       E1000_PTC1023  = 0x040E8, /* Packets Tx (512-1023 bytes) - R/clr */
-       E1000_PTC1522  = 0x040EC, /* Packets Tx (1024-1522 Bytes) - R/clr */
-       E1000_MPTC     = 0x040F0, /* Multicast Packets Tx Count - R/clr */
-       E1000_BPTC     = 0x040F4, /* Broadcast Packets Tx Count - R/clr */
-       E1000_TSCTC    = 0x040F8, /* TCP Segmentation Context Tx - R/clr */
-       E1000_TSCTFC   = 0x040FC, /* TCP Segmentation Context Tx Fail - R/clr */
-       E1000_IAC      = 0x04100, /* Interrupt Assertion Count */
-       E1000_ICRXPTC  = 0x04104, /* Irq Cause Rx Packet Timer Expire Count */
-       E1000_ICRXATC  = 0x04108, /* Irq Cause Rx Abs Timer Expire Count */
-       E1000_ICTXPTC  = 0x0410C, /* Irq Cause Tx Packet Timer Expire Count */
-       E1000_ICTXATC  = 0x04110, /* Irq Cause Tx Abs Timer Expire Count */
-       E1000_ICTXQEC  = 0x04118, /* Irq Cause Tx Queue Empty Count */
-       E1000_ICTXQMTC = 0x0411C, /* Irq Cause Tx Queue MinThreshold Count */
-       E1000_ICRXDMTC = 0x04120, /* Irq Cause Rx Desc MinThreshold Count */
-       E1000_ICRXOC   = 0x04124, /* Irq Cause Receiver Overrun Count */
-       E1000_RXCSUM   = 0x05000, /* Rx Checksum Control - RW */
-       E1000_RFCTL    = 0x05008, /* Receive Filter Control */
-       E1000_MTA      = 0x05200, /* Multicast Table Array - RW Array */
-       E1000_RAL_BASE = 0x05400, /* Receive Address Low - RW */
-#define E1000_RAL(_n)   (E1000_RAL_BASE + ((_n) * 8))
-#define E1000_RA        (E1000_RAL(0))
-       E1000_RAH_BASE = 0x05404, /* Receive Address High - RW */
-#define E1000_RAH(_n)   (E1000_RAH_BASE + ((_n) * 8))
-       E1000_VFTA     = 0x05600, /* VLAN Filter Table Array - RW Array */
-       E1000_WUC      = 0x05800, /* Wakeup Control - RW */
-       E1000_WUFC     = 0x05808, /* Wakeup Filter Control - RW */
-       E1000_WUS      = 0x05810, /* Wakeup Status - RO */
-       E1000_MANC     = 0x05820, /* Management Control - RW */
-       E1000_FFLT     = 0x05F00, /* Flexible Filter Length Table - RW Array */
-       E1000_HOST_IF  = 0x08800, /* Host Interface */
-
-       E1000_KMRNCTRLSTA = 0x00034, /* MAC-PHY interface - RW */
-       E1000_MANC2H    = 0x05860, /* Management Control To Host - RW */
-       E1000_MDEF_BASE = 0x05890, /* Management Decision Filters */
-#define E1000_MDEF(_n)   (E1000_MDEF_BASE + ((_n) * 4))
-       E1000_SW_FW_SYNC = 0x05B5C, /* Software-Firmware Synchronization - RW */
-       E1000_GCR       = 0x05B00, /* PCI-Ex Control */
-       E1000_GCR2      = 0x05B64, /* PCI-Ex Control #2 */
-       E1000_FACTPS    = 0x05B30, /* Function Active and Power State to MNG */
-       E1000_SWSM      = 0x05B50, /* SW Semaphore */
-       E1000_FWSM      = 0x05B54, /* FW Semaphore */
-       E1000_SWSM2     = 0x05B58, /* Driver-only SW semaphore */
-       E1000_FFLT_DBG  = 0x05F04, /* Debug Register */
-       E1000_PCH_RAICC_BASE = 0x05F50, /* Receive Address Initial CRC */
-#define E1000_PCH_RAICC(_n)    (E1000_PCH_RAICC_BASE + ((_n) * 4))
-#define E1000_CRC_OFFSET       E1000_PCH_RAICC_BASE
-       E1000_HICR      = 0x08F00, /* Host Interface Control */
-};
-
-#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 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 BM_WUC_PAGE                    800
-#define BM_WUC_ADDRESS_OPCODE          0x11
-#define BM_WUC_DATA_OPCODE             0x12
-#define BM_WUC_ENABLE_PAGE             769
-#define BM_WUC_ENABLE_REG              17
-#define BM_WUC_ENABLE_BIT              (1 << 2)
-#define BM_WUC_HOST_WU_BIT             (1 << 4)
-#define BM_WUC_ME_WU_BIT               (1 << 5)
-
-#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 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
-
-#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
-
-/* manage.c */
-#define E1000_VFTA_ENTRY_SHIFT         5
-#define E1000_VFTA_ENTRY_MASK          0x7F
-#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK        0x1F
-
-#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_FW_RESET_ENABLE     0x40
-#define E1000_HICR_FW_RESET            0x80
-
-#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
-
-/* nvm.c */
-#define E1000_STM_OPCODE  0xDB00
-
-#define E1000_KMRNCTRLSTA_OFFSET       0x001F0000
-#define E1000_KMRNCTRLSTA_OFFSET_SHIFT 16
-#define E1000_KMRNCTRLSTA_REN          0x00200000
-#define E1000_KMRNCTRLSTA_CTRL_OFFSET  0x1    /* Kumeran Control */
-#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_IBIST_DISABLE        0x0200 /* Kumeran IBIST Disable */
-#define E1000_KMRNCTRLSTA_DIAG_NELPBK  0x1000 /* Nearend Loopback mode */
-#define E1000_KMRNCTRLSTA_K1_CONFIG    0x7
-#define E1000_KMRNCTRLSTA_K1_ENABLE    0x0002
-#define E1000_KMRNCTRLSTA_HD_CTRL      0x10   /* Kumeran HD Control */
-
-#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
-
-/* 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 */
-
-#define E1000_CABLE_LENGTH_UNDEFINED   0xFF
-
-#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_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_82571EB_SERDES_DUAL       0x10D9
-#define E1000_DEV_ID_82571EB_SERDES_QUAD       0x10DA
-#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_AMT              0x10BD
-#define E1000_DEV_ID_ICH9_BM                   0x10E5
-#define E1000_DEV_ID_ICH9_IGP_M_AMT            0x10F5
-#define E1000_DEV_ID_ICH9_IGP_M                        0x10BF
-#define E1000_DEV_ID_ICH9_IGP_M_V              0x10CB
-#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_ICH10_D_BM_V              0x1525
-#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_4 4
-
-#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_82571,
-       e1000_82572,
-       e1000_82573,
-       e1000_82574,
-       e1000_82583,
-       e1000_80003es2lan,
-       e1000_ich8lan,
-       e1000_ich9lan,
-       e1000_ich10lan,
-       e1000_pchlan,
-       e1000_pch2lan,
-};
-
-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_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_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;
-};
-
-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];
-};
-
-/* Function pointers and static data for the MAC. */
-struct e1000_mac_operations {
-       s32  (*id_led_init)(struct e1000_hw *);
-       s32  (*blink_led)(struct e1000_hw *);
-       bool (*check_mng_mode)(struct e1000_hw *);
-       s32  (*check_for_link)(struct e1000_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);
-       s32  (*read_mac_addr)(struct e1000_hw *);
-};
-
-/*
- * When to use various PHY register access functions:
- *
- *                 Func   Caller
- *   Function      Does   Does    When to use
- *   ~~~~~~~~~~~~  ~~~~~  ~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *   X_reg         L,P,A  n/a     for simple PHY reg accesses
- *   X_reg_locked  P,A    L       for multiple accesses of different regs
- *                                on different pages
- *   X_reg_page    A      L,P     for multiple accesses of different regs
- *                                on the same page
- *
- * Where X=[read|write], L=locking, P=sets page, A=register access
- *
- */
-struct e1000_phy_operations {
-       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 *);
-       s32  (*force_speed_duplex)(struct e1000_hw *);
-       s32  (*get_cfg_done)(struct e1000_hw *hw);
-       s32  (*get_cable_length)(struct e1000_hw *);
-       s32  (*get_info)(struct e1000_hw *);
-       s32  (*set_page)(struct e1000_hw *, u16);
-       s32  (*read_reg)(struct e1000_hw *, u32, u16 *);
-       s32  (*read_reg_locked)(struct e1000_hw *, u32, u16 *);
-       s32  (*read_reg_page)(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);
-       s32  (*write_reg_page)(struct e1000_hw *, u32, u16);
-       void (*power_up)(struct e1000_hw *);
-       void (*power_down)(struct e1000_hw *);
-};
-
-/* Function pointers for the NVM. */
-struct e1000_nvm_operations {
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
-       void (*release)(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[ETH_ALEN];
-       u8 perm_addr[ETH_ALEN];
-
-       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 has_fwsm;
-       bool arc_subsystem_valid;
-       bool autoneg;
-       bool autoneg_failed;
-       bool get_link_status;
-       bool in_ifs_mode;
-       bool serdes_has_link;
-       bool tx_pkt_filtering;
-       enum e1000_serdes_link_state serdes_link_state;
-};
-
-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 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_width width;
-
-       u16 func;
-};
-
-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 */
-       u16 refresh_time;        /* Flow control refresh 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;
-       bool eee_disable;
-};
-
-struct e1000_hw {
-       struct e1000_adapter *adapter;
-
-       u8 __iomem *hw_addr;
-       u8 __iomem *flash_address;
-
-       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     e82571;
-               struct e1000_dev_spec_80003es2lan e80003es2lan;
-               struct e1000_dev_spec_ich8lan   ich8lan;
-       } dev_spec;
-};
-
-#endif
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
deleted file mode 100644 (file)
index 4e36978..0000000
+++ /dev/null
@@ -1,4111 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-/*
- * 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
- * 82579LM Gigabit Network Connection
- * 82579V Gigabit Network Connection
- */
-
-#include "e1000.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
-#define ICH_FLASH_PR0                  0x0074
-
-#define ICH_FLASH_READ_COMMAND_TIMEOUT 500
-#define ICH_FLASH_WRITE_COMMAND_TIMEOUT        500
-#define ICH_FLASH_ERASE_COMMAND_TIMEOUT        3000000
-#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 E1000_ICH_FWSM_RSPCIPHY        0x00000040 /* Reset PHY on PCI Reset */
-/* 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_DEF1_OFF2 <<  8) | \
-                                (ID_LED_DEF1_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 E1000_FEXTNVM4_BEACON_DURATION_MASK    0x7
-#define E1000_FEXTNVM4_BEACON_DURATION_8USEC   0x7
-#define E1000_FEXTNVM4_BEACON_DURATION_16USEC  0x3
-
-#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_KMRN_DIAG_PCS_LOCK_LOSS   0x0002
-#define IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK 0x0300
-#define IGP3_VR_CTRL_MODE_SHUTDOWN     0x0200
-
-#define HV_LED_CONFIG          PHY_REG(768, 30) /* LED Configuration */
-
-#define SW_FLAG_TIMEOUT    1000 /* SW Semaphore flag timeout in milliseconds */
-
-/* SMBus Address Phy Register */
-#define HV_SMB_ADDR            PHY_REG(768, 26)
-#define HV_SMB_ADDR_MASK       0x007F
-#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)
-
-/* PHY Low Power Idle Control */
-#define I82579_LPI_CTRL                        PHY_REG(772, 20)
-#define I82579_LPI_CTRL_ENABLE_MASK    0x6000
-
-/* EMI Registers */
-#define I82579_EMI_ADDR         0x10
-#define I82579_EMI_DATA         0x11
-#define I82579_LPI_UPDATE_TIMER 0x4805 /* in 40ns units + 40 ns base value */
-
-/* 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 E1000_NVM_K1_CONFIG 0x1B /* NVM K1 Config Word */
-#define E1000_NVM_K1_ENABLE 0x1  /* NVM Enable K1 bit */
-
-/* KMRN Mode Control */
-#define HV_KMRN_MODE_CTRL      PHY_REG(769, 16)
-#define HV_KMRN_MDIO_SLOW      0x0400
-
-/* 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;
-};
-
-/* ICH Flash Protected Region */
-union ich8_flash_protected_range {
-       struct ich8_pr {
-               u32 base:13;     /* 0:12 Protected Range Base */
-               u32 reserved1:2; /* 13:14 Reserved */
-               u32 rpe:1;       /* 15 Read Protection Enable */
-               u32 limit:13;    /* 16:28 Protected Range Limit */
-               u32 reserved2:2; /* 29:30 Reserved */
-               u32 wpe:1;       /* 31 Write Protection Enable */
-       } range;
-       u32 regval;
-};
-
-static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw);
-static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw);
-static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw);
-static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank);
-static s32 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
-                                               u32 offset, u8 byte);
-static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
-                                        u8 *data);
-static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
-                                        u16 *data);
-static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
-                                        u8 size, u16 *data);
-static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw);
-static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw);
-static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw);
-static s32 e1000_cleanup_led_ich8lan(struct e1000_hw *hw);
-static s32 e1000_led_on_ich8lan(struct e1000_hw *hw);
-static s32 e1000_led_off_ich8lan(struct e1000_hw *hw);
-static s32 e1000_id_led_init_pchlan(struct e1000_hw *hw);
-static s32 e1000_setup_led_pchlan(struct e1000_hw *hw);
-static s32 e1000_cleanup_led_pchlan(struct e1000_hw *hw);
-static s32 e1000_led_on_pchlan(struct e1000_hw *hw);
-static s32 e1000_led_off_pchlan(struct e1000_hw *hw);
-static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active);
-static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
-static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw);
-static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
-static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
-static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
-static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
-static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);
-static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);
-
-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))
-
-static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
-{
-       u32 ctrl;
-
-       ctrl = er32(CTRL);
-       ctrl |= E1000_CTRL_LANPHYPC_OVERRIDE;
-       ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
-       ew32(CTRL, ctrl);
-       e1e_flush();
-       udelay(10);
-       ctrl &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
-       ew32(CTRL, ctrl);
-}
-
-/**
- *  e1000_init_phy_params_pchlan - Initialize PHY function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific PHY parameters and function pointers.
- **/
-static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 fwsm;
-       s32 ret_val = 0;
-
-       phy->addr                     = 1;
-       phy->reset_delay_us           = 100;
-
-       phy->ops.set_page             = e1000_set_page_igp;
-       phy->ops.read_reg             = e1000_read_phy_reg_hv;
-       phy->ops.read_reg_locked      = e1000_read_phy_reg_hv_locked;
-       phy->ops.read_reg_page        = e1000_read_phy_reg_page_hv;
-       phy->ops.set_d0_lplu_state    = e1000_set_lplu_state_pchlan;
-       phy->ops.set_d3_lplu_state    = e1000_set_lplu_state_pchlan;
-       phy->ops.write_reg            = e1000_write_phy_reg_hv;
-       phy->ops.write_reg_locked     = e1000_write_phy_reg_hv_locked;
-       phy->ops.write_reg_page       = e1000_write_phy_reg_page_hv;
-       phy->ops.power_up             = e1000_power_up_phy_copper;
-       phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;
-       phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-
-       /*
-        * The MAC-PHY interconnect may still be in SMBus mode
-        * after Sx->S0.  If the manageability engine (ME) is
-        * disabled, then toggle the LANPHYPC Value bit to force
-        * the interconnect to PCIe mode.
-        */
-       fwsm = er32(FWSM);
-       if (!(fwsm & E1000_ICH_FWSM_FW_VALID) && !e1000_check_reset_block(hw)) {
-               e1000_toggle_lanphypc_value_ich8lan(hw);
-               msleep(50);
-
-               /*
-                * Gate automatic PHY configuration by hardware on
-                * non-managed 82579
-                */
-               if (hw->mac.type == e1000_pch2lan)
-                       e1000_gate_hw_phy_config_ich8lan(hw, true);
-       }
-
-       /*
-        * Reset the PHY before any access to it.  Doing so, ensures that
-        * the PHY is in a known good state before we read/write PHY registers.
-        * The generic reset is sufficient here, because we haven't determined
-        * the PHY type yet.
-        */
-       ret_val = e1000e_phy_hw_reset_generic(hw);
-       if (ret_val)
-               goto out;
-
-       /* Ungate automatic PHY configuration on non-managed 82579 */
-       if ((hw->mac.type == e1000_pch2lan) &&
-           !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
-               usleep_range(10000, 20000);
-               e1000_gate_hw_phy_config_ich8lan(hw, false);
-       }
-
-       phy->id = e1000_phy_unknown;
-       switch (hw->mac.type) {
-       default:
-               ret_val = e1000e_get_phy_id(hw);
-               if (ret_val)
-                       goto out;
-               if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
-                       break;
-               /* fall-through */
-       case e1000_pch2lan:
-               /*
-                * In case the PHY needs to be in mdio slow mode,
-                * set slow mode and try to get the PHY id again.
-                */
-               ret_val = e1000_set_mdio_slow_mode_hv(hw);
-               if (ret_val)
-                       goto out;
-               ret_val = e1000e_get_phy_id(hw);
-               if (ret_val)
-                       goto out;
-               break;
-       }
-       phy->type = e1000e_get_phy_type_from_id(phy->id);
-
-       switch (phy->type) {
-       case e1000_phy_82577:
-       case e1000_phy_82579:
-               phy->ops.check_polarity = e1000_check_polarity_82577;
-               phy->ops.force_speed_duplex =
-                   e1000_phy_force_speed_duplex_82577;
-               phy->ops.get_cable_length = e1000_get_cable_length_82577;
-               phy->ops.get_info = e1000_get_phy_info_82577;
-               phy->ops.commit = e1000e_phy_sw_reset;
-               break;
-       case e1000_phy_82578:
-               phy->ops.check_polarity = e1000_check_polarity_m88;
-               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
-               phy->ops.get_cable_length = e1000e_get_cable_length_m88;
-               phy->ops.get_info = e1000e_get_phy_info_m88;
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               break;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_init_phy_params_ich8lan - Initialize PHY function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific PHY parameters and function pointers.
- **/
-static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 i = 0;
-
-       phy->addr                       = 1;
-       phy->reset_delay_us             = 100;
-
-       phy->ops.power_up               = e1000_power_up_phy_copper;
-       phy->ops.power_down             = e1000_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) {
-                       e_dbg("Cannot determine PHY addr. Erroring out\n");
-                       return ret_val;
-               }
-       }
-
-       phy->id = 0;
-       while ((e1000_phy_unknown == e1000e_get_phy_type_from_id(phy->id)) &&
-              (i++ < 100)) {
-               usleep_range(1000, 2000);
-               ret_val = e1000e_get_phy_id(hw);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* 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;
-               phy->ops.get_info = e1000e_get_phy_info_igp;
-               phy->ops.check_polarity = e1000_check_polarity_igp;
-               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_igp;
-               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;
-               phy->ops.get_info = e1000_get_phy_info_ife;
-               phy->ops.check_polarity = e1000_check_polarity_ife;
-               phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_ife;
-               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;
-               phy->ops.get_info = e1000e_get_phy_info_m88;
-               phy->ops.check_polarity = e1000_check_polarity_m88;
-               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
-               break;
-       default:
-               return -E1000_ERR_PHY;
-               break;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_init_nvm_params_ich8lan - Initialize NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific NVM parameters and function
- *  pointers.
- **/
-static s32 e1000_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;
-       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");
-               return -E1000_ERR_CONFIG;
-       }
-
-       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;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_init_mac_params_ich8lan - Initialize MAC function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific MAC parameters and function
- *  pointers.
- **/
-static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->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--;
-       /* FWSM register */
-       mac->has_fwsm = true;
-       /* ARC subsystem not supported */
-       mac->arc_subsystem_valid = false;
-       /* Adaptive IFS supported */
-       mac->adaptive_ifs = true;
-
-       /* LED operations */
-       switch (mac->type) {
-       case e1000_ich8lan:
-       case e1000_ich9lan:
-       case e1000_ich10lan:
-               /* check management mode */
-               mac->ops.check_mng_mode = e1000_check_mng_mode_ich8lan;
-               /* ID LED init */
-               mac->ops.id_led_init = e1000e_id_led_init;
-               /* blink LED */
-               mac->ops.blink_led = e1000e_blink_led_generic;
-               /* setup LED */
-               mac->ops.setup_led = e1000e_setup_led_generic;
-               /* cleanup LED */
-               mac->ops.cleanup_led = e1000_cleanup_led_ich8lan;
-               /* turn on/off LED */
-               mac->ops.led_on = e1000_led_on_ich8lan;
-               mac->ops.led_off = e1000_led_off_ich8lan;
-               break;
-       case e1000_pchlan:
-       case e1000_pch2lan:
-               /* check management mode */
-               mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
-               /* ID LED init */
-               mac->ops.id_led_init = e1000_id_led_init_pchlan;
-               /* setup LED */
-               mac->ops.setup_led = e1000_setup_led_pchlan;
-               /* cleanup LED */
-               mac->ops.cleanup_led = e1000_cleanup_led_pchlan;
-               /* turn on/off LED */
-               mac->ops.led_on = e1000_led_on_pchlan;
-               mac->ops.led_off = e1000_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);
-
-       /* Gate automatic PHY configuration by hardware on managed 82579 */
-       if ((mac->type == e1000_pch2lan) &&
-           (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
-               e1000_gate_hw_phy_config_ich8lan(hw, true);
-
-       return 0;
-}
-
-/**
- *  e1000_set_eee_pchlan - Enable/disable EEE support
- *  @hw: pointer to the HW structure
- *
- *  Enable/disable EEE based on setting in dev_spec structure.  The bits in
- *  the LPI Control register will remain set only if/when link is up.
- **/
-static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 phy_reg;
-
-       if (hw->phy.type != e1000_phy_82579)
-               goto out;
-
-       ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg);
-       if (ret_val)
-               goto out;
-
-       if (hw->dev_spec.ich8lan.eee_disable)
-               phy_reg &= ~I82579_LPI_CTRL_ENABLE_MASK;
-       else
-               phy_reg |= I82579_LPI_CTRL_ENABLE_MASK;
-
-       ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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 = 0;
-               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 = e1000_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 = e1000_link_stall_workaround_hv(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (hw->mac.type == e1000_pch2lan) {
-               ret_val = e1000_k1_workaround_lv(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Check if there was DownShift, must be checked
-        * immediately after link-up
-        */
-       e1000e_check_downshift(hw);
-
-       /* Enable/Disable EEE after link up */
-       ret_val = e1000_set_eee_pchlan(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * 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;
-}
-
-static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       s32 rc;
-
-       rc = e1000_init_mac_params_ich8lan(adapter);
-       if (rc)
-               return rc;
-
-       rc = e1000_init_nvm_params_ich8lan(hw);
-       if (rc)
-               return rc;
-
-       switch (hw->mac.type) {
-       case e1000_ich8lan:
-       case e1000_ich9lan:
-       case e1000_ich10lan:
-               rc = e1000_init_phy_params_ich8lan(hw);
-               break;
-       case e1000_pchlan:
-       case e1000_pch2lan:
-               rc = e1000_init_phy_params_pchlan(hw);
-               break;
-       default:
-               break;
-       }
-       if (rc)
-               return rc;
-
-       /*
-        * Disable Jumbo Frame support on parts with Intel 10/100 PHY or
-        * on parts with MACsec enabled in NVM (reflected in CTRL_EXT).
-        */
-       if ((adapter->hw.phy.type == e1000_phy_ife) ||
-           ((adapter->hw.mac.type >= e1000_pch2lan) &&
-            (!(er32(CTRL_EXT) & E1000_CTRL_EXT_LSECCK)))) {
-               adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES;
-               adapter->max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN;
-
-               hw->mac.ops.blink_led = NULL;
-       }
-
-       if ((adapter->hw.mac.type == e1000_ich8lan) &&
-           (adapter->hw.phy.type == e1000_phy_igp_3))
-               adapter->flags |= FLAG_LSC_GIG_SPEED_DROP;
-
-       /* Disable EEE by default until IEEE802.3az spec is finalized */
-       if (adapter->flags2 & FLAG2_HAS_EEE)
-               adapter->hw.dev_spec.ich8lan.eee_disable = true;
-
-       return 0;
-}
-
-static DEFINE_MUTEX(nvm_mutex);
-
-/**
- *  e1000_acquire_nvm_ich8lan - Acquire NVM mutex
- *  @hw: pointer to the HW structure
- *
- *  Acquires the mutex for performing NVM operations.
- **/
-static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw)
-{
-       mutex_lock(&nvm_mutex);
-
-       return 0;
-}
-
-/**
- *  e1000_release_nvm_ich8lan - Release NVM mutex
- *  @hw: pointer to the HW structure
- *
- *  Releases the mutex used while performing NVM operations.
- **/
-static void e1000_release_nvm_ich8lan(struct e1000_hw *hw)
-{
-       mutex_unlock(&nvm_mutex);
-}
-
-static DEFINE_MUTEX(swflag_mutex);
-
-/**
- *  e1000_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 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
-{
-       u32 extcnf_ctrl, timeout = PHY_CFG_TIMEOUT;
-       s32 ret_val = 0;
-
-       mutex_lock(&swflag_mutex);
-
-       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 (ret_val)
-               mutex_unlock(&swflag_mutex);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_release_swflag_ich8lan(struct e1000_hw *hw)
-{
-       u32 extcnf_ctrl;
-
-       extcnf_ctrl = er32(EXTCNF_CTRL);
-
-       if (extcnf_ctrl & E1000_EXTCNF_CTRL_SWFLAG) {
-               extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
-               ew32(EXTCNF_CTRL, extcnf_ctrl);
-       } else {
-               e_dbg("Semaphore unexpectedly released by sw/fw/hw\n");
-       }
-
-       mutex_unlock(&swflag_mutex);
-}
-
-/**
- *  e1000_check_mng_mode_ich8lan - Checks management mode
- *  @hw: pointer to the HW structure
- *
- *  This checks if the adapter has any manageability enabled.
- *  This is a function pointer entry point only called by read/write
- *  routines for the PHY and NVM parts.
- **/
-static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       fwsm = er32(FWSM);
-       return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
-              ((fwsm & E1000_FWSM_MODE_MASK) ==
-               (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
-}
-
-/**
- *  e1000_check_mng_mode_pchlan - Checks management mode
- *  @hw: pointer to the HW structure
- *
- *  This checks if the adapter has iAMT enabled.
- *  This is a function pointer entry point only called by read/write
- *  routines for the PHY and NVM parts.
- **/
-static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       fwsm = er32(FWSM);
-       return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
-              (fwsm & (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
-}
-
-/**
- *  e1000_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 e1000_check_reset_block_ich8lan(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       fwsm = er32(FWSM);
-
-       return (fwsm & E1000_ICH_FWSM_RSPCIPHY) ? 0 : E1000_BLK_PHY_RESET;
-}
-
-/**
- *  e1000_write_smbus_addr - Write SMBus address to PHY needed during Sx states
- *  @hw: pointer to the HW structure
- *
- *  Assumes semaphore already acquired.
- *
- **/
-static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
-{
-       u16 phy_data;
-       u32 strap = er32(STRAP);
-       s32 ret_val = 0;
-
-       strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
-
-       ret_val = e1000_read_phy_reg_hv_locked(hw, HV_SMB_ADDR, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~HV_SMB_ADDR_MASK;
-       phy_data |= (strap >> E1000_STRAP_SMBUS_ADDRESS_SHIFT);
-       phy_data |= HV_SMB_ADDR_PEC_EN | HV_SMB_ADDR_VALID;
-       ret_val = e1000_write_phy_reg_hv_locked(hw, HV_SMB_ADDR, phy_data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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 = 0;
-       u16 word_addr, reg_data, reg_addr, phy_page = 0;
-
-       /*
-        * 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.
-        */
-       switch (hw->mac.type) {
-       case e1000_ich8lan:
-               if (phy->type != e1000_phy_igp_3)
-                       return ret_val;
-
-               if ((hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) ||
-                   (hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_C)) {
-                       sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
-                       break;
-               }
-               /* Fall-thru */
-       case e1000_pchlan:
-       case e1000_pch2lan:
-               sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
-               break;
-       default:
-               return ret_val;
-       }
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       data = er32(FEXTNVM);
-       if (!(data & sw_cfg_mask))
-               goto out;
-
-       /*
-        * Make sure HW does not configure LCD from PHY
-        * extended configuration before SW configuration
-        */
-       data = er32(EXTCNF_CTRL);
-       if (!(hw->mac.type == e1000_pch2lan)) {
-               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.
-                */
-               ret_val = e1000_write_smbus_addr(hw);
-               if (ret_val)
-                       goto out;
-
-               data = er32(LEDCTL);
-               ret_val = e1000_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 = e1000_read_nvm(hw, (word_addr + i * 2), 1,
-                                        &reg_data);
-               if (ret_val)
-                       goto out;
-
-               ret_val = e1000_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;
-}
-
-/**
- *  e1000_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 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
-{
-       s32 ret_val = 0;
-       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 = e1000_configure_k1_ich8lan(hw, k1_enable);
-
-release:
-       hw->phy.ops.release(hw);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
-{
-       s32 ret_val = 0;
-       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);
-
-       ew32(CTRL_EXT, ctrl_ext | E1000_CTRL_EXT_SPD_BYPS);
-       e1e_flush();
-       udelay(20);
-       ew32(CTRL, ctrl_reg);
-       ew32(CTRL_EXT, ctrl_ext);
-       e1e_flush();
-       udelay(20);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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.
- **/
-static s32 e1000_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_pch2lan) && (hw->mac.type != e1000_pchlan))
-               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 (!e1000_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;
-}
-
-
-/**
- *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
- *  @hw:   pointer to the HW structure
- **/
-static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 data;
-
-       ret_val = e1e_rphy(hw, HV_KMRN_MODE_CTRL, &data);
-       if (ret_val)
-               return ret_val;
-
-       data |= HV_KMRN_MDIO_SLOW;
-
-       ret_val = e1e_wphy(hw, HV_KMRN_MODE_CTRL, data);
-
-       return ret_val;
-}
-
-/**
- *  e1000_hv_phy_workarounds_ich8lan - A series of Phy workarounds to be
- *  done after every PHY reset.
- **/
-static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 phy_data;
-
-       if (hw->mac.type != e1000_pchlan)
-               return ret_val;
-
-       /* Set MDIO slow mode before any other MDIO access */
-       if (hw->phy.type == e1000_phy_82577) {
-               ret_val = e1000_set_mdio_slow_mode_hv(hw);
-               if (ret_val)
-                       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)
-                       return ret_val;
-
-               /* Preamble tuning for SSC */
-               ret_val = e1e_wphy(hw, PHY_REG(770, 16), 0xA204);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       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)
-               return ret_val;
-
-       hw->phy.addr = 1;
-       ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, 0);
-       hw->phy.ops.release(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Configure the K1 Si workaround during phy reset assuming there is
-        * link so that it disables K1 if link is in 1Gbps.
-        */
-       ret_val = e1000_k1_gig_workaround_hv(hw, true);
-       if (ret_val)
-               goto out;
-
-       /* Workaround for link disconnects on a busy hub in half duplex */
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-       ret_val = hw->phy.ops.read_reg_locked(hw, BM_PORT_GEN_CFG, &phy_data);
-       if (ret_val)
-               goto release;
-       ret_val = hw->phy.ops.write_reg_locked(hw, BM_PORT_GEN_CFG,
-                                              phy_data & 0x00FF);
-release:
-       hw->phy.ops.release(hw);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_copy_rx_addrs_to_phy_ich8lan - Copy Rx addresses from MAC to PHY
- *  @hw:   pointer to the HW structure
- **/
-void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw)
-{
-       u32 mac_reg;
-       u16 i, phy_reg = 0;
-       s32 ret_val;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return;
-       ret_val = e1000_enable_phy_wakeup_reg_access_bm(hw, &phy_reg);
-       if (ret_val)
-               goto release;
-
-       /* Copy both RAL/H (rar_entry_count) and SHRAL/H (+4) to PHY */
-       for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
-               mac_reg = er32(RAL(i));
-               hw->phy.ops.write_reg_page(hw, BM_RAR_L(i),
-                                          (u16)(mac_reg & 0xFFFF));
-               hw->phy.ops.write_reg_page(hw, BM_RAR_M(i),
-                                          (u16)((mac_reg >> 16) & 0xFFFF));
-
-               mac_reg = er32(RAH(i));
-               hw->phy.ops.write_reg_page(hw, BM_RAR_H(i),
-                                          (u16)(mac_reg & 0xFFFF));
-               hw->phy.ops.write_reg_page(hw, BM_RAR_CTRL(i),
-                                          (u16)((mac_reg & E1000_RAH_AV)
-                                                >> 16));
-       }
-
-       e1000_disable_phy_wakeup_reg_access_bm(hw, &phy_reg);
-
-release:
-       hw->phy.ops.release(hw);
-}
-
-/**
- *  e1000_lv_jumbo_workaround_ich8lan - required for jumbo frame operation
- *  with 82579 PHY
- *  @hw: pointer to the HW structure
- *  @enable: flag to enable/disable workaround when enabling/disabling jumbos
- **/
-s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
-{
-       s32 ret_val = 0;
-       u16 phy_reg, data;
-       u32 mac_reg;
-       u16 i;
-
-       if (hw->mac.type != e1000_pch2lan)
-               goto out;
-
-       /* disable Rx path while enabling/disabling workaround */
-       e1e_rphy(hw, PHY_REG(769, 20), &phy_reg);
-       ret_val = e1e_wphy(hw, PHY_REG(769, 20), phy_reg | (1 << 14));
-       if (ret_val)
-               goto out;
-
-       if (enable) {
-               /*
-                * Write Rx addresses (rar_entry_count for RAL/H, +4 for
-                * SHRAL/H) and initial CRC values to the MAC
-                */
-               for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
-                       u8 mac_addr[ETH_ALEN] = {0};
-                       u32 addr_high, addr_low;
-
-                       addr_high = er32(RAH(i));
-                       if (!(addr_high & E1000_RAH_AV))
-                               continue;
-                       addr_low = er32(RAL(i));
-                       mac_addr[0] = (addr_low & 0xFF);
-                       mac_addr[1] = ((addr_low >> 8) & 0xFF);
-                       mac_addr[2] = ((addr_low >> 16) & 0xFF);
-                       mac_addr[3] = ((addr_low >> 24) & 0xFF);
-                       mac_addr[4] = (addr_high & 0xFF);
-                       mac_addr[5] = ((addr_high >> 8) & 0xFF);
-
-                       ew32(PCH_RAICC(i), ~ether_crc_le(ETH_ALEN, mac_addr));
-               }
-
-               /* Write Rx addresses to the PHY */
-               e1000_copy_rx_addrs_to_phy_ich8lan(hw);
-
-               /* Enable jumbo frame workaround in the MAC */
-               mac_reg = er32(FFLT_DBG);
-               mac_reg &= ~(1 << 14);
-               mac_reg |= (7 << 15);
-               ew32(FFLT_DBG, mac_reg);
-
-               mac_reg = er32(RCTL);
-               mac_reg |= E1000_RCTL_SECRC;
-               ew32(RCTL, mac_reg);
-
-               ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                               &data);
-               if (ret_val)
-                       goto out;
-               ret_val = e1000e_write_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                               data | (1 << 0));
-               if (ret_val)
-                       goto out;
-               ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_HD_CTRL,
-                                               &data);
-               if (ret_val)
-                       goto out;
-               data &= ~(0xF << 8);
-               data |= (0xB << 8);
-               ret_val = e1000e_write_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_HD_CTRL,
-                                               data);
-               if (ret_val)
-                       goto out;
-
-               /* Enable jumbo frame workaround in the PHY */
-               e1e_rphy(hw, PHY_REG(769, 23), &data);
-               data &= ~(0x7F << 5);
-               data |= (0x37 << 5);
-               ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);
-               if (ret_val)
-                       goto out;
-               e1e_rphy(hw, PHY_REG(769, 16), &data);
-               data &= ~(1 << 13);
-               ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
-               if (ret_val)
-                       goto out;
-               e1e_rphy(hw, PHY_REG(776, 20), &data);
-               data &= ~(0x3FF << 2);
-               data |= (0x1A << 2);
-               ret_val = e1e_wphy(hw, PHY_REG(776, 20), data);
-               if (ret_val)
-                       goto out;
-               ret_val = e1e_wphy(hw, PHY_REG(776, 23), 0xFE00);
-               if (ret_val)
-                       goto out;
-               e1e_rphy(hw, HV_PM_CTRL, &data);
-               ret_val = e1e_wphy(hw, HV_PM_CTRL, data | (1 << 10));
-               if (ret_val)
-                       goto out;
-       } else {
-               /* Write MAC register values back to h/w defaults */
-               mac_reg = er32(FFLT_DBG);
-               mac_reg &= ~(0xF << 14);
-               ew32(FFLT_DBG, mac_reg);
-
-               mac_reg = er32(RCTL);
-               mac_reg &= ~E1000_RCTL_SECRC;
-               ew32(RCTL, mac_reg);
-
-               ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                               &data);
-               if (ret_val)
-                       goto out;
-               ret_val = e1000e_write_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
-                                               data & ~(1 << 0));
-               if (ret_val)
-                       goto out;
-               ret_val = e1000e_read_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_HD_CTRL,
-                                               &data);
-               if (ret_val)
-                       goto out;
-               data &= ~(0xF << 8);
-               data |= (0xB << 8);
-               ret_val = e1000e_write_kmrn_reg(hw,
-                                               E1000_KMRNCTRLSTA_HD_CTRL,
-                                               data);
-               if (ret_val)
-                       goto out;
-
-               /* Write PHY register values back to h/w defaults */
-               e1e_rphy(hw, PHY_REG(769, 23), &data);
-               data &= ~(0x7F << 5);
-               ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);
-               if (ret_val)
-                       goto out;
-               e1e_rphy(hw, PHY_REG(769, 16), &data);
-               data |= (1 << 13);
-               ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
-               if (ret_val)
-                       goto out;
-               e1e_rphy(hw, PHY_REG(776, 20), &data);
-               data &= ~(0x3FF << 2);
-               data |= (0x8 << 2);
-               ret_val = e1e_wphy(hw, PHY_REG(776, 20), data);
-               if (ret_val)
-                       goto out;
-               ret_val = e1e_wphy(hw, PHY_REG(776, 23), 0x7E00);
-               if (ret_val)
-                       goto out;
-               e1e_rphy(hw, HV_PM_CTRL, &data);
-               ret_val = e1e_wphy(hw, HV_PM_CTRL, data & ~(1 << 10));
-               if (ret_val)
-                       goto out;
-       }
-
-       /* re-enable Rx path after enabling/disabling workaround */
-       ret_val = e1e_wphy(hw, PHY_REG(769, 20), phy_reg & ~(1 << 14));
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_lv_phy_workarounds_ich8lan - A series of Phy workarounds to be
- *  done after every PHY reset.
- **/
-static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-
-       if (hw->mac.type != e1000_pch2lan)
-               goto out;
-
-       /* Set MDIO slow mode before any other MDIO access */
-       ret_val = e1000_set_mdio_slow_mode_hv(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_k1_gig_workaround_lv - K1 Si workaround
- *  @hw:   pointer to the HW structure
- *
- *  Workaround to set the K1 beacon duration for 82579 parts
- **/
-static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 status_reg = 0;
-       u32 mac_reg;
-
-       if (hw->mac.type != e1000_pch2lan)
-               goto out;
-
-       /* Set K1 beacon duration based on 1Gbps speed or otherwise */
-       ret_val = e1e_rphy(hw, HV_M_STATUS, &status_reg);
-       if (ret_val)
-               goto out;
-
-       if ((status_reg & (HV_M_STATUS_LINK_UP | HV_M_STATUS_AUTONEG_COMPLETE))
-           == (HV_M_STATUS_LINK_UP | HV_M_STATUS_AUTONEG_COMPLETE)) {
-               mac_reg = er32(FEXTNVM4);
-               mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK;
-
-               if (status_reg & HV_M_STATUS_SPEED_1000)
-                       mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC;
-               else
-                       mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_16USEC;
-
-               ew32(FEXTNVM4, mac_reg);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_gate_hw_phy_config_ich8lan - disable PHY config via hardware
- *  @hw:   pointer to the HW structure
- *  @gate: boolean set to true to gate, false to ungate
- *
- *  Gate/ungate the automatic PHY configuration via hardware; perform
- *  the configuration via software instead.
- **/
-static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
-{
-       u32 extcnf_ctrl;
-
-       if (hw->mac.type != e1000_pch2lan)
-               return;
-
-       extcnf_ctrl = er32(EXTCNF_CTRL);
-
-       if (gate)
-               extcnf_ctrl |= E1000_EXTCNF_CTRL_GATE_PHY_CFG;
-       else
-               extcnf_ctrl &= ~E1000_EXTCNF_CTRL_GATE_PHY_CFG;
-
-       ew32(EXTCNF_CTRL, extcnf_ctrl);
-       return;
-}
-
-/**
- *  e1000_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 e1000_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);
-}
-
-/**
- *  e1000_post_phy_reset_ich8lan - Perform steps required after a PHY reset
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 reg;
-
-       if (e1000_check_reset_block(hw))
-               goto out;
-
-       /* Allow time for h/w to get to quiescent state after reset */
-       usleep_range(10000, 20000);
-
-       /* Perform any necessary post-reset workarounds */
-       switch (hw->mac.type) {
-       case e1000_pchlan:
-               ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
-               if (ret_val)
-                       goto out;
-               break;
-       case e1000_pch2lan:
-               ret_val = e1000_lv_phy_workarounds_ich8lan(hw);
-               if (ret_val)
-                       goto out;
-               break;
-       default:
-               break;
-       }
-
-       /* Clear the host wakeup bit after lcd reset */
-       if (hw->mac.type >= e1000_pchlan) {
-               e1e_rphy(hw, BM_PORT_GEN_CFG, &reg);
-               reg &= ~BM_WUC_HOST_WU_BIT;
-               e1e_wphy(hw, BM_PORT_GEN_CFG, reg);
-       }
-
-       /* Configure the LCD with the extended configuration region in NVM */
-       ret_val = e1000_sw_lcd_config_ich8lan(hw);
-       if (ret_val)
-               goto out;
-
-       /* Configure the LCD with the OEM bits in NVM */
-       ret_val = e1000_oem_bits_config_ich8lan(hw, true);
-
-       if (hw->mac.type == e1000_pch2lan) {
-               /* Ungate automatic PHY configuration on non-managed 82579 */
-               if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
-                       usleep_range(10000, 20000);
-                       e1000_gate_hw_phy_config_ich8lan(hw, false);
-               }
-
-               /* Set EEE LPI Update Timer to 200usec */
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-               ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
-                                                      I82579_LPI_UPDATE_TIMER);
-               if (ret_val)
-                       goto release;
-               ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA,
-                                                      0x1387);
-release:
-               hw->phy.ops.release(hw);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-
-       /* Gate automatic PHY configuration by hardware on non-managed 82579 */
-       if ((hw->mac.type == e1000_pch2lan) &&
-           !(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
-               e1000_gate_hw_phy_config_ich8lan(hw, true);
-
-       ret_val = e1000e_phy_hw_reset_generic(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_post_phy_reset_ich8lan(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)
-{
-       s32 ret_val = 0;
-       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;
-}
-
-/**
- *  e1000_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 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 phy_ctrl;
-       s32 ret_val = 0;
-       u16 data;
-
-       if (phy->type == e1000_phy_ife)
-               return ret_val;
-
-       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)
-                       return 0;
-
-               /*
-                * 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)
-                       return ret_val;
-       } else {
-               phy_ctrl &= ~E1000_PHY_CTRL_D0A_LPLU;
-               ew32(PHY_CTRL, phy_ctrl);
-
-               if (phy->type != e1000_phy_igp_3)
-                       return 0;
-
-               /*
-                * 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)
-                               return ret_val;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
-                       if (ret_val)
-                               return ret_val;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 phy_ctrl;
-       s32 ret_val;
-       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)
-                       return 0;
-
-               /*
-                * 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)
-                               return ret_val;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
-                       if (ret_val)
-                               return ret_val;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               }
-       } 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)
-                       return 0;
-
-               /*
-                * 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)
-                       return ret_val;
-
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG, data);
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_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 = 0;
-
-       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;
-
-                       return 0;
-               }
-               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 = e1000_read_flash_byte_ich8lan(hw, act_offset,
-                                                       &sig_byte);
-               if (ret_val)
-                       return ret_val;
-               if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
-                   E1000_ICH_NVM_SIG_VALUE) {
-                       *bank = 0;
-                       return 0;
-               }
-
-               /* Check bank 1 */
-               ret_val = e1000_read_flash_byte_ich8lan(hw, act_offset +
-                                                       bank1_offset,
-                                                       &sig_byte);
-               if (ret_val)
-                       return ret_val;
-               if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
-                   E1000_ICH_NVM_SIG_VALUE) {
-                       *bank = 1;
-                       return 0;
-               }
-
-               e_dbg("ERROR: No valid NVM bank present\n");
-               return -E1000_ERR_NVM;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_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 = 0;
-       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 = e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
-       if (ret_val) {
-               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 = 0;
-       for (i = 0; i < words; i++) {
-               if (dev_spec->shadow_ram[offset+i].modified) {
-                       data[i] = dev_spec->shadow_ram[offset+i].value;
-               } else {
-                       ret_val = e1000_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;
-}
-
-/**
- *  e1000_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 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
-{
-       union ich8_hws_flash_status hsfsts;
-       s32 ret_val = -E1000_ERR_NVM;
-
-       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.\n");
-               return -E1000_ERR_NVM;
-       }
-
-       /* 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 = 0;
-       } else {
-               s32 i = 0;
-
-               /*
-                * 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(hw, ICH_FLASH_HSFSTS);
-                       if (hsfsts.hsf_status.flcinprog == 0) {
-                               ret_val = 0;
-                               break;
-                       }
-                       udelay(1);
-               }
-               if (ret_val == 0) {
-                       /*
-                        * 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\n");
-               }
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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)
-               return 0;
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
-                                        u16 *data)
-{
-       /* Must convert offset into bytes. */
-       offset <<= 1;
-
-       return e1000_read_flash_data_ich8lan(hw, offset, 2, data);
-}
-
-/**
- *  e1000_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 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
-                                        u8 *data)
-{
-       s32 ret_val;
-       u16 word = 0;
-
-       ret_val = e1000_read_flash_data_ich8lan(hw, offset, 1, &word);
-       if (ret_val)
-               return ret_val;
-
-       *data = (u8)word;
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_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)
-               return -E1000_ERR_NVM;
-
-       flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-                           hw->nvm.flash_base_addr;
-
-       do {
-               udelay(1);
-               /* Steps */
-               ret_val = e1000_flash_cycle_init_ich8lan(hw);
-               if (ret_val != 0)
-                       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 = e1000_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 == 0) {
-                       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.\n");
-                               break;
-                       }
-               }
-       } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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;
-       u16 i;
-
-       if ((offset >= nvm->word_size) || (words > nvm->word_size - offset) ||
-           (words == 0)) {
-               e_dbg("nvm parameter(s) out of bounds\n");
-               return -E1000_ERR_NVM;
-       }
-
-       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);
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_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 =  e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
-       if (ret_val) {
-               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 = e1000_erase_flash_bank_ich8lan(hw, 1);
-               if (ret_val)
-                       goto release;
-       } else {
-               old_bank_offset = nvm->flash_bank_size;
-               new_bank_offset = 0;
-               ret_val = e1000_erase_flash_bank_ich8lan(hw, 0);
-               if (ret_val)
-                       goto release;
-       }
-
-       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 = e1000_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 = e1000_retry_write_flash_byte_ich8lan(hw,
-                                                              act_offset,
-                                                              (u8)data);
-               if (ret_val)
-                       break;
-
-               udelay(100);
-               ret_val = e1000_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) {
-               /* Possibly read-only, see e1000e_write_protect_nvm_ich8lan() */
-               e_dbg("Flash commit failed.\n");
-               goto release;
-       }
-
-       /*
-        * 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 = e1000_read_flash_word_ich8lan(hw, act_offset, &data);
-       if (ret_val)
-               goto release;
-
-       data &= 0xBFFF;
-       ret_val = e1000_retry_write_flash_byte_ich8lan(hw,
-                                                      act_offset * 2 + 1,
-                                                      (u8)(data >> 8));
-       if (ret_val)
-               goto release;
-
-       /*
-        * 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 = e1000_retry_write_flash_byte_ich8lan(hw, act_offset, 0);
-       if (ret_val)
-               goto release;
-
-       /* 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;
-       }
-
-release:
-       nvm->ops.release(hw);
-
-       /*
-        * Reload the EEPROM, or else modifications will not appear
-        * until after the next adapter reset.
-        */
-       if (!ret_val) {
-               e1000e_reload_nvm(hw);
-               usleep_range(10000, 20000);
-       }
-
-out:
-       if (ret_val)
-               e_dbg("NVM update error: %d\n", ret_val);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       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 = e1000_read_nvm(hw, 0x19, 1, &data);
-       if (ret_val)
-               return ret_val;
-
-       if ((data & 0x40) == 0) {
-               data |= 0x40;
-               ret_val = e1000_write_nvm(hw, 0x19, 1, &data);
-               if (ret_val)
-                       return ret_val;
-               ret_val = e1000e_update_nvm_checksum(hw);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       return e1000e_validate_nvm_checksum_generic(hw);
-}
-
-/**
- *  e1000e_write_protect_nvm_ich8lan - Make the NVM read-only
- *  @hw: pointer to the HW structure
- *
- *  To prevent malicious write/erase of the NVM, set it to be read-only
- *  so that the hardware ignores all write/erase cycles of the NVM via
- *  the flash control registers.  The shadow-ram copy of the NVM will
- *  still be updated, however any updates to this copy will not stick
- *  across driver reloads.
- **/
-void e1000e_write_protect_nvm_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       union ich8_flash_protected_range pr0;
-       union ich8_hws_flash_status hsfsts;
-       u32 gfpreg;
-
-       nvm->ops.acquire(hw);
-
-       gfpreg = er32flash(ICH_FLASH_GFPREG);
-
-       /* Write-protect GbE Sector of NVM */
-       pr0.regval = er32flash(ICH_FLASH_PR0);
-       pr0.range.base = gfpreg & FLASH_GFPREG_BASE_MASK;
-       pr0.range.limit = ((gfpreg >> 16) & FLASH_GFPREG_BASE_MASK);
-       pr0.range.wpe = true;
-       ew32flash(ICH_FLASH_PR0, pr0.regval);
-
-       /*
-        * Lock down a subset of GbE Flash Control Registers, e.g.
-        * PR0 to prevent the write-protection from being lifted.
-        * Once FLOCKDN is set, the registers protected by it cannot
-        * be written until FLOCKDN is cleared by a hardware reset.
-        */
-       hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-       hsfsts.hsf_status.flockdn = true;
-       ew32flash(ICH_FLASH_HSFSTS, hsfsts.regval);
-
-       nvm->ops.release(hw);
-}
-
-/**
- *  e1000_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 e1000_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;
-       u8 count = 0;
-
-       if (size < 1 || size > 2 || data > size * 0xff ||
-           offset > ICH_FLASH_LINEAR_ADDR_MASK)
-               return -E1000_ERR_NVM;
-
-       flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-                           hw->nvm.flash_base_addr;
-
-       do {
-               udelay(1);
-               /* Steps */
-               ret_val = e1000_flash_cycle_init_ich8lan(hw);
-               if (ret_val)
-                       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 = e1000_flash_cycle_ich8lan(hw,
-                                              ICH_FLASH_WRITE_COMMAND_TIMEOUT);
-               if (!ret_val)
-                       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;
-               if (hsfsts.hsf_status.flcdone == 0) {
-                       e_dbg("Timeout error - flash cycle "
-                                "did not complete.");
-                       break;
-               }
-       } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_write_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
-                                         u8 data)
-{
-       u16 word = (u16)data;
-
-       return e1000_write_flash_data_ich8lan(hw, offset, 1, word);
-}
-
-/**
- *  e1000_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 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
-                                               u32 offset, u8 byte)
-{
-       s32 ret_val;
-       u16 program_retries;
-
-       ret_val = e1000_write_flash_byte_ich8lan(hw, offset, byte);
-       if (!ret_val)
-               return ret_val;
-
-       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 = e1000_write_flash_byte_ich8lan(hw, offset, byte);
-               if (!ret_val)
-                       break;
-       }
-       if (program_retries == 100)
-               return -E1000_ERR_NVM;
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_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;
-       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:
-               return -E1000_ERR_NVM;
-       }
-
-       /* 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 = e1000_flash_cycle_init_ich8lan(hw);
-                       if (ret_val)
-                               return ret_val;
-
-                       /*
-                        * 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 = e1000_flash_cycle_ich8lan(hw,
-                                              ICH_FLASH_ERASE_COMMAND_TIMEOUT);
-                       if (ret_val == 0)
-                               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)
-                               return ret_val;
-               } while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               return ret_val;
-       }
-
-       if (*data == ID_LED_RESERVED_0000 ||
-           *data == ID_LED_RESERVED_FFFF)
-               *data = ID_LED_DEFAULT_ICH8LAN;
-
-       return 0;
-}
-
-/**
- *  e1000_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 e1000_led_[on|off]_pchlan().
- **/
-static s32 e1000_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;
-}
-
-/**
- *  e1000_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 e1000_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;
-}
-
-/**
- *  e1000_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 e1000_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();
-
-       usleep_range(10000, 20000);
-
-       /* 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 = e1000_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 (!e1000_check_reset_block(hw)) {
-               /*
-                * Full-chip reset requires MAC and PHY reset at the same
-                * time to make sure the interface between MAC and the
-                * external PHY is reset.
-                */
-               ctrl |= E1000_CTRL_PHY_RST;
-
-               /*
-                * Gate automatic PHY configuration by hardware on
-                * non-managed 82579
-                */
-               if ((hw->mac.type == e1000_pch2lan) &&
-                   !(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
-                       e1000_gate_hw_phy_config_ich8lan(hw, true);
-       }
-       ret_val = e1000_acquire_swflag_ich8lan(hw);
-       e_dbg("Issuing a global reset to ich8lan\n");
-       ew32(CTRL, (ctrl | E1000_CTRL_RST));
-       /* cannot issue a flush here because it hangs the hardware */
-       msleep(20);
-
-       if (!ret_val)
-               mutex_unlock(&swflag_mutex);
-
-       if (ctrl & E1000_CTRL_PHY_RST) {
-               ret_val = hw->phy.ops.get_cfg_done(hw);
-               if (ret_val)
-                       goto out;
-
-               ret_val = e1000_post_phy_reset_ich8lan(hw);
-               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);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_init_hw_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 ctrl_ext, txdctl, snoop;
-       s32 ret_val;
-       u16 i;
-
-       e1000_initialize_hw_bits_ich8lan(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 */
-
-       /* 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.  Disable wakeup by clearing 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_PORT_GEN_CFG, &i);
-               i &= ~BM_WUC_HOST_WU_BIT;
-               e1e_wphy(hw, BM_PORT_GEN_CFG, i);
-               ret_val = e1000_phy_hw_reset_ich8lan(hw);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* Setup link and flow control */
-       ret_val = e1000_setup_link_ich8lan(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.
-        */
-       e1000_clear_hw_cntrs_ich8lan(hw);
-
-       return 0;
-}
-/**
- *  e1000_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 e1000_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);
-       }
-
-       /*
-        * work-around descriptor data corruption issue during nfs v2 udp
-        * traffic, just disable the nfs filtering capability
-        */
-       reg = er32(RFCTL);
-       reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
-       ew32(RFCTL, reg);
-}
-
-/**
- *  e1000_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 e1000_setup_link_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       if (e1000_check_reset_block(hw))
-               return 0;
-
-       /*
-        * 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) {
-               /* Workaround h/w hang when Tx flow control enabled */
-               if (hw->mac.type == e1000_pchlan)
-                       hw->fc.requested_mode = e1000_fc_rx_pause;
-               else
-                       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 = e1000_setup_copper_link_ich8lan(hw);
-       if (ret_val)
-               return ret_val;
-
-       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)) {
-               ew32(FCRTV_PCH, hw->fc.refresh_time);
-
-               ret_val = e1e_wphy(hw, PHY_REG(BM_PORT_CTRL_PAGE, 27),
-                                  hw->fc.pause_time);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       return e1000e_set_fc_watermarks(hw);
-}
-
-/**
- *  e1000_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 e1000_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)
-               return ret_val;
-       ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                      &reg_data);
-       if (ret_val)
-               return ret_val;
-       reg_data |= 0x3F;
-       ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                       reg_data);
-       if (ret_val)
-               return ret_val;
-
-       switch (hw->phy.type) {
-       case e1000_phy_igp_3:
-               ret_val = e1000e_copper_link_setup_igp(hw);
-               if (ret_val)
-                       return ret_val;
-               break;
-       case e1000_phy_bm:
-       case e1000_phy_82578:
-               ret_val = e1000e_copper_link_setup_m88(hw);
-               if (ret_val)
-                       return ret_val;
-               break;
-       case e1000_phy_82577:
-       case e1000_phy_82579:
-               ret_val = e1000_copper_link_setup_82577(hw);
-               if (ret_val)
-                       return ret_val;
-               break;
-       case e1000_phy_ife:
-               ret_val = e1e_rphy(hw, IFE_PHY_MDIX_CONTROL, &reg_data);
-               if (ret_val)
-                       return ret_val;
-
-               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)
-                       return ret_val;
-               break;
-       default:
-               break;
-       }
-       return e1000e_setup_copper_link(hw);
-}
-
-/**
- *  e1000_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 e1000_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)
-               return ret_val;
-
-       if ((hw->mac.type == e1000_ich8lan) &&
-           (hw->phy.type == e1000_phy_igp_3) &&
-           (*speed == SPEED_1000)) {
-               ret_val = e1000_kmrn_lock_loss_workaround_ich8lan(hw);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_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;
-       u16 i, data;
-       bool link;
-
-       if (!dev_spec->kmrn_lock_loss_workaround_enabled)
-               return 0;
-
-       /*
-        * 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)
-               return 0;
-
-       for (i = 0; i < 10; i++) {
-               /* read once to clear */
-               ret_val = e1e_rphy(hw, IGP3_KMRN_DIAG, &data);
-               if (ret_val)
-                       return ret_val;
-               /* and again to get new status */
-               ret_val = e1e_rphy(hw, IGP3_KMRN_DIAG, &data);
-               if (ret_val)
-                       return ret_val;
-
-               /* check for PCS lock */
-               if (!(data & IGP3_KMRN_DIAG_PCS_LOCK_LOSS))
-                       return 0;
-
-               /* Issue PHY reset */
-               e1000_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 */
-       return -E1000_ERR_PHY;
-}
-
-/**
- *  e1000_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;
-}
-
-/**
- *  e1000_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)
-               return;
-
-       /* 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);
-}
-
-/**
- *  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;
-       u16 reg_data;
-
-       if ((hw->mac.type != e1000_ich8lan) ||
-           (hw->phy.type != e1000_phy_igp_3))
-               return;
-
-       ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                     &reg_data);
-       if (ret_val)
-               return;
-       reg_data |= E1000_KMRNCTRLSTA_DIAG_NELPBK;
-       ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                      reg_data);
-       if (ret_val)
-               return;
-       reg_data &= ~E1000_KMRNCTRLSTA_DIAG_NELPBK;
-       ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                      reg_data);
-}
-
-/**
- *  e1000_suspend_workarounds_ich8lan - workarounds needed during S0->Sx
- *  @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.  For PCH and newer parts, the OEM bits PHY register
- *  (LED, GbE disable and LPLU configurations) also needs to be written.
- **/
-void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
-{
-       u32 phy_ctrl;
-       s32 ret_val;
-
-       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) {
-               e1000_oem_bits_config_ich8lan(hw, false);
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       return;
-               e1000_write_smbus_addr(hw);
-               hw->phy.ops.release(hw);
-       }
-}
-
-/**
- *  e1000_resume_workarounds_pchlan - workarounds needed during Sx->S0
- *  @hw: pointer to the HW structure
- *
- *  During Sx to S0 transitions on non-managed devices or managed devices
- *  on which PHY resets are not blocked, if the PHY registers cannot be
- *  accessed properly by the s/w toggle the LANPHYPC value to power cycle
- *  the PHY.
- **/
-void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       if (hw->mac.type != e1000_pch2lan)
-               return;
-
-       fwsm = er32(FWSM);
-       if (!(fwsm & E1000_ICH_FWSM_FW_VALID) || !e1000_check_reset_block(hw)) {
-               u16 phy_id1, phy_id2;
-               s32 ret_val;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val) {
-                       e_dbg("Failed to acquire PHY semaphore in resume\n");
-                       return;
-               }
-
-               /* Test access to the PHY registers by reading the ID regs */
-               ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_id1);
-               if (ret_val)
-                       goto release;
-               ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_id2);
-               if (ret_val)
-                       goto release;
-
-               if (hw->phy.id == ((u32)(phy_id1 << 16) |
-                                  (u32)(phy_id2 & PHY_REVISION_MASK)))
-                       goto release;
-
-               e1000_toggle_lanphypc_value_ich8lan(hw);
-
-               hw->phy.ops.release(hw);
-               msleep(50);
-               e1000_phy_hw_reset(hw);
-               msleep(50);
-               return;
-       }
-
-release:
-       hw->phy.ops.release(hw);
-
-       return;
-}
-
-/**
- *  e1000_cleanup_led_ich8lan - Restore the default LED operation
- *  @hw: pointer to the HW structure
- *
- *  Return the LED back to the default configuration.
- **/
-static s32 e1000_cleanup_led_ich8lan(struct e1000_hw *hw)
-{
-       if (hw->phy.type == e1000_phy_ife)
-               return e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
-
-       ew32(LEDCTL, hw->mac.ledctl_default);
-       return 0;
-}
-
-/**
- *  e1000_led_on_ich8lan - Turn LEDs on
- *  @hw: pointer to the HW structure
- *
- *  Turn on the LEDs.
- **/
-static s32 e1000_led_on_ich8lan(struct e1000_hw *hw)
-{
-       if (hw->phy.type == e1000_phy_ife)
-               return e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED,
-                               (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_ON));
-
-       ew32(LEDCTL, hw->mac.ledctl_mode2);
-       return 0;
-}
-
-/**
- *  e1000_led_off_ich8lan - Turn LEDs off
- *  @hw: pointer to the HW structure
- *
- *  Turn off the LEDs.
- **/
-static s32 e1000_led_off_ich8lan(struct e1000_hw *hw)
-{
-       if (hw->phy.type == e1000_phy_ife)
-               return e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED,
-                               (IFE_PSCL_PROBE_MODE |
-                                IFE_PSCL_PROBE_LEDS_OFF));
-
-       ew32(LEDCTL, hw->mac.ledctl_mode1);
-       return 0;
-}
-
-/**
- *  e1000_setup_led_pchlan - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use.
- **/
-static s32 e1000_setup_led_pchlan(struct e1000_hw *hw)
-{
-       return e1e_wphy(hw, HV_LED_CONFIG, (u16)hw->mac.ledctl_mode1);
-}
-
-/**
- *  e1000_cleanup_led_pchlan - Restore the default LED operation
- *  @hw: pointer to the HW structure
- *
- *  Return the LED back to the default configuration.
- **/
-static s32 e1000_cleanup_led_pchlan(struct e1000_hw *hw)
-{
-       return e1e_wphy(hw, HV_LED_CONFIG, (u16)hw->mac.ledctl_default);
-}
-
-/**
- *  e1000_led_on_pchlan - Turn LEDs on
- *  @hw: pointer to the HW structure
- *
- *  Turn on the LEDs.
- **/
-static s32 e1000_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);
-}
-
-/**
- *  e1000_led_off_pchlan - Turn LEDs off
- *  @hw: pointer to the HW structure
- *
- *  Turn off the LEDs.
- **/
-static s32 e1000_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);
-}
-
-/**
- *  e1000_get_cfg_done_ich8lan - Read config done bit after Full or PHY reset
- *  @hw: pointer to the HW structure
- *
- *  Read appropriate register for the config done bit for completion status
- *  and configure the PHY through s/w for EEPROM-less parts.
- *
- *  NOTE: some silicon which is EEPROM-less will fail trying to read the
- *  config done bit, so only an error is logged and continues.  If we were
- *  to return with error, EEPROM-less silicon would not be able to be reset
- *  or change link.
- **/
-static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u32 bank = 0;
-       u32 status;
-
-       e1000e_get_cfg_done(hw);
-
-       /* Wait for indication from h/w that it has completed basic config */
-       if (hw->mac.type >= e1000_ich10lan) {
-               e1000_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");
-                       ret_val = 0;
-               }
-       }
-
-       /* Clear PHY Reset Asserted bit */
-       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");
-
-       /* If EEPROM is not marked present, init the IGP 3 PHY manually */
-       if (hw->mac.type <= e1000_ich9lan) {
-               if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
-                   (hw->phy.type == e1000_phy_igp_3)) {
-                       e1000e_phy_init_script_igp3(hw);
-               }
-       } else {
-               if (e1000_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;
-}
-
-/**
- * e1000_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 e1000_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) ||
-             hw->phy.ops.check_reset_block(hw)))
-               e1000_power_down_phy_copper(hw);
-}
-
-/**
- *  e1000_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 e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
-{
-       u16 phy_data;
-       s32 ret_val;
-
-       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)) {
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       return;
-               ret_val = hw->phy.ops.set_page(hw,
-                                              HV_STATS_PAGE << IGP_PAGE_SHIFT);
-               if (ret_val)
-                       goto release;
-               hw->phy.ops.read_reg_page(hw, HV_SCC_UPPER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_SCC_LOWER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_ECOL_UPPER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_ECOL_LOWER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_MCC_UPPER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_MCC_LOWER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_LATECOL_UPPER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_LATECOL_LOWER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_COLC_UPPER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_COLC_LOWER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_DC_UPPER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_DC_LOWER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_TNCRS_UPPER, &phy_data);
-               hw->phy.ops.read_reg_page(hw, HV_TNCRS_LOWER, &phy_data);
-release:
-               hw->phy.ops.release(hw);
-       }
-}
-
-static struct e1000_mac_operations ich8_mac_ops = {
-       .id_led_init            = e1000e_id_led_init,
-       /* check_mng_mode dependent on mac type */
-       .check_for_link         = e1000_check_for_copper_link_ich8lan,
-       /* cleanup_led dependent on mac type */
-       .clear_hw_cntrs         = e1000_clear_hw_cntrs_ich8lan,
-       .get_bus_info           = e1000_get_bus_info_ich8lan,
-       .set_lan_id             = e1000_set_lan_id_single_port,
-       .get_link_up_info       = e1000_get_link_up_info_ich8lan,
-       /* led_on dependent on mac type */
-       /* led_off dependent on mac type */
-       .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
-       .reset_hw               = e1000_reset_hw_ich8lan,
-       .init_hw                = e1000_init_hw_ich8lan,
-       .setup_link             = e1000_setup_link_ich8lan,
-       .setup_physical_interface= e1000_setup_copper_link_ich8lan,
-       /* id_led_init dependent on mac type */
-};
-
-static struct e1000_phy_operations ich8_phy_ops = {
-       .acquire                = e1000_acquire_swflag_ich8lan,
-       .check_reset_block      = e1000_check_reset_block_ich8lan,
-       .commit                 = NULL,
-       .get_cfg_done           = e1000_get_cfg_done_ich8lan,
-       .get_cable_length       = e1000e_get_cable_length_igp_2,
-       .read_reg               = e1000e_read_phy_reg_igp,
-       .release                = e1000_release_swflag_ich8lan,
-       .reset                  = e1000_phy_hw_reset_ich8lan,
-       .set_d0_lplu_state      = e1000_set_d0_lplu_state_ich8lan,
-       .set_d3_lplu_state      = e1000_set_d3_lplu_state_ich8lan,
-       .write_reg              = e1000e_write_phy_reg_igp,
-};
-
-static struct e1000_nvm_operations ich8_nvm_ops = {
-       .acquire                = e1000_acquire_nvm_ich8lan,
-       .read                   = e1000_read_nvm_ich8lan,
-       .release                = e1000_release_nvm_ich8lan,
-       .update                 = e1000_update_nvm_checksum_ich8lan,
-       .valid_led_default      = e1000_valid_led_default_ich8lan,
-       .validate               = e1000_validate_nvm_checksum_ich8lan,
-       .write                  = e1000_write_nvm_ich8lan,
-};
-
-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,
-       .get_variants           = e1000_get_variants_ich8lan,
-       .mac_ops                = &ich8_mac_ops,
-       .phy_ops                = &ich8_phy_ops,
-       .nvm_ops                = &ich8_nvm_ops,
-};
-
-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,
-       .get_variants           = e1000_get_variants_ich8lan,
-       .mac_ops                = &ich8_mac_ops,
-       .phy_ops                = &ich8_phy_ops,
-       .nvm_ops                = &ich8_nvm_ops,
-};
-
-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,
-       .get_variants           = e1000_get_variants_ich8lan,
-       .mac_ops                = &ich8_mac_ops,
-       .phy_ops                = &ich8_phy_ops,
-       .nvm_ops                = &ich8_nvm_ops,
-};
-
-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,
-       .flags2                 = FLAG2_HAS_PHY_STATS,
-       .pba                    = 26,
-       .max_hw_frame_size      = 4096,
-       .get_variants           = e1000_get_variants_ich8lan,
-       .mac_ops                = &ich8_mac_ops,
-       .phy_ops                = &ich8_phy_ops,
-       .nvm_ops                = &ich8_nvm_ops,
-};
-
-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,
-       .flags2                 = FLAG2_HAS_PHY_STATS
-                                 | FLAG2_HAS_EEE,
-       .pba                    = 26,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .get_variants           = e1000_get_variants_ich8lan,
-       .mac_ops                = &ich8_mac_ops,
-       .phy_ops                = &ich8_phy_ops,
-       .nvm_ops                = &ich8_nvm_ops,
-};
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
deleted file mode 100644 (file)
index 7898a67..0000000
+++ /dev/null
@@ -1,2692 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include "e1000.h"
-
-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
-
-/* Intel(R) Active Management Technology signature */
-#define E1000_IAMT_SIGNATURE           0x544D4149
-
-/**
- *  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;
-       struct e1000_adapter *adapter = hw->adapter;
-       u16 pcie_link_status, cap_offset;
-
-       cap_offset = adapter->pdev->pcie_cap;
-       if (!cap_offset) {
-               bus->width = e1000_bus_width_unknown;
-       } else {
-               pci_read_config_word(adapter->pdev,
-                                    cap_offset + PCIE_LINK_STATUS,
-                                    &pcie_link_status);
-               bus->width = (enum e1000_bus_width)((pcie_link_status &
-                                                    PCIE_LINK_WIDTH_MASK) >>
-                                                   PCIE_LINK_WIDTH_SHIFT);
-       }
-
-       mac->ops.set_lan_id(hw);
-
-       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.
- **/
-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 = er32(STATUS);
-       bus->func = (reg & E1000_STATUS_FUNC_MASK) >> E1000_STATUS_FUNC_SHIFT;
-}
-
-/**
- *  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;
-
-       for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-               E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, 0);
-               e1e_flush();
-       }
-}
-
-/**
- *  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)
-{
-       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
- *
- *  Setup 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_ALEN] = {0};
-
-       /* Setup the receive address */
-       e_dbg("Programming MAC Address into RAR[0]\n");
-
-       e1000e_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++)
-               e1000e_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 = 0;
-       u16 offset, nvm_alt_mac_addr_offset, nvm_data;
-       u8 alt_mac_addr[ETH_ALEN];
-
-       ret_val = e1000_read_nvm(hw, NVM_COMPAT, 1, &nvm_data);
-       if (ret_val)
-               goto out;
-
-       /* Check for LOM (vs. NIC) or one of two valid mezzanine cards */
-       if (!((nvm_data & NVM_COMPAT_LOM) ||
-             (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||
-             (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)))
-               goto out;
-
-       ret_val = e1000_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_ALEN; i += 2) {
-               offset = nvm_alt_mac_addr_offset + (i >> 1);
-               ret_val = e1000_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 (is_multicast_ether_addr(alt_mac_addr)) {
-               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.
-        */
-       e1000e_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();
-}
-
-/**
- *  e1000_hash_mc_addr - 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()
- **/
-static u32 e1000_hash_mc_addr(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_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 = e1000_hash_mc_addr(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_ALEN);
-       }
-
-       /* 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_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)
-{
-       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);
-}
-
-/**
- *  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)
-               return 0;
-
-       /*
-        * 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)
-               return ret_val;
-
-       if (!link)
-               return ret_val; /* 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;
-               return ret_val;
-       }
-
-       /*
-        * 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");
-
-       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;
-
-       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;
-                       return 0;
-               }
-               e_dbg("NOT Rx'ing /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");
-                       return ret_val;
-               }
-       } 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("Rx'ing /C/, enable AutoNeg and stop forcing link.\n");
-               ew32(TXCW, mac->txcw);
-               ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       }
-
-       return 0;
-}
-
-/**
- *  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;
-
-       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;
-                       return 0;
-               }
-               e_dbg("NOT Rx'ing /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");
-                       return ret_val;
-               }
-       } 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("Rx'ing /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 successfully.\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");
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  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.
- **/
-static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       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 = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
-
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               return ret_val;
-       }
-
-       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;
-
-       return 0;
-}
-
-/**
- *  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)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-
-       /*
-        * In the case of the phy reset being blocked, we already have a link.
-        * We do not need to set it up again.
-        */
-       if (e1000_check_reset_block(hw))
-               return 0;
-
-       /*
-        * 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)
-                       return ret_val;
-       }
-
-       /*
-        * 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 = mac->ops.setup_physical_interface(hw);
-       if (ret_val)
-               return ret_val;
-
-       /*
-        * 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);
-
-       return e1000e_set_fc_watermarks(hw);
-}
-
-/**
- *  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.
- **/
-static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 txcw;
-
-       /*
-        * 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");
-               return -E1000_ERR_CONFIG;
-               break;
-       }
-
-       ew32(TXCW, txcw);
-       mac->txcw = txcw;
-
-       return 0;
-}
-
-/**
- *  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.
- **/
-static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 i, status;
-       s32 ret_val;
-
-       /*
-        * 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++) {
-               usleep_range(10000, 20000);
-               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 = mac->ops.check_for_link(hw);
-               if (ret_val) {
-                       e_dbg("Error while checking for link\n");
-                       return ret_val;
-               }
-               mac->autoneg_failed = 0;
-       } else {
-               mac->autoneg_failed = 0;
-               e_dbg("Valid Link Found\n");
-       }
-
-       return 0;
-}
-
-/**
- *  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;
-
-       ctrl = er32(CTRL);
-
-       /* Take the link out of reset */
-       ctrl &= ~E1000_CTRL_LRST;
-
-       e1000e_config_collision_dist(hw);
-
-       ret_val = e1000_commit_fc_settings_generic(hw);
-       if (ret_val)
-               return ret_val;
-
-       /*
-        * 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();
-       usleep_range(1000, 2000);
-
-       /*
-        * 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 = e1000_poll_fiber_serdes_link_generic(hw);
-       } else {
-               e_dbg("No signal detected\n");
-       }
-
-       return 0;
-}
-
-/**
- *  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_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)
-{
-       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;
-               fcrtl |= E1000_FCRTL_XONE;
-               fcrth = hw->fc.high_water;
-       }
-       ew32(FCRTL, fcrtl);
-       ew32(FCRTH, fcrth);
-
-       return 0;
-}
-
-/**
- *  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;
-
-       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");
-               return -E1000_ERR_CONFIG;
-       }
-
-       ew32(CTRL, ctrl);
-
-       return 0;
-}
-
-/**
- *  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 = 0;
-       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");
-               return ret_val;
-       }
-
-       /*
-        * 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)
-                       return ret_val;
-               ret_val = e1e_rphy(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       return ret_val;
-
-               if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) {
-                       e_dbg("Copper PHY and Auto Neg "
-                                "has not completed.\n");
-                       return ret_val;
-               }
-
-               /*
-                * 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)
-                       return ret_val;
-               ret_val =
-                   e1e_rphy(hw, PHY_LP_ABILITY, &mii_nway_lp_ability_reg);
-               if (ret_val)
-                       return ret_val;
-
-               /*
-                * 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");
-                       return ret_val;
-               }
-
-               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");
-                       return ret_val;
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  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;
-       else if (status & E1000_STATUS_SPEED_100)
-               *speed = SPEED_100;
-       else
-               *speed = SPEED_10;
-
-       if (status & E1000_STATUS_FD)
-               *duplex = FULL_DUPLEX;
-       else
-               *duplex = HALF_DUPLEX;
-
-       e_dbg("%u Mbps, %s Duplex\n",
-             *speed == SPEED_1000 ? 1000 : *speed == SPEED_100 ? 100 : 10,
-             *duplex == FULL_DUPLEX ? "Full" : "Half");
-
-       return 0;
-}
-
-/**
- *  e1000e_get_speed_and_duplex_fiber_serdes - 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, u16 *speed, u16 *duplex)
-{
-       *speed = SPEED_1000;
-       *duplex = FULL_DUPLEX;
-
-       return 0;
-}
-
-/**
- *  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 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");
-               return -E1000_ERR_NVM;
-       }
-
-       /* 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");
-               return -E1000_ERR_NVM;
-       }
-
-       return 0;
-}
-
-/**
- *  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;
-
-       while (i < AUTO_READ_DONE_TIMEOUT) {
-               if (er32(EECD) & E1000_EECD_AUTO_RD)
-                       break;
-               usleep_range(1000, 2000);
-               i++;
-       }
-
-       if (i == AUTO_READ_DONE_TIMEOUT) {
-               e_dbg("Auto read by HW from NVM has not completed.\n");
-               return -E1000_ERR_RESET;
-       }
-
-       return 0;
-}
-
-/**
- *  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 = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               return ret_val;
-       }
-
-       if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
-               *data = ID_LED_DEFAULT;
-
-       return 0;
-}
-
-/**
- *  e1000e_id_led_init -
- *  @hw: pointer to the HW structure
- *
- **/
-s32 e1000e_id_led_init(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;
-
-       ret_val = hw->nvm.ops.valid_led_default(hw, &data);
-       if (ret_val)
-               return ret_val;
-
-       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;
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  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)
-{
-       u32 ledctl;
-
-       if (hw->mac.ops.setup_led != e1000e_setup_led_generic)
-               return -E1000_ERR_CONFIG;
-
-       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);
-       }
-
-       return 0;
-}
-
-/**
- *  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)
-{
-       ew32(LEDCTL, hw->mac.ledctl_default);
-       return 0;
-}
-
-/**
- *  e1000e_blink_led_generic - Blink LED
- *  @hw: pointer to the HW structure
- *
- *  Blink the LEDs which are set to be on.
- **/
-s32 e1000e_blink_led_generic(struct e1000_hw *hw)
-{
-       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);
-
-       return 0;
-}
-
-/**
- *  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)
-{
-       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;
-       }
-
-       return 0;
-}
-
-/**
- *  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)
-{
-       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;
-       }
-
-       return 0;
-}
-
-/**
- *  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 (no_snoop) {
-               gcr = er32(GCR);
-               gcr &= ~(PCIE_NO_SNOOP_ALL);
-               gcr |= no_snoop;
-               ew32(GCR, gcr);
-       }
-}
-
-/**
- *  e1000e_disable_pcie_master - Disables PCI-express master access
- *  @hw: pointer to the HW structure
- *
- *  Returns 0 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;
-
-       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");
-               return -E1000_ERR_MASTER_REQUESTS_PENDING;
-       }
-
-       return 0;
-}
-
-/**
- *  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;
-}
-
-/**
- *  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;
-       ew32(EECD, *eecd);
-       e1e_flush();
-       udelay(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;
-       ew32(EECD, *eecd);
-       e1e_flush();
-       udelay(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 = 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);
-
-               e1000_raise_eec_clk(hw, &eecd);
-               e1000_lower_eec_clk(hw, &eecd);
-
-               mask >>= 1;
-       } while (mask);
-
-       eecd &= ~E1000_EECD_DI;
-       ew32(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;
-
-       eecd = er32(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 = er32(EECD);
-
-               eecd &= ~E1000_EECD_DI;
-               if (eecd & E1000_EECD_DO)
-                       data |= 1;
-
-               e1000_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;
-
-       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)
-                       return 0;
-
-               udelay(5);
-       }
-
-       return -E1000_ERR_NVM;
-}
-
-/**
- *  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;
-
-       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");
-               return -E1000_ERR_NVM;
-       }
-
-       return 0;
-}
-
-/**
- *  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 = 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);
-       }
-}
-
-/**
- *  e1000_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 e1000_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;
-               e1000_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;
-
-       e1000_stop_nvm(hw);
-
-       eecd = er32(EECD);
-       eecd &= ~E1000_EECD_REQ;
-       ew32(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 = er32(EECD);
-       u8 spi_stat_reg;
-
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               u16 timeout = NVM_MAX_RETRY_SPI;
-
-               /* Clear SK and CS */
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-               ew32(EECD, eecd);
-               e1e_flush();
-               udelay(1);
-
-               /*
-                * 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;
-
-                       udelay(5);
-                       e1000_standby_nvm(hw);
-                       timeout--;
-               }
-
-               if (!timeout) {
-                       e_dbg("SPI NVM Status error\n");
-                       return -E1000_ERR_NVM;
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  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 = 0;
-
-       /*
-        * 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");
-               return -E1000_ERR_NVM;
-       }
-
-       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);
-       }
-
-       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");
-               return -E1000_ERR_NVM;
-       }
-
-       ret_val = nvm->ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       while (widx < words) {
-               u8 write_opcode = NVM_WRITE_OPCODE_SPI;
-
-               ret_val = e1000_ready_nvm_eeprom(hw);
-               if (ret_val) {
-                       nvm->ops.release(hw);
-                       return ret_val;
-               }
-
-               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;
-                       }
-               }
-       }
-
-       usleep_range(10000, 20000);
-       nvm->ops.release(hw);
-       return 0;
-}
-
-/**
- *  e1000_read_pba_string_generic - Read device part number
- *  @hw: pointer to the HW structure
- *  @pba_num: pointer to device part number
- *  @pba_num_size: size of part number buffer
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in pba_num.
- **/
-s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
-                                 u32 pba_num_size)
-{
-       s32 ret_val;
-       u16 nvm_data;
-       u16 pba_ptr;
-       u16 offset;
-       u16 length;
-
-       if (pba_num == NULL) {
-               e_dbg("PBA string buffer was null\n");
-               ret_val = E1000_ERR_INVALID_ARGUMENT;
-               goto out;
-       }
-
-       ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &pba_ptr);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       /*
-        * if nvm_data is not ptr guard the PBA must be in legacy format which
-        * means pba_ptr is actually our second data word for the PBA number
-        * and we can decode it into an ascii string
-        */
-       if (nvm_data != NVM_PBA_PTR_GUARD) {
-               e_dbg("NVM PBA number is not stored as string\n");
-
-               /* we will need 11 characters to store the PBA */
-               if (pba_num_size < 11) {
-                       e_dbg("PBA string buffer too small\n");
-                       return E1000_ERR_NO_SPACE;
-               }
-
-               /* extract hex string from data and pba_ptr */
-               pba_num[0] = (nvm_data >> 12) & 0xF;
-               pba_num[1] = (nvm_data >> 8) & 0xF;
-               pba_num[2] = (nvm_data >> 4) & 0xF;
-               pba_num[3] = nvm_data & 0xF;
-               pba_num[4] = (pba_ptr >> 12) & 0xF;
-               pba_num[5] = (pba_ptr >> 8) & 0xF;
-               pba_num[6] = '-';
-               pba_num[7] = 0;
-               pba_num[8] = (pba_ptr >> 4) & 0xF;
-               pba_num[9] = pba_ptr & 0xF;
-
-               /* put a null character on the end of our string */
-               pba_num[10] = '\0';
-
-               /* switch all the data but the '-' to hex char */
-               for (offset = 0; offset < 10; offset++) {
-                       if (pba_num[offset] < 0xA)
-                               pba_num[offset] += '0';
-                       else if (pba_num[offset] < 0x10)
-                               pba_num[offset] += 'A' - 0xA;
-               }
-
-               goto out;
-       }
-
-       ret_val = e1000_read_nvm(hw, pba_ptr, 1, &length);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       if (length == 0xFFFF || length == 0) {
-               e_dbg("NVM PBA number section invalid length\n");
-               ret_val = E1000_ERR_NVM_PBA_SECTION;
-               goto out;
-       }
-       /* check if pba_num buffer is big enough */
-       if (pba_num_size < (((u32)length * 2) - 1)) {
-               e_dbg("PBA string buffer too small\n");
-               ret_val = E1000_ERR_NO_SPACE;
-               goto out;
-       }
-
-       /* trim pba length from start of string */
-       pba_ptr++;
-       length--;
-
-       for (offset = 0; offset < length; offset++) {
-               ret_val = e1000_read_nvm(hw, pba_ptr + offset, 1, &nvm_data);
-               if (ret_val) {
-                       e_dbg("NVM Read Error\n");
-                       goto out;
-               }
-               pba_num[offset * 2] = (u8)(nvm_data >> 8);
-               pba_num[(offset * 2) + 1] = (u8)(nvm_data & 0xFF);
-       }
-       pba_num[offset * 2] = '\0';
-
-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 = 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_ALEN; i++)
-               hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-       return 0;
-}
-
-/**
- *  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;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-               ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       e_dbg("NVM Read Error\n");
-                       return ret_val;
-               }
-               checksum += nvm_data;
-       }
-
-       if (checksum != (u16) NVM_SUM) {
-               e_dbg("NVM Checksum Invalid\n");
-               return -E1000_ERR_NVM;
-       }
-
-       return 0;
-}
-
-/**
- *  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 = e1000_read_nvm(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       e_dbg("NVM Read Error while updating checksum.\n");
-                       return ret_val;
-               }
-               checksum += nvm_data;
-       }
-       checksum = (u16) NVM_SUM - checksum;
-       ret_val = e1000_write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum);
-       if (ret_val)
-               e_dbg("NVM Write Error while updating checksum.\n");
-
-       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.
- **/
-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();
-}
-
-/**
- *  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;
-
-       if (!buffer)
-               return 0;
-
-       for (i = 0; i < length; i++)
-               sum += buffer[i];
-
-       return (u8) (0 - sum);
-}
-
-/**
- *  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.
- **/
-static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
-{
-       u32 hicr;
-       u8 i;
-
-       if (!(hw->mac.arc_subsystem_valid)) {
-               e_dbg("ARC subsystem not valid.\n");
-               return -E1000_ERR_HOST_INTERFACE_COMMAND;
-       }
-
-       /* Check that the host interface is enabled. */
-       hicr = er32(HICR);
-       if ((hicr & E1000_HICR_EN) == 0) {
-               e_dbg("E1000_HOST_EN bit disabled.\n");
-               return -E1000_ERR_HOST_INTERFACE_COMMAND;
-       }
-       /* 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");
-               return -E1000_ERR_HOST_INTERFACE_COMMAND;
-       }
-
-       return 0;
-}
-
-/**
- *  e1000e_check_mng_mode_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 = 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;
-
-       hw->mac.tx_pkt_filtering = true;
-
-       /* No manageability, no filtering */
-       if (!e1000e_check_mng_mode(hw)) {
-               hw->mac.tx_pkt_filtering = false;
-               goto out;
-       }
-
-       /*
-        * If we can't read from the host interface for whatever
-        * reason, disable filtering.
-        */
-       ret_val = e1000_mng_enable_host_if(hw);
-       if (ret_val) {
-               hw->mac.tx_pkt_filtering = 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(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) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
-               hw->mac.tx_pkt_filtering = true;
-               goto out;
-       }
-
-       /* Cookie area is valid, make the final check for filtering. */
-       if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
-               hw->mac.tx_pkt_filtering = false;
-               goto out;
-       }
-
-out:
-       return hw->mac.tx_pkt_filtering;
-}
-
-/**
- *  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.
- **/
-static s32 e1000_mng_write_cmd_header(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 = 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(hw, E1000_HOST_IF, i,
-                                           *((u32 *) hdr + i));
-               e1e_flush();
-       }
-
-       return 0;
-}
-
-/**
- *  e1000_mng_host_if_write - 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.
- **/
-static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer,
-                                  u16 length, u16 offset, u8 *sum)
-{
-       u8 *tmp;
-       u8 *bufptr = buffer;
-       u32 data = 0;
-       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)
-               return -E1000_ERR_PARAM;
-
-       tmp = (u8 *)&data;
-       prev_bytes = offset & 0x3;
-       offset >>= 2;
-
-       if (prev_bytes) {
-               data = E1000_READ_REG_ARRAY(hw, E1000_HOST_IF, offset);
-               for (j = prev_bytes; j < sizeof(u32); j++) {
-                       *(tmp + j) = *bufptr++;
-                       *sum += *(tmp + j);
-               }
-               E1000_WRITE_REG_ARRAY(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(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(hw, E1000_HOST_IF, offset + i, data);
-       }
-
-       return 0;
-}
-
-/**
- *  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 = e1000_mng_enable_host_if(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* Populate the host interface with the contents of "buffer". */
-       ret_val = e1000_mng_host_if_write(hw, buffer, length,
-                                         sizeof(hdr), &(hdr.checksum));
-       if (ret_val)
-               return ret_val;
-
-       /* Write the manageability command header */
-       ret_val = e1000_mng_write_cmd_header(hw, &hdr);
-       if (ret_val)
-               return ret_val;
-
-       /* Tell the ARC a new command is pending. */
-       hicr = er32(HICR);
-       ew32(HICR, hicr | E1000_HICR_C);
-
-       return 0;
-}
-
-/**
- *  e1000e_enable_mng_pass_thru - Check if management passthrough is needed
- *  @hw: pointer to the HW structure
- *
- *  Verifies the hardware needs to leave interface enabled so that frames can
- *  be directed to and from the management interface.
- **/
-bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
-{
-       u32 manc;
-       u32 fwsm, factps;
-       bool ret_val = false;
-
-       manc = er32(MANC);
-
-       if (!(manc & E1000_MANC_RCV_TCO_EN))
-               goto out;
-
-       if (hw->mac.has_fwsm) {
-               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 ((hw->mac.type == e1000_82574) ||
-                  (hw->mac.type == e1000_82583)) {
-               u16 data;
-
-               factps = er32(FACTPS);
-               e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
-
-               if (!(factps & E1000_FACTPS_MNGCG) &&
-                   ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
-                    (e1000_mng_mode_pt << 13))) {
-                       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;
-}
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
deleted file mode 100644 (file)
index ab4be80..0000000
+++ /dev/null
@@ -1,6312 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/vmalloc.h>
-#include <linux/pagemap.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/interrupt.h>
-#include <linux/tcp.h>
-#include <linux/ipv6.h>
-#include <linux/slab.h>
-#include <net/checksum.h>
-#include <net/ip6_checksum.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-#include <linux/cpu.h>
-#include <linux/smp.h>
-#include <linux/pm_qos_params.h>
-#include <linux/pm_runtime.h>
-#include <linux/aer.h>
-#include <linux/prefetch.h>
-
-#include "e1000.h"
-
-#define DRV_EXTRAVERSION "-k"
-
-#define DRV_VERSION "1.3.16" DRV_EXTRAVERSION
-char e1000e_driver_name[] = "e1000e";
-const char e1000e_driver_version[] = DRV_VERSION;
-
-static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);
-
-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,
-};
-
-struct e1000_reg_info {
-       u32 ofs;
-       char *name;
-};
-
-#define E1000_RDFH     0x02410 /* Rx Data FIFO Head - RW */
-#define E1000_RDFT     0x02418 /* Rx Data FIFO Tail - RW */
-#define E1000_RDFHS    0x02420 /* Rx Data FIFO Head Saved - RW */
-#define E1000_RDFTS    0x02428 /* Rx Data FIFO Tail Saved - RW */
-#define E1000_RDFPC    0x02430 /* Rx Data FIFO Packet Count - 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 */
-
-static const struct e1000_reg_info e1000_reg_info_tbl[] = {
-
-       /* General Registers */
-       {E1000_CTRL, "CTRL"},
-       {E1000_STATUS, "STATUS"},
-       {E1000_CTRL_EXT, "CTRL_EXT"},
-
-       /* Interrupt Registers */
-       {E1000_ICR, "ICR"},
-
-       /* Rx Registers */
-       {E1000_RCTL, "RCTL"},
-       {E1000_RDLEN, "RDLEN"},
-       {E1000_RDH, "RDH"},
-       {E1000_RDT, "RDT"},
-       {E1000_RDTR, "RDTR"},
-       {E1000_RXDCTL(0), "RXDCTL"},
-       {E1000_ERT, "ERT"},
-       {E1000_RDBAL, "RDBAL"},
-       {E1000_RDBAH, "RDBAH"},
-       {E1000_RDFH, "RDFH"},
-       {E1000_RDFT, "RDFT"},
-       {E1000_RDFHS, "RDFHS"},
-       {E1000_RDFTS, "RDFTS"},
-       {E1000_RDFPC, "RDFPC"},
-
-       /* Tx Registers */
-       {E1000_TCTL, "TCTL"},
-       {E1000_TDBAL, "TDBAL"},
-       {E1000_TDBAH, "TDBAH"},
-       {E1000_TDLEN, "TDLEN"},
-       {E1000_TDH, "TDH"},
-       {E1000_TDT, "TDT"},
-       {E1000_TIDV, "TIDV"},
-       {E1000_TXDCTL(0), "TXDCTL"},
-       {E1000_TADV, "TADV"},
-       {E1000_TARC(0), "TARC"},
-       {E1000_TDFH, "TDFH"},
-       {E1000_TDFT, "TDFT"},
-       {E1000_TDFHS, "TDFHS"},
-       {E1000_TDFTS, "TDFTS"},
-       {E1000_TDFPC, "TDFPC"},
-
-       /* List Terminator */
-       {}
-};
-
-/*
- * e1000_regdump - register printout routine
- */
-static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo)
-{
-       int n = 0;
-       char rname[16];
-       u32 regs[8];
-
-       switch (reginfo->ofs) {
-       case E1000_RXDCTL(0):
-               for (n = 0; n < 2; n++)
-                       regs[n] = __er32(hw, E1000_RXDCTL(n));
-               break;
-       case E1000_TXDCTL(0):
-               for (n = 0; n < 2; n++)
-                       regs[n] = __er32(hw, E1000_TXDCTL(n));
-               break;
-       case E1000_TARC(0):
-               for (n = 0; n < 2; n++)
-                       regs[n] = __er32(hw, E1000_TARC(n));
-               break;
-       default:
-               printk(KERN_INFO "%-15s %08x\n",
-                      reginfo->name, __er32(hw, reginfo->ofs));
-               return;
-       }
-
-       snprintf(rname, 16, "%s%s", reginfo->name, "[0-1]");
-       printk(KERN_INFO "%-15s ", rname);
-       for (n = 0; n < 2; n++)
-               printk(KERN_CONT "%08x ", regs[n]);
-       printk(KERN_CONT "\n");
-}
-
-/*
- * e1000e_dump - Print registers, Tx-ring and Rx-ring
- */
-static void e1000e_dump(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_reg_info *reginfo;
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_tx_desc *tx_desc;
-       struct my_u0 {
-               u64 a;
-               u64 b;
-       } *u0;
-       struct e1000_buffer *buffer_info;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       union e1000_rx_desc_packet_split *rx_desc_ps;
-       struct e1000_rx_desc *rx_desc;
-       struct my_u1 {
-               u64 a;
-               u64 b;
-               u64 c;
-               u64 d;
-       } *u1;
-       u32 staterr;
-       int i = 0;
-
-       if (!netif_msg_hw(adapter))
-               return;
-
-       /* Print netdevice Info */
-       if (netdev) {
-               dev_info(&adapter->pdev->dev, "Net device Info\n");
-               printk(KERN_INFO "Device Name     state            "
-                      "trans_start      last_rx\n");
-               printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",
-                      netdev->name, netdev->state, netdev->trans_start,
-                      netdev->last_rx);
-       }
-
-       /* Print Registers */
-       dev_info(&adapter->pdev->dev, "Register Dump\n");
-       printk(KERN_INFO " Register Name   Value\n");
-       for (reginfo = (struct e1000_reg_info *)e1000_reg_info_tbl;
-            reginfo->name; reginfo++) {
-               e1000_regdump(hw, reginfo);
-       }
-
-       /* Print Tx Ring Summary */
-       if (!netdev || !netif_running(netdev))
-               goto exit;
-
-       dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");
-       printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma  ]"
-              " leng ntw timestamp\n");
-       buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
-       printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",
-              0, tx_ring->next_to_use, tx_ring->next_to_clean,
-              (unsigned long long)buffer_info->dma,
-              buffer_info->length,
-              buffer_info->next_to_watch,
-              (unsigned long long)buffer_info->time_stamp);
-
-       /* Print Tx Ring */
-       if (!netif_msg_tx_done(adapter))
-               goto rx_ring_summary;
-
-       dev_info(&adapter->pdev->dev, "Tx Ring Dump\n");
-
-       /* Transmit Descriptor Formats - DEXT[29] is 0 (Legacy) or 1 (Extended)
-        *
-        * Legacy Transmit Descriptor
-        *   +--------------------------------------------------------------+
-        * 0 |         Buffer Address [63:0] (Reserved on Write Back)       |
-        *   +--------------------------------------------------------------+
-        * 8 | Special  |    CSS     | Status |  CMD    |  CSO   |  Length  |
-        *   +--------------------------------------------------------------+
-        *   63       48 47        36 35    32 31     24 23    16 15        0
-        *
-        * Extended Context Descriptor (DTYP=0x0) for TSO or checksum offload
-        *   63      48 47    40 39       32 31             16 15    8 7      0
-        *   +----------------------------------------------------------------+
-        * 0 |  TUCSE  | TUCS0  |   TUCSS   |     IPCSE       | IPCS0 | IPCSS |
-        *   +----------------------------------------------------------------+
-        * 8 |   MSS   | HDRLEN | RSV | STA | TUCMD | DTYP |      PAYLEN      |
-        *   +----------------------------------------------------------------+
-        *   63      48 47    40 39 36 35 32 31   24 23  20 19                0
-        *
-        * Extended Data Descriptor (DTYP=0x1)
-        *   +----------------------------------------------------------------+
-        * 0 |                     Buffer Address [63:0]                      |
-        *   +----------------------------------------------------------------+
-        * 8 | VLAN tag |  POPTS  | Rsvd | Status | Command | DTYP |  DTALEN  |
-        *   +----------------------------------------------------------------+
-        *   63       48 47     40 39  36 35    32 31     24 23  20 19        0
-        */
-       printk(KERN_INFO "Tl[desc]     [address 63:0  ] [SpeCssSCmCsLen]"
-              " [bi->dma       ] leng  ntw timestamp        bi->skb "
-              "<-- Legacy format\n");
-       printk(KERN_INFO "Tc[desc]     [Ce CoCsIpceCoS] [MssHlRSCm0Plen]"
-              " [bi->dma       ] leng  ntw timestamp        bi->skb "
-              "<-- Ext Context format\n");
-       printk(KERN_INFO "Td[desc]     [address 63:0  ] [VlaPoRSCm1Dlen]"
-              " [bi->dma       ] leng  ntw timestamp        bi->skb "
-              "<-- Ext Data format\n");
-       for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
-               tx_desc = E1000_TX_DESC(*tx_ring, i);
-               buffer_info = &tx_ring->buffer_info[i];
-               u0 = (struct my_u0 *)tx_desc;
-               printk(KERN_INFO "T%c[0x%03X]    %016llX %016llX %016llX "
-                      "%04X  %3X %016llX %p",
-                      (!(le64_to_cpu(u0->b) & (1 << 29)) ? 'l' :
-                       ((le64_to_cpu(u0->b) & (1 << 20)) ? 'd' : 'c')), i,
-                      (unsigned long long)le64_to_cpu(u0->a),
-                      (unsigned long long)le64_to_cpu(u0->b),
-                      (unsigned long long)buffer_info->dma,
-                      buffer_info->length, buffer_info->next_to_watch,
-                      (unsigned long long)buffer_info->time_stamp,
-                      buffer_info->skb);
-               if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean)
-                       printk(KERN_CONT " NTC/U\n");
-               else if (i == tx_ring->next_to_use)
-                       printk(KERN_CONT " NTU\n");
-               else if (i == tx_ring->next_to_clean)
-                       printk(KERN_CONT " NTC\n");
-               else
-                       printk(KERN_CONT "\n");
-
-               if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
-                       print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,
-                                      16, 1, phys_to_virt(buffer_info->dma),
-                                      buffer_info->length, true);
-       }
-
-       /* Print Rx Ring Summary */
-rx_ring_summary:
-       dev_info(&adapter->pdev->dev, "Rx Ring Summary\n");
-       printk(KERN_INFO "Queue [NTU] [NTC]\n");
-       printk(KERN_INFO " %5d %5X %5X\n", 0,
-              rx_ring->next_to_use, rx_ring->next_to_clean);
-
-       /* Print Rx Ring */
-       if (!netif_msg_rx_status(adapter))
-               goto exit;
-
-       dev_info(&adapter->pdev->dev, "Rx Ring Dump\n");
-       switch (adapter->rx_ps_pages) {
-       case 1:
-       case 2:
-       case 3:
-               /* [Extended] Packet Split Receive Descriptor Format
-                *
-                *    +-----------------------------------------------------+
-                *  0 |                Buffer Address 0 [63:0]              |
-                *    +-----------------------------------------------------+
-                *  8 |                Buffer Address 1 [63:0]              |
-                *    +-----------------------------------------------------+
-                * 16 |                Buffer Address 2 [63:0]              |
-                *    +-----------------------------------------------------+
-                * 24 |                Buffer Address 3 [63:0]              |
-                *    +-----------------------------------------------------+
-                */
-               printk(KERN_INFO "R  [desc]      [buffer 0 63:0 ] "
-                      "[buffer 1 63:0 ] "
-                      "[buffer 2 63:0 ] [buffer 3 63:0 ] [bi->dma       ] "
-                      "[bi->skb] <-- Ext Pkt Split format\n");
-               /* [Extended] Receive Descriptor (Write-Back) Format
-                *
-                *   63       48 47    32 31     13 12    8 7    4 3        0
-                *   +------------------------------------------------------+
-                * 0 | Packet   | IP     |  Rsvd   | MRQ   | Rsvd | MRQ RSS |
-                *   | Checksum | Ident  |         | Queue |      |  Type   |
-                *   +------------------------------------------------------+
-                * 8 | VLAN Tag | Length | Extended Error | Extended Status |
-                *   +------------------------------------------------------+
-                *   63       48 47    32 31            20 19               0
-                */
-               printk(KERN_INFO "RWB[desc]      [ck ipid mrqhsh] "
-                      "[vl   l0 ee  es] "
-                      "[ l3  l2  l1 hs] [reserved      ] ---------------- "
-                      "[bi->skb] <-- Ext Rx Write-Back format\n");
-               for (i = 0; i < rx_ring->count; i++) {
-                       buffer_info = &rx_ring->buffer_info[i];
-                       rx_desc_ps = E1000_RX_DESC_PS(*rx_ring, i);
-                       u1 = (struct my_u1 *)rx_desc_ps;
-                       staterr =
-                           le32_to_cpu(rx_desc_ps->wb.middle.status_error);
-                       if (staterr & E1000_RXD_STAT_DD) {
-                               /* Descriptor Done */
-                               printk(KERN_INFO "RWB[0x%03X]     %016llX "
-                                      "%016llX %016llX %016llX "
-                                      "---------------- %p", i,
-                                      (unsigned long long)le64_to_cpu(u1->a),
-                                      (unsigned long long)le64_to_cpu(u1->b),
-                                      (unsigned long long)le64_to_cpu(u1->c),
-                                      (unsigned long long)le64_to_cpu(u1->d),
-                                      buffer_info->skb);
-                       } else {
-                               printk(KERN_INFO "R  [0x%03X]     %016llX "
-                                      "%016llX %016llX %016llX %016llX %p", i,
-                                      (unsigned long long)le64_to_cpu(u1->a),
-                                      (unsigned long long)le64_to_cpu(u1->b),
-                                      (unsigned long long)le64_to_cpu(u1->c),
-                                      (unsigned long long)le64_to_cpu(u1->d),
-                                      (unsigned long long)buffer_info->dma,
-                                      buffer_info->skb);
-
-                               if (netif_msg_pktdata(adapter))
-                                       print_hex_dump(KERN_INFO, "",
-                                               DUMP_PREFIX_ADDRESS, 16, 1,
-                                               phys_to_virt(buffer_info->dma),
-                                               adapter->rx_ps_bsize0, true);
-                       }
-
-                       if (i == rx_ring->next_to_use)
-                               printk(KERN_CONT " NTU\n");
-                       else if (i == rx_ring->next_to_clean)
-                               printk(KERN_CONT " NTC\n");
-                       else
-                               printk(KERN_CONT "\n");
-               }
-               break;
-       default:
-       case 0:
-               /* Legacy Receive Descriptor Format
-                *
-                * +-----------------------------------------------------+
-                * |                Buffer Address [63:0]                |
-                * +-----------------------------------------------------+
-                * | VLAN Tag | Errors | Status 0 | Packet csum | Length |
-                * +-----------------------------------------------------+
-                * 63       48 47    40 39      32 31         16 15      0
-                */
-               printk(KERN_INFO "Rl[desc]     [address 63:0  ] "
-                      "[vl er S cks ln] [bi->dma       ] [bi->skb] "
-                      "<-- Legacy format\n");
-               for (i = 0; rx_ring->desc && (i < rx_ring->count); i++) {
-                       rx_desc = E1000_RX_DESC(*rx_ring, i);
-                       buffer_info = &rx_ring->buffer_info[i];
-                       u0 = (struct my_u0 *)rx_desc;
-                       printk(KERN_INFO "Rl[0x%03X]    %016llX %016llX "
-                              "%016llX %p", i,
-                              (unsigned long long)le64_to_cpu(u0->a),
-                              (unsigned long long)le64_to_cpu(u0->b),
-                              (unsigned long long)buffer_info->dma,
-                              buffer_info->skb);
-                       if (i == rx_ring->next_to_use)
-                               printk(KERN_CONT " NTU\n");
-                       else if (i == rx_ring->next_to_clean)
-                               printk(KERN_CONT " NTC\n");
-                       else
-                               printk(KERN_CONT "\n");
-
-                       if (netif_msg_pktdata(adapter))
-                               print_hex_dump(KERN_INFO, "",
-                                              DUMP_PREFIX_ADDRESS,
-                                              16, 1,
-                                              phys_to_virt(buffer_info->dma),
-                                              adapter->rx_buffer_len, true);
-               }
-       }
-
-exit:
-       return;
-}
-
-/**
- * e1000_desc_unused - calculate if we have unused descriptors
- **/
-static int e1000_desc_unused(struct e1000_ring *ring)
-{
-       if (ring->next_to_clean > ring->next_to_use)
-               return ring->next_to_clean - ring->next_to_use - 1;
-
-       return ring->count + ring->next_to_clean - ring->next_to_use - 1;
-}
-
-/**
- * e1000_receive_skb - helper function to handle Rx indications
- * @adapter: board private structure
- * @status: descriptor status field as written by hardware
- * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
- * @skb: pointer to sk_buff to be indicated to stack
- **/
-static void e1000_receive_skb(struct e1000_adapter *adapter,
-                             struct net_device *netdev, struct sk_buff *skb,
-                             u8 status, __le16 vlan)
-{
-       u16 tag = le16_to_cpu(vlan);
-       skb->protocol = eth_type_trans(skb, netdev);
-
-       if (status & E1000_RXD_STAT_VP)
-               __vlan_hwaccel_put_tag(skb, tag);
-
-       napi_gro_receive(&adapter->napi, skb);
-}
-
-/**
- * e1000_rx_checksum - Receive Checksum Offload
- * @adapter:     board private structure
- * @status_err:  receive descriptor status and error fields
- * @csum:      receive descriptor csum field
- * @sk_buff:     socket buffer with received data
- **/
-static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
-                             u32 csum, struct sk_buff *skb)
-{
-       u16 status = (u16)status_err;
-       u8 errors = (u8)(status_err >> 24);
-
-       skb_checksum_none_assert(skb);
-
-       /* Ignore Checksum bit is set */
-       if (status & E1000_RXD_STAT_IXSM)
-               return;
-       /* TCP/UDP checksum error bit is set */
-       if (errors & E1000_RXD_ERR_TCPE) {
-               /* let the stack verify checksum errors */
-               adapter->hw_csum_err++;
-               return;
-       }
-
-       /* TCP/UDP Checksum has not been calculated */
-       if (!(status & (E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_UDPCS)))
-               return;
-
-       /* It must be a TCP or UDP packet with a valid checksum */
-       if (status & E1000_RXD_STAT_TCPCS) {
-               /* TCP checksum is good */
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-       } else {
-               /*
-                * IP fragment with UDP payload
-                * Hardware complements the payload checksum, so we undo it
-                * and then put the value in host order for further stack use.
-                */
-               __sum16 sum = (__force __sum16)htons(csum);
-               skb->csum = csum_unfold(~sum);
-               skb->ip_summed = CHECKSUM_COMPLETE;
-       }
-       adapter->hw_csum_good++;
-}
-
-/**
- * e1000_alloc_rx_buffers - Replace used receive buffers; legacy & extended
- * @adapter: address of board private structure
- **/
-static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
-                                  int cleaned_count, gfp_t gfp)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_rx_desc *rx_desc;
-       struct e1000_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       unsigned int bufsz = adapter->rx_buffer_len;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (cleaned_count--) {
-               skb = buffer_info->skb;
-               if (skb) {
-                       skb_trim(skb, 0);
-                       goto map_skb;
-               }
-
-               skb = __netdev_alloc_skb_ip_align(netdev, bufsz, gfp);
-               if (!skb) {
-                       /* Better luck next round */
-                       adapter->alloc_rx_buff_failed++;
-                       break;
-               }
-
-               buffer_info->skb = skb;
-map_skb:
-               buffer_info->dma = dma_map_single(&pdev->dev, skb->data,
-                                                 adapter->rx_buffer_len,
-                                                 DMA_FROM_DEVICE);
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
-                       dev_err(&pdev->dev, "Rx DMA map failed\n");
-                       adapter->rx_dma_failed++;
-                       break;
-               }
-
-               rx_desc = E1000_RX_DESC(*rx_ring, i);
-               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-
-               if (unlikely(!(i & (E1000_RX_BUFFER_WRITE - 1)))) {
-                       /*
-                        * Force memory writes to complete before letting h/w
-                        * know there are new descriptors to fetch.  (Only
-                        * applicable for weak-ordered memory model archs,
-                        * such as IA-64).
-                        */
-                       wmb();
-                       writel(i, adapter->hw.hw_addr + rx_ring->tail);
-               }
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-       rx_ring->next_to_use = i;
-}
-
-/**
- * e1000_alloc_rx_buffers_ps - Replace used receive buffers; packet split
- * @adapter: address of board private structure
- **/
-static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
-                                     int cleaned_count, gfp_t gfp)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       union e1000_rx_desc_packet_split *rx_desc;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_buffer *buffer_info;
-       struct e1000_ps_page *ps_page;
-       struct sk_buff *skb;
-       unsigned int i, j;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (cleaned_count--) {
-               rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
-
-               for (j = 0; j < PS_PAGE_BUFFERS; j++) {
-                       ps_page = &buffer_info->ps_pages[j];
-                       if (j >= adapter->rx_ps_pages) {
-                               /* all unused desc entries get hw null ptr */
-                               rx_desc->read.buffer_addr[j + 1] =
-                                   ~cpu_to_le64(0);
-                               continue;
-                       }
-                       if (!ps_page->page) {
-                               ps_page->page = alloc_page(gfp);
-                               if (!ps_page->page) {
-                                       adapter->alloc_rx_buff_failed++;
-                                       goto no_buffers;
-                               }
-                               ps_page->dma = dma_map_page(&pdev->dev,
-                                                           ps_page->page,
-                                                           0, PAGE_SIZE,
-                                                           DMA_FROM_DEVICE);
-                               if (dma_mapping_error(&pdev->dev,
-                                                     ps_page->dma)) {
-                                       dev_err(&adapter->pdev->dev,
-                                               "Rx DMA page map failed\n");
-                                       adapter->rx_dma_failed++;
-                                       goto no_buffers;
-                               }
-                       }
-                       /*
-                        * Refresh the desc even if buffer_addrs
-                        * didn't change because each write-back
-                        * erases this info.
-                        */
-                       rx_desc->read.buffer_addr[j + 1] =
-                           cpu_to_le64(ps_page->dma);
-               }
-
-               skb = __netdev_alloc_skb_ip_align(netdev,
-                                                 adapter->rx_ps_bsize0,
-                                                 gfp);
-
-               if (!skb) {
-                       adapter->alloc_rx_buff_failed++;
-                       break;
-               }
-
-               buffer_info->skb = skb;
-               buffer_info->dma = dma_map_single(&pdev->dev, skb->data,
-                                                 adapter->rx_ps_bsize0,
-                                                 DMA_FROM_DEVICE);
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
-                       dev_err(&pdev->dev, "Rx DMA map failed\n");
-                       adapter->rx_dma_failed++;
-                       /* cleanup skb */
-                       dev_kfree_skb_any(skb);
-                       buffer_info->skb = NULL;
-                       break;
-               }
-
-               rx_desc->read.buffer_addr[0] = cpu_to_le64(buffer_info->dma);
-
-               if (unlikely(!(i & (E1000_RX_BUFFER_WRITE - 1)))) {
-                       /*
-                        * Force memory writes to complete before letting h/w
-                        * know there are new descriptors to fetch.  (Only
-                        * applicable for weak-ordered memory model archs,
-                        * such as IA-64).
-                        */
-                       wmb();
-                       writel(i << 1, adapter->hw.hw_addr + rx_ring->tail);
-               }
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-no_buffers:
-       rx_ring->next_to_use = i;
-}
-
-/**
- * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers
- * @adapter: address of board private structure
- * @cleaned_count: number of buffers to allocate this pass
- **/
-
-static void e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
-                                        int cleaned_count, gfp_t gfp)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_rx_desc *rx_desc;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       unsigned int bufsz = 256 - 16 /* for skb_reserve */;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (cleaned_count--) {
-               skb = buffer_info->skb;
-               if (skb) {
-                       skb_trim(skb, 0);
-                       goto check_page;
-               }
-
-               skb = __netdev_alloc_skb_ip_align(netdev, bufsz, gfp);
-               if (unlikely(!skb)) {
-                       /* Better luck next round */
-                       adapter->alloc_rx_buff_failed++;
-                       break;
-               }
-
-               buffer_info->skb = skb;
-check_page:
-               /* allocate a new page if necessary */
-               if (!buffer_info->page) {
-                       buffer_info->page = alloc_page(gfp);
-                       if (unlikely(!buffer_info->page)) {
-                               adapter->alloc_rx_buff_failed++;
-                               break;
-                       }
-               }
-
-               if (!buffer_info->dma)
-                       buffer_info->dma = dma_map_page(&pdev->dev,
-                                                       buffer_info->page, 0,
-                                                       PAGE_SIZE,
-                                                       DMA_FROM_DEVICE);
-
-               rx_desc = E1000_RX_DESC(*rx_ring, i);
-               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-
-               if (unlikely(++i == rx_ring->count))
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-       if (likely(rx_ring->next_to_use != i)) {
-               rx_ring->next_to_use = i;
-               if (unlikely(i-- == 0))
-                       i = (rx_ring->count - 1);
-
-               /* Force memory writes to complete before letting h/w
-                * know there are new descriptors to fetch.  (Only
-                * applicable for weak-ordered memory model archs,
-                * such as IA-64). */
-               wmb();
-               writel(i, adapter->hw.hw_addr + rx_ring->tail);
-       }
-}
-
-/**
- * e1000_clean_rx_irq - Send received data up the network stack; legacy
- * @adapter: board private structure
- *
- * the return value indicates whether actual cleaning was done, there
- * is no guarantee that everything was cleaned
- **/
-static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                              int *work_done, int work_to_do)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_rx_desc *rx_desc, *next_rxd;
-       struct e1000_buffer *buffer_info, *next_buffer;
-       u32 length;
-       unsigned int i;
-       int cleaned_count = 0;
-       bool cleaned = 0;
-       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = E1000_RX_DESC(*rx_ring, i);
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (rx_desc->status & E1000_RXD_STAT_DD) {
-               struct sk_buff *skb;
-               u8 status;
-
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-               rmb();  /* read descriptor and rx_buffer_info after status DD */
-
-               status = rx_desc->status;
-               skb = buffer_info->skb;
-               buffer_info->skb = NULL;
-
-               prefetch(skb->data - NET_IP_ALIGN);
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               next_rxd = E1000_RX_DESC(*rx_ring, i);
-               prefetch(next_rxd);
-
-               next_buffer = &rx_ring->buffer_info[i];
-
-               cleaned = 1;
-               cleaned_count++;
-               dma_unmap_single(&pdev->dev,
-                                buffer_info->dma,
-                                adapter->rx_buffer_len,
-                                DMA_FROM_DEVICE);
-               buffer_info->dma = 0;
-
-               length = le16_to_cpu(rx_desc->length);
-
-               /*
-                * !EOP means multiple descriptors were used to store a single
-                * packet, if that's the case we need to toss it.  In fact, we
-                * need to toss every packet with the EOP bit clear and the
-                * next frame that _does_ have the EOP bit set, as it is by
-                * definition only a frame fragment
-                */
-               if (unlikely(!(status & E1000_RXD_STAT_EOP)))
-                       adapter->flags2 |= FLAG2_IS_DISCARDING;
-
-               if (adapter->flags2 & FLAG2_IS_DISCARDING) {
-                       /* All receives must fit into a single buffer */
-                       e_dbg("Receive packet consumed multiple buffers\n");
-                       /* recycle */
-                       buffer_info->skb = skb;
-                       if (status & E1000_RXD_STAT_EOP)
-                               adapter->flags2 &= ~FLAG2_IS_DISCARDING;
-                       goto next_desc;
-               }
-
-               if (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK) {
-                       /* recycle */
-                       buffer_info->skb = skb;
-                       goto next_desc;
-               }
-
-               /* adjust length to remove Ethernet CRC */
-               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
-                       length -= 4;
-
-               total_rx_bytes += length;
-               total_rx_packets++;
-
-               /*
-                * code added for copybreak, this should improve
-                * performance for small packets with large amounts
-                * of reassembly being done in the stack
-                */
-               if (length < copybreak) {
-                       struct sk_buff *new_skb =
-                           netdev_alloc_skb_ip_align(netdev, length);
-                       if (new_skb) {
-                               skb_copy_to_linear_data_offset(new_skb,
-                                                              -NET_IP_ALIGN,
-                                                              (skb->data -
-                                                               NET_IP_ALIGN),
-                                                              (length +
-                                                               NET_IP_ALIGN));
-                               /* save the skb in buffer_info as good */
-                               buffer_info->skb = skb;
-                               skb = new_skb;
-                       }
-                       /* else just continue with the old one */
-               }
-               /* end copybreak code */
-               skb_put(skb, length);
-
-               /* Receive Checksum Offload */
-               e1000_rx_checksum(adapter,
-                                 (u32)(status) |
-                                 ((u32)(rx_desc->errors) << 24),
-                                 le16_to_cpu(rx_desc->csum), skb);
-
-               e1000_receive_skb(adapter, netdev, skb,status,rx_desc->special);
-
-next_desc:
-               rx_desc->status = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (cleaned_count >= E1000_RX_BUFFER_WRITE) {
-                       adapter->alloc_rx_buf(adapter, cleaned_count,
-                                             GFP_ATOMIC);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-       }
-       rx_ring->next_to_clean = i;
-
-       cleaned_count = e1000_desc_unused(rx_ring);
-       if (cleaned_count)
-               adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
-
-       adapter->total_rx_bytes += total_rx_bytes;
-       adapter->total_rx_packets += total_rx_packets;
-       return cleaned;
-}
-
-static void e1000_put_txbuf(struct e1000_adapter *adapter,
-                            struct e1000_buffer *buffer_info)
-{
-       if (buffer_info->dma) {
-               if (buffer_info->mapped_as_page)
-                       dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
-                                      buffer_info->length, DMA_TO_DEVICE);
-               else
-                       dma_unmap_single(&adapter->pdev->dev, buffer_info->dma,
-                                        buffer_info->length, DMA_TO_DEVICE);
-               buffer_info->dma = 0;
-       }
-       if (buffer_info->skb) {
-               dev_kfree_skb_any(buffer_info->skb);
-               buffer_info->skb = NULL;
-       }
-       buffer_info->time_stamp = 0;
-}
-
-static void e1000_print_hw_hang(struct work_struct *work)
-{
-       struct e1000_adapter *adapter = container_of(work,
-                                                    struct e1000_adapter,
-                                                    print_hang_task);
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       unsigned int i = tx_ring->next_to_clean;
-       unsigned int eop = tx_ring->buffer_info[i].next_to_watch;
-       struct e1000_tx_desc *eop_desc = E1000_TX_DESC(*tx_ring, eop);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 phy_status, phy_1000t_status, phy_ext_status;
-       u16 pci_status;
-
-       if (test_bit(__E1000_DOWN, &adapter->state))
-               return;
-
-       e1e_rphy(hw, PHY_STATUS, &phy_status);
-       e1e_rphy(hw, PHY_1000T_STATUS, &phy_1000t_status);
-       e1e_rphy(hw, PHY_EXT_STATUS, &phy_ext_status);
-
-       pci_read_config_word(adapter->pdev, PCI_STATUS, &pci_status);
-
-       /* detected Hardware unit hang */
-       e_err("Detected Hardware Unit Hang:\n"
-             "  TDH                  <%x>\n"
-             "  TDT                  <%x>\n"
-             "  next_to_use          <%x>\n"
-             "  next_to_clean        <%x>\n"
-             "buffer_info[next_to_clean]:\n"
-             "  time_stamp           <%lx>\n"
-             "  next_to_watch        <%x>\n"
-             "  jiffies              <%lx>\n"
-             "  next_to_watch.status <%x>\n"
-             "MAC Status             <%x>\n"
-             "PHY Status             <%x>\n"
-             "PHY 1000BASE-T Status  <%x>\n"
-             "PHY Extended Status    <%x>\n"
-             "PCI Status             <%x>\n",
-             readl(adapter->hw.hw_addr + tx_ring->head),
-             readl(adapter->hw.hw_addr + tx_ring->tail),
-             tx_ring->next_to_use,
-             tx_ring->next_to_clean,
-             tx_ring->buffer_info[eop].time_stamp,
-             eop,
-             jiffies,
-             eop_desc->upper.fields.status,
-             er32(STATUS),
-             phy_status,
-             phy_1000t_status,
-             phy_ext_status,
-             pci_status);
-}
-
-/**
- * e1000_clean_tx_irq - Reclaim resources after transmit completes
- * @adapter: board private structure
- *
- * the return value indicates whether actual cleaning was done, there
- * is no guarantee that everything was cleaned
- **/
-static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_tx_desc *tx_desc, *eop_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i, eop;
-       unsigned int count = 0;
-       unsigned int total_tx_bytes = 0, total_tx_packets = 0;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->buffer_info[i].next_to_watch;
-       eop_desc = E1000_TX_DESC(*tx_ring, eop);
-
-       while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) &&
-              (count < tx_ring->count)) {
-               bool cleaned = false;
-               rmb(); /* read buffer_info after eop_desc */
-               for (; !cleaned; count++) {
-                       tx_desc = E1000_TX_DESC(*tx_ring, i);
-                       buffer_info = &tx_ring->buffer_info[i];
-                       cleaned = (i == eop);
-
-                       if (cleaned) {
-                               total_tx_packets += buffer_info->segs;
-                               total_tx_bytes += buffer_info->bytecount;
-                       }
-
-                       e1000_put_txbuf(adapter, buffer_info);
-                       tx_desc->upper.data = 0;
-
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-
-               if (i == tx_ring->next_to_use)
-                       break;
-               eop = tx_ring->buffer_info[i].next_to_watch;
-               eop_desc = E1000_TX_DESC(*tx_ring, eop);
-       }
-
-       tx_ring->next_to_clean = i;
-
-#define TX_WAKE_THRESHOLD 32
-       if (count && netif_carrier_ok(netdev) &&
-           e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean.
-                */
-               smp_mb();
-
-               if (netif_queue_stopped(netdev) &&
-                   !(test_bit(__E1000_DOWN, &adapter->state))) {
-                       netif_wake_queue(netdev);
-                       ++adapter->restart_queue;
-               }
-       }
-
-       if (adapter->detect_tx_hung) {
-               /*
-                * Detect a transmit hang in hardware, this serializes the
-                * check with the clearing of time_stamp and movement of i
-                */
-               adapter->detect_tx_hung = 0;
-               if (tx_ring->buffer_info[i].time_stamp &&
-                   time_after(jiffies, tx_ring->buffer_info[i].time_stamp
-                              + (adapter->tx_timeout_factor * HZ)) &&
-                   !(er32(STATUS) & E1000_STATUS_TXOFF)) {
-                       schedule_work(&adapter->print_hang_task);
-                       netif_stop_queue(netdev);
-               }
-       }
-       adapter->total_tx_bytes += total_tx_bytes;
-       adapter->total_tx_packets += total_tx_packets;
-       return count < tx_ring->count;
-}
-
-/**
- * e1000_clean_rx_irq_ps - Send received data up the network stack; packet split
- * @adapter: board private structure
- *
- * the return value indicates whether actual cleaning was done, there
- * is no guarantee that everything was cleaned
- **/
-static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
-                                 int *work_done, int work_to_do)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       union e1000_rx_desc_packet_split *rx_desc, *next_rxd;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_buffer *buffer_info, *next_buffer;
-       struct e1000_ps_page *ps_page;
-       struct sk_buff *skb;
-       unsigned int i, j;
-       u32 length, staterr;
-       int cleaned_count = 0;
-       bool cleaned = 0;
-       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
-       staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (staterr & E1000_RXD_STAT_DD) {
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-               skb = buffer_info->skb;
-               rmb();  /* read descriptor and rx_buffer_info after status DD */
-
-               /* in the packet split case this is header only */
-               prefetch(skb->data - NET_IP_ALIGN);
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               next_rxd = E1000_RX_DESC_PS(*rx_ring, i);
-               prefetch(next_rxd);
-
-               next_buffer = &rx_ring->buffer_info[i];
-
-               cleaned = 1;
-               cleaned_count++;
-               dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                adapter->rx_ps_bsize0, DMA_FROM_DEVICE);
-               buffer_info->dma = 0;
-
-               /* see !EOP comment in other Rx routine */
-               if (!(staterr & E1000_RXD_STAT_EOP))
-                       adapter->flags2 |= FLAG2_IS_DISCARDING;
-
-               if (adapter->flags2 & FLAG2_IS_DISCARDING) {
-                       e_dbg("Packet Split buffers didn't pick up the full "
-                             "packet\n");
-                       dev_kfree_skb_irq(skb);
-                       if (staterr & E1000_RXD_STAT_EOP)
-                               adapter->flags2 &= ~FLAG2_IS_DISCARDING;
-                       goto next_desc;
-               }
-
-               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
-                       dev_kfree_skb_irq(skb);
-                       goto next_desc;
-               }
-
-               length = le16_to_cpu(rx_desc->wb.middle.length0);
-
-               if (!length) {
-                       e_dbg("Last part of the packet spanning multiple "
-                             "descriptors\n");
-                       dev_kfree_skb_irq(skb);
-                       goto next_desc;
-               }
-
-               /* Good Receive */
-               skb_put(skb, length);
-
-               {
-               /*
-                * this looks ugly, but it seems compiler issues make it
-                * more efficient than reusing j
-                */
-               int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
-
-               /*
-                * page alloc/put takes too long and effects small packet
-                * throughput, so unsplit small packets and save the alloc/put
-                * only valid in softirq (napi) context to call kmap_*
-                */
-               if (l1 && (l1 <= copybreak) &&
-                   ((length + l1) <= adapter->rx_ps_bsize0)) {
-                       u8 *vaddr;
-
-                       ps_page = &buffer_info->ps_pages[0];
-
-                       /*
-                        * there is no documentation about how to call
-                        * kmap_atomic, so we can't hold the mapping
-                        * very long
-                        */
-                       dma_sync_single_for_cpu(&pdev->dev, ps_page->dma,
-                                               PAGE_SIZE, DMA_FROM_DEVICE);
-                       vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
-                       memcpy(skb_tail_pointer(skb), vaddr, l1);
-                       kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
-                       dma_sync_single_for_device(&pdev->dev, ps_page->dma,
-                                                  PAGE_SIZE, DMA_FROM_DEVICE);
-
-                       /* remove the CRC */
-                       if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
-                               l1 -= 4;
-
-                       skb_put(skb, l1);
-                       goto copydone;
-               } /* if */
-               }
-
-               for (j = 0; j < PS_PAGE_BUFFERS; j++) {
-                       length = le16_to_cpu(rx_desc->wb.upper.length[j]);
-                       if (!length)
-                               break;
-
-                       ps_page = &buffer_info->ps_pages[j];
-                       dma_unmap_page(&pdev->dev, ps_page->dma, PAGE_SIZE,
-                                      DMA_FROM_DEVICE);
-                       ps_page->dma = 0;
-                       skb_fill_page_desc(skb, j, ps_page->page, 0, length);
-                       ps_page->page = NULL;
-                       skb->len += length;
-                       skb->data_len += length;
-                       skb->truesize += length;
-               }
-
-               /* strip the ethernet crc, problem is we're using pages now so
-                * this whole operation can get a little cpu intensive
-                */
-               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
-                       pskb_trim(skb, skb->len - 4);
-
-copydone:
-               total_rx_bytes += skb->len;
-               total_rx_packets++;
-
-               e1000_rx_checksum(adapter, staterr, le16_to_cpu(
-                       rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);
-
-               if (rx_desc->wb.upper.header_status &
-                          cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
-                       adapter->rx_hdr_split++;
-
-               e1000_receive_skb(adapter, netdev, skb,
-                                 staterr, rx_desc->wb.middle.vlan);
-
-next_desc:
-               rx_desc->wb.middle.status_error &= cpu_to_le32(~0xFF);
-               buffer_info->skb = NULL;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (cleaned_count >= E1000_RX_BUFFER_WRITE) {
-                       adapter->alloc_rx_buf(adapter, cleaned_count,
-                                             GFP_ATOMIC);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-
-               staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
-       }
-       rx_ring->next_to_clean = i;
-
-       cleaned_count = e1000_desc_unused(rx_ring);
-       if (cleaned_count)
-               adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
-
-       adapter->total_rx_bytes += total_rx_bytes;
-       adapter->total_rx_packets += total_rx_packets;
-       return cleaned;
-}
-
-/**
- * e1000_consume_page - helper function
- **/
-static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb,
-                               u16 length)
-{
-       bi->page = NULL;
-       skb->len += length;
-       skb->data_len += length;
-       skb->truesize += length;
-}
-
-/**
- * e1000_clean_jumbo_rx_irq - Send received data up the network stack; legacy
- * @adapter: board private structure
- *
- * the return value indicates whether actual cleaning was done, there
- * is no guarantee that everything was cleaned
- **/
-
-static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
-                                     int *work_done, int work_to_do)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_rx_desc *rx_desc, *next_rxd;
-       struct e1000_buffer *buffer_info, *next_buffer;
-       u32 length;
-       unsigned int i;
-       int cleaned_count = 0;
-       bool cleaned = false;
-       unsigned int total_rx_bytes=0, total_rx_packets=0;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = E1000_RX_DESC(*rx_ring, i);
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (rx_desc->status & E1000_RXD_STAT_DD) {
-               struct sk_buff *skb;
-               u8 status;
-
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-               rmb();  /* read descriptor and rx_buffer_info after status DD */
-
-               status = rx_desc->status;
-               skb = buffer_info->skb;
-               buffer_info->skb = NULL;
-
-               ++i;
-               if (i == rx_ring->count)
-                       i = 0;
-               next_rxd = E1000_RX_DESC(*rx_ring, i);
-               prefetch(next_rxd);
-
-               next_buffer = &rx_ring->buffer_info[i];
-
-               cleaned = true;
-               cleaned_count++;
-               dma_unmap_page(&pdev->dev, buffer_info->dma, PAGE_SIZE,
-                              DMA_FROM_DEVICE);
-               buffer_info->dma = 0;
-
-               length = le16_to_cpu(rx_desc->length);
-
-               /* errors is only valid for DD + EOP descriptors */
-               if (unlikely((status & E1000_RXD_STAT_EOP) &&
-                   (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK))) {
-                               /* recycle both page and skb */
-                               buffer_info->skb = skb;
-                               /* an error means any chain goes out the window
-                                * too */
-                               if (rx_ring->rx_skb_top)
-                                       dev_kfree_skb_irq(rx_ring->rx_skb_top);
-                               rx_ring->rx_skb_top = NULL;
-                               goto next_desc;
-               }
-
-#define rxtop (rx_ring->rx_skb_top)
-               if (!(status & E1000_RXD_STAT_EOP)) {
-                       /* this descriptor is only the beginning (or middle) */
-                       if (!rxtop) {
-                               /* this is the beginning of a chain */
-                               rxtop = skb;
-                               skb_fill_page_desc(rxtop, 0, buffer_info->page,
-                                                  0, length);
-                       } else {
-                               /* this is the middle of a chain */
-                               skb_fill_page_desc(rxtop,
-                                   skb_shinfo(rxtop)->nr_frags,
-                                   buffer_info->page, 0, length);
-                               /* re-use the skb, only consumed the page */
-                               buffer_info->skb = skb;
-                       }
-                       e1000_consume_page(buffer_info, rxtop, length);
-                       goto next_desc;
-               } else {
-                       if (rxtop) {
-                               /* end of the chain */
-                               skb_fill_page_desc(rxtop,
-                                   skb_shinfo(rxtop)->nr_frags,
-                                   buffer_info->page, 0, length);
-                               /* re-use the current skb, we only consumed the
-                                * page */
-                               buffer_info->skb = skb;
-                               skb = rxtop;
-                               rxtop = NULL;
-                               e1000_consume_page(buffer_info, skb, length);
-                       } else {
-                               /* no chain, got EOP, this buf is the packet
-                                * copybreak to save the put_page/alloc_page */
-                               if (length <= copybreak &&
-                                   skb_tailroom(skb) >= length) {
-                                       u8 *vaddr;
-                                       vaddr = kmap_atomic(buffer_info->page,
-                                                          KM_SKB_DATA_SOFTIRQ);
-                                       memcpy(skb_tail_pointer(skb), vaddr,
-                                              length);
-                                       kunmap_atomic(vaddr,
-                                                     KM_SKB_DATA_SOFTIRQ);
-                                       /* re-use the page, so don't erase
-                                        * buffer_info->page */
-                                       skb_put(skb, length);
-                               } else {
-                                       skb_fill_page_desc(skb, 0,
-                                                          buffer_info->page, 0,
-                                                          length);
-                                       e1000_consume_page(buffer_info, skb,
-                                                          length);
-                               }
-                       }
-               }
-
-               /* Receive Checksum Offload XXX recompute due to CRC strip? */
-               e1000_rx_checksum(adapter,
-                                 (u32)(status) |
-                                 ((u32)(rx_desc->errors) << 24),
-                                 le16_to_cpu(rx_desc->csum), skb);
-
-               /* probably a little skewed due to removing CRC */
-               total_rx_bytes += skb->len;
-               total_rx_packets++;
-
-               /* eth type trans needs skb->data to point to something */
-               if (!pskb_may_pull(skb, ETH_HLEN)) {
-                       e_err("pskb_may_pull failed.\n");
-                       dev_kfree_skb_irq(skb);
-                       goto next_desc;
-               }
-
-               e1000_receive_skb(adapter, netdev, skb, status,
-                                 rx_desc->special);
-
-next_desc:
-               rx_desc->status = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
-                       adapter->alloc_rx_buf(adapter, cleaned_count,
-                                             GFP_ATOMIC);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-       }
-       rx_ring->next_to_clean = i;
-
-       cleaned_count = e1000_desc_unused(rx_ring);
-       if (cleaned_count)
-               adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
-
-       adapter->total_rx_bytes += total_rx_bytes;
-       adapter->total_rx_packets += total_rx_packets;
-       return cleaned;
-}
-
-/**
- * e1000_clean_rx_ring - Free Rx Buffers per Queue
- * @adapter: board private structure
- **/
-static void e1000_clean_rx_ring(struct e1000_adapter *adapter)
-{
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_buffer *buffer_info;
-       struct e1000_ps_page *ps_page;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned int i, j;
-
-       /* Free all the Rx ring sk_buffs */
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               if (buffer_info->dma) {
-                       if (adapter->clean_rx == e1000_clean_rx_irq)
-                               dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                                adapter->rx_buffer_len,
-                                                DMA_FROM_DEVICE);
-                       else if (adapter->clean_rx == e1000_clean_jumbo_rx_irq)
-                               dma_unmap_page(&pdev->dev, buffer_info->dma,
-                                              PAGE_SIZE,
-                                              DMA_FROM_DEVICE);
-                       else if (adapter->clean_rx == e1000_clean_rx_irq_ps)
-                               dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                                adapter->rx_ps_bsize0,
-                                                DMA_FROM_DEVICE);
-                       buffer_info->dma = 0;
-               }
-
-               if (buffer_info->page) {
-                       put_page(buffer_info->page);
-                       buffer_info->page = NULL;
-               }
-
-               if (buffer_info->skb) {
-                       dev_kfree_skb(buffer_info->skb);
-                       buffer_info->skb = NULL;
-               }
-
-               for (j = 0; j < PS_PAGE_BUFFERS; j++) {
-                       ps_page = &buffer_info->ps_pages[j];
-                       if (!ps_page->page)
-                               break;
-                       dma_unmap_page(&pdev->dev, ps_page->dma, PAGE_SIZE,
-                                      DMA_FROM_DEVICE);
-                       ps_page->dma = 0;
-                       put_page(ps_page->page);
-                       ps_page->page = NULL;
-               }
-       }
-
-       /* there also may be some cached data from a chained receive */
-       if (rx_ring->rx_skb_top) {
-               dev_kfree_skb(rx_ring->rx_skb_top);
-               rx_ring->rx_skb_top = NULL;
-       }
-
-       /* Zero out the descriptor ring */
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-       adapter->flags2 &= ~FLAG2_IS_DISCARDING;
-
-       writel(0, adapter->hw.hw_addr + rx_ring->head);
-       writel(0, adapter->hw.hw_addr + rx_ring->tail);
-}
-
-static void e1000e_downshift_workaround(struct work_struct *work)
-{
-       struct e1000_adapter *adapter = container_of(work,
-                                       struct e1000_adapter, downshift_task);
-
-       if (test_bit(__E1000_DOWN, &adapter->state))
-               return;
-
-       e1000e_gig_downshift_workaround_ich8lan(&adapter->hw);
-}
-
-/**
- * e1000_intr_msi - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-static irqreturn_t e1000_intr_msi(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 icr = er32(ICR);
-
-       /*
-        * read ICR disables interrupts using IAM
-        */
-
-       if (icr & E1000_ICR_LSC) {
-               hw->mac.get_link_status = 1;
-               /*
-                * ICH8 workaround-- Call gig speed drop workaround on cable
-                * disconnect (LSC) before accessing any PHY registers
-                */
-               if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
-                   (!(er32(STATUS) & E1000_STATUS_LU)))
-                       schedule_work(&adapter->downshift_task);
-
-               /*
-                * 80003ES2LAN workaround-- For packet buffer work-around on
-                * link down event; disable receives here in the ISR and reset
-                * adapter in watchdog
-                */
-               if (netif_carrier_ok(netdev) &&
-                   adapter->flags & FLAG_RX_NEEDS_RESTART) {
-                       /* disable receives */
-                       u32 rctl = er32(RCTL);
-                       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-                       adapter->flags |= FLAG_RX_RESTART_NOW;
-               }
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__E1000_DOWN, &adapter->state))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       if (napi_schedule_prep(&adapter->napi)) {
-               adapter->total_tx_bytes = 0;
-               adapter->total_tx_packets = 0;
-               adapter->total_rx_bytes = 0;
-               adapter->total_rx_packets = 0;
-               __napi_schedule(&adapter->napi);
-       }
-
-       return IRQ_HANDLED;
-}
-
-/**
- * e1000_intr - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-static irqreturn_t e1000_intr(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl, icr = er32(ICR);
-
-       if (!icr || test_bit(__E1000_DOWN, &adapter->state))
-               return IRQ_NONE;  /* Not our interrupt */
-
-       /*
-        * IMS will not auto-mask if INT_ASSERTED is not set, and if it is
-        * not set, then the adapter didn't send an interrupt
-        */
-       if (!(icr & E1000_ICR_INT_ASSERTED))
-               return IRQ_NONE;
-
-       /*
-        * Interrupt Auto-Mask...upon reading ICR,
-        * interrupts are masked.  No need for the
-        * IMC write
-        */
-
-       if (icr & E1000_ICR_LSC) {
-               hw->mac.get_link_status = 1;
-               /*
-                * ICH8 workaround-- Call gig speed drop workaround on cable
-                * disconnect (LSC) before accessing any PHY registers
-                */
-               if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
-                   (!(er32(STATUS) & E1000_STATUS_LU)))
-                       schedule_work(&adapter->downshift_task);
-
-               /*
-                * 80003ES2LAN workaround--
-                * For packet buffer work-around on link down event;
-                * disable receives here in the ISR and
-                * reset adapter in watchdog
-                */
-               if (netif_carrier_ok(netdev) &&
-                   (adapter->flags & FLAG_RX_NEEDS_RESTART)) {
-                       /* disable receives */
-                       rctl = er32(RCTL);
-                       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-                       adapter->flags |= FLAG_RX_RESTART_NOW;
-               }
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__E1000_DOWN, &adapter->state))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       if (napi_schedule_prep(&adapter->napi)) {
-               adapter->total_tx_bytes = 0;
-               adapter->total_tx_packets = 0;
-               adapter->total_rx_bytes = 0;
-               adapter->total_rx_packets = 0;
-               __napi_schedule(&adapter->napi);
-       }
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t e1000_msix_other(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 icr = er32(ICR);
-
-       if (!(icr & E1000_ICR_INT_ASSERTED)) {
-               if (!test_bit(__E1000_DOWN, &adapter->state))
-                       ew32(IMS, E1000_IMS_OTHER);
-               return IRQ_NONE;
-       }
-
-       if (icr & adapter->eiac_mask)
-               ew32(ICS, (icr & adapter->eiac_mask));
-
-       if (icr & E1000_ICR_OTHER) {
-               if (!(icr & E1000_ICR_LSC))
-                       goto no_link_interrupt;
-               hw->mac.get_link_status = 1;
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__E1000_DOWN, &adapter->state))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-no_link_interrupt:
-       if (!test_bit(__E1000_DOWN, &adapter->state))
-               ew32(IMS, E1000_IMS_LSC | E1000_IMS_OTHER);
-
-       return IRQ_HANDLED;
-}
-
-
-static irqreturn_t e1000_intr_msix_tx(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-
-
-       adapter->total_tx_bytes = 0;
-       adapter->total_tx_packets = 0;
-
-       if (!e1000_clean_tx_irq(adapter))
-               /* Ring was not completely cleaned, so fire another interrupt */
-               ew32(ICS, tx_ring->ims_val);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t e1000_intr_msix_rx(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       /* Write the ITR value calculated at the end of the
-        * previous interrupt.
-        */
-       if (adapter->rx_ring->set_itr) {
-               writel(1000000000 / (adapter->rx_ring->itr_val * 256),
-                      adapter->hw.hw_addr + adapter->rx_ring->itr_register);
-               adapter->rx_ring->set_itr = 0;
-       }
-
-       if (napi_schedule_prep(&adapter->napi)) {
-               adapter->total_rx_bytes = 0;
-               adapter->total_rx_packets = 0;
-               __napi_schedule(&adapter->napi);
-       }
-       return IRQ_HANDLED;
-}
-
-/**
- * e1000_configure_msix - Configure MSI-X hardware
- *
- * e1000_configure_msix sets up the hardware to properly
- * generate MSI-X interrupts.
- **/
-static void e1000_configure_msix(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       int vector = 0;
-       u32 ctrl_ext, ivar = 0;
-
-       adapter->eiac_mask = 0;
-
-       /* Workaround issue with spurious interrupts on 82574 in MSI-X mode */
-       if (hw->mac.type == e1000_82574) {
-               u32 rfctl = er32(RFCTL);
-               rfctl |= E1000_RFCTL_ACK_DIS;
-               ew32(RFCTL, rfctl);
-       }
-
-#define E1000_IVAR_INT_ALLOC_VALID     0x8
-       /* Configure Rx vector */
-       rx_ring->ims_val = E1000_IMS_RXQ0;
-       adapter->eiac_mask |= rx_ring->ims_val;
-       if (rx_ring->itr_val)
-               writel(1000000000 / (rx_ring->itr_val * 256),
-                      hw->hw_addr + rx_ring->itr_register);
-       else
-               writel(1, hw->hw_addr + rx_ring->itr_register);
-       ivar = E1000_IVAR_INT_ALLOC_VALID | vector;
-
-       /* Configure Tx vector */
-       tx_ring->ims_val = E1000_IMS_TXQ0;
-       vector++;
-       if (tx_ring->itr_val)
-               writel(1000000000 / (tx_ring->itr_val * 256),
-                      hw->hw_addr + tx_ring->itr_register);
-       else
-               writel(1, hw->hw_addr + tx_ring->itr_register);
-       adapter->eiac_mask |= tx_ring->ims_val;
-       ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) << 8);
-
-       /* set vector for Other Causes, e.g. link changes */
-       vector++;
-       ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) << 16);
-       if (rx_ring->itr_val)
-               writel(1000000000 / (rx_ring->itr_val * 256),
-                      hw->hw_addr + E1000_EITR_82574(vector));
-       else
-               writel(1, hw->hw_addr + E1000_EITR_82574(vector));
-
-       /* Cause Tx interrupts on every write back */
-       ivar |= (1 << 31);
-
-       ew32(IVAR, ivar);
-
-       /* enable MSI-X PBA support */
-       ctrl_ext = er32(CTRL_EXT);
-       ctrl_ext |= E1000_CTRL_EXT_PBA_CLR;
-
-       /* Auto-Mask Other interrupts upon ICR read */
-#define E1000_EIAC_MASK_82574   0x01F00000
-       ew32(IAM, ~E1000_EIAC_MASK_82574 | E1000_IMS_OTHER);
-       ctrl_ext |= E1000_CTRL_EXT_EIAME;
-       ew32(CTRL_EXT, ctrl_ext);
-       e1e_flush();
-}
-
-void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
-{
-       if (adapter->msix_entries) {
-               pci_disable_msix(adapter->pdev);
-               kfree(adapter->msix_entries);
-               adapter->msix_entries = NULL;
-       } else if (adapter->flags & FLAG_MSI_ENABLED) {
-               pci_disable_msi(adapter->pdev);
-               adapter->flags &= ~FLAG_MSI_ENABLED;
-       }
-}
-
-/**
- * e1000e_set_interrupt_capability - set MSI or MSI-X if supported
- *
- * Attempt to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
-{
-       int err;
-       int i;
-
-       switch (adapter->int_mode) {
-       case E1000E_INT_MODE_MSIX:
-               if (adapter->flags & FLAG_HAS_MSIX) {
-                       adapter->num_vectors = 3; /* RxQ0, TxQ0 and other */
-                       adapter->msix_entries = kcalloc(adapter->num_vectors,
-                                                     sizeof(struct msix_entry),
-                                                     GFP_KERNEL);
-                       if (adapter->msix_entries) {
-                               for (i = 0; i < adapter->num_vectors; i++)
-                                       adapter->msix_entries[i].entry = i;
-
-                               err = pci_enable_msix(adapter->pdev,
-                                                     adapter->msix_entries,
-                                                     adapter->num_vectors);
-                               if (err == 0)
-                                       return;
-                       }
-                       /* MSI-X failed, so fall through and try MSI */
-                       e_err("Failed to initialize MSI-X interrupts.  "
-                             "Falling back to MSI interrupts.\n");
-                       e1000e_reset_interrupt_capability(adapter);
-               }
-               adapter->int_mode = E1000E_INT_MODE_MSI;
-               /* Fall through */
-       case E1000E_INT_MODE_MSI:
-               if (!pci_enable_msi(adapter->pdev)) {
-                       adapter->flags |= FLAG_MSI_ENABLED;
-               } else {
-                       adapter->int_mode = E1000E_INT_MODE_LEGACY;
-                       e_err("Failed to initialize MSI interrupts.  Falling "
-                             "back to legacy interrupts.\n");
-               }
-               /* Fall through */
-       case E1000E_INT_MODE_LEGACY:
-               /* Don't do anything; this is the system default */
-               break;
-       }
-
-       /* store the number of vectors being used */
-       adapter->num_vectors = 1;
-}
-
-/**
- * e1000_request_msix - Initialize MSI-X interrupts
- *
- * e1000_request_msix allocates MSI-X vectors and requests interrupts from the
- * kernel.
- **/
-static int e1000_request_msix(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int err = 0, vector = 0;
-
-       if (strlen(netdev->name) < (IFNAMSIZ - 5))
-               snprintf(adapter->rx_ring->name,
-                        sizeof(adapter->rx_ring->name) - 1,
-                        "%s-rx-0", netdev->name);
-       else
-               memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         e1000_intr_msix_rx, 0, adapter->rx_ring->name,
-                         netdev);
-       if (err)
-               goto out;
-       adapter->rx_ring->itr_register = E1000_EITR_82574(vector);
-       adapter->rx_ring->itr_val = adapter->itr;
-       vector++;
-
-       if (strlen(netdev->name) < (IFNAMSIZ - 5))
-               snprintf(adapter->tx_ring->name,
-                        sizeof(adapter->tx_ring->name) - 1,
-                        "%s-tx-0", netdev->name);
-       else
-               memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         e1000_intr_msix_tx, 0, adapter->tx_ring->name,
-                         netdev);
-       if (err)
-               goto out;
-       adapter->tx_ring->itr_register = E1000_EITR_82574(vector);
-       adapter->tx_ring->itr_val = adapter->itr;
-       vector++;
-
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         e1000_msix_other, 0, netdev->name, netdev);
-       if (err)
-               goto out;
-
-       e1000_configure_msix(adapter);
-       return 0;
-out:
-       return err;
-}
-
-/**
- * e1000_request_irq - initialize interrupts
- *
- * Attempts to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-static int e1000_request_irq(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int err;
-
-       if (adapter->msix_entries) {
-               err = e1000_request_msix(adapter);
-               if (!err)
-                       return err;
-               /* fall back to MSI */
-               e1000e_reset_interrupt_capability(adapter);
-               adapter->int_mode = E1000E_INT_MODE_MSI;
-               e1000e_set_interrupt_capability(adapter);
-       }
-       if (adapter->flags & FLAG_MSI_ENABLED) {
-               err = request_irq(adapter->pdev->irq, e1000_intr_msi, 0,
-                                 netdev->name, netdev);
-               if (!err)
-                       return err;
-
-               /* fall back to legacy interrupt */
-               e1000e_reset_interrupt_capability(adapter);
-               adapter->int_mode = E1000E_INT_MODE_LEGACY;
-       }
-
-       err = request_irq(adapter->pdev->irq, e1000_intr, IRQF_SHARED,
-                         netdev->name, netdev);
-       if (err)
-               e_err("Unable to allocate interrupt, Error: %d\n", err);
-
-       return err;
-}
-
-static void e1000_free_irq(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       if (adapter->msix_entries) {
-               int vector = 0;
-
-               free_irq(adapter->msix_entries[vector].vector, netdev);
-               vector++;
-
-               free_irq(adapter->msix_entries[vector].vector, netdev);
-               vector++;
-
-               /* Other Causes interrupt vector */
-               free_irq(adapter->msix_entries[vector].vector, netdev);
-               return;
-       }
-
-       free_irq(adapter->pdev->irq, netdev);
-}
-
-/**
- * e1000_irq_disable - Mask off interrupt generation on the NIC
- **/
-static void e1000_irq_disable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(IMC, ~0);
-       if (adapter->msix_entries)
-               ew32(EIAC_82574, 0);
-       e1e_flush();
-
-       if (adapter->msix_entries) {
-               int i;
-               for (i = 0; i < adapter->num_vectors; i++)
-                       synchronize_irq(adapter->msix_entries[i].vector);
-       } else {
-               synchronize_irq(adapter->pdev->irq);
-       }
-}
-
-/**
- * e1000_irq_enable - Enable default interrupt generation settings
- **/
-static void e1000_irq_enable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (adapter->msix_entries) {
-               ew32(EIAC_82574, adapter->eiac_mask & E1000_EIAC_MASK_82574);
-               ew32(IMS, adapter->eiac_mask | E1000_IMS_OTHER | E1000_IMS_LSC);
-       } else {
-               ew32(IMS, IMS_ENABLE_MASK);
-       }
-       e1e_flush();
-}
-
-/**
- * e1000e_get_hw_control - get control of the h/w from f/w
- * @adapter: address of board private structure
- *
- * e1000e_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.
- **/
-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_release_hw_control - release control of the h/w to f/w
- * @adapter: address of board private structure
- *
- * e1000e_release_hw_control resets {CTRL_EXT|SWSM}:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that the
- * driver is no longer loaded. For AMT version (only with 82573) i
- * of the f/w this means that the network i/f is closed.
- *
- **/
-void e1000e_release_hw_control(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_ext;
-       u32 swsm;
-
-       /* Let firmware taken over control of h/w */
-       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);
-       }
-}
-
-/**
- * @e1000_alloc_ring - allocate memory for a ring structure
- **/
-static int e1000_alloc_ring_dma(struct e1000_adapter *adapter,
-                               struct e1000_ring *ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       ring->desc = dma_alloc_coherent(&pdev->dev, ring->size, &ring->dma,
-                                       GFP_KERNEL);
-       if (!ring->desc)
-               return -ENOMEM;
-
-       return 0;
-}
-
-/**
- * e1000e_setup_tx_resources - allocate Tx resources (Descriptors)
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-int e1000e_setup_tx_resources(struct e1000_adapter *adapter)
-{
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       int err = -ENOMEM, size;
-
-       size = sizeof(struct e1000_buffer) * tx_ring->count;
-       tx_ring->buffer_info = vzalloc(size);
-       if (!tx_ring->buffer_info)
-               goto err;
-
-       /* round up to nearest 4K */
-       tx_ring->size = tx_ring->count * sizeof(struct e1000_tx_desc);
-       tx_ring->size = ALIGN(tx_ring->size, 4096);
-
-       err = e1000_alloc_ring_dma(adapter, tx_ring);
-       if (err)
-               goto err;
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-
-       return 0;
-err:
-       vfree(tx_ring->buffer_info);
-       e_err("Unable to allocate memory for the transmit descriptor ring\n");
-       return err;
-}
-
-/**
- * e1000e_setup_rx_resources - allocate Rx resources (Descriptors)
- * @adapter: board private structure
- *
- * Returns 0 on success, negative on failure
- **/
-int e1000e_setup_rx_resources(struct e1000_adapter *adapter)
-{
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       struct e1000_buffer *buffer_info;
-       int i, size, desc_len, err = -ENOMEM;
-
-       size = sizeof(struct e1000_buffer) * rx_ring->count;
-       rx_ring->buffer_info = vzalloc(size);
-       if (!rx_ring->buffer_info)
-               goto err;
-
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               buffer_info->ps_pages = kcalloc(PS_PAGE_BUFFERS,
-                                               sizeof(struct e1000_ps_page),
-                                               GFP_KERNEL);
-               if (!buffer_info->ps_pages)
-                       goto err_pages;
-       }
-
-       desc_len = sizeof(union e1000_rx_desc_packet_split);
-
-       /* Round up to nearest 4K */
-       rx_ring->size = rx_ring->count * desc_len;
-       rx_ring->size = ALIGN(rx_ring->size, 4096);
-
-       err = e1000_alloc_ring_dma(adapter, rx_ring);
-       if (err)
-               goto err_pages;
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-       rx_ring->rx_skb_top = NULL;
-
-       return 0;
-
-err_pages:
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               kfree(buffer_info->ps_pages);
-       }
-err:
-       vfree(rx_ring->buffer_info);
-       e_err("Unable to allocate memory for the receive descriptor ring\n");
-       return err;
-}
-
-/**
- * e1000_clean_tx_ring - Free Tx Buffers
- * @adapter: board private structure
- **/
-static void e1000_clean_tx_ring(struct e1000_adapter *adapter)
-{
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_buffer *buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       for (i = 0; i < tx_ring->count; i++) {
-               buffer_info = &tx_ring->buffer_info[i];
-               e1000_put_txbuf(adapter, buffer_info);
-       }
-
-       size = sizeof(struct e1000_buffer) * tx_ring->count;
-       memset(tx_ring->buffer_info, 0, size);
-
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-
-       writel(0, adapter->hw.hw_addr + tx_ring->head);
-       writel(0, adapter->hw.hw_addr + tx_ring->tail);
-}
-
-/**
- * e1000e_free_tx_resources - Free Tx Resources per Queue
- * @adapter: board private structure
- *
- * Free all transmit software resources
- **/
-void e1000e_free_tx_resources(struct e1000_adapter *adapter)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-
-       e1000_clean_tx_ring(adapter);
-
-       vfree(tx_ring->buffer_info);
-       tx_ring->buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
-                         tx_ring->dma);
-       tx_ring->desc = NULL;
-}
-
-/**
- * e1000e_free_rx_resources - Free Rx Resources
- * @adapter: board private structure
- *
- * Free all receive software resources
- **/
-
-void e1000e_free_rx_resources(struct e1000_adapter *adapter)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       int i;
-
-       e1000_clean_rx_ring(adapter);
-
-       for (i = 0; i < rx_ring->count; i++)
-               kfree(rx_ring->buffer_info[i].ps_pages);
-
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
-                         rx_ring->dma);
-       rx_ring->desc = NULL;
-}
-
-/**
- * e1000_update_itr - update the dynamic ITR value based on statistics
- * @adapter: pointer to adapter
- * @itr_setting: current adapter->itr
- * @packets: the number of packets during this measurement interval
- * @bytes: the number of bytes during this measurement interval
- *
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.  This functionality is controlled
- *      by the InterruptThrottleRate module parameter.
- **/
-static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
-                                    u16 itr_setting, int packets,
-                                    int bytes)
-{
-       unsigned int retval = itr_setting;
-
-       if (packets == 0)
-               goto update_itr_done;
-
-       switch (itr_setting) {
-       case lowest_latency:
-               /* handle TSO and jumbo frames */
-               if (bytes/packets > 8000)
-                       retval = bulk_latency;
-               else if ((packets < 5) && (bytes > 512))
-                       retval = low_latency;
-               break;
-       case low_latency:  /* 50 usec aka 20000 ints/s */
-               if (bytes > 10000) {
-                       /* this if handles the TSO accounting */
-                       if (bytes/packets > 8000)
-                               retval = bulk_latency;
-                       else if ((packets < 10) || ((bytes/packets) > 1200))
-                               retval = bulk_latency;
-                       else if ((packets > 35))
-                               retval = lowest_latency;
-               } else if (bytes/packets > 2000) {
-                       retval = bulk_latency;
-               } else if (packets <= 2 && bytes < 512) {
-                       retval = lowest_latency;
-               }
-               break;
-       case bulk_latency: /* 250 usec aka 4000 ints/s */
-               if (bytes > 25000) {
-                       if (packets > 35)
-                               retval = low_latency;
-               } else if (bytes < 6000) {
-                       retval = low_latency;
-               }
-               break;
-       }
-
-update_itr_done:
-       return retval;
-}
-
-static void e1000_set_itr(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 current_itr;
-       u32 new_itr = adapter->itr;
-
-       /* for non-gigabit speeds, just fix the interrupt rate at 4000 */
-       if (adapter->link_speed != SPEED_1000) {
-               current_itr = 0;
-               new_itr = 4000;
-               goto set_itr_now;
-       }
-
-       if (adapter->flags2 & FLAG2_DISABLE_AIM) {
-               new_itr = 0;
-               goto set_itr_now;
-       }
-
-       adapter->tx_itr = e1000_update_itr(adapter,
-                                   adapter->tx_itr,
-                                   adapter->total_tx_packets,
-                                   adapter->total_tx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
-               adapter->tx_itr = low_latency;
-
-       adapter->rx_itr = e1000_update_itr(adapter,
-                                   adapter->rx_itr,
-                                   adapter->total_rx_packets,
-                                   adapter->total_rx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
-               adapter->rx_itr = low_latency;
-
-       current_itr = max(adapter->rx_itr, adapter->tx_itr);
-
-       switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
-       case lowest_latency:
-               new_itr = 70000;
-               break;
-       case low_latency:
-               new_itr = 20000; /* aka hwitr = ~200 */
-               break;
-       case bulk_latency:
-               new_itr = 4000;
-               break;
-       default:
-               break;
-       }
-
-set_itr_now:
-       if (new_itr != adapter->itr) {
-               /*
-                * this attempts to bias the interrupt rate towards Bulk
-                * by adding intermediate steps when interrupt rate is
-                * increasing
-                */
-               new_itr = new_itr > adapter->itr ?
-                            min(adapter->itr + (new_itr >> 2), new_itr) :
-                            new_itr;
-               adapter->itr = new_itr;
-               adapter->rx_ring->itr_val = new_itr;
-               if (adapter->msix_entries)
-                       adapter->rx_ring->set_itr = 1;
-               else
-                       if (new_itr)
-                               ew32(ITR, 1000000000 / (new_itr * 256));
-                       else
-                               ew32(ITR, 0);
-       }
-}
-
-/**
- * e1000_alloc_queues - Allocate memory for all rings
- * @adapter: board private structure to initialize
- **/
-static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
-{
-       adapter->tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
-       if (!adapter->tx_ring)
-               goto err;
-
-       adapter->rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
-       if (!adapter->rx_ring)
-               goto err;
-
-       return 0;
-err:
-       e_err("Unable to allocate memory for queues\n");
-       kfree(adapter->rx_ring);
-       kfree(adapter->tx_ring);
-       return -ENOMEM;
-}
-
-/**
- * e1000_clean - NAPI Rx polling callback
- * @napi: struct associated with this polling callback
- * @budget: amount of packets driver is allowed to process this poll
- **/
-static int e1000_clean(struct napi_struct *napi, int budget)
-{
-       struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *poll_dev = adapter->netdev;
-       int tx_cleaned = 1, work_done = 0;
-
-       adapter = netdev_priv(poll_dev);
-
-       if (adapter->msix_entries &&
-           !(adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
-               goto clean_rx;
-
-       tx_cleaned = e1000_clean_tx_irq(adapter);
-
-clean_rx:
-       adapter->clean_rx(adapter, &work_done, budget);
-
-       if (!tx_cleaned)
-               work_done = budget;
-
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
-               if (adapter->itr_setting & 3)
-                       e1000_set_itr(adapter);
-               napi_complete(napi);
-               if (!test_bit(__E1000_DOWN, &adapter->state)) {
-                       if (adapter->msix_entries)
-                               ew32(IMS, adapter->rx_ring->ims_val);
-                       else
-                               e1000_irq_enable(adapter);
-               }
-       }
-
-       return work_done;
-}
-
-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vfta, index;
-
-       /* don't update vlan cookie if already programmed */
-       if ((adapter->hw.mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
-           (vid == adapter->mng_vlan_id))
-               return;
-
-       /* add VID to filter table */
-       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
-               index = (vid >> 5) & 0x7F;
-               vfta = E1000_READ_REG_ARRAY(hw, E1000_VFTA, index);
-               vfta |= (1 << (vid & 0x1F));
-               hw->mac.ops.write_vfta(hw, index, vfta);
-       }
-
-       set_bit(vid, adapter->active_vlans);
-}
-
-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vfta, index;
-
-       if ((adapter->hw.mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
-           (vid == adapter->mng_vlan_id)) {
-               /* release control to f/w */
-               e1000e_release_hw_control(adapter);
-               return;
-       }
-
-       /* remove VID from filter table */
-       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
-               index = (vid >> 5) & 0x7F;
-               vfta = E1000_READ_REG_ARRAY(hw, E1000_VFTA, index);
-               vfta &= ~(1 << (vid & 0x1F));
-               hw->mac.ops.write_vfta(hw, index, vfta);
-       }
-
-       clear_bit(vid, adapter->active_vlans);
-}
-
-/**
- * e1000e_vlan_filter_disable - helper to disable hw VLAN filtering
- * @adapter: board private structure to initialize
- **/
-static void e1000e_vlan_filter_disable(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
-               /* disable VLAN receive filtering */
-               rctl = er32(RCTL);
-               rctl &= ~(E1000_RCTL_VFE | E1000_RCTL_CFIEN);
-               ew32(RCTL, rctl);
-
-               if (adapter->mng_vlan_id != (u16)E1000_MNG_VLAN_NONE) {
-                       e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
-                       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-               }
-       }
-}
-
-/**
- * e1000e_vlan_filter_enable - helper to enable HW VLAN filtering
- * @adapter: board private structure to initialize
- **/
-static void e1000e_vlan_filter_enable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
-               /* enable VLAN receive filtering */
-               rctl = er32(RCTL);
-               rctl |= E1000_RCTL_VFE;
-               rctl &= ~E1000_RCTL_CFIEN;
-               ew32(RCTL, rctl);
-       }
-}
-
-/**
- * e1000e_vlan_strip_enable - helper to disable HW VLAN stripping
- * @adapter: board private structure to initialize
- **/
-static void e1000e_vlan_strip_disable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl;
-
-       /* disable VLAN tag insert/strip */
-       ctrl = er32(CTRL);
-       ctrl &= ~E1000_CTRL_VME;
-       ew32(CTRL, ctrl);
-}
-
-/**
- * e1000e_vlan_strip_enable - helper to enable HW VLAN stripping
- * @adapter: board private structure to initialize
- **/
-static void e1000e_vlan_strip_enable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl;
-
-       /* enable VLAN tag insert/strip */
-       ctrl = er32(CTRL);
-       ctrl |= E1000_CTRL_VME;
-       ew32(CTRL, ctrl);
-}
-
-static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       u16 vid = adapter->hw.mng_cookie.vlan_id;
-       u16 old_vid = adapter->mng_vlan_id;
-
-       if (adapter->hw.mng_cookie.status &
-           E1000_MNG_DHCP_COOKIE_STATUS_VLAN) {
-               e1000_vlan_rx_add_vid(netdev, vid);
-               adapter->mng_vlan_id = vid;
-       }
-
-       if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && (vid != old_vid))
-               e1000_vlan_rx_kill_vid(netdev, old_vid);
-}
-
-static void e1000_restore_vlan(struct e1000_adapter *adapter)
-{
-       u16 vid;
-
-       e1000_vlan_rx_add_vid(adapter->netdev, 0);
-
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               e1000_vlan_rx_add_vid(adapter->netdev, vid);
-}
-
-static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 manc, manc2h, mdef, i, j;
-
-       if (!(adapter->flags & FLAG_MNG_PT_ENABLED))
-               return;
-
-       manc = er32(MANC);
-
-       /*
-        * enable receiving management packets to the host. this will probably
-        * generate destination unreachable messages from the host OS, but
-        * the packets will be handled on SMBUS
-        */
-       manc |= E1000_MANC_EN_MNG2HOST;
-       manc2h = er32(MANC2H);
-
-       switch (hw->mac.type) {
-       default:
-               manc2h |= (E1000_MANC2H_PORT_623 | E1000_MANC2H_PORT_664);
-               break;
-       case e1000_82574:
-       case e1000_82583:
-               /*
-                * Check if IPMI pass-through decision filter already exists;
-                * if so, enable it.
-                */
-               for (i = 0, j = 0; i < 8; i++) {
-                       mdef = er32(MDEF(i));
-
-                       /* Ignore filters with anything other than IPMI ports */
-                       if (mdef & ~(E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
-                               continue;
-
-                       /* Enable this decision filter in MANC2H */
-                       if (mdef)
-                               manc2h |= (1 << i);
-
-                       j |= mdef;
-               }
-
-               if (j == (E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
-                       break;
-
-               /* Create new decision filter in an empty filter */
-               for (i = 0, j = 0; i < 8; i++)
-                       if (er32(MDEF(i)) == 0) {
-                               ew32(MDEF(i), (E1000_MDEF_PORT_623 |
-                                              E1000_MDEF_PORT_664));
-                               manc2h |= (1 << 1);
-                               j++;
-                               break;
-                       }
-
-               if (!j)
-                       e_warn("Unable to create IPMI pass-through filter\n");
-               break;
-       }
-
-       ew32(MANC2H, manc2h);
-       ew32(MANC, manc);
-}
-
-/**
- * e1000_configure_tx - Configure 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;
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       u64 tdba;
-       u32 tdlen, tctl, tipg, tarc;
-       u32 ipgr1, ipgr2;
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-       tdba = tx_ring->dma;
-       tdlen = tx_ring->count * sizeof(struct e1000_tx_desc);
-       ew32(TDBAL, (tdba & DMA_BIT_MASK(32)));
-       ew32(TDBAH, (tdba >> 32));
-       ew32(TDLEN, tdlen);
-       ew32(TDH, 0);
-       ew32(TDT, 0);
-       tx_ring->head = E1000_TDH;
-       tx_ring->tail = E1000_TDT;
-
-       /* 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);
-
-       /* Set the Tx Interrupt Delay register */
-       ew32(TIDV, adapter->tx_int_delay);
-       /* Tx irq moderation */
-       ew32(TADV, adapter->tx_abs_int_delay);
-
-       if (adapter->flags2 & FLAG2_DMA_BURST) {
-               u32 txdctl = er32(TXDCTL(0));
-               txdctl &= ~(E1000_TXDCTL_PTHRESH | E1000_TXDCTL_HTHRESH |
-                           E1000_TXDCTL_WTHRESH);
-               /*
-                * set up some performance related parameters to encourage the
-                * hardware to use the bus more efficiently in bursts, depends
-                * on the tx_int_delay to be enabled,
-                * wthresh = 5 ==> burst write a cacheline (64 bytes) at a time
-                * hthresh = 1 ==> prefetch when one or more available
-                * pthresh = 0x1f ==> prefetch if internal cache 31 or less
-                * BEWARE: this seems to work but should be considered first if
-                * there are Tx hangs or other Tx related bugs
-                */
-               txdctl |= E1000_TXDCTL_DMA_BURST_ENABLE;
-               ew32(TXDCTL(0), txdctl);
-               /* erratum work around: set txdctl the same for both queues */
-               ew32(TXDCTL(1), txdctl);
-       }
-
-       /* 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;
-
-       /* only set IDE if we are delaying interrupts using the timers */
-       if (adapter->tx_int_delay)
-               adapter->txd_cmd |= E1000_TXD_CMD_IDE;
-
-       /* enable Report Status bit */
-       adapter->txd_cmd |= E1000_TXD_CMD_RS;
-
-       ew32(TCTL, tctl);
-
-       e1000e_config_collision_dist(hw);
-}
-
-/**
- * e1000_setup_rctl - configure the receive control registers
- * @adapter: Board private structure
- **/
-#define PAGE_USE_COUNT(S) (((S) >> PAGE_SHIFT) + \
-                          (((S) & (PAGE_SIZE - 1)) ? 1 : 0))
-static void e1000_setup_rctl(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl, rfctl;
-       u32 pages = 0;
-
-       /* Workaround Si errata on 82579 - configure jumbo frame flow */
-       if (hw->mac.type == e1000_pch2lan) {
-               s32 ret_val;
-
-               if (adapter->netdev->mtu > ETH_DATA_LEN)
-                       ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);
-               else
-                       ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, false);
-
-               if (ret_val)
-                       e_dbg("failed to enable jumbo frame workaround mode\n");
-       }
-
-       /* Program MC offset vector base */
-       rctl = er32(RCTL);
-       rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
-       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
-               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-               (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
-
-       /* Do not Store bad packets */
-       rctl &= ~E1000_RCTL_SBP;
-
-       /* Enable Long Packet receive */
-       if (adapter->netdev->mtu <= ETH_DATA_LEN)
-               rctl &= ~E1000_RCTL_LPE;
-       else
-               rctl |= E1000_RCTL_LPE;
-
-       /* Some systems expect that the CRC is included in SMBUS traffic. The
-        * hardware strips the CRC before sending to both SMBUS (BMC) and to
-        * host memory when this is enabled
-        */
-       if (adapter->flags2 & FLAG2_CRC_STRIPPING)
-               rctl |= E1000_RCTL_SECRC;
-
-       /* Workaround Si errata on 82577 PHY - configure IPG for jumbos */
-       if ((hw->phy.type == e1000_phy_82577) && (rctl & E1000_RCTL_LPE)) {
-               u16 phy_data;
-
-               e1e_rphy(hw, PHY_REG(770, 26), &phy_data);
-               phy_data &= 0xfff8;
-               phy_data |= (1 << 2);
-               e1e_wphy(hw, PHY_REG(770, 26), phy_data);
-
-               e1e_rphy(hw, 22, &phy_data);
-               phy_data &= 0x0fff;
-               phy_data |= (1 << 14);
-               e1e_wphy(hw, 0x10, 0x2823);
-               e1e_wphy(hw, 0x11, 0x0003);
-               e1e_wphy(hw, 22, phy_data);
-       }
-
-       /* Setup buffer sizes */
-       rctl &= ~E1000_RCTL_SZ_4096;
-       rctl |= E1000_RCTL_BSEX;
-       switch (adapter->rx_buffer_len) {
-       case 2048:
-       default:
-               rctl |= E1000_RCTL_SZ_2048;
-               rctl &= ~E1000_RCTL_BSEX;
-               break;
-       case 4096:
-               rctl |= E1000_RCTL_SZ_4096;
-               break;
-       case 8192:
-               rctl |= E1000_RCTL_SZ_8192;
-               break;
-       case 16384:
-               rctl |= E1000_RCTL_SZ_16384;
-               break;
-       }
-
-       /*
-        * 82571 and greater support packet-split where the protocol
-        * header is placed in skb->data and the packet data is
-        * placed in pages hanging off of skb_shinfo(skb)->nr_frags.
-        * In the case of a non-split, skb->data is linearly filled,
-        * followed by the page buffers.  Therefore, skb->data is
-        * sized to hold the largest protocol header.
-        *
-        * allocations using alloc_page take too long for regular MTU
-        * so only enable packet split for jumbo frames
-        *
-        * Using pages when the page size is greater than 16k wastes
-        * a lot of memory, since we allocate 3 pages at all times
-        * per packet.
-        */
-       pages = PAGE_USE_COUNT(adapter->netdev->mtu);
-       if (!(adapter->flags & FLAG_HAS_ERT) && (pages <= 3) &&
-           (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE))
-               adapter->rx_ps_pages = pages;
-       else
-               adapter->rx_ps_pages = 0;
-
-       if (adapter->rx_ps_pages) {
-               u32 psrctl = 0;
-
-               /* Configure extra packet-split registers */
-               rfctl = er32(RFCTL);
-               rfctl |= E1000_RFCTL_EXTEN;
-               /*
-                * disable packet split support for IPv6 extension headers,
-                * because some malformed IPv6 headers can hang the Rx
-                */
-               rfctl |= (E1000_RFCTL_IPV6_EX_DIS |
-                         E1000_RFCTL_NEW_IPV6_EXT_DIS);
-
-               ew32(RFCTL, rfctl);
-
-               /* Enable Packet split descriptors */
-               rctl |= E1000_RCTL_DTYP_PS;
-
-               psrctl |= adapter->rx_ps_bsize0 >>
-                       E1000_PSRCTL_BSIZE0_SHIFT;
-
-               switch (adapter->rx_ps_pages) {
-               case 3:
-                       psrctl |= PAGE_SIZE <<
-                               E1000_PSRCTL_BSIZE3_SHIFT;
-               case 2:
-                       psrctl |= PAGE_SIZE <<
-                               E1000_PSRCTL_BSIZE2_SHIFT;
-               case 1:
-                       psrctl |= PAGE_SIZE >>
-                               E1000_PSRCTL_BSIZE1_SHIFT;
-                       break;
-               }
-
-               ew32(PSRCTL, psrctl);
-       }
-
-       ew32(RCTL, rctl);
-       /* just started the receive unit, no need to restart */
-       adapter->flags &= ~FLAG_RX_RESTART_NOW;
-}
-
-/**
- * e1000_configure_rx - Configure 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;
-       struct e1000_ring *rx_ring = adapter->rx_ring;
-       u64 rdba;
-       u32 rdlen, rctl, rxcsum, ctrl_ext;
-
-       if (adapter->rx_ps_pages) {
-               /* this is a 32 byte descriptor */
-               rdlen = rx_ring->count *
-                   sizeof(union e1000_rx_desc_packet_split);
-               adapter->clean_rx = e1000_clean_rx_irq_ps;
-               adapter->alloc_rx_buf = e1000_alloc_rx_buffers_ps;
-       } else if (adapter->netdev->mtu > ETH_FRAME_LEN + ETH_FCS_LEN) {
-               rdlen = rx_ring->count * sizeof(struct e1000_rx_desc);
-               adapter->clean_rx = e1000_clean_jumbo_rx_irq;
-               adapter->alloc_rx_buf = e1000_alloc_jumbo_rx_buffers;
-       } else {
-               rdlen = rx_ring->count * sizeof(struct e1000_rx_desc);
-               adapter->clean_rx = e1000_clean_rx_irq;
-               adapter->alloc_rx_buf = e1000_alloc_rx_buffers;
-       }
-
-       /* disable receives while setting up the descriptors */
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-       e1e_flush();
-       usleep_range(10000, 20000);
-
-       if (adapter->flags2 & FLAG2_DMA_BURST) {
-               /*
-                * set the writeback threshold (only takes effect if the RDTR
-                * is set). set GRAN=1 and write back up to 0x4 worth, and
-                * enable prefetching of 0x20 Rx descriptors
-                * granularity = 01
-                * wthresh = 04,
-                * hthresh = 04,
-                * pthresh = 0x20
-                */
-               ew32(RXDCTL(0), E1000_RXDCTL_DMA_BURST_ENABLE);
-               ew32(RXDCTL(1), E1000_RXDCTL_DMA_BURST_ENABLE);
-
-               /*
-                * override the delay timers for enabling bursting, only if
-                * the value was not set by the user via module options
-                */
-               if (adapter->rx_int_delay == DEFAULT_RDTR)
-                       adapter->rx_int_delay = BURST_RDTR;
-               if (adapter->rx_abs_int_delay == DEFAULT_RADV)
-                       adapter->rx_abs_int_delay = BURST_RADV;
-       }
-
-       /* set the Receive Delay Timer Register */
-       ew32(RDTR, adapter->rx_int_delay);
-
-       /* irq moderation */
-       ew32(RADV, adapter->rx_abs_int_delay);
-       if ((adapter->itr_setting != 0) && (adapter->itr != 0))
-               ew32(ITR, 1000000000 / (adapter->itr * 256));
-
-       ctrl_ext = er32(CTRL_EXT);
-       /* Auto-Mask interrupts upon ICR access */
-       ctrl_ext |= E1000_CTRL_EXT_IAME;
-       ew32(IAM, 0xffffffff);
-       ew32(CTRL_EXT, ctrl_ext);
-       e1e_flush();
-
-       /*
-        * Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring
-        */
-       rdba = rx_ring->dma;
-       ew32(RDBAL, (rdba & DMA_BIT_MASK(32)));
-       ew32(RDBAH, (rdba >> 32));
-       ew32(RDLEN, rdlen);
-       ew32(RDH, 0);
-       ew32(RDT, 0);
-       rx_ring->head = E1000_RDH;
-       rx_ring->tail = E1000_RDT;
-
-       /* Enable Receive Checksum Offload for TCP and UDP */
-       rxcsum = er32(RXCSUM);
-       if (adapter->flags & FLAG_RX_CSUM_ENABLED) {
-               rxcsum |= E1000_RXCSUM_TUOFL;
-
-               /*
-                * IPv4 payload checksum for UDP fragments must be
-                * used in conjunction with packet-split.
-                */
-               if (adapter->rx_ps_pages)
-                       rxcsum |= E1000_RXCSUM_IPPCSE;
-       } else {
-               rxcsum &= ~E1000_RXCSUM_TUOFL;
-               /* no need to clear IPPCSE as it defaults to 0 */
-       }
-       ew32(RXCSUM, rxcsum);
-
-       /*
-        * Enable early receives on supported devices, only takes effect when
-        * packet size is equal or larger than the specified value (in 8 byte
-        * units), e.g. using jumbo frames when setting to E1000_ERT_2048
-        */
-       if ((adapter->flags & FLAG_HAS_ERT) ||
-           (adapter->hw.mac.type == e1000_pch2lan)) {
-               if (adapter->netdev->mtu > ETH_DATA_LEN) {
-                       u32 rxdctl = er32(RXDCTL(0));
-                       ew32(RXDCTL(0), rxdctl | 0x3);
-                       if (adapter->flags & FLAG_HAS_ERT)
-                               ew32(ERT, E1000_ERT_2048 | (1 << 13));
-                       /*
-                        * With jumbo frames and early-receive enabled,
-                        * excessive C-state transition latencies result in
-                        * dropped transactions.
-                        */
-                       pm_qos_update_request(&adapter->netdev->pm_qos_req, 55);
-               } else {
-                       pm_qos_update_request(&adapter->netdev->pm_qos_req,
-                                             PM_QOS_DEFAULT_VALUE);
-               }
-       }
-
-       /* Enable Receives */
-       ew32(RCTL, rctl);
-}
-
-/**
- *  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.
- **/
-static void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
-                                     u32 mc_addr_count)
-{
-       hw->mac.ops.update_mc_addr_list(hw, mc_addr_list, mc_addr_count);
-}
-
-/**
- * e1000_set_multi - Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_multi entry point is called whenever the multicast address
- * list or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper multicast,
- * promiscuous mode, and all-multi behavior.
- **/
-static void e1000_set_multi(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct netdev_hw_addr *ha;
-       u8  *mta_list;
-       u32 rctl;
-
-       /* Check for Promiscuous and All Multicast modes */
-
-       rctl = er32(RCTL);
-
-       if (netdev->flags & IFF_PROMISC) {
-               rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
-               rctl &= ~E1000_RCTL_VFE;
-               /* Do not hardware filter VLANs in promisc mode */
-               e1000e_vlan_filter_disable(adapter);
-       } else {
-               if (netdev->flags & IFF_ALLMULTI) {
-                       rctl |= E1000_RCTL_MPE;
-                       rctl &= ~E1000_RCTL_UPE;
-               } else {
-                       rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE);
-               }
-               e1000e_vlan_filter_enable(adapter);
-       }
-
-       ew32(RCTL, rctl);
-
-       if (!netdev_mc_empty(netdev)) {
-               int i = 0;
-
-               mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
-               if (!mta_list)
-                       return;
-
-               /* prepare a packed array of only addresses. */
-               netdev_for_each_mc_addr(ha, netdev)
-                       memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
-
-               e1000_update_mc_addr_list(hw, mta_list, i);
-               kfree(mta_list);
-       } else {
-               /*
-                * if we're called from probe, we might not have
-                * anything to do here, so clear out the list
-                */
-               e1000_update_mc_addr_list(hw, NULL, 0);
-       }
-
-       if (netdev->features & NETIF_F_HW_VLAN_RX)
-               e1000e_vlan_strip_enable(adapter);
-       else
-               e1000e_vlan_strip_disable(adapter);
-}
-
-/**
- * e1000_configure - configure the hardware for Rx and Tx
- * @adapter: private board structure
- **/
-static void e1000_configure(struct e1000_adapter *adapter)
-{
-       e1000_set_multi(adapter->netdev);
-
-       e1000_restore_vlan(adapter);
-       e1000_init_manageability_pt(adapter);
-
-       e1000_configure_tx(adapter);
-       e1000_setup_rctl(adapter);
-       e1000_configure_rx(adapter);
-       adapter->alloc_rx_buf(adapter, e1000_desc_unused(adapter->rx_ring),
-                             GFP_KERNEL);
-}
-
-/**
- * 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.
- */
-static void e1000_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;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tx_space, min_tx_space, min_rx_space;
-       u32 pba = adapter->pba;
-       u16 hwm;
-
-       /* reset Packet Buffer Allocation to default */
-       ew32(PBA, pba);
-
-       if (adapter->max_frame_size > ETH_FRAME_LEN + ETH_FCS_LEN) {
-               /*
-                * To maintain wire speed transmits, the Tx FIFO should be
-                * large enough to accommodate two full transmit packets,
-                * rounded up to the next 1KB and expressed in KB.  Likewise,
-                * the Rx FIFO should be large enough to accommodate at least
-                * one full receive packet and is similarly rounded up and
-                * expressed in KB.
-                */
-               pba = er32(PBA);
-               /* upper 16 bits has Tx packet buffer allocation size in KB */
-               tx_space = pba >> 16;
-               /* lower 16 bits has Rx packet buffer allocation size in KB */
-               pba &= 0xffff;
-               /*
-                * the Tx fifo also stores 16 bytes of information about the Tx
-                * but don't include ethernet FCS because hardware appends it
-                */
-               min_tx_space = (adapter->max_frame_size +
-                               sizeof(struct e1000_tx_desc) -
-                               ETH_FCS_LEN) * 2;
-               min_tx_space = ALIGN(min_tx_space, 1024);
-               min_tx_space >>= 10;
-               /* software strips receive CRC, so leave room for it */
-               min_rx_space = adapter->max_frame_size;
-               min_rx_space = ALIGN(min_rx_space, 1024);
-               min_rx_space >>= 10;
-
-               /*
-                * If current Tx allocation is less than the min Tx FIFO size,
-                * and the min Tx FIFO size is less than the current Rx FIFO
-                * allocation, take space away from current Rx allocation
-                */
-               if ((tx_space < min_tx_space) &&
-                   ((min_tx_space - tx_space) < pba)) {
-                       pba -= min_tx_space - tx_space;
-
-                       /*
-                        * if short on Rx space, Rx wins and must trump Tx
-                        * adjustment or use Early Receive if available
-                        */
-                       if ((pba < min_rx_space) &&
-                           (!(adapter->flags & FLAG_HAS_ERT)))
-                               /* ERT enabled in e1000_configure_rx */
-                               pba = min_rx_space;
-               }
-
-               ew32(PBA, pba);
-       }
-
-       /*
-        * 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, and
-        * - the full Rx FIFO size minus the early receive size (for parts
-        *   with ERT support assuming ERT set to E1000_ERT_2048), or
-        * - the full Rx FIFO size minus one full frame
-        */
-       if (adapter->flags & FLAG_DISABLE_FC_PAUSE_TIME)
-               fc->pause_time = 0xFFFF;
-       else
-               fc->pause_time = E1000_FC_PAUSE_TIME;
-       fc->send_xon = 1;
-       fc->current_mode = fc->requested_mode;
-
-       switch (hw->mac.type) {
-       default:
-               if ((adapter->flags & FLAG_HAS_ERT) &&
-                   (adapter->netdev->mtu > ETH_DATA_LEN))
-                       hwm = min(((pba << 10) * 9 / 10),
-                                 ((pba << 10) - (E1000_ERT_2048 << 3)));
-               else
-                       hwm = min(((pba << 10) * 9 / 10),
-                                 ((pba << 10) - adapter->max_frame_size));
-
-               fc->high_water = hwm & E1000_FCRTH_RTH; /* 8-byte granularity */
-               fc->low_water = fc->high_water - 8;
-               break;
-       case e1000_pchlan:
-               /*
-                * Workaround PCH LOM adapter hangs with certain network
-                * loads.  If hangs persist, try disabling Tx flow control.
-                */
-               if (adapter->netdev->mtu > ETH_DATA_LEN) {
-                       fc->high_water = 0x3500;
-                       fc->low_water  = 0x1500;
-               } else {
-                       fc->high_water = 0x5000;
-                       fc->low_water  = 0x3000;
-               }
-               fc->refresh_time = 0x1000;
-               break;
-       case e1000_pch2lan:
-               fc->high_water = 0x05C20;
-               fc->low_water = 0x05048;
-               fc->pause_time = 0x0650;
-               fc->refresh_time = 0x0400;
-               if (adapter->netdev->mtu > ETH_DATA_LEN) {
-                       pba = 14;
-                       ew32(PBA, pba);
-               }
-               break;
-       }
-
-       /*
-        * Disable Adaptive Interrupt Moderation if 2 full packets cannot
-        * fit in receive buffer and early-receive not supported.
-        */
-       if (adapter->itr_setting & 0x3) {
-               if (((adapter->max_frame_size * 2) > (pba << 10)) &&
-                   !(adapter->flags & FLAG_HAS_ERT)) {
-                       if (!(adapter->flags2 & FLAG2_DISABLE_AIM)) {
-                               dev_info(&adapter->pdev->dev,
-                                       "Interrupt Throttle Rate turned off\n");
-                               adapter->flags2 |= FLAG2_DISABLE_AIM;
-                               ew32(ITR, 0);
-                       }
-               } else if (adapter->flags2 & FLAG2_DISABLE_AIM) {
-                       dev_info(&adapter->pdev->dev,
-                                "Interrupt Throttle Rate turned on\n");
-                       adapter->flags2 &= ~FLAG2_DISABLE_AIM;
-                       adapter->itr = 20000;
-                       ew32(ITR, 1000000000 / (adapter->itr * 256));
-               }
-       }
-
-       /* 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 (mac->ops.init_hw(hw))
-               e_err("Hardware Error\n");
-
-       e1000_update_mng_vlan(adapter);
-
-       /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
-       ew32(VET, ETH_P_8021Q);
-
-       e1000e_reset_adaptive(hw);
-
-       if (!netif_running(adapter->netdev) &&
-           !test_bit(__E1000_TESTING, &adapter->state)) {
-               e1000_power_down_phy(adapter);
-               return;
-       }
-
-       e1000_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);
-       }
-}
-
-int e1000e_up(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* hardware has been reset, we need to reload some things */
-       e1000_configure(adapter);
-
-       clear_bit(__E1000_DOWN, &adapter->state);
-
-       napi_enable(&adapter->napi);
-       if (adapter->msix_entries)
-               e1000_configure_msix(adapter);
-       e1000_irq_enable(adapter);
-
-       netif_start_queue(adapter->netdev);
-
-       /* fire a link change interrupt to start the watchdog */
-       if (adapter->msix_entries)
-               ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);
-       else
-               ew32(ICS, E1000_ICS_LSC);
-
-       return 0;
-}
-
-static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (!(adapter->flags2 & FLAG2_DMA_BURST))
-               return;
-
-       /* flush pending descriptor writebacks to memory */
-       ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
-       ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
-
-       /* execute the writes immediately */
-       e1e_flush();
-}
-
-static void e1000e_update_stats(struct e1000_adapter *adapter);
-
-void e1000e_down(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tctl, rctl;
-
-       /*
-        * signal that we're down so the interrupt handler does not
-        * reschedule our watchdog timer
-        */
-       set_bit(__E1000_DOWN, &adapter->state);
-
-       /* disable receives in the hardware */
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-       /* flush and sleep below */
-
-       netif_stop_queue(netdev);
-
-       /* disable transmits in the hardware */
-       tctl = er32(TCTL);
-       tctl &= ~E1000_TCTL_EN;
-       ew32(TCTL, tctl);
-       /* flush both disables and wait for them to finish */
-       e1e_flush();
-       usleep_range(10000, 20000);
-
-       napi_disable(&adapter->napi);
-       e1000_irq_disable(adapter);
-
-       del_timer_sync(&adapter->watchdog_timer);
-       del_timer_sync(&adapter->phy_info_timer);
-
-       netif_carrier_off(netdev);
-
-       spin_lock(&adapter->stats64_lock);
-       e1000e_update_stats(adapter);
-       spin_unlock(&adapter->stats64_lock);
-
-       e1000e_flush_descriptors(adapter);
-       e1000_clean_tx_ring(adapter);
-       e1000_clean_rx_ring(adapter);
-
-       adapter->link_speed = 0;
-       adapter->link_duplex = 0;
-
-       if (!pci_channel_offline(adapter->pdev))
-               e1000e_reset(adapter);
-
-       /*
-        * TODO: for power management, we could drop the link and
-        * pci_disable_device here.
-        */
-}
-
-void e1000e_reinit_locked(struct e1000_adapter *adapter)
-{
-       might_sleep();
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
-               usleep_range(1000, 2000);
-       e1000e_down(adapter);
-       e1000e_up(adapter);
-       clear_bit(__E1000_RESETTING, &adapter->state);
-}
-
-/**
- * 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 __devinit e1000_sw_init(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN;
-       adapter->rx_ps_bsize0 = 128;
-       adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
-
-       spin_lock_init(&adapter->stats64_lock);
-
-       e1000e_set_interrupt_capability(adapter);
-
-       if (e1000_alloc_queues(adapter))
-               return -ENOMEM;
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       e1000_irq_disable(adapter);
-
-       set_bit(__E1000_DOWN, &adapter->state);
-       return 0;
-}
-
-/**
- * e1000_intr_msi_test - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-static irqreturn_t e1000_intr_msi_test(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 icr = er32(ICR);
-
-       e_dbg("icr is %08X\n", icr);
-       if (icr & E1000_ICR_RXSEQ) {
-               adapter->flags &= ~FLAG_MSI_TEST_FAILED;
-               wmb();
-       }
-
-       return IRQ_HANDLED;
-}
-
-/**
- * e1000_test_msi_interrupt - Returns 0 for successful test
- * @adapter: board private struct
- *
- * code flow taken from tg3.c
- **/
-static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       int err;
-
-       /* poll_enable hasn't been called yet, so don't need disable */
-       /* clear any pending events */
-       er32(ICR);
-
-       /* free the real vector and request a test handler */
-       e1000_free_irq(adapter);
-       e1000e_reset_interrupt_capability(adapter);
-
-       /* Assume that the test fails, if it succeeds then the test
-        * MSI irq handler will unset this flag */
-       adapter->flags |= FLAG_MSI_TEST_FAILED;
-
-       err = pci_enable_msi(adapter->pdev);
-       if (err)
-               goto msi_test_failed;
-
-       err = request_irq(adapter->pdev->irq, e1000_intr_msi_test, 0,
-                         netdev->name, netdev);
-       if (err) {
-               pci_disable_msi(adapter->pdev);
-               goto msi_test_failed;
-       }
-
-       wmb();
-
-       e1000_irq_enable(adapter);
-
-       /* fire an unusual interrupt on the test handler */
-       ew32(ICS, E1000_ICS_RXSEQ);
-       e1e_flush();
-       msleep(50);
-
-       e1000_irq_disable(adapter);
-
-       rmb();
-
-       if (adapter->flags & FLAG_MSI_TEST_FAILED) {
-               adapter->int_mode = E1000E_INT_MODE_LEGACY;
-               e_info("MSI interrupt test failed, using legacy interrupt.\n");
-       } else
-               e_dbg("MSI interrupt test succeeded!\n");
-
-       free_irq(adapter->pdev->irq, netdev);
-       pci_disable_msi(adapter->pdev);
-
-msi_test_failed:
-       e1000e_set_interrupt_capability(adapter);
-       return e1000_request_irq(adapter);
-}
-
-/**
- * e1000_test_msi - Returns 0 if MSI test succeeds or INTx mode is restored
- * @adapter: board private struct
- *
- * code flow taken from tg3.c, called with e1000 interrupts disabled.
- **/
-static int e1000_test_msi(struct e1000_adapter *adapter)
-{
-       int err;
-       u16 pci_cmd;
-
-       if (!(adapter->flags & FLAG_MSI_ENABLED))
-               return 0;
-
-       /* disable SERR in case the MSI write causes a master abort */
-       pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
-       if (pci_cmd & PCI_COMMAND_SERR)
-               pci_write_config_word(adapter->pdev, PCI_COMMAND,
-                                     pci_cmd & ~PCI_COMMAND_SERR);
-
-       err = e1000_test_msi_interrupt(adapter);
-
-       /* re-enable SERR */
-       if (pci_cmd & PCI_COMMAND_SERR) {
-               pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
-               pci_cmd |= PCI_COMMAND_SERR;
-               pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
-       }
-
-       return err;
-}
-
-/**
- * e1000_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-static int e1000_open(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       int err;
-
-       /* disallow open during test */
-       if (test_bit(__E1000_TESTING, &adapter->state))
-               return -EBUSY;
-
-       pm_runtime_get_sync(&pdev->dev);
-
-       netif_carrier_off(netdev);
-
-       /* allocate transmit descriptors */
-       err = e1000e_setup_tx_resources(adapter);
-       if (err)
-               goto err_setup_tx;
-
-       /* allocate receive descriptors */
-       err = e1000e_setup_rx_resources(adapter);
-       if (err)
-               goto err_setup_rx;
-
-       /*
-        * If AMT is enabled, let the firmware know that the network
-        * interface is now open and reset the part to a known state.
-        */
-       if (adapter->flags & FLAG_HAS_AMT) {
-               e1000e_get_hw_control(adapter);
-               e1000e_reset(adapter);
-       }
-
-       e1000e_power_up_phy(adapter);
-
-       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-       if ((adapter->hw.mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
-               e1000_update_mng_vlan(adapter);
-
-       /* DMA latency requirement to workaround early-receive/jumbo issue */
-       if ((adapter->flags & FLAG_HAS_ERT) ||
-           (adapter->hw.mac.type == e1000_pch2lan))
-               pm_qos_add_request(&adapter->netdev->pm_qos_req,
-                                  PM_QOS_CPU_DMA_LATENCY,
-                                  PM_QOS_DEFAULT_VALUE);
-
-       /*
-        * before we allocate an interrupt, we must be ready to handle it.
-        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
-        * as soon as we call pci_request_irq, so we have to setup our
-        * clean_rx handler before we do so.
-        */
-       e1000_configure(adapter);
-
-       err = e1000_request_irq(adapter);
-       if (err)
-               goto err_req_irq;
-
-       /*
-        * Work around PCIe errata with MSI interrupts causing some chipsets to
-        * ignore e1000e MSI messages, which means we need to test our MSI
-        * interrupt now
-        */
-       if (adapter->int_mode != E1000E_INT_MODE_LEGACY) {
-               err = e1000_test_msi(adapter);
-               if (err) {
-                       e_err("Interrupt allocation failed\n");
-                       goto err_req_irq;
-               }
-       }
-
-       /* From here on the code is the same as e1000e_up() */
-       clear_bit(__E1000_DOWN, &adapter->state);
-
-       napi_enable(&adapter->napi);
-
-       e1000_irq_enable(adapter);
-
-       netif_start_queue(netdev);
-
-       adapter->idle_check = true;
-       pm_runtime_put(&pdev->dev);
-
-       /* fire a link status change interrupt to start the watchdog */
-       if (adapter->msix_entries)
-               ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);
-       else
-               ew32(ICS, E1000_ICS_LSC);
-
-       return 0;
-
-err_req_irq:
-       e1000e_release_hw_control(adapter);
-       e1000_power_down_phy(adapter);
-       e1000e_free_rx_resources(adapter);
-err_setup_rx:
-       e1000e_free_tx_resources(adapter);
-err_setup_tx:
-       e1000e_reset(adapter);
-       pm_runtime_put_sync(&pdev->dev);
-
-       return err;
-}
-
-/**
- * e1000_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-static int e1000_close(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct pci_dev *pdev = adapter->pdev;
-
-       WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
-
-       pm_runtime_get_sync(&pdev->dev);
-
-       if (!test_bit(__E1000_DOWN, &adapter->state)) {
-               e1000e_down(adapter);
-               e1000_free_irq(adapter);
-       }
-       e1000_power_down_phy(adapter);
-
-       e1000e_free_tx_resources(adapter);
-       e1000e_free_rx_resources(adapter);
-
-       /*
-        * kill manageability vlan ID if supported, but not if a vlan with
-        * the same ID is registered on the host OS (let 8021q kill it)
-        */
-       if (adapter->hw.mng_cookie.status &
-           E1000_MNG_DHCP_COOKIE_STATUS_VLAN)
-               e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
-
-       /*
-        * If AMT is enabled, let the firmware know that the network
-        * interface is now closed
-        */
-       if ((adapter->flags & FLAG_HAS_AMT) &&
-           !test_bit(__E1000_TESTING, &adapter->state))
-               e1000e_release_hw_control(adapter);
-
-       if ((adapter->flags & FLAG_HAS_ERT) ||
-           (adapter->hw.mac.type == e1000_pch2lan))
-               pm_qos_remove_request(&adapter->netdev->pm_qos_req);
-
-       pm_runtime_put_sync(&pdev->dev);
-
-       return 0;
-}
-/**
- * e1000_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-static int e1000_set_mac(struct net_device *netdev, void *p)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       memcpy(adapter->hw.mac.addr, addr->sa_data, netdev->addr_len);
-
-       e1000e_rar_set(&adapter->hw, adapter->hw.mac.addr, 0);
-
-       if (adapter->flags & FLAG_RESET_OVERWRITES_LAA) {
-               /* activate the work around */
-               e1000e_set_laa_state_82571(&adapter->hw, 1);
-
-               /*
-                * 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 (in e1000_watchdog), 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(&adapter->hw,
-                             adapter->hw.mac.addr,
-                             adapter->hw.mac.rar_entry_count - 1);
-       }
-
-       return 0;
-}
-
-/**
- * e1000e_update_phy_task - work thread to update phy
- * @work: pointer to our work struct
- *
- * this worker thread exists because we must acquire a
- * semaphore to read the phy, which we could msleep while
- * waiting for it, and we can't msleep in a timer.
- **/
-static void e1000e_update_phy_task(struct work_struct *work)
-{
-       struct e1000_adapter *adapter = container_of(work,
-                                       struct e1000_adapter, update_phy_task);
-
-       if (test_bit(__E1000_DOWN, &adapter->state))
-               return;
-
-       e1000_get_phy_info(&adapter->hw);
-}
-
-/*
- * Need to wait a few seconds after link up to get diagnostic information from
- * the phy
- */
-static void e1000_update_phy_info(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *) data;
-
-       if (test_bit(__E1000_DOWN, &adapter->state))
-               return;
-
-       schedule_work(&adapter->update_phy_task);
-}
-
-/**
- * e1000e_update_phy_stats - Update the PHY statistics counters
- * @adapter: board private structure
- *
- * Read/clear the upper 16-bit PHY registers and read/accumulate lower
- **/
-static void e1000e_update_phy_stats(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       s32 ret_val;
-       u16 phy_data;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return;
-
-       /*
-        * A page set is expensive so check if already on desired page.
-        * If not, set to the page with the PHY status registers.
-        */
-       hw->phy.addr = 1;
-       ret_val = e1000e_read_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                          &phy_data);
-       if (ret_val)
-               goto release;
-       if (phy_data != (HV_STATS_PAGE << IGP_PAGE_SHIFT)) {
-               ret_val = hw->phy.ops.set_page(hw,
-                                              HV_STATS_PAGE << IGP_PAGE_SHIFT);
-               if (ret_val)
-                       goto release;
-       }
-
-       /* Single Collision Count */
-       hw->phy.ops.read_reg_page(hw, HV_SCC_UPPER, &phy_data);
-       ret_val = hw->phy.ops.read_reg_page(hw, HV_SCC_LOWER, &phy_data);
-       if (!ret_val)
-               adapter->stats.scc += phy_data;
-
-       /* Excessive Collision Count */
-       hw->phy.ops.read_reg_page(hw, HV_ECOL_UPPER, &phy_data);
-       ret_val = hw->phy.ops.read_reg_page(hw, HV_ECOL_LOWER, &phy_data);
-       if (!ret_val)
-               adapter->stats.ecol += phy_data;
-
-       /* Multiple Collision Count */
-       hw->phy.ops.read_reg_page(hw, HV_MCC_UPPER, &phy_data);
-       ret_val = hw->phy.ops.read_reg_page(hw, HV_MCC_LOWER, &phy_data);
-       if (!ret_val)
-               adapter->stats.mcc += phy_data;
-
-       /* Late Collision Count */
-       hw->phy.ops.read_reg_page(hw, HV_LATECOL_UPPER, &phy_data);
-       ret_val = hw->phy.ops.read_reg_page(hw, HV_LATECOL_LOWER, &phy_data);
-       if (!ret_val)
-               adapter->stats.latecol += phy_data;
-
-       /* Collision Count - also used for adaptive IFS */
-       hw->phy.ops.read_reg_page(hw, HV_COLC_UPPER, &phy_data);
-       ret_val = hw->phy.ops.read_reg_page(hw, HV_COLC_LOWER, &phy_data);
-       if (!ret_val)
-               hw->mac.collision_delta = phy_data;
-
-       /* Defer Count */
-       hw->phy.ops.read_reg_page(hw, HV_DC_UPPER, &phy_data);
-       ret_val = hw->phy.ops.read_reg_page(hw, HV_DC_LOWER, &phy_data);
-       if (!ret_val)
-               adapter->stats.dc += phy_data;
-
-       /* Transmit with no CRS */
-       hw->phy.ops.read_reg_page(hw, HV_TNCRS_UPPER, &phy_data);
-       ret_val = hw->phy.ops.read_reg_page(hw, HV_TNCRS_LOWER, &phy_data);
-       if (!ret_val)
-               adapter->stats.tncrs += phy_data;
-
-release:
-       hw->phy.ops.release(hw);
-}
-
-/**
- * e1000e_update_stats - Update the board statistics counters
- * @adapter: board private structure
- **/
-static void e1000e_update_stats(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-
-       /*
-        * Prevent stats update while adapter is being reset, or if the pci
-        * connection is down.
-        */
-       if (adapter->link_speed == 0)
-               return;
-       if (pci_channel_offline(pdev))
-               return;
-
-       adapter->stats.crcerrs += er32(CRCERRS);
-       adapter->stats.gprc += er32(GPRC);
-       adapter->stats.gorc += er32(GORCL);
-       er32(GORCH); /* Clear gorc */
-       adapter->stats.bprc += er32(BPRC);
-       adapter->stats.mprc += er32(MPRC);
-       adapter->stats.roc += er32(ROC);
-
-       adapter->stats.mpc += er32(MPC);
-
-       /* Half-duplex statistics */
-       if (adapter->link_duplex == HALF_DUPLEX) {
-               if (adapter->flags2 & FLAG2_HAS_PHY_STATS) {
-                       e1000e_update_phy_stats(adapter);
-               } else {
-                       adapter->stats.scc += er32(SCC);
-                       adapter->stats.ecol += er32(ECOL);
-                       adapter->stats.mcc += er32(MCC);
-                       adapter->stats.latecol += er32(LATECOL);
-                       adapter->stats.dc += er32(DC);
-
-                       hw->mac.collision_delta = er32(COLC);
-
-                       if ((hw->mac.type != e1000_82574) &&
-                           (hw->mac.type != e1000_82583))
-                               adapter->stats.tncrs += er32(TNCRS);
-               }
-               adapter->stats.colc += hw->mac.collision_delta;
-       }
-
-       adapter->stats.xonrxc += er32(XONRXC);
-       adapter->stats.xontxc += er32(XONTXC);
-       adapter->stats.xoffrxc += er32(XOFFRXC);
-       adapter->stats.xofftxc += er32(XOFFTXC);
-       adapter->stats.gptc += er32(GPTC);
-       adapter->stats.gotc += er32(GOTCL);
-       er32(GOTCH); /* Clear gotc */
-       adapter->stats.rnbc += er32(RNBC);
-       adapter->stats.ruc += er32(RUC);
-
-       adapter->stats.mptc += er32(MPTC);
-       adapter->stats.bptc += er32(BPTC);
-
-       /* used for adaptive IFS */
-
-       hw->mac.tx_packet_delta = er32(TPT);
-       adapter->stats.tpt += hw->mac.tx_packet_delta;
-
-       adapter->stats.algnerrc += er32(ALGNERRC);
-       adapter->stats.rxerrc += er32(RXERRC);
-       adapter->stats.cexterr += er32(CEXTERR);
-       adapter->stats.tsctc += er32(TSCTC);
-       adapter->stats.tsctfc += er32(TSCTFC);
-
-       /* Fill out the OS statistics structure */
-       netdev->stats.multicast = adapter->stats.mprc;
-       netdev->stats.collisions = adapter->stats.colc;
-
-       /* Rx Errors */
-
-       /*
-        * RLEC on some newer hardware can be incorrect so build
-        * our own version based on RUC and ROC
-        */
-       netdev->stats.rx_errors = adapter->stats.rxerrc +
-               adapter->stats.crcerrs + adapter->stats.algnerrc +
-               adapter->stats.ruc + adapter->stats.roc +
-               adapter->stats.cexterr;
-       netdev->stats.rx_length_errors = adapter->stats.ruc +
-                                             adapter->stats.roc;
-       netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
-       netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
-       netdev->stats.rx_missed_errors = adapter->stats.mpc;
-
-       /* Tx Errors */
-       netdev->stats.tx_errors = adapter->stats.ecol +
-                                      adapter->stats.latecol;
-       netdev->stats.tx_aborted_errors = adapter->stats.ecol;
-       netdev->stats.tx_window_errors = adapter->stats.latecol;
-       netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
-
-       /* Tx Dropped needs to be maintained elsewhere */
-
-       /* Management Stats */
-       adapter->stats.mgptc += er32(MGTPTC);
-       adapter->stats.mgprc += er32(MGTPRC);
-       adapter->stats.mgpdc += er32(MGTPDC);
-}
-
-/**
- * e1000_phy_read_status - Update the PHY register status snapshot
- * @adapter: board private structure
- **/
-static void e1000_phy_read_status(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_phy_regs *phy = &adapter->phy_regs;
-
-       if ((er32(STATUS) & E1000_STATUS_LU) &&
-           (adapter->hw.phy.media_type == e1000_media_type_copper)) {
-               int ret_val;
-
-               ret_val  = e1e_rphy(hw, PHY_CONTROL, &phy->bmcr);
-               ret_val |= e1e_rphy(hw, PHY_STATUS, &phy->bmsr);
-               ret_val |= e1e_rphy(hw, PHY_AUTONEG_ADV, &phy->advertise);
-               ret_val |= e1e_rphy(hw, PHY_LP_ABILITY, &phy->lpa);
-               ret_val |= e1e_rphy(hw, PHY_AUTONEG_EXP, &phy->expansion);
-               ret_val |= e1e_rphy(hw, PHY_1000T_CTRL, &phy->ctrl1000);
-               ret_val |= e1e_rphy(hw, PHY_1000T_STATUS, &phy->stat1000);
-               ret_val |= e1e_rphy(hw, PHY_EXT_STATUS, &phy->estatus);
-               if (ret_val)
-                       e_warn("Error reading PHY register\n");
-       } else {
-               /*
-                * Do not read PHY registers if link is not up
-                * Set values to typical power-on defaults
-                */
-               phy->bmcr = (BMCR_SPEED1000 | BMCR_ANENABLE | BMCR_FULLDPLX);
-               phy->bmsr = (BMSR_100FULL | BMSR_100HALF | BMSR_10FULL |
-                            BMSR_10HALF | BMSR_ESTATEN | BMSR_ANEGCAPABLE |
-                            BMSR_ERCAP);
-               phy->advertise = (ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP |
-                                 ADVERTISE_ALL | ADVERTISE_CSMA);
-               phy->lpa = 0;
-               phy->expansion = EXPANSION_ENABLENPAGE;
-               phy->ctrl1000 = ADVERTISE_1000FULL;
-               phy->stat1000 = 0;
-               phy->estatus = (ESTATUS_1000_TFULL | ESTATUS_1000_THALF);
-       }
-}
-
-static void e1000_print_link_info(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl = er32(CTRL);
-
-       /* Link status message must follow this format for user tools */
-       printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s, "
-              "Flow Control: %s\n",
-              adapter->netdev->name,
-              adapter->link_speed,
-              (adapter->link_duplex == FULL_DUPLEX) ?
-              "Full Duplex" : "Half Duplex",
-              ((ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE)) ?
-              "Rx/Tx" :
-              ((ctrl & E1000_CTRL_RFCE) ? "Rx" :
-               ((ctrl & E1000_CTRL_TFCE) ? "Tx" : "None")));
-}
-
-static bool e1000e_has_link(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       bool link_active = 0;
-       s32 ret_val = 0;
-
-       /*
-        * get_link_status is set on LSC (link status) interrupt or
-        * Rx sequence error interrupt.  get_link_status will stay
-        * false until the check_for_link establishes link
-        * for copper adapters ONLY
-        */
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               if (hw->mac.get_link_status) {
-                       ret_val = hw->mac.ops.check_for_link(hw);
-                       link_active = !hw->mac.get_link_status;
-               } else {
-                       link_active = 1;
-               }
-               break;
-       case e1000_media_type_fiber:
-               ret_val = hw->mac.ops.check_for_link(hw);
-               link_active = !!(er32(STATUS) & E1000_STATUS_LU);
-               break;
-       case e1000_media_type_internal_serdes:
-               ret_val = hw->mac.ops.check_for_link(hw);
-               link_active = adapter->hw.mac.serdes_has_link;
-               break;
-       default:
-       case e1000_media_type_unknown:
-               break;
-       }
-
-       if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
-           (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
-               /* See e1000_kmrn_lock_loss_workaround_ich8lan() */
-               e_info("Gigabit has been disabled, downgrading speed\n");
-       }
-
-       return link_active;
-}
-
-static void e1000e_enable_receives(struct e1000_adapter *adapter)
-{
-       /* make sure the receive unit is started */
-       if ((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
-           (adapter->flags & FLAG_RX_RESTART_NOW)) {
-               struct e1000_hw *hw = &adapter->hw;
-               u32 rctl = er32(RCTL);
-               ew32(RCTL, rctl | E1000_RCTL_EN);
-               adapter->flags &= ~FLAG_RX_RESTART_NOW;
-       }
-}
-
-static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /*
-        * With 82574 controllers, PHY needs to be checked periodically
-        * for hung state and reset, if two calls return true
-        */
-       if (e1000_check_phy_82574(hw))
-               adapter->phy_hang_count++;
-       else
-               adapter->phy_hang_count = 0;
-
-       if (adapter->phy_hang_count > 1) {
-               adapter->phy_hang_count = 0;
-               schedule_work(&adapter->reset_task);
-       }
-}
-
-/**
- * e1000_watchdog - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void e1000_watchdog(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *) data;
-
-       /* Do the rest outside of interrupt context */
-       schedule_work(&adapter->watchdog_task);
-
-       /* TODO: make this use queue_delayed_work() */
-}
-
-static void e1000_watchdog_task(struct work_struct *work)
-{
-       struct e1000_adapter *adapter = container_of(work,
-                                       struct e1000_adapter, watchdog_task);
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-       struct e1000_phy_info *phy = &adapter->hw.phy;
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 link, tctl;
-
-       if (test_bit(__E1000_DOWN, &adapter->state))
-               return;
-
-       link = e1000e_has_link(adapter);
-       if ((netif_carrier_ok(netdev)) && link) {
-               /* Cancel scheduled suspend requests. */
-               pm_runtime_resume(netdev->dev.parent);
-
-               e1000e_enable_receives(adapter);
-               goto link_up;
-       }
-
-       if ((e1000e_enable_tx_pkt_filtering(hw)) &&
-           (adapter->mng_vlan_id != adapter->hw.mng_cookie.vlan_id))
-               e1000_update_mng_vlan(adapter);
-
-       if (link) {
-               if (!netif_carrier_ok(netdev)) {
-                       bool txb2b = 1;
-
-                       /* Cancel scheduled suspend requests. */
-                       pm_runtime_resume(netdev->dev.parent);
-
-                       /* update snapshot of PHY registers on LSC */
-                       e1000_phy_read_status(adapter);
-                       mac->ops.get_link_up_info(&adapter->hw,
-                                                  &adapter->link_speed,
-                                                  &adapter->link_duplex);
-                       e1000_print_link_info(adapter);
-                       /*
-                        * On supported PHYs, check for duplex mismatch only
-                        * if link has autonegotiated at 10/100 half
-                        */
-                       if ((hw->phy.type == e1000_phy_igp_3 ||
-                            hw->phy.type == e1000_phy_bm) &&
-                           (hw->mac.autoneg == true) &&
-                           (adapter->link_speed == SPEED_10 ||
-                            adapter->link_speed == SPEED_100) &&
-                           (adapter->link_duplex == HALF_DUPLEX)) {
-                               u16 autoneg_exp;
-
-                               e1e_rphy(hw, PHY_AUTONEG_EXP, &autoneg_exp);
-
-                               if (!(autoneg_exp & NWAY_ER_LP_NWAY_CAPS))
-                                       e_info("Autonegotiated half duplex but"
-                                              " link partner cannot autoneg. "
-                                              " Try forcing full duplex if "
-                                              "link gets many collisions.\n");
-                       }
-
-                       /* adjust timeout factor according to speed/duplex */
-                       adapter->tx_timeout_factor = 1;
-                       switch (adapter->link_speed) {
-                       case SPEED_10:
-                               txb2b = 0;
-                               adapter->tx_timeout_factor = 16;
-                               break;
-                       case SPEED_100:
-                               txb2b = 0;
-                               adapter->tx_timeout_factor = 10;
-                               break;
-                       }
-
-                       /*
-                        * workaround: re-program speed mode bit after
-                        * link-up event
-                        */
-                       if ((adapter->flags & FLAG_TARC_SPEED_MODE_BIT) &&
-                           !txb2b) {
-                               u32 tarc0;
-                               tarc0 = er32(TARC(0));
-                               tarc0 &= ~SPEED_MODE_BIT;
-                               ew32(TARC(0), tarc0);
-                       }
-
-                       /*
-                        * disable TSO for pcie and 10/100 speeds, to avoid
-                        * some hardware issues
-                        */
-                       if (!(adapter->flags & FLAG_TSO_FORCE)) {
-                               switch (adapter->link_speed) {
-                               case SPEED_10:
-                               case SPEED_100:
-                                       e_info("10/100 speed: disabling TSO\n");
-                                       netdev->features &= ~NETIF_F_TSO;
-                                       netdev->features &= ~NETIF_F_TSO6;
-                                       break;
-                               case SPEED_1000:
-                                       netdev->features |= NETIF_F_TSO;
-                                       netdev->features |= NETIF_F_TSO6;
-                                       break;
-                               default:
-                                       /* oops */
-                                       break;
-                               }
-                       }
-
-                       /*
-                        * enable transmits in the hardware, need to do this
-                        * after setting TARC(0)
-                        */
-                       tctl = er32(TCTL);
-                       tctl |= E1000_TCTL_EN;
-                       ew32(TCTL, tctl);
-
-                        /*
-                        * Perform any post-link-up configuration before
-                        * reporting link up.
-                        */
-                       if (phy->ops.cfg_on_link_up)
-                               phy->ops.cfg_on_link_up(hw);
-
-                       netif_carrier_on(netdev);
-
-                       if (!test_bit(__E1000_DOWN, &adapter->state))
-                               mod_timer(&adapter->phy_info_timer,
-                                         round_jiffies(jiffies + 2 * HZ));
-               }
-       } else {
-               if (netif_carrier_ok(netdev)) {
-                       adapter->link_speed = 0;
-                       adapter->link_duplex = 0;
-                       /* Link status message must follow this format */
-                       printk(KERN_INFO "e1000e: %s NIC Link is Down\n",
-                              adapter->netdev->name);
-                       netif_carrier_off(netdev);
-                       if (!test_bit(__E1000_DOWN, &adapter->state))
-                               mod_timer(&adapter->phy_info_timer,
-                                         round_jiffies(jiffies + 2 * HZ));
-
-                       if (adapter->flags & FLAG_RX_NEEDS_RESTART)
-                               schedule_work(&adapter->reset_task);
-                       else
-                               pm_schedule_suspend(netdev->dev.parent,
-                                                       LINK_TIMEOUT);
-               }
-       }
-
-link_up:
-       spin_lock(&adapter->stats64_lock);
-       e1000e_update_stats(adapter);
-
-       mac->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
-       adapter->tpt_old = adapter->stats.tpt;
-       mac->collision_delta = adapter->stats.colc - adapter->colc_old;
-       adapter->colc_old = adapter->stats.colc;
-
-       adapter->gorc = adapter->stats.gorc - adapter->gorc_old;
-       adapter->gorc_old = adapter->stats.gorc;
-       adapter->gotc = adapter->stats.gotc - adapter->gotc_old;
-       adapter->gotc_old = adapter->stats.gotc;
-       spin_unlock(&adapter->stats64_lock);
-
-       e1000e_update_adaptive(&adapter->hw);
-
-       if (!netif_carrier_ok(netdev) &&
-           (e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
-               /*
-                * We've lost link, so the controller stops DMA,
-                * but we've got queued Tx work that's never going
-                * to get done, so reset controller to flush Tx.
-                * (Do the reset outside of interrupt context).
-                */
-               schedule_work(&adapter->reset_task);
-               /* return immediately since reset is imminent */
-               return;
-       }
-
-       /* Simple mode for Interrupt Throttle Rate (ITR) */
-       if (adapter->itr_setting == 4) {
-               /*
-                * Symmetric Tx/Rx gets a reduced ITR=2000;
-                * Total asymmetrical Tx or Rx gets ITR=8000;
-                * everyone else is between 2000-8000.
-                */
-               u32 goc = (adapter->gotc + adapter->gorc) / 10000;
-               u32 dif = (adapter->gotc > adapter->gorc ?
-                           adapter->gotc - adapter->gorc :
-                           adapter->gorc - adapter->gotc) / 10000;
-               u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
-
-               ew32(ITR, 1000000000 / (itr * 256));
-       }
-
-       /* Cause software interrupt to ensure Rx ring is cleaned */
-       if (adapter->msix_entries)
-               ew32(ICS, adapter->rx_ring->ims_val);
-       else
-               ew32(ICS, E1000_ICS_RXDMT0);
-
-       /* flush pending descriptors to memory before detecting Tx hang */
-       e1000e_flush_descriptors(adapter);
-
-       /* Force detection of hung controller every watchdog period */
-       adapter->detect_tx_hung = 1;
-
-       /*
-        * With 82571 controllers, LAA may be overwritten due to controller
-        * reset from the other port. Set the appropriate LAA in RAR[0]
-        */
-       if (e1000e_get_laa_state_82571(hw))
-               e1000e_rar_set(hw, adapter->hw.mac.addr, 0);
-
-       if (adapter->flags2 & FLAG2_CHECK_PHY_HANG)
-               e1000e_check_82574_phy_workaround(adapter);
-
-       /* Reset the timer */
-       if (!test_bit(__E1000_DOWN, &adapter->state))
-               mod_timer(&adapter->watchdog_timer,
-                         round_jiffies(jiffies + 2 * HZ));
-}
-
-#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
-
-static int e1000_tso(struct e1000_adapter *adapter,
-                    struct sk_buff *skb)
-{
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_context_desc *context_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i;
-       u32 cmd_length = 0;
-       u16 ipcse = 0, tucse, mss;
-       u8 ipcss, ipcso, tucss, tucso, hdr_len;
-
-       if (!skb_is_gso(skb))
-               return 0;
-
-       if (skb_header_cloned(skb)) {
-               int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-
-               if (err)
-                       return err;
-       }
-
-       hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-       mss = skb_shinfo(skb)->gso_size;
-       if (skb->protocol == htons(ETH_P_IP)) {
-               struct iphdr *iph = ip_hdr(skb);
-               iph->tot_len = 0;
-               iph->check = 0;
-               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
-                                                        0, IPPROTO_TCP, 0);
-               cmd_length = E1000_TXD_CMD_IP;
-               ipcse = skb_transport_offset(skb) - 1;
-       } else if (skb_is_gso_v6(skb)) {
-               ipv6_hdr(skb)->payload_len = 0;
-               tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                      &ipv6_hdr(skb)->daddr,
-                                                      0, IPPROTO_TCP, 0);
-               ipcse = 0;
-       }
-       ipcss = skb_network_offset(skb);
-       ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
-       tucss = skb_transport_offset(skb);
-       tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
-       tucse = 0;
-
-       cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
-                      E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
-
-       i = tx_ring->next_to_use;
-       context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
-       buffer_info = &tx_ring->buffer_info[i];
-
-       context_desc->lower_setup.ip_fields.ipcss  = ipcss;
-       context_desc->lower_setup.ip_fields.ipcso  = ipcso;
-       context_desc->lower_setup.ip_fields.ipcse  = cpu_to_le16(ipcse);
-       context_desc->upper_setup.tcp_fields.tucss = tucss;
-       context_desc->upper_setup.tcp_fields.tucso = tucso;
-       context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
-       context_desc->tcp_seg_setup.fields.mss     = cpu_to_le16(mss);
-       context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
-       context_desc->cmd_and_length = cpu_to_le32(cmd_length);
-
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-
-       i++;
-       if (i == tx_ring->count)
-               i = 0;
-       tx_ring->next_to_use = i;
-
-       return 1;
-}
-
-static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
-{
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_context_desc *context_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i;
-       u8 css;
-       u32 cmd_len = E1000_TXD_CMD_DEXT;
-       __be16 protocol;
-
-       if (skb->ip_summed != CHECKSUM_PARTIAL)
-               return 0;
-
-       if (skb->protocol == cpu_to_be16(ETH_P_8021Q))
-               protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
-       else
-               protocol = skb->protocol;
-
-       switch (protocol) {
-       case cpu_to_be16(ETH_P_IP):
-               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
-                       cmd_len |= E1000_TXD_CMD_TCP;
-               break;
-       case cpu_to_be16(ETH_P_IPV6):
-               /* XXX not handling all IPV6 headers */
-               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                       cmd_len |= E1000_TXD_CMD_TCP;
-               break;
-       default:
-               if (unlikely(net_ratelimit()))
-                       e_warn("checksum_partial proto=%x!\n",
-                              be16_to_cpu(protocol));
-               break;
-       }
-
-       css = skb_checksum_start_offset(skb);
-
-       i = tx_ring->next_to_use;
-       buffer_info = &tx_ring->buffer_info[i];
-       context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
-
-       context_desc->lower_setup.ip_config = 0;
-       context_desc->upper_setup.tcp_fields.tucss = css;
-       context_desc->upper_setup.tcp_fields.tucso =
-                               css + skb->csum_offset;
-       context_desc->upper_setup.tcp_fields.tucse = 0;
-       context_desc->tcp_seg_setup.data = 0;
-       context_desc->cmd_and_length = cpu_to_le32(cmd_len);
-
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-
-       i++;
-       if (i == tx_ring->count)
-               i = 0;
-       tx_ring->next_to_use = i;
-
-       return 1;
-}
-
-#define E1000_MAX_PER_TXD      8192
-#define E1000_MAX_TXD_PWR      12
-
-static int e1000_tx_map(struct e1000_adapter *adapter,
-                       struct sk_buff *skb, unsigned int first,
-                       unsigned int max_per_txd, unsigned int nr_frags,
-                       unsigned int mss)
-{
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_buffer *buffer_info;
-       unsigned int len = skb_headlen(skb);
-       unsigned int offset = 0, size, count = 0, i;
-       unsigned int f, bytecount, segs;
-
-       i = tx_ring->next_to_use;
-
-       while (len) {
-               buffer_info = &tx_ring->buffer_info[i];
-               size = min(len, max_per_txd);
-
-               buffer_info->length = size;
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-               buffer_info->dma = dma_map_single(&pdev->dev,
-                                                 skb->data + offset,
-                                                 size, DMA_TO_DEVICE);
-               buffer_info->mapped_as_page = false;
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-                       goto dma_error;
-
-               len -= size;
-               offset += size;
-               count++;
-
-               if (len) {
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-       }
-
-       for (f = 0; f < nr_frags; f++) {
-               struct skb_frag_struct *frag;
-
-               frag = &skb_shinfo(skb)->frags[f];
-               len = frag->size;
-               offset = frag->page_offset;
-
-               while (len) {
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-
-                       buffer_info = &tx_ring->buffer_info[i];
-                       size = min(len, max_per_txd);
-
-                       buffer_info->length = size;
-                       buffer_info->time_stamp = jiffies;
-                       buffer_info->next_to_watch = i;
-                       buffer_info->dma = dma_map_page(&pdev->dev, frag->page,
-                                                       offset, size,
-                                                       DMA_TO_DEVICE);
-                       buffer_info->mapped_as_page = true;
-                       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-                               goto dma_error;
-
-                       len -= size;
-                       offset += size;
-                       count++;
-               }
-       }
-
-       segs = skb_shinfo(skb)->gso_segs ? : 1;
-       /* multiply data chunks by size of headers */
-       bytecount = ((segs - 1) * skb_headlen(skb)) + skb->len;
-
-       tx_ring->buffer_info[i].skb = skb;
-       tx_ring->buffer_info[i].segs = segs;
-       tx_ring->buffer_info[i].bytecount = bytecount;
-       tx_ring->buffer_info[first].next_to_watch = i;
-
-       return count;
-
-dma_error:
-       dev_err(&pdev->dev, "Tx DMA map failed\n");
-       buffer_info->dma = 0;
-       if (count)
-               count--;
-
-       while (count--) {
-               if (i == 0)
-                       i += tx_ring->count;
-               i--;
-               buffer_info = &tx_ring->buffer_info[i];
-               e1000_put_txbuf(adapter, buffer_info);
-       }
-
-       return 0;
-}
-
-static void e1000_tx_queue(struct e1000_adapter *adapter,
-                          int tx_flags, int count)
-{
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       struct e1000_tx_desc *tx_desc = NULL;
-       struct e1000_buffer *buffer_info;
-       u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
-       unsigned int i;
-
-       if (tx_flags & E1000_TX_FLAGS_TSO) {
-               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
-                            E1000_TXD_CMD_TSE;
-               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
-
-               if (tx_flags & E1000_TX_FLAGS_IPV4)
-                       txd_upper |= E1000_TXD_POPTS_IXSM << 8;
-       }
-
-       if (tx_flags & E1000_TX_FLAGS_CSUM) {
-               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
-               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
-       }
-
-       if (tx_flags & E1000_TX_FLAGS_VLAN) {
-               txd_lower |= E1000_TXD_CMD_VLE;
-               txd_upper |= (tx_flags & E1000_TX_FLAGS_VLAN_MASK);
-       }
-
-       i = tx_ring->next_to_use;
-
-       do {
-               buffer_info = &tx_ring->buffer_info[i];
-               tx_desc = E1000_TX_DESC(*tx_ring, i);
-               tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-               tx_desc->lower.data =
-                       cpu_to_le32(txd_lower | buffer_info->length);
-               tx_desc->upper.data = cpu_to_le32(txd_upper);
-
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-       } while (--count > 0);
-
-       tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
-
-       /*
-        * Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64).
-        */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       writel(i, adapter->hw.hw_addr + tx_ring->tail);
-       /*
-        * we need this if more than one processor can write to our tail
-        * at a time, it synchronizes IO on IA64/Altix systems
-        */
-       mmiowb();
-}
-
-#define MINIMUM_DHCP_PACKET_SIZE 282
-static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
-                                   struct sk_buff *skb)
-{
-       struct e1000_hw *hw =  &adapter->hw;
-       u16 length, offset;
-
-       if (vlan_tx_tag_present(skb)) {
-               if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) &&
-                   (adapter->hw.mng_cookie.status &
-                       E1000_MNG_DHCP_COOKIE_STATUS_VLAN)))
-                       return 0;
-       }
-
-       if (skb->len <= MINIMUM_DHCP_PACKET_SIZE)
-               return 0;
-
-       if (((struct ethhdr *) skb->data)->h_proto != htons(ETH_P_IP))
-               return 0;
-
-       {
-               const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data+14);
-               struct udphdr *udp;
-
-               if (ip->protocol != IPPROTO_UDP)
-                       return 0;
-
-               udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2));
-               if (ntohs(udp->dest) != 67)
-                       return 0;
-
-               offset = (u8 *)udp + 8 - skb->data;
-               length = skb->len - offset;
-               return e1000e_mng_write_dhcp_info(hw, (u8 *)udp + 8, length);
-       }
-
-       return 0;
-}
-
-static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       netif_stop_queue(netdev);
-       /*
-        * Herbert's original patch had:
-        *  smp_mb__after_netif_stop_queue();
-        * but since that doesn't exist yet, just open code it.
-        */
-       smp_mb();
-
-       /*
-        * We need to check again in a case another CPU has just
-        * made room available.
-        */
-       if (e1000_desc_unused(adapter->tx_ring) < size)
-               return -EBUSY;
-
-       /* A reprieve! */
-       netif_start_queue(netdev);
-       ++adapter->restart_queue;
-       return 0;
-}
-
-static int e1000_maybe_stop_tx(struct net_device *netdev, int size)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (e1000_desc_unused(adapter->tx_ring) >= size)
-               return 0;
-       return __e1000_maybe_stop_tx(netdev, size);
-}
-
-#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
-static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
-                                   struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_ring *tx_ring = adapter->tx_ring;
-       unsigned int first;
-       unsigned int max_per_txd = E1000_MAX_PER_TXD;
-       unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
-       unsigned int tx_flags = 0;
-       unsigned int len = skb_headlen(skb);
-       unsigned int nr_frags;
-       unsigned int mss;
-       int count = 0;
-       int tso;
-       unsigned int f;
-
-       if (test_bit(__E1000_DOWN, &adapter->state)) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (skb->len <= 0) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       mss = skb_shinfo(skb)->gso_size;
-       /*
-        * The controller does a simple calculation to
-        * make sure there is enough room in the FIFO before
-        * initiating the DMA for each buffer.  The calc is:
-        * 4 = ceil(buffer len/mss).  To make sure we don't
-        * overrun the FIFO, adjust the max buffer len if mss
-        * drops.
-        */
-       if (mss) {
-               u8 hdr_len;
-               max_per_txd = min(mss << 2, max_per_txd);
-               max_txd_pwr = fls(max_per_txd) - 1;
-
-               /*
-                * TSO Workaround for 82571/2/3 Controllers -- if skb->data
-                * points to just header, pull a few bytes of payload from
-                * frags into skb->data
-                */
-               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-               /*
-                * we do this workaround for ES2LAN, but it is un-necessary,
-                * avoiding it could save a lot of cycles
-                */
-               if (skb->data_len && (hdr_len == len)) {
-                       unsigned int pull_size;
-
-                       pull_size = min((unsigned int)4, skb->data_len);
-                       if (!__pskb_pull_tail(skb, pull_size)) {
-                               e_err("__pskb_pull_tail failed.\n");
-                               dev_kfree_skb_any(skb);
-                               return NETDEV_TX_OK;
-                       }
-                       len = skb_headlen(skb);
-               }
-       }
-
-       /* reserve a descriptor for the offload context */
-       if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
-               count++;
-       count++;
-
-       count += TXD_USE_COUNT(len, max_txd_pwr);
-
-       nr_frags = skb_shinfo(skb)->nr_frags;
-       for (f = 0; f < nr_frags; f++)
-               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
-                                      max_txd_pwr);
-
-       if (adapter->hw.mac.tx_pkt_filtering)
-               e1000_transfer_dhcp_info(adapter, skb);
-
-       /*
-        * need: count + 2 desc gap to keep tail from touching
-        * head, otherwise try next time
-        */
-       if (e1000_maybe_stop_tx(netdev, count + 2))
-               return NETDEV_TX_BUSY;
-
-       if (vlan_tx_tag_present(skb)) {
-               tx_flags |= E1000_TX_FLAGS_VLAN;
-               tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
-       }
-
-       first = tx_ring->next_to_use;
-
-       tso = e1000_tso(adapter, skb);
-       if (tso < 0) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (tso)
-               tx_flags |= E1000_TX_FLAGS_TSO;
-       else if (e1000_tx_csum(adapter, skb))
-               tx_flags |= E1000_TX_FLAGS_CSUM;
-
-       /*
-        * Old method was to assume IPv4 packet by default if TSO was enabled.
-        * 82571 hardware supports TSO capabilities for IPv6 as well...
-        * no longer assume, we must.
-        */
-       if (skb->protocol == htons(ETH_P_IP))
-               tx_flags |= E1000_TX_FLAGS_IPV4;
-
-       /* if count is 0 then mapping error has occurred */
-       count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss);
-       if (count) {
-               e1000_tx_queue(adapter, tx_flags, count);
-               /* Make sure there is space in the ring for the next send. */
-               e1000_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 2);
-
-       } else {
-               dev_kfree_skb_any(skb);
-               tx_ring->buffer_info[first].time_stamp = 0;
-               tx_ring->next_to_use = first;
-       }
-
-       return NETDEV_TX_OK;
-}
-
-/**
- * e1000_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-static void e1000_tx_timeout(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       /* Do the reset outside of interrupt context */
-       adapter->tx_timeout_count++;
-       schedule_work(&adapter->reset_task);
-}
-
-static void e1000_reset_task(struct work_struct *work)
-{
-       struct e1000_adapter *adapter;
-       adapter = container_of(work, struct e1000_adapter, reset_task);
-
-       /* don't run the task if already down */
-       if (test_bit(__E1000_DOWN, &adapter->state))
-               return;
-
-       if (!((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
-             (adapter->flags & FLAG_RX_RESTART_NOW))) {
-               e1000e_dump(adapter);
-               e_err("Reset adapter\n");
-       }
-       e1000e_reinit_locked(adapter);
-}
-
-/**
- * e1000_get_stats64 - Get System Network Statistics
- * @netdev: network interface device structure
- * @stats: rtnl_link_stats64 pointer
- *
- * Returns the address of the device statistics structure.
- **/
-struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
-                                             struct rtnl_link_stats64 *stats)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       memset(stats, 0, sizeof(struct rtnl_link_stats64));
-       spin_lock(&adapter->stats64_lock);
-       e1000e_update_stats(adapter);
-       /* Fill out the OS statistics structure */
-       stats->rx_bytes = adapter->stats.gorc;
-       stats->rx_packets = adapter->stats.gprc;
-       stats->tx_bytes = adapter->stats.gotc;
-       stats->tx_packets = adapter->stats.gptc;
-       stats->multicast = adapter->stats.mprc;
-       stats->collisions = adapter->stats.colc;
-
-       /* Rx Errors */
-
-       /*
-        * RLEC on some newer hardware can be incorrect so build
-        * our own version based on RUC and ROC
-        */
-       stats->rx_errors = adapter->stats.rxerrc +
-               adapter->stats.crcerrs + adapter->stats.algnerrc +
-               adapter->stats.ruc + adapter->stats.roc +
-               adapter->stats.cexterr;
-       stats->rx_length_errors = adapter->stats.ruc +
-                                             adapter->stats.roc;
-       stats->rx_crc_errors = adapter->stats.crcerrs;
-       stats->rx_frame_errors = adapter->stats.algnerrc;
-       stats->rx_missed_errors = adapter->stats.mpc;
-
-       /* Tx Errors */
-       stats->tx_errors = adapter->stats.ecol +
-                                      adapter->stats.latecol;
-       stats->tx_aborted_errors = adapter->stats.ecol;
-       stats->tx_window_errors = adapter->stats.latecol;
-       stats->tx_carrier_errors = adapter->stats.tncrs;
-
-       /* Tx Dropped needs to be maintained elsewhere */
-
-       spin_unlock(&adapter->stats64_lock);
-       return stats;
-}
-
-/**
- * e1000_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
-
-       /* Jumbo frame support */
-       if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
-           !(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
-               e_err("Jumbo Frames not supported.\n");
-               return -EINVAL;
-       }
-
-       /* Supported frame sizes */
-       if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) ||
-           (max_frame > adapter->max_hw_frame_size)) {
-               e_err("Unsupported MTU setting\n");
-               return -EINVAL;
-       }
-
-       /* Jumbo frame workaround on 82579 requires CRC be stripped */
-       if ((adapter->hw.mac.type == e1000_pch2lan) &&
-           !(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
-           (new_mtu > ETH_DATA_LEN)) {
-               e_err("Jumbo Frames not supported on 82579 when CRC "
-                     "stripping is disabled.\n");
-               return -EINVAL;
-       }
-
-       /* 82573 Errata 17 */
-       if (((adapter->hw.mac.type == e1000_82573) ||
-            (adapter->hw.mac.type == e1000_82574)) &&
-           (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN)) {
-               adapter->flags2 |= FLAG2_DISABLE_ASPM_L1;
-               e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L1);
-       }
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
-               usleep_range(1000, 2000);
-       /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */
-       adapter->max_frame_size = max_frame;
-       e_info("changing MTU from %d to %d\n", netdev->mtu, new_mtu);
-       netdev->mtu = new_mtu;
-       if (netif_running(netdev))
-               e1000e_down(adapter);
-
-       /*
-        * NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
-        * means we reserve 2 more, this pushes us to allocate from the next
-        * larger slab size.
-        * i.e. RXBUFFER_2048 --> size-4096 slab
-        * However with the new *_jumbo_rx* routines, jumbo receives will use
-        * fragmented skbs
-        */
-
-       if (max_frame <= 2048)
-               adapter->rx_buffer_len = 2048;
-       else
-               adapter->rx_buffer_len = 4096;
-
-       /* adjust allocation if LPE protects us, and we aren't using SBP */
-       if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||
-            (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
-               adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN
-                                        + ETH_FCS_LEN;
-
-       if (netif_running(netdev))
-               e1000e_up(adapter);
-       else
-               e1000e_reset(adapter);
-
-       clear_bit(__E1000_RESETTING, &adapter->state);
-
-       return 0;
-}
-
-static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
-                          int cmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct mii_ioctl_data *data = if_mii(ifr);
-
-       if (adapter->hw.phy.media_type != e1000_media_type_copper)
-               return -EOPNOTSUPP;
-
-       switch (cmd) {
-       case SIOCGMIIPHY:
-               data->phy_id = adapter->hw.phy.addr;
-               break;
-       case SIOCGMIIREG:
-               e1000_phy_read_status(adapter);
-
-               switch (data->reg_num & 0x1F) {
-               case MII_BMCR:
-                       data->val_out = adapter->phy_regs.bmcr;
-                       break;
-               case MII_BMSR:
-                       data->val_out = adapter->phy_regs.bmsr;
-                       break;
-               case MII_PHYSID1:
-                       data->val_out = (adapter->hw.phy.id >> 16);
-                       break;
-               case MII_PHYSID2:
-                       data->val_out = (adapter->hw.phy.id & 0xFFFF);
-                       break;
-               case MII_ADVERTISE:
-                       data->val_out = adapter->phy_regs.advertise;
-                       break;
-               case MII_LPA:
-                       data->val_out = adapter->phy_regs.lpa;
-                       break;
-               case MII_EXPANSION:
-                       data->val_out = adapter->phy_regs.expansion;
-                       break;
-               case MII_CTRL1000:
-                       data->val_out = adapter->phy_regs.ctrl1000;
-                       break;
-               case MII_STAT1000:
-                       data->val_out = adapter->phy_regs.stat1000;
-                       break;
-               case MII_ESTATUS:
-                       data->val_out = adapter->phy_regs.estatus;
-                       break;
-               default:
-                       return -EIO;
-               }
-               break;
-       case SIOCSMIIREG:
-       default:
-               return -EOPNOTSUPP;
-       }
-       return 0;
-}
-
-static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       switch (cmd) {
-       case SIOCGMIIPHY:
-       case SIOCGMIIREG:
-       case SIOCSMIIREG:
-               return e1000_mii_ioctl(netdev, ifr, cmd);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 i, mac_reg;
-       u16 phy_reg, wuc_enable;
-       int retval = 0;
-
-       /* copy MAC RARs to PHY RARs */
-       e1000_copy_rx_addrs_to_phy_ich8lan(hw);
-
-       retval = hw->phy.ops.acquire(hw);
-       if (retval) {
-               e_err("Could not acquire PHY\n");
-               return retval;
-       }
-
-       /* Enable access to wakeup registers on and set page to BM_WUC_PAGE */
-       retval = e1000_enable_phy_wakeup_reg_access_bm(hw, &wuc_enable);
-       if (retval)
-               goto out;
-
-       /* copy MAC MTA to PHY MTA - only needed for pchlan */
-       for (i = 0; i < adapter->hw.mac.mta_reg_count; i++) {
-               mac_reg = E1000_READ_REG_ARRAY(hw, E1000_MTA, i);
-               hw->phy.ops.write_reg_page(hw, BM_MTA(i),
-                                          (u16)(mac_reg & 0xFFFF));
-               hw->phy.ops.write_reg_page(hw, BM_MTA(i) + 1,
-                                          (u16)((mac_reg >> 16) & 0xFFFF));
-       }
-
-       /* configure PHY Rx Control register */
-       hw->phy.ops.read_reg_page(&adapter->hw, BM_RCTL, &phy_reg);
-       mac_reg = er32(RCTL);
-       if (mac_reg & E1000_RCTL_UPE)
-               phy_reg |= BM_RCTL_UPE;
-       if (mac_reg & E1000_RCTL_MPE)
-               phy_reg |= BM_RCTL_MPE;
-       phy_reg &= ~(BM_RCTL_MO_MASK);
-       if (mac_reg & E1000_RCTL_MO_3)
-               phy_reg |= (((mac_reg & E1000_RCTL_MO_3) >> E1000_RCTL_MO_SHIFT)
-                               << BM_RCTL_MO_SHIFT);
-       if (mac_reg & E1000_RCTL_BAM)
-               phy_reg |= BM_RCTL_BAM;
-       if (mac_reg & E1000_RCTL_PMCF)
-               phy_reg |= BM_RCTL_PMCF;
-       mac_reg = er32(CTRL);
-       if (mac_reg & E1000_CTRL_RFCE)
-               phy_reg |= BM_RCTL_RFCE;
-       hw->phy.ops.write_reg_page(&adapter->hw, BM_RCTL, phy_reg);
-
-       /* enable PHY wakeup in MAC register */
-       ew32(WUFC, wufc);
-       ew32(WUC, E1000_WUC_PHY_WAKE | E1000_WUC_PME_EN);
-
-       /* configure and enable PHY wakeup in PHY registers */
-       hw->phy.ops.write_reg_page(&adapter->hw, BM_WUFC, wufc);
-       hw->phy.ops.write_reg_page(&adapter->hw, BM_WUC, E1000_WUC_PME_EN);
-
-       /* activate PHY wakeup */
-       wuc_enable |= BM_WUC_ENABLE_BIT | BM_WUC_HOST_WU_BIT;
-       retval = e1000_disable_phy_wakeup_reg_access_bm(hw, &wuc_enable);
-       if (retval)
-               e_err("Could not set PHY Host Wakeup bit\n");
-out:
-       hw->phy.ops.release(hw);
-
-       return retval;
-}
-
-static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
-                           bool runtime)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl, ctrl_ext, rctl, status;
-       /* Runtime suspend should only enable wakeup for link changes */
-       u32 wufc = runtime ? E1000_WUFC_LNKC : adapter->wol;
-       int retval = 0;
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev)) {
-               WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
-               e1000e_down(adapter);
-               e1000_free_irq(adapter);
-       }
-       e1000e_reset_interrupt_capability(adapter);
-
-       retval = pci_save_state(pdev);
-       if (retval)
-               return retval;
-
-       status = er32(STATUS);
-       if (status & E1000_STATUS_LU)
-               wufc &= ~E1000_WUFC_LNKC;
-
-       if (wufc) {
-               e1000_setup_rctl(adapter);
-               e1000_set_multi(netdev);
-
-               /* turn on all-multi mode if wake on multicast is enabled */
-               if (wufc & E1000_WUFC_MC) {
-                       rctl = er32(RCTL);
-                       rctl |= E1000_RCTL_MPE;
-                       ew32(RCTL, rctl);
-               }
-
-               ctrl = er32(CTRL);
-               /* advertise wake from D3Cold */
-               #define E1000_CTRL_ADVD3WUC 0x00100000
-               /* phy power management enable */
-               #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
-               ctrl |= E1000_CTRL_ADVD3WUC;
-               if (!(adapter->flags2 & FLAG2_HAS_PHY_WAKEUP))
-                       ctrl |= E1000_CTRL_EN_PHY_PWR_MGMT;
-               ew32(CTRL, ctrl);
-
-               if (adapter->hw.phy.media_type == e1000_media_type_fiber ||
-                   adapter->hw.phy.media_type ==
-                   e1000_media_type_internal_serdes) {
-                       /* keep the laser running in D3 */
-                       ctrl_ext = er32(CTRL_EXT);
-                       ctrl_ext |= E1000_CTRL_EXT_SDP3_DATA;
-                       ew32(CTRL_EXT, ctrl_ext);
-               }
-
-               if (adapter->flags & FLAG_IS_ICH)
-                       e1000_suspend_workarounds_ich8lan(&adapter->hw);
-
-               /* Allow time for pending master requests to run */
-               e1000e_disable_pcie_master(&adapter->hw);
-
-               if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) {
-                       /* enable wakeup by the PHY */
-                       retval = e1000_init_phy_wakeup(adapter, wufc);
-                       if (retval)
-                               return retval;
-               } else {
-                       /* enable wakeup by the MAC */
-                       ew32(WUFC, wufc);
-                       ew32(WUC, E1000_WUC_PME_EN);
-               }
-       } else {
-               ew32(WUC, 0);
-               ew32(WUFC, 0);
-       }
-
-       *enable_wake = !!wufc;
-
-       /* make sure adapter isn't asleep if manageability is enabled */
-       if ((adapter->flags & FLAG_MNG_PT_ENABLED) ||
-           (hw->mac.ops.check_mng_mode(hw)))
-               *enable_wake = true;
-
-       if (adapter->hw.phy.type == e1000_phy_igp_3)
-               e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
-
-       /*
-        * Release control of h/w to f/w.  If f/w is AMT enabled, this
-        * would have already happened in close and is redundant.
-        */
-       e1000e_release_hw_control(adapter);
-
-       pci_disable_device(pdev);
-
-       return 0;
-}
-
-static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake)
-{
-       if (sleep && wake) {
-               pci_prepare_to_sleep(pdev);
-               return;
-       }
-
-       pci_wake_from_d3(pdev, wake);
-       pci_set_power_state(pdev, PCI_D3hot);
-}
-
-static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
-                                    bool wake)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       /*
-        * The pci-e switch on some quad port adapters will report a
-        * correctable error when the MAC transitions from D0 to D3.  To
-        * prevent this we need to mask off the correctable errors on the
-        * downstream port of the pci-e switch.
-        */
-       if (adapter->flags & FLAG_IS_QUAD_PORT) {
-               struct pci_dev *us_dev = pdev->bus->self;
-               int pos = pci_pcie_cap(us_dev);
-               u16 devctl;
-
-               pci_read_config_word(us_dev, pos + PCI_EXP_DEVCTL, &devctl);
-               pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL,
-                                     (devctl & ~PCI_EXP_DEVCTL_CERE));
-
-               e1000_power_off(pdev, sleep, wake);
-
-               pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL, devctl);
-       } else {
-               e1000_power_off(pdev, sleep, wake);
-       }
-}
-
-#ifdef CONFIG_PCIEASPM
-static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
-{
-       pci_disable_link_state_locked(pdev, state);
-}
-#else
-static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
-{
-       int pos;
-       u16 reg16;
-
-       /*
-        * Both device and parent should have the same ASPM setting.
-        * Disable ASPM in downstream component first and then upstream.
-        */
-       pos = pci_pcie_cap(pdev);
-       pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &reg16);
-       reg16 &= ~state;
-       pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);
-
-       if (!pdev->bus->self)
-               return;
-
-       pos = pci_pcie_cap(pdev->bus->self);
-       pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, &reg16);
-       reg16 &= ~state;
-       pci_write_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, reg16);
-}
-#endif
-static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
-{
-       dev_info(&pdev->dev, "Disabling ASPM %s %s\n",
-                (state & PCIE_LINK_STATE_L0S) ? "L0s" : "",
-                (state & PCIE_LINK_STATE_L1) ? "L1" : "");
-
-       __e1000e_disable_aspm(pdev, state);
-}
-
-#ifdef CONFIG_PM
-static bool e1000e_pm_ready(struct e1000_adapter *adapter)
-{
-       return !!adapter->tx_ring->buffer_info;
-}
-
-static int __e1000_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 aspm_disable_flag = 0;
-       u32 err;
-
-       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L0S)
-               aspm_disable_flag = PCIE_LINK_STATE_L0S;
-       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1)
-               aspm_disable_flag |= PCIE_LINK_STATE_L1;
-       if (aspm_disable_flag)
-               e1000e_disable_aspm(pdev, aspm_disable_flag);
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       pci_save_state(pdev);
-
-       e1000e_set_interrupt_capability(adapter);
-       if (netif_running(netdev)) {
-               err = e1000_request_irq(adapter);
-               if (err)
-                       return err;
-       }
-
-       if (hw->mac.type == e1000_pch2lan)
-               e1000_resume_workarounds_pchlan(&adapter->hw);
-
-       e1000e_power_up_phy(adapter);
-
-       /* report the system wakeup cause from S3/S4 */
-       if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) {
-               u16 phy_data;
-
-               e1e_rphy(&adapter->hw, BM_WUS, &phy_data);
-               if (phy_data) {
-                       e_info("PHY Wakeup cause - %s\n",
-                               phy_data & E1000_WUS_EX ? "Unicast Packet" :
-                               phy_data & E1000_WUS_MC ? "Multicast Packet" :
-                               phy_data & E1000_WUS_BC ? "Broadcast Packet" :
-                               phy_data & E1000_WUS_MAG ? "Magic Packet" :
-                               phy_data & E1000_WUS_LNKC ? "Link Status "
-                               " Change" : "other");
-               }
-               e1e_wphy(&adapter->hw, BM_WUS, ~0);
-       } else {
-               u32 wus = er32(WUS);
-               if (wus) {
-                       e_info("MAC Wakeup cause - %s\n",
-                               wus & E1000_WUS_EX ? "Unicast Packet" :
-                               wus & E1000_WUS_MC ? "Multicast Packet" :
-                               wus & E1000_WUS_BC ? "Broadcast Packet" :
-                               wus & E1000_WUS_MAG ? "Magic Packet" :
-                               wus & E1000_WUS_LNKC ? "Link Status Change" :
-                               "other");
-               }
-               ew32(WUS, ~0);
-       }
-
-       e1000e_reset(adapter);
-
-       e1000_init_manageability_pt(adapter);
-
-       if (netif_running(netdev))
-               e1000e_up(adapter);
-
-       netif_device_attach(netdev);
-
-       /*
-        * If the controller has AMT, do not set DRV_LOAD until the interface
-        * is up.  For all other cases, let the f/w know that the h/w is now
-        * under the control of the driver.
-        */
-       if (!(adapter->flags & FLAG_HAS_AMT))
-               e1000e_get_hw_control(adapter);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int e1000_suspend(struct device *dev)
-{
-       struct pci_dev *pdev = to_pci_dev(dev);
-       int retval;
-       bool wake;
-
-       retval = __e1000_shutdown(pdev, &wake, false);
-       if (!retval)
-               e1000_complete_shutdown(pdev, true, wake);
-
-       return retval;
-}
-
-static int e1000_resume(struct device *dev)
-{
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (e1000e_pm_ready(adapter))
-               adapter->idle_check = true;
-
-       return __e1000_resume(pdev);
-}
-#endif /* CONFIG_PM_SLEEP */
-
-#ifdef CONFIG_PM_RUNTIME
-static int e1000_runtime_suspend(struct device *dev)
-{
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (e1000e_pm_ready(adapter)) {
-               bool wake;
-
-               __e1000_shutdown(pdev, &wake, true);
-       }
-
-       return 0;
-}
-
-static int e1000_idle(struct device *dev)
-{
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (!e1000e_pm_ready(adapter))
-               return 0;
-
-       if (adapter->idle_check) {
-               adapter->idle_check = false;
-               if (!e1000e_has_link(adapter))
-                       pm_schedule_suspend(dev, MSEC_PER_SEC);
-       }
-
-       return -EBUSY;
-}
-
-static int e1000_runtime_resume(struct device *dev)
-{
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (!e1000e_pm_ready(adapter))
-               return 0;
-
-       adapter->idle_check = !dev->power.runtime_auto;
-       return __e1000_resume(pdev);
-}
-#endif /* CONFIG_PM_RUNTIME */
-#endif /* CONFIG_PM */
-
-static void e1000_shutdown(struct pci_dev *pdev)
-{
-       bool wake = false;
-
-       __e1000_shutdown(pdev, &wake, false);
-
-       if (system_state == SYSTEM_POWER_OFF)
-               e1000_complete_shutdown(pdev, false, wake);
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-
-static irqreturn_t e1000_intr_msix(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       if (adapter->msix_entries) {
-               int vector, msix_irq;
-
-               vector = 0;
-               msix_irq = adapter->msix_entries[vector].vector;
-               disable_irq(msix_irq);
-               e1000_intr_msix_rx(msix_irq, netdev);
-               enable_irq(msix_irq);
-
-               vector++;
-               msix_irq = adapter->msix_entries[vector].vector;
-               disable_irq(msix_irq);
-               e1000_intr_msix_tx(msix_irq, netdev);
-               enable_irq(msix_irq);
-
-               vector++;
-               msix_irq = adapter->msix_entries[vector].vector;
-               disable_irq(msix_irq);
-               e1000_msix_other(msix_irq, netdev);
-               enable_irq(msix_irq);
-       }
-
-       return IRQ_HANDLED;
-}
-
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-static void e1000_netpoll(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       switch (adapter->int_mode) {
-       case E1000E_INT_MODE_MSIX:
-               e1000_intr_msix(adapter->pdev->irq, netdev);
-               break;
-       case E1000E_INT_MODE_MSI:
-               disable_irq(adapter->pdev->irq);
-               e1000_intr_msi(adapter->pdev->irq, netdev);
-               enable_irq(adapter->pdev->irq);
-               break;
-       default: /* E1000E_INT_MODE_LEGACY */
-               disable_irq(adapter->pdev->irq);
-               e1000_intr(adapter->pdev->irq, netdev);
-               enable_irq(adapter->pdev->irq);
-               break;
-       }
-}
-#endif
-
-/**
- * e1000_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
-static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
-                                               pci_channel_state_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (state == pci_channel_io_perm_failure)
-               return PCI_ERS_RESULT_DISCONNECT;
-
-       if (netif_running(netdev))
-               e1000e_down(adapter);
-       pci_disable_device(pdev);
-
-       /* Request a slot slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * e1000_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the e1000_resume routine.
- */
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 aspm_disable_flag = 0;
-       int err;
-       pci_ers_result_t result;
-
-       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L0S)
-               aspm_disable_flag = PCIE_LINK_STATE_L0S;
-       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1)
-               aspm_disable_flag |= PCIE_LINK_STATE_L1;
-       if (aspm_disable_flag)
-               e1000e_disable_aspm(pdev, aspm_disable_flag);
-
-       err = pci_enable_device_mem(pdev);
-       if (err) {
-               dev_err(&pdev->dev,
-                       "Cannot re-enable PCI device after reset.\n");
-               result = PCI_ERS_RESULT_DISCONNECT;
-       } else {
-               pci_set_master(pdev);
-               pdev->state_saved = true;
-               pci_restore_state(pdev);
-
-               pci_enable_wake(pdev, PCI_D3hot, 0);
-               pci_enable_wake(pdev, PCI_D3cold, 0);
-
-               e1000e_reset(adapter);
-               ew32(WUS, ~0);
-               result = PCI_ERS_RESULT_RECOVERED;
-       }
-
-       pci_cleanup_aer_uncorrect_error_status(pdev);
-
-       return result;
-}
-
-/**
- * e1000_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the e1000_resume routine.
- */
-static void e1000_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       e1000_init_manageability_pt(adapter);
-
-       if (netif_running(netdev)) {
-               if (e1000e_up(adapter)) {
-                       dev_err(&pdev->dev,
-                               "can't bring device back up after reset\n");
-                       return;
-               }
-       }
-
-       netif_device_attach(netdev);
-
-       /*
-        * If the controller has AMT, do not set DRV_LOAD until the interface
-        * is up.  For all other cases, let the f/w know that the h/w is now
-        * under the control of the driver.
-        */
-       if (!(adapter->flags & FLAG_HAS_AMT))
-               e1000e_get_hw_control(adapter);
-
-}
-
-static void e1000_print_device_info(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 ret_val;
-       u8 pba_str[E1000_PBANUM_LENGTH];
-
-       /* print bus type/speed/width info */
-       e_info("(PCI Express:2.5GT/s:%s) %pM\n",
-              /* bus width */
-              ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
-               "Width x1"),
-              /* MAC address */
-              netdev->dev_addr);
-       e_info("Intel(R) PRO/%s Network Connection\n",
-              (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
-       ret_val = e1000_read_pba_string_generic(hw, pba_str,
-                                               E1000_PBANUM_LENGTH);
-       if (ret_val)
-               strncpy((char *)pba_str, "Unknown", sizeof(pba_str) - 1);
-       e_info("MAC: %d, PHY: %d, PBA No: %s\n",
-              hw->mac.type, hw->phy.type, pba_str);
-}
-
-static void e1000_eeprom_checks(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int ret_val;
-       u16 buf = 0;
-
-       if (hw->mac.type != e1000_82573)
-               return;
-
-       ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf);
-       if (!ret_val && (!(le16_to_cpu(buf) & (1 << 0)))) {
-               /* Deep Smart Power Down (DSPD) */
-               dev_warn(&adapter->pdev->dev,
-                        "Warning: detected DSPD enabled in EEPROM\n");
-       }
-}
-
-static const struct net_device_ops e1000e_netdev_ops = {
-       .ndo_open               = e1000_open,
-       .ndo_stop               = e1000_close,
-       .ndo_start_xmit         = e1000_xmit_frame,
-       .ndo_get_stats64        = e1000e_get_stats64,
-       .ndo_set_multicast_list = e1000_set_multi,
-       .ndo_set_mac_address    = e1000_set_mac,
-       .ndo_change_mtu         = e1000_change_mtu,
-       .ndo_do_ioctl           = e1000_ioctl,
-       .ndo_tx_timeout         = e1000_tx_timeout,
-       .ndo_validate_addr      = eth_validate_addr,
-
-       .ndo_vlan_rx_add_vid    = e1000_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = e1000_vlan_rx_kill_vid,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = e1000_netpoll,
-#endif
-};
-
-/**
- * e1000_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in e1000_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * e1000_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-static int __devinit e1000_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct e1000_adapter *adapter;
-       struct e1000_hw *hw;
-       const struct e1000_info *ei = e1000_info_tbl[ent->driver_data];
-       resource_size_t mmio_start, mmio_len;
-       resource_size_t flash_start, flash_len;
-
-       static int cards_found;
-       u16 aspm_disable_flag = 0;
-       int i, err, pci_using_dac;
-       u16 eeprom_data = 0;
-       u16 eeprom_apme_mask = E1000_EEPROM_APME;
-
-       if (ei->flags2 & FLAG2_DISABLE_ASPM_L0S)
-               aspm_disable_flag = PCIE_LINK_STATE_L0S;
-       if (ei->flags2 & FLAG2_DISABLE_ASPM_L1)
-               aspm_disable_flag |= PCIE_LINK_STATE_L1;
-       if (aspm_disable_flag)
-               e1000e_disable_aspm(pdev, aspm_disable_flag);
-
-       err = pci_enable_device_mem(pdev);
-       if (err)
-               return err;
-
-       pci_using_dac = 0;
-       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
-       if (!err) {
-               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-               if (!err)
-                       pci_using_dac = 1;
-       } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-               if (err) {
-                       err = dma_set_coherent_mask(&pdev->dev,
-                                                   DMA_BIT_MASK(32));
-                       if (err) {
-                               dev_err(&pdev->dev, "No usable DMA "
-                                       "configuration, aborting\n");
-                               goto err_dma;
-                       }
-               }
-       }
-
-       err = pci_request_selected_regions_exclusive(pdev,
-                                         pci_select_bars(pdev, IORESOURCE_MEM),
-                                         e1000e_driver_name);
-       if (err)
-               goto err_pci_reg;
-
-       /* AER (Advanced Error Reporting) hooks */
-       pci_enable_pcie_error_reporting(pdev);
-
-       pci_set_master(pdev);
-       /* PCI config space info */
-       err = pci_save_state(pdev);
-       if (err)
-               goto err_alloc_etherdev;
-
-       err = -ENOMEM;
-       netdev = alloc_etherdev(sizeof(struct e1000_adapter));
-       if (!netdev)
-               goto err_alloc_etherdev;
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       netdev->irq = pdev->irq;
-
-       pci_set_drvdata(pdev, netdev);
-       adapter = netdev_priv(netdev);
-       hw = &adapter->hw;
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       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 = ei->max_hw_frame_size;
-       adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
-
-       mmio_start = pci_resource_start(pdev, 0);
-       mmio_len = pci_resource_len(pdev, 0);
-
-       err = -EIO;
-       adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
-       if (!adapter->hw.hw_addr)
-               goto err_ioremap;
-
-       if ((adapter->flags & FLAG_HAS_FLASH) &&
-           (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-               flash_start = pci_resource_start(pdev, 1);
-               flash_len = pci_resource_len(pdev, 1);
-               adapter->hw.flash_address = ioremap(flash_start, flash_len);
-               if (!adapter->hw.flash_address)
-                       goto err_flashmap;
-       }
-
-       /* construct the net_device struct */
-       netdev->netdev_ops              = &e1000e_netdev_ops;
-       e1000e_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo          = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       netdev->mem_start = mmio_start;
-       netdev->mem_end = mmio_start + mmio_len;
-
-       adapter->bd_number = cards_found++;
-
-       e1000e_check_options(adapter);
-
-       /* setup adapter struct */
-       err = e1000_sw_init(adapter);
-       if (err)
-               goto err_sw_init;
-
-       memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
-       memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
-       memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
-
-       err = ei->get_variants(adapter);
-       if (err)
-               goto err_hw_init;
-
-       if ((adapter->flags & FLAG_IS_ICH) &&
-           (adapter->flags & FLAG_READ_ONLY_NVM))
-               e1000e_write_protect_nvm_ich8lan(&adapter->hw);
-
-       hw->mac.ops.get_bus_info(&adapter->hw);
-
-       adapter->hw.phy.autoneg_wait_to_complete = 0;
-
-       /* 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;
-       }
-
-       if (e1000_check_reset_block(&adapter->hw))
-               e_info("PHY reset is blocked due to SOL/IDER session.\n");
-
-       netdev->features = NETIF_F_SG |
-                          NETIF_F_HW_CSUM |
-                          NETIF_F_HW_VLAN_TX |
-                          NETIF_F_HW_VLAN_RX;
-
-       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
-               netdev->features |= NETIF_F_HW_VLAN_FILTER;
-
-       netdev->features |= NETIF_F_TSO;
-       netdev->features |= NETIF_F_TSO6;
-
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_TSO6;
-       netdev->vlan_features |= NETIF_F_HW_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
-
-       if (pci_using_dac) {
-               netdev->features |= NETIF_F_HIGHDMA;
-               netdev->vlan_features |= NETIF_F_HIGHDMA;
-       }
-
-       if (e1000e_enable_mng_pass_thru(&adapter->hw))
-               adapter->flags |= FLAG_MNG_PT_ENABLED;
-
-       /*
-        * 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 (e1000_validate_nvm_checksum(&adapter->hw) >= 0)
-                       break;
-               if (i == 2) {
-                       e_err("The NVM Checksum Is Not Valid\n");
-                       err = -EIO;
-                       goto err_eeprom;
-               }
-       }
-
-       e1000_eeprom_checks(adapter);
-
-       /* copy the MAC address */
-       if (e1000e_read_mac_addr(&adapter->hw))
-               e_err("NVM Read Error while reading MAC address\n");
-
-       memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
-       memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->perm_addr)) {
-               e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       init_timer(&adapter->watchdog_timer);
-       adapter->watchdog_timer.function = e1000_watchdog;
-       adapter->watchdog_timer.data = (unsigned long) adapter;
-
-       init_timer(&adapter->phy_info_timer);
-       adapter->phy_info_timer.function = e1000_update_phy_info;
-       adapter->phy_info_timer.data = (unsigned long) adapter;
-
-       INIT_WORK(&adapter->reset_task, e1000_reset_task);
-       INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
-       INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround);
-       INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task);
-       INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang);
-
-       /* Initialize link parameters. User can change them with ethtool */
-       adapter->hw.mac.autoneg = 1;
-       adapter->fc_autoneg = 1;
-       adapter->hw.fc.requested_mode = e1000_fc_default;
-       adapter->hw.fc.current_mode = e1000_fc_default;
-       adapter->hw.phy.autoneg_advertised = 0x2f;
-
-       /* ring size defaults */
-       adapter->rx_ring->count = 256;
-       adapter->tx_ring->count = 256;
-
-       /*
-        * Initial Wake on LAN setting - If APM wake is enabled in
-        * the EEPROM, enable the ACPI Magic Packet filter
-        */
-       if (adapter->flags & FLAG_APME_IN_WUC) {
-               /* APME bit in EEPROM is mapped to WUC.APME */
-               eeprom_data = er32(WUC);
-               eeprom_apme_mask = E1000_WUC_APME;
-               if ((hw->mac.type > e1000_ich10lan) &&
-                   (eeprom_data & E1000_WUC_PHY_WAKE))
-                       adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP;
-       } else if (adapter->flags & FLAG_APME_IN_CTRL3) {
-               if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
-                   (adapter->hw.bus.func == 1))
-                       e1000_read_nvm(&adapter->hw,
-                               NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
-               else
-                       e1000_read_nvm(&adapter->hw,
-                               NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
-       }
-
-       /* fetch WoL from EEPROM */
-       if (eeprom_data & eeprom_apme_mask)
-               adapter->eeprom_wol |= E1000_WUFC_MAG;
-
-       /*
-        * now that we have the eeprom settings, apply the special cases
-        * where the eeprom may be wrong or the board simply won't support
-        * wake on lan on a particular port
-        */
-       if (!(adapter->flags & FLAG_HAS_WOL))
-               adapter->eeprom_wol = 0;
-
-       /* initialize the wol settings based on the eeprom settings */
-       adapter->wol = adapter->eeprom_wol;
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       /* save off EEPROM version number */
-       e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);
-
-       /* reset the hardware with the new settings */
-       e1000e_reset(adapter);
-
-       /*
-        * If the controller has AMT, do not set DRV_LOAD until the interface
-        * is up.  For all other cases, let the f/w know that the h/w is now
-        * under the control of the driver.
-        */
-       if (!(adapter->flags & FLAG_HAS_AMT))
-               e1000e_get_hw_control(adapter);
-
-       strncpy(netdev->name, "eth%d", sizeof(netdev->name) - 1);
-       err = register_netdev(netdev);
-       if (err)
-               goto err_register;
-
-       /* carrier off reporting is important to ethtool even BEFORE open */
-       netif_carrier_off(netdev);
-
-       e1000_print_device_info(adapter);
-
-       if (pci_dev_run_wake(pdev))
-               pm_runtime_put_noidle(&pdev->dev);
-
-       return 0;
-
-err_register:
-       if (!(adapter->flags & FLAG_HAS_AMT))
-               e1000e_release_hw_control(adapter);
-err_eeprom:
-       if (!e1000_check_reset_block(&adapter->hw))
-               e1000_phy_hw_reset(&adapter->hw);
-err_hw_init:
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-err_sw_init:
-       if (adapter->hw.flash_address)
-               iounmap(adapter->hw.flash_address);
-       e1000e_reset_interrupt_capability(adapter);
-err_flashmap:
-       iounmap(adapter->hw.hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_selected_regions(pdev,
-                                    pci_select_bars(pdev, IORESOURCE_MEM));
-err_pci_reg:
-err_dma:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * e1000_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * e1000_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-static void __devexit e1000_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       bool down = test_bit(__E1000_DOWN, &adapter->state);
-
-       /*
-        * The timers may be rescheduled, so explicitly disable them
-        * from being rescheduled.
-        */
-       if (!down)
-               set_bit(__E1000_DOWN, &adapter->state);
-       del_timer_sync(&adapter->watchdog_timer);
-       del_timer_sync(&adapter->phy_info_timer);
-
-       cancel_work_sync(&adapter->reset_task);
-       cancel_work_sync(&adapter->watchdog_task);
-       cancel_work_sync(&adapter->downshift_task);
-       cancel_work_sync(&adapter->update_phy_task);
-       cancel_work_sync(&adapter->print_hang_task);
-
-       if (!(netdev->flags & IFF_UP))
-               e1000_power_down_phy(adapter);
-
-       /* Don't lie to e1000_close() down the road. */
-       if (!down)
-               clear_bit(__E1000_DOWN, &adapter->state);
-       unregister_netdev(netdev);
-
-       if (pci_dev_run_wake(pdev))
-               pm_runtime_get_noresume(&pdev->dev);
-
-       /*
-        * Release control of h/w to f/w.  If f/w is AMT enabled, this
-        * would have already happened in close and is redundant.
-        */
-       e1000e_release_hw_control(adapter);
-
-       e1000e_reset_interrupt_capability(adapter);
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-
-       iounmap(adapter->hw.hw_addr);
-       if (adapter->hw.flash_address)
-               iounmap(adapter->hw.flash_address);
-       pci_release_selected_regions(pdev,
-                                    pci_select_bars(pdev, IORESOURCE_MEM));
-
-       free_netdev(netdev);
-
-       /* AER disable */
-       pci_disable_pcie_error_reporting(pdev);
-
-       pci_disable_device(pdev);
-}
-
-/* PCI Error Recovery (ERS) */
-static struct pci_error_handlers e1000_err_handler = {
-       .error_detected = e1000_io_error_detected,
-       .slot_reset = e1000_io_slot_reset,
-       .resume = e1000_io_resume,
-};
-
-static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_COPPER), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_FIBER), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER_LP), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_FIBER), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_DUAL), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_QUAD), board_82571 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571PT_QUAD_COPPER), board_82571 },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI), board_82572 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_COPPER), board_82572 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_FIBER), board_82572 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_SERDES), board_82572 },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E), board_82573 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT), board_82573 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L), board_82573 },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82574L), board_82574 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82574LA), board_82574 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82583V), board_82583 },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_DPT),
-         board_80003es2lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),
-         board_80003es2lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_DPT),
-         board_80003es2lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_SPT),
-         board_80003es2lan },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE), board_ich8lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_G), board_ich8lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_GT), board_ich8lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_AMT), board_ich8lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_C), board_ich8lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M), board_ich8lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M_AMT), board_ich8lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_82567V_3), board_ich8lan },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_V), board_ich9lan },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM), board_ich10lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF), board_ich10lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_V), board_ich10lan },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LM), board_pchlan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LC), board_pchlan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DM), board_pchlan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DC), board_pchlan },
-
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
-
-       { }     /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
-
-#ifdef CONFIG_PM
-static const struct dev_pm_ops e1000_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
-       SET_RUNTIME_PM_OPS(e1000_runtime_suspend,
-                               e1000_runtime_resume, e1000_idle)
-};
-#endif
-
-/* PCI Device API Driver */
-static struct pci_driver e1000_driver = {
-       .name     = e1000e_driver_name,
-       .id_table = e1000_pci_tbl,
-       .probe    = e1000_probe,
-       .remove   = __devexit_p(e1000_remove),
-#ifdef CONFIG_PM
-       .driver.pm = &e1000_pm_ops,
-#endif
-       .shutdown = e1000_shutdown,
-       .err_handler = &e1000_err_handler
-};
-
-/**
- * e1000_init_module - Driver Registration Routine
- *
- * e1000_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-static int __init e1000_init_module(void)
-{
-       int ret;
-       pr_info("Intel(R) PRO/1000 Network Driver - %s\n",
-               e1000e_driver_version);
-       pr_info("Copyright(c) 1999 - 2011 Intel Corporation.\n");
-       ret = pci_register_driver(&e1000_driver);
-
-       return ret;
-}
-module_init(e1000_init_module);
-
-/**
- * e1000_exit_module - Driver Exit Cleanup Routine
- *
- * e1000_exit_module is called just before the driver is removed
- * from memory.
- **/
-static void __exit e1000_exit_module(void)
-{
-       pci_unregister_driver(&e1000_driver);
-}
-module_exit(e1000_exit_module);
-
-
-MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
-MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-/* e1000_main.c */
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
deleted file mode 100644 (file)
index 4dd9b63..0000000
+++ /dev/null
@@ -1,478 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/netdevice.h>
-#include <linux/pci.h>
-
-#include "e1000.h"
-
-/*
- * This is the only thing that needs to be changed to adjust the
- * maximum number of ports that the driver can manage.
- */
-
-#define E1000_MAX_NIC 32
-
-#define OPTION_UNSET   -1
-#define OPTION_DISABLED 0
-#define OPTION_ENABLED  1
-
-#define COPYBREAK_DEFAULT 256
-unsigned int copybreak = COPYBREAK_DEFAULT;
-module_param(copybreak, uint, 0644);
-MODULE_PARM_DESC(copybreak,
-       "Maximum size of packet that is copied to a new buffer on receive");
-
-/*
- * All parameters are treated the same, as an integer array of values.
- * This macro just reduces the need to repeat the same declaration code
- * over and over (plus this helps to avoid typo bugs).
- */
-
-#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
-#define E1000_PARAM(X, desc)                                   \
-       static int __devinitdata X[E1000_MAX_NIC+1]             \
-               = E1000_PARAM_INIT;                             \
-       static unsigned int num_##X;                            \
-       module_param_array_named(X, X, int, &num_##X, 0);       \
-       MODULE_PARM_DESC(X, desc);
-
-/*
- * Transmit Interrupt Delay in units of 1.024 microseconds
- * Tx interrupt delay needs to typically be set to something non-zero
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(TxIntDelay, "Transmit Interrupt Delay");
-#define DEFAULT_TIDV 8
-#define MAX_TXDELAY 0xFFFF
-#define MIN_TXDELAY 0
-
-/*
- * Transmit Absolute Interrupt Delay in units of 1.024 microseconds
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(TxAbsIntDelay, "Transmit Absolute Interrupt Delay");
-#define DEFAULT_TADV 32
-#define MAX_TXABSDELAY 0xFFFF
-#define MIN_TXABSDELAY 0
-
-/*
- * Receive Interrupt Delay in units of 1.024 microseconds
- * hardware will likely hang if you set this to anything but zero.
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(RxIntDelay, "Receive Interrupt Delay");
-#define MAX_RXDELAY 0xFFFF
-#define MIN_RXDELAY 0
-
-/*
- * Receive Absolute Interrupt Delay in units of 1.024 microseconds
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
-#define MAX_RXABSDELAY 0xFFFF
-#define MIN_RXABSDELAY 0
-
-/*
- * Interrupt Throttle Rate (interrupts/sec)
- *
- * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
- */
-E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
-#define DEFAULT_ITR 3
-#define MAX_ITR 100000
-#define MIN_ITR 100
-
-/* IntMode (Interrupt Mode)
- *
- * Valid Range: 0 - 2
- *
- * Default Value: 2 (MSI-X)
- */
-E1000_PARAM(IntMode, "Interrupt Mode");
-#define MAX_INTMODE    2
-#define MIN_INTMODE    0
-
-/*
- * Enable Smart Power Down of the PHY
- *
- * Valid Range: 0, 1
- *
- * Default Value: 0 (disabled)
- */
-E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
-
-/*
- * Enable Kumeran Lock Loss workaround
- *
- * Valid Range: 0, 1
- *
- * Default Value: 1 (enabled)
- */
-E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");
-
-/*
- * Write Protect NVM
- *
- * Valid Range: 0, 1
- *
- * Default Value: 1 (enabled)
- */
-E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
-
-/*
- * Enable CRC Stripping
- *
- * Valid Range: 0, 1
- *
- * Default Value: 1 (enabled)
- */
-E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
-                          "the CRC");
-
-struct e1000_option {
-       enum { enable_option, range_option, list_option } type;
-       const char *name;
-       const char *err;
-       int def;
-       union {
-               struct { /* range_option info */
-                       int min;
-                       int max;
-               } r;
-               struct { /* list_option info */
-                       int nr;
-                       struct e1000_opt_list { int i; char *str; } *p;
-               } l;
-       } arg;
-};
-
-static int __devinit e1000_validate_option(unsigned int *value,
-                                          const struct e1000_option *opt,
-                                          struct e1000_adapter *adapter)
-{
-       if (*value == OPTION_UNSET) {
-               *value = opt->def;
-               return 0;
-       }
-
-       switch (opt->type) {
-       case enable_option:
-               switch (*value) {
-               case OPTION_ENABLED:
-                       e_info("%s Enabled\n", opt->name);
-                       return 0;
-               case OPTION_DISABLED:
-                       e_info("%s Disabled\n", opt->name);
-                       return 0;
-               }
-               break;
-       case range_option:
-               if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
-                       e_info("%s set to %i\n", opt->name, *value);
-                       return 0;
-               }
-               break;
-       case list_option: {
-               int i;
-               struct e1000_opt_list *ent;
-
-               for (i = 0; i < opt->arg.l.nr; i++) {
-                       ent = &opt->arg.l.p[i];
-                       if (*value == ent->i) {
-                               if (ent->str[0] != '\0')
-                                       e_info("%s\n", ent->str);
-                               return 0;
-                       }
-               }
-       }
-               break;
-       default:
-               BUG();
-       }
-
-       e_info("Invalid %s value specified (%i) %s\n", opt->name, *value,
-              opt->err);
-       *value = opt->def;
-       return -1;
-}
-
-/**
- * e1000e_check_options - Range Checking for Command Line Parameters
- * @adapter: board private structure
- *
- * This routine checks all command line parameters for valid user
- * input.  If an invalid value is given, or if no user specified
- * value exists, a default value is used.  The final value is stored
- * in a variable in the adapter structure.
- **/
-void __devinit e1000e_check_options(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int bd = adapter->bd_number;
-
-       if (bd >= E1000_MAX_NIC) {
-               e_notice("Warning: no configuration for board #%i\n", bd);
-               e_notice("Using defaults for all values\n");
-       }
-
-       { /* Transmit Interrupt Delay */
-               static const struct e1000_option opt = {
-                       .type = range_option,
-                       .name = "Transmit Interrupt Delay",
-                       .err  = "using default of "
-                               __MODULE_STRING(DEFAULT_TIDV),
-                       .def  = DEFAULT_TIDV,
-                       .arg  = { .r = { .min = MIN_TXDELAY,
-                                        .max = MAX_TXDELAY } }
-               };
-
-               if (num_TxIntDelay > bd) {
-                       adapter->tx_int_delay = TxIntDelay[bd];
-                       e1000_validate_option(&adapter->tx_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->tx_int_delay = opt.def;
-               }
-       }
-       { /* Transmit Absolute Interrupt Delay */
-               static const struct e1000_option opt = {
-                       .type = range_option,
-                       .name = "Transmit Absolute Interrupt Delay",
-                       .err  = "using default of "
-                               __MODULE_STRING(DEFAULT_TADV),
-                       .def  = DEFAULT_TADV,
-                       .arg  = { .r = { .min = MIN_TXABSDELAY,
-                                        .max = MAX_TXABSDELAY } }
-               };
-
-               if (num_TxAbsIntDelay > bd) {
-                       adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-                       e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->tx_abs_int_delay = opt.def;
-               }
-       }
-       { /* Receive Interrupt Delay */
-               static struct e1000_option opt = {
-                       .type = range_option,
-                       .name = "Receive Interrupt Delay",
-                       .err  = "using default of "
-                               __MODULE_STRING(DEFAULT_RDTR),
-                       .def  = DEFAULT_RDTR,
-                       .arg  = { .r = { .min = MIN_RXDELAY,
-                                        .max = MAX_RXDELAY } }
-               };
-
-               if (num_RxIntDelay > bd) {
-                       adapter->rx_int_delay = RxIntDelay[bd];
-                       e1000_validate_option(&adapter->rx_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->rx_int_delay = opt.def;
-               }
-       }
-       { /* Receive Absolute Interrupt Delay */
-               static const struct e1000_option opt = {
-                       .type = range_option,
-                       .name = "Receive Absolute Interrupt Delay",
-                       .err  = "using default of "
-                               __MODULE_STRING(DEFAULT_RADV),
-                       .def  = DEFAULT_RADV,
-                       .arg  = { .r = { .min = MIN_RXABSDELAY,
-                                        .max = MAX_RXABSDELAY } }
-               };
-
-               if (num_RxAbsIntDelay > bd) {
-                       adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-                       e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->rx_abs_int_delay = opt.def;
-               }
-       }
-       { /* Interrupt Throttling Rate */
-               static const struct e1000_option opt = {
-                       .type = range_option,
-                       .name = "Interrupt Throttling Rate (ints/sec)",
-                       .err  = "using default of "
-                               __MODULE_STRING(DEFAULT_ITR),
-                       .def  = DEFAULT_ITR,
-                       .arg  = { .r = { .min = MIN_ITR,
-                                        .max = MAX_ITR } }
-               };
-
-               if (num_InterruptThrottleRate > bd) {
-                       adapter->itr = InterruptThrottleRate[bd];
-                       switch (adapter->itr) {
-                       case 0:
-                               e_info("%s turned off\n", opt.name);
-                               break;
-                       case 1:
-                               e_info("%s set to dynamic mode\n", opt.name);
-                               adapter->itr_setting = adapter->itr;
-                               adapter->itr = 20000;
-                               break;
-                       case 3:
-                               e_info("%s set to dynamic conservative mode\n",
-                                       opt.name);
-                               adapter->itr_setting = adapter->itr;
-                               adapter->itr = 20000;
-                               break;
-                       case 4:
-                               e_info("%s set to simplified (2000-8000 ints) "
-                                      "mode\n", opt.name);
-                               adapter->itr_setting = 4;
-                               break;
-                       default:
-                               /*
-                                * Save the setting, because the dynamic bits
-                                * change itr.
-                                */
-                               if (e1000_validate_option(&adapter->itr, &opt,
-                                                         adapter) &&
-                                   (adapter->itr == 3)) {
-                                       /*
-                                        * In case of invalid user value,
-                                        * default to conservative mode.
-                                        */
-                                       adapter->itr_setting = adapter->itr;
-                                       adapter->itr = 20000;
-                               } else {
-                                       /*
-                                        * Clear the lower two bits because
-                                        * they are used as control.
-                                        */
-                                       adapter->itr_setting =
-                                               adapter->itr & ~3;
-                               }
-                               break;
-                       }
-               } else {
-                       adapter->itr_setting = opt.def;
-                       adapter->itr = 20000;
-               }
-       }
-       { /* Interrupt Mode */
-               static struct e1000_option opt = {
-                       .type = range_option,
-                       .name = "Interrupt Mode",
-                       .err  = "defaulting to 2 (MSI-X)",
-                       .def  = E1000E_INT_MODE_MSIX,
-                       .arg  = { .r = { .min = MIN_INTMODE,
-                                        .max = MAX_INTMODE } }
-               };
-
-               if (num_IntMode > bd) {
-                       unsigned int int_mode = IntMode[bd];
-                       e1000_validate_option(&int_mode, &opt, adapter);
-                       adapter->int_mode = int_mode;
-               } else {
-                       adapter->int_mode = opt.def;
-               }
-       }
-       { /* Smart Power Down */
-               static const struct e1000_option opt = {
-                       .type = enable_option,
-                       .name = "PHY Smart Power Down",
-                       .err  = "defaulting to Disabled",
-                       .def  = OPTION_DISABLED
-               };
-
-               if (num_SmartPowerDownEnable > bd) {
-                       unsigned int spd = SmartPowerDownEnable[bd];
-                       e1000_validate_option(&spd, &opt, adapter);
-                       if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN)
-                           && spd)
-                               adapter->flags |= FLAG_SMART_POWER_DOWN;
-               }
-       }
-       { /* CRC Stripping */
-               static const struct e1000_option opt = {
-                       .type = enable_option,
-                       .name = "CRC Stripping",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (num_CrcStripping > bd) {
-                       unsigned int crc_stripping = CrcStripping[bd];
-                       e1000_validate_option(&crc_stripping, &opt, adapter);
-                       if (crc_stripping == OPTION_ENABLED)
-                               adapter->flags2 |= FLAG2_CRC_STRIPPING;
-               } else {
-                       adapter->flags2 |= FLAG2_CRC_STRIPPING;
-               }
-       }
-       { /* Kumeran Lock Loss Workaround */
-               static const struct e1000_option opt = {
-                       .type = enable_option,
-                       .name = "Kumeran Lock Loss Workaround",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (num_KumeranLockLoss > bd) {
-                       unsigned int kmrn_lock_loss = KumeranLockLoss[bd];
-                       e1000_validate_option(&kmrn_lock_loss, &opt, adapter);
-                       if (hw->mac.type == e1000_ich8lan)
-                               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
-                                                               kmrn_lock_loss);
-               } else {
-                       if (hw->mac.type == e1000_ich8lan)
-                               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
-                                                                      opt.def);
-               }
-       }
-       { /* Write-protect NVM */
-               static const struct e1000_option opt = {
-                       .type = enable_option,
-                       .name = "Write-protect NVM",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (adapter->flags & FLAG_IS_ICH) {
-                       if (num_WriteProtectNVM > bd) {
-                               unsigned int write_protect_nvm = WriteProtectNVM[bd];
-                               e1000_validate_option(&write_protect_nvm, &opt,
-                                                     adapter);
-                               if (write_protect_nvm)
-                                       adapter->flags |= FLAG_READ_ONLY_NVM;
-                       } else {
-                               if (opt.def)
-                                       adapter->flags |= FLAG_READ_ONLY_NVM;
-                       }
-               }
-       }
-}
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
deleted file mode 100644 (file)
index 8666476..0000000
+++ /dev/null
@@ -1,3377 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/delay.h>
-
-#include "e1000.h"
-
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
-static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
-static s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active);
-static s32 e1000_wait_autoneg(struct e1000_hw *hw);
-static u32 e1000_get_phy_addr_for_bm_page(u32 page, u32 reg);
-static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
-                                         u16 *data, bool read, bool page_set);
-static u32 e1000_get_phy_addr_for_hv_page(u32 page);
-static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
-                                          u16 *data, bool read);
-
-/* 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 \
-               ARRAY_SIZE(e1000_m88_cable_length_table)
-
-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 \
-               ARRAY_SIZE(e1000_igp_2_cable_length_table)
-
-#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_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
-
-/* 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 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
-
-/**
- *  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 0, 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 : 0;
-}
-
-/**
- *  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 = 0;
-       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;
-
-               retry_count++;
-       }
-out:
-       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;
-
-       ret_val = e1e_wphy(hw, M88E1000_PHY_GEN_CONTROL, 0xC1);
-       if (ret_val)
-               return ret_val;
-
-       return e1e_wphy(hw, M88E1000_PHY_GEN_CONTROL, 0);
-}
-
-/**
- *  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;
-
-       if (offset > MAX_PHY_REG_ADDRESS) {
-               e_dbg("PHY Address %d is out of range\n", offset);
-               return -E1000_ERR_PARAM;
-       }
-
-       /*
-        * 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");
-               return -E1000_ERR_PHY;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               e_dbg("MDI Error\n");
-               return -E1000_ERR_PHY;
-       }
-       *data = (u16) mdic;
-
-       /*
-        * Allow some time after each MDIC transaction to avoid
-        * reading duplicate data in the next MDIC transaction.
-        */
-       if (hw->mac.type == e1000_pch2lan)
-               udelay(100);
-
-       return 0;
-}
-
-/**
- *  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;
-
-       if (offset > MAX_PHY_REG_ADDRESS) {
-               e_dbg("PHY Address %d is out of range\n", offset);
-               return -E1000_ERR_PARAM;
-       }
-
-       /*
-        * 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");
-               return -E1000_ERR_PHY;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               e_dbg("MDI Error\n");
-               return -E1000_ERR_PHY;
-       }
-
-       /*
-        * Allow some time after each MDIC transaction to avoid
-        * reading duplicate data in the next MDIC transaction.
-        */
-       if (hw->mac.type == e1000_pch2lan)
-               udelay(100);
-
-       return 0;
-}
-
-/**
- *  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;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-       hw->phy.ops.release(hw);
-
-       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;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                           data);
-
-       hw->phy.ops.release(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_set_page_igp - Set page as on IGP-like PHY(s)
- *  @hw: pointer to the HW structure
- *  @page: page to set (shifted left when necessary)
- *
- *  Sets PHY page required for PHY register access.  Assumes semaphore is
- *  already acquired.  Note, this function sets phy.addr to 1 so the caller
- *  must set it appropriately (if necessary) after this function returns.
- **/
-s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page)
-{
-       e_dbg("Setting page 0x%x\n", page);
-
-       hw->phy.addr = 1;
-
-       return e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, page);
-}
-
-/**
- *  __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 = 0;
-
-       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 = 0;
-
-       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);
-}
-
-/**
- *  __e1000_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 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
-                                 bool locked)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = 0;
-
-       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);
-       e1e_flush();
-
-       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 __e1000_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 __e1000_read_kmrn_reg(hw, offset, data, true);
-}
-
-/**
- *  __e1000_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 __e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
-                                  bool locked)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = 0;
-
-       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);
-       e1e_flush();
-
-       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 __e1000_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 __e1000_write_kmrn_reg(hw, offset, data, true);
-}
-
-/**
- *  e1000_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 e1000_copper_link_setup_82577(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 phy_data;
-
-       /* 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;
-
-       /* 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)
-               return ret_val;
-
-       /* 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)
-               return ret_val;
-
-       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)
-                       return ret_val;
-
-               phy_data |= M88E1000_EPSCR_TX_CLK_25;
-
-               if ((phy->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)
-                       return ret_val;
-       }
-
-       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)
-                       return ret_val;
-
-               /* Set PHY page 0, register 30 to 0x0000 */
-               ret_val = e1e_wphy(hw, 30, 0x0000);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* Commit the changes. */
-       ret_val = e1000e_commit_phy(hw);
-       if (ret_val) {
-               e_dbg("Error committing the PHY changes\n");
-               return ret_val;
-       }
-
-       if (phy->type == e1000_phy_82578) {
-               ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               /* 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)
-                       return ret_val;
-       }
-
-       return 0;
-}
-
-/**
- *  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;
-
-       ret_val = e1000_phy_hw_reset(hw);
-       if (ret_val) {
-               e_dbg("Error resetting the PHY.\n");
-               return ret_val;
-       }
-
-       /*
-        * Wait 100ms for MAC to configure PHY from NVM settings, to avoid
-        * timeout issues when LFS is enabled.
-        */
-       msleep(100);
-
-       /* disable lplu d0 during driver init */
-       ret_val = e1000_set_d0_lplu_state(hw, false);
-       if (ret_val) {
-               e_dbg("Error Disabling LPLU D0\n");
-               return ret_val;
-       }
-       /* Configure mdi-mdix settings */
-       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CTRL, &data);
-       if (ret_val)
-               return ret_val;
-
-       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)
-               return ret_val;
-
-       /* 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)
-                               return ret_val;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-
-                       /* Set auto Master/Slave resolution process */
-                       ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
-                       if (ret_val)
-                               return ret_val;
-
-                       data &= ~CR_1000T_MS_ENABLE;
-                       ret_val = e1e_wphy(hw, PHY_1000T_CTRL, data);
-                       if (ret_val)
-                               return ret_val;
-               }
-
-               ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
-               if (ret_val)
-                       return ret_val;
-
-               /* 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);
-       }
-
-       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.
- **/
-static 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;
-
-       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)
-               return ret_val;
-
-       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)
-                       return ret_val;
-       }
-
-       /*
-        * 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;
-               return ret_val;
-       }
-
-       ret_val = e1e_wphy(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
-       if (ret_val)
-               return ret_val;
-
-       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);
-
-       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.
- **/
-static s32 e1000_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 = e1000_phy_setup_autoneg(hw);
-       if (ret_val) {
-               e_dbg("Error Setting up Auto-Negotiation\n");
-               return ret_val;
-       }
-       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)
-               return ret_val;
-
-       phy_ctrl |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               return ret_val;
-
-       /*
-        * 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 = e1000_wait_autoneg(hw);
-               if (ret_val) {
-                       e_dbg("Error while waiting for "
-                                "autoneg to complete\n");
-                       return ret_val;
-               }
-       }
-
-       hw->mac.get_link_status = 1;
-
-       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 = e1000_copper_link_autoneg(hw);
-               if (ret_val)
-                       return ret_val;
-       } else {
-               /*
-                * PHY will be set to 10H, 10F, 100H or 100F
-                * depending on user settings.
-                */
-               e_dbg("Forcing Speed and Duplex\n");
-               ret_val = e1000_phy_force_speed_duplex(hw);
-               if (ret_val) {
-                       e_dbg("Error Forcing Speed and Duplex\n");
-                       return ret_val;
-               }
-       }
-
-       /*
-        * 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)
-               return ret_val;
-
-       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");
-       }
-
-       return ret_val;
-}
-
-/**
- *  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)
-               return ret_val;
-
-       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       /*
-        * 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)
-               return ret_val;
-
-       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)
-               return ret_val;
-
-       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)
-                       return ret_val;
-
-               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)
-                       return ret_val;
-       }
-
-       return ret_val;
-}
-
-/**
- *  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)
-               return ret_val;
-
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       e_dbg("M88E1000 PSCR: %X\n", phy_data);
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               return ret_val;
-
-       /* Reset the phy to commit changes. */
-       ret_val = e1000e_commit_phy(hw);
-       if (ret_val)
-               return ret_val;
-
-       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)
-                       return ret_val;
-
-               if (!link) {
-                       if (hw->phy.type != e1000_phy_m88) {
-                               e_dbg("Link taking longer than expected.\n");
-                       } else {
-                               /*
-                                * 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)
-                                       return ret_val;
-                               ret_val = e1000e_phy_reset_dsp(hw);
-                               if (ret_val)
-                                       return ret_val;
-                       }
-               }
-
-               /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       if (hw->phy.type != e1000_phy_m88)
-               return 0;
-
-       ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       /*
-        * 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)
-               return ret_val;
-
-       /*
-        * 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)
-               return ret_val;
-
-       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-
-       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;
-
-       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;
-}
-
-/**
- *  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);
-}
-
-/**
- *  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;
-       u16 data;
-
-       ret_val = e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &data);
-       if (ret_val)
-               return ret_val;
-
-       if (!active) {
-               data &= ~IGP02E1000_PM_D3_LPLU;
-               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, data);
-               if (ret_val)
-                       return ret_val;
-               /*
-                * 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)
-                               return ret_val;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          &data);
-                       if (ret_val)
-                               return ret_val;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          data);
-                       if (ret_val)
-                               return ret_val;
-               }
-       } 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)
-                       return ret_val;
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG, &data);
-               if (ret_val)
-                       return ret_val;
-
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG, data);
-       }
-
-       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_3:
-               offset  = IGP01E1000_PHY_LINK_HEALTH;
-               mask    = IGP01E1000_PLHR_SS_DOWNGRADE;
-               break;
-       default:
-               /* speed downshift not supported */
-               phy->speed_downgraded = false;
-               return 0;
-       }
-
-       ret_val = e1e_rphy(hw, offset, &phy_data);
-
-       if (!ret_val)
-               phy->speed_downgraded = (phy_data & mask);
-
-       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;
-
-       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;
-}
-
-/**
- *  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;
-
-       /*
-        * Polarity is determined based on the speed of
-        * our connection.
-        */
-       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               return ret_val;
-
-       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;
-
-       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;
-
-       /*
-        * 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;
-}
-
-/**
- *  e1000_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.
- **/
-static s32 e1000_wait_autoneg(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 i, phy_status;
-
-       /* 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 = 0;
-       u16 i, phy_status;
-
-       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);
-
-       return ret_val;
-}
-
-/**
- *  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;
-       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;
-       static const 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)
-                       return ret_val;
-
-               /*
-                * 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))
-                       return -E1000_ERR_PHY;
-
-               /* 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;
-
-       return ret_val;
-}
-
-/**
- *  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");
-               return -E1000_ERR_CONFIG;
-       }
-
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               return ret_val;
-
-       if (!link) {
-               e_dbg("Phy info is only valid if link is up\n");
-               return -E1000_ERR_CONFIG;
-       }
-
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy->polarity_correction = (phy_data &
-                                   M88E1000_PSCR_POLARITY_REVERSAL);
-
-       ret_val = e1000_check_polarity_m88(hw);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               return ret_val;
-
-       phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX);
-
-       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
-               ret_val = e1000_get_cable_length(hw);
-               if (ret_val)
-                       return ret_val;
-
-               ret_val = e1e_rphy(hw, PHY_1000T_STATUS, &phy_data);
-               if (ret_val)
-                       return ret_val;
-
-               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;
-       }
-
-       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)
-               return ret_val;
-
-       if (!link) {
-               e_dbg("Phy info is only valid if link is up\n");
-               return -E1000_ERR_CONFIG;
-       }
-
-       phy->polarity_correction = true;
-
-       ret_val = e1000_check_polarity_igp(hw);
-       if (ret_val)
-               return ret_val;
-
-       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               return ret_val;
-
-       phy->is_mdix = (data & IGP01E1000_PSSR_MDIX);
-
-       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-               ret_val = e1000_get_cable_length(hw);
-               if (ret_val)
-                       return ret_val;
-
-               ret_val = e1e_rphy(hw, PHY_1000T_STATUS, &data);
-               if (ret_val)
-                       return ret_val;
-
-               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 {
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_get_phy_info_ife - Retrieves various IFE PHY states
- *  @hw: pointer to the HW structure
- *
- *  Populates "phy" structure with various feature states.
- **/
-s32 e1000_get_phy_info_ife(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 = e1000_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_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;
-       u16 phy_ctrl;
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               return ret_val;
-
-       phy_ctrl |= MII_CR_RESET;
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               return ret_val;
-
-       udelay(1);
-
-       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;
-       u32 ctrl;
-
-       ret_val = e1000_check_reset_block(hw);
-       if (ret_val)
-               return 0;
-
-       ret_val = phy->ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       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);
-
-       return e1000_get_phy_cfg_done(hw);
-}
-
-/**
- *  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)
-{
-       mdelay(10);
-       return 0;
-}
-
-/**
- *  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 0;
-}
-
-/* Internal function pointers */
-
-/**
- *  e1000_get_phy_cfg_done - Generic PHY configuration done
- *  @hw: pointer to the HW structure
- *
- *  Return success if silicon family did not implement a family specific
- *  get_cfg_done function.
- **/
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_cfg_done)
-               return hw->phy.ops.get_cfg_done(hw);
-
-       return 0;
-}
-
-/**
- *  e1000_phy_force_speed_duplex - Generic force PHY speed/duplex
- *  @hw: pointer to the HW structure
- *
- *  When the silicon family has not implemented a forced speed/duplex
- *  function for the PHY, simply return 0.
- **/
-static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.force_speed_duplex)
-               return hw->phy.ops.force_speed_duplex(hw);
-
-       return 0;
-}
-
-/**
- *  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 = 0;
-                               goto out;
-                       }
-                       usleep_range(1000, 2000);
-                       i++;
-               } while (i < 10);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_get_phy_addr_for_bm_page - Retrieve PHY page address
- *  @page: page to access
- *
- *  Returns the phy address for the page requested.
- **/
-static u32 e1000_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 = 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 = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
-                                                        false, false);
-               goto out;
-       }
-
-       hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               u32 page_shift, page_select;
-
-               /*
-                * 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 = 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 = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
-                                                        true, false);
-               goto out;
-       }
-
-       hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               u32 page_shift, page_select;
-
-               /*
-                * 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 = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
-                                                        true, 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_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 = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
-                                                        false, 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;
-}
-
-/**
- *  e1000_enable_phy_wakeup_reg_access_bm - enable access to BM wakeup registers
- *  @hw: pointer to the HW structure
- *  @phy_reg: pointer to store original contents of BM_WUC_ENABLE_REG
- *
- *  Assumes semaphore already acquired and phy_reg points to a valid memory
- *  address to store contents of the BM_WUC_ENABLE_REG register.
- **/
-s32 e1000_enable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg)
-{
-       s32 ret_val;
-       u16 temp;
-
-       /* All page select, port ctrl and wakeup registers use phy address 1 */
-       hw->phy.addr = 1;
-
-       /* Select Port Control Registers page */
-       ret_val = e1000_set_page_igp(hw, (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
-       if (ret_val) {
-               e_dbg("Could not set Port Control page\n");
-               goto out;
-       }
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, phy_reg);
-       if (ret_val) {
-               e_dbg("Could not read PHY register %d.%d\n",
-                     BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
-               goto out;
-       }
-
-       /*
-        * Enable both PHY wakeup mode and Wakeup register page writes.
-        * Prevent a power state change by disabling ME and Host PHY wakeup.
-        */
-       temp = *phy_reg;
-       temp |= BM_WUC_ENABLE_BIT;
-       temp &= ~(BM_WUC_ME_WU_BIT | BM_WUC_HOST_WU_BIT);
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, temp);
-       if (ret_val) {
-               e_dbg("Could not write PHY register %d.%d\n",
-                     BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
-               goto out;
-       }
-
-       /* Select Host Wakeup Registers page */
-       ret_val = e1000_set_page_igp(hw, (BM_WUC_PAGE << IGP_PAGE_SHIFT));
-
-       /* caller now able to write registers on the Wakeup registers page */
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_disable_phy_wakeup_reg_access_bm - disable access to BM wakeup regs
- *  @hw: pointer to the HW structure
- *  @phy_reg: pointer to original contents of BM_WUC_ENABLE_REG
- *
- *  Restore BM_WUC_ENABLE_REG to its original value.
- *
- *  Assumes semaphore already acquired and *phy_reg is the contents of the
- *  BM_WUC_ENABLE_REG before register(s) on BM_WUC_PAGE were accessed by
- *  caller.
- **/
-s32 e1000_disable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg)
-{
-       s32 ret_val = 0;
-
-       /* Select Port Control Registers page */
-       ret_val = e1000_set_page_igp(hw, (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
-       if (ret_val) {
-               e_dbg("Could not set Port Control page\n");
-               goto out;
-       }
-
-       /* Restore 769.17 to its original value */
-       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, *phy_reg);
-       if (ret_val)
-               e_dbg("Could not restore PHY register %d.%d\n",
-                     BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_access_phy_wakeup_reg_bm - Read/write 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
- *  @page_set: BM_WUC_PAGE already set and access enabled
- *
- *  Read the PHY register at offset and store the retrieved information in
- *  data, or write data to PHY register at offset.  Note the procedure to
- *  access the PHY wakeup registers is different than reading the other PHY
- *  registers. It works as such:
- *  1) Set 769.17.2 (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
- *
- *  Steps 1 and 2 are done by e1000_enable_phy_wakeup_reg_access_bm() and
- *  step 5 is done by e1000_disable_phy_wakeup_reg_access_bm().
- *
- *  Assumes semaphore is already acquired.  When page_set==true, assumes
- *  the PHY page is set to BM_WUC_PAGE (i.e. a function in the call stack
- *  is responsible for calls to e1000_[enable|disable]_phy_wakeup_reg_bm()).
- **/
-static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
-                                         u16 *data, bool read, bool page_set)
-{
-       s32 ret_val;
-       u16 reg = BM_PHY_REG_NUM(offset);
-       u16 page = BM_PHY_REG_PAGE(offset);
-       u16 phy_reg = 0;
-
-       /* Gig must be disabled for MDIO accesses to Host Wakeup reg page */
-       if ((hw->mac.type == e1000_pchlan) &&
-           (!(er32(PHY_CTRL) & E1000_PHY_CTRL_GBE_DISABLE)))
-               e_dbg("Attempting to access page %d while gig enabled.\n",
-                     page);
-
-       if (!page_set) {
-               /* Enable access to PHY wakeup registers */
-               ret_val = e1000_enable_phy_wakeup_reg_access_bm(hw, &phy_reg);
-               if (ret_val) {
-                       e_dbg("Could not enable PHY wakeup reg access\n");
-                       goto out;
-               }
-       }
-
-       e_dbg("Accessing PHY page %d reg 0x%x\n", page, reg);
-
-       /* Write the Wakeup register page 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 %d\n", page);
-               goto out;
-       }
-
-       if (read) {
-               /* Read the Wakeup register page value using opcode 0x12 */
-               ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
-                                                  data);
-       } else {
-               /* Write the Wakeup register page 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 PHY reg %d.%d\n", page, reg);
-               goto out;
-       }
-
-       if (!page_set)
-               ret_val = e1000_disable_phy_wakeup_reg_access_bm(hw, &phy_reg);
-
-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 */
-       e1e_rphy(hw, PHY_CONTROL, &mii_reg);
-       mii_reg &= ~MII_CR_POWER_DOWN;
-       e1e_wphy(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 */
-       e1e_rphy(hw, PHY_CONTROL, &mii_reg);
-       mii_reg |= MII_CR_POWER_DOWN;
-       e1e_wphy(hw, PHY_CONTROL, mii_reg);
-       usleep_range(1000, 2000);
-}
-
-/**
- *  e1000e_commit_phy - 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 e1000e_commit_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.commit)
-               return hw->phy.ops.commit(hw);
-
-       return 0;
-}
-
-/**
- *  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.
- **/
-static 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 0;
-}
-
-/**
- *  __e1000_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 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
-                                  bool locked, bool page_set)
-{
-       s32 ret_val;
-       u16 page = BM_PHY_REG_PAGE(offset);
-       u16 reg = BM_PHY_REG_NUM(offset);
-       u32 phy_addr = hw->phy.addr = e1000_get_phy_addr_for_hv_page(page);
-
-       if (!locked) {
-               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 = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
-                                                        true, page_set);
-               goto out;
-       }
-
-       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
-               ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
-                                                        data, true);
-               goto out;
-       }
-
-       if (!page_set) {
-               if (page == HV_INTC_FC_PAGE_START)
-                       page = 0;
-
-               if (reg > MAX_PHY_MULTI_PAGE_REG) {
-                       /* Page is shifted left, PHY expects (page x 32) */
-                       ret_val = e1000_set_page_igp(hw,
-                                                    (page << IGP_PAGE_SHIFT));
-
-                       hw->phy.addr = phy_addr;
-
-                       if (ret_val)
-                               goto out;
-               }
-       }
-
-       e_dbg("reading PHY page %d (or 0x%x shifted) reg 0x%x\n", page,
-             page << IGP_PAGE_SHIFT, reg);
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
-                                         data);
-out:
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000_read_phy_reg_hv(hw, offset, data, false, false);
-}
-
-/**
- *  e1000_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 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000_read_phy_reg_hv(hw, offset, data, true, false);
-}
-
-/**
- *  e1000_read_phy_reg_page_hv - Read HV PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Reads the PHY register at offset and stores the retrieved information
- *  in data.  Assumes semaphore already acquired and page already set.
- **/
-s32 e1000_read_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000_read_phy_reg_hv(hw, offset, data, true, true);
-}
-
-/**
- *  __e1000_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 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
-                                   bool locked, bool page_set)
-{
-       s32 ret_val;
-       u16 page = BM_PHY_REG_PAGE(offset);
-       u16 reg = BM_PHY_REG_NUM(offset);
-       u32 phy_addr = hw->phy.addr = e1000_get_phy_addr_for_hv_page(page);
-
-       if (!locked) {
-               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 = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
-                                                        false, page_set);
-               goto out;
-       }
-
-       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
-               ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
-                                                        &data, false);
-               goto out;
-       }
-
-       if (!page_set) {
-               if (page == HV_INTC_FC_PAGE_START)
-                       page = 0;
-
-               /*
-                * Workaround MDIO accesses being disabled after entering IEEE
-                * Power Down (when 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 = e1000_access_phy_debug_regs_hv(hw,
-                                                                (1 << 6) | 0x3,
-                                                                &data2, false);
-                       if (ret_val)
-                               goto out;
-               }
-
-               if (reg > MAX_PHY_MULTI_PAGE_REG) {
-                       /* Page is shifted left, PHY expects (page x 32) */
-                       ret_val = e1000_set_page_igp(hw,
-                                                    (page << IGP_PAGE_SHIFT));
-
-                       hw->phy.addr = phy_addr;
-
-                       if (ret_val)
-                               goto out;
-               }
-       }
-
-       e_dbg("writing PHY page %d (or 0x%x shifted) reg 0x%x\n", page,
-             page << IGP_PAGE_SHIFT, reg);
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
-                                         data);
-
-out:
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000_write_phy_reg_hv(hw, offset, data, false, false);
-}
-
-/**
- *  e1000_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 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000_write_phy_reg_hv(hw, offset, data, true, false);
-}
-
-/**
- *  e1000_write_phy_reg_page_hv - 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 and page already set.
- **/
-s32 e1000_write_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000_write_phy_reg_hv(hw, offset, data, true, true);
-}
-
-/**
- *  e1000_get_phy_addr_for_hv_page - Get PHY address based on page
- *  @page: page to be accessed
- **/
-static u32 e1000_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;
-}
-
-/**
- *  e1000_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 write
- *
- *  Reads the PHY register at offset and stores the retreived information
- *  in data.  Assumes semaphore already acquired.  Note that the procedure
- *  to access these regs uses the address port and data port to read/write.
- *  These accesses done with PHY address 2 and without using pages.
- **/
-static s32 e1000_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 the Address Offset port 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 access the Data port register\n");
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_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 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       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;
-
-       mdelay(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;
-}
-
-/**
- *  e1000_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 e1000_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;
-}
-
-/**
- *  e1000_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.
- **/
-s32 e1000_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;
-
-       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;
-}
-
-/**
- *  e1000_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 e1000_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 = e1000_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) {
-               ret_val = hw->phy.ops.get_cable_length(hw);
-               if (ret_val)
-                       goto out;
-
-               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;
-       } 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;
-}
-
-/**
- *  e1000_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 e1000_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;
-}
index 69d6403ec4bdc0efb40d1e66d8faefec4f9aa391..a2fd38562cb3a5732391c62997210e6090a4ef01 100644 (file)
@@ -16,5 +16,6 @@ source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/intel/Kconfig"
 
 endif # ETHERNET
index 470e5d843013d272406515b2a4f8f73dc1ba589c..526527177d13dbf04225c57a238c692bfe54cb9b 100644 (file)
@@ -7,3 +7,4 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
new file mode 100644 (file)
index 0000000..5fe185b
--- /dev/null
@@ -0,0 +1,220 @@
+#
+# Intel network device configuration
+#
+
+config NET_VENDOR_INTEL
+       bool "Intel devices"
+       depends on PCI || PCI_MSI
+       ---help---
+         If you have a network (Ethernet) card belonging to this class, say Y
+         and read the Ethernet-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>.
+
+         Note that the answer to this question doesn't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about Intel cards. If you say Y, you will be asked for
+         your specific card in the following questions.
+
+if NET_VENDOR_INTEL
+
+config E100
+       tristate "Intel(R) PRO/100+ support"
+       depends on PCI
+       select MII
+       ---help---
+         This driver supports Intel(R) PRO/100 family of adapters.
+         To verify that your adapter is supported, find the board ID number
+         on the adapter. Look for a label that has a barcode and a number
+         in the format 123456-001 (six digits hyphen three digits).
+
+         Use the above information and the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         to identify the adapter.
+
+         For the latest Intel PRO/100 network driver for Linux, see:
+
+         <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/e100.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called e100.
+
+config E1000
+       tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
+       depends on PCI
+       ---help---
+         This driver supports Intel(R) PRO/1000 gigabit ethernet family of
+         adapters.  For more information on how to identify your adapter, go
+         to the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/e1000.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called e1000.
+
+config E1000E
+       tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
+       depends on PCI && (!SPARC32 || BROKEN)
+       select CRC32
+       ---help---
+         This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
+         ethernet family of adapters. For PCI or PCI-X e1000 adapters,
+         use the regular e1000 driver For more information on how to
+         identify your adapter, go to the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         To compile this driver as a module, choose M here. The module
+         will be called e1000e.
+
+config IGB
+       tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
+       depends on PCI
+       ---help---
+         This driver supports Intel(R) 82575/82576 gigabit ethernet family of
+         adapters.  For more information on how to identify your adapter, go
+         to the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/e1000.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called igb.
+
+config IGB_DCA
+       bool "Direct Cache Access (DCA) Support"
+       default y
+       depends on IGB && DCA && !(IGB=y && DCA=m)
+       ---help---
+         Say Y here if you want to use Direct Cache Access (DCA) in the
+         driver.  DCA is a method for warming the CPU cache before data
+         is used, with the intent of lessening the impact of cache misses.
+
+config IGBVF
+       tristate "Intel(R) 82576 Virtual Function Ethernet support"
+       depends on PCI
+       ---help---
+         This driver supports Intel(R) 82576 virtual functions.  For more
+         information on how to identify your adapter, go to the Adapter &
+         Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/e1000.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called igbvf.
+
+config IXGB
+       tristate "Intel(R) PRO/10GbE support"
+       depends on PCI
+       ---help---
+         This driver supports Intel(R) PRO/10GbE family of adapters for
+         PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
+         instead. For more information on how to identify your adapter, go
+         to the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/ixgb.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called ixgb.
+
+config IXGBE
+       tristate "Intel(R) 10GbE PCI Express adapters support"
+       depends on PCI && INET
+       select MDIO
+       ---help---
+         This driver supports Intel(R) 10GbE PCI Express family of
+         adapters.  For more information on how to identify your adapter, go
+         to the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         To compile this driver as a module, choose M here. The module
+         will be called ixgbe.
+
+config IXGBE_DCA
+       bool "Direct Cache Access (DCA) Support"
+       default y
+       depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
+       ---help---
+         Say Y here if you want to use Direct Cache Access (DCA) in the
+         driver.  DCA is a method for warming the CPU cache before data
+         is used, with the intent of lessening the impact of cache misses.
+
+config IXGBE_DCB
+       bool "Data Center Bridging (DCB) Support"
+       default n
+       depends on IXGBE && DCB
+       ---help---
+         Say Y here if you want to use Data Center Bridging (DCB) in the
+         driver.
+
+         If unsure, say N.
+
+config IXGBEVF
+       tristate "Intel(R) 82599 Virtual Function Ethernet support"
+       depends on PCI_MSI
+       ---help---
+         This driver supports Intel(R) 82599 virtual functions.  For more
+         information on how to identify your adapter, go to the Adapter &
+         Driver ID Guide at:
+
+         <http://support.intel.com/support/network/sb/CS-008441.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/ixgbevf.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called ixgbevf.  MSI-X interrupt support is required
+         for this driver to work correctly.
+
+endif # NET_VENDOR_INTEL
diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile
new file mode 100644 (file)
index 0000000..c8210e6
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Makefile for the Intel network device drivers.
+#
+
+obj-$(CONFIG_E100) += e100.o
+obj-$(CONFIG_E1000) += e1000/
+obj-$(CONFIG_E1000E) += e1000e/
+obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGBVF) += igbvf/
+obj-$(CONFIG_IXGBE) += ixgbe/
+obj-$(CONFIG_IXGBEVF) += ixgbevf/
+obj-$(CONFIG_IXGB) += ixgb/
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
new file mode 100644 (file)
index 0000000..c1352c6
--- /dev/null
@@ -0,0 +1,3109 @@
+/*******************************************************************************
+
+  Intel PRO/100 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+*******************************************************************************/
+
+/*
+ *     e100.c: Intel(R) PRO/100 ethernet driver
+ *
+ *     (Re)written 2003 by scott.feldman@intel.com.  Based loosely on
+ *     original e100 driver, but better described as a munging of
+ *     e100, e1000, eepro100, tg3, 8139cp, and other drivers.
+ *
+ *     References:
+ *             Intel 8255x 10/100 Mbps Ethernet Controller Family,
+ *             Open Source Software Developers Manual,
+ *             http://sourceforge.net/projects/e1000
+ *
+ *
+ *                           Theory of Operation
+ *
+ *     I.   General
+ *
+ *     The driver supports Intel(R) 10/100 Mbps PCI Fast Ethernet
+ *     controller family, which includes the 82557, 82558, 82559, 82550,
+ *     82551, and 82562 devices.  82558 and greater controllers
+ *     integrate the Intel 82555 PHY.  The controllers are used in
+ *     server and client network interface cards, as well as in
+ *     LAN-On-Motherboard (LOM), CardBus, MiniPCI, and ICHx
+ *     configurations.  8255x supports a 32-bit linear addressing
+ *     mode and operates at 33Mhz PCI clock rate.
+ *
+ *     II.  Driver Operation
+ *
+ *     Memory-mapped mode is used exclusively to access the device's
+ *     shared-memory structure, the Control/Status Registers (CSR). All
+ *     setup, configuration, and control of the device, including queuing
+ *     of Tx, Rx, and configuration commands is through the CSR.
+ *     cmd_lock serializes accesses to the CSR command register.  cb_lock
+ *     protects the shared Command Block List (CBL).
+ *
+ *     8255x is highly MII-compliant and all access to the PHY go
+ *     through the Management Data Interface (MDI).  Consequently, the
+ *     driver leverages the mii.c library shared with other MII-compliant
+ *     devices.
+ *
+ *     Big- and Little-Endian byte order as well as 32- and 64-bit
+ *     archs are supported.  Weak-ordered memory and non-cache-coherent
+ *     archs are supported.
+ *
+ *     III. Transmit
+ *
+ *     A Tx skb is mapped and hangs off of a TCB.  TCBs are linked
+ *     together in a fixed-size ring (CBL) thus forming the flexible mode
+ *     memory structure.  A TCB marked with the suspend-bit indicates
+ *     the end of the ring.  The last TCB processed suspends the
+ *     controller, and the controller can be restarted by issue a CU
+ *     resume command to continue from the suspend point, or a CU start
+ *     command to start at a given position in the ring.
+ *
+ *     Non-Tx commands (config, multicast setup, etc) are linked
+ *     into the CBL ring along with Tx commands.  The common structure
+ *     used for both Tx and non-Tx commands is the Command Block (CB).
+ *
+ *     cb_to_use is the next CB to use for queuing a command; cb_to_clean
+ *     is the next CB to check for completion; cb_to_send is the first
+ *     CB to start on in case of a previous failure to resume.  CB clean
+ *     up happens in interrupt context in response to a CU interrupt.
+ *     cbs_avail keeps track of number of free CB resources available.
+ *
+ *     Hardware padding of short packets to minimum packet size is
+ *     enabled.  82557 pads with 7Eh, while the later controllers pad
+ *     with 00h.
+ *
+ *     IV.  Receive
+ *
+ *     The Receive Frame Area (RFA) comprises a ring of Receive Frame
+ *     Descriptors (RFD) + data buffer, thus forming the simplified mode
+ *     memory structure.  Rx skbs are allocated to contain both the RFD
+ *     and the data buffer, but the RFD is pulled off before the skb is
+ *     indicated.  The data buffer is aligned such that encapsulated
+ *     protocol headers are u32-aligned.  Since the RFD is part of the
+ *     mapped shared memory, and completion status is contained within
+ *     the RFD, the RFD must be dma_sync'ed to maintain a consistent
+ *     view from software and hardware.
+ *
+ *     In order to keep updates to the RFD link field from colliding with
+ *     hardware writes to mark packets complete, we use the feature that
+ *     hardware will not write to a size 0 descriptor and mark the previous
+ *     packet as end-of-list (EL).   After updating the link, we remove EL
+ *     and only then restore the size such that hardware may use the
+ *     previous-to-end RFD.
+ *
+ *     Under typical operation, the  receive unit (RU) is start once,
+ *     and the controller happily fills RFDs as frames arrive.  If
+ *     replacement RFDs cannot be allocated, or the RU goes non-active,
+ *     the RU must be restarted.  Frame arrival generates an interrupt,
+ *     and Rx indication and re-allocation happen in the same context,
+ *     therefore no locking is required.  A software-generated interrupt
+ *     is generated from the watchdog to recover from a failed allocation
+ *     scenario where all Rx resources have been indicated and none re-
+ *     placed.
+ *
+ *     V.   Miscellaneous
+ *
+ *     VLAN offloading of tagging, stripping and filtering is not
+ *     supported, but driver will accommodate the extra 4-byte VLAN tag
+ *     for processing by upper layers.  Tx/Rx Checksum offloading is not
+ *     supported.  Tx Scatter/Gather is not supported.  Jumbo Frames is
+ *     not supported (hardware limitation).
+ *
+ *     MagicPacket(tm) WoL support is enabled/disabled via ethtool.
+ *
+ *     Thanks to JC (jchapman@katalix.com) for helping with
+ *     testing/troubleshooting the development driver.
+ *
+ *     TODO:
+ *     o several entry points race with dev->close
+ *     o check for tx-no-resources/stop Q races with tx clean/wake Q
+ *
+ *     FIXES:
+ * 2005/12/02 - Michael O'Donnell <Michael.ODonnell at stratus dot com>
+ *     - Stratus87247: protect MDI control register manipulations
+ * 2009/06/01 - Andreas Mohr <andi at lisas dot de>
+ *      - add clean lowlevel I/O emulation for cards with MII-lacking PHYs
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/hardirq.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/dmapool.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/mii.h>
+#include <linux/if_vlan.h>
+#include <linux/skbuff.h>
+#include <linux/ethtool.h>
+#include <linux/string.h>
+#include <linux/firmware.h>
+#include <linux/rtnetlink.h>
+#include <asm/unaligned.h>
+
+
+#define DRV_NAME               "e100"
+#define DRV_EXT                        "-NAPI"
+#define DRV_VERSION            "3.5.24-k2"DRV_EXT
+#define DRV_DESCRIPTION                "Intel(R) PRO/100 Network Driver"
+#define DRV_COPYRIGHT          "Copyright(c) 1999-2006 Intel Corporation"
+
+#define E100_WATCHDOG_PERIOD   (2 * HZ)
+#define E100_NAPI_WEIGHT       16
+
+#define FIRMWARE_D101M         "e100/d101m_ucode.bin"
+#define FIRMWARE_D101S         "e100/d101s_ucode.bin"
+#define FIRMWARE_D102E         "e100/d102e_ucode.bin"
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+MODULE_FIRMWARE(FIRMWARE_D101M);
+MODULE_FIRMWARE(FIRMWARE_D101S);
+MODULE_FIRMWARE(FIRMWARE_D102E);
+
+static int debug = 3;
+static int eeprom_bad_csum_allow = 0;
+static int use_io = 0;
+module_param(debug, int, 0);
+module_param(eeprom_bad_csum_allow, int, 0);
+module_param(use_io, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
+MODULE_PARM_DESC(use_io, "Force use of i/o access mode");
+
+#define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\
+       PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \
+       PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich }
+static DEFINE_PCI_DEVICE_TABLE(e100_id_table) = {
+       INTEL_8255X_ETHERNET_DEVICE(0x1029, 0),
+       INTEL_8255X_ETHERNET_DEVICE(0x1030, 0),
+       INTEL_8255X_ETHERNET_DEVICE(0x1031, 3),
+       INTEL_8255X_ETHERNET_DEVICE(0x1032, 3),
+       INTEL_8255X_ETHERNET_DEVICE(0x1033, 3),
+       INTEL_8255X_ETHERNET_DEVICE(0x1034, 3),
+       INTEL_8255X_ETHERNET_DEVICE(0x1038, 3),
+       INTEL_8255X_ETHERNET_DEVICE(0x1039, 4),
+       INTEL_8255X_ETHERNET_DEVICE(0x103A, 4),
+       INTEL_8255X_ETHERNET_DEVICE(0x103B, 4),
+       INTEL_8255X_ETHERNET_DEVICE(0x103C, 4),
+       INTEL_8255X_ETHERNET_DEVICE(0x103D, 4),
+       INTEL_8255X_ETHERNET_DEVICE(0x103E, 4),
+       INTEL_8255X_ETHERNET_DEVICE(0x1050, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1051, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1052, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1053, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1054, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1055, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1056, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1057, 5),
+       INTEL_8255X_ETHERNET_DEVICE(0x1059, 0),
+       INTEL_8255X_ETHERNET_DEVICE(0x1064, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x1065, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x1066, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x1067, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x1068, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x1069, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x106A, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x106B, 6),
+       INTEL_8255X_ETHERNET_DEVICE(0x1091, 7),
+       INTEL_8255X_ETHERNET_DEVICE(0x1092, 7),
+       INTEL_8255X_ETHERNET_DEVICE(0x1093, 7),
+       INTEL_8255X_ETHERNET_DEVICE(0x1094, 7),
+       INTEL_8255X_ETHERNET_DEVICE(0x1095, 7),
+       INTEL_8255X_ETHERNET_DEVICE(0x10fe, 7),
+       INTEL_8255X_ETHERNET_DEVICE(0x1209, 0),
+       INTEL_8255X_ETHERNET_DEVICE(0x1229, 0),
+       INTEL_8255X_ETHERNET_DEVICE(0x2449, 2),
+       INTEL_8255X_ETHERNET_DEVICE(0x2459, 2),
+       INTEL_8255X_ETHERNET_DEVICE(0x245D, 2),
+       INTEL_8255X_ETHERNET_DEVICE(0x27DC, 7),
+       { 0, }
+};
+MODULE_DEVICE_TABLE(pci, e100_id_table);
+
+enum mac {
+       mac_82557_D100_A  = 0,
+       mac_82557_D100_B  = 1,
+       mac_82557_D100_C  = 2,
+       mac_82558_D101_A4 = 4,
+       mac_82558_D101_B0 = 5,
+       mac_82559_D101M   = 8,
+       mac_82559_D101S   = 9,
+       mac_82550_D102    = 12,
+       mac_82550_D102_C  = 13,
+       mac_82551_E       = 14,
+       mac_82551_F       = 15,
+       mac_82551_10      = 16,
+       mac_unknown       = 0xFF,
+};
+
+enum phy {
+       phy_100a     = 0x000003E0,
+       phy_100c     = 0x035002A8,
+       phy_82555_tx = 0x015002A8,
+       phy_nsc_tx   = 0x5C002000,
+       phy_82562_et = 0x033002A8,
+       phy_82562_em = 0x032002A8,
+       phy_82562_ek = 0x031002A8,
+       phy_82562_eh = 0x017002A8,
+       phy_82552_v  = 0xd061004d,
+       phy_unknown  = 0xFFFFFFFF,
+};
+
+/* CSR (Control/Status Registers) */
+struct csr {
+       struct {
+               u8 status;
+               u8 stat_ack;
+               u8 cmd_lo;
+               u8 cmd_hi;
+               u32 gen_ptr;
+       } scb;
+       u32 port;
+       u16 flash_ctrl;
+       u8 eeprom_ctrl_lo;
+       u8 eeprom_ctrl_hi;
+       u32 mdi_ctrl;
+       u32 rx_dma_count;
+};
+
+enum scb_status {
+       rus_no_res       = 0x08,
+       rus_ready        = 0x10,
+       rus_mask         = 0x3C,
+};
+
+enum ru_state  {
+       RU_SUSPENDED = 0,
+       RU_RUNNING       = 1,
+       RU_UNINITIALIZED = -1,
+};
+
+enum scb_stat_ack {
+       stat_ack_not_ours    = 0x00,
+       stat_ack_sw_gen      = 0x04,
+       stat_ack_rnr         = 0x10,
+       stat_ack_cu_idle     = 0x20,
+       stat_ack_frame_rx    = 0x40,
+       stat_ack_cu_cmd_done = 0x80,
+       stat_ack_not_present = 0xFF,
+       stat_ack_rx = (stat_ack_sw_gen | stat_ack_rnr | stat_ack_frame_rx),
+       stat_ack_tx = (stat_ack_cu_idle | stat_ack_cu_cmd_done),
+};
+
+enum scb_cmd_hi {
+       irq_mask_none = 0x00,
+       irq_mask_all  = 0x01,
+       irq_sw_gen    = 0x02,
+};
+
+enum scb_cmd_lo {
+       cuc_nop        = 0x00,
+       ruc_start      = 0x01,
+       ruc_load_base  = 0x06,
+       cuc_start      = 0x10,
+       cuc_resume     = 0x20,
+       cuc_dump_addr  = 0x40,
+       cuc_dump_stats = 0x50,
+       cuc_load_base  = 0x60,
+       cuc_dump_reset = 0x70,
+};
+
+enum cuc_dump {
+       cuc_dump_complete       = 0x0000A005,
+       cuc_dump_reset_complete = 0x0000A007,
+};
+
+enum port {
+       software_reset  = 0x0000,
+       selftest        = 0x0001,
+       selective_reset = 0x0002,
+};
+
+enum eeprom_ctrl_lo {
+       eesk = 0x01,
+       eecs = 0x02,
+       eedi = 0x04,
+       eedo = 0x08,
+};
+
+enum mdi_ctrl {
+       mdi_write = 0x04000000,
+       mdi_read  = 0x08000000,
+       mdi_ready = 0x10000000,
+};
+
+enum eeprom_op {
+       op_write = 0x05,
+       op_read  = 0x06,
+       op_ewds  = 0x10,
+       op_ewen  = 0x13,
+};
+
+enum eeprom_offsets {
+       eeprom_cnfg_mdix  = 0x03,
+       eeprom_phy_iface  = 0x06,
+       eeprom_id         = 0x0A,
+       eeprom_config_asf = 0x0D,
+       eeprom_smbus_addr = 0x90,
+};
+
+enum eeprom_cnfg_mdix {
+       eeprom_mdix_enabled = 0x0080,
+};
+
+enum eeprom_phy_iface {
+       NoSuchPhy = 0,
+       I82553AB,
+       I82553C,
+       I82503,
+       DP83840,
+       S80C240,
+       S80C24,
+       I82555,
+       DP83840A = 10,
+};
+
+enum eeprom_id {
+       eeprom_id_wol = 0x0020,
+};
+
+enum eeprom_config_asf {
+       eeprom_asf = 0x8000,
+       eeprom_gcl = 0x4000,
+};
+
+enum cb_status {
+       cb_complete = 0x8000,
+       cb_ok       = 0x2000,
+};
+
+enum cb_command {
+       cb_nop    = 0x0000,
+       cb_iaaddr = 0x0001,
+       cb_config = 0x0002,
+       cb_multi  = 0x0003,
+       cb_tx     = 0x0004,
+       cb_ucode  = 0x0005,
+       cb_dump   = 0x0006,
+       cb_tx_sf  = 0x0008,
+       cb_cid    = 0x1f00,
+       cb_i      = 0x2000,
+       cb_s      = 0x4000,
+       cb_el     = 0x8000,
+};
+
+struct rfd {
+       __le16 status;
+       __le16 command;
+       __le32 link;
+       __le32 rbd;
+       __le16 actual_size;
+       __le16 size;
+};
+
+struct rx {
+       struct rx *next, *prev;
+       struct sk_buff *skb;
+       dma_addr_t dma_addr;
+};
+
+#if defined(__BIG_ENDIAN_BITFIELD)
+#define X(a,b) b,a
+#else
+#define X(a,b) a,b
+#endif
+struct config {
+/*0*/  u8 X(byte_count:6, pad0:2);
+/*1*/  u8 X(X(rx_fifo_limit:4, tx_fifo_limit:3), pad1:1);
+/*2*/  u8 adaptive_ifs;
+/*3*/  u8 X(X(X(X(mwi_enable:1, type_enable:1), read_align_enable:1),
+          term_write_cache_line:1), pad3:4);
+/*4*/  u8 X(rx_dma_max_count:7, pad4:1);
+/*5*/  u8 X(tx_dma_max_count:7, dma_max_count_enable:1);
+/*6*/  u8 X(X(X(X(X(X(X(late_scb_update:1, direct_rx_dma:1),
+          tno_intr:1), cna_intr:1), standard_tcb:1), standard_stat_counter:1),
+          rx_discard_overruns:1), rx_save_bad_frames:1);
+/*7*/  u8 X(X(X(X(X(rx_discard_short_frames:1, tx_underrun_retry:2),
+          pad7:2), rx_extended_rfd:1), tx_two_frames_in_fifo:1),
+          tx_dynamic_tbd:1);
+/*8*/  u8 X(X(mii_mode:1, pad8:6), csma_disabled:1);
+/*9*/  u8 X(X(X(X(X(rx_tcpudp_checksum:1, pad9:3), vlan_arp_tco:1),
+          link_status_wake:1), arp_wake:1), mcmatch_wake:1);
+/*10*/ u8 X(X(X(pad10:3, no_source_addr_insertion:1), preamble_length:2),
+          loopback:2);
+/*11*/ u8 X(linear_priority:3, pad11:5);
+/*12*/ u8 X(X(linear_priority_mode:1, pad12:3), ifs:4);
+/*13*/ u8 ip_addr_lo;
+/*14*/ u8 ip_addr_hi;
+/*15*/ u8 X(X(X(X(X(X(X(promiscuous_mode:1, broadcast_disabled:1),
+          wait_after_win:1), pad15_1:1), ignore_ul_bit:1), crc_16_bit:1),
+          pad15_2:1), crs_or_cdt:1);
+/*16*/ u8 fc_delay_lo;
+/*17*/ u8 fc_delay_hi;
+/*18*/ u8 X(X(X(X(X(rx_stripping:1, tx_padding:1), rx_crc_transfer:1),
+          rx_long_ok:1), fc_priority_threshold:3), pad18:1);
+/*19*/ u8 X(X(X(X(X(X(X(addr_wake:1, magic_packet_disable:1),
+          fc_disable:1), fc_restop:1), fc_restart:1), fc_reject:1),
+          full_duplex_force:1), full_duplex_pin:1);
+/*20*/ u8 X(X(X(pad20_1:5, fc_priority_location:1), multi_ia:1), pad20_2:1);
+/*21*/ u8 X(X(pad21_1:3, multicast_all:1), pad21_2:4);
+/*22*/ u8 X(X(rx_d102_mode:1, rx_vlan_drop:1), pad22:6);
+       u8 pad_d102[9];
+};
+
+#define E100_MAX_MULTICAST_ADDRS       64
+struct multi {
+       __le16 count;
+       u8 addr[E100_MAX_MULTICAST_ADDRS * ETH_ALEN + 2/*pad*/];
+};
+
+/* Important: keep total struct u32-aligned */
+#define UCODE_SIZE                     134
+struct cb {
+       __le16 status;
+       __le16 command;
+       __le32 link;
+       union {
+               u8 iaaddr[ETH_ALEN];
+               __le32 ucode[UCODE_SIZE];
+               struct config config;
+               struct multi multi;
+               struct {
+                       u32 tbd_array;
+                       u16 tcb_byte_count;
+                       u8 threshold;
+                       u8 tbd_count;
+                       struct {
+                               __le32 buf_addr;
+                               __le16 size;
+                               u16 eol;
+                       } tbd;
+               } tcb;
+               __le32 dump_buffer_addr;
+       } u;
+       struct cb *next, *prev;
+       dma_addr_t dma_addr;
+       struct sk_buff *skb;
+};
+
+enum loopback {
+       lb_none = 0, lb_mac = 1, lb_phy = 3,
+};
+
+struct stats {
+       __le32 tx_good_frames, tx_max_collisions, tx_late_collisions,
+               tx_underruns, tx_lost_crs, tx_deferred, tx_single_collisions,
+               tx_multiple_collisions, tx_total_collisions;
+       __le32 rx_good_frames, rx_crc_errors, rx_alignment_errors,
+               rx_resource_errors, rx_overrun_errors, rx_cdt_errors,
+               rx_short_frame_errors;
+       __le32 fc_xmt_pause, fc_rcv_pause, fc_rcv_unsupported;
+       __le16 xmt_tco_frames, rcv_tco_frames;
+       __le32 complete;
+};
+
+struct mem {
+       struct {
+               u32 signature;
+               u32 result;
+       } selftest;
+       struct stats stats;
+       u8 dump_buf[596];
+};
+
+struct param_range {
+       u32 min;
+       u32 max;
+       u32 count;
+};
+
+struct params {
+       struct param_range rfds;
+       struct param_range cbs;
+};
+
+struct nic {
+       /* Begin: frequently used values: keep adjacent for cache effect */
+       u32 msg_enable                          ____cacheline_aligned;
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+       u16 (*mdio_ctrl)(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data);
+
+       struct rx *rxs                          ____cacheline_aligned;
+       struct rx *rx_to_use;
+       struct rx *rx_to_clean;
+       struct rfd blank_rfd;
+       enum ru_state ru_running;
+
+       spinlock_t cb_lock                      ____cacheline_aligned;
+       spinlock_t cmd_lock;
+       struct csr __iomem *csr;
+       enum scb_cmd_lo cuc_cmd;
+       unsigned int cbs_avail;
+       struct napi_struct napi;
+       struct cb *cbs;
+       struct cb *cb_to_use;
+       struct cb *cb_to_send;
+       struct cb *cb_to_clean;
+       __le16 tx_command;
+       /* End: frequently used values: keep adjacent for cache effect */
+
+       enum {
+               ich                = (1 << 0),
+               promiscuous        = (1 << 1),
+               multicast_all      = (1 << 2),
+               wol_magic          = (1 << 3),
+               ich_10h_workaround = (1 << 4),
+       } flags                                 ____cacheline_aligned;
+
+       enum mac mac;
+       enum phy phy;
+       struct params params;
+       struct timer_list watchdog;
+       struct mii_if_info mii;
+       struct work_struct tx_timeout_task;
+       enum loopback loopback;
+
+       struct mem *mem;
+       dma_addr_t dma_addr;
+
+       struct pci_pool *cbs_pool;
+       dma_addr_t cbs_dma_addr;
+       u8 adaptive_ifs;
+       u8 tx_threshold;
+       u32 tx_frames;
+       u32 tx_collisions;
+       u32 tx_deferred;
+       u32 tx_single_collisions;
+       u32 tx_multiple_collisions;
+       u32 tx_fc_pause;
+       u32 tx_tco_frames;
+
+       u32 rx_fc_pause;
+       u32 rx_fc_unsupported;
+       u32 rx_tco_frames;
+       u32 rx_over_length_errors;
+
+       u16 eeprom_wc;
+       __le16 eeprom[256];
+       spinlock_t mdio_lock;
+       const struct firmware *fw;
+};
+
+static inline void e100_write_flush(struct nic *nic)
+{
+       /* Flush previous PCI writes through intermediate bridges
+        * by doing a benign read */
+       (void)ioread8(&nic->csr->scb.status);
+}
+
+static void e100_enable_irq(struct nic *nic)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&nic->cmd_lock, flags);
+       iowrite8(irq_mask_none, &nic->csr->scb.cmd_hi);
+       e100_write_flush(nic);
+       spin_unlock_irqrestore(&nic->cmd_lock, flags);
+}
+
+static void e100_disable_irq(struct nic *nic)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&nic->cmd_lock, flags);
+       iowrite8(irq_mask_all, &nic->csr->scb.cmd_hi);
+       e100_write_flush(nic);
+       spin_unlock_irqrestore(&nic->cmd_lock, flags);
+}
+
+static void e100_hw_reset(struct nic *nic)
+{
+       /* Put CU and RU into idle with a selective reset to get
+        * device off of PCI bus */
+       iowrite32(selective_reset, &nic->csr->port);
+       e100_write_flush(nic); udelay(20);
+
+       /* Now fully reset device */
+       iowrite32(software_reset, &nic->csr->port);
+       e100_write_flush(nic); udelay(20);
+
+       /* Mask off our interrupt line - it's unmasked after reset */
+       e100_disable_irq(nic);
+}
+
+static int e100_self_test(struct nic *nic)
+{
+       u32 dma_addr = nic->dma_addr + offsetof(struct mem, selftest);
+
+       /* Passing the self-test is a pretty good indication
+        * that the device can DMA to/from host memory */
+
+       nic->mem->selftest.signature = 0;
+       nic->mem->selftest.result = 0xFFFFFFFF;
+
+       iowrite32(selftest | dma_addr, &nic->csr->port);
+       e100_write_flush(nic);
+       /* Wait 10 msec for self-test to complete */
+       msleep(10);
+
+       /* Interrupts are enabled after self-test */
+       e100_disable_irq(nic);
+
+       /* Check results of self-test */
+       if (nic->mem->selftest.result != 0) {
+               netif_err(nic, hw, nic->netdev,
+                         "Self-test failed: result=0x%08X\n",
+                         nic->mem->selftest.result);
+               return -ETIMEDOUT;
+       }
+       if (nic->mem->selftest.signature == 0) {
+               netif_err(nic, hw, nic->netdev, "Self-test failed: timed out\n");
+               return -ETIMEDOUT;
+       }
+
+       return 0;
+}
+
+static void e100_eeprom_write(struct nic *nic, u16 addr_len, u16 addr, __le16 data)
+{
+       u32 cmd_addr_data[3];
+       u8 ctrl;
+       int i, j;
+
+       /* Three cmds: write/erase enable, write data, write/erase disable */
+       cmd_addr_data[0] = op_ewen << (addr_len - 2);
+       cmd_addr_data[1] = (((op_write << addr_len) | addr) << 16) |
+               le16_to_cpu(data);
+       cmd_addr_data[2] = op_ewds << (addr_len - 2);
+
+       /* Bit-bang cmds to write word to eeprom */
+       for (j = 0; j < 3; j++) {
+
+               /* Chip select */
+               iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
+               e100_write_flush(nic); udelay(4);
+
+               for (i = 31; i >= 0; i--) {
+                       ctrl = (cmd_addr_data[j] & (1 << i)) ?
+                               eecs | eedi : eecs;
+                       iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
+                       e100_write_flush(nic); udelay(4);
+
+                       iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
+                       e100_write_flush(nic); udelay(4);
+               }
+               /* Wait 10 msec for cmd to complete */
+               msleep(10);
+
+               /* Chip deselect */
+               iowrite8(0, &nic->csr->eeprom_ctrl_lo);
+               e100_write_flush(nic); udelay(4);
+       }
+};
+
+/* General technique stolen from the eepro100 driver - very clever */
+static __le16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
+{
+       u32 cmd_addr_data;
+       u16 data = 0;
+       u8 ctrl;
+       int i;
+
+       cmd_addr_data = ((op_read << *addr_len) | addr) << 16;
+
+       /* Chip select */
+       iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
+       e100_write_flush(nic); udelay(4);
+
+       /* Bit-bang to read word from eeprom */
+       for (i = 31; i >= 0; i--) {
+               ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs;
+               iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
+               e100_write_flush(nic); udelay(4);
+
+               iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
+               e100_write_flush(nic); udelay(4);
+
+               /* Eeprom drives a dummy zero to EEDO after receiving
+                * complete address.  Use this to adjust addr_len. */
+               ctrl = ioread8(&nic->csr->eeprom_ctrl_lo);
+               if (!(ctrl & eedo) && i > 16) {
+                       *addr_len -= (i - 16);
+                       i = 17;
+               }
+
+               data = (data << 1) | (ctrl & eedo ? 1 : 0);
+       }
+
+       /* Chip deselect */
+       iowrite8(0, &nic->csr->eeprom_ctrl_lo);
+       e100_write_flush(nic); udelay(4);
+
+       return cpu_to_le16(data);
+};
+
+/* Load entire EEPROM image into driver cache and validate checksum */
+static int e100_eeprom_load(struct nic *nic)
+{
+       u16 addr, addr_len = 8, checksum = 0;
+
+       /* Try reading with an 8-bit addr len to discover actual addr len */
+       e100_eeprom_read(nic, &addr_len, 0);
+       nic->eeprom_wc = 1 << addr_len;
+
+       for (addr = 0; addr < nic->eeprom_wc; addr++) {
+               nic->eeprom[addr] = e100_eeprom_read(nic, &addr_len, addr);
+               if (addr < nic->eeprom_wc - 1)
+                       checksum += le16_to_cpu(nic->eeprom[addr]);
+       }
+
+       /* The checksum, stored in the last word, is calculated such that
+        * the sum of words should be 0xBABA */
+       if (cpu_to_le16(0xBABA - checksum) != nic->eeprom[nic->eeprom_wc - 1]) {
+               netif_err(nic, probe, nic->netdev, "EEPROM corrupted\n");
+               if (!eeprom_bad_csum_allow)
+                       return -EAGAIN;
+       }
+
+       return 0;
+}
+
+/* Save (portion of) driver EEPROM cache to device and update checksum */
+static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
+{
+       u16 addr, addr_len = 8, checksum = 0;
+
+       /* Try reading with an 8-bit addr len to discover actual addr len */
+       e100_eeprom_read(nic, &addr_len, 0);
+       nic->eeprom_wc = 1 << addr_len;
+
+       if (start + count >= nic->eeprom_wc)
+               return -EINVAL;
+
+       for (addr = start; addr < start + count; addr++)
+               e100_eeprom_write(nic, addr_len, addr, nic->eeprom[addr]);
+
+       /* The checksum, stored in the last word, is calculated such that
+        * the sum of words should be 0xBABA */
+       for (addr = 0; addr < nic->eeprom_wc - 1; addr++)
+               checksum += le16_to_cpu(nic->eeprom[addr]);
+       nic->eeprom[nic->eeprom_wc - 1] = cpu_to_le16(0xBABA - checksum);
+       e100_eeprom_write(nic, addr_len, nic->eeprom_wc - 1,
+               nic->eeprom[nic->eeprom_wc - 1]);
+
+       return 0;
+}
+
+#define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */
+#define E100_WAIT_SCB_FAST 20       /* delay like the old code */
+static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
+{
+       unsigned long flags;
+       unsigned int i;
+       int err = 0;
+
+       spin_lock_irqsave(&nic->cmd_lock, flags);
+
+       /* Previous command is accepted when SCB clears */
+       for (i = 0; i < E100_WAIT_SCB_TIMEOUT; i++) {
+               if (likely(!ioread8(&nic->csr->scb.cmd_lo)))
+                       break;
+               cpu_relax();
+               if (unlikely(i > E100_WAIT_SCB_FAST))
+                       udelay(5);
+       }
+       if (unlikely(i == E100_WAIT_SCB_TIMEOUT)) {
+               err = -EAGAIN;
+               goto err_unlock;
+       }
+
+       if (unlikely(cmd != cuc_resume))
+               iowrite32(dma_addr, &nic->csr->scb.gen_ptr);
+       iowrite8(cmd, &nic->csr->scb.cmd_lo);
+
+err_unlock:
+       spin_unlock_irqrestore(&nic->cmd_lock, flags);
+
+       return err;
+}
+
+static int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
+       void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *))
+{
+       struct cb *cb;
+       unsigned long flags;
+       int err = 0;
+
+       spin_lock_irqsave(&nic->cb_lock, flags);
+
+       if (unlikely(!nic->cbs_avail)) {
+               err = -ENOMEM;
+               goto err_unlock;
+       }
+
+       cb = nic->cb_to_use;
+       nic->cb_to_use = cb->next;
+       nic->cbs_avail--;
+       cb->skb = skb;
+
+       if (unlikely(!nic->cbs_avail))
+               err = -ENOSPC;
+
+       cb_prepare(nic, cb, skb);
+
+       /* Order is important otherwise we'll be in a race with h/w:
+        * set S-bit in current first, then clear S-bit in previous. */
+       cb->command |= cpu_to_le16(cb_s);
+       wmb();
+       cb->prev->command &= cpu_to_le16(~cb_s);
+
+       while (nic->cb_to_send != nic->cb_to_use) {
+               if (unlikely(e100_exec_cmd(nic, nic->cuc_cmd,
+                       nic->cb_to_send->dma_addr))) {
+                       /* Ok, here's where things get sticky.  It's
+                        * possible that we can't schedule the command
+                        * because the controller is too busy, so
+                        * let's just queue the command and try again
+                        * when another command is scheduled. */
+                       if (err == -ENOSPC) {
+                               //request a reset
+                               schedule_work(&nic->tx_timeout_task);
+                       }
+                       break;
+               } else {
+                       nic->cuc_cmd = cuc_resume;
+                       nic->cb_to_send = nic->cb_to_send->next;
+               }
+       }
+
+err_unlock:
+       spin_unlock_irqrestore(&nic->cb_lock, flags);
+
+       return err;
+}
+
+static int mdio_read(struct net_device *netdev, int addr, int reg)
+{
+       struct nic *nic = netdev_priv(netdev);
+       return nic->mdio_ctrl(nic, addr, mdi_read, reg, 0);
+}
+
+static void mdio_write(struct net_device *netdev, int addr, int reg, int data)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       nic->mdio_ctrl(nic, addr, mdi_write, reg, data);
+}
+
+/* the standard mdio_ctrl() function for usual MII-compliant hardware */
+static u16 mdio_ctrl_hw(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
+{
+       u32 data_out = 0;
+       unsigned int i;
+       unsigned long flags;
+
+
+       /*
+        * Stratus87247: we shouldn't be writing the MDI control
+        * register until the Ready bit shows True.  Also, since
+        * manipulation of the MDI control registers is a multi-step
+        * procedure it should be done under lock.
+        */
+       spin_lock_irqsave(&nic->mdio_lock, flags);
+       for (i = 100; i; --i) {
+               if (ioread32(&nic->csr->mdi_ctrl) & mdi_ready)
+                       break;
+               udelay(20);
+       }
+       if (unlikely(!i)) {
+               netdev_err(nic->netdev, "e100.mdio_ctrl won't go Ready\n");
+               spin_unlock_irqrestore(&nic->mdio_lock, flags);
+               return 0;               /* No way to indicate timeout error */
+       }
+       iowrite32((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
+
+       for (i = 0; i < 100; i++) {
+               udelay(20);
+               if ((data_out = ioread32(&nic->csr->mdi_ctrl)) & mdi_ready)
+                       break;
+       }
+       spin_unlock_irqrestore(&nic->mdio_lock, flags);
+       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                    "%s:addr=%d, reg=%d, data_in=0x%04X, data_out=0x%04X\n",
+                    dir == mdi_read ? "READ" : "WRITE",
+                    addr, reg, data, data_out);
+       return (u16)data_out;
+}
+
+/* slightly tweaked mdio_ctrl() function for phy_82552_v specifics */
+static u16 mdio_ctrl_phy_82552_v(struct nic *nic,
+                                u32 addr,
+                                u32 dir,
+                                u32 reg,
+                                u16 data)
+{
+       if ((reg == MII_BMCR) && (dir == mdi_write)) {
+               if (data & (BMCR_ANRESTART | BMCR_ANENABLE)) {
+                       u16 advert = mdio_read(nic->netdev, nic->mii.phy_id,
+                                                       MII_ADVERTISE);
+
+                       /*
+                        * Workaround Si issue where sometimes the part will not
+                        * autoneg to 100Mbps even when advertised.
+                        */
+                       if (advert & ADVERTISE_100FULL)
+                               data |= BMCR_SPEED100 | BMCR_FULLDPLX;
+                       else if (advert & ADVERTISE_100HALF)
+                               data |= BMCR_SPEED100;
+               }
+       }
+       return mdio_ctrl_hw(nic, addr, dir, reg, data);
+}
+
+/* Fully software-emulated mdio_ctrl() function for cards without
+ * MII-compliant PHYs.
+ * For now, this is mainly geared towards 80c24 support; in case of further
+ * requirements for other types (i82503, ...?) either extend this mechanism
+ * or split it, whichever is cleaner.
+ */
+static u16 mdio_ctrl_phy_mii_emulated(struct nic *nic,
+                                     u32 addr,
+                                     u32 dir,
+                                     u32 reg,
+                                     u16 data)
+{
+       /* might need to allocate a netdev_priv'ed register array eventually
+        * to be able to record state changes, but for now
+        * some fully hardcoded register handling ought to be ok I guess. */
+
+       if (dir == mdi_read) {
+               switch (reg) {
+               case MII_BMCR:
+                       /* Auto-negotiation, right? */
+                       return  BMCR_ANENABLE |
+                               BMCR_FULLDPLX;
+               case MII_BMSR:
+                       return  BMSR_LSTATUS /* for mii_link_ok() */ |
+                               BMSR_ANEGCAPABLE |
+                               BMSR_10FULL;
+               case MII_ADVERTISE:
+                       /* 80c24 is a "combo card" PHY, right? */
+                       return  ADVERTISE_10HALF |
+                               ADVERTISE_10FULL;
+               default:
+                       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                                    "%s:addr=%d, reg=%d, data=0x%04X: unimplemented emulation!\n",
+                                    dir == mdi_read ? "READ" : "WRITE",
+                                    addr, reg, data);
+                       return 0xFFFF;
+               }
+       } else {
+               switch (reg) {
+               default:
+                       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                                    "%s:addr=%d, reg=%d, data=0x%04X: unimplemented emulation!\n",
+                                    dir == mdi_read ? "READ" : "WRITE",
+                                    addr, reg, data);
+                       return 0xFFFF;
+               }
+       }
+}
+static inline int e100_phy_supports_mii(struct nic *nic)
+{
+       /* for now, just check it by comparing whether we
+          are using MII software emulation.
+       */
+       return (nic->mdio_ctrl != mdio_ctrl_phy_mii_emulated);
+}
+
+static void e100_get_defaults(struct nic *nic)
+{
+       struct param_range rfds = { .min = 16, .max = 256, .count = 256 };
+       struct param_range cbs  = { .min = 64, .max = 256, .count = 128 };
+
+       /* MAC type is encoded as rev ID; exception: ICH is treated as 82559 */
+       nic->mac = (nic->flags & ich) ? mac_82559_D101M : nic->pdev->revision;
+       if (nic->mac == mac_unknown)
+               nic->mac = mac_82557_D100_A;
+
+       nic->params.rfds = rfds;
+       nic->params.cbs = cbs;
+
+       /* Quadwords to DMA into FIFO before starting frame transmit */
+       nic->tx_threshold = 0xE0;
+
+       /* no interrupt for every tx completion, delay = 256us if not 557 */
+       nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf |
+               ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
+
+       /* Template for a freshly allocated RFD */
+       nic->blank_rfd.command = 0;
+       nic->blank_rfd.rbd = cpu_to_le32(0xFFFFFFFF);
+       nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
+
+       /* MII setup */
+       nic->mii.phy_id_mask = 0x1F;
+       nic->mii.reg_num_mask = 0x1F;
+       nic->mii.dev = nic->netdev;
+       nic->mii.mdio_read = mdio_read;
+       nic->mii.mdio_write = mdio_write;
+}
+
+static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
+{
+       struct config *config = &cb->u.config;
+       u8 *c = (u8 *)config;
+
+       cb->command = cpu_to_le16(cb_config);
+
+       memset(config, 0, sizeof(struct config));
+
+       config->byte_count = 0x16;              /* bytes in this struct */
+       config->rx_fifo_limit = 0x8;            /* bytes in FIFO before DMA */
+       config->direct_rx_dma = 0x1;            /* reserved */
+       config->standard_tcb = 0x1;             /* 1=standard, 0=extended */
+       config->standard_stat_counter = 0x1;    /* 1=standard, 0=extended */
+       config->rx_discard_short_frames = 0x1;  /* 1=discard, 0=pass */
+       config->tx_underrun_retry = 0x3;        /* # of underrun retries */
+       if (e100_phy_supports_mii(nic))
+               config->mii_mode = 1;           /* 1=MII mode, 0=i82503 mode */
+       config->pad10 = 0x6;
+       config->no_source_addr_insertion = 0x1; /* 1=no, 0=yes */
+       config->preamble_length = 0x2;          /* 0=1, 1=3, 2=7, 3=15 bytes */
+       config->ifs = 0x6;                      /* x16 = inter frame spacing */
+       config->ip_addr_hi = 0xF2;              /* ARP IP filter - not used */
+       config->pad15_1 = 0x1;
+       config->pad15_2 = 0x1;
+       config->crs_or_cdt = 0x0;               /* 0=CRS only, 1=CRS or CDT */
+       config->fc_delay_hi = 0x40;             /* time delay for fc frame */
+       config->tx_padding = 0x1;               /* 1=pad short frames */
+       config->fc_priority_threshold = 0x7;    /* 7=priority fc disabled */
+       config->pad18 = 0x1;
+       config->full_duplex_pin = 0x1;          /* 1=examine FDX# pin */
+       config->pad20_1 = 0x1F;
+       config->fc_priority_location = 0x1;     /* 1=byte#31, 0=byte#19 */
+       config->pad21_1 = 0x5;
+
+       config->adaptive_ifs = nic->adaptive_ifs;
+       config->loopback = nic->loopback;
+
+       if (nic->mii.force_media && nic->mii.full_duplex)
+               config->full_duplex_force = 0x1;        /* 1=force, 0=auto */
+
+       if (nic->flags & promiscuous || nic->loopback) {
+               config->rx_save_bad_frames = 0x1;       /* 1=save, 0=discard */
+               config->rx_discard_short_frames = 0x0;  /* 1=discard, 0=save */
+               config->promiscuous_mode = 0x1;         /* 1=on, 0=off */
+       }
+
+       if (nic->flags & multicast_all)
+               config->multicast_all = 0x1;            /* 1=accept, 0=no */
+
+       /* disable WoL when up */
+       if (netif_running(nic->netdev) || !(nic->flags & wol_magic))
+               config->magic_packet_disable = 0x1;     /* 1=off, 0=on */
+
+       if (nic->mac >= mac_82558_D101_A4) {
+               config->fc_disable = 0x1;       /* 1=Tx fc off, 0=Tx fc on */
+               config->mwi_enable = 0x1;       /* 1=enable, 0=disable */
+               config->standard_tcb = 0x0;     /* 1=standard, 0=extended */
+               config->rx_long_ok = 0x1;       /* 1=VLANs ok, 0=standard */
+               if (nic->mac >= mac_82559_D101M) {
+                       config->tno_intr = 0x1;         /* TCO stats enable */
+                       /* Enable TCO in extended config */
+                       if (nic->mac >= mac_82551_10) {
+                               config->byte_count = 0x20; /* extended bytes */
+                               config->rx_d102_mode = 0x1; /* GMRC for TCO */
+                       }
+               } else {
+                       config->standard_stat_counter = 0x0;
+               }
+       }
+
+       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                    "[00-07]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
+                    c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
+       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                    "[08-15]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
+                    c[8], c[9], c[10], c[11], c[12], c[13], c[14], c[15]);
+       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                    "[16-23]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
+                    c[16], c[17], c[18], c[19], c[20], c[21], c[22], c[23]);
+}
+
+/*************************************************************************
+*  CPUSaver parameters
+*
+*  All CPUSaver parameters are 16-bit literals that are part of a
+*  "move immediate value" instruction.  By changing the value of
+*  the literal in the instruction before the code is loaded, the
+*  driver can change the algorithm.
+*
+*  INTDELAY - This loads the dead-man timer with its initial value.
+*    When this timer expires the interrupt is asserted, and the
+*    timer is reset each time a new packet is received.  (see
+*    BUNDLEMAX below to set the limit on number of chained packets)
+*    The current default is 0x600 or 1536.  Experiments show that
+*    the value should probably stay within the 0x200 - 0x1000.
+*
+*  BUNDLEMAX -
+*    This sets the maximum number of frames that will be bundled.  In
+*    some situations, such as the TCP windowing algorithm, it may be
+*    better to limit the growth of the bundle size than let it go as
+*    high as it can, because that could cause too much added latency.
+*    The default is six, because this is the number of packets in the
+*    default TCP window size.  A value of 1 would make CPUSaver indicate
+*    an interrupt for every frame received.  If you do not want to put
+*    a limit on the bundle size, set this value to xFFFF.
+*
+*  BUNDLESMALL -
+*    This contains a bit-mask describing the minimum size frame that
+*    will be bundled.  The default masks the lower 7 bits, which means
+*    that any frame less than 128 bytes in length will not be bundled,
+*    but will instead immediately generate an interrupt.  This does
+*    not affect the current bundle in any way.  Any frame that is 128
+*    bytes or large will be bundled normally.  This feature is meant
+*    to provide immediate indication of ACK frames in a TCP environment.
+*    Customers were seeing poor performance when a machine with CPUSaver
+*    enabled was sending but not receiving.  The delay introduced when
+*    the ACKs were received was enough to reduce total throughput, because
+*    the sender would sit idle until the ACK was finally seen.
+*
+*    The current default is 0xFF80, which masks out the lower 7 bits.
+*    This means that any frame which is x7F (127) bytes or smaller
+*    will cause an immediate interrupt.  Because this value must be a
+*    bit mask, there are only a few valid values that can be used.  To
+*    turn this feature off, the driver can write the value xFFFF to the
+*    lower word of this instruction (in the same way that the other
+*    parameters are used).  Likewise, a value of 0xF800 (2047) would
+*    cause an interrupt to be generated for every frame, because all
+*    standard Ethernet frames are <= 2047 bytes in length.
+*************************************************************************/
+
+/* if you wish to disable the ucode functionality, while maintaining the
+ * workarounds it provides, set the following defines to:
+ * BUNDLESMALL 0
+ * BUNDLEMAX 1
+ * INTDELAY 1
+ */
+#define BUNDLESMALL 1
+#define BUNDLEMAX (u16)6
+#define INTDELAY (u16)1536 /* 0x600 */
+
+/* Initialize firmware */
+static const struct firmware *e100_request_firmware(struct nic *nic)
+{
+       const char *fw_name;
+       const struct firmware *fw = nic->fw;
+       u8 timer, bundle, min_size;
+       int err = 0;
+
+       /* do not load u-code for ICH devices */
+       if (nic->flags & ich)
+               return NULL;
+
+       /* Search for ucode match against h/w revision */
+       if (nic->mac == mac_82559_D101M)
+               fw_name = FIRMWARE_D101M;
+       else if (nic->mac == mac_82559_D101S)
+               fw_name = FIRMWARE_D101S;
+       else if (nic->mac == mac_82551_F || nic->mac == mac_82551_10)
+               fw_name = FIRMWARE_D102E;
+       else /* No ucode on other devices */
+               return NULL;
+
+       /* If the firmware has not previously been loaded, request a pointer
+        * to it. If it was previously loaded, we are reinitializing the
+        * adapter, possibly in a resume from hibernate, in which case
+        * request_firmware() cannot be used.
+        */
+       if (!fw)
+               err = request_firmware(&fw, fw_name, &nic->pdev->dev);
+
+       if (err) {
+               netif_err(nic, probe, nic->netdev,
+                         "Failed to load firmware \"%s\": %d\n",
+                         fw_name, err);
+               return ERR_PTR(err);
+       }
+
+       /* Firmware should be precisely UCODE_SIZE (words) plus three bytes
+          indicating the offsets for BUNDLESMALL, BUNDLEMAX, INTDELAY */
+       if (fw->size != UCODE_SIZE * 4 + 3) {
+               netif_err(nic, probe, nic->netdev,
+                         "Firmware \"%s\" has wrong size %zu\n",
+                         fw_name, fw->size);
+               release_firmware(fw);
+               return ERR_PTR(-EINVAL);
+       }
+
+       /* Read timer, bundle and min_size from end of firmware blob */
+       timer = fw->data[UCODE_SIZE * 4];
+       bundle = fw->data[UCODE_SIZE * 4 + 1];
+       min_size = fw->data[UCODE_SIZE * 4 + 2];
+
+       if (timer >= UCODE_SIZE || bundle >= UCODE_SIZE ||
+           min_size >= UCODE_SIZE) {
+               netif_err(nic, probe, nic->netdev,
+                         "\"%s\" has bogus offset values (0x%x,0x%x,0x%x)\n",
+                         fw_name, timer, bundle, min_size);
+               release_firmware(fw);
+               return ERR_PTR(-EINVAL);
+       }
+
+       /* OK, firmware is validated and ready to use. Save a pointer
+        * to it in the nic */
+       nic->fw = fw;
+       return fw;
+}
+
+static void e100_setup_ucode(struct nic *nic, struct cb *cb,
+                            struct sk_buff *skb)
+{
+       const struct firmware *fw = (void *)skb;
+       u8 timer, bundle, min_size;
+
+       /* It's not a real skb; we just abused the fact that e100_exec_cb
+          will pass it through to here... */
+       cb->skb = NULL;
+
+       /* firmware is stored as little endian already */
+       memcpy(cb->u.ucode, fw->data, UCODE_SIZE * 4);
+
+       /* Read timer, bundle and min_size from end of firmware blob */
+       timer = fw->data[UCODE_SIZE * 4];
+       bundle = fw->data[UCODE_SIZE * 4 + 1];
+       min_size = fw->data[UCODE_SIZE * 4 + 2];
+
+       /* Insert user-tunable settings in cb->u.ucode */
+       cb->u.ucode[timer] &= cpu_to_le32(0xFFFF0000);
+       cb->u.ucode[timer] |= cpu_to_le32(INTDELAY);
+       cb->u.ucode[bundle] &= cpu_to_le32(0xFFFF0000);
+       cb->u.ucode[bundle] |= cpu_to_le32(BUNDLEMAX);
+       cb->u.ucode[min_size] &= cpu_to_le32(0xFFFF0000);
+       cb->u.ucode[min_size] |= cpu_to_le32((BUNDLESMALL) ? 0xFFFF : 0xFF80);
+
+       cb->command = cpu_to_le16(cb_ucode | cb_el);
+}
+
+static inline int e100_load_ucode_wait(struct nic *nic)
+{
+       const struct firmware *fw;
+       int err = 0, counter = 50;
+       struct cb *cb = nic->cb_to_clean;
+
+       fw = e100_request_firmware(nic);
+       /* If it's NULL, then no ucode is required */
+       if (!fw || IS_ERR(fw))
+               return PTR_ERR(fw);
+
+       if ((err = e100_exec_cb(nic, (void *)fw, e100_setup_ucode)))
+               netif_err(nic, probe, nic->netdev,
+                         "ucode cmd failed with error %d\n", err);
+
+       /* must restart cuc */
+       nic->cuc_cmd = cuc_start;
+
+       /* wait for completion */
+       e100_write_flush(nic);
+       udelay(10);
+
+       /* wait for possibly (ouch) 500ms */
+       while (!(cb->status & cpu_to_le16(cb_complete))) {
+               msleep(10);
+               if (!--counter) break;
+       }
+
+       /* ack any interrupts, something could have been set */
+       iowrite8(~0, &nic->csr->scb.stat_ack);
+
+       /* if the command failed, or is not OK, notify and return */
+       if (!counter || !(cb->status & cpu_to_le16(cb_ok))) {
+               netif_err(nic, probe, nic->netdev, "ucode load failed\n");
+               err = -EPERM;
+       }
+
+       return err;
+}
+
+static void e100_setup_iaaddr(struct nic *nic, struct cb *cb,
+       struct sk_buff *skb)
+{
+       cb->command = cpu_to_le16(cb_iaaddr);
+       memcpy(cb->u.iaaddr, nic->netdev->dev_addr, ETH_ALEN);
+}
+
+static void e100_dump(struct nic *nic, struct cb *cb, struct sk_buff *skb)
+{
+       cb->command = cpu_to_le16(cb_dump);
+       cb->u.dump_buffer_addr = cpu_to_le32(nic->dma_addr +
+               offsetof(struct mem, dump_buf));
+}
+
+static int e100_phy_check_without_mii(struct nic *nic)
+{
+       u8 phy_type;
+       int without_mii;
+
+       phy_type = (nic->eeprom[eeprom_phy_iface] >> 8) & 0x0f;
+
+       switch (phy_type) {
+       case NoSuchPhy: /* Non-MII PHY; UNTESTED! */
+       case I82503: /* Non-MII PHY; UNTESTED! */
+       case S80C24: /* Non-MII PHY; tested and working */
+               /* paragraph from the FreeBSD driver, "FXP_PHY_80C24":
+                * The Seeq 80c24 AutoDUPLEX(tm) Ethernet Interface Adapter
+                * doesn't have a programming interface of any sort.  The
+                * media is sensed automatically based on how the link partner
+                * is configured.  This is, in essence, manual configuration.
+                */
+               netif_info(nic, probe, nic->netdev,
+                          "found MII-less i82503 or 80c24 or other PHY\n");
+
+               nic->mdio_ctrl = mdio_ctrl_phy_mii_emulated;
+               nic->mii.phy_id = 0; /* is this ok for an MII-less PHY? */
+
+               /* these might be needed for certain MII-less cards...
+                * nic->flags |= ich;
+                * nic->flags |= ich_10h_workaround; */
+
+               without_mii = 1;
+               break;
+       default:
+               without_mii = 0;
+               break;
+       }
+       return without_mii;
+}
+
+#define NCONFIG_AUTO_SWITCH    0x0080
+#define MII_NSC_CONG           MII_RESV1
+#define NSC_CONG_ENABLE                0x0100
+#define NSC_CONG_TXREADY       0x0400
+#define ADVERTISE_FC_SUPPORTED 0x0400
+static int e100_phy_init(struct nic *nic)
+{
+       struct net_device *netdev = nic->netdev;
+       u32 addr;
+       u16 bmcr, stat, id_lo, id_hi, cong;
+
+       /* Discover phy addr by searching addrs in order {1,0,2,..., 31} */
+       for (addr = 0; addr < 32; addr++) {
+               nic->mii.phy_id = (addr == 0) ? 1 : (addr == 1) ? 0 : addr;
+               bmcr = mdio_read(netdev, nic->mii.phy_id, MII_BMCR);
+               stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
+               stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
+               if (!((bmcr == 0xFFFF) || ((stat == 0) && (bmcr == 0))))
+                       break;
+       }
+       if (addr == 32) {
+               /* uhoh, no PHY detected: check whether we seem to be some
+                * weird, rare variant which is *known* to not have any MII.
+                * But do this AFTER MII checking only, since this does
+                * lookup of EEPROM values which may easily be unreliable. */
+               if (e100_phy_check_without_mii(nic))
+                       return 0; /* simply return and hope for the best */
+               else {
+                       /* for unknown cases log a fatal error */
+                       netif_err(nic, hw, nic->netdev,
+                                 "Failed to locate any known PHY, aborting\n");
+                       return -EAGAIN;
+               }
+       } else
+               netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                            "phy_addr = %d\n", nic->mii.phy_id);
+
+       /* Get phy ID */
+       id_lo = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID1);
+       id_hi = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID2);
+       nic->phy = (u32)id_hi << 16 | (u32)id_lo;
+       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                    "phy ID = 0x%08X\n", nic->phy);
+
+       /* Select the phy and isolate the rest */
+       for (addr = 0; addr < 32; addr++) {
+               if (addr != nic->mii.phy_id) {
+                       mdio_write(netdev, addr, MII_BMCR, BMCR_ISOLATE);
+               } else if (nic->phy != phy_82552_v) {
+                       bmcr = mdio_read(netdev, addr, MII_BMCR);
+                       mdio_write(netdev, addr, MII_BMCR,
+                               bmcr & ~BMCR_ISOLATE);
+               }
+       }
+       /*
+        * Workaround for 82552:
+        * Clear the ISOLATE bit on selected phy_id last (mirrored on all
+        * other phy_id's) using bmcr value from addr discovery loop above.
+        */
+       if (nic->phy == phy_82552_v)
+               mdio_write(netdev, nic->mii.phy_id, MII_BMCR,
+                       bmcr & ~BMCR_ISOLATE);
+
+       /* Handle National tx phys */
+#define NCS_PHY_MODEL_MASK     0xFFF0FFFF
+       if ((nic->phy & NCS_PHY_MODEL_MASK) == phy_nsc_tx) {
+               /* Disable congestion control */
+               cong = mdio_read(netdev, nic->mii.phy_id, MII_NSC_CONG);
+               cong |= NSC_CONG_TXREADY;
+               cong &= ~NSC_CONG_ENABLE;
+               mdio_write(netdev, nic->mii.phy_id, MII_NSC_CONG, cong);
+       }
+
+       if (nic->phy == phy_82552_v) {
+               u16 advert = mdio_read(netdev, nic->mii.phy_id, MII_ADVERTISE);
+
+               /* assign special tweaked mdio_ctrl() function */
+               nic->mdio_ctrl = mdio_ctrl_phy_82552_v;
+
+               /* Workaround Si not advertising flow-control during autoneg */
+               advert |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
+               mdio_write(netdev, nic->mii.phy_id, MII_ADVERTISE, advert);
+
+               /* Reset for the above changes to take effect */
+               bmcr = mdio_read(netdev, nic->mii.phy_id, MII_BMCR);
+               bmcr |= BMCR_RESET;
+               mdio_write(netdev, nic->mii.phy_id, MII_BMCR, bmcr);
+       } else if ((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&
+          (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&
+               !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {
+               /* enable/disable MDI/MDI-X auto-switching. */
+               mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,
+                               nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);
+       }
+
+       return 0;
+}
+
+static int e100_hw_init(struct nic *nic)
+{
+       int err = 0;
+
+       e100_hw_reset(nic);
+
+       netif_err(nic, hw, nic->netdev, "e100_hw_init\n");
+       if (!in_interrupt() && (err = e100_self_test(nic)))
+               return err;
+
+       if ((err = e100_phy_init(nic)))
+               return err;
+       if ((err = e100_exec_cmd(nic, cuc_load_base, 0)))
+               return err;
+       if ((err = e100_exec_cmd(nic, ruc_load_base, 0)))
+               return err;
+       if ((err = e100_load_ucode_wait(nic)))
+               return err;
+       if ((err = e100_exec_cb(nic, NULL, e100_configure)))
+               return err;
+       if ((err = e100_exec_cb(nic, NULL, e100_setup_iaaddr)))
+               return err;
+       if ((err = e100_exec_cmd(nic, cuc_dump_addr,
+               nic->dma_addr + offsetof(struct mem, stats))))
+               return err;
+       if ((err = e100_exec_cmd(nic, cuc_dump_reset, 0)))
+               return err;
+
+       e100_disable_irq(nic);
+
+       return 0;
+}
+
+static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb)
+{
+       struct net_device *netdev = nic->netdev;
+       struct netdev_hw_addr *ha;
+       u16 i, count = min(netdev_mc_count(netdev), E100_MAX_MULTICAST_ADDRS);
+
+       cb->command = cpu_to_le16(cb_multi);
+       cb->u.multi.count = cpu_to_le16(count * ETH_ALEN);
+       i = 0;
+       netdev_for_each_mc_addr(ha, netdev) {
+               if (i == count)
+                       break;
+               memcpy(&cb->u.multi.addr[i++ * ETH_ALEN], &ha->addr,
+                       ETH_ALEN);
+       }
+}
+
+static void e100_set_multicast_list(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       netif_printk(nic, hw, KERN_DEBUG, nic->netdev,
+                    "mc_count=%d, flags=0x%04X\n",
+                    netdev_mc_count(netdev), netdev->flags);
+
+       if (netdev->flags & IFF_PROMISC)
+               nic->flags |= promiscuous;
+       else
+               nic->flags &= ~promiscuous;
+
+       if (netdev->flags & IFF_ALLMULTI ||
+               netdev_mc_count(netdev) > E100_MAX_MULTICAST_ADDRS)
+               nic->flags |= multicast_all;
+       else
+               nic->flags &= ~multicast_all;
+
+       e100_exec_cb(nic, NULL, e100_configure);
+       e100_exec_cb(nic, NULL, e100_multi);
+}
+
+static void e100_update_stats(struct nic *nic)
+{
+       struct net_device *dev = nic->netdev;
+       struct net_device_stats *ns = &dev->stats;
+       struct stats *s = &nic->mem->stats;
+       __le32 *complete = (nic->mac < mac_82558_D101_A4) ? &s->fc_xmt_pause :
+               (nic->mac < mac_82559_D101M) ? (__le32 *)&s->xmt_tco_frames :
+               &s->complete;
+
+       /* Device's stats reporting may take several microseconds to
+        * complete, so we're always waiting for results of the
+        * previous command. */
+
+       if (*complete == cpu_to_le32(cuc_dump_reset_complete)) {
+               *complete = 0;
+               nic->tx_frames = le32_to_cpu(s->tx_good_frames);
+               nic->tx_collisions = le32_to_cpu(s->tx_total_collisions);
+               ns->tx_aborted_errors += le32_to_cpu(s->tx_max_collisions);
+               ns->tx_window_errors += le32_to_cpu(s->tx_late_collisions);
+               ns->tx_carrier_errors += le32_to_cpu(s->tx_lost_crs);
+               ns->tx_fifo_errors += le32_to_cpu(s->tx_underruns);
+               ns->collisions += nic->tx_collisions;
+               ns->tx_errors += le32_to_cpu(s->tx_max_collisions) +
+                       le32_to_cpu(s->tx_lost_crs);
+               ns->rx_length_errors += le32_to_cpu(s->rx_short_frame_errors) +
+                       nic->rx_over_length_errors;
+               ns->rx_crc_errors += le32_to_cpu(s->rx_crc_errors);
+               ns->rx_frame_errors += le32_to_cpu(s->rx_alignment_errors);
+               ns->rx_over_errors += le32_to_cpu(s->rx_overrun_errors);
+               ns->rx_fifo_errors += le32_to_cpu(s->rx_overrun_errors);
+               ns->rx_missed_errors += le32_to_cpu(s->rx_resource_errors);
+               ns->rx_errors += le32_to_cpu(s->rx_crc_errors) +
+                       le32_to_cpu(s->rx_alignment_errors) +
+                       le32_to_cpu(s->rx_short_frame_errors) +
+                       le32_to_cpu(s->rx_cdt_errors);
+               nic->tx_deferred += le32_to_cpu(s->tx_deferred);
+               nic->tx_single_collisions +=
+                       le32_to_cpu(s->tx_single_collisions);
+               nic->tx_multiple_collisions +=
+                       le32_to_cpu(s->tx_multiple_collisions);
+               if (nic->mac >= mac_82558_D101_A4) {
+                       nic->tx_fc_pause += le32_to_cpu(s->fc_xmt_pause);
+                       nic->rx_fc_pause += le32_to_cpu(s->fc_rcv_pause);
+                       nic->rx_fc_unsupported +=
+                               le32_to_cpu(s->fc_rcv_unsupported);
+                       if (nic->mac >= mac_82559_D101M) {
+                               nic->tx_tco_frames +=
+                                       le16_to_cpu(s->xmt_tco_frames);
+                               nic->rx_tco_frames +=
+                                       le16_to_cpu(s->rcv_tco_frames);
+                       }
+               }
+       }
+
+
+       if (e100_exec_cmd(nic, cuc_dump_reset, 0))
+               netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
+                            "exec cuc_dump_reset failed\n");
+}
+
+static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex)
+{
+       /* Adjust inter-frame-spacing (IFS) between two transmits if
+        * we're getting collisions on a half-duplex connection. */
+
+       if (duplex == DUPLEX_HALF) {
+               u32 prev = nic->adaptive_ifs;
+               u32 min_frames = (speed == SPEED_100) ? 1000 : 100;
+
+               if ((nic->tx_frames / 32 < nic->tx_collisions) &&
+                  (nic->tx_frames > min_frames)) {
+                       if (nic->adaptive_ifs < 60)
+                               nic->adaptive_ifs += 5;
+               } else if (nic->tx_frames < min_frames) {
+                       if (nic->adaptive_ifs >= 5)
+                               nic->adaptive_ifs -= 5;
+               }
+               if (nic->adaptive_ifs != prev)
+                       e100_exec_cb(nic, NULL, e100_configure);
+       }
+}
+
+static void e100_watchdog(unsigned long data)
+{
+       struct nic *nic = (struct nic *)data;
+       struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
+       u32 speed;
+
+       netif_printk(nic, timer, KERN_DEBUG, nic->netdev,
+                    "right now = %ld\n", jiffies);
+
+       /* mii library handles link maintenance tasks */
+
+       mii_ethtool_gset(&nic->mii, &cmd);
+       speed = ethtool_cmd_speed(&cmd);
+
+       if (mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) {
+               netdev_info(nic->netdev, "NIC Link is Up %u Mbps %s Duplex\n",
+                           speed == SPEED_100 ? 100 : 10,
+                           cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
+       } else if (!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) {
+               netdev_info(nic->netdev, "NIC Link is Down\n");
+       }
+
+       mii_check_link(&nic->mii);
+
+       /* Software generated interrupt to recover from (rare) Rx
+        * allocation failure.
+        * Unfortunately have to use a spinlock to not re-enable interrupts
+        * accidentally, due to hardware that shares a register between the
+        * interrupt mask bit and the SW Interrupt generation bit */
+       spin_lock_irq(&nic->cmd_lock);
+       iowrite8(ioread8(&nic->csr->scb.cmd_hi) | irq_sw_gen,&nic->csr->scb.cmd_hi);
+       e100_write_flush(nic);
+       spin_unlock_irq(&nic->cmd_lock);
+
+       e100_update_stats(nic);
+       e100_adjust_adaptive_ifs(nic, speed, cmd.duplex);
+
+       if (nic->mac <= mac_82557_D100_C)
+               /* Issue a multicast command to workaround a 557 lock up */
+               e100_set_multicast_list(nic->netdev);
+
+       if (nic->flags & ich && speed == SPEED_10 && cmd.duplex == DUPLEX_HALF)
+               /* Need SW workaround for ICH[x] 10Mbps/half duplex Tx hang. */
+               nic->flags |= ich_10h_workaround;
+       else
+               nic->flags &= ~ich_10h_workaround;
+
+       mod_timer(&nic->watchdog,
+                 round_jiffies(jiffies + E100_WATCHDOG_PERIOD));
+}
+
+static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
+       struct sk_buff *skb)
+{
+       cb->command = nic->tx_command;
+       /* interrupt every 16 packets regardless of delay */
+       if ((nic->cbs_avail & ~15) == nic->cbs_avail)
+               cb->command |= cpu_to_le16(cb_i);
+       cb->u.tcb.tbd_array = cb->dma_addr + offsetof(struct cb, u.tcb.tbd);
+       cb->u.tcb.tcb_byte_count = 0;
+       cb->u.tcb.threshold = nic->tx_threshold;
+       cb->u.tcb.tbd_count = 1;
+       cb->u.tcb.tbd.buf_addr = cpu_to_le32(pci_map_single(nic->pdev,
+               skb->data, skb->len, PCI_DMA_TODEVICE));
+       /* check for mapping failure? */
+       cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
+}
+
+static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,
+                                  struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+       int err;
+
+       if (nic->flags & ich_10h_workaround) {
+               /* SW workaround for ICH[x] 10Mbps/half duplex Tx hang.
+                  Issue a NOP command followed by a 1us delay before
+                  issuing the Tx command. */
+               if (e100_exec_cmd(nic, cuc_nop, 0))
+                       netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
+                                    "exec cuc_nop failed\n");
+               udelay(1);
+       }
+
+       err = e100_exec_cb(nic, skb, e100_xmit_prepare);
+
+       switch (err) {
+       case -ENOSPC:
+               /* We queued the skb, but now we're out of space. */
+               netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
+                            "No space for CB\n");
+               netif_stop_queue(netdev);
+               break;
+       case -ENOMEM:
+               /* This is a hard error - log it. */
+               netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
+                            "Out of Tx resources, returning skb\n");
+               netif_stop_queue(netdev);
+               return NETDEV_TX_BUSY;
+       }
+
+       return NETDEV_TX_OK;
+}
+
+static int e100_tx_clean(struct nic *nic)
+{
+       struct net_device *dev = nic->netdev;
+       struct cb *cb;
+       int tx_cleaned = 0;
+
+       spin_lock(&nic->cb_lock);
+
+       /* Clean CBs marked complete */
+       for (cb = nic->cb_to_clean;
+           cb->status & cpu_to_le16(cb_complete);
+           cb = nic->cb_to_clean = cb->next) {
+               rmb(); /* read skb after status */
+               netif_printk(nic, tx_done, KERN_DEBUG, nic->netdev,
+                            "cb[%d]->status = 0x%04X\n",
+                            (int)(((void*)cb - (void*)nic->cbs)/sizeof(struct cb)),
+                            cb->status);
+
+               if (likely(cb->skb != NULL)) {
+                       dev->stats.tx_packets++;
+                       dev->stats.tx_bytes += cb->skb->len;
+
+                       pci_unmap_single(nic->pdev,
+                               le32_to_cpu(cb->u.tcb.tbd.buf_addr),
+                               le16_to_cpu(cb->u.tcb.tbd.size),
+                               PCI_DMA_TODEVICE);
+                       dev_kfree_skb_any(cb->skb);
+                       cb->skb = NULL;
+                       tx_cleaned = 1;
+               }
+               cb->status = 0;
+               nic->cbs_avail++;
+       }
+
+       spin_unlock(&nic->cb_lock);
+
+       /* Recover from running out of Tx resources in xmit_frame */
+       if (unlikely(tx_cleaned && netif_queue_stopped(nic->netdev)))
+               netif_wake_queue(nic->netdev);
+
+       return tx_cleaned;
+}
+
+static void e100_clean_cbs(struct nic *nic)
+{
+       if (nic->cbs) {
+               while (nic->cbs_avail != nic->params.cbs.count) {
+                       struct cb *cb = nic->cb_to_clean;
+                       if (cb->skb) {
+                               pci_unmap_single(nic->pdev,
+                                       le32_to_cpu(cb->u.tcb.tbd.buf_addr),
+                                       le16_to_cpu(cb->u.tcb.tbd.size),
+                                       PCI_DMA_TODEVICE);
+                               dev_kfree_skb(cb->skb);
+                       }
+                       nic->cb_to_clean = nic->cb_to_clean->next;
+                       nic->cbs_avail++;
+               }
+               pci_pool_free(nic->cbs_pool, nic->cbs, nic->cbs_dma_addr);
+               nic->cbs = NULL;
+               nic->cbs_avail = 0;
+       }
+       nic->cuc_cmd = cuc_start;
+       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean =
+               nic->cbs;
+}
+
+static int e100_alloc_cbs(struct nic *nic)
+{
+       struct cb *cb;
+       unsigned int i, count = nic->params.cbs.count;
+
+       nic->cuc_cmd = cuc_start;
+       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;
+       nic->cbs_avail = 0;
+
+       nic->cbs = pci_pool_alloc(nic->cbs_pool, GFP_KERNEL,
+                                 &nic->cbs_dma_addr);
+       if (!nic->cbs)
+               return -ENOMEM;
+       memset(nic->cbs, 0, count * sizeof(struct cb));
+
+       for (cb = nic->cbs, i = 0; i < count; cb++, i++) {
+               cb->next = (i + 1 < count) ? cb + 1 : nic->cbs;
+               cb->prev = (i == 0) ? nic->cbs + count - 1 : cb - 1;
+
+               cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb);
+               cb->link = cpu_to_le32(nic->cbs_dma_addr +
+                       ((i+1) % count) * sizeof(struct cb));
+       }
+
+       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs;
+       nic->cbs_avail = count;
+
+       return 0;
+}
+
+static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
+{
+       if (!nic->rxs) return;
+       if (RU_SUSPENDED != nic->ru_running) return;
+
+       /* handle init time starts */
+       if (!rx) rx = nic->rxs;
+
+       /* (Re)start RU if suspended or idle and RFA is non-NULL */
+       if (rx->skb) {
+               e100_exec_cmd(nic, ruc_start, rx->dma_addr);
+               nic->ru_running = RU_RUNNING;
+       }
+}
+
+#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
+static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
+{
+       if (!(rx->skb = netdev_alloc_skb_ip_align(nic->netdev, RFD_BUF_LEN)))
+               return -ENOMEM;
+
+       /* Init, and map the RFD. */
+       skb_copy_to_linear_data(rx->skb, &nic->blank_rfd, sizeof(struct rfd));
+       rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,
+               RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
+
+       if (pci_dma_mapping_error(nic->pdev, rx->dma_addr)) {
+               dev_kfree_skb_any(rx->skb);
+               rx->skb = NULL;
+               rx->dma_addr = 0;
+               return -ENOMEM;
+       }
+
+       /* Link the RFD to end of RFA by linking previous RFD to
+        * this one.  We are safe to touch the previous RFD because
+        * it is protected by the before last buffer's el bit being set */
+       if (rx->prev->skb) {
+               struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data;
+               put_unaligned_le32(rx->dma_addr, &prev_rfd->link);
+               pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr,
+                       sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
+       }
+
+       return 0;
+}
+
+static int e100_rx_indicate(struct nic *nic, struct rx *rx,
+       unsigned int *work_done, unsigned int work_to_do)
+{
+       struct net_device *dev = nic->netdev;
+       struct sk_buff *skb = rx->skb;
+       struct rfd *rfd = (struct rfd *)skb->data;
+       u16 rfd_status, actual_size;
+
+       if (unlikely(work_done && *work_done >= work_to_do))
+               return -EAGAIN;
+
+       /* Need to sync before taking a peek at cb_complete bit */
+       pci_dma_sync_single_for_cpu(nic->pdev, rx->dma_addr,
+               sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
+       rfd_status = le16_to_cpu(rfd->status);
+
+       netif_printk(nic, rx_status, KERN_DEBUG, nic->netdev,
+                    "status=0x%04X\n", rfd_status);
+       rmb(); /* read size after status bit */
+
+       /* If data isn't ready, nothing to indicate */
+       if (unlikely(!(rfd_status & cb_complete))) {
+               /* If the next buffer has the el bit, but we think the receiver
+                * is still running, check to see if it really stopped while
+                * we had interrupts off.
+                * This allows for a fast restart without re-enabling
+                * interrupts */
+               if ((le16_to_cpu(rfd->command) & cb_el) &&
+                   (RU_RUNNING == nic->ru_running))
+
+                       if (ioread8(&nic->csr->scb.status) & rus_no_res)
+                               nic->ru_running = RU_SUSPENDED;
+               pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
+                                              sizeof(struct rfd),
+                                              PCI_DMA_FROMDEVICE);
+               return -ENODATA;
+       }
+
+       /* Get actual data size */
+       actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF;
+       if (unlikely(actual_size > RFD_BUF_LEN - sizeof(struct rfd)))
+               actual_size = RFD_BUF_LEN - sizeof(struct rfd);
+
+       /* Get data */
+       pci_unmap_single(nic->pdev, rx->dma_addr,
+               RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
+
+       /* If this buffer has the el bit, but we think the receiver
+        * is still running, check to see if it really stopped while
+        * we had interrupts off.
+        * This allows for a fast restart without re-enabling interrupts.
+        * This can happen when the RU sees the size change but also sees
+        * the el bit set. */
+       if ((le16_to_cpu(rfd->command) & cb_el) &&
+           (RU_RUNNING == nic->ru_running)) {
+
+           if (ioread8(&nic->csr->scb.status) & rus_no_res)
+               nic->ru_running = RU_SUSPENDED;
+       }
+
+       /* Pull off the RFD and put the actual data (minus eth hdr) */
+       skb_reserve(skb, sizeof(struct rfd));
+       skb_put(skb, actual_size);
+       skb->protocol = eth_type_trans(skb, nic->netdev);
+
+       if (unlikely(!(rfd_status & cb_ok))) {
+               /* Don't indicate if hardware indicates errors */
+               dev_kfree_skb_any(skb);
+       } else if (actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN) {
+               /* Don't indicate oversized frames */
+               nic->rx_over_length_errors++;
+               dev_kfree_skb_any(skb);
+       } else {
+               dev->stats.rx_packets++;
+               dev->stats.rx_bytes += actual_size;
+               netif_receive_skb(skb);
+               if (work_done)
+                       (*work_done)++;
+       }
+
+       rx->skb = NULL;
+
+       return 0;
+}
+
+static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
+       unsigned int work_to_do)
+{
+       struct rx *rx;
+       int restart_required = 0, err = 0;
+       struct rx *old_before_last_rx, *new_before_last_rx;
+       struct rfd *old_before_last_rfd, *new_before_last_rfd;
+
+       /* Indicate newly arrived packets */
+       for (rx = nic->rx_to_clean; rx->skb; rx = nic->rx_to_clean = rx->next) {
+               err = e100_rx_indicate(nic, rx, work_done, work_to_do);
+               /* Hit quota or no more to clean */
+               if (-EAGAIN == err || -ENODATA == err)
+                       break;
+       }
+
+
+       /* On EAGAIN, hit quota so have more work to do, restart once
+        * cleanup is complete.
+        * Else, are we already rnr? then pay attention!!! this ensures that
+        * the state machine progression never allows a start with a
+        * partially cleaned list, avoiding a race between hardware
+        * and rx_to_clean when in NAPI mode */
+       if (-EAGAIN != err && RU_SUSPENDED == nic->ru_running)
+               restart_required = 1;
+
+       old_before_last_rx = nic->rx_to_use->prev->prev;
+       old_before_last_rfd = (struct rfd *)old_before_last_rx->skb->data;
+
+       /* Alloc new skbs to refill list */
+       for (rx = nic->rx_to_use; !rx->skb; rx = nic->rx_to_use = rx->next) {
+               if (unlikely(e100_rx_alloc_skb(nic, rx)))
+                       break; /* Better luck next time (see watchdog) */
+       }
+
+       new_before_last_rx = nic->rx_to_use->prev->prev;
+       if (new_before_last_rx != old_before_last_rx) {
+               /* Set the el-bit on the buffer that is before the last buffer.
+                * This lets us update the next pointer on the last buffer
+                * without worrying about hardware touching it.
+                * We set the size to 0 to prevent hardware from touching this
+                * buffer.
+                * When the hardware hits the before last buffer with el-bit
+                * and size of 0, it will RNR interrupt, the RUS will go into
+                * the No Resources state.  It will not complete nor write to
+                * this buffer. */
+               new_before_last_rfd =
+                       (struct rfd *)new_before_last_rx->skb->data;
+               new_before_last_rfd->size = 0;
+               new_before_last_rfd->command |= cpu_to_le16(cb_el);
+               pci_dma_sync_single_for_device(nic->pdev,
+                       new_before_last_rx->dma_addr, sizeof(struct rfd),
+                       PCI_DMA_BIDIRECTIONAL);
+
+               /* Now that we have a new stopping point, we can clear the old
+                * stopping point.  We must sync twice to get the proper
+                * ordering on the hardware side of things. */
+               old_before_last_rfd->command &= ~cpu_to_le16(cb_el);
+               pci_dma_sync_single_for_device(nic->pdev,
+                       old_before_last_rx->dma_addr, sizeof(struct rfd),
+                       PCI_DMA_BIDIRECTIONAL);
+               old_before_last_rfd->size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
+               pci_dma_sync_single_for_device(nic->pdev,
+                       old_before_last_rx->dma_addr, sizeof(struct rfd),
+                       PCI_DMA_BIDIRECTIONAL);
+       }
+
+       if (restart_required) {
+               // ack the rnr?
+               iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
+               e100_start_receiver(nic, nic->rx_to_clean);
+               if (work_done)
+                       (*work_done)++;
+       }
+}
+
+static void e100_rx_clean_list(struct nic *nic)
+{
+       struct rx *rx;
+       unsigned int i, count = nic->params.rfds.count;
+
+       nic->ru_running = RU_UNINITIALIZED;
+
+       if (nic->rxs) {
+               for (rx = nic->rxs, i = 0; i < count; rx++, i++) {
+                       if (rx->skb) {
+                               pci_unmap_single(nic->pdev, rx->dma_addr,
+                                       RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
+                               dev_kfree_skb(rx->skb);
+                       }
+               }
+               kfree(nic->rxs);
+               nic->rxs = NULL;
+       }
+
+       nic->rx_to_use = nic->rx_to_clean = NULL;
+}
+
+static int e100_rx_alloc_list(struct nic *nic)
+{
+       struct rx *rx;
+       unsigned int i, count = nic->params.rfds.count;
+       struct rfd *before_last;
+
+       nic->rx_to_use = nic->rx_to_clean = NULL;
+       nic->ru_running = RU_UNINITIALIZED;
+
+       if (!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
+               return -ENOMEM;
+
+       for (rx = nic->rxs, i = 0; i < count; rx++, i++) {
+               rx->next = (i + 1 < count) ? rx + 1 : nic->rxs;
+               rx->prev = (i == 0) ? nic->rxs + count - 1 : rx - 1;
+               if (e100_rx_alloc_skb(nic, rx)) {
+                       e100_rx_clean_list(nic);
+                       return -ENOMEM;
+               }
+       }
+       /* Set the el-bit on the buffer that is before the last buffer.
+        * This lets us update the next pointer on the last buffer without
+        * worrying about hardware touching it.
+        * We set the size to 0 to prevent hardware from touching this buffer.
+        * When the hardware hits the before last buffer with el-bit and size
+        * of 0, it will RNR interrupt, the RU will go into the No Resources
+        * state.  It will not complete nor write to this buffer. */
+       rx = nic->rxs->prev->prev;
+       before_last = (struct rfd *)rx->skb->data;
+       before_last->command |= cpu_to_le16(cb_el);
+       before_last->size = 0;
+       pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
+               sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
+
+       nic->rx_to_use = nic->rx_to_clean = nic->rxs;
+       nic->ru_running = RU_SUSPENDED;
+
+       return 0;
+}
+
+static irqreturn_t e100_intr(int irq, void *dev_id)
+{
+       struct net_device *netdev = dev_id;
+       struct nic *nic = netdev_priv(netdev);
+       u8 stat_ack = ioread8(&nic->csr->scb.stat_ack);
+
+       netif_printk(nic, intr, KERN_DEBUG, nic->netdev,
+                    "stat_ack = 0x%02X\n", stat_ack);
+
+       if (stat_ack == stat_ack_not_ours ||    /* Not our interrupt */
+          stat_ack == stat_ack_not_present)    /* Hardware is ejected */
+               return IRQ_NONE;
+
+       /* Ack interrupt(s) */
+       iowrite8(stat_ack, &nic->csr->scb.stat_ack);
+
+       /* We hit Receive No Resource (RNR); restart RU after cleaning */
+       if (stat_ack & stat_ack_rnr)
+               nic->ru_running = RU_SUSPENDED;
+
+       if (likely(napi_schedule_prep(&nic->napi))) {
+               e100_disable_irq(nic);
+               __napi_schedule(&nic->napi);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int e100_poll(struct napi_struct *napi, int budget)
+{
+       struct nic *nic = container_of(napi, struct nic, napi);
+       unsigned int work_done = 0;
+
+       e100_rx_clean(nic, &work_done, budget);
+       e100_tx_clean(nic);
+
+       /* If budget not fully consumed, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               e100_enable_irq(nic);
+       }
+
+       return work_done;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void e100_netpoll(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       e100_disable_irq(nic);
+       e100_intr(nic->pdev->irq, netdev);
+       e100_tx_clean(nic);
+       e100_enable_irq(nic);
+}
+#endif
+
+static int e100_set_mac_address(struct net_device *netdev, void *p)
+{
+       struct nic *nic = netdev_priv(netdev);
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+       e100_exec_cb(nic, NULL, e100_setup_iaaddr);
+
+       return 0;
+}
+
+static int e100_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       if (new_mtu < ETH_ZLEN || new_mtu > ETH_DATA_LEN)
+               return -EINVAL;
+       netdev->mtu = new_mtu;
+       return 0;
+}
+
+static int e100_asf(struct nic *nic)
+{
+       /* ASF can be enabled from eeprom */
+       return (nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1057) &&
+          (nic->eeprom[eeprom_config_asf] & eeprom_asf) &&
+          !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) &&
+          ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE);
+}
+
+static int e100_up(struct nic *nic)
+{
+       int err;
+
+       if ((err = e100_rx_alloc_list(nic)))
+               return err;
+       if ((err = e100_alloc_cbs(nic)))
+               goto err_rx_clean_list;
+       if ((err = e100_hw_init(nic)))
+               goto err_clean_cbs;
+       e100_set_multicast_list(nic->netdev);
+       e100_start_receiver(nic, NULL);
+       mod_timer(&nic->watchdog, jiffies);
+       if ((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
+               nic->netdev->name, nic->netdev)))
+               goto err_no_irq;
+       netif_wake_queue(nic->netdev);
+       napi_enable(&nic->napi);
+       /* enable ints _after_ enabling poll, preventing a race between
+        * disable ints+schedule */
+       e100_enable_irq(nic);
+       return 0;
+
+err_no_irq:
+       del_timer_sync(&nic->watchdog);
+err_clean_cbs:
+       e100_clean_cbs(nic);
+err_rx_clean_list:
+       e100_rx_clean_list(nic);
+       return err;
+}
+
+static void e100_down(struct nic *nic)
+{
+       /* wait here for poll to complete */
+       napi_disable(&nic->napi);
+       netif_stop_queue(nic->netdev);
+       e100_hw_reset(nic);
+       free_irq(nic->pdev->irq, nic->netdev);
+       del_timer_sync(&nic->watchdog);
+       netif_carrier_off(nic->netdev);
+       e100_clean_cbs(nic);
+       e100_rx_clean_list(nic);
+}
+
+static void e100_tx_timeout(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       /* Reset outside of interrupt context, to avoid request_irq
+        * in interrupt context */
+       schedule_work(&nic->tx_timeout_task);
+}
+
+static void e100_tx_timeout_task(struct work_struct *work)
+{
+       struct nic *nic = container_of(work, struct nic, tx_timeout_task);
+       struct net_device *netdev = nic->netdev;
+
+       netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
+                    "scb.status=0x%02X\n", ioread8(&nic->csr->scb.status));
+
+       rtnl_lock();
+       if (netif_running(netdev)) {
+               e100_down(netdev_priv(netdev));
+               e100_up(netdev_priv(netdev));
+       }
+       rtnl_unlock();
+}
+
+static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
+{
+       int err;
+       struct sk_buff *skb;
+
+       /* Use driver resources to perform internal MAC or PHY
+        * loopback test.  A single packet is prepared and transmitted
+        * in loopback mode, and the test passes if the received
+        * packet compares byte-for-byte to the transmitted packet. */
+
+       if ((err = e100_rx_alloc_list(nic)))
+               return err;
+       if ((err = e100_alloc_cbs(nic)))
+               goto err_clean_rx;
+
+       /* ICH PHY loopback is broken so do MAC loopback instead */
+       if (nic->flags & ich && loopback_mode == lb_phy)
+               loopback_mode = lb_mac;
+
+       nic->loopback = loopback_mode;
+       if ((err = e100_hw_init(nic)))
+               goto err_loopback_none;
+
+       if (loopback_mode == lb_phy)
+               mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR,
+                       BMCR_LOOPBACK);
+
+       e100_start_receiver(nic, NULL);
+
+       if (!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
+               err = -ENOMEM;
+               goto err_loopback_none;
+       }
+       skb_put(skb, ETH_DATA_LEN);
+       memset(skb->data, 0xFF, ETH_DATA_LEN);
+       e100_xmit_frame(skb, nic->netdev);
+
+       msleep(10);
+
+       pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr,
+                       RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
+
+       if (memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd),
+          skb->data, ETH_DATA_LEN))
+               err = -EAGAIN;
+
+err_loopback_none:
+       mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0);
+       nic->loopback = lb_none;
+       e100_clean_cbs(nic);
+       e100_hw_reset(nic);
+err_clean_rx:
+       e100_rx_clean_list(nic);
+       return err;
+}
+
+#define MII_LED_CONTROL        0x1B
+#define E100_82552_LED_OVERRIDE 0x19
+#define E100_82552_LED_ON       0x000F /* LEDTX and LED_RX both on */
+#define E100_82552_LED_OFF      0x000A /* LEDTX and LED_RX both off */
+
+static int e100_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
+{
+       struct nic *nic = netdev_priv(netdev);
+       return mii_ethtool_gset(&nic->mii, cmd);
+}
+
+static int e100_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
+{
+       struct nic *nic = netdev_priv(netdev);
+       int err;
+
+       mdio_write(netdev, nic->mii.phy_id, MII_BMCR, BMCR_RESET);
+       err = mii_ethtool_sset(&nic->mii, cmd);
+       e100_exec_cb(nic, NULL, e100_configure);
+
+       return err;
+}
+
+static void e100_get_drvinfo(struct net_device *netdev,
+       struct ethtool_drvinfo *info)
+{
+       struct nic *nic = netdev_priv(netdev);
+       strcpy(info->driver, DRV_NAME);
+       strcpy(info->version, DRV_VERSION);
+       strcpy(info->fw_version, "N/A");
+       strcpy(info->bus_info, pci_name(nic->pdev));
+}
+
+#define E100_PHY_REGS 0x1C
+static int e100_get_regs_len(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+       return 1 + E100_PHY_REGS + sizeof(nic->mem->dump_buf);
+}
+
+static void e100_get_regs(struct net_device *netdev,
+       struct ethtool_regs *regs, void *p)
+{
+       struct nic *nic = netdev_priv(netdev);
+       u32 *buff = p;
+       int i;
+
+       regs->version = (1 << 24) | nic->pdev->revision;
+       buff[0] = ioread8(&nic->csr->scb.cmd_hi) << 24 |
+               ioread8(&nic->csr->scb.cmd_lo) << 16 |
+               ioread16(&nic->csr->scb.status);
+       for (i = E100_PHY_REGS; i >= 0; i--)
+               buff[1 + E100_PHY_REGS - i] =
+                       mdio_read(netdev, nic->mii.phy_id, i);
+       memset(nic->mem->dump_buf, 0, sizeof(nic->mem->dump_buf));
+       e100_exec_cb(nic, NULL, e100_dump);
+       msleep(10);
+       memcpy(&buff[2 + E100_PHY_REGS], nic->mem->dump_buf,
+               sizeof(nic->mem->dump_buf));
+}
+
+static void e100_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct nic *nic = netdev_priv(netdev);
+       wol->supported = (nic->mac >= mac_82558_D101_A4) ?  WAKE_MAGIC : 0;
+       wol->wolopts = (nic->flags & wol_magic) ? WAKE_MAGIC : 0;
+}
+
+static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       if ((wol->wolopts && wol->wolopts != WAKE_MAGIC) ||
+           !device_can_wakeup(&nic->pdev->dev))
+               return -EOPNOTSUPP;
+
+       if (wol->wolopts)
+               nic->flags |= wol_magic;
+       else
+               nic->flags &= ~wol_magic;
+
+       device_set_wakeup_enable(&nic->pdev->dev, wol->wolopts);
+
+       e100_exec_cb(nic, NULL, e100_configure);
+
+       return 0;
+}
+
+static u32 e100_get_msglevel(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+       return nic->msg_enable;
+}
+
+static void e100_set_msglevel(struct net_device *netdev, u32 value)
+{
+       struct nic *nic = netdev_priv(netdev);
+       nic->msg_enable = value;
+}
+
+static int e100_nway_reset(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+       return mii_nway_restart(&nic->mii);
+}
+
+static u32 e100_get_link(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+       return mii_link_ok(&nic->mii);
+}
+
+static int e100_get_eeprom_len(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+       return nic->eeprom_wc << 1;
+}
+
+#define E100_EEPROM_MAGIC      0x1234
+static int e100_get_eeprom(struct net_device *netdev,
+       struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       eeprom->magic = E100_EEPROM_MAGIC;
+       memcpy(bytes, &((u8 *)nic->eeprom)[eeprom->offset], eeprom->len);
+
+       return 0;
+}
+
+static int e100_set_eeprom(struct net_device *netdev,
+       struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       if (eeprom->magic != E100_EEPROM_MAGIC)
+               return -EINVAL;
+
+       memcpy(&((u8 *)nic->eeprom)[eeprom->offset], bytes, eeprom->len);
+
+       return e100_eeprom_save(nic, eeprom->offset >> 1,
+               (eeprom->len >> 1) + 1);
+}
+
+static void e100_get_ringparam(struct net_device *netdev,
+       struct ethtool_ringparam *ring)
+{
+       struct nic *nic = netdev_priv(netdev);
+       struct param_range *rfds = &nic->params.rfds;
+       struct param_range *cbs = &nic->params.cbs;
+
+       ring->rx_max_pending = rfds->max;
+       ring->tx_max_pending = cbs->max;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = rfds->count;
+       ring->tx_pending = cbs->count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int e100_set_ringparam(struct net_device *netdev,
+       struct ethtool_ringparam *ring)
+{
+       struct nic *nic = netdev_priv(netdev);
+       struct param_range *rfds = &nic->params.rfds;
+       struct param_range *cbs = &nic->params.cbs;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       if (netif_running(netdev))
+               e100_down(nic);
+       rfds->count = max(ring->rx_pending, rfds->min);
+       rfds->count = min(rfds->count, rfds->max);
+       cbs->count = max(ring->tx_pending, cbs->min);
+       cbs->count = min(cbs->count, cbs->max);
+       netif_info(nic, drv, nic->netdev, "Ring Param settings: rx: %d, tx %d\n",
+                  rfds->count, cbs->count);
+       if (netif_running(netdev))
+               e100_up(nic);
+
+       return 0;
+}
+
+static const char e100_gstrings_test[][ETH_GSTRING_LEN] = {
+       "Link test     (on/offline)",
+       "Eeprom test   (on/offline)",
+       "Self test        (offline)",
+       "Mac loopback     (offline)",
+       "Phy loopback     (offline)",
+};
+#define E100_TEST_LEN  ARRAY_SIZE(e100_gstrings_test)
+
+static void e100_diag_test(struct net_device *netdev,
+       struct ethtool_test *test, u64 *data)
+{
+       struct ethtool_cmd cmd;
+       struct nic *nic = netdev_priv(netdev);
+       int i, err;
+
+       memset(data, 0, E100_TEST_LEN * sizeof(u64));
+       data[0] = !mii_link_ok(&nic->mii);
+       data[1] = e100_eeprom_load(nic);
+       if (test->flags & ETH_TEST_FL_OFFLINE) {
+
+               /* save speed, duplex & autoneg settings */
+               err = mii_ethtool_gset(&nic->mii, &cmd);
+
+               if (netif_running(netdev))
+                       e100_down(nic);
+               data[2] = e100_self_test(nic);
+               data[3] = e100_loopback_test(nic, lb_mac);
+               data[4] = e100_loopback_test(nic, lb_phy);
+
+               /* restore speed, duplex & autoneg settings */
+               err = mii_ethtool_sset(&nic->mii, &cmd);
+
+               if (netif_running(netdev))
+                       e100_up(nic);
+       }
+       for (i = 0; i < E100_TEST_LEN; i++)
+               test->flags |= data[i] ? ETH_TEST_FL_FAILED : 0;
+
+       msleep_interruptible(4 * 1000);
+}
+
+static int e100_set_phys_id(struct net_device *netdev,
+                           enum ethtool_phys_id_state state)
+{
+       struct nic *nic = netdev_priv(netdev);
+       enum led_state {
+               led_on     = 0x01,
+               led_off    = 0x04,
+               led_on_559 = 0x05,
+               led_on_557 = 0x07,
+       };
+       u16 led_reg = (nic->phy == phy_82552_v) ? E100_82552_LED_OVERRIDE :
+               MII_LED_CONTROL;
+       u16 leds = 0;
+
+       switch (state) {
+       case ETHTOOL_ID_ACTIVE:
+               return 2;
+
+       case ETHTOOL_ID_ON:
+               leds = (nic->phy == phy_82552_v) ? E100_82552_LED_ON :
+                      (nic->mac < mac_82559_D101M) ? led_on_557 : led_on_559;
+               break;
+
+       case ETHTOOL_ID_OFF:
+               leds = (nic->phy == phy_82552_v) ? E100_82552_LED_OFF : led_off;
+               break;
+
+       case ETHTOOL_ID_INACTIVE:
+               break;
+       }
+
+       mdio_write(netdev, nic->mii.phy_id, led_reg, leds);
+       return 0;
+}
+
+static const char e100_gstrings_stats[][ETH_GSTRING_LEN] = {
+       "rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",
+       "tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
+       "rx_length_errors", "rx_over_errors", "rx_crc_errors",
+       "rx_frame_errors", "rx_fifo_errors", "rx_missed_errors",
+       "tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
+       "tx_heartbeat_errors", "tx_window_errors",
+       /* device-specific stats */
+       "tx_deferred", "tx_single_collisions", "tx_multi_collisions",
+       "tx_flow_control_pause", "rx_flow_control_pause",
+       "rx_flow_control_unsupported", "tx_tco_packets", "rx_tco_packets",
+};
+#define E100_NET_STATS_LEN     21
+#define E100_STATS_LEN ARRAY_SIZE(e100_gstrings_stats)
+
+static int e100_get_sset_count(struct net_device *netdev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_TEST:
+               return E100_TEST_LEN;
+       case ETH_SS_STATS:
+               return E100_STATS_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static void e100_get_ethtool_stats(struct net_device *netdev,
+       struct ethtool_stats *stats, u64 *data)
+{
+       struct nic *nic = netdev_priv(netdev);
+       int i;
+
+       for (i = 0; i < E100_NET_STATS_LEN; i++)
+               data[i] = ((unsigned long *)&netdev->stats)[i];
+
+       data[i++] = nic->tx_deferred;
+       data[i++] = nic->tx_single_collisions;
+       data[i++] = nic->tx_multiple_collisions;
+       data[i++] = nic->tx_fc_pause;
+       data[i++] = nic->rx_fc_pause;
+       data[i++] = nic->rx_fc_unsupported;
+       data[i++] = nic->tx_tco_frames;
+       data[i++] = nic->rx_tco_frames;
+}
+
+static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
+{
+       switch (stringset) {
+       case ETH_SS_TEST:
+               memcpy(data, *e100_gstrings_test, sizeof(e100_gstrings_test));
+               break;
+       case ETH_SS_STATS:
+               memcpy(data, *e100_gstrings_stats, sizeof(e100_gstrings_stats));
+               break;
+       }
+}
+
+static const struct ethtool_ops e100_ethtool_ops = {
+       .get_settings           = e100_get_settings,
+       .set_settings           = e100_set_settings,
+       .get_drvinfo            = e100_get_drvinfo,
+       .get_regs_len           = e100_get_regs_len,
+       .get_regs               = e100_get_regs,
+       .get_wol                = e100_get_wol,
+       .set_wol                = e100_set_wol,
+       .get_msglevel           = e100_get_msglevel,
+       .set_msglevel           = e100_set_msglevel,
+       .nway_reset             = e100_nway_reset,
+       .get_link               = e100_get_link,
+       .get_eeprom_len         = e100_get_eeprom_len,
+       .get_eeprom             = e100_get_eeprom,
+       .set_eeprom             = e100_set_eeprom,
+       .get_ringparam          = e100_get_ringparam,
+       .set_ringparam          = e100_set_ringparam,
+       .self_test              = e100_diag_test,
+       .get_strings            = e100_get_strings,
+       .set_phys_id            = e100_set_phys_id,
+       .get_ethtool_stats      = e100_get_ethtool_stats,
+       .get_sset_count         = e100_get_sset_count,
+};
+
+static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+       struct nic *nic = netdev_priv(netdev);
+
+       return generic_mii_ioctl(&nic->mii, if_mii(ifr), cmd, NULL);
+}
+
+static int e100_alloc(struct nic *nic)
+{
+       nic->mem = pci_alloc_consistent(nic->pdev, sizeof(struct mem),
+               &nic->dma_addr);
+       return nic->mem ? 0 : -ENOMEM;
+}
+
+static void e100_free(struct nic *nic)
+{
+       if (nic->mem) {
+               pci_free_consistent(nic->pdev, sizeof(struct mem),
+                       nic->mem, nic->dma_addr);
+               nic->mem = NULL;
+       }
+}
+
+static int e100_open(struct net_device *netdev)
+{
+       struct nic *nic = netdev_priv(netdev);
+       int err = 0;
+
+       netif_carrier_off(netdev);
+       if ((err = e100_up(nic)))
+               netif_err(nic, ifup, nic->netdev, "Cannot open interface, aborting\n");
+       return err;
+}
+
+static int e100_close(struct net_device *netdev)
+{
+       e100_down(netdev_priv(netdev));
+       return 0;
+}
+
+static const struct net_device_ops e100_netdev_ops = {
+       .ndo_open               = e100_open,
+       .ndo_stop               = e100_close,
+       .ndo_start_xmit         = e100_xmit_frame,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_multicast_list = e100_set_multicast_list,
+       .ndo_set_mac_address    = e100_set_mac_address,
+       .ndo_change_mtu         = e100_change_mtu,
+       .ndo_do_ioctl           = e100_do_ioctl,
+       .ndo_tx_timeout         = e100_tx_timeout,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = e100_netpoll,
+#endif
+};
+
+static int __devinit e100_probe(struct pci_dev *pdev,
+       const struct pci_device_id *ent)
+{
+       struct net_device *netdev;
+       struct nic *nic;
+       int err;
+
+       if (!(netdev = alloc_etherdev(sizeof(struct nic)))) {
+               if (((1 << debug) - 1) & NETIF_MSG_PROBE)
+                       pr_err("Etherdev alloc failed, aborting\n");
+               return -ENOMEM;
+       }
+
+       netdev->netdev_ops = &e100_netdev_ops;
+       SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
+       netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;
+       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+
+       nic = netdev_priv(netdev);
+       netif_napi_add(netdev, &nic->napi, e100_poll, E100_NAPI_WEIGHT);
+       nic->netdev = netdev;
+       nic->pdev = pdev;
+       nic->msg_enable = (1 << debug) - 1;
+       nic->mdio_ctrl = mdio_ctrl_hw;
+       pci_set_drvdata(pdev, netdev);
+
+       if ((err = pci_enable_device(pdev))) {
+               netif_err(nic, probe, nic->netdev, "Cannot enable PCI device, aborting\n");
+               goto err_out_free_dev;
+       }
+
+       if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+               netif_err(nic, probe, nic->netdev, "Cannot find proper PCI device base address, aborting\n");
+               err = -ENODEV;
+               goto err_out_disable_pdev;
+       }
+
+       if ((err = pci_request_regions(pdev, DRV_NAME))) {
+               netif_err(nic, probe, nic->netdev, "Cannot obtain PCI resources, aborting\n");
+               goto err_out_disable_pdev;
+       }
+
+       if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
+               netif_err(nic, probe, nic->netdev, "No usable DMA configuration, aborting\n");
+               goto err_out_free_res;
+       }
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       if (use_io)
+               netif_info(nic, probe, nic->netdev, "using i/o access mode\n");
+
+       nic->csr = pci_iomap(pdev, (use_io ? 1 : 0), sizeof(struct csr));
+       if (!nic->csr) {
+               netif_err(nic, probe, nic->netdev, "Cannot map device registers, aborting\n");
+               err = -ENOMEM;
+               goto err_out_free_res;
+       }
+
+       if (ent->driver_data)
+               nic->flags |= ich;
+       else
+               nic->flags &= ~ich;
+
+       e100_get_defaults(nic);
+
+       /* locks must be initialized before calling hw_reset */
+       spin_lock_init(&nic->cb_lock);
+       spin_lock_init(&nic->cmd_lock);
+       spin_lock_init(&nic->mdio_lock);
+
+       /* Reset the device before pci_set_master() in case device is in some
+        * funky state and has an interrupt pending - hint: we don't have the
+        * interrupt handler registered yet. */
+       e100_hw_reset(nic);
+
+       pci_set_master(pdev);
+
+       init_timer(&nic->watchdog);
+       nic->watchdog.function = e100_watchdog;
+       nic->watchdog.data = (unsigned long)nic;
+
+       INIT_WORK(&nic->tx_timeout_task, e100_tx_timeout_task);
+
+       if ((err = e100_alloc(nic))) {
+               netif_err(nic, probe, nic->netdev, "Cannot alloc driver memory, aborting\n");
+               goto err_out_iounmap;
+       }
+
+       if ((err = e100_eeprom_load(nic)))
+               goto err_out_free;
+
+       e100_phy_init(nic);
+
+       memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
+       memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
+       if (!is_valid_ether_addr(netdev->perm_addr)) {
+               if (!eeprom_bad_csum_allow) {
+                       netif_err(nic, probe, nic->netdev, "Invalid MAC address from EEPROM, aborting\n");
+                       err = -EAGAIN;
+                       goto err_out_free;
+               } else {
+                       netif_err(nic, probe, nic->netdev, "Invalid MAC address from EEPROM, you MUST configure one.\n");
+               }
+       }
+
+       /* Wol magic packet can be enabled from eeprom */
+       if ((nic->mac >= mac_82558_D101_A4) &&
+          (nic->eeprom[eeprom_id] & eeprom_id_wol)) {
+               nic->flags |= wol_magic;
+               device_set_wakeup_enable(&pdev->dev, true);
+       }
+
+       /* ack any pending wake events, disable PME */
+       pci_pme_active(pdev, false);
+
+       strcpy(netdev->name, "eth%d");
+       if ((err = register_netdev(netdev))) {
+               netif_err(nic, probe, nic->netdev, "Cannot register net device, aborting\n");
+               goto err_out_free;
+       }
+       nic->cbs_pool = pci_pool_create(netdev->name,
+                          nic->pdev,
+                          nic->params.cbs.max * sizeof(struct cb),
+                          sizeof(u32),
+                          0);
+       netif_info(nic, probe, nic->netdev,
+                  "addr 0x%llx, irq %d, MAC addr %pM\n",
+                  (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
+                  pdev->irq, netdev->dev_addr);
+
+       return 0;
+
+err_out_free:
+       e100_free(nic);
+err_out_iounmap:
+       pci_iounmap(pdev, nic->csr);
+err_out_free_res:
+       pci_release_regions(pdev);
+err_out_disable_pdev:
+       pci_disable_device(pdev);
+err_out_free_dev:
+       pci_set_drvdata(pdev, NULL);
+       free_netdev(netdev);
+       return err;
+}
+
+static void __devexit e100_remove(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+
+       if (netdev) {
+               struct nic *nic = netdev_priv(netdev);
+               unregister_netdev(netdev);
+               e100_free(nic);
+               pci_iounmap(pdev, nic->csr);
+               pci_pool_destroy(nic->cbs_pool);
+               free_netdev(netdev);
+               pci_release_regions(pdev);
+               pci_disable_device(pdev);
+               pci_set_drvdata(pdev, NULL);
+       }
+}
+
+#define E100_82552_SMARTSPEED   0x14   /* SmartSpeed Ctrl register */
+#define E100_82552_REV_ANEG     0x0200 /* Reverse auto-negotiation */
+#define E100_82552_ANEG_NOW     0x0400 /* Auto-negotiate now */
+static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct nic *nic = netdev_priv(netdev);
+
+       if (netif_running(netdev))
+               e100_down(nic);
+       netif_device_detach(netdev);
+
+       pci_save_state(pdev);
+
+       if ((nic->flags & wol_magic) | e100_asf(nic)) {
+               /* enable reverse auto-negotiation */
+               if (nic->phy == phy_82552_v) {
+                       u16 smartspeed = mdio_read(netdev, nic->mii.phy_id,
+                                                  E100_82552_SMARTSPEED);
+
+                       mdio_write(netdev, nic->mii.phy_id,
+                                  E100_82552_SMARTSPEED, smartspeed |
+                                  E100_82552_REV_ANEG | E100_82552_ANEG_NOW);
+               }
+               *enable_wake = true;
+       } else {
+               *enable_wake = false;
+       }
+
+       pci_disable_device(pdev);
+}
+
+static int __e100_power_off(struct pci_dev *pdev, bool wake)
+{
+       if (wake)
+               return pci_prepare_to_sleep(pdev);
+
+       pci_wake_from_d3(pdev, false);
+       pci_set_power_state(pdev, PCI_D3hot);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       bool wake;
+       __e100_shutdown(pdev, &wake);
+       return __e100_power_off(pdev, wake);
+}
+
+static int e100_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct nic *nic = netdev_priv(netdev);
+
+       pci_set_power_state(pdev, PCI_D0);
+       pci_restore_state(pdev);
+       /* ack any pending wake events, disable PME */
+       pci_enable_wake(pdev, 0, 0);
+
+       /* disable reverse auto-negotiation */
+       if (nic->phy == phy_82552_v) {
+               u16 smartspeed = mdio_read(netdev, nic->mii.phy_id,
+                                          E100_82552_SMARTSPEED);
+
+               mdio_write(netdev, nic->mii.phy_id,
+                          E100_82552_SMARTSPEED,
+                          smartspeed & ~(E100_82552_REV_ANEG));
+       }
+
+       netif_device_attach(netdev);
+       if (netif_running(netdev))
+               e100_up(nic);
+
+       return 0;
+}
+#endif /* CONFIG_PM */
+
+static void e100_shutdown(struct pci_dev *pdev)
+{
+       bool wake;
+       __e100_shutdown(pdev, &wake);
+       if (system_state == SYSTEM_POWER_OFF)
+               __e100_power_off(pdev, wake);
+}
+
+/* ------------------ PCI Error Recovery infrastructure  -------------- */
+/**
+ * e100_io_error_detected - called when PCI error is detected.
+ * @pdev: Pointer to PCI device
+ * @state: The current pci connection state
+ */
+static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct nic *nic = netdev_priv(netdev);
+
+       netif_device_detach(netdev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       if (netif_running(netdev))
+               e100_down(nic);
+       pci_disable_device(pdev);
+
+       /* Request a slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * e100_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch.
+ */
+static pci_ers_result_t e100_io_slot_reset(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct nic *nic = netdev_priv(netdev);
+
+       if (pci_enable_device(pdev)) {
+               pr_err("Cannot re-enable PCI device after reset\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+       pci_set_master(pdev);
+
+       /* Only one device per card can do a reset */
+       if (0 != PCI_FUNC(pdev->devfn))
+               return PCI_ERS_RESULT_RECOVERED;
+       e100_hw_reset(nic);
+       e100_phy_init(nic);
+
+       return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * e100_io_resume - resume normal operations
+ * @pdev: Pointer to PCI device
+ *
+ * Resume normal operations after an error recovery
+ * sequence has been completed.
+ */
+static void e100_io_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct nic *nic = netdev_priv(netdev);
+
+       /* ack any pending wake events, disable PME */
+       pci_enable_wake(pdev, 0, 0);
+
+       netif_device_attach(netdev);
+       if (netif_running(netdev)) {
+               e100_open(netdev);
+               mod_timer(&nic->watchdog, jiffies);
+       }
+}
+
+static struct pci_error_handlers e100_err_handler = {
+       .error_detected = e100_io_error_detected,
+       .slot_reset = e100_io_slot_reset,
+       .resume = e100_io_resume,
+};
+
+static struct pci_driver e100_driver = {
+       .name =         DRV_NAME,
+       .id_table =     e100_id_table,
+       .probe =        e100_probe,
+       .remove =       __devexit_p(e100_remove),
+#ifdef CONFIG_PM
+       /* Power Management hooks */
+       .suspend =      e100_suspend,
+       .resume =       e100_resume,
+#endif
+       .shutdown =     e100_shutdown,
+       .err_handler = &e100_err_handler,
+};
+
+static int __init e100_init_module(void)
+{
+       if (((1 << debug) - 1) & NETIF_MSG_DRV) {
+               pr_info("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
+               pr_info("%s\n", DRV_COPYRIGHT);
+       }
+       return pci_register_driver(&e100_driver);
+}
+
+static void __exit e100_cleanup_module(void)
+{
+       pci_unregister_driver(&e100_driver);
+}
+
+module_init(e100_init_module);
+module_exit(e100_cleanup_module);
diff --git a/drivers/net/ethernet/intel/e1000/Makefile b/drivers/net/ethernet/intel/e1000/Makefile
new file mode 100644 (file)
index 0000000..4a6ab15
--- /dev/null
@@ -0,0 +1,35 @@
+################################################################################
+#
+# Intel PRO/1000 Linux driver
+# Copyright(c) 1999 - 2006 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
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) PRO/1000 ethernet driver
+#
+
+obj-$(CONFIG_E1000) += e1000.o
+
+e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
new file mode 100644 (file)
index 0000000..24f41da
--- /dev/null
@@ -0,0 +1,361 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+*******************************************************************************/
+
+
+/* Linux PRO/1000 Ethernet Driver main header file */
+
+#ifndef _E1000_H_
+#define _E1000_H_
+
+#include <linux/stddef.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <asm/byteorder.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/pagemap.h>
+#include <linux/dma-mapping.h>
+#include <linux/bitops.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <linux/capability.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <net/pkt_sched.h>
+#include <linux/list.h>
+#include <linux/reboot.h>
+#include <net/checksum.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+
+#define BAR_0          0
+#define BAR_1          1
+#define BAR_5          5
+
+#define INTEL_E1000_ETHERNET_DEVICE(device_id) {\
+       PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
+
+struct e1000_adapter;
+
+#include "e1000_hw.h"
+
+#define E1000_MAX_INTR 10
+
+/* TX/RX descriptor defines */
+#define E1000_DEFAULT_TXD                  256
+#define E1000_MAX_TXD                      256
+#define E1000_MIN_TXD                       48
+#define E1000_MAX_82544_TXD               4096
+
+#define E1000_DEFAULT_RXD                  256
+#define E1000_MAX_RXD                      256
+#define E1000_MIN_RXD                       48
+#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    /* Used for packet split */
+#define E1000_RXBUFFER_256   256    /* Used for packet split */
+#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
+
+/* Flow Control Watermarks */
+#define E1000_FC_HIGH_DIFF 0x1638  /* High: 5688 bytes below Rx FIFO size */
+#define E1000_FC_LOW_DIFF 0x1640   /* Low:  5696 bytes below Rx FIFO size */
+
+#define E1000_FC_PAUSE_TIME 0xFFFF /* pause for the max or until send xon */
+
+/* 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
+
+#ifndef E1000_MASTER_SLAVE
+/* Switch to override PHY master/slave setting */
+#define E1000_MASTER_SLAVE     e1000_ms_hw_default
+#endif
+
+#define E1000_MNG_VLAN_NONE (-1)
+
+/* 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;
+       struct page *page;
+       unsigned long time_stamp;
+       u16 length;
+       u16 next_to_watch;
+       u16 mapped_as_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;
+
+       u16 tdh;
+       u16 tdt;
+       bool last_tx_tso;
+};
+
+struct e1000_rx_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;
+       struct sk_buff *rx_skb_top;
+
+       /* cpu for rx queue */
+       int cpu;
+
+       u16 rdh;
+       u16 rdt;
+};
+
+#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 {
+       struct timer_list tx_fifo_stall_timer;
+       struct timer_list watchdog_timer;
+       struct timer_list phy_info_timer;
+       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       u16 mng_vlan_id;
+       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;
+
+       struct work_struct reset_task;
+       u8 fc_autoneg;
+
+       /* TX */
+       struct e1000_tx_ring *tx_ring;      /* One per active queue */
+       unsigned int restart_queue;
+       u32 txd_cmd;
+       u32 tx_int_delay;
+       u32 tx_abs_int_delay;
+       u32 gotcl;
+       u64 gotcl_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;
+       atomic_t tx_fifo_stall;
+       bool pcix_82544;
+       bool detect_tx_hung;
+
+       /* RX */
+       bool (*clean_rx)(struct e1000_adapter *adapter,
+                        struct e1000_rx_ring *rx_ring,
+                        int *work_done, int work_to_do);
+       void (*alloc_rx_buf)(struct e1000_adapter *adapter,
+                            struct e1000_rx_ring *rx_ring,
+                            int cleaned_count);
+       struct e1000_rx_ring *rx_ring;      /* One per active queue */
+       struct napi_struct napi;
+
+       int num_tx_queues;
+       int num_rx_queues;
+
+       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 gorcl;
+       u64 gorcl_old;
+
+       /* OS defined structs */
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+
+       /* 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;
+
+       u32 test_icr;
+       struct e1000_tx_ring test_tx_ring;
+       struct e1000_rx_ring test_rx_ring;
+
+       int msg_enable;
+
+       /* to not mess up cache alignment, always add to the bottom */
+       bool tso_force;
+       bool smart_power_down;  /* phy smart power down */
+       bool quad_port_a;
+       unsigned long flags;
+       u32 eeprom_wol;
+
+       /* for ioport free */
+       int bars;
+       int need_ioport;
+
+       bool discarding;
+
+       struct work_struct fifo_stall_task;
+       struct work_struct phy_info_task;
+};
+
+enum e1000_state_t {
+       __E1000_TESTING,
+       __E1000_RESETTING,
+       __E1000_DOWN
+};
+
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);
+#define e_dbg(format, arg...) \
+       netdev_dbg(e1000_get_hw_dev(hw), format, ## arg)
+#define e_err(msglvl, format, arg...) \
+       netif_err(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_info(msglvl, format, arg...) \
+       netif_info(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_warn(msglvl, format, arg...) \
+       netif_warn(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_notice(msglvl, format, arg...) \
+       netif_notice(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_dev_info(format, arg...) \
+       dev_info(&adapter->pdev->dev, format, ## arg)
+#define e_dev_warn(format, arg...) \
+       dev_warn(&adapter->pdev->dev, format, ## arg)
+#define e_dev_err(format, arg...) \
+       dev_err(&adapter->pdev->dev, format, ## arg)
+
+extern char e1000_driver_name[];
+extern const char e1000_driver_version[];
+
+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, u32 spd, u8 dplx);
+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);
+extern bool e1000_has_link(struct e1000_adapter *adapter);
+extern void e1000_power_up_phy(struct e1000_adapter *);
+extern void e1000_set_ethtool_ops(struct net_device *netdev);
+extern void e1000_check_options(struct e1000_adapter *adapter);
+extern char *e1000_get_hw_dev_name(struct e1000_hw *hw);
+
+#endif /* _E1000_H_ */
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
new file mode 100644 (file)
index 0000000..5548d46
--- /dev/null
@@ -0,0 +1,1863 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+*******************************************************************************/
+
+/* ethtool support for e1000 */
+
+#include "e1000.h"
+#include <asm/uaccess.h>
+
+enum {NETDEV_STATS, E1000_STATS};
+
+struct e1000_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int type;
+       int sizeof_stat;
+       int stat_offset;
+};
+
+#define E1000_STAT(m)          E1000_STATS, \
+                               sizeof(((struct e1000_adapter *)0)->m), \
+                               offsetof(struct e1000_adapter, m)
+#define E1000_NETDEV_STAT(m)   NETDEV_STATS, \
+                               sizeof(((struct net_device *)0)->m), \
+                               offsetof(struct net_device, m)
+
+static const struct e1000_stats e1000_gstrings_stats[] = {
+       { "rx_packets", E1000_STAT(stats.gprc) },
+       { "tx_packets", E1000_STAT(stats.gptc) },
+       { "rx_bytes", E1000_STAT(stats.gorcl) },
+       { "tx_bytes", E1000_STAT(stats.gotcl) },
+       { "rx_broadcast", E1000_STAT(stats.bprc) },
+       { "tx_broadcast", E1000_STAT(stats.bptc) },
+       { "rx_multicast", E1000_STAT(stats.mprc) },
+       { "tx_multicast", E1000_STAT(stats.mptc) },
+       { "rx_errors", E1000_STAT(stats.rxerrc) },
+       { "tx_errors", E1000_STAT(stats.txerrc) },
+       { "tx_dropped", E1000_NETDEV_STAT(stats.tx_dropped) },
+       { "multicast", E1000_STAT(stats.mprc) },
+       { "collisions", E1000_STAT(stats.colc) },
+       { "rx_length_errors", E1000_STAT(stats.rlerrc) },
+       { "rx_over_errors", E1000_NETDEV_STAT(stats.rx_over_errors) },
+       { "rx_crc_errors", E1000_STAT(stats.crcerrs) },
+       { "rx_frame_errors", E1000_NETDEV_STAT(stats.rx_frame_errors) },
+       { "rx_no_buffer_count", E1000_STAT(stats.rnbc) },
+       { "rx_missed_errors", E1000_STAT(stats.mpc) },
+       { "tx_aborted_errors", E1000_STAT(stats.ecol) },
+       { "tx_carrier_errors", E1000_STAT(stats.tncrs) },
+       { "tx_fifo_errors", E1000_NETDEV_STAT(stats.tx_fifo_errors) },
+       { "tx_heartbeat_errors", E1000_NETDEV_STAT(stats.tx_heartbeat_errors) },
+       { "tx_window_errors", E1000_STAT(stats.latecol) },
+       { "tx_abort_late_coll", E1000_STAT(stats.latecol) },
+       { "tx_deferred_ok", E1000_STAT(stats.dc) },
+       { "tx_single_coll_ok", E1000_STAT(stats.scc) },
+       { "tx_multi_coll_ok", E1000_STAT(stats.mcc) },
+       { "tx_timeout_count", E1000_STAT(tx_timeout_count) },
+       { "tx_restart_queue", E1000_STAT(restart_queue) },
+       { "rx_long_length_errors", E1000_STAT(stats.roc) },
+       { "rx_short_length_errors", E1000_STAT(stats.ruc) },
+       { "rx_align_errors", E1000_STAT(stats.algnerrc) },
+       { "tx_tcp_seg_good", E1000_STAT(stats.tsctc) },
+       { "tx_tcp_seg_failed", E1000_STAT(stats.tsctfc) },
+       { "rx_flow_control_xon", E1000_STAT(stats.xonrxc) },
+       { "rx_flow_control_xoff", E1000_STAT(stats.xoffrxc) },
+       { "tx_flow_control_xon", E1000_STAT(stats.xontxc) },
+       { "tx_flow_control_xoff", E1000_STAT(stats.xofftxc) },
+       { "rx_long_byte_count", E1000_STAT(stats.gorcl) },
+       { "rx_csum_offload_good", E1000_STAT(hw_csum_good) },
+       { "rx_csum_offload_errors", E1000_STAT(hw_csum_err) },
+       { "alloc_rx_buff_failed", E1000_STAT(alloc_rx_buff_failed) },
+       { "tx_smbus", E1000_STAT(stats.mgptc) },
+       { "rx_smbus", E1000_STAT(stats.mgprc) },
+       { "dropped_smbus", E1000_STAT(stats.mgpdc) },
+};
+
+#define E1000_QUEUE_STATS_LEN 0
+#define E1000_GLOBAL_STATS_LEN ARRAY_SIZE(e1000_gstrings_stats)
+#define E1000_STATS_LEN (E1000_GLOBAL_STATS_LEN + E1000_QUEUE_STATS_LEN)
+static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
+       "Register test  (offline)", "Eeprom test    (offline)",
+       "Interrupt test (offline)", "Loopback test  (offline)",
+       "Link test   (on/offline)"
+};
+#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
+
+static int e1000_get_settings(struct net_device *netdev,
+                             struct ethtool_cmd *ecmd)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (hw->media_type == e1000_media_type_copper) {
+
+               ecmd->supported = (SUPPORTED_10baseT_Half |
+                                  SUPPORTED_10baseT_Full |
+                                  SUPPORTED_100baseT_Half |
+                                  SUPPORTED_100baseT_Full |
+                                  SUPPORTED_1000baseT_Full|
+                                  SUPPORTED_Autoneg |
+                                  SUPPORTED_TP);
+               ecmd->advertising = ADVERTISED_TP;
+
+               if (hw->autoneg == 1) {
+                       ecmd->advertising |= ADVERTISED_Autoneg;
+                       /* the e1000 autoneg seems to match ethtool nicely */
+                       ecmd->advertising |= hw->autoneg_advertised;
+               }
+
+               ecmd->port = PORT_TP;
+               ecmd->phy_address = hw->phy_addr;
+
+               if (hw->mac_type == e1000_82543)
+                       ecmd->transceiver = XCVR_EXTERNAL;
+               else
+                       ecmd->transceiver = XCVR_INTERNAL;
+
+       } else {
+               ecmd->supported   = (SUPPORTED_1000baseT_Full |
+                                    SUPPORTED_FIBRE |
+                                    SUPPORTED_Autoneg);
+
+               ecmd->advertising = (ADVERTISED_1000baseT_Full |
+                                    ADVERTISED_FIBRE |
+                                    ADVERTISED_Autoneg);
+
+               ecmd->port = PORT_FIBRE;
+
+               if (hw->mac_type >= e1000_82545)
+                       ecmd->transceiver = XCVR_INTERNAL;
+               else
+                       ecmd->transceiver = XCVR_EXTERNAL;
+       }
+
+       if (er32(STATUS) & E1000_STATUS_LU) {
+
+               e1000_get_speed_and_duplex(hw, &adapter->link_speed,
+                                                  &adapter->link_duplex);
+               ethtool_cmd_speed_set(ecmd, adapter->link_speed);
+
+               /* unfortunately FULL_DUPLEX != DUPLEX_FULL
+                *          and HALF_DUPLEX != DUPLEX_HALF */
+
+               if (adapter->link_duplex == FULL_DUPLEX)
+                       ecmd->duplex = DUPLEX_FULL;
+               else
+                       ecmd->duplex = DUPLEX_HALF;
+       } else {
+               ethtool_cmd_speed_set(ecmd, -1);
+               ecmd->duplex = -1;
+       }
+
+       ecmd->autoneg = ((hw->media_type == e1000_media_type_fiber) ||
+                        hw->autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+       return 0;
+}
+
+static int e1000_set_settings(struct net_device *netdev,
+                             struct ethtool_cmd *ecmd)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+               msleep(1);
+
+       if (ecmd->autoneg == AUTONEG_ENABLE) {
+               hw->autoneg = 1;
+               if (hw->media_type == e1000_media_type_fiber)
+                       hw->autoneg_advertised = ADVERTISED_1000baseT_Full |
+                                    ADVERTISED_FIBRE |
+                                    ADVERTISED_Autoneg;
+               else
+                       hw->autoneg_advertised = ecmd->advertising |
+                                                ADVERTISED_TP |
+                                                ADVERTISED_Autoneg;
+               ecmd->advertising = hw->autoneg_advertised;
+       } else {
+               u32 speed = ethtool_cmd_speed(ecmd);
+               if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {
+                       clear_bit(__E1000_RESETTING, &adapter->flags);
+                       return -EINVAL;
+               }
+       }
+
+       /* reset the link */
+
+       if (netif_running(adapter->netdev)) {
+               e1000_down(adapter);
+               e1000_up(adapter);
+       } else
+               e1000_reset(adapter);
+
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+       return 0;
+}
+
+static u32 e1000_get_link(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       /*
+        * If the link is not reported up to netdev, interrupts are disabled,
+        * and so the physical link state may have changed since we last
+        * looked. Set get_link_status to make sure that the true link
+        * state is interrogated, rather than pulling a cached and possibly
+        * stale link state from the driver.
+        */
+       if (!netif_carrier_ok(netdev))
+               adapter->hw.get_link_status = 1;
+
+       return e1000_has_link(adapter);
+}
+
+static void e1000_get_pauseparam(struct net_device *netdev,
+                                struct ethtool_pauseparam *pause)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       pause->autoneg =
+               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
+
+       if (hw->fc == E1000_FC_RX_PAUSE)
+               pause->rx_pause = 1;
+       else if (hw->fc == E1000_FC_TX_PAUSE)
+               pause->tx_pause = 1;
+       else if (hw->fc == E1000_FC_FULL) {
+               pause->rx_pause = 1;
+               pause->tx_pause = 1;
+       }
+}
+
+static int e1000_set_pauseparam(struct net_device *netdev,
+                               struct ethtool_pauseparam *pause)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int retval = 0;
+
+       adapter->fc_autoneg = pause->autoneg;
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+               msleep(1);
+
+       if (pause->rx_pause && pause->tx_pause)
+               hw->fc = E1000_FC_FULL;
+       else if (pause->rx_pause && !pause->tx_pause)
+               hw->fc = E1000_FC_RX_PAUSE;
+       else if (!pause->rx_pause && pause->tx_pause)
+               hw->fc = E1000_FC_TX_PAUSE;
+       else if (!pause->rx_pause && !pause->tx_pause)
+               hw->fc = E1000_FC_NONE;
+
+       hw->original_fc = hw->fc;
+
+       if (adapter->fc_autoneg == AUTONEG_ENABLE) {
+               if (netif_running(adapter->netdev)) {
+                       e1000_down(adapter);
+                       e1000_up(adapter);
+               } else
+                       e1000_reset(adapter);
+       } else
+               retval = ((hw->media_type == e1000_media_type_fiber) ?
+                         e1000_setup_link(hw) : e1000_force_mac_fc(hw));
+
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+       return retval;
+}
+
+static u32 e1000_get_msglevel(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       return adapter->msg_enable;
+}
+
+static void e1000_set_msglevel(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       adapter->msg_enable = data;
+}
+
+static int e1000_get_regs_len(struct net_device *netdev)
+{
+#define E1000_REGS_LEN 32
+       return E1000_REGS_LEN * sizeof(u32);
+}
+
+static void e1000_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
+                          void *p)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 *regs_buff = p;
+       u16 phy_data;
+
+       memset(p, 0, E1000_REGS_LEN * sizeof(u32));
+
+       regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;
+
+       regs_buff[0]  = er32(CTRL);
+       regs_buff[1]  = er32(STATUS);
+
+       regs_buff[2]  = er32(RCTL);
+       regs_buff[3]  = er32(RDLEN);
+       regs_buff[4]  = er32(RDH);
+       regs_buff[5]  = er32(RDT);
+       regs_buff[6]  = er32(RDTR);
+
+       regs_buff[7]  = er32(TCTL);
+       regs_buff[8]  = er32(TDLEN);
+       regs_buff[9]  = er32(TDH);
+       regs_buff[10] = er32(TDT);
+       regs_buff[11] = er32(TIDV);
+
+       regs_buff[12] = hw->phy_type;  /* PHY type (IGP=1, M88=0) */
+       if (hw->phy_type == e1000_phy_igp) {
+               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                   IGP01E1000_PHY_AGC_A);
+               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_A &
+                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
+               regs_buff[13] = (u32)phy_data; /* cable length */
+               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                   IGP01E1000_PHY_AGC_B);
+               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_B &
+                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
+               regs_buff[14] = (u32)phy_data; /* cable length */
+               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                   IGP01E1000_PHY_AGC_C);
+               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_C &
+                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
+               regs_buff[15] = (u32)phy_data; /* cable length */
+               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                   IGP01E1000_PHY_AGC_D);
+               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_D &
+                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
+               regs_buff[16] = (u32)phy_data; /* cable length */
+               regs_buff[17] = 0; /* extended 10bt distance (not needed) */
+               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
+               e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS &
+                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
+               regs_buff[18] = (u32)phy_data; /* cable polarity */
+               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                   IGP01E1000_PHY_PCS_INIT_REG);
+               e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG &
+                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
+               regs_buff[19] = (u32)phy_data; /* cable polarity */
+               regs_buff[20] = 0; /* polarity correction enabled (always) */
+               regs_buff[22] = 0; /* phy receive errors (unavailable) */
+               regs_buff[23] = regs_buff[18]; /* mdix mode */
+               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
+       } else {
+               e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+               regs_buff[13] = (u32)phy_data; /* cable length */
+               regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+               regs_buff[17] = (u32)phy_data; /* extended 10bt distance */
+               regs_buff[18] = regs_buff[13]; /* cable polarity */
+               regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               regs_buff[20] = regs_buff[17]; /* polarity correction */
+               /* phy receive errors */
+               regs_buff[22] = adapter->phy_stats.receive_errors;
+               regs_buff[23] = regs_buff[13]; /* mdix mode */
+       }
+       regs_buff[21] = adapter->phy_stats.idle_errors;  /* phy idle errors */
+       e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
+       regs_buff[24] = (u32)phy_data;  /* phy local receiver status */
+       regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
+       if (hw->mac_type >= e1000_82540 &&
+           hw->media_type == e1000_media_type_copper) {
+               regs_buff[26] = er32(MANC);
+       }
+}
+
+static int e1000_get_eeprom_len(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       return hw->eeprom.word_size * 2;
+}
+
+static int e1000_get_eeprom(struct net_device *netdev,
+                           struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       int first_word, last_word;
+       int ret_val = 0;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EINVAL;
+
+       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+
+       eeprom_buff = kmalloc(sizeof(u16) *
+                       (last_word - first_word + 1), GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       if (hw->eeprom.type == e1000_eeprom_spi)
+               ret_val = e1000_read_eeprom(hw, first_word,
+                                           last_word - first_word + 1,
+                                           eeprom_buff);
+       else {
+               for (i = 0; i < last_word - first_word + 1; i++) {
+                       ret_val = e1000_read_eeprom(hw, first_word + i, 1,
+                                                   &eeprom_buff[i]);
+                       if (ret_val)
+                               break;
+               }
+       }
+
+       /* Device's eeprom is always little-endian, word addressable */
+       for (i = 0; i < last_word - first_word + 1; i++)
+               le16_to_cpus(&eeprom_buff[i]);
+
+       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
+                       eeprom->len);
+       kfree(eeprom_buff);
+
+       return ret_val;
+}
+
+static int e1000_set_eeprom(struct net_device *netdev,
+                           struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       void *ptr;
+       int max_len, first_word, last_word, ret_val = 0;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EOPNOTSUPP;
+
+       if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
+               return -EFAULT;
+
+       max_len = hw->eeprom.word_size * 2;
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       ptr = (void *)eeprom_buff;
+
+       if (eeprom->offset & 1) {
+               /* need read/modify/write of first changed EEPROM word */
+               /* only the second byte of the word is being modified */
+               ret_val = e1000_read_eeprom(hw, first_word, 1,
+                                           &eeprom_buff[0]);
+               ptr++;
+       }
+       if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) {
+               /* need read/modify/write of last changed EEPROM word */
+               /* only the first byte of the word is being modified */
+               ret_val = e1000_read_eeprom(hw, last_word, 1,
+                                 &eeprom_buff[last_word - first_word]);
+       }
+
+       /* Device's eeprom is always little-endian, word addressable */
+       for (i = 0; i < last_word - first_word + 1; i++)
+               le16_to_cpus(&eeprom_buff[i]);
+
+       memcpy(ptr, bytes, eeprom->len);
+
+       for (i = 0; i < last_word - first_word + 1; i++)
+               eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
+
+       ret_val = e1000_write_eeprom(hw, first_word,
+                                    last_word - first_word + 1, eeprom_buff);
+
+       /* Update the checksum over the first part of the EEPROM if needed */
+       if ((ret_val == 0) && (first_word <= EEPROM_CHECKSUM_REG))
+               e1000_update_eeprom_checksum(hw);
+
+       kfree(eeprom_buff);
+       return ret_val;
+}
+
+static void e1000_get_drvinfo(struct net_device *netdev,
+                             struct ethtool_drvinfo *drvinfo)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       char firmware_version[32];
+
+       strncpy(drvinfo->driver,  e1000_driver_name, 32);
+       strncpy(drvinfo->version, e1000_driver_version, 32);
+
+       sprintf(firmware_version, "N/A");
+       strncpy(drvinfo->fw_version, firmware_version, 32);
+       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
+       drvinfo->regdump_len = e1000_get_regs_len(netdev);
+       drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
+}
+
+static void e1000_get_ringparam(struct net_device *netdev,
+                               struct ethtool_ringparam *ring)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       e1000_mac_type mac_type = hw->mac_type;
+       struct e1000_tx_ring *txdr = adapter->tx_ring;
+       struct e1000_rx_ring *rxdr = adapter->rx_ring;
+
+       ring->rx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_RXD :
+               E1000_MAX_82544_RXD;
+       ring->tx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_TXD :
+               E1000_MAX_82544_TXD;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = rxdr->count;
+       ring->tx_pending = txdr->count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int e1000_set_ringparam(struct net_device *netdev,
+                              struct ethtool_ringparam *ring)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       e1000_mac_type mac_type = hw->mac_type;
+       struct e1000_tx_ring *txdr, *tx_old;
+       struct e1000_rx_ring *rxdr, *rx_old;
+       int i, err;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+               msleep(1);
+
+       if (netif_running(adapter->netdev))
+               e1000_down(adapter);
+
+       tx_old = adapter->tx_ring;
+       rx_old = adapter->rx_ring;
+
+       err = -ENOMEM;
+       txdr = kcalloc(adapter->num_tx_queues, sizeof(struct e1000_tx_ring), GFP_KERNEL);
+       if (!txdr)
+               goto err_alloc_tx;
+
+       rxdr = kcalloc(adapter->num_rx_queues, sizeof(struct e1000_rx_ring), GFP_KERNEL);
+       if (!rxdr)
+               goto err_alloc_rx;
+
+       adapter->tx_ring = txdr;
+       adapter->rx_ring = rxdr;
+
+       rxdr->count = max(ring->rx_pending,(u32)E1000_MIN_RXD);
+       rxdr->count = min(rxdr->count,(u32)(mac_type < e1000_82544 ?
+               E1000_MAX_RXD : E1000_MAX_82544_RXD));
+       rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+
+       txdr->count = max(ring->tx_pending,(u32)E1000_MIN_TXD);
+       txdr->count = min(txdr->count,(u32)(mac_type < e1000_82544 ?
+               E1000_MAX_TXD : E1000_MAX_82544_TXD));
+       txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               txdr[i].count = txdr->count;
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               rxdr[i].count = rxdr->count;
+
+       if (netif_running(adapter->netdev)) {
+               /* Try to get new resources before deleting old */
+               err = e1000_setup_all_rx_resources(adapter);
+               if (err)
+                       goto err_setup_rx;
+               err = e1000_setup_all_tx_resources(adapter);
+               if (err)
+                       goto err_setup_tx;
+
+               /* save the new, restore the old in order to free it,
+                * then restore the new back again */
+
+               adapter->rx_ring = rx_old;
+               adapter->tx_ring = tx_old;
+               e1000_free_all_rx_resources(adapter);
+               e1000_free_all_tx_resources(adapter);
+               kfree(tx_old);
+               kfree(rx_old);
+               adapter->rx_ring = rxdr;
+               adapter->tx_ring = txdr;
+               err = e1000_up(adapter);
+               if (err)
+                       goto err_setup;
+       }
+
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+       return 0;
+err_setup_tx:
+       e1000_free_all_rx_resources(adapter);
+err_setup_rx:
+       adapter->rx_ring = rx_old;
+       adapter->tx_ring = tx_old;
+       kfree(rxdr);
+err_alloc_rx:
+       kfree(txdr);
+err_alloc_tx:
+       e1000_up(adapter);
+err_setup:
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+       return err;
+}
+
+static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, int reg,
+                            u32 mask, u32 write)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       static const u32 test[] =
+               {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
+       u8 __iomem *address = hw->hw_addr + reg;
+       u32 read;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(test); i++) {
+               writel(write & test[i], address);
+               read = readl(address);
+               if (read != (write & test[i] & mask)) {
+                       e_err(drv, "pattern test reg %04X failed: "
+                             "got 0x%08X expected 0x%08X\n",
+                             reg, read, (write & test[i] & mask));
+                       *data = reg;
+                       return true;
+               }
+       }
+       return false;
+}
+
+static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, int reg,
+                             u32 mask, u32 write)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u8 __iomem *address = hw->hw_addr + reg;
+       u32 read;
+
+       writel(write & mask, address);
+       read = readl(address);
+       if ((read & mask) != (write & mask)) {
+               e_err(drv, "set/check reg %04X test failed: "
+                     "got 0x%08X expected 0x%08X\n",
+                     reg, (read & mask), (write & mask));
+               *data = reg;
+               return true;
+       }
+       return false;
+}
+
+#define REG_PATTERN_TEST(reg, mask, write)                          \
+       do {                                                         \
+               if (reg_pattern_test(adapter, data,                  \
+                            (hw->mac_type >= e1000_82543)   \
+                            ? E1000_##reg : E1000_82542_##reg,      \
+                            mask, write))                           \
+                       return 1;                                    \
+       } while (0)
+
+#define REG_SET_AND_CHECK(reg, mask, write)                         \
+       do {                                                         \
+               if (reg_set_and_check(adapter, data,                 \
+                             (hw->mac_type >= e1000_82543)  \
+                             ? E1000_##reg : E1000_82542_##reg,     \
+                             mask, write))                          \
+                       return 1;                                    \
+       } while (0)
+
+static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
+{
+       u32 value, before, after;
+       u32 i, toggle;
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* The status register is Read Only, so a write should fail.
+        * Some bits that get toggled are ignored.
+        */
+
+       /* there are several bits on newer hardware that are r/w */
+       toggle = 0xFFFFF833;
+
+       before = er32(STATUS);
+       value = (er32(STATUS) & toggle);
+       ew32(STATUS, toggle);
+       after = er32(STATUS) & toggle;
+       if (value != after) {
+               e_err(drv, "failed STATUS register test got: "
+                     "0x%08X expected: 0x%08X\n", after, value);
+               *data = 1;
+               return 1;
+       }
+       /* restore previous status */
+       ew32(STATUS, before);
+
+       REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(FCT, 0x0000FFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(VET, 0x0000FFFF, 0xFFFFFFFF);
+
+       REG_PATTERN_TEST(RDTR, 0x0000FFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(RDLEN, 0x000FFF80, 0x000FFFFF);
+       REG_PATTERN_TEST(RDH, 0x0000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(RDT, 0x0000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(FCRTH, 0x0000FFF8, 0x0000FFF8);
+       REG_PATTERN_TEST(FCTTV, 0x0000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(TIPG, 0x3FFFFFFF, 0x3FFFFFFF);
+       REG_PATTERN_TEST(TDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(TDLEN, 0x000FFF80, 0x000FFFFF);
+
+       REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x00000000);
+
+       before = 0x06DFB3FE;
+       REG_SET_AND_CHECK(RCTL, before, 0x003FFFFB);
+       REG_SET_AND_CHECK(TCTL, 0xFFFFFFFF, 0x00000000);
+
+       if (hw->mac_type >= e1000_82543) {
+
+               REG_SET_AND_CHECK(RCTL, before, 0xFFFFFFFF);
+               REG_PATTERN_TEST(RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+               REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);
+               REG_PATTERN_TEST(TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+               REG_PATTERN_TEST(TIDV, 0x0000FFFF, 0x0000FFFF);
+               value = E1000_RAR_ENTRIES;
+               for (i = 0; i < value; i++) {
+                       REG_PATTERN_TEST(RA + (((i << 1) + 1) << 2), 0x8003FFFF,
+                                        0xFFFFFFFF);
+               }
+
+       } else {
+
+               REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x01FFFFFF);
+               REG_PATTERN_TEST(RDBAL, 0xFFFFF000, 0xFFFFFFFF);
+               REG_PATTERN_TEST(TXCW, 0x0000FFFF, 0x0000FFFF);
+               REG_PATTERN_TEST(TDBAL, 0xFFFFF000, 0xFFFFFFFF);
+
+       }
+
+       value = E1000_MC_TBL_SIZE;
+       for (i = 0; i < value; i++)
+               REG_PATTERN_TEST(MTA + (i << 2), 0xFFFFFFFF, 0xFFFFFFFF);
+
+       *data = 0;
+       return 0;
+}
+
+static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 temp;
+       u16 checksum = 0;
+       u16 i;
+
+       *data = 0;
+       /* Read and add up the contents of the EEPROM */
+       for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
+               if ((e1000_read_eeprom(hw, i, 1, &temp)) < 0) {
+                       *data = 1;
+                       break;
+               }
+               checksum += temp;
+       }
+
+       /* If Checksum is not Correct return error else test passed */
+       if ((checksum != (u16)EEPROM_SUM) && !(*data))
+               *data = 2;
+
+       return *data;
+}
+
+static irqreturn_t e1000_test_intr(int irq, void *data)
+{
+       struct net_device *netdev = (struct net_device *)data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       adapter->test_icr |= er32(ICR);
+
+       return IRQ_HANDLED;
+}
+
+static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
+{
+       struct net_device *netdev = adapter->netdev;
+       u32 mask, i = 0;
+       bool shared_int = true;
+       u32 irq = adapter->pdev->irq;
+       struct e1000_hw *hw = &adapter->hw;
+
+       *data = 0;
+
+       /* NOTE: we don't test MSI interrupts here, yet */
+       /* Hook up test interrupt handler just for this test */
+       if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
+                        netdev))
+               shared_int = false;
+       else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
+                netdev->name, netdev)) {
+               *data = 1;
+               return -1;
+       }
+       e_info(hw, "testing %s interrupt\n", (shared_int ?
+              "shared" : "unshared"));
+
+       /* Disable all the interrupts */
+       ew32(IMC, 0xFFFFFFFF);
+       E1000_WRITE_FLUSH();
+       msleep(10);
+
+       /* Test each interrupt */
+       for (; i < 10; i++) {
+
+               /* Interrupt to test */
+               mask = 1 << i;
+
+               if (!shared_int) {
+                       /* Disable the interrupt to be reported in
+                        * the cause register and then force the same
+                        * interrupt and see if one gets posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+                       ew32(IMC, mask);
+                       ew32(ICS, mask);
+                       E1000_WRITE_FLUSH();
+                       msleep(10);
+
+                       if (adapter->test_icr & mask) {
+                               *data = 3;
+                               break;
+                       }
+               }
+
+               /* Enable the interrupt to be reported in
+                * the cause register and then force the same
+                * interrupt and see if one gets posted.  If
+                * an interrupt was not posted to the bus, the
+                * test failed.
+                */
+               adapter->test_icr = 0;
+               ew32(IMS, mask);
+               ew32(ICS, mask);
+               E1000_WRITE_FLUSH();
+               msleep(10);
+
+               if (!(adapter->test_icr & mask)) {
+                       *data = 4;
+                       break;
+               }
+
+               if (!shared_int) {
+                       /* Disable the other interrupts to be reported in
+                        * the cause register and then force the other
+                        * interrupts and see if any get posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+                       ew32(IMC, ~mask & 0x00007FFF);
+                       ew32(ICS, ~mask & 0x00007FFF);
+                       E1000_WRITE_FLUSH();
+                       msleep(10);
+
+                       if (adapter->test_icr) {
+                               *data = 5;
+                               break;
+                       }
+               }
+       }
+
+       /* Disable all the interrupts */
+       ew32(IMC, 0xFFFFFFFF);
+       E1000_WRITE_FLUSH();
+       msleep(10);
+
+       /* Unhook test interrupt handler */
+       free_irq(irq, netdev);
+
+       return *data;
+}
+
+static void e1000_free_desc_rings(struct e1000_adapter *adapter)
+{
+       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
+       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       int i;
+
+       if (txdr->desc && txdr->buffer_info) {
+               for (i = 0; i < txdr->count; i++) {
+                       if (txdr->buffer_info[i].dma)
+                               dma_unmap_single(&pdev->dev,
+                                                txdr->buffer_info[i].dma,
+                                                txdr->buffer_info[i].length,
+                                                DMA_TO_DEVICE);
+                       if (txdr->buffer_info[i].skb)
+                               dev_kfree_skb(txdr->buffer_info[i].skb);
+               }
+       }
+
+       if (rxdr->desc && rxdr->buffer_info) {
+               for (i = 0; i < rxdr->count; i++) {
+                       if (rxdr->buffer_info[i].dma)
+                               dma_unmap_single(&pdev->dev,
+                                                rxdr->buffer_info[i].dma,
+                                                rxdr->buffer_info[i].length,
+                                                DMA_FROM_DEVICE);
+                       if (rxdr->buffer_info[i].skb)
+                               dev_kfree_skb(rxdr->buffer_info[i].skb);
+               }
+       }
+
+       if (txdr->desc) {
+               dma_free_coherent(&pdev->dev, txdr->size, txdr->desc,
+                                 txdr->dma);
+               txdr->desc = NULL;
+       }
+       if (rxdr->desc) {
+               dma_free_coherent(&pdev->dev, rxdr->size, rxdr->desc,
+                                 rxdr->dma);
+               rxdr->desc = NULL;
+       }
+
+       kfree(txdr->buffer_info);
+       txdr->buffer_info = NULL;
+       kfree(rxdr->buffer_info);
+       rxdr->buffer_info = NULL;
+}
+
+static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
+       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       u32 rctl;
+       int i, ret_val;
+
+       /* Setup Tx descriptor ring and Tx buffers */
+
+       if (!txdr->count)
+               txdr->count = E1000_DEFAULT_TXD;
+
+       txdr->buffer_info = kcalloc(txdr->count, sizeof(struct e1000_buffer),
+                                   GFP_KERNEL);
+       if (!txdr->buffer_info) {
+               ret_val = 1;
+               goto err_nomem;
+       }
+
+       txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
+       txdr->size = ALIGN(txdr->size, 4096);
+       txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
+                                       GFP_KERNEL);
+       if (!txdr->desc) {
+               ret_val = 2;
+               goto err_nomem;
+       }
+       memset(txdr->desc, 0, txdr->size);
+       txdr->next_to_use = txdr->next_to_clean = 0;
+
+       ew32(TDBAL, ((u64)txdr->dma & 0x00000000FFFFFFFF));
+       ew32(TDBAH, ((u64)txdr->dma >> 32));
+       ew32(TDLEN, txdr->count * sizeof(struct e1000_tx_desc));
+       ew32(TDH, 0);
+       ew32(TDT, 0);
+       ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN |
+            E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
+            E1000_FDX_COLLISION_DISTANCE << E1000_COLD_SHIFT);
+
+       for (i = 0; i < txdr->count; i++) {
+               struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*txdr, i);
+               struct sk_buff *skb;
+               unsigned int size = 1024;
+
+               skb = alloc_skb(size, GFP_KERNEL);
+               if (!skb) {
+                       ret_val = 3;
+                       goto err_nomem;
+               }
+               skb_put(skb, size);
+               txdr->buffer_info[i].skb = skb;
+               txdr->buffer_info[i].length = skb->len;
+               txdr->buffer_info[i].dma =
+                       dma_map_single(&pdev->dev, skb->data, skb->len,
+                                      DMA_TO_DEVICE);
+               tx_desc->buffer_addr = cpu_to_le64(txdr->buffer_info[i].dma);
+               tx_desc->lower.data = cpu_to_le32(skb->len);
+               tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
+                                                  E1000_TXD_CMD_IFCS |
+                                                  E1000_TXD_CMD_RPS);
+               tx_desc->upper.data = 0;
+       }
+
+       /* Setup Rx descriptor ring and Rx buffers */
+
+       if (!rxdr->count)
+               rxdr->count = E1000_DEFAULT_RXD;
+
+       rxdr->buffer_info = kcalloc(rxdr->count, sizeof(struct e1000_buffer),
+                                   GFP_KERNEL);
+       if (!rxdr->buffer_info) {
+               ret_val = 4;
+               goto err_nomem;
+       }
+
+       rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
+       rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
+                                       GFP_KERNEL);
+       if (!rxdr->desc) {
+               ret_val = 5;
+               goto err_nomem;
+       }
+       memset(rxdr->desc, 0, rxdr->size);
+       rxdr->next_to_use = rxdr->next_to_clean = 0;
+
+       rctl = er32(RCTL);
+       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+       ew32(RDBAL, ((u64)rxdr->dma & 0xFFFFFFFF));
+       ew32(RDBAH, ((u64)rxdr->dma >> 32));
+       ew32(RDLEN, rxdr->size);
+       ew32(RDH, 0);
+       ew32(RDT, 0);
+       rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
+               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+               (hw->mc_filter_type << E1000_RCTL_MO_SHIFT);
+       ew32(RCTL, rctl);
+
+       for (i = 0; i < rxdr->count; i++) {
+               struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rxdr, i);
+               struct sk_buff *skb;
+
+               skb = alloc_skb(E1000_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL);
+               if (!skb) {
+                       ret_val = 6;
+                       goto err_nomem;
+               }
+               skb_reserve(skb, NET_IP_ALIGN);
+               rxdr->buffer_info[i].skb = skb;
+               rxdr->buffer_info[i].length = E1000_RXBUFFER_2048;
+               rxdr->buffer_info[i].dma =
+                       dma_map_single(&pdev->dev, skb->data,
+                                      E1000_RXBUFFER_2048, DMA_FROM_DEVICE);
+               rx_desc->buffer_addr = cpu_to_le64(rxdr->buffer_info[i].dma);
+               memset(skb->data, 0x00, skb->len);
+       }
+
+       return 0;
+
+err_nomem:
+       e1000_free_desc_rings(adapter);
+       return ret_val;
+}
+
+static void e1000_phy_disable_receiver(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
+       e1000_write_phy_reg(hw, 29, 0x001F);
+       e1000_write_phy_reg(hw, 30, 0x8FFC);
+       e1000_write_phy_reg(hw, 29, 0x001A);
+       e1000_write_phy_reg(hw, 30, 0x8FF0);
+}
+
+static void e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 phy_reg;
+
+       /* Because we reset the PHY above, we need to re-force TX_CLK in the
+        * Extended PHY Specific Control Register to 25MHz clock.  This
+        * value defaults back to a 2.5MHz clock when the PHY is reset.
+        */
+       e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
+       phy_reg |= M88E1000_EPSCR_TX_CLK_25;
+       e1000_write_phy_reg(hw,
+               M88E1000_EXT_PHY_SPEC_CTRL, phy_reg);
+
+       /* In addition, because of the s/w reset above, we need to enable
+        * CRS on TX.  This must be set for both full and half duplex
+        * operation.
+        */
+       e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_reg);
+       phy_reg |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
+       e1000_write_phy_reg(hw,
+               M88E1000_PHY_SPEC_CTRL, phy_reg);
+}
+
+static int e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl_reg;
+       u16 phy_reg;
+
+       /* Setup the Device Control Register for PHY loopback test. */
+
+       ctrl_reg = er32(CTRL);
+       ctrl_reg |= (E1000_CTRL_ILOS |          /* Invert Loss-Of-Signal */
+                    E1000_CTRL_FRCSPD |        /* Set the Force Speed Bit */
+                    E1000_CTRL_FRCDPX |        /* Set the Force Duplex Bit */
+                    E1000_CTRL_SPD_1000 |      /* Force Speed to 1000 */
+                    E1000_CTRL_FD);            /* Force Duplex to FULL */
+
+       ew32(CTRL, ctrl_reg);
+
+       /* Read the PHY Specific Control Register (0x10) */
+       e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_reg);
+
+       /* Clear Auto-Crossover bits in PHY Specific Control Register
+        * (bits 6:5).
+        */
+       phy_reg &= ~M88E1000_PSCR_AUTO_X_MODE;
+       e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_reg);
+
+       /* Perform software reset on the PHY */
+       e1000_phy_reset(hw);
+
+       /* Have to setup TX_CLK and TX_CRS after software reset */
+       e1000_phy_reset_clk_and_crs(adapter);
+
+       e1000_write_phy_reg(hw, PHY_CTRL, 0x8100);
+
+       /* Wait for reset to complete. */
+       udelay(500);
+
+       /* Have to setup TX_CLK and TX_CRS after software reset */
+       e1000_phy_reset_clk_and_crs(adapter);
+
+       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
+       e1000_phy_disable_receiver(adapter);
+
+       /* Set the loopback bit in the PHY control register. */
+       e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
+       phy_reg |= MII_CR_LOOPBACK;
+       e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
+
+       /* Setup TX_CLK and TX_CRS one more time. */
+       e1000_phy_reset_clk_and_crs(adapter);
+
+       /* Check Phy Configuration */
+       e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
+       if (phy_reg != 0x4100)
+                return 9;
+
+       e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
+       if (phy_reg != 0x0070)
+               return 10;
+
+       e1000_read_phy_reg(hw, 29, &phy_reg);
+       if (phy_reg != 0x001A)
+               return 11;
+
+       return 0;
+}
+
+static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl_reg = 0;
+       u32 stat_reg = 0;
+
+       hw->autoneg = false;
+
+       if (hw->phy_type == e1000_phy_m88) {
+               /* Auto-MDI/MDIX Off */
+               e1000_write_phy_reg(hw,
+                                   M88E1000_PHY_SPEC_CTRL, 0x0808);
+               /* reset to update Auto-MDI/MDIX */
+               e1000_write_phy_reg(hw, PHY_CTRL, 0x9140);
+               /* autoneg off */
+               e1000_write_phy_reg(hw, PHY_CTRL, 0x8140);
+       }
+
+       ctrl_reg = er32(CTRL);
+
+       /* force 1000, set loopback */
+       e1000_write_phy_reg(hw, PHY_CTRL, 0x4140);
+
+       /* Now set up the MAC to the same speed/duplex as the PHY. */
+       ctrl_reg = er32(CTRL);
+       ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
+       ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
+                       E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
+                       E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
+                       E1000_CTRL_FD);  /* Force Duplex to FULL */
+
+       if (hw->media_type == e1000_media_type_copper &&
+          hw->phy_type == e1000_phy_m88)
+               ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
+       else {
+               /* Set the ILOS bit on the fiber Nic is half
+                * duplex link is detected. */
+               stat_reg = er32(STATUS);
+               if ((stat_reg & E1000_STATUS_FD) == 0)
+                       ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
+       }
+
+       ew32(CTRL, ctrl_reg);
+
+       /* Disable the receiver on the PHY so when a cable is plugged in, the
+        * PHY does not begin to autoneg when a cable is reconnected to the NIC.
+        */
+       if (hw->phy_type == e1000_phy_m88)
+               e1000_phy_disable_receiver(adapter);
+
+       udelay(500);
+
+       return 0;
+}
+
+static int e1000_set_phy_loopback(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 phy_reg = 0;
+       u16 count = 0;
+
+       switch (hw->mac_type) {
+       case e1000_82543:
+               if (hw->media_type == e1000_media_type_copper) {
+                       /* Attempt to setup Loopback mode on Non-integrated PHY.
+                        * Some PHY registers get corrupted at random, so
+                        * attempt this 10 times.
+                        */
+                       while (e1000_nonintegrated_phy_loopback(adapter) &&
+                             count++ < 10);
+                       if (count < 11)
+                               return 0;
+               }
+               break;
+
+       case e1000_82544:
+       case e1000_82540:
+       case e1000_82545:
+       case e1000_82545_rev_3:
+       case e1000_82546:
+       case e1000_82546_rev_3:
+       case e1000_82541:
+       case e1000_82541_rev_2:
+       case e1000_82547:
+       case e1000_82547_rev_2:
+               return e1000_integrated_phy_loopback(adapter);
+               break;
+       default:
+               /* Default PHY loopback work is to read the MII
+                * control register and assert bit 14 (loopback mode).
+                */
+               e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
+               phy_reg |= MII_CR_LOOPBACK;
+               e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
+               return 0;
+               break;
+       }
+
+       return 8;
+}
+
+static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+
+       if (hw->media_type == e1000_media_type_fiber ||
+           hw->media_type == e1000_media_type_internal_serdes) {
+               switch (hw->mac_type) {
+               case e1000_82545:
+               case e1000_82546:
+               case e1000_82545_rev_3:
+               case e1000_82546_rev_3:
+                       return e1000_set_phy_loopback(adapter);
+                       break;
+               default:
+                       rctl = er32(RCTL);
+                       rctl |= E1000_RCTL_LBM_TCVR;
+                       ew32(RCTL, rctl);
+                       return 0;
+               }
+       } else if (hw->media_type == e1000_media_type_copper)
+               return e1000_set_phy_loopback(adapter);
+
+       return 7;
+}
+
+static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+       u16 phy_reg;
+
+       rctl = er32(RCTL);
+       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
+       ew32(RCTL, rctl);
+
+       switch (hw->mac_type) {
+       case e1000_82545:
+       case e1000_82546:
+       case e1000_82545_rev_3:
+       case e1000_82546_rev_3:
+       default:
+               hw->autoneg = true;
+               e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
+               if (phy_reg & MII_CR_LOOPBACK) {
+                       phy_reg &= ~MII_CR_LOOPBACK;
+                       e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
+                       e1000_phy_reset(hw);
+               }
+               break;
+       }
+}
+
+static void e1000_create_lbtest_frame(struct sk_buff *skb,
+                                     unsigned int frame_size)
+{
+       memset(skb->data, 0xFF, frame_size);
+       frame_size &= ~1;
+       memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
+       memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
+       memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
+}
+
+static int e1000_check_lbtest_frame(struct sk_buff *skb,
+                                   unsigned int frame_size)
+{
+       frame_size &= ~1;
+       if (*(skb->data + 3) == 0xFF) {
+               if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
+                  (*(skb->data + frame_size / 2 + 12) == 0xAF)) {
+                       return 0;
+               }
+       }
+       return 13;
+}
+
+static int e1000_run_loopback_test(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
+       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       int i, j, k, l, lc, good_cnt, ret_val=0;
+       unsigned long time;
+
+       ew32(RDT, rxdr->count - 1);
+
+       /* Calculate the loop count based on the largest descriptor ring
+        * The idea is to wrap the largest ring a number of times using 64
+        * send/receive pairs during each loop
+        */
+
+       if (rxdr->count <= txdr->count)
+               lc = ((txdr->count / 64) * 2) + 1;
+       else
+               lc = ((rxdr->count / 64) * 2) + 1;
+
+       k = l = 0;
+       for (j = 0; j <= lc; j++) { /* loop count loop */
+               for (i = 0; i < 64; i++) { /* send the packets */
+                       e1000_create_lbtest_frame(txdr->buffer_info[i].skb,
+                                       1024);
+                       dma_sync_single_for_device(&pdev->dev,
+                                                  txdr->buffer_info[k].dma,
+                                                  txdr->buffer_info[k].length,
+                                                  DMA_TO_DEVICE);
+                       if (unlikely(++k == txdr->count)) k = 0;
+               }
+               ew32(TDT, k);
+               E1000_WRITE_FLUSH();
+               msleep(200);
+               time = jiffies; /* set the start time for the receive */
+               good_cnt = 0;
+               do { /* receive the sent packets */
+                       dma_sync_single_for_cpu(&pdev->dev,
+                                               rxdr->buffer_info[l].dma,
+                                               rxdr->buffer_info[l].length,
+                                               DMA_FROM_DEVICE);
+
+                       ret_val = e1000_check_lbtest_frame(
+                                       rxdr->buffer_info[l].skb,
+                                       1024);
+                       if (!ret_val)
+                               good_cnt++;
+                       if (unlikely(++l == rxdr->count)) l = 0;
+                       /* time + 20 msecs (200 msecs on 2.4) is more than
+                        * enough time to complete the receives, if it's
+                        * exceeded, break and error off
+                        */
+               } while (good_cnt < 64 && jiffies < (time + 20));
+               if (good_cnt != 64) {
+                       ret_val = 13; /* ret_val is the same as mis-compare */
+                       break;
+               }
+               if (jiffies >= (time + 2)) {
+                       ret_val = 14; /* error code for time out error */
+                       break;
+               }
+       } /* end loop count loop */
+       return ret_val;
+}
+
+static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
+{
+       *data = e1000_setup_desc_rings(adapter);
+       if (*data)
+               goto out;
+       *data = e1000_setup_loopback_test(adapter);
+       if (*data)
+               goto err_loopback;
+       *data = e1000_run_loopback_test(adapter);
+       e1000_loopback_cleanup(adapter);
+
+err_loopback:
+       e1000_free_desc_rings(adapter);
+out:
+       return *data;
+}
+
+static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       *data = 0;
+       if (hw->media_type == e1000_media_type_internal_serdes) {
+               int i = 0;
+               hw->serdes_has_link = false;
+
+               /* On some blade server designs, link establishment
+                * could take as long as 2-3 minutes */
+               do {
+                       e1000_check_for_link(hw);
+                       if (hw->serdes_has_link)
+                               return *data;
+                       msleep(20);
+               } while (i++ < 3750);
+
+               *data = 1;
+       } else {
+               e1000_check_for_link(hw);
+               if (hw->autoneg)  /* if auto_neg is set wait for it */
+                       msleep(4000);
+
+               if (!(er32(STATUS) & E1000_STATUS_LU)) {
+                       *data = 1;
+               }
+       }
+       return *data;
+}
+
+static int e1000_get_sset_count(struct net_device *netdev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_TEST:
+               return E1000_TEST_LEN;
+       case ETH_SS_STATS:
+               return E1000_STATS_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static void e1000_diag_test(struct net_device *netdev,
+                           struct ethtool_test *eth_test, u64 *data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       bool if_running = netif_running(netdev);
+
+       set_bit(__E1000_TESTING, &adapter->flags);
+       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
+               /* Offline tests */
+
+               /* save speed, duplex, autoneg settings */
+               u16 autoneg_advertised = hw->autoneg_advertised;
+               u8 forced_speed_duplex = hw->forced_speed_duplex;
+               u8 autoneg = hw->autoneg;
+
+               e_info(hw, "offline testing starting\n");
+
+               /* Link test performed before hardware reset so autoneg doesn't
+                * interfere with test result */
+               if (e1000_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               if (if_running)
+                       /* indicate we're in test mode */
+                       dev_close(netdev);
+               else
+                       e1000_reset(adapter);
+
+               if (e1000_reg_test(adapter, &data[0]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               e1000_reset(adapter);
+               if (e1000_eeprom_test(adapter, &data[1]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               e1000_reset(adapter);
+               if (e1000_intr_test(adapter, &data[2]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               e1000_reset(adapter);
+               /* make sure the phy is powered up */
+               e1000_power_up_phy(adapter);
+               if (e1000_loopback_test(adapter, &data[3]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* restore speed, duplex, autoneg settings */
+               hw->autoneg_advertised = autoneg_advertised;
+               hw->forced_speed_duplex = forced_speed_duplex;
+               hw->autoneg = autoneg;
+
+               e1000_reset(adapter);
+               clear_bit(__E1000_TESTING, &adapter->flags);
+               if (if_running)
+                       dev_open(netdev);
+       } else {
+               e_info(hw, "online testing starting\n");
+               /* Online tests */
+               if (e1000_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* Online tests aren't run; pass by default */
+               data[0] = 0;
+               data[1] = 0;
+               data[2] = 0;
+               data[3] = 0;
+
+               clear_bit(__E1000_TESTING, &adapter->flags);
+       }
+       msleep_interruptible(4 * 1000);
+}
+
+static int e1000_wol_exclusion(struct e1000_adapter *adapter,
+                              struct ethtool_wolinfo *wol)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       int retval = 1; /* fail by default */
+
+       switch (hw->device_id) {
+       case E1000_DEV_ID_82542:
+       case E1000_DEV_ID_82543GC_FIBER:
+       case E1000_DEV_ID_82543GC_COPPER:
+       case E1000_DEV_ID_82544EI_FIBER:
+       case E1000_DEV_ID_82546EB_QUAD_COPPER:
+       case E1000_DEV_ID_82545EM_FIBER:
+       case E1000_DEV_ID_82545EM_COPPER:
+       case E1000_DEV_ID_82546GB_QUAD_COPPER:
+       case E1000_DEV_ID_82546GB_PCIE:
+               /* these don't support WoL at all */
+               wol->supported = 0;
+               break;
+       case E1000_DEV_ID_82546EB_FIBER:
+       case E1000_DEV_ID_82546GB_FIBER:
+               /* Wake events not supported on port B */
+               if (er32(STATUS) & E1000_STATUS_FUNC_1) {
+                       wol->supported = 0;
+                       break;
+               }
+               /* return success for non excluded adapter ports */
+               retval = 0;
+               break;
+       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+               /* quad port adapters only support WoL on port A */
+               if (!adapter->quad_port_a) {
+                       wol->supported = 0;
+                       break;
+               }
+               /* return success for non excluded adapter ports */
+               retval = 0;
+               break;
+       default:
+               /* dual port cards only support WoL on port A from now on
+                * unless it was enabled in the eeprom for port B
+                * so exclude FUNC_1 ports from having WoL enabled */
+               if (er32(STATUS) & E1000_STATUS_FUNC_1 &&
+                   !adapter->eeprom_wol) {
+                       wol->supported = 0;
+                       break;
+               }
+
+               retval = 0;
+       }
+
+       return retval;
+}
+
+static void e1000_get_wol(struct net_device *netdev,
+                         struct ethtool_wolinfo *wol)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       wol->supported = WAKE_UCAST | WAKE_MCAST |
+                        WAKE_BCAST | WAKE_MAGIC;
+       wol->wolopts = 0;
+
+       /* this function will set ->supported = 0 and return 1 if wol is not
+        * supported by this hardware */
+       if (e1000_wol_exclusion(adapter, wol) ||
+           !device_can_wakeup(&adapter->pdev->dev))
+               return;
+
+       /* apply any specific unsupported masks here */
+       switch (hw->device_id) {
+       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+               /* KSP3 does not suppport UCAST wake-ups */
+               wol->supported &= ~WAKE_UCAST;
+
+               if (adapter->wol & E1000_WUFC_EX)
+                       e_err(drv, "Interface does not support directed "
+                             "(unicast) frame wake-up packets\n");
+               break;
+       default:
+               break;
+       }
+
+       if (adapter->wol & E1000_WUFC_EX)
+               wol->wolopts |= WAKE_UCAST;
+       if (adapter->wol & E1000_WUFC_MC)
+               wol->wolopts |= WAKE_MCAST;
+       if (adapter->wol & E1000_WUFC_BC)
+               wol->wolopts |= WAKE_BCAST;
+       if (adapter->wol & E1000_WUFC_MAG)
+               wol->wolopts |= WAKE_MAGIC;
+}
+
+static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
+               return -EOPNOTSUPP;
+
+       if (e1000_wol_exclusion(adapter, wol) ||
+           !device_can_wakeup(&adapter->pdev->dev))
+               return wol->wolopts ? -EOPNOTSUPP : 0;
+
+       switch (hw->device_id) {
+       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+               if (wol->wolopts & WAKE_UCAST) {
+                       e_err(drv, "Interface does not support directed "
+                             "(unicast) frame wake-up packets\n");
+                       return -EOPNOTSUPP;
+               }
+               break;
+       default:
+               break;
+       }
+
+       /* these settings will always override what we currently have */
+       adapter->wol = 0;
+
+       if (wol->wolopts & WAKE_UCAST)
+               adapter->wol |= E1000_WUFC_EX;
+       if (wol->wolopts & WAKE_MCAST)
+               adapter->wol |= E1000_WUFC_MC;
+       if (wol->wolopts & WAKE_BCAST)
+               adapter->wol |= E1000_WUFC_BC;
+       if (wol->wolopts & WAKE_MAGIC)
+               adapter->wol |= E1000_WUFC_MAG;
+
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       return 0;
+}
+
+static int e1000_set_phys_id(struct net_device *netdev,
+                            enum ethtool_phys_id_state state)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       switch (state) {
+       case ETHTOOL_ID_ACTIVE:
+               e1000_setup_led(hw);
+               return 2;
+
+       case ETHTOOL_ID_ON:
+               e1000_led_on(hw);
+               break;
+
+       case ETHTOOL_ID_OFF:
+               e1000_led_off(hw);
+               break;
+
+       case ETHTOOL_ID_INACTIVE:
+               e1000_cleanup_led(hw);
+       }
+
+       return 0;
+}
+
+static int e1000_get_coalesce(struct net_device *netdev,
+                             struct ethtool_coalesce *ec)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (adapter->hw.mac_type < e1000_82545)
+               return -EOPNOTSUPP;
+
+       if (adapter->itr_setting <= 4)
+               ec->rx_coalesce_usecs = adapter->itr_setting;
+       else
+               ec->rx_coalesce_usecs = 1000000 / adapter->itr_setting;
+
+       return 0;
+}
+
+static int e1000_set_coalesce(struct net_device *netdev,
+                             struct ethtool_coalesce *ec)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (hw->mac_type < e1000_82545)
+               return -EOPNOTSUPP;
+
+       if ((ec->rx_coalesce_usecs > E1000_MAX_ITR_USECS) ||
+           ((ec->rx_coalesce_usecs > 4) &&
+            (ec->rx_coalesce_usecs < E1000_MIN_ITR_USECS)) ||
+           (ec->rx_coalesce_usecs == 2))
+               return -EINVAL;
+
+       if (ec->rx_coalesce_usecs == 4) {
+               adapter->itr = adapter->itr_setting = 4;
+       } else if (ec->rx_coalesce_usecs <= 3) {
+               adapter->itr = 20000;
+               adapter->itr_setting = ec->rx_coalesce_usecs;
+       } else {
+               adapter->itr = (1000000 / ec->rx_coalesce_usecs);
+               adapter->itr_setting = adapter->itr & ~3;
+       }
+
+       if (adapter->itr_setting != 0)
+               ew32(ITR, 1000000000 / (adapter->itr * 256));
+       else
+               ew32(ITR, 0);
+
+       return 0;
+}
+
+static int e1000_nway_reset(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       if (netif_running(netdev))
+               e1000_reinit_locked(adapter);
+       return 0;
+}
+
+static void e1000_get_ethtool_stats(struct net_device *netdev,
+                                   struct ethtool_stats *stats, u64 *data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       int i;
+       char *p = NULL;
+
+       e1000_update_stats(adapter);
+       for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
+               switch (e1000_gstrings_stats[i].type) {
+               case NETDEV_STATS:
+                       p = (char *) netdev +
+                                       e1000_gstrings_stats[i].stat_offset;
+                       break;
+               case E1000_STATS:
+                       p = (char *) adapter +
+                                       e1000_gstrings_stats[i].stat_offset;
+                       break;
+               }
+
+               data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
+                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+       }
+/*     BUG_ON(i != E1000_STATS_LEN); */
+}
+
+static void e1000_get_strings(struct net_device *netdev, u32 stringset,
+                             u8 *data)
+{
+       u8 *p = data;
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_TEST:
+               memcpy(data, *e1000_gstrings_test,
+                       sizeof(e1000_gstrings_test));
+               break;
+       case ETH_SS_STATS:
+               for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
+                       memcpy(p, e1000_gstrings_stats[i].stat_string,
+                              ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+/*             BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */
+               break;
+       }
+}
+
+static const struct ethtool_ops e1000_ethtool_ops = {
+       .get_settings           = e1000_get_settings,
+       .set_settings           = e1000_set_settings,
+       .get_drvinfo            = e1000_get_drvinfo,
+       .get_regs_len           = e1000_get_regs_len,
+       .get_regs               = e1000_get_regs,
+       .get_wol                = e1000_get_wol,
+       .set_wol                = e1000_set_wol,
+       .get_msglevel           = e1000_get_msglevel,
+       .set_msglevel           = e1000_set_msglevel,
+       .nway_reset             = e1000_nway_reset,
+       .get_link               = e1000_get_link,
+       .get_eeprom_len         = e1000_get_eeprom_len,
+       .get_eeprom             = e1000_get_eeprom,
+       .set_eeprom             = e1000_set_eeprom,
+       .get_ringparam          = e1000_get_ringparam,
+       .set_ringparam          = e1000_set_ringparam,
+       .get_pauseparam         = e1000_get_pauseparam,
+       .set_pauseparam         = e1000_set_pauseparam,
+       .self_test              = e1000_diag_test,
+       .get_strings            = e1000_get_strings,
+       .set_phys_id            = e1000_set_phys_id,
+       .get_ethtool_stats      = e1000_get_ethtool_stats,
+       .get_sset_count         = e1000_get_sset_count,
+       .get_coalesce           = e1000_get_coalesce,
+       .set_coalesce           = e1000_set_coalesce,
+};
+
+void e1000_set_ethtool_ops(struct net_device *netdev)
+{
+       SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
+}
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
new file mode 100644 (file)
index 0000000..8545c7a
--- /dev/null
@@ -0,0 +1,5824 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+ */
+
+/* e1000_hw.c
+ * Shared functions for accessing and configuring the MAC
+ */
+
+#include "e1000.h"
+
+static s32 e1000_check_downshift(struct e1000_hw *hw);
+static s32 e1000_check_polarity(struct e1000_hw *hw,
+                               e1000_rev_polarity *polarity);
+static void e1000_clear_hw_cntrs(struct e1000_hw *hw);
+static void e1000_clear_vfta(struct e1000_hw *hw);
+static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw,
+                                             bool link_up);
+static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw);
+static s32 e1000_detect_gig_phy(struct e1000_hw *hw);
+static s32 e1000_get_auto_rd_done(struct e1000_hw *hw);
+static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
+                                 u16 *max_length);
+static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
+static s32 e1000_id_led_init(struct e1000_hw *hw);
+static void e1000_init_rx_addrs(struct e1000_hw *hw);
+static s32 e1000_phy_igp_get_info(struct e1000_hw *hw,
+                                 struct e1000_phy_info *phy_info);
+static s32 e1000_phy_m88_get_info(struct e1000_hw *hw,
+                                 struct e1000_phy_info *phy_info);
+static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active);
+static s32 e1000_wait_autoneg(struct e1000_hw *hw);
+static void e1000_write_reg_io(struct e1000_hw *hw, u32 offset, u32 value);
+static s32 e1000_set_phy_type(struct e1000_hw *hw);
+static void e1000_phy_init_script(struct e1000_hw *hw);
+static s32 e1000_setup_copper_link(struct e1000_hw *hw);
+static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw);
+static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw);
+static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
+static s32 e1000_config_mac_to_phy(struct e1000_hw *hw);
+static void e1000_raise_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
+static void e1000_lower_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
+static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data, u16 count);
+static u16 e1000_shift_in_mdi_bits(struct e1000_hw *hw);
+static s32 e1000_phy_reset_dsp(struct e1000_hw *hw);
+static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset,
+                                 u16 words, u16 *data);
+static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw, u16 offset,
+                                       u16 words, u16 *data);
+static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw);
+static void e1000_raise_ee_clk(struct e1000_hw *hw, u32 *eecd);
+static void e1000_lower_ee_clk(struct e1000_hw *hw, u32 *eecd);
+static void e1000_shift_out_ee_bits(struct e1000_hw *hw, u16 data, u16 count);
+static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
+                                 u16 phy_data);
+static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
+                                u16 *phy_data);
+static u16 e1000_shift_in_ee_bits(struct e1000_hw *hw, u16 count);
+static s32 e1000_acquire_eeprom(struct e1000_hw *hw);
+static void e1000_release_eeprom(struct e1000_hw *hw);
+static void e1000_standby_eeprom(struct e1000_hw *hw);
+static s32 e1000_set_vco_speed(struct e1000_hw *hw);
+static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw);
+static s32 e1000_set_phy_mode(struct e1000_hw *hw);
+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
+                               u16 *data);
+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
+                                u16 *data);
+
+/* IGP cable length table */
+static const
+u16 e1000_igp_cable_length_table[IGP01E1000_AGC_LENGTH_TABLE_SIZE] = {
+       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
+};
+
+static DEFINE_SPINLOCK(e1000_eeprom_lock);
+
+/**
+ * e1000_set_phy_type - Set the phy type member in the hw struct.
+ * @hw: Struct containing variables accessed by shared code
+ */
+static s32 e1000_set_phy_type(struct e1000_hw *hw)
+{
+       e_dbg("e1000_set_phy_type");
+
+       if (hw->mac_type == e1000_undefined)
+               return -E1000_ERR_PHY_TYPE;
+
+       switch (hw->phy_id) {
+       case M88E1000_E_PHY_ID:
+       case M88E1000_I_PHY_ID:
+       case M88E1011_I_PHY_ID:
+       case M88E1111_I_PHY_ID:
+       case M88E1118_E_PHY_ID:
+               hw->phy_type = e1000_phy_m88;
+               break;
+       case IGP01E1000_I_PHY_ID:
+               if (hw->mac_type == e1000_82541 ||
+                   hw->mac_type == e1000_82541_rev_2 ||
+                   hw->mac_type == e1000_82547 ||
+                   hw->mac_type == e1000_82547_rev_2)
+                       hw->phy_type = e1000_phy_igp;
+               break;
+       case RTL8211B_PHY_ID:
+               hw->phy_type = e1000_phy_8211;
+               break;
+       case RTL8201N_PHY_ID:
+               hw->phy_type = e1000_phy_8201;
+               break;
+       default:
+               /* Should never have loaded on this device */
+               hw->phy_type = e1000_phy_undefined;
+               return -E1000_ERR_PHY_TYPE;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_phy_init_script - IGP phy init script - initializes the GbE PHY
+ * @hw: Struct containing variables accessed by shared code
+ */
+static void e1000_phy_init_script(struct e1000_hw *hw)
+{
+       u32 ret_val;
+       u16 phy_saved_data;
+
+       e_dbg("e1000_phy_init_script");
+
+       if (hw->phy_init_script) {
+               msleep(20);
+
+               /* Save off the current value of register 0x2F5B to be restored at
+                * the end of this routine. */
+               ret_val = e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
+
+               /* Disabled the PHY transmitter */
+               e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
+               msleep(20);
+
+               e1000_write_phy_reg(hw, 0x0000, 0x0140);
+               msleep(5);
+
+               switch (hw->mac_type) {
+               case e1000_82541:
+               case e1000_82547:
+                       e1000_write_phy_reg(hw, 0x1F95, 0x0001);
+                       e1000_write_phy_reg(hw, 0x1F71, 0xBD21);
+                       e1000_write_phy_reg(hw, 0x1F79, 0x0018);
+                       e1000_write_phy_reg(hw, 0x1F30, 0x1600);
+                       e1000_write_phy_reg(hw, 0x1F31, 0x0014);
+                       e1000_write_phy_reg(hw, 0x1F32, 0x161C);
+                       e1000_write_phy_reg(hw, 0x1F94, 0x0003);
+                       e1000_write_phy_reg(hw, 0x1F96, 0x003F);
+                       e1000_write_phy_reg(hw, 0x2010, 0x0008);
+                       break;
+
+               case e1000_82541_rev_2:
+               case e1000_82547_rev_2:
+                       e1000_write_phy_reg(hw, 0x1F73, 0x0099);
+                       break;
+               default:
+                       break;
+               }
+
+               e1000_write_phy_reg(hw, 0x0000, 0x3300);
+               msleep(20);
+
+               /* Now enable the transmitter */
+               e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
+
+               if (hw->mac_type == e1000_82547) {
+                       u16 fused, fine, coarse;
+
+                       /* Move to analog registers page */
+                       e1000_read_phy_reg(hw,
+                                          IGP01E1000_ANALOG_SPARE_FUSE_STATUS,
+                                          &fused);
+
+                       if (!(fused & IGP01E1000_ANALOG_SPARE_FUSE_ENABLED)) {
+                               e1000_read_phy_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);
+
+                               e1000_write_phy_reg(hw,
+                                                   IGP01E1000_ANALOG_FUSE_CONTROL,
+                                                   fused);
+                               e1000_write_phy_reg(hw,
+                                                   IGP01E1000_ANALOG_FUSE_BYPASS,
+                                                   IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL);
+                       }
+               }
+       }
+}
+
+/**
+ * e1000_set_mac_type - Set the mac type member in the hw struct.
+ * @hw: Struct containing variables accessed by shared code
+ */
+s32 e1000_set_mac_type(struct e1000_hw *hw)
+{
+       e_dbg("e1000_set_mac_type");
+
+       switch (hw->device_id) {
+       case E1000_DEV_ID_82542:
+               switch (hw->revision_id) {
+               case E1000_82542_2_0_REV_ID:
+                       hw->mac_type = e1000_82542_rev2_0;
+                       break;
+               case E1000_82542_2_1_REV_ID:
+                       hw->mac_type = e1000_82542_rev2_1;
+                       break;
+               default:
+                       /* Invalid 82542 revision ID */
+                       return -E1000_ERR_MAC_TYPE;
+               }
+               break;
+       case E1000_DEV_ID_82543GC_FIBER:
+       case E1000_DEV_ID_82543GC_COPPER:
+               hw->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:
+               hw->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:
+               hw->mac_type = e1000_82540;
+               break;
+       case E1000_DEV_ID_82545EM_COPPER:
+       case E1000_DEV_ID_82545EM_FIBER:
+               hw->mac_type = e1000_82545;
+               break;
+       case E1000_DEV_ID_82545GM_COPPER:
+       case E1000_DEV_ID_82545GM_FIBER:
+       case E1000_DEV_ID_82545GM_SERDES:
+               hw->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:
+               hw->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:
+               hw->mac_type = e1000_82546_rev_3;
+               break;
+       case E1000_DEV_ID_82541EI:
+       case E1000_DEV_ID_82541EI_MOBILE:
+       case E1000_DEV_ID_82541ER_LOM:
+               hw->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:
+               hw->mac_type = e1000_82541_rev_2;
+               break;
+       case E1000_DEV_ID_82547EI:
+       case E1000_DEV_ID_82547EI_MOBILE:
+               hw->mac_type = e1000_82547;
+               break;
+       case E1000_DEV_ID_82547GI:
+               hw->mac_type = e1000_82547_rev_2;
+               break;
+       case E1000_DEV_ID_INTEL_CE4100_GBE:
+               hw->mac_type = e1000_ce4100;
+               break;
+       default:
+               /* Should never have loaded on this device */
+               return -E1000_ERR_MAC_TYPE;
+       }
+
+       switch (hw->mac_type) {
+       case e1000_82541:
+       case e1000_82547:
+       case e1000_82541_rev_2:
+       case e1000_82547_rev_2:
+               hw->asf_firmware_present = true;
+               break;
+       default:
+               break;
+       }
+
+       /* The 82543 chip does not count tx_carrier_errors properly in
+        * FD mode
+        */
+       if (hw->mac_type == e1000_82543)
+               hw->bad_tx_carr_stats_fd = true;
+
+       if (hw->mac_type > e1000_82544)
+               hw->has_smbus = true;
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_set_media_type - Set media type and TBI compatibility.
+ * @hw: Struct containing variables accessed by shared code
+ */
+void e1000_set_media_type(struct e1000_hw *hw)
+{
+       u32 status;
+
+       e_dbg("e1000_set_media_type");
+
+       if (hw->mac_type != e1000_82543) {
+               /* tbi_compatibility is only valid on 82543 */
+               hw->tbi_compatibility_en = false;
+       }
+
+       switch (hw->device_id) {
+       case E1000_DEV_ID_82545GM_SERDES:
+       case E1000_DEV_ID_82546GB_SERDES:
+               hw->media_type = e1000_media_type_internal_serdes;
+               break;
+       default:
+               switch (hw->mac_type) {
+               case e1000_82542_rev2_0:
+               case e1000_82542_rev2_1:
+                       hw->media_type = e1000_media_type_fiber;
+                       break;
+               case e1000_ce4100:
+                       hw->media_type = e1000_media_type_copper;
+                       break;
+               default:
+                       status = er32(STATUS);
+                       if (status & E1000_STATUS_TBIMODE) {
+                               hw->media_type = e1000_media_type_fiber;
+                               /* tbi_compatibility not valid on fiber */
+                               hw->tbi_compatibility_en = false;
+                       } else {
+                               hw->media_type = e1000_media_type_copper;
+                       }
+                       break;
+               }
+       }
+}
+
+/**
+ * e1000_reset_hw: reset the hardware completely
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Reset the transmit and receive units; mask and clear all interrupts.
+ */
+s32 e1000_reset_hw(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       u32 ctrl_ext;
+       u32 icr;
+       u32 manc;
+       u32 led_ctrl;
+       s32 ret_val;
+
+       e_dbg("e1000_reset_hw");
+
+       /* For 82542 (rev 2.0), disable MWI before issuing a device reset */
+       if (hw->mac_type == e1000_82542_rev2_0) {
+               e_dbg("Disabling MWI on 82542 rev 2.0\n");
+               e1000_pci_clear_mwi(hw);
+       }
+
+       /* Clear interrupt mask to stop board from generating interrupts */
+       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);
+       E1000_WRITE_FLUSH();
+
+       /* The tbi_compatibility_on Flag must be cleared when Rctl is cleared. */
+       hw->tbi_compatibility_on = false;
+
+       /* Delay to allow any outstanding PCI transactions to complete before
+        * resetting the device
+        */
+       msleep(10);
+
+       ctrl = er32(CTRL);
+
+       /* Must reset the PHY before resetting the MAC */
+       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
+               ew32(CTRL, (ctrl | E1000_CTRL_PHY_RST));
+               E1000_WRITE_FLUSH();
+               msleep(5);
+       }
+
+       /* Issue a global reset to the MAC.  This will reset the chip's
+        * transmit, receive, DMA, and link units.  It will not effect
+        * the current PCI configuration.  The global reset bit is self-
+        * clearing, and should clear within a microsecond.
+        */
+       e_dbg("Issuing a global reset to MAC\n");
+
+       switch (hw->mac_type) {
+       case e1000_82544:
+       case e1000_82540:
+       case e1000_82545:
+       case e1000_82546:
+       case e1000_82541:
+       case e1000_82541_rev_2:
+               /* These controllers can't ack the 64-bit write when issuing the
+                * reset, so use IO-mapping as a workaround to issue the reset */
+               E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST));
+               break;
+       case e1000_82545_rev_3:
+       case e1000_82546_rev_3:
+               /* Reset is performed on a shadow of the control register */
+               ew32(CTRL_DUP, (ctrl | E1000_CTRL_RST));
+               break;
+       case e1000_ce4100:
+       default:
+               ew32(CTRL, (ctrl | E1000_CTRL_RST));
+               break;
+       }
+
+       /* After MAC reset, force reload of EEPROM to restore power-on settings to
+        * device.  Later controllers reload the EEPROM automatically, so just wait
+        * for reload to complete.
+        */
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+       case e1000_82544:
+               /* Wait for reset to complete */
+               udelay(10);
+               ctrl_ext = er32(CTRL_EXT);
+               ctrl_ext |= E1000_CTRL_EXT_EE_RST;
+               ew32(CTRL_EXT, ctrl_ext);
+               E1000_WRITE_FLUSH();
+               /* Wait for EEPROM reload */
+               msleep(2);
+               break;
+       case e1000_82541:
+       case e1000_82541_rev_2:
+       case e1000_82547:
+       case e1000_82547_rev_2:
+               /* Wait for EEPROM reload */
+               msleep(20);
+               break;
+       default:
+               /* Auto read done will delay 5ms or poll based on mac type */
+               ret_val = e1000_get_auto_rd_done(hw);
+               if (ret_val)
+                       return ret_val;
+               break;
+       }
+
+       /* Disable HW ARPs on ASF enabled adapters */
+       if (hw->mac_type >= e1000_82540) {
+               manc = er32(MANC);
+               manc &= ~(E1000_MANC_ARP_EN);
+               ew32(MANC, manc);
+       }
+
+       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
+               e1000_phy_init_script(hw);
+
+               /* Configure activity LED after PHY reset */
+               led_ctrl = er32(LEDCTL);
+               led_ctrl &= IGP_ACTIVITY_LED_MASK;
+               led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
+               ew32(LEDCTL, led_ctrl);
+       }
+
+       /* Clear interrupt mask to stop board from generating interrupts */
+       e_dbg("Masking off all interrupts\n");
+       ew32(IMC, 0xffffffff);
+
+       /* Clear any pending interrupt events. */
+       icr = er32(ICR);
+
+       /* If MWI was previously enabled, reenable it. */
+       if (hw->mac_type == e1000_82542_rev2_0) {
+               if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
+                       e1000_pci_set_mwi(hw);
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_init_hw: Performs basic configuration of the adapter.
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Assumes that the controller has previously been reset and is in a
+ * post-reset uninitialized state. Initializes the receive address registers,
+ * multicast table, and VLAN filter table. Calls routines to setup link
+ * configuration and flow control settings. Clears all on-chip counters. Leaves
+ * the transmit and receive units disabled and uninitialized.
+ */
+s32 e1000_init_hw(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       u32 i;
+       s32 ret_val;
+       u32 mta_size;
+       u32 ctrl_ext;
+
+       e_dbg("e1000_init_hw");
+
+       /* Initialize Identification LED */
+       ret_val = e1000_id_led_init(hw);
+       if (ret_val) {
+               e_dbg("Error Initializing Identification LED\n");
+               return ret_val;
+       }
+
+       /* Set the media type and TBI compatibility */
+       e1000_set_media_type(hw);
+
+       /* Disabling VLAN filtering. */
+       e_dbg("Initializing the IEEE VLAN\n");
+       if (hw->mac_type < e1000_82545_rev_3)
+               ew32(VET, 0);
+       e1000_clear_vfta(hw);
+
+       /* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
+       if (hw->mac_type == e1000_82542_rev2_0) {
+               e_dbg("Disabling MWI on 82542 rev 2.0\n");
+               e1000_pci_clear_mwi(hw);
+               ew32(RCTL, E1000_RCTL_RST);
+               E1000_WRITE_FLUSH();
+               msleep(5);
+       }
+
+       /* Setup the receive address. This involves initializing all of the Receive
+        * Address Registers (RARs 0 - 15).
+        */
+       e1000_init_rx_addrs(hw);
+
+       /* For 82542 (rev 2.0), take the receiver out of reset and enable MWI */
+       if (hw->mac_type == e1000_82542_rev2_0) {
+               ew32(RCTL, 0);
+               E1000_WRITE_FLUSH();
+               msleep(1);
+               if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
+                       e1000_pci_set_mwi(hw);
+       }
+
+       /* Zero out the Multicast HASH table */
+       e_dbg("Zeroing the MTA\n");
+       mta_size = E1000_MC_TBL_SIZE;
+       for (i = 0; i < mta_size; i++) {
+               E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);
+               /* use write flush to prevent Memory Write Block (MWB) from
+                * occurring when accessing our register space */
+               E1000_WRITE_FLUSH();
+       }
+
+       /* 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.  Valid only on
+        * 82542 and 82543 silicon.
+        */
+       if (hw->dma_fairness && hw->mac_type <= e1000_82543) {
+               ctrl = er32(CTRL);
+               ew32(CTRL, ctrl | E1000_CTRL_PRIOR);
+       }
+
+       switch (hw->mac_type) {
+       case e1000_82545_rev_3:
+       case e1000_82546_rev_3:
+               break;
+       default:
+               /* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */
+               if (hw->bus_type == e1000_bus_type_pcix
+                   && e1000_pcix_get_mmrbc(hw) > 2048)
+                       e1000_pcix_set_mmrbc(hw, 2048);
+               break;
+       }
+
+       /* Call a subroutine to configure the link and setup flow control. */
+       ret_val = e1000_setup_link(hw);
+
+       /* Set the transmit descriptor write-back policy */
+       if (hw->mac_type > e1000_82544) {
+               ctrl = er32(TXDCTL);
+               ctrl =
+                   (ctrl & ~E1000_TXDCTL_WTHRESH) |
+                   E1000_TXDCTL_FULL_TX_DESC_WB;
+               ew32(TXDCTL, ctrl);
+       }
+
+       /* 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(hw);
+
+       if (hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER ||
+           hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3) {
+               ctrl_ext = er32(CTRL_EXT);
+               /* Relaxed ordering must be disabled to avoid a parity
+                * error crash in a PCI slot. */
+               ctrl_ext |= E1000_CTRL_EXT_RO_DIS;
+               ew32(CTRL_EXT, ctrl_ext);
+       }
+
+       return ret_val;
+}
+
+/**
+ * e1000_adjust_serdes_amplitude - Adjust SERDES output amplitude based on EEPROM setting.
+ * @hw: Struct containing variables accessed by shared code.
+ */
+static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
+{
+       u16 eeprom_data;
+       s32 ret_val;
+
+       e_dbg("e1000_adjust_serdes_amplitude");
+
+       if (hw->media_type != e1000_media_type_internal_serdes)
+               return E1000_SUCCESS;
+
+       switch (hw->mac_type) {
+       case e1000_82545_rev_3:
+       case e1000_82546_rev_3:
+               break;
+       default:
+               return E1000_SUCCESS;
+       }
+
+       ret_val = e1000_read_eeprom(hw, EEPROM_SERDES_AMPLITUDE, 1,
+                                   &eeprom_data);
+       if (ret_val) {
+               return ret_val;
+       }
+
+       if (eeprom_data != EEPROM_RESERVED_WORD) {
+               /* Adjust SERDES output amplitude only. */
+               eeprom_data &= EEPROM_SERDES_AMPLITUDE_MASK;
+               ret_val =
+                   e1000_write_phy_reg(hw, M88E1000_PHY_EXT_CTRL, eeprom_data);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_setup_link - Configures flow control and link settings.
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Determines which flow control settings to use. Calls the appropriate media-
+ * specific link configuration function. Configures the flow control settings.
+ * 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(struct e1000_hw *hw)
+{
+       u32 ctrl_ext;
+       s32 ret_val;
+       u16 eeprom_data;
+
+       e_dbg("e1000_setup_link");
+
+       /* 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.
+        */
+       if (hw->fc == E1000_FC_DEFAULT) {
+               ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG,
+                                           1, &eeprom_data);
+               if (ret_val) {
+                       e_dbg("EEPROM Read Error\n");
+                       return -E1000_ERR_EEPROM;
+               }
+               if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 0)
+                       hw->fc = E1000_FC_NONE;
+               else if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) ==
+                        EEPROM_WORD0F_ASM_DIR)
+                       hw->fc = E1000_FC_TX_PAUSE;
+               else
+                       hw->fc = E1000_FC_FULL;
+       }
+
+       /* We want to save off the original Flow Control configuration just
+        * in case we get disconnected and then reconnected into a different
+        * hub or switch with different Flow Control capabilities.
+        */
+       if (hw->mac_type == e1000_82542_rev2_0)
+               hw->fc &= (~E1000_FC_TX_PAUSE);
+
+       if ((hw->mac_type < e1000_82543) && (hw->report_tx_early == 1))
+               hw->fc &= (~E1000_FC_RX_PAUSE);
+
+       hw->original_fc = hw->fc;
+
+       e_dbg("After fix-ups FlowControl is now = %x\n", hw->fc);
+
+       /* Take the 4 bits from EEPROM word 0x0F 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 e1000_setup_pcs_link()
+        * or e1000_phy_setup() is called.
+        */
+       if (hw->mac_type == e1000_82543) {
+               ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG,
+                                           1, &eeprom_data);
+               if (ret_val) {
+                       e_dbg("EEPROM Read Error\n");
+                       return -E1000_ERR_EEPROM;
+               }
+               ctrl_ext = ((eeprom_data & EEPROM_WORD0F_SWPDIO_EXT) <<
+                           SWDPIO__EXT_SHIFT);
+               ew32(CTRL_EXT, ctrl_ext);
+       }
+
+       /* Call the necessary subroutine to configure the link. */
+       ret_val = (hw->media_type == e1000_media_type_copper) ?
+           e1000_setup_copper_link(hw) : e1000_setup_fiber_serdes_link(hw);
+
+       /* 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);
+
+       /* 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 in not enabled, then these
+        * registers will be set to 0.
+        */
+       if (!(hw->fc & E1000_FC_TX_PAUSE)) {
+               ew32(FCRTL, 0);
+               ew32(FCRTH, 0);
+       } else {
+               /* We need to set up the Receive Threshold high and low water marks
+                * as well as (optionally) enabling the transmission of XON frames.
+                */
+               if (hw->fc_send_xon) {
+                       ew32(FCRTL, (hw->fc_low_water | E1000_FCRTL_XONE));
+                       ew32(FCRTH, hw->fc_high_water);
+               } else {
+                       ew32(FCRTL, hw->fc_low_water);
+                       ew32(FCRTH, hw->fc_high_water);
+               }
+       }
+       return ret_val;
+}
+
+/**
+ * e1000_setup_fiber_serdes_link - prepare fiber or serdes link
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Manipulates Physical Coding Sublayer functions in order to configure
+ * link. Assumes the hardware has been previously reset and the transmitter
+ * and receiver are not enabled.
+ */
+static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       u32 status;
+       u32 txcw = 0;
+       u32 i;
+       u32 signal = 0;
+       s32 ret_val;
+
+       e_dbg("e1000_setup_fiber_serdes_link");
+
+       /* On adapters with a MAC newer than 82544, SWDP 1 will be
+        * set when the optics detect a signal. On older adapters, it will be
+        * cleared when there is a signal.  This applies to fiber media only.
+        * If we're on serdes media, adjust the output amplitude to value
+        * set in the EEPROM.
+        */
+       ctrl = er32(CTRL);
+       if (hw->media_type == e1000_media_type_fiber)
+               signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
+
+       ret_val = e1000_adjust_serdes_amplitude(hw);
+       if (ret_val)
+               return ret_val;
+
+       /* Take the link out of reset */
+       ctrl &= ~(E1000_CTRL_LRST);
+
+       /* Adjust VCO speed to improve BER performance */
+       ret_val = e1000_set_vco_speed(hw);
+       if (ret_val)
+               return ret_val;
+
+       e1000_config_collision_dist(hw);
+
+       /* 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 Tranmsit
+        * 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) {
+       case E1000_FC_NONE:
+               /* Flow control is 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");
+               return -E1000_ERR_CONFIG;
+               break;
+       }
+
+       /* 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(TXCW, txcw);
+       ew32(CTRL, ctrl);
+       E1000_WRITE_FLUSH();
+
+       hw->txcw = txcw;
+       msleep(1);
+
+       /* If we have a signal (the cable is plugged in) 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 internal serdes, we just assume a signal is present, then poll.
+        */
+       if (hw->media_type == e1000_media_type_internal_serdes ||
+           (er32(CTRL) & E1000_CTRL_SWDPIN1) == signal) {
+               e_dbg("Looking for Link\n");
+               for (i = 0; i < (LINK_UP_TIMEOUT / 10); i++) {
+                       msleep(10);
+                       status = er32(STATUS);
+                       if (status & E1000_STATUS_LU)
+                               break;
+               }
+               if (i == (LINK_UP_TIMEOUT / 10)) {
+                       e_dbg("Never got a valid link from auto-neg!!!\n");
+                       hw->autoneg_failed = 1;
+                       /* AutoNeg failed to achieve a link, so we'll call
+                        * e1000_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 = e1000_check_for_link(hw);
+                       if (ret_val) {
+                               e_dbg("Error while checking for link\n");
+                               return ret_val;
+                       }
+                       hw->autoneg_failed = 0;
+               } else {
+                       hw->autoneg_failed = 0;
+                       e_dbg("Valid Link Found\n");
+               }
+       } else {
+               e_dbg("No Signal Detected\n");
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_copper_link_rtl_setup - Copper link setup for e1000_phy_rtl series.
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Commits changes to PHY configuration by calling e1000_phy_reset().
+ */
+static s32 e1000_copper_link_rtl_setup(struct e1000_hw *hw)
+{
+       s32 ret_val;
+
+       /* SW reset the PHY so all changes take effect */
+       ret_val = e1000_phy_reset(hw);
+       if (ret_val) {
+               e_dbg("Error Resetting the PHY\n");
+               return ret_val;
+       }
+
+       return E1000_SUCCESS;
+}
+
+static s32 gbe_dhg_phy_setup(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u32 ctrl_aux;
+
+       switch (hw->phy_type) {
+       case e1000_phy_8211:
+               ret_val = e1000_copper_link_rtl_setup(hw);
+               if (ret_val) {
+                       e_dbg("e1000_copper_link_rtl_setup failed!\n");
+                       return ret_val;
+               }
+               break;
+       case e1000_phy_8201:
+               /* Set RMII mode */
+               ctrl_aux = er32(CTL_AUX);
+               ctrl_aux |= E1000_CTL_AUX_RMII;
+               ew32(CTL_AUX, ctrl_aux);
+               E1000_WRITE_FLUSH();
+
+               /* Disable the J/K bits required for receive */
+               ctrl_aux = er32(CTL_AUX);
+               ctrl_aux |= 0x4;
+               ctrl_aux &= ~0x2;
+               ew32(CTL_AUX, ctrl_aux);
+               E1000_WRITE_FLUSH();
+               ret_val = e1000_copper_link_rtl_setup(hw);
+
+               if (ret_val) {
+                       e_dbg("e1000_copper_link_rtl_setup failed!\n");
+                       return ret_val;
+               }
+               break;
+       default:
+               e_dbg("Error Resetting the PHY\n");
+               return E1000_ERR_PHY_TYPE;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_copper_link_preconfig - early configuration for copper
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Make sure we have a valid PHY and change PHY mode before link setup.
+ */
+static s32 e1000_copper_link_preconfig(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_copper_link_preconfig");
+
+       ctrl = er32(CTRL);
+       /* 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_SLU;
+               ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
+               ew32(CTRL, ctrl);
+       } else {
+               ctrl |=
+                   (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX | E1000_CTRL_SLU);
+               ew32(CTRL, ctrl);
+               ret_val = e1000_phy_hw_reset(hw);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /* Make sure we have a valid PHY */
+       ret_val = e1000_detect_gig_phy(hw);
+       if (ret_val) {
+               e_dbg("Error, did not detect valid phy.\n");
+               return ret_val;
+       }
+       e_dbg("Phy ID = %x\n", hw->phy_id);
+
+       /* Set PHY to class A mode (if necessary) */
+       ret_val = e1000_set_phy_mode(hw);
+       if (ret_val)
+               return ret_val;
+
+       if ((hw->mac_type == e1000_82545_rev_3) ||
+           (hw->mac_type == e1000_82546_rev_3)) {
+               ret_val =
+                   e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+               phy_data |= 0x00000008;
+               ret_val =
+                   e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+       }
+
+       if (hw->mac_type <= e1000_82543 ||
+           hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547 ||
+           hw->mac_type == e1000_82541_rev_2
+           || hw->mac_type == e1000_82547_rev_2)
+               hw->phy_reset_disable = false;
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_copper_link_igp_setup - Copper link setup for e1000_phy_igp series.
+ * @hw: Struct containing variables accessed by shared code
+ */
+static s32 e1000_copper_link_igp_setup(struct e1000_hw *hw)
+{
+       u32 led_ctrl;
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_copper_link_igp_setup");
+
+       if (hw->phy_reset_disable)
+               return E1000_SUCCESS;
+
+       ret_val = e1000_phy_reset(hw);
+       if (ret_val) {
+               e_dbg("Error Resetting the PHY\n");
+               return ret_val;
+       }
+
+       /* Wait 15ms for MAC to configure PHY from eeprom settings */
+       msleep(15);
+       /* Configure activity LED after PHY reset */
+       led_ctrl = er32(LEDCTL);
+       led_ctrl &= IGP_ACTIVITY_LED_MASK;
+       led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
+       ew32(LEDCTL, led_ctrl);
+
+       /* The NVM settings will configure LPLU in D3 for IGP2 and IGP3 PHYs */
+       if (hw->phy_type == e1000_phy_igp) {
+               /* disable lplu d3 during driver init */
+               ret_val = e1000_set_d3_lplu_state(hw, false);
+               if (ret_val) {
+                       e_dbg("Error Disabling LPLU D3\n");
+                       return ret_val;
+               }
+       }
+
+       /* Configure mdi-mdix settings */
+       ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
+               hw->dsp_config_state = e1000_dsp_config_disabled;
+               /* Force MDI for earlier revs of the IGP PHY */
+               phy_data &=
+                   ~(IGP01E1000_PSCR_AUTO_MDIX |
+                     IGP01E1000_PSCR_FORCE_MDI_MDIX);
+               hw->mdix = 1;
+
+       } else {
+               hw->dsp_config_state = e1000_dsp_config_enabled;
+               phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
+
+               switch (hw->mdix) {
+               case 1:
+                       phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
+                       break;
+               case 2:
+                       phy_data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
+                       break;
+               case 0:
+               default:
+                       phy_data |= IGP01E1000_PSCR_AUTO_MDIX;
+                       break;
+               }
+       }
+       ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /* set auto-master slave resolution settings */
+       if (hw->autoneg) {
+               e1000_ms_type phy_ms_setting = hw->master_slave;
+
+               if (hw->ffe_config_state == e1000_ffe_config_active)
+                       hw->ffe_config_state = e1000_ffe_config_enabled;
+
+               if (hw->dsp_config_state == e1000_dsp_config_activated)
+                       hw->dsp_config_state = e1000_dsp_config_enabled;
+
+               /* when autonegotiation advertisement is only 1000Mbps then we
+                * should disable SmartSpeed and enable Auto MasterSlave
+                * resolution as hardware default. */
+               if (hw->autoneg_advertised == ADVERTISE_1000_FULL) {
+                       /* Disable SmartSpeed */
+                       ret_val =
+                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                              &phy_data);
+                       if (ret_val)
+                               return ret_val;
+                       phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val =
+                           e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                               phy_data);
+                       if (ret_val)
+                               return ret_val;
+                       /* Set auto Master/Slave resolution process */
+                       ret_val =
+                           e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_data);
+                       if (ret_val)
+                               return ret_val;
+                       phy_data &= ~CR_1000T_MS_ENABLE;
+                       ret_val =
+                           e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data);
+                       if (ret_val)
+                               return ret_val;
+               }
+
+               ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               /* load defaults for future use */
+               hw->original_master_slave = (phy_data & CR_1000T_MS_ENABLE) ?
+                   ((phy_data & CR_1000T_MS_VALUE) ?
+                    e1000_ms_force_master :
+                    e1000_ms_force_slave) : e1000_ms_auto;
+
+               switch (phy_ms_setting) {
+               case e1000_ms_force_master:
+                       phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
+                       break;
+               case e1000_ms_force_slave:
+                       phy_data |= CR_1000T_MS_ENABLE;
+                       phy_data &= ~(CR_1000T_MS_VALUE);
+                       break;
+               case e1000_ms_auto:
+                       phy_data &= ~CR_1000T_MS_ENABLE;
+               default:
+                       break;
+               }
+               ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_copper_link_mgp_setup - Copper link setup for e1000_phy_m88 series.
+ * @hw: Struct containing variables accessed by shared code
+ */
+static s32 e1000_copper_link_mgp_setup(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_copper_link_mgp_setup");
+
+       if (hw->phy_reset_disable)
+               return E1000_SUCCESS;
+
+       /* Enable CRS on TX. This must be set for half-duplex operation. */
+       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       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 (hw->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 (hw->disable_polarity_correction == 1)
+               phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       if (hw->phy_revision < M88E1011_I_REV_4) {
+               /* Force TX_CLK in the Extended PHY Specific Control Register
+                * to 25MHz clock.
+                */
+               ret_val =
+                   e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
+                                      &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_data |= M88E1000_EPSCR_TX_CLK_25;
+
+               if ((hw->phy_revision == E1000_REVISION_2) &&
+                   (hw->phy_id == M88E1111_I_PHY_ID)) {
+                       /* Vidalia Phy, set the downshift counter to 5x */
+                       phy_data &= ~(M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK);
+                       phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;
+                       ret_val = e1000_write_phy_reg(hw,
+                                                     M88E1000_EXT_PHY_SPEC_CTRL,
+                                                     phy_data);
+                       if (ret_val)
+                               return ret_val;
+               } 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 = e1000_write_phy_reg(hw,
+                                                     M88E1000_EXT_PHY_SPEC_CTRL,
+                                                     phy_data);
+                       if (ret_val)
+                               return ret_val;
+               }
+       }
+
+       /* SW Reset the PHY so all changes take effect */
+       ret_val = e1000_phy_reset(hw);
+       if (ret_val) {
+               e_dbg("Error Resetting the PHY\n");
+               return ret_val;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_copper_link_autoneg - setup auto-neg
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Setup auto-negotiation and flow control advertisements,
+ * and then perform auto-negotiation.
+ */
+static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_copper_link_autoneg");
+
+       /* Perform some bounds checking on the hw->autoneg_advertised
+        * parameter.  If this variable is zero, then set it to the default.
+        */
+       hw->autoneg_advertised &= AUTONEG_ADVERTISE_SPEED_DEFAULT;
+
+       /* If autoneg_advertised is zero, we assume it was not defaulted
+        * by the calling code so we set to advertise full capability.
+        */
+       if (hw->autoneg_advertised == 0)
+               hw->autoneg_advertised = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+
+       /* IFE/RTL8201N PHY only supports 10/100 */
+       if (hw->phy_type == e1000_phy_8201)
+               hw->autoneg_advertised &= AUTONEG_ADVERTISE_10_100_ALL;
+
+       e_dbg("Reconfiguring auto-neg advertisement params\n");
+       ret_val = e1000_phy_setup_autoneg(hw);
+       if (ret_val) {
+               e_dbg("Error Setting up Auto-Negotiation\n");
+               return ret_val;
+       }
+       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 = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy_data |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
+       ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /* Does the user want to wait for Auto-Neg to complete here, or
+        * check at a later time (for example, callback routine).
+        */
+       if (hw->wait_autoneg_complete) {
+               ret_val = e1000_wait_autoneg(hw);
+               if (ret_val) {
+                       e_dbg
+                           ("Error while waiting for autoneg to complete\n");
+                       return ret_val;
+               }
+       }
+
+       hw->get_link_status = true;
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_copper_link_postconfig - post link setup
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Config the MAC and the PHY after link is up.
+ *   1) Set up the MAC to the current PHY speed/duplex
+ *      if we are on 82543.  If we
+ *      are on newer silicon, we only need to configure
+ *      collision distance in the Transmit Control Register.
+ *   2) Set up flow control on the MAC to that established with
+ *      the link partner.
+ *   3) Config DSP to improve Gigabit link quality for some PHY revisions.
+ */
+static s32 e1000_copper_link_postconfig(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       e_dbg("e1000_copper_link_postconfig");
+
+       if ((hw->mac_type >= e1000_82544) && (hw->mac_type != e1000_ce4100)) {
+               e1000_config_collision_dist(hw);
+       } else {
+               ret_val = e1000_config_mac_to_phy(hw);
+               if (ret_val) {
+                       e_dbg("Error configuring MAC to PHY settings\n");
+                       return ret_val;
+               }
+       }
+       ret_val = e1000_config_fc_after_link_up(hw);
+       if (ret_val) {
+               e_dbg("Error Configuring Flow Control\n");
+               return ret_val;
+       }
+
+       /* Config DSP to improve Giga link quality */
+       if (hw->phy_type == e1000_phy_igp) {
+               ret_val = e1000_config_dsp_after_link_change(hw, true);
+               if (ret_val) {
+                       e_dbg("Error Configuring DSP after link up\n");
+                       return ret_val;
+               }
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_setup_copper_link - phy/speed/duplex setting
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Detects which PHY is present and sets up the speed and duplex
+ */
+static s32 e1000_setup_copper_link(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 i;
+       u16 phy_data;
+
+       e_dbg("e1000_setup_copper_link");
+
+       /* Check if it is a valid PHY and set PHY mode if necessary. */
+       ret_val = e1000_copper_link_preconfig(hw);
+       if (ret_val)
+               return ret_val;
+
+       if (hw->phy_type == e1000_phy_igp) {
+               ret_val = e1000_copper_link_igp_setup(hw);
+               if (ret_val)
+                       return ret_val;
+       } else if (hw->phy_type == e1000_phy_m88) {
+               ret_val = e1000_copper_link_mgp_setup(hw);
+               if (ret_val)
+                       return ret_val;
+       } else {
+               ret_val = gbe_dhg_phy_setup(hw);
+               if (ret_val) {
+                       e_dbg("gbe_dhg_phy_setup failed!\n");
+                       return ret_val;
+               }
+       }
+
+       if (hw->autoneg) {
+               /* Setup autoneg and flow control advertisement
+                * and perform autonegotiation */
+               ret_val = e1000_copper_link_autoneg(hw);
+               if (ret_val)
+                       return ret_val;
+       } else {
+               /* PHY will be set to 10H, 10F, 100H,or 100F
+                * depending on value from forced_speed_duplex. */
+               e_dbg("Forcing speed and duplex\n");
+               ret_val = e1000_phy_force_speed_duplex(hw);
+               if (ret_val) {
+                       e_dbg("Error Forcing Speed and Duplex\n");
+                       return ret_val;
+               }
+       }
+
+       /* Check link status. Wait up to 100 microseconds for link to become
+        * valid.
+        */
+       for (i = 0; i < 10; i++) {
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               if (phy_data & MII_SR_LINK_STATUS) {
+                       /* Config the MAC and PHY after link is up */
+                       ret_val = e1000_copper_link_postconfig(hw);
+                       if (ret_val)
+                               return ret_val;
+
+                       e_dbg("Valid link established!!!\n");
+                       return E1000_SUCCESS;
+               }
+               udelay(10);
+       }
+
+       e_dbg("Unable to establish link!!!\n");
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_phy_setup_autoneg - phy settings
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Configures PHY autoneg and flow control advertisement settings
+ */
+s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 mii_autoneg_adv_reg;
+       u16 mii_1000t_ctrl_reg;
+
+       e_dbg("e1000_phy_setup_autoneg");
+
+       /* Read the MII Auto-Neg Advertisement Register (Address 4). */
+       ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
+       if (ret_val)
+               return ret_val;
+
+       /* Read the MII 1000Base-T Control Register (Address 9). */
+       ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &mii_1000t_ctrl_reg);
+       if (ret_val)
+               return ret_val;
+       else if (hw->phy_type == e1000_phy_8201)
+               mii_1000t_ctrl_reg &= ~REG9_SPEED_MASK;
+
+       /* 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 &= ~REG4_SPEED_MASK;
+       mii_1000t_ctrl_reg &= ~REG9_SPEED_MASK;
+
+       e_dbg("autoneg_advertised %x\n", hw->autoneg_advertised);
+
+       /* Do we want to advertise 10 Mb Half Duplex? */
+       if (hw->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 (hw->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 (hw->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 (hw->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 (hw->autoneg_advertised & ADVERTISE_1000_HALF) {
+               e_dbg
+                   ("Advertise 1000mb Half duplex requested, request denied!\n");
+       }
+
+       /* Do we want to advertise 1000 Mb Full Duplex? */
+       if (hw->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) {
+       case E1000_FC_NONE:     /* 0 */
+               /* 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: /* 1 */
+               /* 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: /* 2 */
+               /* 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:     /* 3 */
+               /* 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");
+               return -E1000_ERR_CONFIG;
+       }
+
+       ret_val = e1000_write_phy_reg(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
+       if (ret_val)
+               return ret_val;
+
+       e_dbg("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
+
+       if (hw->phy_type == e1000_phy_8201) {
+               mii_1000t_ctrl_reg = 0;
+       } else {
+               ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL,
+                                             mii_1000t_ctrl_reg);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_phy_force_speed_duplex - force link settings
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Force PHY speed and duplex settings to hw->forced_speed_duplex
+ */
+static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       s32 ret_val;
+       u16 mii_ctrl_reg;
+       u16 mii_status_reg;
+       u16 phy_data;
+       u16 i;
+
+       e_dbg("e1000_phy_force_speed_duplex");
+
+       /* Turn off Flow control if we are forcing speed and duplex. */
+       hw->fc = E1000_FC_NONE;
+
+       e_dbg("hw->fc = %d\n", hw->fc);
+
+       /* Read the Device Control Register. */
+       ctrl = er32(CTRL);
+
+       /* Set the bits to Force Speed and Duplex in the Device Ctrl Reg. */
+       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
+       ctrl &= ~(DEVICE_SPEED_MASK);
+
+       /* Clear the Auto Speed Detect Enable bit. */
+       ctrl &= ~E1000_CTRL_ASDE;
+
+       /* Read the MII Control Register. */
+       ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &mii_ctrl_reg);
+       if (ret_val)
+               return ret_val;
+
+       /* We need to disable autoneg in order to force link and duplex. */
+
+       mii_ctrl_reg &= ~MII_CR_AUTO_NEG_EN;
+
+       /* Are we forcing Full or Half Duplex? */
+       if (hw->forced_speed_duplex == e1000_100_full ||
+           hw->forced_speed_duplex == e1000_10_full) {
+               /* We want to force full duplex so we SET the full duplex bits in the
+                * Device and MII Control Registers.
+                */
+               ctrl |= E1000_CTRL_FD;
+               mii_ctrl_reg |= MII_CR_FULL_DUPLEX;
+               e_dbg("Full Duplex\n");
+       } else {
+               /* We want to force half duplex so we CLEAR the full duplex bits in
+                * the Device and MII Control Registers.
+                */
+               ctrl &= ~E1000_CTRL_FD;
+               mii_ctrl_reg &= ~MII_CR_FULL_DUPLEX;
+               e_dbg("Half Duplex\n");
+       }
+
+       /* Are we forcing 100Mbps??? */
+       if (hw->forced_speed_duplex == e1000_100_full ||
+           hw->forced_speed_duplex == e1000_100_half) {
+               /* Set the 100Mb bit and turn off the 1000Mb and 10Mb bits. */
+               ctrl |= E1000_CTRL_SPD_100;
+               mii_ctrl_reg |= MII_CR_SPEED_100;
+               mii_ctrl_reg &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
+               e_dbg("Forcing 100mb ");
+       } else {
+               /* Set the 10Mb bit and turn off the 1000Mb and 100Mb bits. */
+               ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
+               mii_ctrl_reg |= MII_CR_SPEED_10;
+               mii_ctrl_reg &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
+               e_dbg("Forcing 10mb ");
+       }
+
+       e1000_config_collision_dist(hw);
+
+       /* Write the configured values back to the Device Control Reg. */
+       ew32(CTRL, ctrl);
+
+       if (hw->phy_type == e1000_phy_m88) {
+               ret_val =
+                   e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               /* Clear Auto-Crossover to force MDI manually. M88E1000 requires MDI
+                * forced whenever speed are duplex are forced.
+                */
+               phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
+               ret_val =
+                   e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               e_dbg("M88E1000 PSCR: %x\n", phy_data);
+
+               /* Need to reset the PHY or these changes will be ignored */
+               mii_ctrl_reg |= MII_CR_RESET;
+
+               /* Disable MDI-X support for 10/100 */
+       } else {
+               /* Clear Auto-Crossover to force MDI manually.  IGP requires MDI
+                * forced whenever speed or duplex are forced.
+                */
+               ret_val =
+                   e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
+               phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
+
+               ret_val =
+                   e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /* Write back the modified PHY MII control register. */
+       ret_val = e1000_write_phy_reg(hw, PHY_CTRL, mii_ctrl_reg);
+       if (ret_val)
+               return ret_val;
+
+       udelay(1);
+
+       /* The wait_autoneg_complete flag may be a little misleading here.
+        * Since we are forcing speed and duplex, Auto-Neg is not enabled.
+        * But we do want to delay for a period while forcing only so we
+        * don't generate false No Link messages.  So we will wait here
+        * only if the user has set wait_autoneg_complete to 1, which is
+        * the default.
+        */
+       if (hw->wait_autoneg_complete) {
+               /* We will wait for autoneg to complete. */
+               e_dbg("Waiting for forced speed/duplex link.\n");
+               mii_status_reg = 0;
+
+               /* We will wait for autoneg to complete or 4.5 seconds to expire. */
+               for (i = PHY_FORCE_TIME; i > 0; i--) {
+                       /* Read the MII Status Register and wait for Auto-Neg Complete bit
+                        * to be set.
+                        */
+                       ret_val =
+                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+                       if (ret_val)
+                               return ret_val;
+
+                       ret_val =
+                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+                       if (ret_val)
+                               return ret_val;
+
+                       if (mii_status_reg & MII_SR_LINK_STATUS)
+                               break;
+                       msleep(100);
+               }
+               if ((i == 0) && (hw->phy_type == e1000_phy_m88)) {
+                       /* We didn't get link.  Reset the DSP and wait again for link. */
+                       ret_val = e1000_phy_reset_dsp(hw);
+                       if (ret_val) {
+                               e_dbg("Error Resetting PHY DSP\n");
+                               return ret_val;
+                       }
+               }
+               /* This loop will early-out if the link condition has been met.  */
+               for (i = PHY_FORCE_TIME; i > 0; i--) {
+                       if (mii_status_reg & MII_SR_LINK_STATUS)
+                               break;
+                       msleep(100);
+                       /* Read the MII Status Register and wait for Auto-Neg Complete bit
+                        * to be set.
+                        */
+                       ret_val =
+                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+                       if (ret_val)
+                               return ret_val;
+
+                       ret_val =
+                           e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+                       if (ret_val)
+                               return ret_val;
+               }
+       }
+
+       if (hw->phy_type == e1000_phy_m88) {
+               /* Because we reset the PHY above, we need to re-force TX_CLK in the
+                * Extended PHY Specific Control Register to 25MHz clock.  This value
+                * defaults back to a 2.5MHz clock when the PHY is reset.
+                */
+               ret_val =
+                   e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
+                                      &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_data |= M88E1000_EPSCR_TX_CLK_25;
+               ret_val =
+                   e1000_write_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
+                                       phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               /* In addition, because of the s/w reset above, we need to enable CRS on
+                * TX.  This must be set for both full and half duplex operation.
+                */
+               ret_val =
+                   e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
+               ret_val =
+                   e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               if ((hw->mac_type == e1000_82544 || hw->mac_type == e1000_82543)
+                   && (!hw->autoneg)
+                   && (hw->forced_speed_duplex == e1000_10_full
+                       || hw->forced_speed_duplex == e1000_10_half)) {
+                       ret_val = e1000_polarity_reversal_workaround(hw);
+                       if (ret_val)
+                               return ret_val;
+               }
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_config_collision_dist - set collision distance register
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Sets the collision distance in the Transmit Control register.
+ * Link should have been established previously. Reads the speed and duplex
+ * information from the Device Status register.
+ */
+void e1000_config_collision_dist(struct e1000_hw *hw)
+{
+       u32 tctl, coll_dist;
+
+       e_dbg("e1000_config_collision_dist");
+
+       if (hw->mac_type < e1000_82543)
+               coll_dist = E1000_COLLISION_DISTANCE_82542;
+       else
+               coll_dist = E1000_COLLISION_DISTANCE;
+
+       tctl = er32(TCTL);
+
+       tctl &= ~E1000_TCTL_COLD;
+       tctl |= coll_dist << E1000_COLD_SHIFT;
+
+       ew32(TCTL, tctl);
+       E1000_WRITE_FLUSH();
+}
+
+/**
+ * e1000_config_mac_to_phy - sync phy and mac settings
+ * @hw: Struct containing variables accessed by shared code
+ * @mii_reg: data to write to the MII control register
+ *
+ * Sets MAC speed and duplex settings to reflect the those in the PHY
+ * The contents of the PHY register containing the needed information need to
+ * be passed in.
+ */
+static s32 e1000_config_mac_to_phy(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_config_mac_to_phy");
+
+       /* 82544 or newer MAC, Auto Speed Detection takes care of
+        * MAC speed/duplex configuration.*/
+       if ((hw->mac_type >= e1000_82544) && (hw->mac_type != e1000_ce4100))
+               return E1000_SUCCESS;
+
+       /* Read the Device Control Register and set the bits to Force Speed
+        * and Duplex.
+        */
+       ctrl = er32(CTRL);
+       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
+       ctrl &= ~(E1000_CTRL_SPD_SEL | E1000_CTRL_ILOS);
+
+       switch (hw->phy_type) {
+       case e1000_phy_8201:
+               ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               if (phy_data & RTL_PHY_CTRL_FD)
+                       ctrl |= E1000_CTRL_FD;
+               else
+                       ctrl &= ~E1000_CTRL_FD;
+
+               if (phy_data & RTL_PHY_CTRL_SPD_100)
+                       ctrl |= E1000_CTRL_SPD_100;
+               else
+                       ctrl |= E1000_CTRL_SPD_10;
+
+               e1000_config_collision_dist(hw);
+               break;
+       default:
+               /* Set up duplex in the Device Control and Transmit Control
+                * registers depending on negotiated values.
+                */
+               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
+                                            &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               if (phy_data & M88E1000_PSSR_DPLX)
+                       ctrl |= E1000_CTRL_FD;
+               else
+                       ctrl &= ~E1000_CTRL_FD;
+
+               e1000_config_collision_dist(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;
+       }
+
+       /* Write the configured values back to the Device Control Reg. */
+       ew32(CTRL, ctrl);
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_force_mac_fc - force flow control settings
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Forces 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(struct e1000_hw *hw)
+{
+       u32 ctrl;
+
+       e_dbg("e1000_force_mac_fc");
+
+       /* Get the current configuration of the Device Control Register */
+       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" 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.
+        */
+
+       switch (hw->fc) {
+       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");
+               return -E1000_ERR_CONFIG;
+       }
+
+       /* Disable TX Flow Control for 82542 (rev 2.0) */
+       if (hw->mac_type == e1000_82542_rev2_0)
+               ctrl &= (~E1000_CTRL_TFCE);
+
+       ew32(CTRL, ctrl);
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_config_fc_after_link_up - configure flow control after autoneg
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Configures flow control settings after link is established
+ * Should be called immediately after a valid link has been established.
+ * Forces MAC flow control settings if link was forced. When in MII/GMII mode
+ * and autonegotiation is enabled, the MAC flow control settings will be set
+ * based on the flow control negotiated by the PHY. In TBI mode, the TFCE
+ * and RFCE bits will be automatically set to the negotiated flow control mode.
+ */
+static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 mii_status_reg;
+       u16 mii_nway_adv_reg;
+       u16 mii_nway_lp_ability_reg;
+       u16 speed;
+       u16 duplex;
+
+       e_dbg("e1000_config_fc_after_link_up");
+
+       /* 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 (((hw->media_type == e1000_media_type_fiber) && (hw->autoneg_failed))
+           || ((hw->media_type == e1000_media_type_internal_serdes)
+               && (hw->autoneg_failed))
+           || ((hw->media_type == e1000_media_type_copper)
+               && (!hw->autoneg))) {
+               ret_val = e1000_force_mac_fc(hw);
+               if (ret_val) {
+                       e_dbg("Error forcing flow control settings\n");
+                       return ret_val;
+               }
+       }
+
+       /* 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->media_type == e1000_media_type_copper) && hw->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 = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+               if (ret_val)
+                       return ret_val;
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+               if (ret_val)
+                       return ret_val;
+
+               if (mii_status_reg & MII_SR_AUTONEG_COMPLETE) {
+                       /* 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 = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV,
+                                                    &mii_nway_adv_reg);
+                       if (ret_val)
+                               return ret_val;
+                       ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY,
+                                                    &mii_nway_lp_ability_reg);
+                       if (ret_val)
+                               return ret_val;
+
+                       /* 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->original_fc == E1000_FC_FULL) {
+                                       hw->fc = E1000_FC_FULL;
+                                       e_dbg("Flow Control = FULL.\n");
+                               } else {
+                                       hw->fc = E1000_FC_RX_PAUSE;
+                                       e_dbg
+                                           ("Flow Control = RX PAUSE frames only.\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 = E1000_FC_TX_PAUSE;
+                               e_dbg
+                                   ("Flow Control = TX PAUSE frames only.\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 = E1000_FC_RX_PAUSE;
+                               e_dbg
+                                   ("Flow Control = RX PAUSE frames only.\n");
+                       }
+                       /* Per the IEEE spec, at this point flow control should be
+                        * disabled.  However, we want to consider that we could
+                        * be connected to a legacy switch that doesn't advertise
+                        * desired flow control, but can be forced on the link
+                        * partner.  So if we advertised no flow control, that is
+                        * what we will resolve to.  If we advertised some kind of
+                        * receive capability (Rx Pause Only or Full Flow Control)
+                        * and the link partner advertised none, we will configure
+                        * ourselves to enable Rx Flow Control only.  We can do
+                        * this safely for two reasons:  If the link partner really
+                        * didn't want flow control enabled, and we enable Rx, no
+                        * harm done since we won't be receiving any PAUSE frames
+                        * anyway.  If the intent on the link partner was to have
+                        * flow control enabled, then by us enabling RX only, we
+                        * can at least receive pause frames and process them.
+                        * This is a good idea because in most cases, since we are
+                        * predominantly a server NIC, more times than not we will
+                        * be asked to delay transmission of packets than asking
+                        * our link partner to pause transmission of frames.
+                        */
+                       else if ((hw->original_fc == E1000_FC_NONE ||
+                                 hw->original_fc == E1000_FC_TX_PAUSE) ||
+                                hw->fc_strict_ieee) {
+                               hw->fc = E1000_FC_NONE;
+                               e_dbg("Flow Control = NONE.\n");
+                       } else {
+                               hw->fc = E1000_FC_RX_PAUSE;
+                               e_dbg
+                                   ("Flow Control = RX PAUSE frames only.\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 =
+                           e1000_get_speed_and_duplex(hw, &speed, &duplex);
+                       if (ret_val) {
+                               e_dbg
+                                   ("Error getting link speed and duplex\n");
+                               return ret_val;
+                       }
+
+                       if (duplex == HALF_DUPLEX)
+                               hw->fc = 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(hw);
+                       if (ret_val) {
+                               e_dbg
+                                   ("Error forcing flow control settings\n");
+                               return ret_val;
+                       }
+               } else {
+                       e_dbg
+                           ("Copper PHY and Auto Neg has not completed.\n");
+               }
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * 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.
+ */
+static s32 e1000_check_for_serdes_link_generic(struct e1000_hw *hw)
+{
+       u32 rxcw;
+       u32 ctrl;
+       u32 status;
+       s32 ret_val = E1000_SUCCESS;
+
+       e_dbg("e1000_check_for_serdes_link_generic");
+
+       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 (hw->autoneg_failed == 0) {
+                       hw->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, (hw->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 = e1000_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, hw->txcw);
+               ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
+
+               hw->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)) {
+                               hw->serdes_has_link = true;
+                               e_dbg("SERDES: Link up - forced.\n");
+                       }
+               } else {
+                       hw->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)) {
+                                       hw->serdes_has_link = true;
+                                       e_dbg("SERDES: Link up - autoneg "
+                                                "completed successfully.\n");
+                               } else {
+                                       hw->serdes_has_link = false;
+                                       e_dbg("SERDES: Link down - invalid"
+                                                "codewords detected in autoneg.\n");
+                               }
+                       } else {
+                               hw->serdes_has_link = false;
+                               e_dbg("SERDES: Link down - no sync.\n");
+                       }
+               } else {
+                       hw->serdes_has_link = false;
+                       e_dbg("SERDES: Link down - autoneg failed\n");
+               }
+       }
+
+      out:
+       return ret_val;
+}
+
+/**
+ * e1000_check_for_link
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Checks to see if the link status of the hardware has changed.
+ * Called by any function that needs to check the link status of the adapter.
+ */
+s32 e1000_check_for_link(struct e1000_hw *hw)
+{
+       u32 rxcw = 0;
+       u32 ctrl;
+       u32 status;
+       u32 rctl;
+       u32 icr;
+       u32 signal = 0;
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_check_for_link");
+
+       ctrl = er32(CTRL);
+       status = er32(STATUS);
+
+       /* On adapters with a MAC newer than 82544, SW Definable pin 1 will be
+        * set when the optics detect a signal. On older adapters, it will be
+        * cleared when there is a signal.  This applies to fiber media only.
+        */
+       if ((hw->media_type == e1000_media_type_fiber) ||
+           (hw->media_type == e1000_media_type_internal_serdes)) {
+               rxcw = er32(RXCW);
+
+               if (hw->media_type == e1000_media_type_fiber) {
+                       signal =
+                           (hw->mac_type >
+                            e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
+                       if (status & E1000_STATUS_LU)
+                               hw->get_link_status = false;
+               }
+       }
+
+       /* If we have a copper PHY then 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 will be set if we
+        * receive a Link Status Change interrupt or we have Rx Sequence
+        * Errors.
+        */
+       if ((hw->media_type == e1000_media_type_copper) && hw->get_link_status) {
+               /* 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.
+                * Read the register twice since the link bit is sticky.
+                */
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               if (phy_data & MII_SR_LINK_STATUS) {
+                       hw->get_link_status = false;
+                       /* Check if there was DownShift, must be checked immediately after
+                        * link-up */
+                       e1000_check_downshift(hw);
+
+                       /* If we are on 82544 or 82543 silicon and speed/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
+                        * happen due to the execution of this workaround.
+                        */
+
+                       if ((hw->mac_type == e1000_82544
+                            || hw->mac_type == e1000_82543) && (!hw->autoneg)
+                           && (hw->forced_speed_duplex == e1000_10_full
+                               || hw->forced_speed_duplex == e1000_10_half)) {
+                               ew32(IMC, 0xffffffff);
+                               ret_val =
+                                   e1000_polarity_reversal_workaround(hw);
+                               icr = er32(ICR);
+                               ew32(ICS, (icr & ~E1000_ICS_LSC));
+                               ew32(IMS, IMS_ENABLE_MASK);
+                       }
+
+               } else {
+                       /* No link detected */
+                       e1000_config_dsp_after_link_change(hw, false);
+                       return 0;
+               }
+
+               /* If we are forcing speed/duplex, then we simply return since
+                * we have already determined whether we have link or not.
+                */
+               if (!hw->autoneg)
+                       return -E1000_ERR_CONFIG;
+
+               /* optimize the dsp settings for the igp phy */
+               e1000_config_dsp_after_link_change(hw, true);
+
+               /* 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 ((hw->mac_type >= e1000_82544) &&
+                   (hw->mac_type != e1000_ce4100))
+                       e1000_config_collision_dist(hw);
+               else {
+                       ret_val = e1000_config_mac_to_phy(hw);
+                       if (ret_val) {
+                               e_dbg
+                                   ("Error configuring MAC to PHY settings\n");
+                               return ret_val;
+                       }
+               }
+
+               /* 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(hw);
+               if (ret_val) {
+                       e_dbg("Error configuring flow control\n");
+                       return ret_val;
+               }
+
+               /* 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 (hw->tbi_compatibility_en) {
+                       u16 speed, duplex;
+                       ret_val =
+                           e1000_get_speed_and_duplex(hw, &speed, &duplex);
+                       if (ret_val) {
+                               e_dbg
+                                   ("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 (hw->tbi_compatibility_on) {
+                                       /* If we previously were in the mode, turn it off. */
+                                       rctl = er32(RCTL);
+                                       rctl &= ~E1000_RCTL_SBP;
+                                       ew32(RCTL, rctl);
+                                       hw->tbi_compatibility_on = false;
+                               }
+                       } 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 (!hw->tbi_compatibility_on) {
+                                       hw->tbi_compatibility_on = true;
+                                       rctl = er32(RCTL);
+                                       rctl |= E1000_RCTL_SBP;
+                                       ew32(RCTL, rctl);
+                               }
+                       }
+               }
+       }
+
+       if ((hw->media_type == e1000_media_type_fiber) ||
+           (hw->media_type == e1000_media_type_internal_serdes))
+               e1000_check_for_serdes_link_generic(hw);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_get_speed_and_duplex
+ * @hw: Struct containing variables accessed by shared code
+ * @speed: Speed of the connection
+ * @duplex: Duplex setting of the connection
+
+ * Detects the current speed and duplex settings of the hardware.
+ */
+s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)
+{
+       u32 status;
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_get_speed_and_duplex");
+
+       if (hw->mac_type >= e1000_82543) {
+               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");
+               }
+       } else {
+               e_dbg("1000 Mbs, Full Duplex\n");
+               *speed = SPEED_1000;
+               *duplex = FULL_DUPLEX;
+       }
+
+       /* 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.
+        */
+       if (hw->phy_type == e1000_phy_igp && hw->speed_downgraded) {
+               ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_EXP, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               if (!(phy_data & NWAY_ER_LP_NWAY_CAPS))
+                       *duplex = HALF_DUPLEX;
+               else {
+                       ret_val =
+                           e1000_read_phy_reg(hw, PHY_LP_ABILITY, &phy_data);
+                       if (ret_val)
+                               return ret_val;
+                       if ((*speed == SPEED_100
+                            && !(phy_data & NWAY_LPAR_100TX_FD_CAPS))
+                           || (*speed == SPEED_10
+                               && !(phy_data & NWAY_LPAR_10T_FD_CAPS)))
+                               *duplex = HALF_DUPLEX;
+               }
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_wait_autoneg
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Blocks until autoneg completes or times out (~4.5 seconds)
+ */
+static s32 e1000_wait_autoneg(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 i;
+       u16 phy_data;
+
+       e_dbg("e1000_wait_autoneg");
+       e_dbg("Waiting for Auto-Neg to complete.\n");
+
+       /* We will wait for autoneg to complete or 4.5 seconds to expire. */
+       for (i = PHY_AUTO_NEG_TIME; i > 0; i--) {
+               /* Read the MII Status Register and wait for Auto-Neg
+                * Complete bit to be set.
+                */
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+               if (phy_data & MII_SR_AUTONEG_COMPLETE) {
+                       return E1000_SUCCESS;
+               }
+               msleep(100);
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_raise_mdi_clk - Raises the Management Data Clock
+ * @hw: Struct containing variables accessed by shared code
+ * @ctrl: Device control register's current value
+ */
+static void e1000_raise_mdi_clk(struct e1000_hw *hw, u32 *ctrl)
+{
+       /* Raise the clock input to the Management Data Clock (by setting the MDC
+        * bit), and then delay 10 microseconds.
+        */
+       ew32(CTRL, (*ctrl | E1000_CTRL_MDC));
+       E1000_WRITE_FLUSH();
+       udelay(10);
+}
+
+/**
+ * e1000_lower_mdi_clk - Lowers the Management Data Clock
+ * @hw: Struct containing variables accessed by shared code
+ * @ctrl: Device control register's current value
+ */
+static void e1000_lower_mdi_clk(struct e1000_hw *hw, u32 *ctrl)
+{
+       /* Lower the clock input to the Management Data Clock (by clearing the MDC
+        * bit), and then delay 10 microseconds.
+        */
+       ew32(CTRL, (*ctrl & ~E1000_CTRL_MDC));
+       E1000_WRITE_FLUSH();
+       udelay(10);
+}
+
+/**
+ * e1000_shift_out_mdi_bits - Shifts data bits out to the PHY
+ * @hw: Struct containing variables accessed by shared code
+ * @data: Data to send out to the PHY
+ * @count: Number of bits to shift out
+ *
+ * Bits are shifted out in MSB to LSB order.
+ */
+static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data, u16 count)
+{
+       u32 ctrl;
+       u32 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 = er32(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;
+
+               ew32(CTRL, ctrl);
+               E1000_WRITE_FLUSH();
+
+               udelay(10);
+
+               e1000_raise_mdi_clk(hw, &ctrl);
+               e1000_lower_mdi_clk(hw, &ctrl);
+
+               mask = mask >> 1;
+       }
+}
+
+/**
+ * e1000_shift_in_mdi_bits - Shifts data bits in from the PHY
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Bits are shifted in in MSB to LSB order.
+ */
+static u16 e1000_shift_in_mdi_bits(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 = er32(CTRL);
+
+       /* Clear MDIO_DIR (SWDPIO1) to indicate this bit is to be used as input. */
+       ctrl &= ~E1000_CTRL_MDIO_DIR;
+       ctrl &= ~E1000_CTRL_MDIO;
+
+       ew32(CTRL, ctrl);
+       E1000_WRITE_FLUSH();
+
+       /* 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(hw, &ctrl);
+       e1000_lower_mdi_clk(hw, &ctrl);
+
+       for (data = 0, i = 0; i < 16; i++) {
+               data = data << 1;
+               e1000_raise_mdi_clk(hw, &ctrl);
+               ctrl = er32(CTRL);
+               /* Check to see if we shifted in a "1". */
+               if (ctrl & E1000_CTRL_MDIO)
+                       data |= 1;
+               e1000_lower_mdi_clk(hw, &ctrl);
+       }
+
+       e1000_raise_mdi_clk(hw, &ctrl);
+       e1000_lower_mdi_clk(hw, &ctrl);
+
+       return data;
+}
+
+
+/**
+ * e1000_read_phy_reg - read a phy register
+ * @hw: Struct containing variables accessed by shared code
+ * @reg_addr: address of the PHY register to read
+ *
+ * Reads the value from a PHY register, if the value is on a specific non zero
+ * page, sets the page first.
+ */
+s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 *phy_data)
+{
+       u32 ret_val;
+
+       e_dbg("e1000_read_phy_reg");
+
+       if ((hw->phy_type == e1000_phy_igp) &&
+           (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
+               ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                                (u16) reg_addr);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       ret_val = e1000_read_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr,
+                                       phy_data);
+
+       return ret_val;
+}
+
+static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
+                                u16 *phy_data)
+{
+       u32 i;
+       u32 mdic = 0;
+       const u32 phy_addr = (hw->mac_type == e1000_ce4100) ? hw->phy_addr : 1;
+
+       e_dbg("e1000_read_phy_reg_ex");
+
+       if (reg_addr > MAX_PHY_REG_ADDRESS) {
+               e_dbg("PHY Address %d is out of range\n", reg_addr);
+               return -E1000_ERR_PARAM;
+       }
+
+       if (hw->mac_type > e1000_82543) {
+               /* Set up Op-code, Phy Address, and register address in the MDI
+                * Control register.  The MAC will take care of interfacing with the
+                * PHY to retrieve the desired data.
+                */
+               if (hw->mac_type == e1000_ce4100) {
+                       mdic = ((reg_addr << E1000_MDIC_REG_SHIFT) |
+                               (phy_addr << E1000_MDIC_PHY_SHIFT) |
+                               (INTEL_CE_GBE_MDIC_OP_READ) |
+                               (INTEL_CE_GBE_MDIC_GO));
+
+                       writel(mdic, E1000_MDIO_CMD);
+
+                       /* Poll the ready bit to see if the MDI read
+                        * completed
+                        */
+                       for (i = 0; i < 64; i++) {
+                               udelay(50);
+                               mdic = readl(E1000_MDIO_CMD);
+                               if (!(mdic & INTEL_CE_GBE_MDIC_GO))
+                                       break;
+                       }
+
+                       if (mdic & INTEL_CE_GBE_MDIC_GO) {
+                               e_dbg("MDI Read did not complete\n");
+                               return -E1000_ERR_PHY;
+                       }
+
+                       mdic = readl(E1000_MDIO_STS);
+                       if (mdic & INTEL_CE_GBE_MDIC_READ_ERROR) {
+                               e_dbg("MDI Read Error\n");
+                               return -E1000_ERR_PHY;
+                       }
+                       *phy_data = (u16) mdic;
+               } else {
+                       mdic = ((reg_addr << 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
+                        */
+                       for (i = 0; i < 64; 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");
+                               return -E1000_ERR_PHY;
+                       }
+                       if (mdic & E1000_MDIC_ERROR) {
+                               e_dbg("MDI Error\n");
+                               return -E1000_ERR_PHY;
+                       }
+                       *phy_data = (u16) mdic;
+               }
+       } else {
+               /* 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(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
+                * a MII read instruction consists of a shift out of 14 bits and is
+                * defined as follows:
+                *    <Preamble><SOF><Op Code><Phy Addr><Reg Addr>
+                * 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 = ((reg_addr) | (phy_addr << 5) |
+                       (PHY_OP_READ << 10) | (PHY_SOF << 12));
+
+               e1000_shift_out_mdi_bits(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.
+                */
+               *phy_data = e1000_shift_in_mdi_bits(hw);
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_write_phy_reg - write a phy register
+ *
+ * @hw: Struct containing variables accessed by shared code
+ * @reg_addr: address of the PHY register to write
+ * @data: data to write to the PHY
+
+ * Writes a value to a PHY register
+ */
+s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 phy_data)
+{
+       u32 ret_val;
+
+       e_dbg("e1000_write_phy_reg");
+
+       if ((hw->phy_type == e1000_phy_igp) &&
+           (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
+               ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                                (u16) reg_addr);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       ret_val = e1000_write_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr,
+                                        phy_data);
+
+       return ret_val;
+}
+
+static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
+                                 u16 phy_data)
+{
+       u32 i;
+       u32 mdic = 0;
+       const u32 phy_addr = (hw->mac_type == e1000_ce4100) ? hw->phy_addr : 1;
+
+       e_dbg("e1000_write_phy_reg_ex");
+
+       if (reg_addr > MAX_PHY_REG_ADDRESS) {
+               e_dbg("PHY Address %d is out of range\n", reg_addr);
+               return -E1000_ERR_PARAM;
+       }
+
+       if (hw->mac_type > e1000_82543) {
+               /* Set up Op-code, Phy Address, register address, and data
+                * intended for the PHY register in the MDI Control register.
+                * The MAC will take care of interfacing with the PHY to send
+                * the desired data.
+                */
+               if (hw->mac_type == e1000_ce4100) {
+                       mdic = (((u32) phy_data) |
+                               (reg_addr << E1000_MDIC_REG_SHIFT) |
+                               (phy_addr << E1000_MDIC_PHY_SHIFT) |
+                               (INTEL_CE_GBE_MDIC_OP_WRITE) |
+                               (INTEL_CE_GBE_MDIC_GO));
+
+                       writel(mdic, E1000_MDIO_CMD);
+
+                       /* Poll the ready bit to see if the MDI read
+                        * completed
+                        */
+                       for (i = 0; i < 640; i++) {
+                               udelay(5);
+                               mdic = readl(E1000_MDIO_CMD);
+                               if (!(mdic & INTEL_CE_GBE_MDIC_GO))
+                                       break;
+                       }
+                       if (mdic & INTEL_CE_GBE_MDIC_GO) {
+                               e_dbg("MDI Write did not complete\n");
+                               return -E1000_ERR_PHY;
+                       }
+               } else {
+                       mdic = (((u32) phy_data) |
+                               (reg_addr << 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
+                        */
+                       for (i = 0; i < 641; i++) {
+                               udelay(5);
+                               mdic = er32(MDIC);
+                               if (mdic & E1000_MDIC_READY)
+                                       break;
+                       }
+                       if (!(mdic & E1000_MDIC_READY)) {
+                               e_dbg("MDI Write did not complete\n");
+                               return -E1000_ERR_PHY;
+                       }
+               }
+       } else {
+               /* 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(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) | (reg_addr << 2) | (phy_addr << 7) |
+                       (PHY_OP_WRITE << 12) | (PHY_SOF << 14));
+               mdic <<= 16;
+               mdic |= (u32) phy_data;
+
+               e1000_shift_out_mdi_bits(hw, mdic, 32);
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_phy_hw_reset - reset the phy, hardware style
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Returns the PHY to the power-on reset state
+ */
+s32 e1000_phy_hw_reset(struct e1000_hw *hw)
+{
+       u32 ctrl, ctrl_ext;
+       u32 led_ctrl;
+
+       e_dbg("e1000_phy_hw_reset");
+
+       e_dbg("Resetting Phy...\n");
+
+       if (hw->mac_type > e1000_82543) {
+               /* Read the device control register and assert the E1000_CTRL_PHY_RST
+                * bit. Then, take it out of reset.
+                * For e1000 hardware, we delay for 10ms between the assert
+                * and deassert.
+                */
+               ctrl = er32(CTRL);
+               ew32(CTRL, ctrl | E1000_CTRL_PHY_RST);
+               E1000_WRITE_FLUSH();
+
+               msleep(10);
+
+               ew32(CTRL, ctrl);
+               E1000_WRITE_FLUSH();
+
+       } else {
+               /* Read the Extended Device Control Register, assert the PHY_RESET_DIR
+                * bit to put the PHY into reset. Then, take it out of reset.
+                */
+               ctrl_ext = er32(CTRL_EXT);
+               ctrl_ext |= E1000_CTRL_EXT_SDP4_DIR;
+               ctrl_ext &= ~E1000_CTRL_EXT_SDP4_DATA;
+               ew32(CTRL_EXT, ctrl_ext);
+               E1000_WRITE_FLUSH();
+               msleep(10);
+               ctrl_ext |= E1000_CTRL_EXT_SDP4_DATA;
+               ew32(CTRL_EXT, ctrl_ext);
+               E1000_WRITE_FLUSH();
+       }
+       udelay(150);
+
+       if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
+               /* Configure activity LED after PHY reset */
+               led_ctrl = er32(LEDCTL);
+               led_ctrl &= IGP_ACTIVITY_LED_MASK;
+               led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
+               ew32(LEDCTL, led_ctrl);
+       }
+
+       /* Wait for FW to finish PHY configuration. */
+       return e1000_get_phy_cfg_done(hw);
+}
+
+/**
+ * e1000_phy_reset - reset the phy to commit settings
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Resets the PHY
+ * Sets bit 15 of the MII Control register
+ */
+s32 e1000_phy_reset(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_phy_reset");
+
+       switch (hw->phy_type) {
+       case e1000_phy_igp:
+               ret_val = e1000_phy_hw_reset(hw);
+               if (ret_val)
+                       return ret_val;
+               break;
+       default:
+               ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_data |= MII_CR_RESET;
+               ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               udelay(1);
+               break;
+       }
+
+       if (hw->phy_type == e1000_phy_igp)
+               e1000_phy_init_script(hw);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_detect_gig_phy - check the phy type
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Probes the expected PHY address for known PHY IDs
+ */
+static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
+{
+       s32 phy_init_status, ret_val;
+       u16 phy_id_high, phy_id_low;
+       bool match = false;
+
+       e_dbg("e1000_detect_gig_phy");
+
+       if (hw->phy_id != 0)
+               return E1000_SUCCESS;
+
+       /* Read the PHY ID Registers to identify which PHY is onboard. */
+       ret_val = e1000_read_phy_reg(hw, PHY_ID1, &phy_id_high);
+       if (ret_val)
+               return ret_val;
+
+       hw->phy_id = (u32) (phy_id_high << 16);
+       udelay(20);
+       ret_val = e1000_read_phy_reg(hw, PHY_ID2, &phy_id_low);
+       if (ret_val)
+               return ret_val;
+
+       hw->phy_id |= (u32) (phy_id_low & PHY_REVISION_MASK);
+       hw->phy_revision = (u32) phy_id_low & ~PHY_REVISION_MASK;
+
+       switch (hw->mac_type) {
+       case e1000_82543:
+               if (hw->phy_id == M88E1000_E_PHY_ID)
+                       match = true;
+               break;
+       case e1000_82544:
+               if (hw->phy_id == M88E1000_I_PHY_ID)
+                       match = true;
+               break;
+       case e1000_82540:
+       case e1000_82545:
+       case e1000_82545_rev_3:
+       case e1000_82546:
+       case e1000_82546_rev_3:
+               if (hw->phy_id == M88E1011_I_PHY_ID)
+                       match = true;
+               break;
+       case e1000_ce4100:
+               if ((hw->phy_id == RTL8211B_PHY_ID) ||
+                   (hw->phy_id == RTL8201N_PHY_ID) ||
+                   (hw->phy_id == M88E1118_E_PHY_ID))
+                       match = true;
+               break;
+       case e1000_82541:
+       case e1000_82541_rev_2:
+       case e1000_82547:
+       case e1000_82547_rev_2:
+               if (hw->phy_id == IGP01E1000_I_PHY_ID)
+                       match = true;
+               break;
+       default:
+               e_dbg("Invalid MAC type %d\n", hw->mac_type);
+               return -E1000_ERR_CONFIG;
+       }
+       phy_init_status = e1000_set_phy_type(hw);
+
+       if ((match) && (phy_init_status == E1000_SUCCESS)) {
+               e_dbg("PHY ID 0x%X detected\n", hw->phy_id);
+               return E1000_SUCCESS;
+       }
+       e_dbg("Invalid PHY ID 0x%X\n", hw->phy_id);
+       return -E1000_ERR_PHY;
+}
+
+/**
+ * e1000_phy_reset_dsp - reset DSP
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Resets the PHY's DSP
+ */
+static s32 e1000_phy_reset_dsp(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       e_dbg("e1000_phy_reset_dsp");
+
+       do {
+               ret_val = e1000_write_phy_reg(hw, 29, 0x001d);
+               if (ret_val)
+                       break;
+               ret_val = e1000_write_phy_reg(hw, 30, 0x00c1);
+               if (ret_val)
+                       break;
+               ret_val = e1000_write_phy_reg(hw, 30, 0x0000);
+               if (ret_val)
+                       break;
+               ret_val = E1000_SUCCESS;
+       } while (0);
+
+       return ret_val;
+}
+
+/**
+ * e1000_phy_igp_get_info - get igp specific registers
+ * @hw: Struct containing variables accessed by shared code
+ * @phy_info: PHY information structure
+ *
+ * Get PHY information from various PHY registers for igp PHY only.
+ */
+static s32 e1000_phy_igp_get_info(struct e1000_hw *hw,
+                                 struct e1000_phy_info *phy_info)
+{
+       s32 ret_val;
+       u16 phy_data, min_length, max_length, average;
+       e1000_rev_polarity polarity;
+
+       e_dbg("e1000_phy_igp_get_info");
+
+       /* The downshift status is checked only once, after link is established,
+        * and it stored in the hw->speed_downgraded parameter. */
+       phy_info->downshift = (e1000_downshift) hw->speed_downgraded;
+
+       /* IGP01E1000 does not need to support it. */
+       phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_normal;
+
+       /* IGP01E1000 always correct polarity reversal */
+       phy_info->polarity_correction = e1000_polarity_reversal_enabled;
+
+       /* Check polarity status */
+       ret_val = e1000_check_polarity(hw, &polarity);
+       if (ret_val)
+               return ret_val;
+
+       phy_info->cable_polarity = polarity;
+
+       ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy_info->mdix_mode =
+           (e1000_auto_x_mode) ((phy_data & IGP01E1000_PSSR_MDIX) >>
+                                IGP01E1000_PSSR_MDIX_SHIFT);
+
+       if ((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
+           IGP01E1000_PSSR_SPEED_1000MBPS) {
+               /* Local/Remote Receiver Information are only valid at 1000 Mbps */
+               ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>
+                                     SR_1000T_LOCAL_RX_STATUS_SHIFT) ?
+                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
+               phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>
+                                      SR_1000T_REMOTE_RX_STATUS_SHIFT) ?
+                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
+
+               /* Get cable length */
+               ret_val = e1000_get_cable_length(hw, &min_length, &max_length);
+               if (ret_val)
+                       return ret_val;
+
+               /* Translate to old method */
+               average = (max_length + min_length) / 2;
+
+               if (average <= e1000_igp_cable_length_50)
+                       phy_info->cable_length = e1000_cable_length_50;
+               else if (average <= e1000_igp_cable_length_80)
+                       phy_info->cable_length = e1000_cable_length_50_80;
+               else if (average <= e1000_igp_cable_length_110)
+                       phy_info->cable_length = e1000_cable_length_80_110;
+               else if (average <= e1000_igp_cable_length_140)
+                       phy_info->cable_length = e1000_cable_length_110_140;
+               else
+                       phy_info->cable_length = e1000_cable_length_140;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_phy_m88_get_info - get m88 specific registers
+ * @hw: Struct containing variables accessed by shared code
+ * @phy_info: PHY information structure
+ *
+ * Get PHY information from various PHY registers for m88 PHY only.
+ */
+static s32 e1000_phy_m88_get_info(struct e1000_hw *hw,
+                                 struct e1000_phy_info *phy_info)
+{
+       s32 ret_val;
+       u16 phy_data;
+       e1000_rev_polarity polarity;
+
+       e_dbg("e1000_phy_m88_get_info");
+
+       /* The downshift status is checked only once, after link is established,
+        * and it stored in the hw->speed_downgraded parameter. */
+       phy_info->downshift = (e1000_downshift) hw->speed_downgraded;
+
+       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy_info->extended_10bt_distance =
+           ((phy_data & M88E1000_PSCR_10BT_EXT_DIST_ENABLE) >>
+            M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT) ?
+           e1000_10bt_ext_dist_enable_lower :
+           e1000_10bt_ext_dist_enable_normal;
+
+       phy_info->polarity_correction =
+           ((phy_data & M88E1000_PSCR_POLARITY_REVERSAL) >>
+            M88E1000_PSCR_POLARITY_REVERSAL_SHIFT) ?
+           e1000_polarity_reversal_disabled : e1000_polarity_reversal_enabled;
+
+       /* Check polarity status */
+       ret_val = e1000_check_polarity(hw, &polarity);
+       if (ret_val)
+               return ret_val;
+       phy_info->cable_polarity = polarity;
+
+       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy_info->mdix_mode =
+           (e1000_auto_x_mode) ((phy_data & M88E1000_PSSR_MDIX) >>
+                                M88E1000_PSSR_MDIX_SHIFT);
+
+       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
+               /* Cable Length Estimation and Local/Remote Receiver Information
+                * are only valid at 1000 Mbps.
+                */
+               phy_info->cable_length =
+                   (e1000_cable_length) ((phy_data &
+                                          M88E1000_PSSR_CABLE_LENGTH) >>
+                                         M88E1000_PSSR_CABLE_LENGTH_SHIFT);
+
+               ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>
+                                     SR_1000T_LOCAL_RX_STATUS_SHIFT) ?
+                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
+               phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>
+                                      SR_1000T_REMOTE_RX_STATUS_SHIFT) ?
+                   e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;
+
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_phy_get_info - request phy info
+ * @hw: Struct containing variables accessed by shared code
+ * @phy_info: PHY information structure
+ *
+ * Get PHY information from various PHY registers
+ */
+s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_phy_get_info");
+
+       phy_info->cable_length = e1000_cable_length_undefined;
+       phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_undefined;
+       phy_info->cable_polarity = e1000_rev_polarity_undefined;
+       phy_info->downshift = e1000_downshift_undefined;
+       phy_info->polarity_correction = e1000_polarity_reversal_undefined;
+       phy_info->mdix_mode = e1000_auto_x_mode_undefined;
+       phy_info->local_rx = e1000_1000t_rx_status_undefined;
+       phy_info->remote_rx = e1000_1000t_rx_status_undefined;
+
+       if (hw->media_type != e1000_media_type_copper) {
+               e_dbg("PHY info is only valid for copper media\n");
+               return -E1000_ERR_CONFIG;
+       }
+
+       ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       if ((phy_data & MII_SR_LINK_STATUS) != MII_SR_LINK_STATUS) {
+               e_dbg("PHY info is only valid if link is up\n");
+               return -E1000_ERR_CONFIG;
+       }
+
+       if (hw->phy_type == e1000_phy_igp)
+               return e1000_phy_igp_get_info(hw, phy_info);
+       else if ((hw->phy_type == e1000_phy_8211) ||
+                (hw->phy_type == e1000_phy_8201))
+               return E1000_SUCCESS;
+       else
+               return e1000_phy_m88_get_info(hw, phy_info);
+}
+
+s32 e1000_validate_mdi_setting(struct e1000_hw *hw)
+{
+       e_dbg("e1000_validate_mdi_settings");
+
+       if (!hw->autoneg && (hw->mdix == 0 || hw->mdix == 3)) {
+               e_dbg("Invalid MDI setting detected\n");
+               hw->mdix = 1;
+               return -E1000_ERR_CONFIG;
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_init_eeprom_params - initialize sw eeprom vars
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Sets up eeprom variables in the hw struct.  Must be called after mac_type
+ * is configured.
+ */
+s32 e1000_init_eeprom_params(struct e1000_hw *hw)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       u32 eecd = er32(EECD);
+       s32 ret_val = E1000_SUCCESS;
+       u16 eeprom_size;
+
+       e_dbg("e1000_init_eeprom_params");
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+       case e1000_82544:
+               eeprom->type = e1000_eeprom_microwire;
+               eeprom->word_size = 64;
+               eeprom->opcode_bits = 3;
+               eeprom->address_bits = 6;
+               eeprom->delay_usec = 50;
+               break;
+       case e1000_82540:
+       case e1000_82545:
+       case e1000_82545_rev_3:
+       case e1000_82546:
+       case e1000_82546_rev_3:
+               eeprom->type = e1000_eeprom_microwire;
+               eeprom->opcode_bits = 3;
+               eeprom->delay_usec = 50;
+               if (eecd & E1000_EECD_SIZE) {
+                       eeprom->word_size = 256;
+                       eeprom->address_bits = 8;
+               } else {
+                       eeprom->word_size = 64;
+                       eeprom->address_bits = 6;
+               }
+               break;
+       case e1000_82541:
+       case e1000_82541_rev_2:
+       case e1000_82547:
+       case e1000_82547_rev_2:
+               if (eecd & E1000_EECD_TYPE) {
+                       eeprom->type = e1000_eeprom_spi;
+                       eeprom->opcode_bits = 8;
+                       eeprom->delay_usec = 1;
+                       if (eecd & E1000_EECD_ADDR_BITS) {
+                               eeprom->page_size = 32;
+                               eeprom->address_bits = 16;
+                       } else {
+                               eeprom->page_size = 8;
+                               eeprom->address_bits = 8;
+                       }
+               } else {
+                       eeprom->type = e1000_eeprom_microwire;
+                       eeprom->opcode_bits = 3;
+                       eeprom->delay_usec = 50;
+                       if (eecd & E1000_EECD_ADDR_BITS) {
+                               eeprom->word_size = 256;
+                               eeprom->address_bits = 8;
+                       } else {
+                               eeprom->word_size = 64;
+                               eeprom->address_bits = 6;
+                       }
+               }
+               break;
+       default:
+               break;
+       }
+
+       if (eeprom->type == e1000_eeprom_spi) {
+               /* eeprom_size will be an enum [0..8] that maps to eeprom sizes 128B to
+                * 32KB (incremented by powers of 2).
+                */
+               /* Set to default value for initial eeprom read. */
+               eeprom->word_size = 64;
+               ret_val = e1000_read_eeprom(hw, EEPROM_CFG, 1, &eeprom_size);
+               if (ret_val)
+                       return ret_val;
+               eeprom_size =
+                   (eeprom_size & EEPROM_SIZE_MASK) >> EEPROM_SIZE_SHIFT;
+               /* 256B eeprom size was not supported in earlier hardware, so we
+                * bump eeprom_size up one to ensure that "1" (which maps to 256B)
+                * is never the result used in the shifting logic below. */
+               if (eeprom_size)
+                       eeprom_size++;
+
+               eeprom->word_size = 1 << (eeprom_size + EEPROM_WORD_SIZE_SHIFT);
+       }
+       return ret_val;
+}
+
+/**
+ * e1000_raise_ee_clk - Raises the EEPROM's clock input.
+ * @hw: Struct containing variables accessed by shared code
+ * @eecd: EECD's current value
+ */
+static void e1000_raise_ee_clk(struct e1000_hw *hw, u32 *eecd)
+{
+       /* Raise the clock input to the EEPROM (by setting the SK bit), and then
+        * wait <delay> microseconds.
+        */
+       *eecd = *eecd | E1000_EECD_SK;
+       ew32(EECD, *eecd);
+       E1000_WRITE_FLUSH();
+       udelay(hw->eeprom.delay_usec);
+}
+
+/**
+ * e1000_lower_ee_clk - Lowers the EEPROM's clock input.
+ * @hw: Struct containing variables accessed by shared code
+ * @eecd: EECD's current value
+ */
+static void e1000_lower_ee_clk(struct e1000_hw *hw, u32 *eecd)
+{
+       /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
+        * wait 50 microseconds.
+        */
+       *eecd = *eecd & ~E1000_EECD_SK;
+       ew32(EECD, *eecd);
+       E1000_WRITE_FLUSH();
+       udelay(hw->eeprom.delay_usec);
+}
+
+/**
+ * e1000_shift_out_ee_bits - Shift data bits out to the EEPROM.
+ * @hw: Struct containing variables accessed by shared code
+ * @data: data to send to the EEPROM
+ * @count: number of bits to shift out
+ */
+static void e1000_shift_out_ee_bits(struct e1000_hw *hw, u16 data, u16 count)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       u32 eecd;
+       u32 mask;
+
+       /* We need to shift "count" bits out to the EEPROM. So, 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.
+        */
+       mask = 0x01 << (count - 1);
+       eecd = er32(EECD);
+       if (eeprom->type == e1000_eeprom_microwire) {
+               eecd &= ~E1000_EECD_DO;
+       } else if (eeprom->type == e1000_eeprom_spi) {
+               eecd |= E1000_EECD_DO;
+       }
+       do {
+               /* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
+                * and then raising and then lowering the clock (the SK bit controls
+                * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
+                * by setting "DI" to "0" and then raising and then lowering the clock.
+                */
+               eecd &= ~E1000_EECD_DI;
+
+               if (data & mask)
+                       eecd |= E1000_EECD_DI;
+
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+
+               udelay(eeprom->delay_usec);
+
+               e1000_raise_ee_clk(hw, &eecd);
+               e1000_lower_ee_clk(hw, &eecd);
+
+               mask = mask >> 1;
+
+       } while (mask);
+
+       /* We leave the "DI" bit set to "0" when we leave this routine. */
+       eecd &= ~E1000_EECD_DI;
+       ew32(EECD, eecd);
+}
+
+/**
+ * e1000_shift_in_ee_bits - Shift data bits in from the EEPROM
+ * @hw: Struct containing variables accessed by shared code
+ * @count: number of bits to shift in
+ */
+static u16 e1000_shift_in_ee_bits(struct e1000_hw *hw, u16 count)
+{
+       u32 eecd;
+       u32 i;
+       u16 data;
+
+       /* 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 "DO" bit.  During this "shifting in" process the "DI" bit should
+        * always be clear.
+        */
+
+       eecd = er32(EECD);
+
+       eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
+       data = 0;
+
+       for (i = 0; i < count; i++) {
+               data = data << 1;
+               e1000_raise_ee_clk(hw, &eecd);
+
+               eecd = er32(EECD);
+
+               eecd &= ~(E1000_EECD_DI);
+               if (eecd & E1000_EECD_DO)
+                       data |= 1;
+
+               e1000_lower_ee_clk(hw, &eecd);
+       }
+
+       return data;
+}
+
+/**
+ * e1000_acquire_eeprom - Prepares EEPROM for access
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This
+ * function should be called before issuing a command to the EEPROM.
+ */
+static s32 e1000_acquire_eeprom(struct e1000_hw *hw)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       u32 eecd, i = 0;
+
+       e_dbg("e1000_acquire_eeprom");
+
+       eecd = er32(EECD);
+
+       /* Request EEPROM Access */
+       if (hw->mac_type > e1000_82544) {
+               eecd |= E1000_EECD_REQ;
+               ew32(EECD, eecd);
+               eecd = er32(EECD);
+               while ((!(eecd & E1000_EECD_GNT)) &&
+                      (i < E1000_EEPROM_GRANT_ATTEMPTS)) {
+                       i++;
+                       udelay(5);
+                       eecd = er32(EECD);
+               }
+               if (!(eecd & E1000_EECD_GNT)) {
+                       eecd &= ~E1000_EECD_REQ;
+                       ew32(EECD, eecd);
+                       e_dbg("Could not acquire EEPROM grant\n");
+                       return -E1000_ERR_EEPROM;
+               }
+       }
+
+       /* Setup EEPROM for Read/Write */
+
+       if (eeprom->type == e1000_eeprom_microwire) {
+               /* Clear SK and DI */
+               eecd &= ~(E1000_EECD_DI | E1000_EECD_SK);
+               ew32(EECD, eecd);
+
+               /* Set CS */
+               eecd |= E1000_EECD_CS;
+               ew32(EECD, eecd);
+       } else if (eeprom->type == e1000_eeprom_spi) {
+               /* Clear SK and CS */
+               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(1);
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_standby_eeprom - Returns EEPROM to a "standby" state
+ * @hw: Struct containing variables accessed by shared code
+ */
+static void e1000_standby_eeprom(struct e1000_hw *hw)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       u32 eecd;
+
+       eecd = er32(EECD);
+
+       if (eeprom->type == e1000_eeprom_microwire) {
+               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(eeprom->delay_usec);
+
+               /* Clock high */
+               eecd |= E1000_EECD_SK;
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(eeprom->delay_usec);
+
+               /* Select EEPROM */
+               eecd |= E1000_EECD_CS;
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(eeprom->delay_usec);
+
+               /* Clock low */
+               eecd &= ~E1000_EECD_SK;
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(eeprom->delay_usec);
+       } else if (eeprom->type == e1000_eeprom_spi) {
+               /* Toggle CS to flush commands */
+               eecd |= E1000_EECD_CS;
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(eeprom->delay_usec);
+               eecd &= ~E1000_EECD_CS;
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(eeprom->delay_usec);
+       }
+}
+
+/**
+ * e1000_release_eeprom - drop chip select
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Terminates a command by inverting the EEPROM's chip select pin
+ */
+static void e1000_release_eeprom(struct e1000_hw *hw)
+{
+       u32 eecd;
+
+       e_dbg("e1000_release_eeprom");
+
+       eecd = er32(EECD);
+
+       if (hw->eeprom.type == e1000_eeprom_spi) {
+               eecd |= E1000_EECD_CS;  /* Pull CS high */
+               eecd &= ~E1000_EECD_SK; /* Lower SCK */
+
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+
+               udelay(hw->eeprom.delay_usec);
+       } else if (hw->eeprom.type == e1000_eeprom_microwire) {
+               /* cleanup eeprom */
+
+               /* CS on Microwire is active-high */
+               eecd &= ~(E1000_EECD_CS | E1000_EECD_DI);
+
+               ew32(EECD, eecd);
+
+               /* Rising edge of clock */
+               eecd |= E1000_EECD_SK;
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(hw->eeprom.delay_usec);
+
+               /* Falling edge of clock */
+               eecd &= ~E1000_EECD_SK;
+               ew32(EECD, eecd);
+               E1000_WRITE_FLUSH();
+               udelay(hw->eeprom.delay_usec);
+       }
+
+       /* Stop requesting EEPROM access */
+       if (hw->mac_type > e1000_82544) {
+               eecd &= ~E1000_EECD_REQ;
+               ew32(EECD, eecd);
+       }
+}
+
+/**
+ * e1000_spi_eeprom_ready - Reads a 16 bit word from the EEPROM.
+ * @hw: Struct containing variables accessed by shared code
+ */
+static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw)
+{
+       u16 retry_count = 0;
+       u8 spi_stat_reg;
+
+       e_dbg("e1000_spi_eeprom_ready");
+
+       /* 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
+        * 5 milliseconds, then error out.
+        */
+       retry_count = 0;
+       do {
+               e1000_shift_out_ee_bits(hw, EEPROM_RDSR_OPCODE_SPI,
+                                       hw->eeprom.opcode_bits);
+               spi_stat_reg = (u8) e1000_shift_in_ee_bits(hw, 8);
+               if (!(spi_stat_reg & EEPROM_STATUS_RDY_SPI))
+                       break;
+
+               udelay(5);
+               retry_count += 5;
+
+               e1000_standby_eeprom(hw);
+       } while (retry_count < EEPROM_MAX_RETRY_SPI);
+
+       /* ATMEL SPI write time could vary from 0-20mSec on 3.3V devices (and
+        * only 0-5mSec on 5V devices)
+        */
+       if (retry_count >= EEPROM_MAX_RETRY_SPI) {
+               e_dbg("SPI EEPROM Status error\n");
+               return -E1000_ERR_EEPROM;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_read_eeprom - Reads a 16 bit word from the EEPROM.
+ * @hw: Struct containing variables accessed by shared code
+ * @offset: offset of  word in the EEPROM to read
+ * @data: word read from the EEPROM
+ * @words: number of words to read
+ */
+s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
+       s32 ret;
+       spin_lock(&e1000_eeprom_lock);
+       ret = e1000_do_read_eeprom(hw, offset, words, data);
+       spin_unlock(&e1000_eeprom_lock);
+       return ret;
+}
+
+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
+                               u16 *data)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       u32 i = 0;
+
+       e_dbg("e1000_read_eeprom");
+
+       if (hw->mac_type == e1000_ce4100) {
+               GBE_CONFIG_FLASH_READ(GBE_CONFIG_BASE_VIRT, offset, words,
+                                     data);
+               return E1000_SUCCESS;
+       }
+
+       /* If eeprom is not yet detected, do so now */
+       if (eeprom->word_size == 0)
+               e1000_init_eeprom_params(hw);
+
+       /* A check for invalid values:  offset too large, too many words, and not
+        * enough words.
+        */
+       if ((offset >= eeprom->word_size)
+           || (words > eeprom->word_size - offset) || (words == 0)) {
+               e_dbg("\"words\" parameter out of bounds. Words = %d,"
+                     "size = %d\n", offset, eeprom->word_size);
+               return -E1000_ERR_EEPROM;
+       }
+
+       /* EEPROM's that don't use EERD to read require us to bit-bang the SPI
+        * directly. In this case, we need to acquire the EEPROM so that
+        * FW or other port software does not interrupt.
+        */
+       /* Prepare the EEPROM for bit-bang reading */
+       if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
+               return -E1000_ERR_EEPROM;
+
+       /* Set up the SPI or Microwire EEPROM for bit-bang reading.  We have
+        * acquired the EEPROM at this point, so any returns should release it */
+       if (eeprom->type == e1000_eeprom_spi) {
+               u16 word_in;
+               u8 read_opcode = EEPROM_READ_OPCODE_SPI;
+
+               if (e1000_spi_eeprom_ready(hw)) {
+                       e1000_release_eeprom(hw);
+                       return -E1000_ERR_EEPROM;
+               }
+
+               e1000_standby_eeprom(hw);
+
+               /* Some SPI eeproms use the 8th address bit embedded in the opcode */
+               if ((eeprom->address_bits == 8) && (offset >= 128))
+                       read_opcode |= EEPROM_A8_OPCODE_SPI;
+
+               /* Send the READ command (opcode + addr)  */
+               e1000_shift_out_ee_bits(hw, read_opcode, eeprom->opcode_bits);
+               e1000_shift_out_ee_bits(hw, (u16) (offset * 2),
+                                       eeprom->address_bits);
+
+               /* Read the data.  The address of the eeprom internally increments with
+                * each byte (spi) being read, saving on the overhead of eeprom setup
+                * and tear-down.  The address counter will roll over if reading beyond
+                * the size of the eeprom, thus allowing the entire memory to be read
+                * starting from any offset. */
+               for (i = 0; i < words; i++) {
+                       word_in = e1000_shift_in_ee_bits(hw, 16);
+                       data[i] = (word_in >> 8) | (word_in << 8);
+               }
+       } else if (eeprom->type == e1000_eeprom_microwire) {
+               for (i = 0; i < words; i++) {
+                       /* Send the READ command (opcode + addr)  */
+                       e1000_shift_out_ee_bits(hw,
+                                               EEPROM_READ_OPCODE_MICROWIRE,
+                                               eeprom->opcode_bits);
+                       e1000_shift_out_ee_bits(hw, (u16) (offset + i),
+                                               eeprom->address_bits);
+
+                       /* Read the data.  For microwire, each word requires the overhead
+                        * of eeprom setup and tear-down. */
+                       data[i] = e1000_shift_in_ee_bits(hw, 16);
+                       e1000_standby_eeprom(hw);
+               }
+       }
+
+       /* End this read operation */
+       e1000_release_eeprom(hw);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_validate_eeprom_checksum - Verifies that the EEPROM has a valid checksum
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Reads the first 64 16 bit words of the EEPROM and sums the values read.
+ * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
+ * valid.
+ */
+s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
+{
+       u16 checksum = 0;
+       u16 i, eeprom_data;
+
+       e_dbg("e1000_validate_eeprom_checksum");
+
+       for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
+               if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
+                       e_dbg("EEPROM Read Error\n");
+                       return -E1000_ERR_EEPROM;
+               }
+               checksum += eeprom_data;
+       }
+
+       if (checksum == (u16) EEPROM_SUM)
+               return E1000_SUCCESS;
+       else {
+               e_dbg("EEPROM Checksum Invalid\n");
+               return -E1000_ERR_EEPROM;
+       }
+}
+
+/**
+ * e1000_update_eeprom_checksum - Calculates/writes the EEPROM checksum
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Sums the first 63 16 bit words of the EEPROM. Subtracts the sum from 0xBABA.
+ * Writes the difference to word offset 63 of the EEPROM.
+ */
+s32 e1000_update_eeprom_checksum(struct e1000_hw *hw)
+{
+       u16 checksum = 0;
+       u16 i, eeprom_data;
+
+       e_dbg("e1000_update_eeprom_checksum");
+
+       for (i = 0; i < EEPROM_CHECKSUM_REG; i++) {
+               if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
+                       e_dbg("EEPROM Read Error\n");
+                       return -E1000_ERR_EEPROM;
+               }
+               checksum += eeprom_data;
+       }
+       checksum = (u16) EEPROM_SUM - checksum;
+       if (e1000_write_eeprom(hw, EEPROM_CHECKSUM_REG, 1, &checksum) < 0) {
+               e_dbg("EEPROM Write Error\n");
+               return -E1000_ERR_EEPROM;
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_write_eeprom - write words to the different EEPROM types.
+ * @hw: Struct containing variables accessed by shared code
+ * @offset: offset within the EEPROM to be written to
+ * @words: number of words to write
+ * @data: 16 bit word to be written to the EEPROM
+ *
+ * If e1000_update_eeprom_checksum is not called after this function, the
+ * EEPROM will most likely contain an invalid checksum.
+ */
+s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
+       s32 ret;
+       spin_lock(&e1000_eeprom_lock);
+       ret = e1000_do_write_eeprom(hw, offset, words, data);
+       spin_unlock(&e1000_eeprom_lock);
+       return ret;
+}
+
+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words,
+                                u16 *data)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       s32 status = 0;
+
+       e_dbg("e1000_write_eeprom");
+
+       if (hw->mac_type == e1000_ce4100) {
+               GBE_CONFIG_FLASH_WRITE(GBE_CONFIG_BASE_VIRT, offset, words,
+                                      data);
+               return E1000_SUCCESS;
+       }
+
+       /* If eeprom is not yet detected, do so now */
+       if (eeprom->word_size == 0)
+               e1000_init_eeprom_params(hw);
+
+       /* A check for invalid values:  offset too large, too many words, and not
+        * enough words.
+        */
+       if ((offset >= eeprom->word_size)
+           || (words > eeprom->word_size - offset) || (words == 0)) {
+               e_dbg("\"words\" parameter out of bounds\n");
+               return -E1000_ERR_EEPROM;
+       }
+
+       /* Prepare the EEPROM for writing  */
+       if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
+               return -E1000_ERR_EEPROM;
+
+       if (eeprom->type == e1000_eeprom_microwire) {
+               status = e1000_write_eeprom_microwire(hw, offset, words, data);
+       } else {
+               status = e1000_write_eeprom_spi(hw, offset, words, data);
+               msleep(10);
+       }
+
+       /* Done with writing */
+       e1000_release_eeprom(hw);
+
+       return status;
+}
+
+/**
+ * e1000_write_eeprom_spi - Writes a 16 bit word to a given offset in an SPI EEPROM.
+ * @hw: Struct containing variables accessed by shared code
+ * @offset: offset within the EEPROM to be written to
+ * @words: number of words to write
+ * @data: pointer to array of 8 bit words to be written to the EEPROM
+ */
+static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset, u16 words,
+                                 u16 *data)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       u16 widx = 0;
+
+       e_dbg("e1000_write_eeprom_spi");
+
+       while (widx < words) {
+               u8 write_opcode = EEPROM_WRITE_OPCODE_SPI;
+
+               if (e1000_spi_eeprom_ready(hw))
+                       return -E1000_ERR_EEPROM;
+
+               e1000_standby_eeprom(hw);
+
+               /*  Send the WRITE ENABLE command (8 bit opcode )  */
+               e1000_shift_out_ee_bits(hw, EEPROM_WREN_OPCODE_SPI,
+                                       eeprom->opcode_bits);
+
+               e1000_standby_eeprom(hw);
+
+               /* Some SPI eeproms use the 8th address bit embedded in the opcode */
+               if ((eeprom->address_bits == 8) && (offset >= 128))
+                       write_opcode |= EEPROM_A8_OPCODE_SPI;
+
+               /* Send the Write command (8-bit opcode + addr) */
+               e1000_shift_out_ee_bits(hw, write_opcode, eeprom->opcode_bits);
+
+               e1000_shift_out_ee_bits(hw, (u16) ((offset + widx) * 2),
+                                       eeprom->address_bits);
+
+               /* Send the data */
+
+               /* Loop to allow for up to whole page write (32 bytes) of eeprom */
+               while (widx < words) {
+                       u16 word_out = data[widx];
+                       word_out = (word_out >> 8) | (word_out << 8);
+                       e1000_shift_out_ee_bits(hw, word_out, 16);
+                       widx++;
+
+                       /* Some larger eeprom sizes are capable of a 32-byte PAGE WRITE
+                        * operation, while the smaller eeproms are capable of an 8-byte
+                        * PAGE WRITE operation.  Break the inner loop to pass new address
+                        */
+                       if ((((offset + widx) * 2) % eeprom->page_size) == 0) {
+                               e1000_standby_eeprom(hw);
+                               break;
+                       }
+               }
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_write_eeprom_microwire - Writes a 16 bit word to a given offset in a Microwire EEPROM.
+ * @hw: Struct containing variables accessed by shared code
+ * @offset: offset within the EEPROM to be written to
+ * @words: number of words to write
+ * @data: pointer to array of 8 bit words to be written to the EEPROM
+ */
+static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw, u16 offset,
+                                       u16 words, u16 *data)
+{
+       struct e1000_eeprom_info *eeprom = &hw->eeprom;
+       u32 eecd;
+       u16 words_written = 0;
+       u16 i = 0;
+
+       e_dbg("e1000_write_eeprom_microwire");
+
+       /* Send the write enable command to the EEPROM (3-bit opcode plus
+        * 6/8-bit dummy address beginning with 11).  It's less work to include
+        * the 11 of the dummy address as part of the opcode than it is to shift
+        * it over the correct number of bits for the address.  This puts the
+        * EEPROM into write/erase mode.
+        */
+       e1000_shift_out_ee_bits(hw, EEPROM_EWEN_OPCODE_MICROWIRE,
+                               (u16) (eeprom->opcode_bits + 2));
+
+       e1000_shift_out_ee_bits(hw, 0, (u16) (eeprom->address_bits - 2));
+
+       /* Prepare the EEPROM */
+       e1000_standby_eeprom(hw);
+
+       while (words_written < words) {
+               /* Send the Write command (3-bit opcode + addr) */
+               e1000_shift_out_ee_bits(hw, EEPROM_WRITE_OPCODE_MICROWIRE,
+                                       eeprom->opcode_bits);
+
+               e1000_shift_out_ee_bits(hw, (u16) (offset + words_written),
+                                       eeprom->address_bits);
+
+               /* Send the data */
+               e1000_shift_out_ee_bits(hw, data[words_written], 16);
+
+               /* Toggle the CS line.  This in effect tells the EEPROM to execute
+                * the previous command.
+                */
+               e1000_standby_eeprom(hw);
+
+               /* Read DO repeatedly until it is high (equal to '1').  The EEPROM will
+                * signal that the command has been completed by raising the DO signal.
+                * If DO does not go high in 10 milliseconds, then error out.
+                */
+               for (i = 0; i < 200; i++) {
+                       eecd = er32(EECD);
+                       if (eecd & E1000_EECD_DO)
+                               break;
+                       udelay(50);
+               }
+               if (i == 200) {
+                       e_dbg("EEPROM Write did not complete\n");
+                       return -E1000_ERR_EEPROM;
+               }
+
+               /* Recover from write */
+               e1000_standby_eeprom(hw);
+
+               words_written++;
+       }
+
+       /* Send the write disable command to the EEPROM (3-bit opcode plus
+        * 6/8-bit dummy address beginning with 10).  It's less work to include
+        * the 10 of the dummy address as part of the opcode than it is to shift
+        * it over the correct number of bits for the address.  This takes the
+        * EEPROM out of write/erase mode.
+        */
+       e1000_shift_out_ee_bits(hw, EEPROM_EWDS_OPCODE_MICROWIRE,
+                               (u16) (eeprom->opcode_bits + 2));
+
+       e1000_shift_out_ee_bits(hw, 0, (u16) (eeprom->address_bits - 2));
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_read_mac_addr - read the adapters MAC from eeprom
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
+ * second function of dual function devices
+ */
+s32 e1000_read_mac_addr(struct e1000_hw *hw)
+{
+       u16 offset;
+       u16 eeprom_data, i;
+
+       e_dbg("e1000_read_mac_addr");
+
+       for (i = 0; i < NODE_ADDRESS_SIZE; i += 2) {
+               offset = i >> 1;
+               if (e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
+                       e_dbg("EEPROM Read Error\n");
+                       return -E1000_ERR_EEPROM;
+               }
+               hw->perm_mac_addr[i] = (u8) (eeprom_data & 0x00FF);
+               hw->perm_mac_addr[i + 1] = (u8) (eeprom_data >> 8);
+       }
+
+       switch (hw->mac_type) {
+       default:
+               break;
+       case e1000_82546:
+       case e1000_82546_rev_3:
+               if (er32(STATUS) & E1000_STATUS_FUNC_1)
+                       hw->perm_mac_addr[5] ^= 0x01;
+               break;
+       }
+
+       for (i = 0; i < NODE_ADDRESS_SIZE; i++)
+               hw->mac_addr[i] = hw->perm_mac_addr[i];
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_init_rx_addrs - Initializes receive address filters.
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Places the MAC address in receive address register 0 and clears the rest
+ * of the receive address registers. Clears the multicast table. Assumes
+ * the receiver is in reset when the routine is called.
+ */
+static void e1000_init_rx_addrs(struct e1000_hw *hw)
+{
+       u32 i;
+       u32 rar_num;
+
+       e_dbg("e1000_init_rx_addrs");
+
+       /* Setup the receive address. */
+       e_dbg("Programming MAC Address into RAR[0]\n");
+
+       e1000_rar_set(hw, hw->mac_addr, 0);
+
+       rar_num = E1000_RAR_ENTRIES;
+
+       /* Zero out the other 15 receive addresses. */
+       e_dbg("Clearing RAR[1-15]\n");
+       for (i = 1; i < rar_num; i++) {
+               E1000_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
+               E1000_WRITE_FLUSH();
+               E1000_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
+               E1000_WRITE_FLUSH();
+       }
+}
+
+/**
+ * e1000_hash_mc_addr - Hashes an address to determine its location in the multicast table
+ * @hw: Struct containing variables accessed by shared code
+ * @mc_addr: the multicast address to hash
+ */
+u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
+{
+       u32 hash_value = 0;
+
+       /* The portion of the address that is used for the hash table is
+        * determined by the mc_filter_type setting.
+        */
+       switch (hw->mc_filter_type) {
+               /* [0] [1] [2] [3] [4] [5]
+                * 01  AA  00  12  34  56
+                * LSB                 MSB
+                */
+       case 0:
+               /* [47:36] i.e. 0x563 for above example address */
+               hash_value = ((mc_addr[4] >> 4) | (((u16) mc_addr[5]) << 4));
+               break;
+       case 1:
+               /* [46:35] i.e. 0xAC6 for above example address */
+               hash_value = ((mc_addr[4] >> 3) | (((u16) mc_addr[5]) << 5));
+               break;
+       case 2:
+               /* [45:34] i.e. 0x5D8 for above example address */
+               hash_value = ((mc_addr[4] >> 2) | (((u16) mc_addr[5]) << 6));
+               break;
+       case 3:
+               /* [43:32] i.e. 0x634 for above example address */
+               hash_value = ((mc_addr[4]) | (((u16) mc_addr[5]) << 8));
+               break;
+       }
+
+       hash_value &= 0xFFF;
+       return hash_value;
+}
+
+/**
+ * e1000_rar_set - Puts an ethernet address into a receive address register.
+ * @hw: Struct containing variables accessed by shared code
+ * @addr: Address to put into receive address register
+ * @index: Receive address register to write
+ */
+void e1000_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));
+
+       /* Disable Rx and flush all Rx frames before enabling RSS to avoid Rx
+        * unit hang.
+        *
+        * Description:
+        * If there are any Rx frames queued up or otherwise present in the HW
+        * before RSS is enabled, and then we enable RSS, the HW Rx unit will
+        * hang.  To work around this issue, we have to disable receives and
+        * flush out all Rx frames before we enable RSS. To do so, we modify we
+        * redirect all Rx traffic to manageability and then reset the HW.
+        * This flushes away Rx frames, and (since the redirections to
+        * manageability persists across resets) keeps new ones from coming in
+        * while we work.  Then, we clear the Address Valid AV bit for all MAC
+        * addresses and undo the re-direction to manageability.
+        * Now, frames are coming in again, but the MAC won't accept them, so
+        * far so good.  We now proceed to initialize RSS (if necessary) and
+        * configure the Rx unit.  Last, we re-enable the AV bits and continue
+        * on our merry way.
+        */
+       switch (hw->mac_type) {
+       default:
+               /* Indicate to hardware the Address is Valid. */
+               rar_high |= E1000_RAH_AV;
+               break;
+       }
+
+       E1000_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
+       E1000_WRITE_FLUSH();
+       E1000_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
+       E1000_WRITE_FLUSH();
+}
+
+/**
+ * e1000_write_vfta - Writes a value to the specified offset in the VLAN filter table.
+ * @hw: Struct containing variables accessed by shared code
+ * @offset: Offset in VLAN filer table to write
+ * @value: Value to write into VLAN filter table
+ */
+void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
+{
+       u32 temp;
+
+       if ((hw->mac_type == e1000_82544) && ((offset & 0x1) == 1)) {
+               temp = E1000_READ_REG_ARRAY(hw, VFTA, (offset - 1));
+               E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);
+               E1000_WRITE_FLUSH();
+               E1000_WRITE_REG_ARRAY(hw, VFTA, (offset - 1), temp);
+               E1000_WRITE_FLUSH();
+       } else {
+               E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);
+               E1000_WRITE_FLUSH();
+       }
+}
+
+/**
+ * e1000_clear_vfta - Clears the VLAN filer table
+ * @hw: Struct containing variables accessed by shared code
+ */
+static void e1000_clear_vfta(struct e1000_hw *hw)
+{
+       u32 offset;
+       u32 vfta_value = 0;
+       u32 vfta_offset = 0;
+       u32 vfta_bit_in_reg = 0;
+
+       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, VFTA, offset, vfta_value);
+               E1000_WRITE_FLUSH();
+       }
+}
+
+static s32 e1000_id_led_init(struct e1000_hw *hw)
+{
+       u32 ledctl;
+       const u32 ledctl_mask = 0x000000FF;
+       const u32 ledctl_on = E1000_LEDCTL_MODE_LED_ON;
+       const u32 ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
+       u16 eeprom_data, i, temp;
+       const u16 led_mask = 0x0F;
+
+       e_dbg("e1000_id_led_init");
+
+       if (hw->mac_type < e1000_82540) {
+               /* Nothing to do */
+               return E1000_SUCCESS;
+       }
+
+       ledctl = er32(LEDCTL);
+       hw->ledctl_default = ledctl;
+       hw->ledctl_mode1 = hw->ledctl_default;
+       hw->ledctl_mode2 = hw->ledctl_default;
+
+       if (e1000_read_eeprom(hw, EEPROM_ID_LED_SETTINGS, 1, &eeprom_data) < 0) {
+               e_dbg("EEPROM Read Error\n");
+               return -E1000_ERR_EEPROM;
+       }
+
+       if ((eeprom_data == ID_LED_RESERVED_0000) ||
+           (eeprom_data == ID_LED_RESERVED_FFFF)) {
+               eeprom_data = ID_LED_DEFAULT;
+       }
+
+       for (i = 0; i < 4; i++) {
+               temp = (eeprom_data >> (i << 2)) & led_mask;
+               switch (temp) {
+               case ID_LED_ON1_DEF2:
+               case ID_LED_ON1_ON2:
+               case ID_LED_ON1_OFF2:
+                       hw->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
+                       hw->ledctl_mode1 |= ledctl_on << (i << 3);
+                       break;
+               case ID_LED_OFF1_DEF2:
+               case ID_LED_OFF1_ON2:
+               case ID_LED_OFF1_OFF2:
+                       hw->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
+                       hw->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:
+                       hw->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
+                       hw->ledctl_mode2 |= ledctl_on << (i << 3);
+                       break;
+               case ID_LED_DEF1_OFF2:
+               case ID_LED_ON1_OFF2:
+               case ID_LED_OFF1_OFF2:
+                       hw->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
+                       hw->ledctl_mode2 |= ledctl_off << (i << 3);
+                       break;
+               default:
+                       /* Do nothing */
+                       break;
+               }
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_setup_led
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Prepares SW controlable LED for use and saves the current state of the LED.
+ */
+s32 e1000_setup_led(struct e1000_hw *hw)
+{
+       u32 ledctl;
+       s32 ret_val = E1000_SUCCESS;
+
+       e_dbg("e1000_setup_led");
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+       case e1000_82544:
+               /* No setup necessary */
+               break;
+       case e1000_82541:
+       case e1000_82547:
+       case e1000_82541_rev_2:
+       case e1000_82547_rev_2:
+               /* Turn off PHY Smart Power Down (if enabled) */
+               ret_val = e1000_read_phy_reg(hw, IGP01E1000_GMII_FIFO,
+                                            &hw->phy_spd_default);
+               if (ret_val)
+                       return ret_val;
+               ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
+                                             (u16) (hw->phy_spd_default &
+                                                    ~IGP01E1000_GMII_SPD));
+               if (ret_val)
+                       return ret_val;
+               /* Fall Through */
+       default:
+               if (hw->media_type == e1000_media_type_fiber) {
+                       ledctl = er32(LEDCTL);
+                       /* Save current LEDCTL settings */
+                       hw->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->media_type == e1000_media_type_copper)
+                       ew32(LEDCTL, hw->ledctl_mode1);
+               break;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_cleanup_led - Restores the saved state of the SW controlable LED.
+ * @hw: Struct containing variables accessed by shared code
+ */
+s32 e1000_cleanup_led(struct e1000_hw *hw)
+{
+       s32 ret_val = E1000_SUCCESS;
+
+       e_dbg("e1000_cleanup_led");
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+       case e1000_82544:
+               /* No cleanup necessary */
+               break;
+       case e1000_82541:
+       case e1000_82547:
+       case e1000_82541_rev_2:
+       case e1000_82547_rev_2:
+               /* Turn on PHY Smart Power Down (if previously enabled) */
+               ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
+                                             hw->phy_spd_default);
+               if (ret_val)
+                       return ret_val;
+               /* Fall Through */
+       default:
+               /* Restore LEDCTL settings */
+               ew32(LEDCTL, hw->ledctl_default);
+               break;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_led_on - Turns on the software controllable LED
+ * @hw: Struct containing variables accessed by shared code
+ */
+s32 e1000_led_on(struct e1000_hw *hw)
+{
+       u32 ctrl = er32(CTRL);
+
+       e_dbg("e1000_led_on");
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+               /* Set SW Defineable Pin 0 to turn on the LED */
+               ctrl |= E1000_CTRL_SWDPIN0;
+               ctrl |= E1000_CTRL_SWDPIO0;
+               break;
+       case e1000_82544:
+               if (hw->media_type == e1000_media_type_fiber) {
+                       /* Set SW Defineable Pin 0 to turn on the LED */
+                       ctrl |= E1000_CTRL_SWDPIN0;
+                       ctrl |= E1000_CTRL_SWDPIO0;
+               } else {
+                       /* Clear SW Defineable Pin 0 to turn on the LED */
+                       ctrl &= ~E1000_CTRL_SWDPIN0;
+                       ctrl |= E1000_CTRL_SWDPIO0;
+               }
+               break;
+       default:
+               if (hw->media_type == e1000_media_type_fiber) {
+                       /* Clear SW Defineable Pin 0 to turn on the LED */
+                       ctrl &= ~E1000_CTRL_SWDPIN0;
+                       ctrl |= E1000_CTRL_SWDPIO0;
+               } else if (hw->media_type == e1000_media_type_copper) {
+                       ew32(LEDCTL, hw->ledctl_mode2);
+                       return E1000_SUCCESS;
+               }
+               break;
+       }
+
+       ew32(CTRL, ctrl);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_led_off - Turns off the software controllable LED
+ * @hw: Struct containing variables accessed by shared code
+ */
+s32 e1000_led_off(struct e1000_hw *hw)
+{
+       u32 ctrl = er32(CTRL);
+
+       e_dbg("e1000_led_off");
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+               /* Clear SW Defineable Pin 0 to turn off the LED */
+               ctrl &= ~E1000_CTRL_SWDPIN0;
+               ctrl |= E1000_CTRL_SWDPIO0;
+               break;
+       case e1000_82544:
+               if (hw->media_type == e1000_media_type_fiber) {
+                       /* Clear SW Defineable Pin 0 to turn off the LED */
+                       ctrl &= ~E1000_CTRL_SWDPIN0;
+                       ctrl |= E1000_CTRL_SWDPIO0;
+               } else {
+                       /* Set SW Defineable Pin 0 to turn off the LED */
+                       ctrl |= E1000_CTRL_SWDPIN0;
+                       ctrl |= E1000_CTRL_SWDPIO0;
+               }
+               break;
+       default:
+               if (hw->media_type == e1000_media_type_fiber) {
+                       /* Set SW Defineable Pin 0 to turn off the LED */
+                       ctrl |= E1000_CTRL_SWDPIN0;
+                       ctrl |= E1000_CTRL_SWDPIO0;
+               } else if (hw->media_type == e1000_media_type_copper) {
+                       ew32(LEDCTL, hw->ledctl_mode1);
+                       return E1000_SUCCESS;
+               }
+               break;
+       }
+
+       ew32(CTRL, ctrl);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_clear_hw_cntrs - Clears all hardware statistics counters.
+ * @hw: Struct containing variables accessed by shared code
+ */
+static void e1000_clear_hw_cntrs(struct e1000_hw *hw)
+{
+       volatile u32 temp;
+
+       temp = er32(CRCERRS);
+       temp = er32(SYMERRS);
+       temp = er32(MPC);
+       temp = er32(SCC);
+       temp = er32(ECOL);
+       temp = er32(MCC);
+       temp = er32(LATECOL);
+       temp = er32(COLC);
+       temp = er32(DC);
+       temp = er32(SEC);
+       temp = er32(RLEC);
+       temp = er32(XONRXC);
+       temp = er32(XONTXC);
+       temp = er32(XOFFRXC);
+       temp = er32(XOFFTXC);
+       temp = er32(FCRUC);
+
+       temp = er32(PRC64);
+       temp = er32(PRC127);
+       temp = er32(PRC255);
+       temp = er32(PRC511);
+       temp = er32(PRC1023);
+       temp = er32(PRC1522);
+
+       temp = er32(GPRC);
+       temp = er32(BPRC);
+       temp = er32(MPRC);
+       temp = er32(GPTC);
+       temp = er32(GORCL);
+       temp = er32(GORCH);
+       temp = er32(GOTCL);
+       temp = er32(GOTCH);
+       temp = er32(RNBC);
+       temp = er32(RUC);
+       temp = er32(RFC);
+       temp = er32(ROC);
+       temp = er32(RJC);
+       temp = er32(TORL);
+       temp = er32(TORH);
+       temp = er32(TOTL);
+       temp = er32(TOTH);
+       temp = er32(TPR);
+       temp = er32(TPT);
+
+       temp = er32(PTC64);
+       temp = er32(PTC127);
+       temp = er32(PTC255);
+       temp = er32(PTC511);
+       temp = er32(PTC1023);
+       temp = er32(PTC1522);
+
+       temp = er32(MPTC);
+       temp = er32(BPTC);
+
+       if (hw->mac_type < e1000_82543)
+               return;
+
+       temp = er32(ALGNERRC);
+       temp = er32(RXERRC);
+       temp = er32(TNCRS);
+       temp = er32(CEXTERR);
+       temp = er32(TSCTC);
+       temp = er32(TSCTFC);
+
+       if (hw->mac_type <= e1000_82544)
+               return;
+
+       temp = er32(MGTPRC);
+       temp = er32(MGTPDC);
+       temp = er32(MGTPTC);
+}
+
+/**
+ * e1000_reset_adaptive - Resets Adaptive IFS to its default state.
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Call this after e1000_init_hw. You may override the IFS defaults by setting
+ * hw->ifs_params_forced to true. However, you must initialize hw->
+ * current_ifs_val, ifs_min_val, ifs_max_val, ifs_step_size, and ifs_ratio
+ * before calling this function.
+ */
+void e1000_reset_adaptive(struct e1000_hw *hw)
+{
+       e_dbg("e1000_reset_adaptive");
+
+       if (hw->adaptive_ifs) {
+               if (!hw->ifs_params_forced) {
+                       hw->current_ifs_val = 0;
+                       hw->ifs_min_val = IFS_MIN;
+                       hw->ifs_max_val = IFS_MAX;
+                       hw->ifs_step_size = IFS_STEP;
+                       hw->ifs_ratio = IFS_RATIO;
+               }
+               hw->in_ifs_mode = false;
+               ew32(AIT, 0);
+       } else {
+               e_dbg("Not in Adaptive IFS mode!\n");
+       }
+}
+
+/**
+ * e1000_update_adaptive - update adaptive IFS
+ * @hw: Struct containing variables accessed by shared code
+ * @tx_packets: Number of transmits since last callback
+ * @total_collisions: Number of collisions since last callback
+ *
+ * Called during the callback/watchdog routine to update IFS value based on
+ * the ratio of transmits to collisions.
+ */
+void e1000_update_adaptive(struct e1000_hw *hw)
+{
+       e_dbg("e1000_update_adaptive");
+
+       if (hw->adaptive_ifs) {
+               if ((hw->collision_delta *hw->ifs_ratio) > hw->tx_packet_delta) {
+                       if (hw->tx_packet_delta > MIN_NUM_XMITS) {
+                               hw->in_ifs_mode = true;
+                               if (hw->current_ifs_val < hw->ifs_max_val) {
+                                       if (hw->current_ifs_val == 0)
+                                               hw->current_ifs_val =
+                                                   hw->ifs_min_val;
+                                       else
+                                               hw->current_ifs_val +=
+                                                   hw->ifs_step_size;
+                                       ew32(AIT, hw->current_ifs_val);
+                               }
+                       }
+               } else {
+                       if (hw->in_ifs_mode
+                           && (hw->tx_packet_delta <= MIN_NUM_XMITS)) {
+                               hw->current_ifs_val = 0;
+                               hw->in_ifs_mode = false;
+                               ew32(AIT, 0);
+                       }
+               }
+       } else {
+               e_dbg("Not in Adaptive IFS mode!\n");
+       }
+}
+
+/**
+ * e1000_tbi_adjust_stats
+ * @hw: Struct containing variables accessed by shared code
+ * @frame_len: The length of the frame in question
+ * @mac_addr: The Ethernet destination address of the frame in question
+ *
+ * Adjusts the statistic counters when a frame is accepted by TBI_ACCEPT
+ */
+void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats,
+                           u32 frame_len, u8 *mac_addr)
+{
+       u64 carry_bit;
+
+       /* 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             */
+       carry_bit = 0x80000000 & stats->gorcl;
+       stats->gorcl += frame_len;
+       /* If the high bit of Gorcl (the low 32 bits of the Good Octets
+        * Received Count) was one before the addition,
+        * AND it is zero after, then we lost the carry out,
+        * need to add one to Gorch (Good Octets Received Count High).
+        * This could be simplified if all environments supported
+        * 64-bit integers.
+        */
+       if (carry_bit && ((stats->gorcl & 0x80000000) == 0))
+               stats->gorch++;
+       /* 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] == (u8) 0xff) && (mac_addr[1] == (u8) 0xff))
+               /* Broadcast packet */
+               stats->bprc++;
+       else if (*mac_addr & 0x01)
+               /* Multicast packet */
+               stats->mprc++;
+
+       if (frame_len == hw->max_frame_size) {
+               /* In this case, the hardware has overcounted the number of
+                * oversize frames.
+                */
+               if (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++;
+       }
+}
+
+/**
+ * e1000_get_bus_info
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Gets the current PCI bus type, speed, and width of the hardware
+ */
+void e1000_get_bus_info(struct e1000_hw *hw)
+{
+       u32 status;
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+               hw->bus_type = e1000_bus_type_pci;
+               hw->bus_speed = e1000_bus_speed_unknown;
+               hw->bus_width = e1000_bus_width_unknown;
+               break;
+       default:
+               status = er32(STATUS);
+               hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ?
+                   e1000_bus_type_pcix : e1000_bus_type_pci;
+
+               if (hw->device_id == E1000_DEV_ID_82546EB_QUAD_COPPER) {
+                       hw->bus_speed = (hw->bus_type == e1000_bus_type_pci) ?
+                           e1000_bus_speed_66 : e1000_bus_speed_120;
+               } else if (hw->bus_type == e1000_bus_type_pci) {
+                       hw->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:
+                               hw->bus_speed = e1000_bus_speed_66;
+                               break;
+                       case E1000_STATUS_PCIX_SPEED_100:
+                               hw->bus_speed = e1000_bus_speed_100;
+                               break;
+                       case E1000_STATUS_PCIX_SPEED_133:
+                               hw->bus_speed = e1000_bus_speed_133;
+                               break;
+                       default:
+                               hw->bus_speed = e1000_bus_speed_reserved;
+                               break;
+                       }
+               }
+               hw->bus_width = (status & E1000_STATUS_BUS64) ?
+                   e1000_bus_width_64 : e1000_bus_width_32;
+               break;
+       }
+}
+
+/**
+ * e1000_write_reg_io
+ * @hw: Struct containing variables accessed by shared code
+ * @offset: offset to write to
+ * @value: value to write
+ *
+ * Writes a value to one of the devices registers using port I/O (as opposed to
+ * memory mapped I/O). Only 82544 and newer devices support port I/O.
+ */
+static void e1000_write_reg_io(struct e1000_hw *hw, u32 offset, u32 value)
+{
+       unsigned long io_addr = hw->io_base;
+       unsigned long io_data = hw->io_base + 4;
+
+       e1000_io_write(hw, io_addr, offset);
+       e1000_io_write(hw, io_data, value);
+}
+
+/**
+ * e1000_get_cable_length - Estimates the cable length.
+ * @hw: Struct containing variables accessed by shared code
+ * @min_length: The estimated minimum length
+ * @max_length: The estimated maximum length
+ *
+ * returns: - E1000_ERR_XXX
+ *            E1000_SUCCESS
+ *
+ * This function always returns a ranged length (minimum & maximum).
+ * So for M88 phy's, this function interprets the one value returned from the
+ * register to the minimum and maximum range.
+ * For IGP phy's, the function calculates the range by the AGC registers.
+ */
+static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
+                                 u16 *max_length)
+{
+       s32 ret_val;
+       u16 agc_value = 0;
+       u16 i, phy_data;
+       u16 cable_length;
+
+       e_dbg("e1000_get_cable_length");
+
+       *min_length = *max_length = 0;
+
+       /* Use old method for Phy older than IGP */
+       if (hw->phy_type == e1000_phy_m88) {
+
+               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
+                                            &phy_data);
+               if (ret_val)
+                       return ret_val;
+               cable_length = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
+                   M88E1000_PSSR_CABLE_LENGTH_SHIFT;
+
+               /* Convert the enum value to ranged values */
+               switch (cable_length) {
+               case e1000_cable_length_50:
+                       *min_length = 0;
+                       *max_length = e1000_igp_cable_length_50;
+                       break;
+               case e1000_cable_length_50_80:
+                       *min_length = e1000_igp_cable_length_50;
+                       *max_length = e1000_igp_cable_length_80;
+                       break;
+               case e1000_cable_length_80_110:
+                       *min_length = e1000_igp_cable_length_80;
+                       *max_length = e1000_igp_cable_length_110;
+                       break;
+               case e1000_cable_length_110_140:
+                       *min_length = e1000_igp_cable_length_110;
+                       *max_length = e1000_igp_cable_length_140;
+                       break;
+               case e1000_cable_length_140:
+                       *min_length = e1000_igp_cable_length_140;
+                       *max_length = e1000_igp_cable_length_170;
+                       break;
+               default:
+                       return -E1000_ERR_PHY;
+                       break;
+               }
+       } else if (hw->phy_type == e1000_phy_igp) {     /* For IGP PHY */
+               u16 cur_agc_value;
+               u16 min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
+               static const u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] = {
+                      IGP01E1000_PHY_AGC_A,
+                      IGP01E1000_PHY_AGC_B,
+                      IGP01E1000_PHY_AGC_C,
+                      IGP01E1000_PHY_AGC_D
+               };
+               /* Read the AGC registers for all channels */
+               for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
+
+                       ret_val =
+                           e1000_read_phy_reg(hw, agc_reg_array[i], &phy_data);
+                       if (ret_val)
+                               return ret_val;
+
+                       cur_agc_value = phy_data >> IGP01E1000_AGC_LENGTH_SHIFT;
+
+                       /* Value bound check. */
+                       if ((cur_agc_value >=
+                            IGP01E1000_AGC_LENGTH_TABLE_SIZE - 1)
+                           || (cur_agc_value == 0))
+                               return -E1000_ERR_PHY;
+
+                       agc_value += cur_agc_value;
+
+                       /* Update minimal 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 * e1000_igp_cable_length_50) {
+                       agc_value -= min_agc_value;
+
+                       /* Get the average length of the remaining 3 channels */
+                       agc_value /= (IGP01E1000_PHY_CHANNEL_NUM - 1);
+               } else {
+                       /* Get the average length of all the 4 channels. */
+                       agc_value /= IGP01E1000_PHY_CHANNEL_NUM;
+               }
+
+               /* Set the range of the calculated length. */
+               *min_length = ((e1000_igp_cable_length_table[agc_value] -
+                               IGP01E1000_AGC_RANGE) > 0) ?
+                   (e1000_igp_cable_length_table[agc_value] -
+                    IGP01E1000_AGC_RANGE) : 0;
+               *max_length = e1000_igp_cable_length_table[agc_value] +
+                   IGP01E1000_AGC_RANGE;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_check_polarity - Check the cable polarity
+ * @hw: Struct containing variables accessed by shared code
+ * @polarity: output parameter : 0 - Polarity is not reversed
+ *                               1 - Polarity is reversed.
+ *
+ * returns: - E1000_ERR_XXX
+ *            E1000_SUCCESS
+ *
+ * For phy's older than IGP, this function simply reads the polarity bit in the
+ * Phy Status register.  For IGP phy's, this bit is valid only if link speed is
+ * 10 Mbps.  If the link speed is 100 Mbps there is no polarity so this bit will
+ * return 0.  If the link speed is 1000 Mbps the polarity status is in the
+ * IGP01E1000_PHY_PCS_INIT_REG.
+ */
+static s32 e1000_check_polarity(struct e1000_hw *hw,
+                               e1000_rev_polarity *polarity)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_check_polarity");
+
+       if (hw->phy_type == e1000_phy_m88) {
+               /* return the Polarity bit in the Status register. */
+               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
+                                            &phy_data);
+               if (ret_val)
+                       return ret_val;
+               *polarity = ((phy_data & M88E1000_PSSR_REV_POLARITY) >>
+                            M88E1000_PSSR_REV_POLARITY_SHIFT) ?
+                   e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
+
+       } else if (hw->phy_type == e1000_phy_igp) {
+               /* Read the Status register to check the speed */
+               ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS,
+                                            &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               /* If speed is 1000 Mbps, must read the IGP01E1000_PHY_PCS_INIT_REG to
+                * find the polarity status */
+               if ((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
+                   IGP01E1000_PSSR_SPEED_1000MBPS) {
+
+                       /* Read the GIG initialization PCS register (0x00B4) */
+                       ret_val =
+                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG,
+                                              &phy_data);
+                       if (ret_val)
+                               return ret_val;
+
+                       /* Check the polarity bits */
+                       *polarity = (phy_data & IGP01E1000_PHY_POLARITY_MASK) ?
+                           e1000_rev_polarity_reversed :
+                           e1000_rev_polarity_normal;
+               } else {
+                       /* For 10 Mbps, read the polarity bit in the status register. (for
+                        * 100 Mbps this bit is always 0) */
+                       *polarity =
+                           (phy_data & IGP01E1000_PSSR_POLARITY_REVERSED) ?
+                           e1000_rev_polarity_reversed :
+                           e1000_rev_polarity_normal;
+               }
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_check_downshift - Check if Downshift occurred
+ * @hw: Struct containing variables accessed by shared code
+ * @downshift: output parameter : 0 - No Downshift occurred.
+ *                                1 - Downshift occurred.
+ *
+ * returns: - E1000_ERR_XXX
+ *            E1000_SUCCESS
+ *
+ * For phy's older than IGP, this function reads the Downshift bit in the Phy
+ * Specific Status register.  For IGP phy's, it reads the Downgrade bit in the
+ * Link Health register.  In IGP this bit is latched high, so the driver must
+ * read it immediately after link is established.
+ */
+static s32 e1000_check_downshift(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       e_dbg("e1000_check_downshift");
+
+       if (hw->phy_type == e1000_phy_igp) {
+               ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_LINK_HEALTH,
+                                            &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               hw->speed_downgraded =
+                   (phy_data & IGP01E1000_PLHR_SS_DOWNGRADE) ? 1 : 0;
+       } else if (hw->phy_type == e1000_phy_m88) {
+               ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
+                                            &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               hw->speed_downgraded = (phy_data & M88E1000_PSSR_DOWNSHIFT) >>
+                   M88E1000_PSSR_DOWNSHIFT_SHIFT;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_config_dsp_after_link_change
+ * @hw: Struct containing variables accessed by shared code
+ * @link_up: was link up at the time this was called
+ *
+ * returns: - E1000_ERR_PHY if fail to read/write the PHY
+ *            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(struct e1000_hw *hw, bool link_up)
+{
+       s32 ret_val;
+       u16 phy_data, phy_saved_data, speed, duplex, i;
+       static const 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
+       };
+       u16 min_length, max_length;
+
+       e_dbg("e1000_config_dsp_after_link_change");
+
+       if (hw->phy_type != e1000_phy_igp)
+               return E1000_SUCCESS;
+
+       if (link_up) {
+               ret_val = e1000_get_speed_and_duplex(hw, &speed, &duplex);
+               if (ret_val) {
+                       e_dbg("Error getting link speed and duplex\n");
+                       return ret_val;
+               }
+
+               if (speed == SPEED_1000) {
+
+                       ret_val =
+                           e1000_get_cable_length(hw, &min_length,
+                                                  &max_length);
+                       if (ret_val)
+                               return ret_val;
+
+                       if ((hw->dsp_config_state == e1000_dsp_config_enabled)
+                           && min_length >= e1000_igp_cable_length_50) {
+
+                               for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
+                                       ret_val =
+                                           e1000_read_phy_reg(hw,
+                                                              dsp_reg_array[i],
+                                                              &phy_data);
+                                       if (ret_val)
+                                               return ret_val;
+
+                                       phy_data &=
+                                           ~IGP01E1000_PHY_EDAC_MU_INDEX;
+
+                                       ret_val =
+                                           e1000_write_phy_reg(hw,
+                                                               dsp_reg_array
+                                                               [i], phy_data);
+                                       if (ret_val)
+                                               return ret_val;
+                               }
+                               hw->dsp_config_state =
+                                   e1000_dsp_config_activated;
+                       }
+
+                       if ((hw->ffe_config_state == e1000_ffe_config_enabled)
+                           && (min_length < e1000_igp_cable_length_50)) {
+
+                               u16 ffe_idle_err_timeout =
+                                   FFE_IDLE_ERR_COUNT_TIMEOUT_20;
+                               u32 idle_errs = 0;
+
+                               /* clear previous idle error counts */
+                               ret_val =
+                                   e1000_read_phy_reg(hw, PHY_1000T_STATUS,
+                                                      &phy_data);
+                               if (ret_val)
+                                       return ret_val;
+
+                               for (i = 0; i < ffe_idle_err_timeout; i++) {
+                                       udelay(1000);
+                                       ret_val =
+                                           e1000_read_phy_reg(hw,
+                                                              PHY_1000T_STATUS,
+                                                              &phy_data);
+                                       if (ret_val)
+                                               return ret_val;
+
+                                       idle_errs +=
+                                           (phy_data &
+                                            SR_1000T_IDLE_ERROR_CNT);
+                                       if (idle_errs >
+                                           SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT)
+                                       {
+                                               hw->ffe_config_state =
+                                                   e1000_ffe_config_active;
+
+                                               ret_val =
+                                                   e1000_write_phy_reg(hw,
+                                                                       IGP01E1000_PHY_DSP_FFE,
+                                                                       IGP01E1000_PHY_DSP_FFE_CM_CP);
+                                               if (ret_val)
+                                                       return ret_val;
+                                               break;
+                                       }
+
+                                       if (idle_errs)
+                                               ffe_idle_err_timeout =
+                                                   FFE_IDLE_ERR_COUNT_TIMEOUT_100;
+                               }
+                       }
+               }
+       } else {
+               if (hw->dsp_config_state == e1000_dsp_config_activated) {
+                       /* Save off the current value of register 0x2F5B to be restored at
+                        * the end of the routines. */
+                       ret_val =
+                           e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
+
+                       if (ret_val)
+                               return ret_val;
+
+                       /* Disable the PHY transmitter */
+                       ret_val = e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
+
+                       if (ret_val)
+                               return ret_val;
+
+                       mdelay(20);
+
+                       ret_val = e1000_write_phy_reg(hw, 0x0000,
+                                                     IGP01E1000_IEEE_FORCE_GIGA);
+                       if (ret_val)
+                               return ret_val;
+                       for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
+                               ret_val =
+                                   e1000_read_phy_reg(hw, dsp_reg_array[i],
+                                                      &phy_data);
+                               if (ret_val)
+                                       return ret_val;
+
+                               phy_data &= ~IGP01E1000_PHY_EDAC_MU_INDEX;
+                               phy_data |= IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS;
+
+                               ret_val =
+                                   e1000_write_phy_reg(hw, dsp_reg_array[i],
+                                                       phy_data);
+                               if (ret_val)
+                                       return ret_val;
+                       }
+
+                       ret_val = e1000_write_phy_reg(hw, 0x0000,
+                                                     IGP01E1000_IEEE_RESTART_AUTONEG);
+                       if (ret_val)
+                               return ret_val;
+
+                       mdelay(20);
+
+                       /* Now enable the transmitter */
+                       ret_val =
+                           e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
+
+                       if (ret_val)
+                               return ret_val;
+
+                       hw->dsp_config_state = e1000_dsp_config_enabled;
+               }
+
+               if (hw->ffe_config_state == e1000_ffe_config_active) {
+                       /* Save off the current value of register 0x2F5B to be restored at
+                        * the end of the routines. */
+                       ret_val =
+                           e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
+
+                       if (ret_val)
+                               return ret_val;
+
+                       /* Disable the PHY transmitter */
+                       ret_val = e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
+
+                       if (ret_val)
+                               return ret_val;
+
+                       mdelay(20);
+
+                       ret_val = e1000_write_phy_reg(hw, 0x0000,
+                                                     IGP01E1000_IEEE_FORCE_GIGA);
+                       if (ret_val)
+                               return ret_val;
+                       ret_val =
+                           e1000_write_phy_reg(hw, IGP01E1000_PHY_DSP_FFE,
+                                               IGP01E1000_PHY_DSP_FFE_DEFAULT);
+                       if (ret_val)
+                               return ret_val;
+
+                       ret_val = e1000_write_phy_reg(hw, 0x0000,
+                                                     IGP01E1000_IEEE_RESTART_AUTONEG);
+                       if (ret_val)
+                               return ret_val;
+
+                       mdelay(20);
+
+                       /* Now enable the transmitter */
+                       ret_val =
+                           e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
+
+                       if (ret_val)
+                               return ret_val;
+
+                       hw->ffe_config_state = e1000_ffe_config_enabled;
+               }
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_set_phy_mode - Set PHY to class A mode
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * 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(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 eeprom_data;
+
+       e_dbg("e1000_set_phy_mode");
+
+       if ((hw->mac_type == e1000_82545_rev_3) &&
+           (hw->media_type == e1000_media_type_copper)) {
+               ret_val =
+                   e1000_read_eeprom(hw, EEPROM_PHY_CLASS_WORD, 1,
+                                     &eeprom_data);
+               if (ret_val) {
+                       return ret_val;
+               }
+
+               if ((eeprom_data != EEPROM_RESERVED_WORD) &&
+                   (eeprom_data & EEPROM_PHY_CLASS_A)) {
+                       ret_val =
+                           e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT,
+                                               0x000B);
+                       if (ret_val)
+                               return ret_val;
+                       ret_val =
+                           e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL,
+                                               0x8104);
+                       if (ret_val)
+                               return ret_val;
+
+                       hw->phy_reset_disable = false;
+               }
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_set_d3_lplu_state - set d3 link power state
+ * @hw: Struct containing variables accessed by shared code
+ * @active: true to enable lplu false to disable lplu.
+ *
+ * This function sets the lplu state according to the active flag.  When
+ * activating lplu this function also disables smart speed and vise 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.
+ *
+ * returns: - E1000_ERR_PHY if fail to read/write the PHY
+ *            E1000_SUCCESS at any other case.
+ */
+static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active)
+{
+       s32 ret_val;
+       u16 phy_data;
+       e_dbg("e1000_set_d3_lplu_state");
+
+       if (hw->phy_type != e1000_phy_igp)
+               return E1000_SUCCESS;
+
+       /* During driver activity LPLU should not be used or it will attain link
+        * from the lowest speeds starting from 10Mbps. The capability is used for
+        * Dx transitions and states */
+       if (hw->mac_type == e1000_82541_rev_2
+           || hw->mac_type == e1000_82547_rev_2) {
+               ret_val =
+                   e1000_read_phy_reg(hw, IGP01E1000_GMII_FIFO, &phy_data);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       if (!active) {
+               if (hw->mac_type == e1000_82541_rev_2 ||
+                   hw->mac_type == e1000_82547_rev_2) {
+                       phy_data &= ~IGP01E1000_GMII_FLEX_SPD;
+                       ret_val =
+                           e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
+                                               phy_data);
+                       if (ret_val)
+                               return ret_val;
+               }
+
+               /* 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 (hw->smart_speed == e1000_smart_speed_on) {
+                       ret_val =
+                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                              &phy_data);
+                       if (ret_val)
+                               return ret_val;
+
+                       phy_data |= IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val =
+                           e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                               phy_data);
+                       if (ret_val)
+                               return ret_val;
+               } else if (hw->smart_speed == e1000_smart_speed_off) {
+                       ret_val =
+                           e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                              &phy_data);
+                       if (ret_val)
+                               return ret_val;
+
+                       phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val =
+                           e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                               phy_data);
+                       if (ret_val)
+                               return ret_val;
+               }
+       } else if ((hw->autoneg_advertised == AUTONEG_ADVERTISE_SPEED_DEFAULT)
+                  || (hw->autoneg_advertised == AUTONEG_ADVERTISE_10_ALL)
+                  || (hw->autoneg_advertised ==
+                      AUTONEG_ADVERTISE_10_100_ALL)) {
+
+               if (hw->mac_type == e1000_82541_rev_2 ||
+                   hw->mac_type == e1000_82547_rev_2) {
+                       phy_data |= IGP01E1000_GMII_FLEX_SPD;
+                       ret_val =
+                           e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
+                                               phy_data);
+                       if (ret_val)
+                               return ret_val;
+               }
+
+               /* When LPLU is enabled we should disable SmartSpeed */
+               ret_val =
+                   e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                      &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+               ret_val =
+                   e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                       phy_data);
+               if (ret_val)
+                       return ret_val;
+
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_set_vco_speed
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Change VCO speed register to improve Bit Error Rate performance of SERDES.
+ */
+static s32 e1000_set_vco_speed(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 default_page = 0;
+       u16 phy_data;
+
+       e_dbg("e1000_set_vco_speed");
+
+       switch (hw->mac_type) {
+       case e1000_82545_rev_3:
+       case e1000_82546_rev_3:
+               break;
+       default:
+               return E1000_SUCCESS;
+       }
+
+       /* Set PHY register 30, page 5, bit 8 to 0 */
+
+       ret_val =
+           e1000_read_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, &default_page);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0005);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy_data &= ~M88E1000_PHY_VCO_REG_BIT8;
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /* Set PHY register 30, page 4, bit 11 to 1 */
+
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0004);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy_data |= M88E1000_PHY_VCO_REG_BIT11;
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       ret_val =
+           e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, default_page);
+       if (ret_val)
+               return ret_val;
+
+       return E1000_SUCCESS;
+}
+
+
+/**
+ * e1000_enable_mng_pass_thru - check for bmc pass through
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Verifies the hardware needs to allow ARPs to be processed by the host
+ * returns: - true/false
+ */
+u32 e1000_enable_mng_pass_thru(struct e1000_hw *hw)
+{
+       u32 manc;
+
+       if (hw->asf_firmware_present) {
+               manc = er32(MANC);
+
+               if (!(manc & E1000_MANC_RCV_TCO_EN) ||
+                   !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
+                       return false;
+               if ((manc & E1000_MANC_SMBUS_EN) && !(manc & E1000_MANC_ASF_EN))
+                       return true;
+       }
+       return false;
+}
+
+static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 mii_status_reg;
+       u16 i;
+
+       /* Polarity reversal workaround for forced 10F/10H links. */
+
+       /* Disable the transmitter on the PHY */
+
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
+       if (ret_val)
+               return ret_val;
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFFF);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
+       if (ret_val)
+               return ret_val;
+
+       /* This loop will early-out if the NO link condition has been met. */
+       for (i = PHY_FORCE_TIME; i > 0; i--) {
+               /* Read the MII Status Register and wait for Link Status bit
+                * to be clear.
+                */
+
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+               if (ret_val)
+                       return ret_val;
+
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+               if (ret_val)
+                       return ret_val;
+
+               if ((mii_status_reg & ~MII_SR_LINK_STATUS) == 0)
+                       break;
+               mdelay(100);
+       }
+
+       /* Recommended delay time after link has been lost */
+       mdelay(1000);
+
+       /* Now we will re-enable th transmitter on the PHY */
+
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
+       if (ret_val)
+               return ret_val;
+       mdelay(50);
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFF0);
+       if (ret_val)
+               return ret_val;
+       mdelay(50);
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFF00);
+       if (ret_val)
+               return ret_val;
+       mdelay(50);
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0x0000);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
+       if (ret_val)
+               return ret_val;
+
+       /* This loop will early-out if the link condition has been met. */
+       for (i = PHY_FORCE_TIME; i > 0; i--) {
+               /* Read the MII Status Register and wait for Link Status bit
+                * to be set.
+                */
+
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+               if (ret_val)
+                       return ret_val;
+
+               ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
+               if (ret_val)
+                       return ret_val;
+
+               if (mii_status_reg & MII_SR_LINK_STATUS)
+                       break;
+               mdelay(100);
+       }
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_get_auto_rd_done
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Check for EEPROM Auto Read bit done.
+ * returns: - E1000_ERR_RESET if fail to reset MAC
+ *            E1000_SUCCESS at any other case.
+ */
+static s32 e1000_get_auto_rd_done(struct e1000_hw *hw)
+{
+       e_dbg("e1000_get_auto_rd_done");
+       msleep(5);
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_get_phy_cfg_done
+ * @hw: Struct containing variables accessed by shared code
+ *
+ * Checks if the PHY configuration is done
+ * returns: - E1000_ERR_RESET if fail to reset MAC
+ *            E1000_SUCCESS at any other case.
+ */
+static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
+{
+       e_dbg("e1000_get_phy_cfg_done");
+       mdelay(10);
+       return E1000_SUCCESS;
+}
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h
new file mode 100644 (file)
index 0000000..5c9a840
--- /dev/null
@@ -0,0 +1,3103 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+*******************************************************************************/
+
+/* e1000_hw.h
+ * Structures, enums, and macros for the MAC
+ */
+
+#ifndef _E1000_HW_H_
+#define _E1000_HW_H_
+
+#include "e1000_osdep.h"
+
+
+/* Forward declarations of structures used by the shared code */
+struct e1000_hw;
+struct e1000_hw_stats;
+
+/* Enumerated types specific to the e1000 hardware */
+/* Media Access Controllers */
+typedef enum {
+       e1000_undefined = 0,
+       e1000_82542_rev2_0,
+       e1000_82542_rev2_1,
+       e1000_82543,
+       e1000_82544,
+       e1000_82540,
+       e1000_82545,
+       e1000_82545_rev_3,
+       e1000_82546,
+       e1000_ce4100,
+       e1000_82546_rev_3,
+       e1000_82541,
+       e1000_82541_rev_2,
+       e1000_82547,
+       e1000_82547_rev_2,
+       e1000_num_macs
+} e1000_mac_type;
+
+typedef enum {
+       e1000_eeprom_uninitialized = 0,
+       e1000_eeprom_spi,
+       e1000_eeprom_microwire,
+       e1000_eeprom_flash,
+       e1000_eeprom_none,      /* No NVM support */
+       e1000_num_eeprom_types
+} e1000_eeprom_type;
+
+/* Media Types */
+typedef enum {
+       e1000_media_type_copper = 0,
+       e1000_media_type_fiber = 1,
+       e1000_media_type_internal_serdes = 2,
+       e1000_num_media_types
+} e1000_media_type;
+
+typedef enum {
+       e1000_10_half = 0,
+       e1000_10_full = 1,
+       e1000_100_half = 2,
+       e1000_100_full = 3
+} e1000_speed_duplex_type;
+
+/* Flow Control Settings */
+typedef enum {
+       E1000_FC_NONE = 0,
+       E1000_FC_RX_PAUSE = 1,
+       E1000_FC_TX_PAUSE = 2,
+       E1000_FC_FULL = 3,
+       E1000_FC_DEFAULT = 0xFF
+} e1000_fc_type;
+
+struct e1000_shadow_ram {
+       u16 eeprom_word;
+       bool modified;
+};
+
+/* PCI bus types */
+typedef enum {
+       e1000_bus_type_unknown = 0,
+       e1000_bus_type_pci,
+       e1000_bus_type_pcix,
+       e1000_bus_type_reserved
+} e1000_bus_type;
+
+/* PCI bus speeds */
+typedef enum {
+       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_reserved
+} e1000_bus_speed;
+
+/* PCI bus widths */
+typedef enum {
+       e1000_bus_width_unknown = 0,
+       e1000_bus_width_32,
+       e1000_bus_width_64,
+       e1000_bus_width_reserved
+} e1000_bus_width;
+
+/* PHY status info structure and supporting enums */
+typedef enum {
+       e1000_cable_length_50 = 0,
+       e1000_cable_length_50_80,
+       e1000_cable_length_80_110,
+       e1000_cable_length_110_140,
+       e1000_cable_length_140,
+       e1000_cable_length_undefined = 0xFF
+} e1000_cable_length;
+
+typedef enum {
+       e1000_gg_cable_length_60 = 0,
+       e1000_gg_cable_length_60_115 = 1,
+       e1000_gg_cable_length_115_150 = 2,
+       e1000_gg_cable_length_150 = 4
+} e1000_gg_cable_length;
+
+typedef enum {
+       e1000_igp_cable_length_10 = 10,
+       e1000_igp_cable_length_20 = 20,
+       e1000_igp_cable_length_30 = 30,
+       e1000_igp_cable_length_40 = 40,
+       e1000_igp_cable_length_50 = 50,
+       e1000_igp_cable_length_60 = 60,
+       e1000_igp_cable_length_70 = 70,
+       e1000_igp_cable_length_80 = 80,
+       e1000_igp_cable_length_90 = 90,
+       e1000_igp_cable_length_100 = 100,
+       e1000_igp_cable_length_110 = 110,
+       e1000_igp_cable_length_115 = 115,
+       e1000_igp_cable_length_120 = 120,
+       e1000_igp_cable_length_130 = 130,
+       e1000_igp_cable_length_140 = 140,
+       e1000_igp_cable_length_150 = 150,
+       e1000_igp_cable_length_160 = 160,
+       e1000_igp_cable_length_170 = 170,
+       e1000_igp_cable_length_180 = 180
+} e1000_igp_cable_length;
+
+typedef enum {
+       e1000_10bt_ext_dist_enable_normal = 0,
+       e1000_10bt_ext_dist_enable_lower,
+       e1000_10bt_ext_dist_enable_undefined = 0xFF
+} e1000_10bt_ext_dist_enable;
+
+typedef enum {
+       e1000_rev_polarity_normal = 0,
+       e1000_rev_polarity_reversed,
+       e1000_rev_polarity_undefined = 0xFF
+} e1000_rev_polarity;
+
+typedef enum {
+       e1000_downshift_normal = 0,
+       e1000_downshift_activated,
+       e1000_downshift_undefined = 0xFF
+} e1000_downshift;
+
+typedef enum {
+       e1000_smart_speed_default = 0,
+       e1000_smart_speed_on,
+       e1000_smart_speed_off
+} e1000_smart_speed;
+
+typedef enum {
+       e1000_polarity_reversal_enabled = 0,
+       e1000_polarity_reversal_disabled,
+       e1000_polarity_reversal_undefined = 0xFF
+} e1000_polarity_reversal;
+
+typedef enum {
+       e1000_auto_x_mode_manual_mdi = 0,
+       e1000_auto_x_mode_manual_mdix,
+       e1000_auto_x_mode_auto1,
+       e1000_auto_x_mode_auto2,
+       e1000_auto_x_mode_undefined = 0xFF
+} e1000_auto_x_mode;
+
+typedef enum {
+       e1000_1000t_rx_status_not_ok = 0,
+       e1000_1000t_rx_status_ok,
+       e1000_1000t_rx_status_undefined = 0xFF
+} e1000_1000t_rx_status;
+
+typedef enum {
+       e1000_phy_m88 = 0,
+       e1000_phy_igp,
+       e1000_phy_8211,
+       e1000_phy_8201,
+       e1000_phy_undefined = 0xFF
+} e1000_phy_type;
+
+typedef enum {
+       e1000_ms_hw_default = 0,
+       e1000_ms_force_master,
+       e1000_ms_force_slave,
+       e1000_ms_auto
+} e1000_ms_type;
+
+typedef enum {
+       e1000_ffe_config_enabled = 0,
+       e1000_ffe_config_active,
+       e1000_ffe_config_blocked
+} e1000_ffe_config;
+
+typedef enum {
+       e1000_dsp_config_disabled = 0,
+       e1000_dsp_config_enabled,
+       e1000_dsp_config_activated,
+       e1000_dsp_config_undefined = 0xFF
+} e1000_dsp_config;
+
+struct e1000_phy_info {
+       e1000_cable_length cable_length;
+       e1000_10bt_ext_dist_enable extended_10bt_distance;
+       e1000_rev_polarity cable_polarity;
+       e1000_downshift downshift;
+       e1000_polarity_reversal polarity_correction;
+       e1000_auto_x_mode mdix_mode;
+       e1000_1000t_rx_status local_rx;
+       e1000_1000t_rx_status remote_rx;
+};
+
+struct e1000_phy_stats {
+       u32 idle_errors;
+       u32 receive_errors;
+};
+
+struct e1000_eeprom_info {
+       e1000_eeprom_type type;
+       u16 word_size;
+       u16 opcode_bits;
+       u16 address_bits;
+       u16 delay_usec;
+       u16 page_size;
+};
+
+/* Flex ASF Information */
+#define E1000_HOST_IF_MAX_SIZE  2048
+
+typedef enum {
+       e1000_byte_align = 0,
+       e1000_word_align = 1,
+       e1000_dword_align = 2
+} e1000_align_type;
+
+/* Error Codes */
+#define E1000_SUCCESS      0
+#define E1000_ERR_EEPROM   1
+#define E1000_ERR_PHY      2
+#define E1000_ERR_CONFIG   3
+#define E1000_ERR_PARAM    4
+#define E1000_ERR_MAC_TYPE 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_BYTE_SWAP_WORD(_value) ((((_value) & 0x00ff) << 8) | \
+                                     (((_value) & 0xff00) >> 8))
+
+/* Function prototypes */
+/* Initialization */
+s32 e1000_reset_hw(struct e1000_hw *hw);
+s32 e1000_init_hw(struct e1000_hw *hw);
+s32 e1000_set_mac_type(struct e1000_hw *hw);
+void e1000_set_media_type(struct e1000_hw *hw);
+
+/* Link Configuration */
+s32 e1000_setup_link(struct e1000_hw *hw);
+s32 e1000_phy_setup_autoneg(struct e1000_hw *hw);
+void e1000_config_collision_dist(struct e1000_hw *hw);
+s32 e1000_check_for_link(struct e1000_hw *hw);
+s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 * speed, u16 * duplex);
+s32 e1000_force_mac_fc(struct e1000_hw *hw);
+
+/* PHY */
+s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 * phy_data);
+s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 data);
+s32 e1000_phy_hw_reset(struct e1000_hw *hw);
+s32 e1000_phy_reset(struct e1000_hw *hw);
+s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
+s32 e1000_validate_mdi_setting(struct e1000_hw *hw);
+
+/* EEPROM Functions */
+s32 e1000_init_eeprom_params(struct e1000_hw *hw);
+
+/* MNG HOST IF functions */
+u32 e1000_enable_mng_pass_thru(struct e1000_hw *hw);
+
+#define E1000_MNG_DHCP_TX_PAYLOAD_CMD   64
+#define E1000_HI_MAX_MNG_DATA_LENGTH    0x6F8  /* Host Interface data length */
+
+#define E1000_MNG_DHCP_COMMAND_TIMEOUT  10     /* Time in ms to process MNG command */
+#define E1000_MNG_DHCP_COOKIE_OFFSET    0x6F0  /* Cookie offset */
+#define E1000_MNG_DHCP_COOKIE_LENGTH    0x10   /* Cookie length */
+#define E1000_MNG_IAMT_MODE             0x3
+#define E1000_MNG_ICH_IAMT_MODE         0x2
+#define E1000_IAMT_SIGNATURE            0x544D4149     /* Intel(R) Active Management Technology signature */
+
+#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING_SUPPORT 0x1       /* DHCP parsing enabled */
+#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT    0x2       /* DHCP parsing enabled */
+#define E1000_VFTA_ENTRY_SHIFT                       0x5
+#define E1000_VFTA_ENTRY_MASK                        0x7F
+#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK              0x1F
+
+struct e1000_host_mng_command_header {
+       u8 command_id;
+       u8 checksum;
+       u16 reserved1;
+       u16 reserved2;
+       u16 command_length;
+};
+
+struct e1000_host_mng_command_info {
+       struct e1000_host_mng_command_header command_header;    /* Command Head/Command Result Head has 4 bytes */
+       u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];  /* Command data can length 0..0x658 */
+};
+#ifdef __BIG_ENDIAN
+struct e1000_host_mng_dhcp_cookie {
+       u32 signature;
+       u16 vlan_id;
+       u8 reserved0;
+       u8 status;
+       u32 reserved1;
+       u8 checksum;
+       u8 reserved3;
+       u16 reserved2;
+};
+#else
+struct e1000_host_mng_dhcp_cookie {
+       u32 signature;
+       u8 status;
+       u8 reserved0;
+       u16 vlan_id;
+       u32 reserved1;
+       u16 reserved2;
+       u8 reserved3;
+       u8 checksum;
+};
+#endif
+
+bool e1000_check_mng_mode(struct e1000_hw *hw);
+s32 e1000_read_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 * data);
+s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw);
+s32 e1000_update_eeprom_checksum(struct e1000_hw *hw);
+s32 e1000_write_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 * data);
+s32 e1000_read_mac_addr(struct e1000_hw *hw);
+
+/* Filters (multicast, vlan, receive) */
+u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 * mc_addr);
+void e1000_mta_set(struct e1000_hw *hw, u32 hash_value);
+void e1000_rar_set(struct e1000_hw *hw, u8 * mc_addr, u32 rar_index);
+void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value);
+
+/* LED functions */
+s32 e1000_setup_led(struct e1000_hw *hw);
+s32 e1000_cleanup_led(struct e1000_hw *hw);
+s32 e1000_led_on(struct e1000_hw *hw);
+s32 e1000_led_off(struct e1000_hw *hw);
+s32 e1000_blink_led_start(struct e1000_hw *hw);
+
+/* Adaptive IFS Functions */
+
+/* Everything else */
+void e1000_reset_adaptive(struct e1000_hw *hw);
+void e1000_update_adaptive(struct e1000_hw *hw);
+void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats,
+                           u32 frame_len, u8 * mac_addr);
+void e1000_get_bus_info(struct e1000_hw *hw);
+void e1000_pci_set_mwi(struct e1000_hw *hw);
+void e1000_pci_clear_mwi(struct e1000_hw *hw);
+void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc);
+int e1000_pcix_get_mmrbc(struct e1000_hw *hw);
+/* Port I/O is only supported on 82544 and newer */
+void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value);
+
+#define E1000_READ_REG_IO(a, reg) \
+    e1000_read_reg_io((a), E1000_##reg)
+#define E1000_WRITE_REG_IO(a, reg, val) \
+    e1000_write_reg_io((a), E1000_##reg, val)
+
+/* PCI Device IDs */
+#define E1000_DEV_ID_82542               0x1000
+#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_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_82547GI             0x1075
+#define E1000_DEV_ID_82541GI             0x1076
+#define E1000_DEV_ID_82541GI_MOBILE      0x1077
+#define E1000_DEV_ID_82541GI_LF          0x107C
+#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_82547EI             0x1019
+#define E1000_DEV_ID_82547EI_MOBILE      0x101A
+#define E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 0x10B5
+#define E1000_DEV_ID_INTEL_CE4100_GBE    0x2E6E
+
+#define NODE_ADDRESS_SIZE 6
+#define ETH_LENGTH_OF_ADDRESS 6
+
+/* MAC decode size is 128K - This is the size of BAR0 */
+#define MAC_DECODE_SIZE (128 * 1024)
+
+#define E1000_82542_2_0_REV_ID 2
+#define E1000_82542_2_1_REV_ID 3
+#define E1000_REVISION_0       0
+#define E1000_REVISION_1       1
+#define E1000_REVISION_2       2
+#define E1000_REVISION_3       3
+
+#define SPEED_10    10
+#define SPEED_100   100
+#define SPEED_1000  1000
+#define HALF_DUPLEX 1
+#define FULL_DUPLEX 2
+
+/* The sizes (in bytes) of a ethernet packet */
+#define ENET_HEADER_SIZE             14
+#define MINIMUM_ETHERNET_FRAME_SIZE  64        /* With FCS */
+#define ETHERNET_FCS_SIZE            4
+#define MINIMUM_ETHERNET_PACKET_SIZE \
+    (MINIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
+#define CRC_LENGTH                   ETHERNET_FCS_SIZE
+#define MAX_JUMBO_FRAME_SIZE         0x3F00
+
+/* 802.1q VLAN Packet Sizes */
+#define VLAN_TAG_SIZE  4       /* 802.3ac tag (not DMAed) */
+
+/* Ethertype field values */
+#define ETHERNET_IEEE_VLAN_TYPE 0x8100 /* 802.3ac packet */
+#define ETHERNET_IP_TYPE        0x0800 /* IP packets */
+#define ETHERNET_ARP_TYPE       0x0806 /* Address Resolution Protocol (ARP) */
+
+/* Packet Header defines */
+#define IP_PROTOCOL_TCP    6
+#define IP_PROTOCOL_UDP    0x11
+
+/* 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)
+
+/* Number of high/low register pairs in the RAR. The RAR (Receive Address
+ * Registers) holds the directed and multicast addresses that we monitor. We
+ * reserve one of these spots for our directed address, allowing us room for
+ * E1000_RAR_ENTRIES - 1 multicast addresses.
+ */
+#define E1000_RAR_ENTRIES 15
+
+#define MIN_NUMBER_OF_DESCRIPTORS  8
+#define MAX_NUMBER_OF_DESCRIPTORS  0xFFF8
+
+/* 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 */
+};
+
+/* 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_IPIDV    0x200  /* IP identification valid */
+#define E1000_RXD_STAT_UDPV     0x400  /* Valid UDP checksum */
+#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_RXDPS_HDRSTAT_HDRSP        0x00008000
+#define E1000_RXDPS_HDRSTAT_HDRLEN_MASK  0x000003FF
+
+/* 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)
+
+/* 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;
+};
+
+/* Transmit Descriptor bit definitions */
+#define E1000_TXD_DTYP_D     0x00100000        /* Data Descriptor */
+#define E1000_TXD_DTYP_C     0x00000000        /* Context Descriptor */
+#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 */
+
+/* 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;
+};
+
+/* Filters */
+#define E1000_NUM_UNICAST          16  /* Unicast filter entries */
+#define E1000_MC_TBL_SIZE          128 /* Multicast Filter Table (4096 bits) */
+#define E1000_VLAN_FILTER_TBL_SIZE 128 /* VLAN Filter Table (4096 bits) */
+
+/* Receive Address Register */
+struct e1000_rar {
+       volatile __le32 low;    /* receive address low */
+       volatile __le32 high;   /* receive address high */
+};
+
+/* Number of entries in the Multicast Table Array (MTA). */
+#define E1000_NUM_MTA_REGISTERS 128
+
+/* IPv4 Address Table Entry */
+struct e1000_ipv4_at_entry {
+       volatile u32 ipv4_addr; /* IP Address (RW) */
+       volatile u32 reserved;
+};
+
+/* Four wakeup IP addresses are supported */
+#define E1000_WAKEUP_IP_ADDRESS_COUNT_MAX 4
+#define E1000_IP4AT_SIZE                  E1000_WAKEUP_IP_ADDRESS_COUNT_MAX
+#define E1000_IP6AT_SIZE                  1
+
+/* IPv6 Address Table Entry */
+struct e1000_ipv6_at_entry {
+       volatile u8 ipv6_addr[16];
+};
+
+/* Flexible Filter Length Table Entry */
+struct e1000_fflt_entry {
+       volatile u32 length;    /* Flexible Filter Length (RW) */
+       volatile u32 reserved;
+};
+
+/* Flexible Filter Mask Table Entry */
+struct e1000_ffmt_entry {
+       volatile u32 mask;      /* Flexible Filter Mask (RW) */
+       volatile u32 reserved;
+};
+
+/* Flexible Filter Value Table Entry */
+struct e1000_ffvt_entry {
+       volatile u32 value;     /* Flexible Filter Value (RW) */
+       volatile u32 reserved;
+};
+
+/* 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
+
+#define E1000_DISABLE_SERDES_LOOPBACK   0x0400
+
+/* Register Set. (82543, 82544)
+ *
+ * Registers are defined to be 32 bits and  should be accessed as 32 bit values.
+ * These registers are physically located on the NIC, but are mapped into the
+ * host memory address space.
+ *
+ * RW - register is both readable and writable
+ * RO - register is read only
+ * WO - register is write only
+ * R/clr - register is read only and is cleared when read
+ * A - register array
+ */
+#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 */
+
+extern void __iomem *ce4100_gbe_mdio_base_virt;
+#define INTEL_CE_GBE_MDIO_RCOMP_BASE    (ce4100_gbe_mdio_base_virt)
+#define E1000_MDIO_STS  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0)
+#define E1000_MDIO_CMD  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 4)
+#define E1000_MDIO_DRV  (INTEL_CE_GBE_MDIO_RCOMP_BASE + 8)
+#define E1000_MDC_CMD   (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0xC)
+#define E1000_RCOMP_CTL (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0x20)
+#define E1000_RCOMP_STS (INTEL_CE_GBE_MDIO_RCOMP_BASE + 0x24)
+
+#define E1000_SCTL     0x00024 /* SerDes Control - RW */
+#define E1000_FEXTNVM  0x00028 /* Future Extended NVM register */
+#define E1000_FCAL     0x00028 /* Flow Control Address Low - RW */
+#define E1000_FCAH     0x0002C /* Flow Control Address High -RW */
+#define E1000_FCT      0x00030 /* Flow Control Type - 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 */
+
+/* Auxiliary Control Register. This register is CE4100 specific,
+ * RMII/RGMII function is switched by this register - RW
+ * Following are bits definitions of the Auxiliary Control Register
+ */
+#define E1000_CTL_AUX  0x000E0
+#define E1000_CTL_AUX_END_SEL_SHIFT     10
+#define E1000_CTL_AUX_ENDIANESS_SHIFT   8
+#define E1000_CTL_AUX_RGMII_RMII_SHIFT  0
+
+/* descriptor and packet transfer use CTL_AUX.ENDIANESS */
+#define E1000_CTL_AUX_DES_PKT   (0x0 << E1000_CTL_AUX_END_SEL_SHIFT)
+/* descriptor use CTL_AUX.ENDIANESS, packet use default */
+#define E1000_CTL_AUX_DES       (0x1 << E1000_CTL_AUX_END_SEL_SHIFT)
+/* descriptor use default, packet use CTL_AUX.ENDIANESS */
+#define E1000_CTL_AUX_PKT       (0x2 << E1000_CTL_AUX_END_SEL_SHIFT)
+/* all use CTL_AUX.ENDIANESS */
+#define E1000_CTL_AUX_ALL       (0x3 << E1000_CTL_AUX_END_SEL_SHIFT)
+
+#define E1000_CTL_AUX_RGMII     (0x0 << E1000_CTL_AUX_RGMII_RMII_SHIFT)
+#define E1000_CTL_AUX_RMII      (0x1 << E1000_CTL_AUX_RGMII_RMII_SHIFT)
+
+/* LW little endian, Byte big endian */
+#define E1000_CTL_AUX_LWLE_BBE  (0x0 << E1000_CTL_AUX_ENDIANESS_SHIFT)
+#define E1000_CTL_AUX_LWLE_BLE  (0x1 << E1000_CTL_AUX_ENDIANESS_SHIFT)
+#define E1000_CTL_AUX_LWBE_BBE  (0x2 << E1000_CTL_AUX_ENDIANESS_SHIFT)
+#define E1000_CTL_AUX_LWBE_BLE  (0x3 << E1000_CTL_AUX_ENDIANESS_SHIFT)
+
+#define E1000_RCTL     0x00100 /* RX Control - RW */
+#define E1000_RDTR1    0x02820 /* RX Delay Timer (1) - RW */
+#define E1000_RDBAL1   0x02900 /* RX Descriptor Base Address Low (1) - RW */
+#define E1000_RDBAH1   0x02904 /* RX Descriptor Base Address High (1) - RW */
+#define E1000_RDLEN1   0x02908 /* RX Descriptor Length (1) - RW */
+#define E1000_RDH1     0x02910 /* RX Descriptor Head (1) - RW */
+#define E1000_RDT1     0x02918 /* RX Descriptor Tail (1) - 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 FEXTNVM_SW_CONFIG  0x0001
+#define E1000_PBA      0x01000 /* Packet Buffer Allocation - RW */
+#define E1000_PBS      0x01008 /* Packet Buffer Size */
+#define E1000_EEMNGCTL 0x01010 /* MNG EEprom Control */
+#define E1000_FLASH_UPDATES 1000
+#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_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_RDBAL    0x02800 /* RX Descriptor Base Address Low - RW */
+#define E1000_RDBAH    0x02804 /* RX Descriptor Base Address High - RW */
+#define E1000_RDLEN    0x02808 /* RX Descriptor Length - RW */
+#define E1000_RDH      0x02810 /* RX Descriptor Head - RW */
+#define E1000_RDT      0x02818 /* RX Descriptor Tail - RW */
+#define E1000_RDTR     0x02820 /* RX Delay Timer - RW */
+#define E1000_RDBAL0   E1000_RDBAL     /* RX Desc Base Address Low (0) - RW */
+#define E1000_RDBAH0   E1000_RDBAH     /* RX Desc Base Address High (0) - RW */
+#define E1000_RDLEN0   E1000_RDLEN     /* RX Desc Length (0) - RW */
+#define E1000_RDH0     E1000_RDH       /* RX Desc Head (0) - RW */
+#define E1000_RDT0     E1000_RDT       /* RX Desc Tail (0) - RW */
+#define E1000_RDTR0    E1000_RDTR      /* RX Delay Timer (0) - RW */
+#define E1000_RXDCTL   0x02828 /* RX Descriptor Control queue 0 - RW */
+#define E1000_RXDCTL1  0x02928 /* RX Descriptor Control queue 1 - RW */
+#define E1000_RADV     0x0282C /* RX Interrupt Absolute Delay Timer - RW */
+#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_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_TDBAL    0x03800 /* TX Descriptor Base Address Low - RW */
+#define E1000_TDBAH    0x03804 /* TX Descriptor Base Address High - RW */
+#define E1000_TDLEN    0x03808 /* TX Descriptor Length - RW */
+#define E1000_TDH      0x03810 /* TX Descriptor Head - RW */
+#define E1000_TDT      0x03818 /* TX Descripotr Tail - RW */
+#define E1000_TIDV     0x03820 /* TX Interrupt Delay Value - RW */
+#define E1000_TXDCTL   0x03828 /* TX Descriptor Control - RW */
+#define E1000_TADV     0x0382C /* TX Interrupt Absolute Delay Val - RW */
+#define E1000_TSPMT    0x03830 /* TCP Segmentation PAD & Min Threshold - RW */
+#define E1000_TARC0    0x03840 /* TX Arbitration Count (0) */
+#define E1000_TDBAL1   0x03900 /* TX Desc Base Address Low (1) - RW */
+#define E1000_TDBAH1   0x03904 /* TX Desc Base Address High (1) - RW */
+#define E1000_TDLEN1   0x03908 /* TX Desc Length (1) - RW */
+#define E1000_TDH1     0x03910 /* TX Desc Head (1) - RW */
+#define E1000_TDT1     0x03918 /* TX Desc Tail (1) - RW */
+#define E1000_TXDCTL1  0x03928 /* TX Descriptor Control (1) - RW */
+#define E1000_TARC1    0x03940 /* TX Arbitration Count (1) */
+#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 Packet Timer Expire Count */
+#define E1000_ICRXATC  0x04108 /* Interrupt Cause Rx Absolute Timer Expire Count */
+#define E1000_ICTXPTC  0x0410C /* Interrupt Cause Tx Packet Timer Expire Count */
+#define E1000_ICTXATC  0x04110 /* Interrupt Cause Tx Absolute Timer Expire Count */
+#define E1000_ICTXQEC  0x04118 /* Interrupt Cause Tx Queue Empty Count */
+#define E1000_ICTXQMTC 0x0411C /* Interrupt Cause Tx Queue Minimum Threshold Count */
+#define E1000_ICRXDMTC 0x04120 /* Interrupt Cause Rx Descriptor Minimum Threshold Count */
+#define E1000_ICRXOC   0x04124 /* Interrupt Cause Receiver Overrun Count */
+#define E1000_RXCSUM   0x05000 /* RX Checksum Control - RW */
+#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_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_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_KUMCTRLSTA 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_GCR       0x05B00        /* PCI-Ex Control */
+#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_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_RETA      0x05C00        /* Redirection Table - RW Array */
+#define E1000_RSSRK     0x05C80        /* RSS Random Key - RW Array */
+#define E1000_RSSIM     0x05864        /* RSS Interrupt Mask */
+#define E1000_RSSIR     0x05868        /* RSS Interrupt Request */
+/* Register Set (82542)
+ *
+ * Some of the 82542 registers are located at different offsets than they are
+ * in more current versions of the 8254x. Despite the difference in location,
+ * the registers function in the same manner.
+ */
+#define E1000_82542_CTL_AUX  E1000_CTL_AUX
+#define E1000_82542_CTRL     E1000_CTRL
+#define E1000_82542_CTRL_DUP E1000_CTRL_DUP
+#define E1000_82542_STATUS   E1000_STATUS
+#define E1000_82542_EECD     E1000_EECD
+#define E1000_82542_EERD     E1000_EERD
+#define E1000_82542_CTRL_EXT E1000_CTRL_EXT
+#define E1000_82542_FLA      E1000_FLA
+#define E1000_82542_MDIC     E1000_MDIC
+#define E1000_82542_SCTL     E1000_SCTL
+#define E1000_82542_FEXTNVM  E1000_FEXTNVM
+#define E1000_82542_FCAL     E1000_FCAL
+#define E1000_82542_FCAH     E1000_FCAH
+#define E1000_82542_FCT      E1000_FCT
+#define E1000_82542_VET      E1000_VET
+#define E1000_82542_RA       0x00040
+#define E1000_82542_ICR      E1000_ICR
+#define E1000_82542_ITR      E1000_ITR
+#define E1000_82542_ICS      E1000_ICS
+#define E1000_82542_IMS      E1000_IMS
+#define E1000_82542_IMC      E1000_IMC
+#define E1000_82542_RCTL     E1000_RCTL
+#define E1000_82542_RDTR     0x00108
+#define E1000_82542_RDBAL    0x00110
+#define E1000_82542_RDBAH    0x00114
+#define E1000_82542_RDLEN    0x00118
+#define E1000_82542_RDH      0x00120
+#define E1000_82542_RDT      0x00128
+#define E1000_82542_RDTR0    E1000_82542_RDTR
+#define E1000_82542_RDBAL0   E1000_82542_RDBAL
+#define E1000_82542_RDBAH0   E1000_82542_RDBAH
+#define E1000_82542_RDLEN0   E1000_82542_RDLEN
+#define E1000_82542_RDH0     E1000_82542_RDH
+#define E1000_82542_RDT0     E1000_82542_RDT
+#define E1000_82542_SRRCTL(_n) (0x280C + ((_n) << 8))  /* Split and Replication
+                                                        * RX Control - RW */
+#define E1000_82542_DCA_RXCTRL(_n) (0x02814 + ((_n) << 8))
+#define E1000_82542_RDBAH3   0x02B04   /* RX Desc Base High Queue 3 - RW */
+#define E1000_82542_RDBAL3   0x02B00   /* RX Desc Low Queue 3 - RW */
+#define E1000_82542_RDLEN3   0x02B08   /* RX Desc Length Queue 3 - RW */
+#define E1000_82542_RDH3     0x02B10   /* RX Desc Head Queue 3 - RW */
+#define E1000_82542_RDT3     0x02B18   /* RX Desc Tail Queue 3 - RW */
+#define E1000_82542_RDBAL2   0x02A00   /* RX Desc Base Low Queue 2 - RW */
+#define E1000_82542_RDBAH2   0x02A04   /* RX Desc Base High Queue 2 - RW */
+#define E1000_82542_RDLEN2   0x02A08   /* RX Desc Length Queue 2 - RW */
+#define E1000_82542_RDH2     0x02A10   /* RX Desc Head Queue 2 - RW */
+#define E1000_82542_RDT2     0x02A18   /* RX Desc Tail Queue 2 - RW */
+#define E1000_82542_RDTR1    0x00130
+#define E1000_82542_RDBAL1   0x00138
+#define E1000_82542_RDBAH1   0x0013C
+#define E1000_82542_RDLEN1   0x00140
+#define E1000_82542_RDH1     0x00148
+#define E1000_82542_RDT1     0x00150
+#define E1000_82542_FCRTH    0x00160
+#define E1000_82542_FCRTL    0x00168
+#define E1000_82542_FCTTV    E1000_FCTTV
+#define E1000_82542_TXCW     E1000_TXCW
+#define E1000_82542_RXCW     E1000_RXCW
+#define E1000_82542_MTA      0x00200
+#define E1000_82542_TCTL     E1000_TCTL
+#define E1000_82542_TCTL_EXT E1000_TCTL_EXT
+#define E1000_82542_TIPG     E1000_TIPG
+#define E1000_82542_TDBAL    0x00420
+#define E1000_82542_TDBAH    0x00424
+#define E1000_82542_TDLEN    0x00428
+#define E1000_82542_TDH      0x00430
+#define E1000_82542_TDT      0x00438
+#define E1000_82542_TIDV     0x00440
+#define E1000_82542_TBT      E1000_TBT
+#define E1000_82542_AIT      E1000_AIT
+#define E1000_82542_VFTA     0x00600
+#define E1000_82542_LEDCTL   E1000_LEDCTL
+#define E1000_82542_PBA      E1000_PBA
+#define E1000_82542_PBS      E1000_PBS
+#define E1000_82542_EEMNGCTL E1000_EEMNGCTL
+#define E1000_82542_EEARBC   E1000_EEARBC
+#define E1000_82542_FLASHT   E1000_FLASHT
+#define E1000_82542_EEWR     E1000_EEWR
+#define E1000_82542_FLSWCTL  E1000_FLSWCTL
+#define E1000_82542_FLSWDATA E1000_FLSWDATA
+#define E1000_82542_FLSWCNT  E1000_FLSWCNT
+#define E1000_82542_FLOP     E1000_FLOP
+#define E1000_82542_EXTCNF_CTRL  E1000_EXTCNF_CTRL
+#define E1000_82542_EXTCNF_SIZE  E1000_EXTCNF_SIZE
+#define E1000_82542_PHY_CTRL E1000_PHY_CTRL
+#define E1000_82542_ERT      E1000_ERT
+#define E1000_82542_RXDCTL   E1000_RXDCTL
+#define E1000_82542_RXDCTL1  E1000_RXDCTL1
+#define E1000_82542_RADV     E1000_RADV
+#define E1000_82542_RSRPD    E1000_RSRPD
+#define E1000_82542_TXDMAC   E1000_TXDMAC
+#define E1000_82542_KABGTXD  E1000_KABGTXD
+#define E1000_82542_TDFHS    E1000_TDFHS
+#define E1000_82542_TDFTS    E1000_TDFTS
+#define E1000_82542_TDFPC    E1000_TDFPC
+#define E1000_82542_TXDCTL   E1000_TXDCTL
+#define E1000_82542_TADV     E1000_TADV
+#define E1000_82542_TSPMT    E1000_TSPMT
+#define E1000_82542_CRCERRS  E1000_CRCERRS
+#define E1000_82542_ALGNERRC E1000_ALGNERRC
+#define E1000_82542_SYMERRS  E1000_SYMERRS
+#define E1000_82542_RXERRC   E1000_RXERRC
+#define E1000_82542_MPC      E1000_MPC
+#define E1000_82542_SCC      E1000_SCC
+#define E1000_82542_ECOL     E1000_ECOL
+#define E1000_82542_MCC      E1000_MCC
+#define E1000_82542_LATECOL  E1000_LATECOL
+#define E1000_82542_COLC     E1000_COLC
+#define E1000_82542_DC       E1000_DC
+#define E1000_82542_TNCRS    E1000_TNCRS
+#define E1000_82542_SEC      E1000_SEC
+#define E1000_82542_CEXTERR  E1000_CEXTERR
+#define E1000_82542_RLEC     E1000_RLEC
+#define E1000_82542_XONRXC   E1000_XONRXC
+#define E1000_82542_XONTXC   E1000_XONTXC
+#define E1000_82542_XOFFRXC  E1000_XOFFRXC
+#define E1000_82542_XOFFTXC  E1000_XOFFTXC
+#define E1000_82542_FCRUC    E1000_FCRUC
+#define E1000_82542_PRC64    E1000_PRC64
+#define E1000_82542_PRC127   E1000_PRC127
+#define E1000_82542_PRC255   E1000_PRC255
+#define E1000_82542_PRC511   E1000_PRC511
+#define E1000_82542_PRC1023  E1000_PRC1023
+#define E1000_82542_PRC1522  E1000_PRC1522
+#define E1000_82542_GPRC     E1000_GPRC
+#define E1000_82542_BPRC     E1000_BPRC
+#define E1000_82542_MPRC     E1000_MPRC
+#define E1000_82542_GPTC     E1000_GPTC
+#define E1000_82542_GORCL    E1000_GORCL
+#define E1000_82542_GORCH    E1000_GORCH
+#define E1000_82542_GOTCL    E1000_GOTCL
+#define E1000_82542_GOTCH    E1000_GOTCH
+#define E1000_82542_RNBC     E1000_RNBC
+#define E1000_82542_RUC      E1000_RUC
+#define E1000_82542_RFC      E1000_RFC
+#define E1000_82542_ROC      E1000_ROC
+#define E1000_82542_RJC      E1000_RJC
+#define E1000_82542_MGTPRC   E1000_MGTPRC
+#define E1000_82542_MGTPDC   E1000_MGTPDC
+#define E1000_82542_MGTPTC   E1000_MGTPTC
+#define E1000_82542_TORL     E1000_TORL
+#define E1000_82542_TORH     E1000_TORH
+#define E1000_82542_TOTL     E1000_TOTL
+#define E1000_82542_TOTH     E1000_TOTH
+#define E1000_82542_TPR      E1000_TPR
+#define E1000_82542_TPT      E1000_TPT
+#define E1000_82542_PTC64    E1000_PTC64
+#define E1000_82542_PTC127   E1000_PTC127
+#define E1000_82542_PTC255   E1000_PTC255
+#define E1000_82542_PTC511   E1000_PTC511
+#define E1000_82542_PTC1023  E1000_PTC1023
+#define E1000_82542_PTC1522  E1000_PTC1522
+#define E1000_82542_MPTC     E1000_MPTC
+#define E1000_82542_BPTC     E1000_BPTC
+#define E1000_82542_TSCTC    E1000_TSCTC
+#define E1000_82542_TSCTFC   E1000_TSCTFC
+#define E1000_82542_RXCSUM   E1000_RXCSUM
+#define E1000_82542_WUC      E1000_WUC
+#define E1000_82542_WUFC     E1000_WUFC
+#define E1000_82542_WUS      E1000_WUS
+#define E1000_82542_MANC     E1000_MANC
+#define E1000_82542_IPAV     E1000_IPAV
+#define E1000_82542_IP4AT    E1000_IP4AT
+#define E1000_82542_IP6AT    E1000_IP6AT
+#define E1000_82542_WUPL     E1000_WUPL
+#define E1000_82542_WUPM     E1000_WUPM
+#define E1000_82542_FFLT     E1000_FFLT
+#define E1000_82542_TDFH     0x08010
+#define E1000_82542_TDFT     0x08018
+#define E1000_82542_FFMT     E1000_FFMT
+#define E1000_82542_FFVT     E1000_FFVT
+#define E1000_82542_HOST_IF  E1000_HOST_IF
+#define E1000_82542_IAM         E1000_IAM
+#define E1000_82542_EEMNGCTL    E1000_EEMNGCTL
+#define E1000_82542_PSRCTL      E1000_PSRCTL
+#define E1000_82542_RAID        E1000_RAID
+#define E1000_82542_TARC0       E1000_TARC0
+#define E1000_82542_TDBAL1      E1000_TDBAL1
+#define E1000_82542_TDBAH1      E1000_TDBAH1
+#define E1000_82542_TDLEN1      E1000_TDLEN1
+#define E1000_82542_TDH1        E1000_TDH1
+#define E1000_82542_TDT1        E1000_TDT1
+#define E1000_82542_TXDCTL1     E1000_TXDCTL1
+#define E1000_82542_TARC1       E1000_TARC1
+#define E1000_82542_RFCTL       E1000_RFCTL
+#define E1000_82542_GCR         E1000_GCR
+#define E1000_82542_GSCL_1      E1000_GSCL_1
+#define E1000_82542_GSCL_2      E1000_GSCL_2
+#define E1000_82542_GSCL_3      E1000_GSCL_3
+#define E1000_82542_GSCL_4      E1000_GSCL_4
+#define E1000_82542_FACTPS      E1000_FACTPS
+#define E1000_82542_SWSM        E1000_SWSM
+#define E1000_82542_FWSM        E1000_FWSM
+#define E1000_82542_FFLT_DBG    E1000_FFLT_DBG
+#define E1000_82542_IAC         E1000_IAC
+#define E1000_82542_ICRXPTC     E1000_ICRXPTC
+#define E1000_82542_ICRXATC     E1000_ICRXATC
+#define E1000_82542_ICTXPTC     E1000_ICTXPTC
+#define E1000_82542_ICTXATC     E1000_ICTXATC
+#define E1000_82542_ICTXQEC     E1000_ICTXQEC
+#define E1000_82542_ICTXQMTC    E1000_ICTXQMTC
+#define E1000_82542_ICRXDMTC    E1000_ICRXDMTC
+#define E1000_82542_ICRXOC      E1000_ICRXOC
+#define E1000_82542_HICR        E1000_HICR
+
+#define E1000_82542_CPUVEC      E1000_CPUVEC
+#define E1000_82542_MRQC        E1000_MRQC
+#define E1000_82542_RETA        E1000_RETA
+#define E1000_82542_RSSRK       E1000_RSSRK
+#define E1000_82542_RSSIM       E1000_RSSIM
+#define E1000_82542_RSSIR       E1000_RSSIR
+#define E1000_82542_KUMCTRLSTA E1000_KUMCTRLSTA
+#define E1000_82542_SW_FW_SYNC E1000_SW_FW_SYNC
+
+/* Statistics counters collected by the MAC */
+struct e1000_hw_stats {
+       u64 crcerrs;
+       u64 algnerrc;
+       u64 symerrs;
+       u64 rxerrc;
+       u64 txerrc;
+       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 gorcl;
+       u64 gorch;
+       u64 gotcl;
+       u64 gotch;
+       u64 rnbc;
+       u64 ruc;
+       u64 rfc;
+       u64 roc;
+       u64 rlerrc;
+       u64 rjc;
+       u64 mgprc;
+       u64 mgpdc;
+       u64 mgptc;
+       u64 torl;
+       u64 torh;
+       u64 totl;
+       u64 toth;
+       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;
+};
+
+/* Structure containing variables used by the shared code (e1000_hw.c) */
+struct e1000_hw {
+       u8 __iomem *hw_addr;
+       u8 __iomem *flash_address;
+       e1000_mac_type mac_type;
+       e1000_phy_type phy_type;
+       u32 phy_init_script;
+       e1000_media_type media_type;
+       void *back;
+       struct e1000_shadow_ram *eeprom_shadow_ram;
+       u32 flash_bank_size;
+       u32 flash_base_addr;
+       e1000_fc_type fc;
+       e1000_bus_speed bus_speed;
+       e1000_bus_width bus_width;
+       e1000_bus_type bus_type;
+       struct e1000_eeprom_info eeprom;
+       e1000_ms_type master_slave;
+       e1000_ms_type original_master_slave;
+       e1000_ffe_config ffe_config_state;
+       u32 asf_firmware_present;
+       u32 eeprom_semaphore_present;
+       unsigned long io_base;
+       u32 phy_id;
+       u32 phy_revision;
+       u32 phy_addr;
+       u32 original_fc;
+       u32 txcw;
+       u32 autoneg_failed;
+       u32 max_frame_size;
+       u32 min_frame_size;
+       u32 mc_filter_type;
+       u32 num_mc_addrs;
+       u32 collision_delta;
+       u32 tx_packet_delta;
+       u32 ledctl_default;
+       u32 ledctl_mode1;
+       u32 ledctl_mode2;
+       bool tx_pkt_filtering;
+       struct e1000_host_mng_dhcp_cookie mng_cookie;
+       u16 phy_spd_default;
+       u16 autoneg_advertised;
+       u16 pci_cmd_word;
+       u16 fc_high_water;
+       u16 fc_low_water;
+       u16 fc_pause_time;
+       u16 current_ifs_val;
+       u16 ifs_min_val;
+       u16 ifs_max_val;
+       u16 ifs_step_size;
+       u16 ifs_ratio;
+       u16 device_id;
+       u16 vendor_id;
+       u16 subsystem_id;
+       u16 subsystem_vendor_id;
+       u8 revision_id;
+       u8 autoneg;
+       u8 mdix;
+       u8 forced_speed_duplex;
+       u8 wait_autoneg_complete;
+       u8 dma_fairness;
+       u8 mac_addr[NODE_ADDRESS_SIZE];
+       u8 perm_mac_addr[NODE_ADDRESS_SIZE];
+       bool disable_polarity_correction;
+       bool speed_downgraded;
+       e1000_smart_speed smart_speed;
+       e1000_dsp_config dsp_config_state;
+       bool get_link_status;
+       bool serdes_has_link;
+       bool tbi_compatibility_en;
+       bool tbi_compatibility_on;
+       bool laa_is_present;
+       bool phy_reset_disable;
+       bool initialize_hw_bits_disable;
+       bool fc_send_xon;
+       bool fc_strict_ieee;
+       bool report_tx_early;
+       bool adaptive_ifs;
+       bool ifs_params_forced;
+       bool in_ifs_mode;
+       bool mng_reg_access_disabled;
+       bool leave_av_bit_off;
+       bool bad_tx_carr_stats_fd;
+       bool has_smbus;
+};
+
+#define E1000_EEPROM_SWDPIN0   0x0001  /* SWDPIN 0 EEPROM Value */
+#define E1000_EEPROM_LED_LOGIC 0x0020  /* Led Logic Word */
+#define E1000_EEPROM_RW_REG_DATA   16  /* Offset to data in EEPROM read/write registers */
+#define E1000_EEPROM_RW_REG_DONE   2   /* Offset to READ/WRITE done bit */
+#define E1000_EEPROM_RW_REG_START  1   /* First bit for telling part to start operation */
+#define E1000_EEPROM_RW_ADDR_SHIFT 2   /* Shift to the address bits */
+#define E1000_EEPROM_POLL_WRITE    1   /* Flag for polling for write complete */
+#define E1000_EEPROM_POLL_READ     0   /* Flag for polling for read complete */
+/* Register Bit Masks */
+/* 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 requests */
+#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 manageability engine */
+
+/* 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 EEPROM/Flash */
+#define E1000_STATUS_ASDV       0x00000300     /* Auto speed detect value */
+#define E1000_STATUS_DOCK_CI    0x00000800     /* Change in Dock/Undock state. Clear on write '0'. */
+#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000      /* Status of Master requests. */
+#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 */
+
+/* EEPROM/Flash Control */
+#define E1000_EECD_SK        0x00000001        /* EEPROM Clock */
+#define E1000_EECD_CS        0x00000002        /* EEPROM Chip Select */
+#define E1000_EECD_DI        0x00000004        /* EEPROM Data In */
+#define E1000_EECD_DO        0x00000008        /* EEPROM 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        /* EEPROM Access Request */
+#define E1000_EECD_GNT       0x00000080        /* EEPROM Access Grant */
+#define E1000_EECD_PRES      0x00000100        /* EEPROM Present */
+#define E1000_EECD_SIZE      0x00000200        /* EEPROM Size (0=64 word 1=256 word) */
+#define E1000_EECD_ADDR_BITS 0x00000400        /* EEPROM Addressing bits based on type
+                                        * (0-small, 1-large) */
+#define E1000_EECD_TYPE      0x00002000        /* EEPROM Type (1-SPI, 0-Microwire) */
+#ifndef E1000_EEPROM_GRANT_ATTEMPTS
+#define E1000_EEPROM_GRANT_ATTEMPTS 1000       /* EEPROM # attempts to gain grant */
+#endif
+#define E1000_EECD_AUTO_RD          0x00000200 /* EEPROM Auto Read done */
+#define E1000_EECD_SIZE_EX_MASK     0x00007800 /* EEprom 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_STM_OPCODE     0xDB00
+#define E1000_HICR_FW_RESET  0xC0
+
+#define E1000_SHADOW_RAM_WORDS     2048
+#define E1000_ICH_NVM_SIG_WORD     0x13
+#define E1000_ICH_NVM_SIG_MASK     0xC0
+
+/* EEPROM Read */
+#define E1000_EERD_START      0x00000001       /* Start Read */
+#define E1000_EERD_DONE       0x00000010       /* Read Done */
+#define E1000_EERD_ADDR_SHIFT 8
+#define E1000_EERD_ADDR_MASK  0x0000FF00       /* Read Address */
+#define E1000_EERD_DATA_SHIFT 16
+#define E1000_EERD_DATA_MASK  0xFFFF0000       /* Read Data */
+
+/* SPI EEPROM Status Register */
+#define EEPROM_STATUS_RDY_SPI  0x01
+#define EEPROM_STATUS_WEN_SPI  0x02
+#define EEPROM_STATUS_BP0_SPI  0x04
+#define EEPROM_STATUS_BP1_SPI  0x08
+#define EEPROM_STATUS_WPEN_SPI 0x80
+
+/* 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 */
+#define E1000_CTRL_EXT_SDP4_DATA 0x00000010    /* Value of SW Defineable Pin 4 */
+#define E1000_CTRL_EXT_SDP5_DATA 0x00000020    /* Value of SW Defineable Pin 5 */
+#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
+#define E1000_CTRL_EXT_SDP6_DATA 0x00000040    /* Value of SW Defineable Pin 6 */
+#define E1000_CTRL_EXT_SDP7_DATA 0x00000080    /* Value of SW Defineable Pin 7 */
+#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_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_SERDES  0x00C00000
+#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
+#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_DRV_LOAD       0x10000000       /* Driver loaded bit for FW */
+#define E1000_CTRL_EXT_IAME           0x08000000       /* Interrupt acknowledge Auto-mask */
+#define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000       /* Clear Interrupt timers after IMS clear */
+#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
+
+/* 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
+
+#define INTEL_CE_GBE_MDIC_OP_WRITE      0x04000000
+#define INTEL_CE_GBE_MDIC_OP_READ       0x00000000
+#define INTEL_CE_GBE_MDIC_GO            0x80000000
+#define INTEL_CE_GBE_MDIC_READ_ERROR    0x80000000
+
+#define E1000_KUMCTRLSTA_MASK           0x0000FFFF
+#define E1000_KUMCTRLSTA_OFFSET         0x001F0000
+#define E1000_KUMCTRLSTA_OFFSET_SHIFT   16
+#define E1000_KUMCTRLSTA_REN            0x00200000
+
+#define E1000_KUMCTRLSTA_OFFSET_FIFO_CTRL      0x00000000
+#define E1000_KUMCTRLSTA_OFFSET_CTRL           0x00000001
+#define E1000_KUMCTRLSTA_OFFSET_INB_CTRL       0x00000002
+#define E1000_KUMCTRLSTA_OFFSET_DIAG           0x00000003
+#define E1000_KUMCTRLSTA_OFFSET_TIMEOUTS       0x00000004
+#define E1000_KUMCTRLSTA_OFFSET_INB_PARAM      0x00000009
+#define E1000_KUMCTRLSTA_OFFSET_HD_CTRL        0x00000010
+#define E1000_KUMCTRLSTA_OFFSET_M2P_SERDES     0x0000001E
+#define E1000_KUMCTRLSTA_OFFSET_M2P_MODES      0x0000001F
+
+/* FIFO Control */
+#define E1000_KUMCTRLSTA_FIFO_CTRL_RX_BYPASS   0x00000008
+#define E1000_KUMCTRLSTA_FIFO_CTRL_TX_BYPASS   0x00000800
+
+/* In-Band Control */
+#define E1000_KUMCTRLSTA_INB_CTRL_LINK_STATUS_TX_TIMEOUT_DEFAULT    0x00000500
+#define E1000_KUMCTRLSTA_INB_CTRL_DIS_PADDING  0x00000010
+
+/* Half-Duplex Control */
+#define E1000_KUMCTRLSTA_HD_CTRL_10_100_DEFAULT 0x00000004
+#define E1000_KUMCTRLSTA_HD_CTRL_1000_DEFAULT  0x00000000
+
+#define E1000_KUMCTRLSTA_OFFSET_K0S_CTRL       0x0000001E
+
+#define E1000_KUMCTRLSTA_DIAG_FELPBK           0x2000
+#define E1000_KUMCTRLSTA_DIAG_NELPBK           0x1000
+
+#define E1000_KUMCTRLSTA_K0S_100_EN            0x2000
+#define E1000_KUMCTRLSTA_K0S_GBE_EN            0x1000
+#define E1000_KUMCTRLSTA_K0S_ENTRY_LATENCY_MASK   0x0003
+
+#define E1000_KABGTXD_BGSQLBIAS                0x00050000
+
+#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_PHY_CTRL_B2B_EN                  0x00000080
+
+/* LED Control */
+#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
+#define E1000_LEDCTL_LED0_MODE_SHIFT      0
+#define E1000_LEDCTL_LED0_BLINK_RATE      0x0000020
+#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      0x0002000
+#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
+
+/* Receive Address */
+#define E1000_RAH_AV  0x80000000       /* Receive descriptor valid */
+
+/* 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_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     /* queue 0 Rx descriptor FIFO parity error */
+#define E1000_ICR_TXD_FIFO_PAR0 0x00200000     /* queue 0 Tx descriptor FIFO parity error */
+#define E1000_ICR_HOST_ARB_PAR  0x00400000     /* host arb read buffer parity error */
+#define E1000_ICR_PB_PAR        0x00800000     /* packet buffer parity error */
+#define E1000_ICR_RXD_FIFO_PAR1 0x01000000     /* queue 1 Rx descriptor FIFO parity error */
+#define E1000_ICR_TXD_FIFO_PAR1 0x02000000     /* queue 1 Tx descriptor 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_EPRST         0x00100000     /* ME hardware reset occurs */
+
+/* Interrupt Cause Set */
+#define E1000_ICS_TXDW      E1000_ICR_TXDW     /* Transmit 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        /* queue 0 Rx descriptor FIFO parity error */
+#define E1000_ICS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0        /* queue 0 Tx descriptor 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        /* queue 1 Rx descriptor FIFO parity error */
+#define E1000_ICS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1        /* queue 1 Tx descriptor FIFO parity error */
+#define E1000_ICS_DSW       E1000_ICR_DSW
+#define E1000_ICS_PHYINT    E1000_ICR_PHYINT
+#define E1000_ICS_EPRST     E1000_ICR_EPRST
+
+/* Interrupt Mask Set */
+#define E1000_IMS_TXDW      E1000_ICR_TXDW     /* Transmit 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_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        /* queue 0 Rx descriptor FIFO parity error */
+#define E1000_IMS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0        /* queue 0 Tx descriptor 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        /* queue 1 Rx descriptor FIFO parity error */
+#define E1000_IMS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1        /* queue 1 Tx descriptor FIFO parity error */
+#define E1000_IMS_DSW       E1000_ICR_DSW
+#define E1000_IMS_PHYINT    E1000_ICR_PHYINT
+#define E1000_IMS_EPRST     E1000_ICR_EPRST
+
+/* Interrupt Mask Clear */
+#define E1000_IMC_TXDW      E1000_ICR_TXDW     /* Transmit desc written back */
+#define E1000_IMC_TXQE      E1000_ICR_TXQE     /* Transmit Queue empty */
+#define E1000_IMC_LSC       E1000_ICR_LSC      /* Link Status Change */
+#define E1000_IMC_RXSEQ     E1000_ICR_RXSEQ    /* rx sequence error */
+#define E1000_IMC_RXDMT0    E1000_ICR_RXDMT0   /* rx desc min. threshold */
+#define E1000_IMC_RXO       E1000_ICR_RXO      /* rx overrun */
+#define E1000_IMC_RXT0      E1000_ICR_RXT0     /* rx timer intr */
+#define E1000_IMC_MDAC      E1000_ICR_MDAC     /* MDIO access complete */
+#define E1000_IMC_RXCFG     E1000_ICR_RXCFG    /* RX /c/ ordered set */
+#define E1000_IMC_GPI_EN0   E1000_ICR_GPI_EN0  /* GP Int 0 */
+#define E1000_IMC_GPI_EN1   E1000_ICR_GPI_EN1  /* GP Int 1 */
+#define E1000_IMC_GPI_EN2   E1000_ICR_GPI_EN2  /* GP Int 2 */
+#define E1000_IMC_GPI_EN3   E1000_ICR_GPI_EN3  /* GP Int 3 */
+#define E1000_IMC_TXD_LOW   E1000_ICR_TXD_LOW
+#define E1000_IMC_SRPD      E1000_ICR_SRPD
+#define E1000_IMC_ACK       E1000_ICR_ACK      /* Receive Ack frame */
+#define E1000_IMC_MNG       E1000_ICR_MNG      /* Manageability event */
+#define E1000_IMC_DOCK      E1000_ICR_DOCK     /* Dock/Undock */
+#define E1000_IMC_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0        /* queue 0 Rx descriptor FIFO parity error */
+#define E1000_IMC_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0        /* queue 0 Tx descriptor FIFO parity error */
+#define E1000_IMC_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR /* host arb read buffer parity error */
+#define E1000_IMC_PB_PAR        E1000_ICR_PB_PAR       /* packet buffer parity error */
+#define E1000_IMC_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1        /* queue 1 Rx descriptor FIFO parity error */
+#define E1000_IMC_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1        /* queue 1 Tx descriptor FIFO parity error */
+#define E1000_IMC_DSW       E1000_ICR_DSW
+#define E1000_IMC_PHYINT    E1000_ICR_PHYINT
+#define E1000_IMC_EPRST     E1000_ICR_EPRST
+
+/* 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 promiscuous enable */
+#define E1000_RCTL_MPE            0x00000010   /* multicast promiscuous enab */
+#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 threshold size */
+#define E1000_RCTL_RDMTS_QUAT     0x00000100   /* rx desc min threshold size */
+#define E1000_RCTL_RDMTS_EIGTH    0x00000200   /* rx desc min threshold 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 */
+
+/* SW_W_SYNC definitions */
+#define E1000_SWFW_EEP_SM     0x0001
+#define E1000_SWFW_PHY0_SM    0x0002
+#define E1000_SWFW_PHY1_SM    0x0004
+#define E1000_SWFW_MAC_CSR_SM 0x0008
+
+/* Receive Descriptor */
+#define E1000_RDT_DELAY 0x0000ffff     /* Delay timer (1=1024us) */
+#define E1000_RDT_FPDB  0x80000000     /* Flush descriptor block */
+#define E1000_RDLEN_LEN 0x0007ff80     /* descriptor length */
+#define E1000_RDH_RDH   0x0000ffff     /* receive descriptor head */
+#define E1000_RDT_RDT   0x0000ffff     /* receive descriptor tail */
+
+/* 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 */
+
+/* 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
+
+/* Receive Descriptor Control */
+#define E1000_RXDCTL_PTHRESH 0x0000003F        /* RXDCTL Prefetch Threshold */
+#define E1000_RXDCTL_HTHRESH 0x00003F00        /* RXDCTL Host Threshold */
+#define E1000_RXDCTL_WTHRESH 0x003F0000        /* RXDCTL Writeback Threshold */
+#define E1000_RXDCTL_GRAN    0x01000000        /* RXDCTL Granularity */
+
+/* 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_COUNT_DESC 0x00400000     /* Enable the counting of desc.
+                                                  still to be processed. */
+/* 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 */
+
+/* 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 */
+/* Extended Transmit Control */
+#define E1000_TCTL_EXT_BST_MASK  0x000003FF    /* Backoff Slot Time */
+#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00    /* Gigabit Carry Extend Padding */
+
+/* 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_IPPCSE    0x00001000      /* IP payload checksum enable */
+#define E1000_RXCSUM_PCSD      0x00002000      /* packet checksum disabled */
+
+/* Multiple Receive Queue Control */
+#define E1000_MRQC_ENABLE_MASK              0x00000003
+#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
+
+/* 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_SPM        0x80000000        /* Enable SPM */
+
+/* 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 0x00000001      /* Link Status Changed */
+#define E1000_WUS_MAG  0x00000002      /* Magic Packet Received */
+#define E1000_WUS_EX   0x00000004      /* Directed Exact Received */
+#define E1000_WUS_MC   0x00000008      /* Directed Multicast Received */
+#define E1000_WUS_BC   0x00000010      /* Broadcast Received */
+#define E1000_WUS_ARP  0x00000020      /* ARP Request Packet Received */
+#define E1000_WUS_IPV4 0x00000040      /* Directed IPv4 Packet Wakeup Received */
+#define E1000_WUS_IPV6 0x00000080      /* Directed IPv6 Packet Wakeup Received */
+#define E1000_WUS_FLX0 0x00010000      /* Flexible Filter 0 Match */
+#define E1000_WUS_FLX1 0x00020000      /* Flexible Filter 1 Match */
+#define E1000_WUS_FLX2 0x00040000      /* Flexible Filter 2 Match */
+#define E1000_WUS_FLX3 0x00080000      /* Flexible Filter 3 Match */
+#define E1000_WUS_FLX_FILTERS 0x000F0000       /* Mask for the 4 flexible filters */
+
+/* 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 */
+#define E1000_MANC_NEIGHBOR_EN   0x00004000    /* Enable Neighbor Discovery
+                                                * Filtering */
+#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 */
+#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000     /* Enable MAC address
+                                                        * filtering */
+#define E1000_MANC_EN_MNG2HOST   0x00200000    /* Enable MNG packets to host
+                                                * memory */
+#define E1000_MANC_EN_IP_ADDR_FILTER    0x00400000     /* Enable IP address
+                                                        * filtering */
+#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 */
+
+/* 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 */
+
+/* FW Semaphore Register */
+#define E1000_FWSM_MODE_MASK    0x0000000E     /* FW mode */
+#define E1000_FWSM_MODE_SHIFT            1
+#define E1000_FWSM_FW_VALID     0x00008000     /* FW established a valid mode */
+
+#define E1000_FWSM_RSPCIPHY        0x00000040  /* Reset PHY on PCI reset */
+#define E1000_FWSM_DISSW           0x10000000  /* FW disable SW Write Access */
+#define E1000_FWSM_SKUSEL_MASK     0x60000000  /* LAN SKU select */
+#define E1000_FWSM_SKUEL_SHIFT     29
+#define E1000_FWSM_SKUSEL_EMB      0x0 /* Embedded SKU */
+#define E1000_FWSM_SKUSEL_CONS     0x1 /* Consumer SKU */
+#define E1000_FWSM_SKUSEL_PERF_100 0x2 /* Perf & Corp 10/100 SKU */
+#define E1000_FWSM_SKUSEL_PERF_GBE 0x3 /* Perf & Copr GbE SKU */
+
+/* FFLT Debug Register */
+#define E1000_FFLT_DBG_INVC     0x00100000     /* Invalid /C/ code handling */
+
+typedef enum {
+       e1000_mng_mode_none = 0,
+       e1000_mng_mode_asf,
+       e1000_mng_mode_pt,
+       e1000_mng_mode_ipmi,
+       e1000_mng_mode_host_interface_only
+} e1000_mng_mode;
+
+/* Host Interface Control Register */
+#define E1000_HICR_EN           0x00000001     /* Enable Bit - RO */
+#define E1000_HICR_C            0x00000002     /* Driver sets this bit when done
+                                                * to put command in RAM */
+#define E1000_HICR_SV           0x00000004     /* Status Validity */
+#define E1000_HICR_FWR          0x00000080     /* FW reset. Set by the Host */
+
+/* Host Interface Command Interface - Address range 0x8800-0x8EFF */
+#define E1000_HI_MAX_DATA_LENGTH         252   /* Host Interface data length */
+#define E1000_HI_MAX_BLOCK_BYTE_LENGTH  1792   /* Number of bytes in range */
+#define E1000_HI_MAX_BLOCK_DWORD_LENGTH  448   /* Number of dwords in range */
+#define E1000_HI_COMMAND_TIMEOUT         500   /* Time in ms to process HI command */
+
+struct e1000_host_command_header {
+       u8 command_id;
+       u8 command_length;
+       u8 command_options;     /* I/F bits for command, status for return */
+       u8 checksum;
+};
+struct e1000_host_command_info {
+       struct e1000_host_command_header command_header;        /* Command Head/Command Result Head has 4 bytes */
+       u8 command_data[E1000_HI_MAX_DATA_LENGTH];      /* Command data can length 0..252 */
+};
+
+/* Host SMB register #0 */
+#define E1000_HSMC0R_CLKIN      0x00000001     /* SMB Clock in */
+#define E1000_HSMC0R_DATAIN     0x00000002     /* SMB Data in */
+#define E1000_HSMC0R_DATAOUT    0x00000004     /* SMB Data out */
+#define E1000_HSMC0R_CLKOUT     0x00000008     /* SMB Clock out */
+
+/* Host SMB register #1 */
+#define E1000_HSMC1R_CLKIN      E1000_HSMC0R_CLKIN
+#define E1000_HSMC1R_DATAIN     E1000_HSMC0R_DATAIN
+#define E1000_HSMC1R_DATAOUT    E1000_HSMC0R_DATAOUT
+#define E1000_HSMC1R_CLKOUT     E1000_HSMC0R_CLKOUT
+
+/* FW Status Register */
+#define E1000_FWSTS_FWS_MASK    0x000000FF     /* FW Status */
+
+/* Wake Up Packet Length */
+#define E1000_WUPL_LENGTH_MASK 0x0FFF  /* Only the lower 12 bits are valid */
+
+#define E1000_MDALIGN          4096
+
+/* PCI-Ex registers*/
+
+/* PCI-Ex Control Register */
+#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 PCI_EX_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)
+
+#define PCI_EX_82566_SNOOP_ALL PCI_EX_NO_SNOOP_ALL
+
+#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000
+/* Function Active and Power State to MNG */
+#define E1000_FACTPS_FUNC0_POWER_STATE_MASK         0x00000003
+#define E1000_FACTPS_LAN0_VALID                     0x00000004
+#define E1000_FACTPS_FUNC0_AUX_EN                   0x00000008
+#define E1000_FACTPS_FUNC1_POWER_STATE_MASK         0x000000C0
+#define E1000_FACTPS_FUNC1_POWER_STATE_SHIFT        6
+#define E1000_FACTPS_LAN1_VALID                     0x00000100
+#define E1000_FACTPS_FUNC1_AUX_EN                   0x00000200
+#define E1000_FACTPS_FUNC2_POWER_STATE_MASK         0x00003000
+#define E1000_FACTPS_FUNC2_POWER_STATE_SHIFT        12
+#define E1000_FACTPS_IDE_ENABLE                     0x00004000
+#define E1000_FACTPS_FUNC2_AUX_EN                   0x00008000
+#define E1000_FACTPS_FUNC3_POWER_STATE_MASK         0x000C0000
+#define E1000_FACTPS_FUNC3_POWER_STATE_SHIFT        18
+#define E1000_FACTPS_SP_ENABLE                      0x00100000
+#define E1000_FACTPS_FUNC3_AUX_EN                   0x00200000
+#define E1000_FACTPS_FUNC4_POWER_STATE_MASK         0x03000000
+#define E1000_FACTPS_FUNC4_POWER_STATE_SHIFT        24
+#define E1000_FACTPS_IPMI_ENABLE                    0x04000000
+#define E1000_FACTPS_FUNC4_AUX_EN                   0x08000000
+#define E1000_FACTPS_MNGCG                          0x20000000
+#define E1000_FACTPS_LAN_FUNC_SEL                   0x40000000
+#define E1000_FACTPS_PM_STATE_CHANGED               0x80000000
+
+/* PCI-Ex Config Space */
+#define PCI_EX_LINK_STATUS           0x12
+#define PCI_EX_LINK_WIDTH_MASK       0x3F0
+#define PCI_EX_LINK_WIDTH_SHIFT      4
+
+/* EEPROM Commands - Microwire */
+#define EEPROM_READ_OPCODE_MICROWIRE  0x6      /* EEPROM read opcode */
+#define EEPROM_WRITE_OPCODE_MICROWIRE 0x5      /* EEPROM write opcode */
+#define EEPROM_ERASE_OPCODE_MICROWIRE 0x7      /* EEPROM erase opcode */
+#define EEPROM_EWEN_OPCODE_MICROWIRE  0x13     /* EEPROM erase/write enable */
+#define EEPROM_EWDS_OPCODE_MICROWIRE  0x10     /* EEPROM erase/write disable */
+
+/* EEPROM Commands - SPI */
+#define EEPROM_MAX_RETRY_SPI        5000       /* Max wait of 5ms, for RDY signal */
+#define EEPROM_READ_OPCODE_SPI      0x03       /* EEPROM read opcode */
+#define EEPROM_WRITE_OPCODE_SPI     0x02       /* EEPROM write opcode */
+#define EEPROM_A8_OPCODE_SPI        0x08       /* opcode bit-3 = address bit-8 */
+#define EEPROM_WREN_OPCODE_SPI      0x06       /* EEPROM set Write Enable latch */
+#define EEPROM_WRDI_OPCODE_SPI      0x04       /* EEPROM reset Write Enable latch */
+#define EEPROM_RDSR_OPCODE_SPI      0x05       /* EEPROM read Status register */
+#define EEPROM_WRSR_OPCODE_SPI      0x01       /* EEPROM write Status register */
+#define EEPROM_ERASE4K_OPCODE_SPI   0x20       /* EEPROM ERASE 4KB */
+#define EEPROM_ERASE64K_OPCODE_SPI  0xD8       /* EEPROM ERASE 64KB */
+#define EEPROM_ERASE256_OPCODE_SPI  0xDB       /* EEPROM ERASE 256B */
+
+/* EEPROM Size definitions */
+#define EEPROM_WORD_SIZE_SHIFT  6
+#define EEPROM_SIZE_SHIFT       10
+#define EEPROM_SIZE_MASK        0x1C00
+
+/* EEPROM Word Offsets */
+#define EEPROM_COMPAT                 0x0003
+#define EEPROM_ID_LED_SETTINGS        0x0004
+#define EEPROM_VERSION                0x0005
+#define EEPROM_SERDES_AMPLITUDE       0x0006   /* For SERDES output amplitude adjustment. */
+#define EEPROM_PHY_CLASS_WORD         0x0007
+#define EEPROM_INIT_CONTROL1_REG      0x000A
+#define EEPROM_INIT_CONTROL2_REG      0x000F
+#define EEPROM_SWDEF_PINS_CTRL_PORT_1 0x0010
+#define EEPROM_INIT_CONTROL3_PORT_B   0x0014
+#define EEPROM_INIT_3GIO_3            0x001A
+#define EEPROM_SWDEF_PINS_CTRL_PORT_0 0x0020
+#define EEPROM_INIT_CONTROL3_PORT_A   0x0024
+#define EEPROM_CFG                    0x0012
+#define EEPROM_FLASH_VERSION          0x0032
+#define EEPROM_CHECKSUM_REG           0x003F
+
+#define E1000_EEPROM_CFG_DONE         0x00040000       /* MNG config cycle done */
+#define E1000_EEPROM_CFG_DONE_PORT_1  0x00080000       /* ...for second port */
+
+/* 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
+
+/* Mask bits for SERDES amplitude adjustment in Word 6 of the EEPROM */
+#define EEPROM_SERDES_AMPLITUDE_MASK  0x000F
+
+/* Mask bit for PHY class in Word 7 of the EEPROM */
+#define EEPROM_PHY_CLASS_A   0x8000
+
+/* Mask bits for fields in Word 0x0a of the EEPROM */
+#define EEPROM_WORD0A_ILOS   0x0010
+#define EEPROM_WORD0A_SWDPIO 0x01E0
+#define EEPROM_WORD0A_LRST   0x0200
+#define EEPROM_WORD0A_FD     0x0400
+#define EEPROM_WORD0A_66MHZ  0x0800
+
+/* Mask bits for fields in Word 0x0f of the EEPROM */
+#define EEPROM_WORD0F_PAUSE_MASK 0x3000
+#define EEPROM_WORD0F_PAUSE      0x1000
+#define EEPROM_WORD0F_ASM_DIR    0x2000
+#define EEPROM_WORD0F_ANE        0x0800
+#define EEPROM_WORD0F_SWPDIO_EXT 0x00F0
+#define EEPROM_WORD0F_LPLU       0x0001
+
+/* Mask bits for fields in Word 0x10/0x20 of the EEPROM */
+#define EEPROM_WORD1020_GIGA_DISABLE         0x0010
+#define EEPROM_WORD1020_GIGA_DISABLE_NON_D0A 0x0008
+
+/* Mask bits for fields in Word 0x1a of the EEPROM */
+#define EEPROM_WORD1A_ASPM_MASK  0x000C
+
+/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
+#define EEPROM_SUM 0xBABA
+
+/* EEPROM Map defines (WORD OFFSETS)*/
+#define EEPROM_NODE_ADDRESS_BYTE_0 0
+#define EEPROM_PBA_BYTE_1          8
+
+#define EEPROM_RESERVED_WORD          0xFFFF
+
+/* EEPROM Map Sizes (Byte Counts) */
+#define PBA_SIZE 4
+
+/* Collision related configuration parameters */
+#define E1000_COLLISION_THRESHOLD       15
+#define E1000_CT_SHIFT                  4
+/* Collision distance is a 0-based value that applies to
+ * half-duplex-capable hardware only. */
+#define E1000_COLLISION_DISTANCE        63
+#define E1000_COLLISION_DISTANCE_82542  64
+#define E1000_FDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
+#define E1000_HDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
+#define E1000_COLD_SHIFT                12
+
+/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
+#define REQ_TX_DESCRIPTOR_MULTIPLE  8
+#define REQ_RX_DESCRIPTOR_MULTIPLE  8
+
+/* 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 E1000_TIPG_IPGR2_SHIFT  20
+
+#define E1000_TXDMAC_DPP 0x00000001
+
+/* Adaptive IFS defines */
+#define TX_THRESHOLD_START     8
+#define TX_THRESHOLD_INCREMENT 10
+#define TX_THRESHOLD_DECREMENT 1
+#define TX_THRESHOLD_STOP      190
+#define TX_THRESHOLD_DISABLE   0
+#define TX_THRESHOLD_TIMER_MS  10000
+#define MIN_NUM_XMITS          1000
+#define IFS_MAX                80
+#define IFS_STEP               10
+#define IFS_MIN                40
+#define IFS_RATIO              4
+
+/* Extended Configuration Control and Size */
+#define E1000_EXTCNF_CTRL_PCIE_WRITE_ENABLE 0x00000001
+#define E1000_EXTCNF_CTRL_PHY_WRITE_ENABLE  0x00000002
+#define E1000_EXTCNF_CTRL_D_UD_ENABLE       0x00000004
+#define E1000_EXTCNF_CTRL_D_UD_LATENCY      0x00000008
+#define E1000_EXTCNF_CTRL_D_UD_OWNER        0x00000010
+#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP 0x00000020
+#define E1000_EXTCNF_CTRL_MDIO_HW_OWNERSHIP 0x00000040
+#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER   0x0FFF0000
+
+#define E1000_EXTCNF_SIZE_EXT_PHY_LENGTH    0x000000FF
+#define E1000_EXTCNF_SIZE_EXT_DOCK_LENGTH   0x0000FF00
+#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH   0x00FF0000
+#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE  0x00000001
+#define E1000_EXTCNF_CTRL_SWFLAG            0x00000020
+
+/* PBA constants */
+#define E1000_PBA_8K 0x0008    /* 8KB, default Rx allocation */
+#define E1000_PBA_12K 0x000C   /* 12KB, default Rx allocation */
+#define E1000_PBA_16K 0x0010   /* 16KB, default TX allocation */
+#define E1000_PBA_20K 0x0014
+#define E1000_PBA_22K 0x0016
+#define E1000_PBA_24K 0x0018
+#define E1000_PBA_30K 0x001E
+#define E1000_PBA_32K 0x0020
+#define E1000_PBA_34K 0x0022
+#define E1000_PBA_38K 0x0026
+#define E1000_PBA_40K 0x0028
+#define E1000_PBA_48K 0x0030   /* 48KB, default RX allocation */
+
+#define E1000_PBS_16K E1000_PBA_16K
+
+/* Flow Control Constants */
+#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
+#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
+#define FLOW_CONTROL_TYPE         0x8808
+
+/* The historical defaults for the flow control values are given below. */
+#define FC_DEFAULT_HI_THRESH        (0x8000)   /* 32KB */
+#define FC_DEFAULT_LO_THRESH        (0x4000)   /* 16KB */
+#define FC_DEFAULT_TX_TIMER         (0x100)    /* ~130 us */
+
+/* PCIX Config space */
+#define PCIX_COMMAND_REGISTER    0xE6
+#define PCIX_STATUS_REGISTER_LO  0xE8
+#define PCIX_STATUS_REGISTER_HI  0xEA
+
+#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
+
+/* Number of bits required to shift right the "pause" bits from the
+ * EEPROM (bits 13:12) to the "pause" (bits 8:7) field in the TXCW register.
+ */
+#define PAUSE_SHIFT 5
+
+/* Number of bits required to shift left the "SWDPIO" bits from the
+ * EEPROM (bits 8:5) to the "SWDPIO" (bits 25:22) field in the CTRL register.
+ */
+#define SWDPIO_SHIFT 17
+
+/* Number of bits required to shift left the "SWDPIO_EXT" bits from the
+ * EEPROM word F (bits 7:4) to the bits 11:8 of The Extended CTRL register.
+ */
+#define SWDPIO__EXT_SHIFT 4
+
+/* Number of bits required to shift left the "ILOS" bit from the EEPROM
+ * (bit 4) to the "ILOS" (bit 7) field in the CTRL register.
+ */
+#define ILOS_SHIFT  3
+
+#define RECEIVE_BUFFER_ALIGN_SIZE  (256)
+
+/* Number of milliseconds we wait for auto-negotiation to complete */
+#define LINK_UP_TIMEOUT             500
+
+/* Number of milliseconds we wait for Eeprom auto read bit done after MAC reset */
+#define AUTO_READ_DONE_TIMEOUT      10
+/* Number of milliseconds we wait for PHY configuration done after MAC reset */
+#define PHY_CFG_TIMEOUT             100
+
+#define E1000_TX_BUFFER_SIZE ((u32)1514)
+
+/* The carrier extension symbol, as received by the NIC. */
+#define CARRIER_EXTENSION   0x0F
+
+/* 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;
+ *  }
+ *  ...
+ */
+
+#define TBI_ACCEPT(adapter, status, errors, length, last_byte) \
+    ((adapter)->tbi_compatibility_on && \
+     (((errors) & E1000_RXD_ERR_FRAME_ERR_MASK) == E1000_RXD_ERR_CE) && \
+     ((last_byte) == CARRIER_EXTENSION) && \
+     (((status) & E1000_RXD_STAT_VP) ? \
+          (((length) > ((adapter)->min_frame_size - VLAN_TAG_SIZE)) && \
+           ((length) <= ((adapter)->max_frame_size + 1))) : \
+          (((length) > (adapter)->min_frame_size) && \
+           ((length) <= ((adapter)->max_frame_size + VLAN_TAG_SIZE + 1)))))
+
+/* Structures, enums, and macros for the PHY */
+
+/* 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
+
+/* PHY 1000 MII Register/Bit Definitions */
+/* PHY Registers defined by IEEE */
+#define PHY_CTRL         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 MAX_PHY_REG_ADDRESS        0x1F        /* 5 bit address bus (0-0x1F) */
+#define MAX_PHY_MULTI_PAGE_REG     0xF /* Registers equal on all pages */
+
+/* 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 */
+
+#define IGP01E1000_IEEE_REGS_PAGE  0x0000
+#define IGP01E1000_IEEE_RESTART_AUTONEG 0x3300
+#define IGP01E1000_IEEE_FORCE_GIGA      0x0140
+
+/* IGP01E1000 Specific Registers */
+#define IGP01E1000_PHY_PORT_CONFIG 0x10        /* PHY Specific Port Config Register */
+#define IGP01E1000_PHY_PORT_STATUS 0x11        /* PHY Specific Status Register */
+#define IGP01E1000_PHY_PORT_CTRL   0x12        /* PHY Specific Control Register */
+#define IGP01E1000_PHY_LINK_HEALTH 0x13        /* PHY Link Health Register */
+#define IGP01E1000_GMII_FIFO       0x14        /* GMII FIFO Register */
+#define IGP01E1000_PHY_CHANNEL_QUALITY 0x15    /* PHY Channel Quality Register */
+#define IGP02E1000_PHY_POWER_MGMT      0x19
+#define IGP01E1000_PHY_PAGE_SELECT     0x1F    /* PHY Page Select Core Register */
+
+/* IGP01E1000 AGC Registers - stores the cable length values*/
+#define IGP01E1000_PHY_AGC_A        0x1172
+#define IGP01E1000_PHY_AGC_B        0x1272
+#define IGP01E1000_PHY_AGC_C        0x1472
+#define IGP01E1000_PHY_AGC_D        0x1872
+
+/* IGP02E1000 AGC Registers for cable length values */
+#define IGP02E1000_PHY_AGC_A        0x11B1
+#define IGP02E1000_PHY_AGC_B        0x12B1
+#define IGP02E1000_PHY_AGC_C        0x14B1
+#define IGP02E1000_PHY_AGC_D        0x18B1
+
+/* IGP01E1000 DSP Reset Register */
+#define IGP01E1000_PHY_DSP_RESET   0x1F33
+#define IGP01E1000_PHY_DSP_SET     0x1F71
+#define IGP01E1000_PHY_DSP_FFE     0x1F35
+
+#define IGP01E1000_PHY_CHANNEL_NUM    4
+#define IGP02E1000_PHY_CHANNEL_NUM    4
+
+#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_ANALOG_TX_STATE      0x2890
+#define IGP01E1000_PHY_ANALOG_CLASS_A       0x2000
+#define IGP01E1000_PHY_FORCE_ANALOG_ENABLE  0x0004
+#define IGP01E1000_PHY_DSP_FFE_CM_CP        0x0069
+
+#define IGP01E1000_PHY_DSP_FFE_DEFAULT      0x002A
+/* IGP01E1000 PCS Initialization register - stores the polarity status when
+ * speed = 1000 Mbps. */
+#define IGP01E1000_PHY_PCS_INIT_REG  0x00B4
+#define IGP01E1000_PHY_PCS_CTRL_REG  0x00B5
+
+#define IGP01E1000_ANALOG_REGS_PAGE  0x20C0
+
+/* 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 */
+
+/* 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 */
+
+/* Next Page TX Register */
+#define NPTX_MSG_CODE_FIELD 0x0001     /* NP msg code or unformatted data */
+#define NPTX_TOGGLE         0x0800     /* Toggles between exchanges
+                                        * of different NP
+                                        */
+#define NPTX_ACKNOWLDGE2    0x1000     /* 1 = will comply with msg
+                                        * 0 = cannot comply with msg
+                                        */
+#define NPTX_MSG_PAGE       0x2000     /* formatted(1)/unformatted(0) pg */
+#define NPTX_NEXT_PAGE      0x8000     /* 1 = addition NP will follow
+                                        * 0 = sending last NP
+                                        */
+
+/* Link Partner Next Page Register */
+#define LP_RNPR_MSG_CODE_FIELD 0x0001  /* NP msg code or unformatted data */
+#define LP_RNPR_TOGGLE         0x0800  /* Toggles between exchanges
+                                        * of different NP
+                                        */
+#define LP_RNPR_ACKNOWLDGE2    0x1000  /* 1 = will comply with msg
+                                        * 0 = cannot comply with msg
+                                        */
+#define LP_RNPR_MSG_PAGE       0x2000  /* formatted(1)/unformatted(0) pg */
+#define LP_RNPR_ACKNOWLDGE     0x4000  /* 1 = ACK / 0 = NO ACK */
+#define LP_RNPR_NEXT_PAGE      0x8000  /* 1 = addition NP will follow
+                                        * 0 = sending last NP
+                                        */
+
+/* 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_REMOTE_RX_STATUS_SHIFT          12
+#define SR_1000T_LOCAL_RX_STATUS_SHIFT           13
+#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT    5
+#define FFE_IDLE_ERR_COUNT_TIMEOUT_20            20
+#define FFE_IDLE_ERR_COUNT_TIMEOUT_100           100
+
+/* Extended Status Register */
+#define IEEE_ESR_1000T_HD_CAPS 0x1000  /* 1000T HD capable */
+#define IEEE_ESR_1000T_FD_CAPS 0x2000  /* 1000T FD capable */
+#define IEEE_ESR_1000X_HD_CAPS 0x4000  /* 1000X HD capable */
+#define IEEE_ESR_1000X_FD_CAPS 0x8000  /* 1000X FD capable */
+
+#define PHY_TX_POLARITY_MASK   0x0100  /* register 10h bit 8 (polarity bit) */
+#define PHY_TX_NORMAL_POLARITY 0       /* register 10h bit 8 (normal polarity) */
+
+#define AUTO_POLARITY_DISABLE  0x0010  /* register 11h bit 4 */
+                                     /* (0=enable, 1=disable) */
+
+/* M88E1000 PHY Specific Control Register */
+#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
+#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
+#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
+#define M88E1000_PSCR_CLK125_DISABLE    0x0010 /* 1=CLK125 low,
+                                                * 0=CLK125 toggling
+                                                */
+#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 */
+#define M88E1000_PSCR_AUTO_X_1000T     0x0040  /* 1000BASE-T: Auto crossover,
+                                                *  100BASE-TX/10BASE-T:
+                                                *  MDI Mode
+                                                */
+#define M88E1000_PSCR_AUTO_X_MODE      0x0060  /* Auto crossover enabled
+                                                * all speeds.
+                                                */
+#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE 0x0080
+                                       /* 1=Enable Extended 10BASE-T distance
+                                        * (Lower 10BASE-T RX Threshold)
+                                        * 0=Normal 10BASE-T RX Threshold */
+#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
+                                       /* 1=5-Bit interface in 100BASE-TX
+                                        * 0=MII interface in 100BASE-TX */
+#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 Transmit */
+
+#define M88E1000_PSCR_POLARITY_REVERSAL_SHIFT    1
+#define M88E1000_PSCR_AUTO_X_MODE_SHIFT          5
+#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT 7
+
+/* 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 */
+#define M88E1000_PSSR_CABLE_LENGTH       0x0380        /* 0=<50M;1=50-80M;2=80-110M;
+                                                * 3=110-140M;4=>140M */
+#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_REV_POLARITY_SHIFT 1
+#define M88E1000_PSSR_DOWNSHIFT_SHIFT    5
+#define M88E1000_PSSR_MDIX_SHIFT         6
+#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
+
+/* M88E1000 Extended PHY Specific Control Register */
+#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000   /* 1=Fiber loopback */
+#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000   /* 1=Lost lock detect enabled.
+                                                * Will assert lost lock and bring
+                                                * link down if idle not seen
+                                                * within 1ms in 1000BASE-T
+                                                */
+/* 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
+
+/* IGP01E1000 Specific Port Config Register - R/W */
+#define IGP01E1000_PSCFR_AUTO_MDIX_PAR_DETECT  0x0010
+#define IGP01E1000_PSCFR_PRE_EN                0x0020
+#define IGP01E1000_PSCFR_SMART_SPEED           0x0080
+#define IGP01E1000_PSCFR_DISABLE_TPLOOPBACK    0x0100
+#define IGP01E1000_PSCFR_DISABLE_JABBER        0x0400
+#define IGP01E1000_PSCFR_DISABLE_TRANSMIT      0x2000
+
+/* IGP01E1000 Specific Port Status Register - R/O */
+#define IGP01E1000_PSSR_AUTONEG_FAILED         0x0001  /* RO LH SC */
+#define IGP01E1000_PSSR_POLARITY_REVERSED      0x0002
+#define IGP01E1000_PSSR_CABLE_LENGTH           0x007C
+#define IGP01E1000_PSSR_FULL_DUPLEX            0x0200
+#define IGP01E1000_PSSR_LINK_UP                0x0400
+#define IGP01E1000_PSSR_MDIX                   0x0800
+#define IGP01E1000_PSSR_SPEED_MASK             0xC000  /* speed bits mask */
+#define IGP01E1000_PSSR_SPEED_10MBPS           0x4000
+#define IGP01E1000_PSSR_SPEED_100MBPS          0x8000
+#define IGP01E1000_PSSR_SPEED_1000MBPS         0xC000
+#define IGP01E1000_PSSR_CABLE_LENGTH_SHIFT     0x0002  /* shift right 2 */
+#define IGP01E1000_PSSR_MDIX_SHIFT             0x000B  /* shift right 11 */
+
+/* IGP01E1000 Specific Port Control Register - R/W */
+#define IGP01E1000_PSCR_TP_LOOPBACK            0x0010
+#define IGP01E1000_PSCR_CORRECT_NC_SCMBLR      0x0200
+#define IGP01E1000_PSCR_TEN_CRS_SELECT         0x0400
+#define IGP01E1000_PSCR_FLIP_CHIP              0x0800
+#define IGP01E1000_PSCR_AUTO_MDIX              0x1000
+#define IGP01E1000_PSCR_FORCE_MDI_MDIX         0x2000  /* 0-MDI, 1-MDIX */
+
+/* IGP01E1000 Specific Port Link Health Register */
+#define IGP01E1000_PLHR_SS_DOWNGRADE           0x8000
+#define IGP01E1000_PLHR_GIG_SCRAMBLER_ERROR    0x4000
+#define IGP01E1000_PLHR_MASTER_FAULT           0x2000
+#define IGP01E1000_PLHR_MASTER_RESOLUTION      0x1000
+#define IGP01E1000_PLHR_GIG_REM_RCVR_NOK       0x0800  /* LH */
+#define IGP01E1000_PLHR_IDLE_ERROR_CNT_OFLOW   0x0400  /* LH */
+#define IGP01E1000_PLHR_DATA_ERR_1             0x0200  /* LH */
+#define IGP01E1000_PLHR_DATA_ERR_0             0x0100
+#define IGP01E1000_PLHR_AUTONEG_FAULT          0x0040
+#define IGP01E1000_PLHR_AUTONEG_ACTIVE         0x0010
+#define IGP01E1000_PLHR_VALID_CHANNEL_D        0x0008
+#define IGP01E1000_PLHR_VALID_CHANNEL_C        0x0004
+#define IGP01E1000_PLHR_VALID_CHANNEL_B        0x0002
+#define IGP01E1000_PLHR_VALID_CHANNEL_A        0x0001
+
+/* IGP01E1000 Channel Quality Register */
+#define IGP01E1000_MSE_CHANNEL_D        0x000F
+#define IGP01E1000_MSE_CHANNEL_C        0x00F0
+#define IGP01E1000_MSE_CHANNEL_B        0x0F00
+#define IGP01E1000_MSE_CHANNEL_A        0xF000
+
+#define IGP02E1000_PM_SPD                         0x0001       /* Smart Power Down */
+#define IGP02E1000_PM_D3_LPLU                     0x0004       /* Enable LPLU in non-D0a modes */
+#define IGP02E1000_PM_D0_LPLU                     0x0002       /* Enable LPLU in D0a mode */
+
+/* IGP01E1000 DSP reset macros */
+#define DSP_RESET_ENABLE     0x0
+#define DSP_RESET_DISABLE    0x2
+#define E1000_MAX_DSP_RESETS 10
+
+/* IGP01E1000 & IGP02E1000 AGC Registers */
+
+#define IGP01E1000_AGC_LENGTH_SHIFT 7  /* Coarse - 13:11, Fine - 10:7 */
+#define IGP02E1000_AGC_LENGTH_SHIFT 9  /* Coarse - 15:13, Fine - 12:9 */
+
+/* IGP02E1000 AGC Register Length 9-bit mask */
+#define IGP02E1000_AGC_LENGTH_MASK  0x7F
+
+/* 7 bits (3 Coarse + 4 Fine) --> 128 optional values */
+#define IGP01E1000_AGC_LENGTH_TABLE_SIZE 128
+#define IGP02E1000_AGC_LENGTH_TABLE_SIZE 113
+
+/* The precision error of the cable length is +/- 10 meters */
+#define IGP01E1000_AGC_RANGE    10
+#define IGP02E1000_AGC_RANGE    15
+
+/* IGP01E1000 PCS Initialization register */
+/* bits 3:6 in the PCS registers stores the channels polarity */
+#define IGP01E1000_PHY_POLARITY_MASK    0x0078
+
+/* IGP01E1000 GMII FIFO Register */
+#define IGP01E1000_GMII_FLEX_SPD               0x10    /* Enable flexible speed
+                                                        * on Link-Up */
+#define IGP01E1000_GMII_SPD                    0x20    /* Enable SPD */
+
+/* IGP01E1000 Analog Register */
+#define IGP01E1000_ANALOG_SPARE_FUSE_STATUS       0x20D1
+#define IGP01E1000_ANALOG_FUSE_STATUS             0x20D0
+#define IGP01E1000_ANALOG_FUSE_CONTROL            0x20DC
+#define IGP01E1000_ANALOG_FUSE_BYPASS             0x20DE
+
+#define IGP01E1000_ANALOG_FUSE_POLY_MASK            0xF000
+#define IGP01E1000_ANALOG_FUSE_FINE_MASK            0x0F80
+#define IGP01E1000_ANALOG_FUSE_COARSE_MASK          0x0070
+#define IGP01E1000_ANALOG_SPARE_FUSE_ENABLED        0x0100
+#define IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL    0x0002
+
+#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
+
+/* Bit definitions for valid PHY IDs. */
+/* I = Integrated
+ * E = External
+ */
+#define M88_VENDOR         0x0141
+#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 M88E1000_12_PHY_ID M88E1000_E_PHY_ID
+#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
+#define M88E1011_I_REV_4   0x04
+#define M88E1111_I_PHY_ID  0x01410CC0
+#define M88E1118_E_PHY_ID  0x01410E40
+#define L1LXT971A_PHY_ID   0x001378E0
+
+#define RTL8211B_PHY_ID    0x001CC910
+#define RTL8201N_PHY_ID    0x8200
+#define RTL_PHY_CTRL_FD    0x0100 /* Full duplex.0=half; 1=full */
+#define RTL_PHY_CTRL_SPD_100    0x200000 /* Force 100Mb */
+
+/* Bits...
+ * 15-5: page
+ * 4-0: register offset
+ */
+#define PHY_PAGE_SHIFT        5
+#define PHY_REG(page, reg)    \
+        (((page) << PHY_PAGE_SHIFT) | ((reg) & MAX_PHY_REG_ADDRESS))
+
+#define IGP3_PHY_PORT_CTRL           \
+        PHY_REG(769, 17)       /* Port General Configuration */
+#define IGP3_PHY_RATE_ADAPT_CTRL \
+        PHY_REG(769, 25)       /* Rate Adapter Control Register */
+
+#define IGP3_KMRN_FIFO_CTRL_STATS \
+        PHY_REG(770, 16)       /* KMRN FIFO's control/status register */
+#define IGP3_KMRN_POWER_MNG_CTRL \
+        PHY_REG(770, 17)       /* KMRN Power Management Control Register */
+#define IGP3_KMRN_INBAND_CTRL \
+        PHY_REG(770, 18)       /* KMRN Inband Control Register */
+#define IGP3_KMRN_DIAG \
+        PHY_REG(770, 19)       /* KMRN Diagnostic register */
+#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS 0x0002    /* RX PCS is not synced */
+#define IGP3_KMRN_ACK_TIMEOUT \
+        PHY_REG(770, 20)       /* KMRN Acknowledge Timeouts register */
+
+#define IGP3_VR_CTRL \
+        PHY_REG(776, 18)       /* Voltage regulator control register */
+#define IGP3_VR_CTRL_MODE_SHUT       0x0200    /* Enter powerdown, shutdown VRs */
+#define IGP3_VR_CTRL_MODE_MASK       0x0300    /* Shutdown VR Mask */
+
+#define IGP3_CAPABILITY \
+        PHY_REG(776, 19)       /* IGP3 Capability Register */
+
+/* Capabilities for SKU Control  */
+#define IGP3_CAP_INITIATE_TEAM       0x0001    /* Able to initiate a team */
+#define IGP3_CAP_WFM                 0x0002    /* Support WoL and PXE */
+#define IGP3_CAP_ASF                 0x0004    /* Support ASF */
+#define IGP3_CAP_LPLU                0x0008    /* Support Low Power Link Up */
+#define IGP3_CAP_DC_AUTO_SPEED       0x0010    /* Support AC/DC Auto Link Speed */
+#define IGP3_CAP_SPD                 0x0020    /* Support Smart Power Down */
+#define IGP3_CAP_MULT_QUEUE          0x0040    /* Support 2 tx & 2 rx queues */
+#define IGP3_CAP_RSS                 0x0080    /* Support RSS */
+#define IGP3_CAP_8021PQ              0x0100    /* Support 802.1Q & 802.1p */
+#define IGP3_CAP_AMT_CB              0x0200    /* Support active manageability and circuit breaker */
+
+#define IGP3_PPC_JORDAN_EN           0x0001
+#define IGP3_PPC_JORDAN_GIGA_SPEED   0x0002
+
+#define IGP3_KMRN_PMC_EE_IDLE_LINK_DIS         0x0001
+#define IGP3_KMRN_PMC_K0S_ENTRY_LATENCY_MASK   0x001E
+#define IGP3_KMRN_PMC_K0S_MODE1_EN_GIGA        0x0020
+#define IGP3_KMRN_PMC_K0S_MODE1_EN_100         0x0040
+
+#define IGP3E1000_PHY_MISC_CTRL                0x1B    /* Misc. Ctrl register */
+#define IGP3_PHY_MISC_DUPLEX_MANUAL_SET        0x1000  /* Duplex Manual Set */
+
+#define IGP3_KMRN_EXT_CTRL  PHY_REG(770, 18)
+#define IGP3_KMRN_EC_DIS_INBAND    0x0080
+
+#define IGP03E1000_E_PHY_ID  0x02A80390
+#define IFE_E_PHY_ID         0x02A80330        /* 10/100 PHY */
+#define IFE_PLUS_E_PHY_ID    0x02A80320
+#define IFE_C_E_PHY_ID       0x02A80310
+
+#define IFE_PHY_EXTENDED_STATUS_CONTROL   0x10 /* 100BaseTx Extended Status, Control and Address */
+#define IFE_PHY_SPECIAL_CONTROL           0x11 /* 100BaseTx PHY special control register */
+#define IFE_PHY_RCV_FALSE_CARRIER         0x13 /* 100BaseTx Receive False Carrier Counter */
+#define IFE_PHY_RCV_DISCONNECT            0x14 /* 100BaseTx Receive Disconnect Counter */
+#define IFE_PHY_RCV_ERROT_FRAME           0x15 /* 100BaseTx Receive Error Frame Counter */
+#define IFE_PHY_RCV_SYMBOL_ERR            0x16 /* Receive Symbol Error Counter */
+#define IFE_PHY_PREM_EOF_ERR              0x17 /* 100BaseTx Receive Premature End Of Frame Error Counter */
+#define IFE_PHY_RCV_EOF_ERR               0x18 /* 10BaseT Receive End Of Frame Error Counter */
+#define IFE_PHY_TX_JABBER_DETECT          0x19 /* 10BaseT Transmit Jabber Detect Counter */
+#define IFE_PHY_EQUALIZER                 0x1A /* PHY Equalizer Control and Status */
+#define IFE_PHY_SPECIAL_CONTROL_LED       0x1B /* PHY special control and LED configuration */
+#define IFE_PHY_MDIX_CONTROL              0x1C /* MDI/MDI-X Control register */
+#define IFE_PHY_HWI_CONTROL               0x1D /* Hardware Integrity Control (HWI) */
+
+#define IFE_PESC_REDUCED_POWER_DOWN_DISABLE  0x2000    /* Default 1 = Disable auto reduced power down */
+#define IFE_PESC_100BTX_POWER_DOWN           0x0400    /* Indicates the power state of 100BASE-TX */
+#define IFE_PESC_10BTX_POWER_DOWN            0x0200    /* Indicates the power state of 10BASE-T */
+#define IFE_PESC_POLARITY_REVERSED           0x0100    /* Indicates 10BASE-T polarity */
+#define IFE_PESC_PHY_ADDR_MASK               0x007C    /* Bit 6:2 for sampled PHY address */
+#define IFE_PESC_SPEED                       0x0002    /* Auto-negotiation speed result 1=100Mbs, 0=10Mbs */
+#define IFE_PESC_DUPLEX                      0x0001    /* Auto-negotiation duplex result 1=Full, 0=Half */
+#define IFE_PESC_POLARITY_REVERSED_SHIFT     8
+
+#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN   0x0100    /* 1 = Dynamic Power Down disabled */
+#define IFE_PSC_FORCE_POLARITY               0x0020    /* 1=Reversed Polarity, 0=Normal */
+#define IFE_PSC_AUTO_POLARITY_DISABLE        0x0010    /* 1=Auto Polarity Disabled, 0=Enabled */
+#define IFE_PSC_JABBER_FUNC_DISABLE          0x0001    /* 1=Jabber Disabled, 0=Normal Jabber Operation */
+#define IFE_PSC_FORCE_POLARITY_SHIFT         5
+#define IFE_PSC_AUTO_POLARITY_DISABLE_SHIFT  4
+
+#define IFE_PMC_AUTO_MDIX                    0x0080    /* 1=enable MDI/MDI-X feature, default 0=disabled */
+#define IFE_PMC_FORCE_MDIX                   0x0040    /* 1=force MDIX-X, 0=force MDI */
+#define IFE_PMC_MDIX_STATUS                  0x0020    /* 1=MDI-X, 0=MDI */
+#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010    /* Resolution algorithm is completed */
+#define IFE_PMC_MDIX_MODE_SHIFT              6
+#define IFE_PHC_MDIX_RESET_ALL_MASK          0x0000    /* Disable auto MDI-X */
+
+#define IFE_PHC_HWI_ENABLE                   0x8000    /* Enable the HWI feature */
+#define IFE_PHC_ABILITY_CHECK                0x4000    /* 1= Test Passed, 0=failed */
+#define IFE_PHC_TEST_EXEC                    0x2000    /* PHY launch test pulses on the wire */
+#define IFE_PHC_HIGHZ                        0x0200    /* 1 = Open Circuit */
+#define IFE_PHC_LOWZ                         0x0400    /* 1 = Short Circuit */
+#define IFE_PHC_LOW_HIGH_Z_MASK              0x0600    /* Mask for indication type of problem on the line */
+#define IFE_PHC_DISTANCE_MASK                0x01FF    /* Mask for distance to the cable problem, in 80cm granularity */
+#define IFE_PHC_RESET_ALL_MASK               0x0000    /* Disable HWI */
+#define IFE_PSCL_PROBE_MODE                  0x0020    /* LED Probe mode */
+#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 */
+
+#define ICH_FLASH_COMMAND_TIMEOUT            5000      /* 5000 uSecs - adjusted */
+#define ICH_FLASH_ERASE_TIMEOUT              3000000   /* Up to 3 seconds - worst case */
+#define ICH_FLASH_CYCLE_REPEAT_COUNT         10        /* 10 cycles */
+#define ICH_FLASH_SEG_SIZE_256               256
+#define ICH_FLASH_SEG_SIZE_4K                4096
+#define ICH_FLASH_SEG_SIZE_64K               65536
+
+#define ICH_CYCLE_READ                       0x0
+#define ICH_CYCLE_RESERVED                   0x1
+#define ICH_CYCLE_WRITE                      0x2
+#define ICH_CYCLE_ERASE                      0x3
+
+#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
+#define ICH_FLASH_FRACC    0x0050
+#define ICH_FLASH_FREG0    0x0054
+#define ICH_FLASH_FREG1    0x0058
+#define ICH_FLASH_FREG2    0x005C
+#define ICH_FLASH_FREG3    0x0060
+#define ICH_FLASH_FPR0     0x0074
+#define ICH_FLASH_FPR1     0x0078
+#define ICH_FLASH_SSFSTS   0x0090
+#define ICH_FLASH_SSFCTL   0x0092
+#define ICH_FLASH_PREOP    0x0094
+#define ICH_FLASH_OPTYPE   0x0096
+#define ICH_FLASH_OPMENU   0x0098
+
+#define ICH_FLASH_REG_MAPSIZE      0x00A0
+#define ICH_FLASH_SECTOR_SIZE      4096
+#define ICH_GFPREG_BASE_MASK       0x1FFF
+#define ICH_FLASH_LINEAR_ADDR_MASK 0x00FFFFFF
+
+/* Miscellaneous PHY bit definitions. */
+#define PHY_PREAMBLE        0xFFFFFFFF
+#define PHY_SOF             0x01
+#define PHY_OP_READ         0x02
+#define PHY_OP_WRITE        0x01
+#define PHY_TURNAROUND      0x02
+#define PHY_PREAMBLE_SIZE   32
+#define MII_CR_SPEED_1000   0x0040
+#define MII_CR_SPEED_100    0x2000
+#define MII_CR_SPEED_10     0x0000
+#define E1000_PHY_ADDRESS   0x01
+#define PHY_AUTO_NEG_TIME   45 /* 4.5 Seconds */
+#define PHY_FORCE_TIME      20 /* 2.0 Seconds */
+#define PHY_REVISION_MASK   0xFFFFFFF0
+#define DEVICE_SPEED_MASK   0x00000300 /* Device Ctrl Reg Speed Mask */
+#define REG4_SPEED_MASK     0x01E0
+#define REG9_SPEED_MASK     0x0300
+#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
+#define ADVERTISE_1000_FULL 0x0020
+#define AUTONEG_ADVERTISE_SPEED_DEFAULT 0x002F /* Everything but 1000-Half */
+#define AUTONEG_ADVERTISE_10_100_ALL    0x000F /* All 10/100 speeds */
+#define AUTONEG_ADVERTISE_10_ALL        0x0003 /* 10Mbps Full & Half speeds */
+
+#endif /* _E1000_HW_H_ */
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
new file mode 100644 (file)
index 0000000..f97afda
--- /dev/null
@@ -0,0 +1,4974 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+*******************************************************************************/
+
+#include "e1000.h"
+#include <net/ip6_checksum.h>
+#include <linux/io.h>
+#include <linux/prefetch.h>
+#include <linux/bitops.h>
+#include <linux/if_vlan.h>
+
+/* Intel Media SOC GbE MDIO physical base address */
+static unsigned long ce4100_gbe_mdio_base_phy;
+/* Intel Media SOC GbE MDIO virtual base address */
+void __iomem *ce4100_gbe_mdio_base_virt;
+
+char e1000_driver_name[] = "e1000";
+static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
+#define DRV_VERSION "7.3.21-k8-NAPI"
+const char e1000_driver_version[] = DRV_VERSION;
+static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
+
+/* e1000_pci_tbl - PCI Device ID Table
+ *
+ * Last entry must be all 0s
+ *
+ * Macro expands to...
+ *   {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
+ */
+static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
+       INTEL_E1000_ETHERNET_DEVICE(0x1000),
+       INTEL_E1000_ETHERNET_DEVICE(0x1001),
+       INTEL_E1000_ETHERNET_DEVICE(0x1004),
+       INTEL_E1000_ETHERNET_DEVICE(0x1008),
+       INTEL_E1000_ETHERNET_DEVICE(0x1009),
+       INTEL_E1000_ETHERNET_DEVICE(0x100C),
+       INTEL_E1000_ETHERNET_DEVICE(0x100D),
+       INTEL_E1000_ETHERNET_DEVICE(0x100E),
+       INTEL_E1000_ETHERNET_DEVICE(0x100F),
+       INTEL_E1000_ETHERNET_DEVICE(0x1010),
+       INTEL_E1000_ETHERNET_DEVICE(0x1011),
+       INTEL_E1000_ETHERNET_DEVICE(0x1012),
+       INTEL_E1000_ETHERNET_DEVICE(0x1013),
+       INTEL_E1000_ETHERNET_DEVICE(0x1014),
+       INTEL_E1000_ETHERNET_DEVICE(0x1015),
+       INTEL_E1000_ETHERNET_DEVICE(0x1016),
+       INTEL_E1000_ETHERNET_DEVICE(0x1017),
+       INTEL_E1000_ETHERNET_DEVICE(0x1018),
+       INTEL_E1000_ETHERNET_DEVICE(0x1019),
+       INTEL_E1000_ETHERNET_DEVICE(0x101A),
+       INTEL_E1000_ETHERNET_DEVICE(0x101D),
+       INTEL_E1000_ETHERNET_DEVICE(0x101E),
+       INTEL_E1000_ETHERNET_DEVICE(0x1026),
+       INTEL_E1000_ETHERNET_DEVICE(0x1027),
+       INTEL_E1000_ETHERNET_DEVICE(0x1028),
+       INTEL_E1000_ETHERNET_DEVICE(0x1075),
+       INTEL_E1000_ETHERNET_DEVICE(0x1076),
+       INTEL_E1000_ETHERNET_DEVICE(0x1077),
+       INTEL_E1000_ETHERNET_DEVICE(0x1078),
+       INTEL_E1000_ETHERNET_DEVICE(0x1079),
+       INTEL_E1000_ETHERNET_DEVICE(0x107A),
+       INTEL_E1000_ETHERNET_DEVICE(0x107B),
+       INTEL_E1000_ETHERNET_DEVICE(0x107C),
+       INTEL_E1000_ETHERNET_DEVICE(0x108A),
+       INTEL_E1000_ETHERNET_DEVICE(0x1099),
+       INTEL_E1000_ETHERNET_DEVICE(0x10B5),
+       INTEL_E1000_ETHERNET_DEVICE(0x2E6E),
+       /* required last entry */
+       {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
+
+int e1000_up(struct e1000_adapter *adapter);
+void e1000_down(struct e1000_adapter *adapter);
+void e1000_reinit_locked(struct e1000_adapter *adapter);
+void e1000_reset(struct e1000_adapter *adapter);
+int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
+int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
+void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
+void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
+static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
+                             struct e1000_tx_ring *txdr);
+static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
+                             struct e1000_rx_ring *rxdr);
+static void e1000_free_tx_resources(struct e1000_adapter *adapter,
+                             struct e1000_tx_ring *tx_ring);
+static void e1000_free_rx_resources(struct e1000_adapter *adapter,
+                             struct e1000_rx_ring *rx_ring);
+void e1000_update_stats(struct e1000_adapter *adapter);
+
+static int e1000_init_module(void);
+static void e1000_exit_module(void);
+static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+static void __devexit e1000_remove(struct pci_dev *pdev);
+static int e1000_alloc_queues(struct e1000_adapter *adapter);
+static int e1000_sw_init(struct e1000_adapter *adapter);
+static int e1000_open(struct net_device *netdev);
+static int e1000_close(struct net_device *netdev);
+static void e1000_configure_tx(struct e1000_adapter *adapter);
+static void e1000_configure_rx(struct e1000_adapter *adapter);
+static void e1000_setup_rctl(struct e1000_adapter *adapter);
+static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter);
+static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter);
+static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
+                                struct e1000_tx_ring *tx_ring);
+static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
+                                struct e1000_rx_ring *rx_ring);
+static void e1000_set_rx_mode(struct net_device *netdev);
+static void e1000_update_phy_info(unsigned long data);
+static void e1000_update_phy_info_task(struct work_struct *work);
+static void e1000_watchdog(unsigned long data);
+static void e1000_82547_tx_fifo_stall(unsigned long data);
+static void e1000_82547_tx_fifo_stall_task(struct work_struct *work);
+static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
+                                   struct net_device *netdev);
+static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
+static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
+static int e1000_set_mac(struct net_device *netdev, void *p);
+static irqreturn_t e1000_intr(int irq, void *data);
+static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
+                              struct e1000_tx_ring *tx_ring);
+static int e1000_clean(struct napi_struct *napi, int budget);
+static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                              struct e1000_rx_ring *rx_ring,
+                              int *work_done, int work_to_do);
+static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
+                                    struct e1000_rx_ring *rx_ring,
+                                    int *work_done, int work_to_do);
+static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
+                                  struct e1000_rx_ring *rx_ring,
+                                  int cleaned_count);
+static void e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
+                                        struct e1000_rx_ring *rx_ring,
+                                        int cleaned_count);
+static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
+static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
+                          int cmd);
+static void e1000_enter_82542_rst(struct e1000_adapter *adapter);
+static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
+static void e1000_tx_timeout(struct net_device *dev);
+static void e1000_reset_task(struct work_struct *work);
+static void e1000_smartspeed(struct e1000_adapter *adapter);
+static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
+                                       struct sk_buff *skb);
+
+static bool e1000_vlan_used(struct e1000_adapter *adapter);
+static void e1000_vlan_mode(struct net_device *netdev, u32 features);
+static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+static void e1000_restore_vlan(struct e1000_adapter *adapter);
+
+#ifdef CONFIG_PM
+static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
+static int e1000_resume(struct pci_dev *pdev);
+#endif
+static void e1000_shutdown(struct pci_dev *pdev);
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/* for netdump / net console */
+static void e1000_netpoll (struct net_device *netdev);
+#endif
+
+#define COPYBREAK_DEFAULT 256
+static unsigned int copybreak __read_mostly = COPYBREAK_DEFAULT;
+module_param(copybreak, uint, 0644);
+MODULE_PARM_DESC(copybreak,
+       "Maximum size of packet that is copied to a new buffer on receive");
+
+static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
+                     pci_channel_state_t state);
+static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev);
+static void e1000_io_resume(struct pci_dev *pdev);
+
+static struct pci_error_handlers e1000_err_handler = {
+       .error_detected = e1000_io_error_detected,
+       .slot_reset = e1000_io_slot_reset,
+       .resume = e1000_io_resume,
+};
+
+static struct pci_driver e1000_driver = {
+       .name     = e1000_driver_name,
+       .id_table = e1000_pci_tbl,
+       .probe    = e1000_probe,
+       .remove   = __devexit_p(e1000_remove),
+#ifdef CONFIG_PM
+       /* Power Management Hooks */
+       .suspend  = e1000_suspend,
+       .resume   = e1000_resume,
+#endif
+       .shutdown = e1000_shutdown,
+       .err_handler = &e1000_err_handler
+};
+
+MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
+MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
+/**
+ * e1000_get_hw_dev - return device
+ * used by hardware layer to print debugging information
+ *
+ **/
+struct net_device *e1000_get_hw_dev(struct e1000_hw *hw)
+{
+       struct e1000_adapter *adapter = hw->back;
+       return adapter->netdev;
+}
+
+/**
+ * e1000_init_module - Driver Registration Routine
+ *
+ * e1000_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+
+static int __init e1000_init_module(void)
+{
+       int ret;
+       pr_info("%s - version %s\n", e1000_driver_string, e1000_driver_version);
+
+       pr_info("%s\n", e1000_copyright);
+
+       ret = pci_register_driver(&e1000_driver);
+       if (copybreak != COPYBREAK_DEFAULT) {
+               if (copybreak == 0)
+                       pr_info("copybreak disabled\n");
+               else
+                       pr_info("copybreak enabled for "
+                                  "packets <= %u bytes\n", copybreak);
+       }
+       return ret;
+}
+
+module_init(e1000_init_module);
+
+/**
+ * e1000_exit_module - Driver Exit Cleanup Routine
+ *
+ * e1000_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+
+static void __exit e1000_exit_module(void)
+{
+       pci_unregister_driver(&e1000_driver);
+}
+
+module_exit(e1000_exit_module);
+
+static int e1000_request_irq(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       irq_handler_t handler = e1000_intr;
+       int irq_flags = IRQF_SHARED;
+       int err;
+
+       err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
+                         netdev);
+       if (err) {
+               e_err(probe, "Unable to allocate interrupt Error: %d\n", err);
+       }
+
+       return err;
+}
+
+static void e1000_free_irq(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+
+       free_irq(adapter->pdev->irq, netdev);
+}
+
+/**
+ * e1000_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ **/
+
+static void e1000_irq_disable(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       ew32(IMC, ~0);
+       E1000_WRITE_FLUSH();
+       synchronize_irq(adapter->pdev->irq);
+}
+
+/**
+ * e1000_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ **/
+
+static void e1000_irq_enable(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       ew32(IMS, IMS_ENABLE_MASK);
+       E1000_WRITE_FLUSH();
+}
+
+static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u16 vid = hw->mng_cookie.vlan_id;
+       u16 old_vid = adapter->mng_vlan_id;
+
+       if (!e1000_vlan_used(adapter))
+               return;
+
+       if (!test_bit(vid, adapter->active_vlans)) {
+               if (hw->mng_cookie.status &
+                   E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
+                       e1000_vlan_rx_add_vid(netdev, vid);
+                       adapter->mng_vlan_id = vid;
+               } else {
+                       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
+               }
+               if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&
+                   (vid != old_vid) &&
+                   !test_bit(old_vid, adapter->active_vlans))
+                       e1000_vlan_rx_kill_vid(netdev, old_vid);
+       } else {
+               adapter->mng_vlan_id = vid;
+       }
+}
+
+static void e1000_init_manageability(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (adapter->en_mng_pt) {
+               u32 manc = er32(MANC);
+
+               /* disable hardware interception of ARP */
+               manc &= ~(E1000_MANC_ARP_EN);
+
+               ew32(MANC, manc);
+       }
+}
+
+static void e1000_release_manageability(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (adapter->en_mng_pt) {
+               u32 manc = er32(MANC);
+
+               /* re-enable hardware interception of ARP */
+               manc |= E1000_MANC_ARP_EN;
+
+               ew32(MANC, manc);
+       }
+}
+
+/**
+ * e1000_configure - configure the hardware for RX and TX
+ * @adapter = private board structure
+ **/
+static void e1000_configure(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int i;
+
+       e1000_set_rx_mode(netdev);
+
+       e1000_restore_vlan(adapter);
+       e1000_init_manageability(adapter);
+
+       e1000_configure_tx(adapter);
+       e1000_setup_rctl(adapter);
+       e1000_configure_rx(adapter);
+       /* call E1000_DESC_UNUSED which always leaves
+        * at least 1 descriptor unused to make sure
+        * next_to_use != next_to_clean */
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               struct e1000_rx_ring *ring = &adapter->rx_ring[i];
+               adapter->alloc_rx_buf(adapter, ring,
+                                     E1000_DESC_UNUSED(ring));
+       }
+}
+
+int e1000_up(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* hardware has been reset, we need to reload some things */
+       e1000_configure(adapter);
+
+       clear_bit(__E1000_DOWN, &adapter->flags);
+
+       napi_enable(&adapter->napi);
+
+       e1000_irq_enable(adapter);
+
+       netif_wake_queue(adapter->netdev);
+
+       /* fire a link change interrupt to start the watchdog */
+       ew32(ICS, E1000_ICS_LSC);
+       return 0;
+}
+
+/**
+ * e1000_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 e1000_reset ***
+ *
+ **/
+
+void e1000_power_up_phy(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 mii_reg = 0;
+
+       /* Just clear the power down bit to wake the phy back up */
+       if (hw->media_type == e1000_media_type_copper) {
+               /* according to the manual, the phy will retain its
+                * settings across a power-down/up cycle */
+               e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg);
+               mii_reg &= ~MII_CR_POWER_DOWN;
+               e1000_write_phy_reg(hw, PHY_CTRL, mii_reg);
+       }
+}
+
+static void e1000_power_down_phy(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* Power down the PHY so no link is implied when interface is down *
+        * The PHY cannot be powered down if any of the following is true *
+        * (a) WoL is enabled
+        * (b) AMT is active
+        * (c) SoL/IDER session is active */
+       if (!adapter->wol && hw->mac_type >= e1000_82540 &&
+          hw->media_type == e1000_media_type_copper) {
+               u16 mii_reg = 0;
+
+               switch (hw->mac_type) {
+               case e1000_82540:
+               case e1000_82545:
+               case e1000_82545_rev_3:
+               case e1000_82546:
+               case e1000_ce4100:
+               case e1000_82546_rev_3:
+               case e1000_82541:
+               case e1000_82541_rev_2:
+               case e1000_82547:
+               case e1000_82547_rev_2:
+                       if (er32(MANC) & E1000_MANC_SMBUS_EN)
+                               goto out;
+                       break;
+               default:
+                       goto out;
+               }
+               e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg);
+               mii_reg |= MII_CR_POWER_DOWN;
+               e1000_write_phy_reg(hw, PHY_CTRL, mii_reg);
+               mdelay(1);
+       }
+out:
+       return;
+}
+
+void e1000_down(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u32 rctl, tctl;
+
+
+       /* disable receives in the hardware */
+       rctl = er32(RCTL);
+       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+       /* flush and sleep below */
+
+       netif_tx_disable(netdev);
+
+       /* disable transmits in the hardware */
+       tctl = er32(TCTL);
+       tctl &= ~E1000_TCTL_EN;
+       ew32(TCTL, tctl);
+       /* flush both disables and wait for them to finish */
+       E1000_WRITE_FLUSH();
+       msleep(10);
+
+       napi_disable(&adapter->napi);
+
+       e1000_irq_disable(adapter);
+
+       /*
+        * Setting DOWN must be after irq_disable to prevent
+        * a screaming interrupt.  Setting DOWN also prevents
+        * timers and tasks from rescheduling.
+        */
+       set_bit(__E1000_DOWN, &adapter->flags);
+
+       del_timer_sync(&adapter->tx_fifo_stall_timer);
+       del_timer_sync(&adapter->watchdog_timer);
+       del_timer_sync(&adapter->phy_info_timer);
+
+       adapter->link_speed = 0;
+       adapter->link_duplex = 0;
+       netif_carrier_off(netdev);
+
+       e1000_reset(adapter);
+       e1000_clean_all_tx_rings(adapter);
+       e1000_clean_all_rx_rings(adapter);
+}
+
+static void e1000_reinit_safe(struct e1000_adapter *adapter)
+{
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+               msleep(1);
+       rtnl_lock();
+       e1000_down(adapter);
+       e1000_up(adapter);
+       rtnl_unlock();
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+}
+
+void e1000_reinit_locked(struct e1000_adapter *adapter)
+{
+       /* if rtnl_lock is not held the call path is bogus */
+       ASSERT_RTNL();
+       WARN_ON(in_interrupt());
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+               msleep(1);
+       e1000_down(adapter);
+       e1000_up(adapter);
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+}
+
+void e1000_reset(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 pba = 0, tx_space, min_tx_space, min_rx_space;
+       bool legacy_pba_adjust = false;
+       u16 hwm;
+
+       /* Repartition Pba for greater than 9k mtu
+        * To take effect CTRL.RST is required.
+        */
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+       case e1000_82544:
+       case e1000_82540:
+       case e1000_82541:
+       case e1000_82541_rev_2:
+               legacy_pba_adjust = true;
+               pba = E1000_PBA_48K;
+               break;
+       case e1000_82545:
+       case e1000_82545_rev_3:
+       case e1000_82546:
+       case e1000_ce4100:
+       case e1000_82546_rev_3:
+               pba = E1000_PBA_48K;
+               break;
+       case e1000_82547:
+       case e1000_82547_rev_2:
+               legacy_pba_adjust = true;
+               pba = E1000_PBA_30K;
+               break;
+       case e1000_undefined:
+       case e1000_num_macs:
+               break;
+       }
+
+       if (legacy_pba_adjust) {
+               if (hw->max_frame_size > E1000_RXBUFFER_8192)
+                       pba -= 8; /* allocate more FIFO for Tx */
+
+               if (hw->mac_type == e1000_82547) {
+                       adapter->tx_fifo_head = 0;
+                       adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT;
+                       adapter->tx_fifo_size =
+                               (E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT;
+                       atomic_set(&adapter->tx_fifo_stall, 0);
+               }
+       } else if (hw->max_frame_size >  ETH_FRAME_LEN + ETH_FCS_LEN) {
+               /* adjust PBA for jumbo frames */
+               ew32(PBA, pba);
+
+               /* To maintain wire speed transmits, the Tx FIFO should be
+                * large enough to accommodate two full transmit packets,
+                * rounded up to the next 1KB and expressed in KB.  Likewise,
+                * the Rx FIFO should be large enough to accommodate at least
+                * one full receive packet and is similarly rounded up and
+                * expressed in KB. */
+               pba = er32(PBA);
+               /* upper 16 bits has Tx packet buffer allocation size in KB */
+               tx_space = pba >> 16;
+               /* lower 16 bits has Rx packet buffer allocation size in KB */
+               pba &= 0xffff;
+               /*
+                * the tx fifo also stores 16 bytes of information about the tx
+                * but don't include ethernet FCS because hardware appends it
+                */
+               min_tx_space = (hw->max_frame_size +
+                               sizeof(struct e1000_tx_desc) -
+                               ETH_FCS_LEN) * 2;
+               min_tx_space = ALIGN(min_tx_space, 1024);
+               min_tx_space >>= 10;
+               /* software strips receive CRC, so leave room for it */
+               min_rx_space = hw->max_frame_size;
+               min_rx_space = ALIGN(min_rx_space, 1024);
+               min_rx_space >>= 10;
+
+               /* If current Tx allocation is less than the min Tx FIFO size,
+                * and the min Tx FIFO size is less than the current Rx FIFO
+                * allocation, take space away from current Rx allocation */
+               if (tx_space < min_tx_space &&
+                   ((min_tx_space - tx_space) < pba)) {
+                       pba = pba - (min_tx_space - tx_space);
+
+                       /* PCI/PCIx hardware has PBA alignment constraints */
+                       switch (hw->mac_type) {
+                       case e1000_82545 ... e1000_82546_rev_3:
+                               pba &= ~(E1000_PBA_8K - 1);
+                               break;
+                       default:
+                               break;
+                       }
+
+                       /* if short on rx space, rx wins and must trump tx
+                        * adjustment or use Early Receive if available */
+                       if (pba < min_rx_space)
+                               pba = min_rx_space;
+               }
+       }
+
+       ew32(PBA, pba);
+
+       /*
+        * 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, and
+        * - the full Rx FIFO size minus the early receive size (for parts
+        *   with ERT support assuming ERT set to E1000_ERT_2048), or
+        * - the full Rx FIFO size minus one full frame
+        */
+       hwm = min(((pba << 10) * 9 / 10),
+                 ((pba << 10) - hw->max_frame_size));
+
+       hw->fc_high_water = hwm & 0xFFF8;       /* 8-byte granularity */
+       hw->fc_low_water = hw->fc_high_water - 8;
+       hw->fc_pause_time = E1000_FC_PAUSE_TIME;
+       hw->fc_send_xon = 1;
+       hw->fc = hw->original_fc;
+
+       /* Allow time for pending master requests to run */
+       e1000_reset_hw(hw);
+       if (hw->mac_type >= e1000_82544)
+               ew32(WUC, 0);
+
+       if (e1000_init_hw(hw))
+               e_dev_err("Hardware Error\n");
+       e1000_update_mng_vlan(adapter);
+
+       /* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
+       if (hw->mac_type >= e1000_82544 &&
+           hw->autoneg == 1 &&
+           hw->autoneg_advertised == ADVERTISE_1000_FULL) {
+               u32 ctrl = er32(CTRL);
+               /* clear phy power management bit if we are in gig only mode,
+                * which if enabled will attempt negotiation to 100Mb, which
+                * can cause a loss of link at power off or driver unload */
+               ctrl &= ~E1000_CTRL_SWDPIN3;
+               ew32(CTRL, ctrl);
+       }
+
+       /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
+       ew32(VET, ETHERNET_IEEE_VLAN_TYPE);
+
+       e1000_reset_adaptive(hw);
+       e1000_phy_get_info(hw, &adapter->phy_info);
+
+       e1000_release_manageability(adapter);
+}
+
+/**
+ *  Dump the eeprom for users having checksum issues
+ **/
+static void e1000_dump_eeprom(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ethtool_eeprom eeprom;
+       const struct ethtool_ops *ops = netdev->ethtool_ops;
+       u8 *data;
+       int i;
+       u16 csum_old, csum_new = 0;
+
+       eeprom.len = ops->get_eeprom_len(netdev);
+       eeprom.offset = 0;
+
+       data = kmalloc(eeprom.len, GFP_KERNEL);
+       if (!data) {
+               pr_err("Unable to allocate memory to dump EEPROM data\n");
+               return;
+       }
+
+       ops->get_eeprom(netdev, &eeprom, data);
+
+       csum_old = (data[EEPROM_CHECKSUM_REG * 2]) +
+                  (data[EEPROM_CHECKSUM_REG * 2 + 1] << 8);
+       for (i = 0; i < EEPROM_CHECKSUM_REG * 2; i += 2)
+               csum_new += data[i] + (data[i + 1] << 8);
+       csum_new = EEPROM_SUM - csum_new;
+
+       pr_err("/*********************/\n");
+       pr_err("Current EEPROM Checksum : 0x%04x\n", csum_old);
+       pr_err("Calculated              : 0x%04x\n", csum_new);
+
+       pr_err("Offset    Values\n");
+       pr_err("========  ======\n");
+       print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, data, 128, 0);
+
+       pr_err("Include this output when contacting your support provider.\n");
+       pr_err("This is not a software error! Something bad happened to\n");
+       pr_err("your hardware or EEPROM image. Ignoring this problem could\n");
+       pr_err("result in further problems, possibly loss of data,\n");
+       pr_err("corruption or system hangs!\n");
+       pr_err("The MAC Address will be reset to 00:00:00:00:00:00,\n");
+       pr_err("which is invalid and requires you to set the proper MAC\n");
+       pr_err("address manually before continuing to enable this network\n");
+       pr_err("device. Please inspect the EEPROM dump and report the\n");
+       pr_err("issue to your hardware vendor or Intel Customer Support.\n");
+       pr_err("/*********************/\n");
+
+       kfree(data);
+}
+
+/**
+ * e1000_is_need_ioport - determine if an adapter needs ioport resources or not
+ * @pdev: PCI device information struct
+ *
+ * Return true if an adapter needs ioport resources
+ **/
+static int e1000_is_need_ioport(struct pci_dev *pdev)
+{
+       switch (pdev->device) {
+       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:
+       case E1000_DEV_ID_82541EI:
+       case E1000_DEV_ID_82541EI_MOBILE:
+       case E1000_DEV_ID_82541ER:
+       case E1000_DEV_ID_82541ER_LOM:
+       case E1000_DEV_ID_82541GI:
+       case E1000_DEV_ID_82541GI_LF:
+       case E1000_DEV_ID_82541GI_MOBILE:
+       case E1000_DEV_ID_82544EI_COPPER:
+       case E1000_DEV_ID_82544EI_FIBER:
+       case E1000_DEV_ID_82544GC_COPPER:
+       case E1000_DEV_ID_82544GC_LOM:
+       case E1000_DEV_ID_82545EM_COPPER:
+       case E1000_DEV_ID_82545EM_FIBER:
+       case E1000_DEV_ID_82546EB_COPPER:
+       case E1000_DEV_ID_82546EB_FIBER:
+       case E1000_DEV_ID_82546EB_QUAD_COPPER:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static u32 e1000_fix_features(struct net_device *netdev, u32 features)
+{
+       /*
+        * Since there is no support for separate rx/tx vlan accel
+        * enable/disable make sure tx flag is always in same state as rx.
+        */
+       if (features & NETIF_F_HW_VLAN_RX)
+               features |= NETIF_F_HW_VLAN_TX;
+       else
+               features &= ~NETIF_F_HW_VLAN_TX;
+
+       return features;
+}
+
+static int e1000_set_features(struct net_device *netdev, u32 features)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       u32 changed = features ^ netdev->features;
+
+       if (changed & NETIF_F_HW_VLAN_RX)
+               e1000_vlan_mode(netdev, features);
+
+       if (!(changed & NETIF_F_RXCSUM))
+               return 0;
+
+       adapter->rx_csum = !!(features & NETIF_F_RXCSUM);
+
+       if (netif_running(netdev))
+               e1000_reinit_locked(adapter);
+       else
+               e1000_reset(adapter);
+
+       return 0;
+}
+
+static const struct net_device_ops e1000_netdev_ops = {
+       .ndo_open               = e1000_open,
+       .ndo_stop               = e1000_close,
+       .ndo_start_xmit         = e1000_xmit_frame,
+       .ndo_get_stats          = e1000_get_stats,
+       .ndo_set_rx_mode        = e1000_set_rx_mode,
+       .ndo_set_mac_address    = e1000_set_mac,
+       .ndo_tx_timeout         = e1000_tx_timeout,
+       .ndo_change_mtu         = e1000_change_mtu,
+       .ndo_do_ioctl           = e1000_ioctl,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_vlan_rx_add_vid    = e1000_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = e1000_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = e1000_netpoll,
+#endif
+       .ndo_fix_features       = e1000_fix_features,
+       .ndo_set_features       = e1000_set_features,
+};
+
+/**
+ * e1000_init_hw_struct - initialize members of hw struct
+ * @adapter: board private struct
+ * @hw: structure used by e1000_hw.c
+ *
+ * Factors out initialization of the e1000_hw struct to its own function
+ * that can be called very early at init (just after struct allocation).
+ * Fields are initialized based on PCI device information and
+ * OS network device settings (MTU size).
+ * Returns negative error codes if MAC type setup fails.
+ */
+static int e1000_init_hw_struct(struct e1000_adapter *adapter,
+                               struct e1000_hw *hw)
+{
+       struct pci_dev *pdev = adapter->pdev;
+
+       /* PCI config space info */
+       hw->vendor_id = pdev->vendor;
+       hw->device_id = pdev->device;
+       hw->subsystem_vendor_id = pdev->subsystem_vendor;
+       hw->subsystem_id = pdev->subsystem_device;
+       hw->revision_id = pdev->revision;
+
+       pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
+
+       hw->max_frame_size = adapter->netdev->mtu +
+                            ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
+       hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;
+
+       /* identify the MAC */
+       if (e1000_set_mac_type(hw)) {
+               e_err(probe, "Unknown MAC Type\n");
+               return -EIO;
+       }
+
+       switch (hw->mac_type) {
+       default:
+               break;
+       case e1000_82541:
+       case e1000_82547:
+       case e1000_82541_rev_2:
+       case e1000_82547_rev_2:
+               hw->phy_init_script = 1;
+               break;
+       }
+
+       e1000_set_media_type(hw);
+       e1000_get_bus_info(hw);
+
+       hw->wait_autoneg_complete = false;
+       hw->tbi_compatibility_en = true;
+       hw->adaptive_ifs = true;
+
+       /* Copper options */
+
+       if (hw->media_type == e1000_media_type_copper) {
+               hw->mdix = AUTO_ALL_MODES;
+               hw->disable_polarity_correction = false;
+               hw->master_slave = E1000_MASTER_SLAVE;
+       }
+
+       return 0;
+}
+
+/**
+ * e1000_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in e1000_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * e1000_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+static int __devinit e1000_probe(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+       struct net_device *netdev;
+       struct e1000_adapter *adapter;
+       struct e1000_hw *hw;
+
+       static int cards_found = 0;
+       static int global_quad_port_a = 0; /* global ksp3 port a indication */
+       int i, err, pci_using_dac;
+       u16 eeprom_data = 0;
+       u16 tmp = 0;
+       u16 eeprom_apme_mask = E1000_EEPROM_APME;
+       int bars, need_ioport;
+
+       /* do not allocate ioport bars when not needed */
+       need_ioport = e1000_is_need_ioport(pdev);
+       if (need_ioport) {
+               bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
+               err = pci_enable_device(pdev);
+       } else {
+               bars = pci_select_bars(pdev, IORESOURCE_MEM);
+               err = pci_enable_device_mem(pdev);
+       }
+       if (err)
+               return err;
+
+       err = pci_request_selected_regions(pdev, bars, e1000_driver_name);
+       if (err)
+               goto err_pci_reg;
+
+       pci_set_master(pdev);
+       err = pci_save_state(pdev);
+       if (err)
+               goto err_alloc_etherdev;
+
+       err = -ENOMEM;
+       netdev = alloc_etherdev(sizeof(struct e1000_adapter));
+       if (!netdev)
+               goto err_alloc_etherdev;
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       pci_set_drvdata(pdev, netdev);
+       adapter = netdev_priv(netdev);
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+       adapter->msg_enable = (1 << debug) - 1;
+       adapter->bars = bars;
+       adapter->need_ioport = need_ioport;
+
+       hw = &adapter->hw;
+       hw->back = adapter;
+
+       err = -EIO;
+       hw->hw_addr = pci_ioremap_bar(pdev, BAR_0);
+       if (!hw->hw_addr)
+               goto err_ioremap;
+
+       if (adapter->need_ioport) {
+               for (i = BAR_1; i <= BAR_5; i++) {
+                       if (pci_resource_len(pdev, i) == 0)
+                               continue;
+                       if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
+                               hw->io_base = pci_resource_start(pdev, i);
+                               break;
+                       }
+               }
+       }
+
+       /* make ready for any if (hw->...) below */
+       err = e1000_init_hw_struct(adapter, hw);
+       if (err)
+               goto err_sw_init;
+
+       /*
+        * there is a workaround being applied below that limits
+        * 64-bit DMA addresses to 64-bit hardware.  There are some
+        * 32-bit adapters that Tx hang when given 64-bit DMA addresses
+        */
+       pci_using_dac = 0;
+       if ((hw->bus_type == e1000_bus_type_pcix) &&
+           !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+               /*
+                * according to DMA-API-HOWTO, coherent calls will always
+                * succeed if the set call did
+                */
+               dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+               pci_using_dac = 1;
+       } else {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               if (err) {
+                       pr_err("No usable DMA config, aborting\n");
+                       goto err_dma;
+               }
+               dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+       }
+
+       netdev->netdev_ops = &e1000_netdev_ops;
+       e1000_set_ethtool_ops(netdev);
+       netdev->watchdog_timeo = 5 * HZ;
+       netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
+
+       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+
+       adapter->bd_number = cards_found;
+
+       /* setup the private structure */
+
+       err = e1000_sw_init(adapter);
+       if (err)
+               goto err_sw_init;
+
+       err = -EIO;
+       if (hw->mac_type == e1000_ce4100) {
+               ce4100_gbe_mdio_base_phy = pci_resource_start(pdev, BAR_1);
+               ce4100_gbe_mdio_base_virt = ioremap(ce4100_gbe_mdio_base_phy,
+                                               pci_resource_len(pdev, BAR_1));
+
+               if (!ce4100_gbe_mdio_base_virt)
+                       goto err_mdio_ioremap;
+       }
+
+       if (hw->mac_type >= e1000_82543) {
+               netdev->hw_features = NETIF_F_SG |
+                                  NETIF_F_HW_CSUM |
+                                  NETIF_F_HW_VLAN_RX;
+               netdev->features = NETIF_F_HW_VLAN_TX |
+                                  NETIF_F_HW_VLAN_FILTER;
+       }
+
+       if ((hw->mac_type >= e1000_82544) &&
+          (hw->mac_type != e1000_82547))
+               netdev->hw_features |= NETIF_F_TSO;
+
+       netdev->features |= netdev->hw_features;
+       netdev->hw_features |= NETIF_F_RXCSUM;
+
+       if (pci_using_dac) {
+               netdev->features |= NETIF_F_HIGHDMA;
+               netdev->vlan_features |= NETIF_F_HIGHDMA;
+       }
+
+       netdev->vlan_features |= NETIF_F_TSO;
+       netdev->vlan_features |= NETIF_F_HW_CSUM;
+       netdev->vlan_features |= NETIF_F_SG;
+
+       adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);
+
+       /* initialize eeprom parameters */
+       if (e1000_init_eeprom_params(hw)) {
+               e_err(probe, "EEPROM initialization failed\n");
+               goto err_eeprom;
+       }
+
+       /* before reading the EEPROM, reset the controller to
+        * put the device in a known good starting state */
+
+       e1000_reset_hw(hw);
+
+       /* make sure the EEPROM is good */
+       if (e1000_validate_eeprom_checksum(hw) < 0) {
+               e_err(probe, "The EEPROM Checksum Is Not Valid\n");
+               e1000_dump_eeprom(adapter);
+               /*
+                * set MAC address to all zeroes to invalidate and temporary
+                * disable this device for the user. This blocks regular
+                * traffic while still permitting ethtool ioctls from reaching
+                * the hardware as well as allowing the user to run the
+                * interface after manually setting a hw addr using
+                * `ip set address`
+                */
+               memset(hw->mac_addr, 0, netdev->addr_len);
+       } else {
+               /* copy the MAC address out of the EEPROM */
+               if (e1000_read_mac_addr(hw))
+                       e_err(probe, "EEPROM Read Error\n");
+       }
+       /* don't block initalization here due to bad MAC address */
+       memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len);
+       memcpy(netdev->perm_addr, hw->mac_addr, netdev->addr_len);
+
+       if (!is_valid_ether_addr(netdev->perm_addr))
+               e_err(probe, "Invalid MAC Address\n");
+
+       init_timer(&adapter->tx_fifo_stall_timer);
+       adapter->tx_fifo_stall_timer.function = e1000_82547_tx_fifo_stall;
+       adapter->tx_fifo_stall_timer.data = (unsigned long)adapter;
+
+       init_timer(&adapter->watchdog_timer);
+       adapter->watchdog_timer.function = e1000_watchdog;
+       adapter->watchdog_timer.data = (unsigned long) adapter;
+
+       init_timer(&adapter->phy_info_timer);
+       adapter->phy_info_timer.function = e1000_update_phy_info;
+       adapter->phy_info_timer.data = (unsigned long)adapter;
+
+       INIT_WORK(&adapter->fifo_stall_task, e1000_82547_tx_fifo_stall_task);
+       INIT_WORK(&adapter->reset_task, e1000_reset_task);
+       INIT_WORK(&adapter->phy_info_task, e1000_update_phy_info_task);
+
+       e1000_check_options(adapter);
+
+       /* Initial Wake on LAN setting
+        * If APM wake is enabled in the EEPROM,
+        * enable the ACPI Magic Packet filter
+        */
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+       case e1000_82543:
+               break;
+       case e1000_82544:
+               e1000_read_eeprom(hw,
+                       EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data);
+               eeprom_apme_mask = E1000_EEPROM_82544_APM;
+               break;
+       case e1000_82546:
+       case e1000_82546_rev_3:
+               if (er32(STATUS) & E1000_STATUS_FUNC_1){
+                       e1000_read_eeprom(hw,
+                               EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
+                       break;
+               }
+               /* Fall Through */
+       default:
+               e1000_read_eeprom(hw,
+                       EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
+               break;
+       }
+       if (eeprom_data & eeprom_apme_mask)
+               adapter->eeprom_wol |= E1000_WUFC_MAG;
+
+       /* now that we have the eeprom settings, apply the special cases
+        * where the eeprom may be wrong or the board simply won't support
+        * wake on lan on a particular port */
+       switch (pdev->device) {
+       case E1000_DEV_ID_82546GB_PCIE:
+               adapter->eeprom_wol = 0;
+               break;
+       case E1000_DEV_ID_82546EB_FIBER:
+       case E1000_DEV_ID_82546GB_FIBER:
+               /* Wake events only supported on port A for dual fiber
+                * regardless of eeprom setting */
+               if (er32(STATUS) & E1000_STATUS_FUNC_1)
+                       adapter->eeprom_wol = 0;
+               break;
+       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+               /* if quad port adapter, disable WoL on all but port A */
+               if (global_quad_port_a != 0)
+                       adapter->eeprom_wol = 0;
+               else
+                       adapter->quad_port_a = 1;
+               /* Reset for multiple quad port adapters */
+               if (++global_quad_port_a == 4)
+                       global_quad_port_a = 0;
+               break;
+       }
+
+       /* initialize the wol settings based on the eeprom settings */
+       adapter->wol = adapter->eeprom_wol;
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       /* Auto detect PHY address */
+       if (hw->mac_type == e1000_ce4100) {
+               for (i = 0; i < 32; i++) {
+                       hw->phy_addr = i;
+                       e1000_read_phy_reg(hw, PHY_ID2, &tmp);
+                       if (tmp == 0 || tmp == 0xFF) {
+                               if (i == 31)
+                                       goto err_eeprom;
+                               continue;
+                       } else
+                               break;
+               }
+       }
+
+       /* reset the hardware with the new settings */
+       e1000_reset(adapter);
+
+       strcpy(netdev->name, "eth%d");
+       err = register_netdev(netdev);
+       if (err)
+               goto err_register;
+
+       e1000_vlan_mode(netdev, netdev->features);
+
+       /* print bus type/speed/width info */
+       e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",
+              ((hw->bus_type == e1000_bus_type_pcix) ? "-X" : ""),
+              ((hw->bus_speed == e1000_bus_speed_133) ? 133 :
+               (hw->bus_speed == e1000_bus_speed_120) ? 120 :
+               (hw->bus_speed == e1000_bus_speed_100) ? 100 :
+               (hw->bus_speed == e1000_bus_speed_66) ? 66 : 33),
+              ((hw->bus_width == e1000_bus_width_64) ? 64 : 32),
+              netdev->dev_addr);
+
+       /* carrier off reporting is important to ethtool even BEFORE open */
+       netif_carrier_off(netdev);
+
+       e_info(probe, "Intel(R) PRO/1000 Network Connection\n");
+
+       cards_found++;
+       return 0;
+
+err_register:
+err_eeprom:
+       e1000_phy_hw_reset(hw);
+
+       if (hw->flash_address)
+               iounmap(hw->flash_address);
+       kfree(adapter->tx_ring);
+       kfree(adapter->rx_ring);
+err_dma:
+err_sw_init:
+err_mdio_ioremap:
+       iounmap(ce4100_gbe_mdio_base_virt);
+       iounmap(hw->hw_addr);
+err_ioremap:
+       free_netdev(netdev);
+err_alloc_etherdev:
+       pci_release_selected_regions(pdev, bars);
+err_pci_reg:
+       pci_disable_device(pdev);
+       return err;
+}
+
+/**
+ * e1000_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * e1000_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+
+static void __devexit e1000_remove(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       set_bit(__E1000_DOWN, &adapter->flags);
+       del_timer_sync(&adapter->tx_fifo_stall_timer);
+       del_timer_sync(&adapter->watchdog_timer);
+       del_timer_sync(&adapter->phy_info_timer);
+
+       cancel_work_sync(&adapter->reset_task);
+
+       e1000_release_manageability(adapter);
+
+       unregister_netdev(netdev);
+
+       e1000_phy_hw_reset(hw);
+
+       kfree(adapter->tx_ring);
+       kfree(adapter->rx_ring);
+
+       iounmap(hw->hw_addr);
+       if (hw->flash_address)
+               iounmap(hw->flash_address);
+       pci_release_selected_regions(pdev, adapter->bars);
+
+       free_netdev(netdev);
+
+       pci_disable_device(pdev);
+}
+
+/**
+ * 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.
+ * e1000_init_hw_struct MUST be called before this function
+ **/
+
+static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
+{
+       adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+
+       adapter->num_tx_queues = 1;
+       adapter->num_rx_queues = 1;
+
+       if (e1000_alloc_queues(adapter)) {
+               e_err(probe, "Unable to allocate memory for queues\n");
+               return -ENOMEM;
+       }
+
+       /* Explicitly disable IRQ since the NIC can be in any state. */
+       e1000_irq_disable(adapter);
+
+       spin_lock_init(&adapter->stats_lock);
+
+       set_bit(__E1000_DOWN, &adapter->flags);
+
+       return 0;
+}
+
+/**
+ * e1000_alloc_queues - Allocate memory for all rings
+ * @adapter: board private structure to initialize
+ *
+ * We allocate one ring per queue at run-time since we don't know the
+ * number of queues at compile-time.
+ **/
+
+static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
+{
+       adapter->tx_ring = kcalloc(adapter->num_tx_queues,
+                                  sizeof(struct e1000_tx_ring), GFP_KERNEL);
+       if (!adapter->tx_ring)
+               return -ENOMEM;
+
+       adapter->rx_ring = kcalloc(adapter->num_rx_queues,
+                                  sizeof(struct e1000_rx_ring), GFP_KERNEL);
+       if (!adapter->rx_ring) {
+               kfree(adapter->tx_ring);
+               return -ENOMEM;
+       }
+
+       return E1000_SUCCESS;
+}
+
+/**
+ * e1000_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+
+static int e1000_open(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int err;
+
+       /* disallow open during test */
+       if (test_bit(__E1000_TESTING, &adapter->flags))
+               return -EBUSY;
+
+       netif_carrier_off(netdev);
+
+       /* allocate transmit descriptors */
+       err = e1000_setup_all_tx_resources(adapter);
+       if (err)
+               goto err_setup_tx;
+
+       /* allocate receive descriptors */
+       err = e1000_setup_all_rx_resources(adapter);
+       if (err)
+               goto err_setup_rx;
+
+       e1000_power_up_phy(adapter);
+
+       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
+       if ((hw->mng_cookie.status &
+                         E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) {
+               e1000_update_mng_vlan(adapter);
+       }
+
+       /* before we allocate an interrupt, we must be ready to handle it.
+        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
+        * as soon as we call pci_request_irq, so we have to setup our
+        * clean_rx handler before we do so.  */
+       e1000_configure(adapter);
+
+       err = e1000_request_irq(adapter);
+       if (err)
+               goto err_req_irq;
+
+       /* From here on the code is the same as e1000_up() */
+       clear_bit(__E1000_DOWN, &adapter->flags);
+
+       napi_enable(&adapter->napi);
+
+       e1000_irq_enable(adapter);
+
+       netif_start_queue(netdev);
+
+       /* fire a link status change interrupt to start the watchdog */
+       ew32(ICS, E1000_ICS_LSC);
+
+       return E1000_SUCCESS;
+
+err_req_irq:
+       e1000_power_down_phy(adapter);
+       e1000_free_all_rx_resources(adapter);
+err_setup_rx:
+       e1000_free_all_tx_resources(adapter);
+err_setup_tx:
+       e1000_reset(adapter);
+
+       return err;
+}
+
+/**
+ * e1000_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+
+static int e1000_close(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
+       e1000_down(adapter);
+       e1000_power_down_phy(adapter);
+       e1000_free_irq(adapter);
+
+       e1000_free_all_tx_resources(adapter);
+       e1000_free_all_rx_resources(adapter);
+
+       /* kill manageability vlan ID if supported, but not if a vlan with
+        * the same ID is registered on the host OS (let 8021q kill it) */
+       if ((hw->mng_cookie.status &
+                         E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
+            !test_bit(adapter->mng_vlan_id, adapter->active_vlans)) {
+               e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
+       }
+
+       return 0;
+}
+
+/**
+ * e1000_check_64k_bound - check that memory doesn't cross 64kB boundary
+ * @adapter: address of board private structure
+ * @start: address of beginning of memory
+ * @len: length of memory
+ **/
+static bool e1000_check_64k_bound(struct e1000_adapter *adapter, void *start,
+                                 unsigned long len)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       unsigned long begin = (unsigned long)start;
+       unsigned long end = begin + len;
+
+       /* First rev 82545 and 82546 need to not allow any memory
+        * write location to cross 64k boundary due to errata 23 */
+       if (hw->mac_type == e1000_82545 ||
+           hw->mac_type == e1000_ce4100 ||
+           hw->mac_type == e1000_82546) {
+               return ((begin ^ (end - 1)) >> 16) != 0 ? false : true;
+       }
+
+       return true;
+}
+
+/**
+ * e1000_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @adapter: board private structure
+ * @txdr:    tx descriptor ring (for a specific queue) to setup
+ *
+ * Return 0 on success, negative on failure
+ **/
+
+static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
+                                   struct e1000_tx_ring *txdr)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int size;
+
+       size = sizeof(struct e1000_buffer) * txdr->count;
+       txdr->buffer_info = vzalloc(size);
+       if (!txdr->buffer_info) {
+               e_err(probe, "Unable to allocate memory for the Tx descriptor "
+                     "ring\n");
+               return -ENOMEM;
+       }
+
+       /* round up to nearest 4K */
+
+       txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
+       txdr->size = ALIGN(txdr->size, 4096);
+
+       txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
+                                       GFP_KERNEL);
+       if (!txdr->desc) {
+setup_tx_desc_die:
+               vfree(txdr->buffer_info);
+               e_err(probe, "Unable to allocate memory for the Tx descriptor "
+                     "ring\n");
+               return -ENOMEM;
+       }
+
+       /* Fix for errata 23, can't cross 64kB boundary */
+       if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
+               void *olddesc = txdr->desc;
+               dma_addr_t olddma = txdr->dma;
+               e_err(tx_err, "txdr align check failed: %u bytes at %p\n",
+                     txdr->size, txdr->desc);
+               /* Try again, without freeing the previous */
+               txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size,
+                                               &txdr->dma, GFP_KERNEL);
+               /* Failed allocation, critical failure */
+               if (!txdr->desc) {
+                       dma_free_coherent(&pdev->dev, txdr->size, olddesc,
+                                         olddma);
+                       goto setup_tx_desc_die;
+               }
+
+               if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
+                       /* give up */
+                       dma_free_coherent(&pdev->dev, txdr->size, txdr->desc,
+                                         txdr->dma);
+                       dma_free_coherent(&pdev->dev, txdr->size, olddesc,
+                                         olddma);
+                       e_err(probe, "Unable to allocate aligned memory "
+                             "for the transmit descriptor ring\n");
+                       vfree(txdr->buffer_info);
+                       return -ENOMEM;
+               } else {
+                       /* Free old allocation, new allocation was successful */
+                       dma_free_coherent(&pdev->dev, txdr->size, olddesc,
+                                         olddma);
+               }
+       }
+       memset(txdr->desc, 0, txdr->size);
+
+       txdr->next_to_use = 0;
+       txdr->next_to_clean = 0;
+
+       return 0;
+}
+
+/**
+ * e1000_setup_all_tx_resources - wrapper to allocate Tx resources
+ *                               (Descriptors) for all queues
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+
+int e1000_setup_all_tx_resources(struct e1000_adapter *adapter)
+{
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               err = e1000_setup_tx_resources(adapter, &adapter->tx_ring[i]);
+               if (err) {
+                       e_err(probe, "Allocation for Tx Queue %u failed\n", i);
+                       for (i-- ; i >= 0; i--)
+                               e1000_free_tx_resources(adapter,
+                                                       &adapter->tx_ring[i]);
+                       break;
+               }
+       }
+
+       return err;
+}
+
+/**
+ * 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)
+{
+       u64 tdba;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 tdlen, tctl, tipg;
+       u32 ipgr1, ipgr2;
+
+       /* Setup the HW Tx Head and Tail descriptor pointers */
+
+       switch (adapter->num_tx_queues) {
+       case 1:
+       default:
+               tdba = adapter->tx_ring[0].dma;
+               tdlen = adapter->tx_ring[0].count *
+                       sizeof(struct e1000_tx_desc);
+               ew32(TDLEN, tdlen);
+               ew32(TDBAH, (tdba >> 32));
+               ew32(TDBAL, (tdba & 0x00000000ffffffffULL));
+               ew32(TDT, 0);
+               ew32(TDH, 0);
+               adapter->tx_ring[0].tdh = ((hw->mac_type >= e1000_82543) ? E1000_TDH : E1000_82542_TDH);
+               adapter->tx_ring[0].tdt = ((hw->mac_type >= e1000_82543) ? E1000_TDT : E1000_82542_TDT);
+               break;
+       }
+
+       /* Set the default values for the Tx Inter Packet Gap timer */
+       if ((hw->media_type == e1000_media_type_fiber ||
+            hw->media_type == e1000_media_type_internal_serdes))
+               tipg = DEFAULT_82543_TIPG_IPGT_FIBER;
+       else
+               tipg = DEFAULT_82543_TIPG_IPGT_COPPER;
+
+       switch (hw->mac_type) {
+       case e1000_82542_rev2_0:
+       case e1000_82542_rev2_1:
+               tipg = DEFAULT_82542_TIPG_IPGT;
+               ipgr1 = DEFAULT_82542_TIPG_IPGR1;
+               ipgr2 = DEFAULT_82542_TIPG_IPGR2;
+               break;
+       default:
+               ipgr1 = DEFAULT_82543_TIPG_IPGR1;
+               ipgr2 = DEFAULT_82543_TIPG_IPGR2;
+               break;
+       }
+       tipg |= ipgr1 << E1000_TIPG_IPGR1_SHIFT;
+       tipg |= ipgr2 << E1000_TIPG_IPGR2_SHIFT;
+       ew32(TIPG, tipg);
+
+       /* Set the Tx Interrupt Delay register */
+
+       ew32(TIDV, adapter->tx_int_delay);
+       if (hw->mac_type >= e1000_82540)
+               ew32(TADV, adapter->tx_abs_int_delay);
+
+       /* 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);
+
+       e1000_config_collision_dist(hw);
+
+       /* Setup Transmit Descriptor Settings for eop descriptor */
+       adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
+
+       /* only set IDE if we are delaying interrupts using the timers */
+       if (adapter->tx_int_delay)
+               adapter->txd_cmd |= E1000_TXD_CMD_IDE;
+
+       if (hw->mac_type < e1000_82543)
+               adapter->txd_cmd |= E1000_TXD_CMD_RPS;
+       else
+               adapter->txd_cmd |= E1000_TXD_CMD_RS;
+
+       /* Cache if we're 82544 running in PCI-X because we'll
+        * need this to apply a workaround later in the send path. */
+       if (hw->mac_type == e1000_82544 &&
+           hw->bus_type == e1000_bus_type_pcix)
+               adapter->pcix_82544 = 1;
+
+       ew32(TCTL, tctl);
+
+}
+
+/**
+ * e1000_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @adapter: board private structure
+ * @rxdr:    rx descriptor ring (for a specific queue) to setup
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
+                                   struct e1000_rx_ring *rxdr)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int size, desc_len;
+
+       size = sizeof(struct e1000_buffer) * rxdr->count;
+       rxdr->buffer_info = vzalloc(size);
+       if (!rxdr->buffer_info) {
+               e_err(probe, "Unable to allocate memory for the Rx descriptor "
+                     "ring\n");
+               return -ENOMEM;
+       }
+
+       desc_len = sizeof(struct e1000_rx_desc);
+
+       /* Round up to nearest 4K */
+
+       rxdr->size = rxdr->count * desc_len;
+       rxdr->size = ALIGN(rxdr->size, 4096);
+
+       rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
+                                       GFP_KERNEL);
+
+       if (!rxdr->desc) {
+               e_err(probe, "Unable to allocate memory for the Rx descriptor "
+                     "ring\n");
+setup_rx_desc_die:
+               vfree(rxdr->buffer_info);
+               return -ENOMEM;
+       }
+
+       /* Fix for errata 23, can't cross 64kB boundary */
+       if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
+               void *olddesc = rxdr->desc;
+               dma_addr_t olddma = rxdr->dma;
+               e_err(rx_err, "rxdr align check failed: %u bytes at %p\n",
+                     rxdr->size, rxdr->desc);
+               /* Try again, without freeing the previous */
+               rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size,
+                                               &rxdr->dma, GFP_KERNEL);
+               /* Failed allocation, critical failure */
+               if (!rxdr->desc) {
+                       dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
+                                         olddma);
+                       e_err(probe, "Unable to allocate memory for the Rx "
+                             "descriptor ring\n");
+                       goto setup_rx_desc_die;
+               }
+
+               if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
+                       /* give up */
+                       dma_free_coherent(&pdev->dev, rxdr->size, rxdr->desc,
+                                         rxdr->dma);
+                       dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
+                                         olddma);
+                       e_err(probe, "Unable to allocate aligned memory for "
+                             "the Rx descriptor ring\n");
+                       goto setup_rx_desc_die;
+               } else {
+                       /* Free old allocation, new allocation was successful */
+                       dma_free_coherent(&pdev->dev, rxdr->size, olddesc,
+                                         olddma);
+               }
+       }
+       memset(rxdr->desc, 0, rxdr->size);
+
+       rxdr->next_to_clean = 0;
+       rxdr->next_to_use = 0;
+       rxdr->rx_skb_top = NULL;
+
+       return 0;
+}
+
+/**
+ * e1000_setup_all_rx_resources - wrapper to allocate Rx resources
+ *                               (Descriptors) for all queues
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+
+int e1000_setup_all_rx_resources(struct e1000_adapter *adapter)
+{
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               err = e1000_setup_rx_resources(adapter, &adapter->rx_ring[i]);
+               if (err) {
+                       e_err(probe, "Allocation for Rx Queue %u failed\n", i);
+                       for (i-- ; i >= 0; i--)
+                               e1000_free_rx_resources(adapter,
+                                                       &adapter->rx_ring[i]);
+                       break;
+               }
+       }
+
+       return err;
+}
+
+/**
+ * e1000_setup_rctl - configure the receive control registers
+ * @adapter: Board private structure
+ **/
+static void e1000_setup_rctl(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+
+       rctl = er32(RCTL);
+
+       rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
+
+       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
+               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+               (hw->mc_filter_type << E1000_RCTL_MO_SHIFT);
+
+       if (hw->tbi_compatibility_on == 1)
+               rctl |= E1000_RCTL_SBP;
+       else
+               rctl &= ~E1000_RCTL_SBP;
+
+       if (adapter->netdev->mtu <= ETH_DATA_LEN)
+               rctl &= ~E1000_RCTL_LPE;
+       else
+               rctl |= E1000_RCTL_LPE;
+
+       /* Setup buffer sizes */
+       rctl &= ~E1000_RCTL_SZ_4096;
+       rctl |= E1000_RCTL_BSEX;
+       switch (adapter->rx_buffer_len) {
+               case E1000_RXBUFFER_2048:
+               default:
+                       rctl |= E1000_RCTL_SZ_2048;
+                       rctl &= ~E1000_RCTL_BSEX;
+                       break;
+               case E1000_RXBUFFER_4096:
+                       rctl |= E1000_RCTL_SZ_4096;
+                       break;
+               case E1000_RXBUFFER_8192:
+                       rctl |= E1000_RCTL_SZ_8192;
+                       break;
+               case E1000_RXBUFFER_16384:
+                       rctl |= E1000_RCTL_SZ_16384;
+                       break;
+       }
+
+       ew32(RCTL, rctl);
+}
+
+/**
+ * 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)
+{
+       u64 rdba;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rdlen, rctl, rxcsum;
+
+       if (adapter->netdev->mtu > ETH_DATA_LEN) {
+               rdlen = adapter->rx_ring[0].count *
+                       sizeof(struct e1000_rx_desc);
+               adapter->clean_rx = e1000_clean_jumbo_rx_irq;
+               adapter->alloc_rx_buf = e1000_alloc_jumbo_rx_buffers;
+       } else {
+               rdlen = adapter->rx_ring[0].count *
+                       sizeof(struct e1000_rx_desc);
+               adapter->clean_rx = e1000_clean_rx_irq;
+               adapter->alloc_rx_buf = e1000_alloc_rx_buffers;
+       }
+
+       /* disable receives while setting up the descriptors */
+       rctl = er32(RCTL);
+       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+
+       /* set the Receive Delay Timer Register */
+       ew32(RDTR, adapter->rx_int_delay);
+
+       if (hw->mac_type >= e1000_82540) {
+               ew32(RADV, adapter->rx_abs_int_delay);
+               if (adapter->itr_setting != 0)
+                       ew32(ITR, 1000000000 / (adapter->itr * 256));
+       }
+
+       /* Setup the HW Rx Head and Tail Descriptor Pointers and
+        * the Base and Length of the Rx Descriptor Ring */
+       switch (adapter->num_rx_queues) {
+       case 1:
+       default:
+               rdba = adapter->rx_ring[0].dma;
+               ew32(RDLEN, rdlen);
+               ew32(RDBAH, (rdba >> 32));
+               ew32(RDBAL, (rdba & 0x00000000ffffffffULL));
+               ew32(RDT, 0);
+               ew32(RDH, 0);
+               adapter->rx_ring[0].rdh = ((hw->mac_type >= e1000_82543) ? E1000_RDH : E1000_82542_RDH);
+               adapter->rx_ring[0].rdt = ((hw->mac_type >= e1000_82543) ? E1000_RDT : E1000_82542_RDT);
+               break;
+       }
+
+       /* Enable 82543 Receive Checksum Offload for TCP and UDP */
+       if (hw->mac_type >= e1000_82543) {
+               rxcsum = er32(RXCSUM);
+               if (adapter->rx_csum)
+                       rxcsum |= E1000_RXCSUM_TUOFL;
+               else
+                       /* don't need to clear IPPCSE as it defaults to 0 */
+                       rxcsum &= ~E1000_RXCSUM_TUOFL;
+               ew32(RXCSUM, rxcsum);
+       }
+
+       /* Enable Receives */
+       ew32(RCTL, rctl);
+}
+
+/**
+ * e1000_free_tx_resources - Free Tx Resources per Queue
+ * @adapter: board private structure
+ * @tx_ring: Tx descriptor ring for a specific queue
+ *
+ * Free all transmit software resources
+ **/
+
+static void e1000_free_tx_resources(struct e1000_adapter *adapter,
+                                   struct e1000_tx_ring *tx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+
+       e1000_clean_tx_ring(adapter, tx_ring);
+
+       vfree(tx_ring->buffer_info);
+       tx_ring->buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
+                         tx_ring->dma);
+
+       tx_ring->desc = NULL;
+}
+
+/**
+ * e1000_free_all_tx_resources - Free Tx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all transmit software resources
+ **/
+
+void e1000_free_all_tx_resources(struct e1000_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               e1000_free_tx_resources(adapter, &adapter->tx_ring[i]);
+}
+
+static void e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
+                                            struct e1000_buffer *buffer_info)
+{
+       if (buffer_info->dma) {
+               if (buffer_info->mapped_as_page)
+                       dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
+                                      buffer_info->length, DMA_TO_DEVICE);
+               else
+                       dma_unmap_single(&adapter->pdev->dev, buffer_info->dma,
+                                        buffer_info->length,
+                                        DMA_TO_DEVICE);
+               buffer_info->dma = 0;
+       }
+       if (buffer_info->skb) {
+               dev_kfree_skb_any(buffer_info->skb);
+               buffer_info->skb = NULL;
+       }
+       buffer_info->time_stamp = 0;
+       /* buffer_info must be completely set up in the transmit path */
+}
+
+/**
+ * e1000_clean_tx_ring - Free Tx Buffers
+ * @adapter: board private structure
+ * @tx_ring: ring to be cleaned
+ **/
+
+static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
+                               struct e1000_tx_ring *tx_ring)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_buffer *buffer_info;
+       unsigned long size;
+       unsigned int i;
+
+       /* Free all the Tx ring sk_buffs */
+
+       for (i = 0; i < tx_ring->count; i++) {
+               buffer_info = &tx_ring->buffer_info[i];
+               e1000_unmap_and_free_tx_resource(adapter, buffer_info);
+       }
+
+       size = sizeof(struct e1000_buffer) * tx_ring->count;
+       memset(tx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+
+       memset(tx_ring->desc, 0, tx_ring->size);
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+       tx_ring->last_tx_tso = 0;
+
+       writel(0, hw->hw_addr + tx_ring->tdh);
+       writel(0, hw->hw_addr + tx_ring->tdt);
+}
+
+/**
+ * e1000_clean_all_tx_rings - Free Tx Buffers for all queues
+ * @adapter: board private structure
+ **/
+
+static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               e1000_clean_tx_ring(adapter, &adapter->tx_ring[i]);
+}
+
+/**
+ * e1000_free_rx_resources - Free Rx Resources
+ * @adapter: board private structure
+ * @rx_ring: ring to clean the resources from
+ *
+ * Free all receive software resources
+ **/
+
+static void e1000_free_rx_resources(struct e1000_adapter *adapter,
+                                   struct e1000_rx_ring *rx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+
+       e1000_clean_rx_ring(adapter, rx_ring);
+
+       vfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
+                         rx_ring->dma);
+
+       rx_ring->desc = NULL;
+}
+
+/**
+ * e1000_free_all_rx_resources - Free Rx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all receive software resources
+ **/
+
+void e1000_free_all_rx_resources(struct e1000_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               e1000_free_rx_resources(adapter, &adapter->rx_ring[i]);
+}
+
+/**
+ * e1000_clean_rx_ring - Free Rx Buffers per Queue
+ * @adapter: board private structure
+ * @rx_ring: ring to free buffers from
+ **/
+
+static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
+                               struct e1000_rx_ring *rx_ring)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_buffer *buffer_info;
+       struct pci_dev *pdev = adapter->pdev;
+       unsigned long size;
+       unsigned int i;
+
+       /* Free all the Rx ring sk_buffs */
+       for (i = 0; i < rx_ring->count; i++) {
+               buffer_info = &rx_ring->buffer_info[i];
+               if (buffer_info->dma &&
+                   adapter->clean_rx == e1000_clean_rx_irq) {
+                       dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                        buffer_info->length,
+                                        DMA_FROM_DEVICE);
+               } else if (buffer_info->dma &&
+                          adapter->clean_rx == e1000_clean_jumbo_rx_irq) {
+                       dma_unmap_page(&pdev->dev, buffer_info->dma,
+                                      buffer_info->length,
+                                      DMA_FROM_DEVICE);
+               }
+
+               buffer_info->dma = 0;
+               if (buffer_info->page) {
+                       put_page(buffer_info->page);
+                       buffer_info->page = NULL;
+               }
+               if (buffer_info->skb) {
+                       dev_kfree_skb(buffer_info->skb);
+                       buffer_info->skb = NULL;
+               }
+       }
+
+       /* there also may be some cached data from a chained receive */
+       if (rx_ring->rx_skb_top) {
+               dev_kfree_skb(rx_ring->rx_skb_top);
+               rx_ring->rx_skb_top = NULL;
+       }
+
+       size = sizeof(struct e1000_buffer) * rx_ring->count;
+       memset(rx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(rx_ring->desc, 0, rx_ring->size);
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       writel(0, hw->hw_addr + rx_ring->rdh);
+       writel(0, hw->hw_addr + rx_ring->rdt);
+}
+
+/**
+ * e1000_clean_all_rx_rings - Free Rx Buffers for all queues
+ * @adapter: board private structure
+ **/
+
+static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               e1000_clean_rx_ring(adapter, &adapter->rx_ring[i]);
+}
+
+/* The 82542 2.0 (revision 2) needs to have the receive unit in reset
+ * and memory write and invalidate disabled for certain operations
+ */
+static void e1000_enter_82542_rst(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u32 rctl;
+
+       e1000_pci_clear_mwi(hw);
+
+       rctl = er32(RCTL);
+       rctl |= E1000_RCTL_RST;
+       ew32(RCTL, rctl);
+       E1000_WRITE_FLUSH();
+       mdelay(5);
+
+       if (netif_running(netdev))
+               e1000_clean_all_rx_rings(adapter);
+}
+
+static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u32 rctl;
+
+       rctl = er32(RCTL);
+       rctl &= ~E1000_RCTL_RST;
+       ew32(RCTL, rctl);
+       E1000_WRITE_FLUSH();
+       mdelay(5);
+
+       if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
+               e1000_pci_set_mwi(hw);
+
+       if (netif_running(netdev)) {
+               /* No need to loop, because 82542 supports only 1 queue */
+               struct e1000_rx_ring *ring = &adapter->rx_ring[0];
+               e1000_configure_rx(adapter);
+               adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring));
+       }
+}
+
+/**
+ * e1000_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int e1000_set_mac(struct net_device *netdev, void *p)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       /* 82542 2.0 needs to be in reset to write receive address registers */
+
+       if (hw->mac_type == e1000_82542_rev2_0)
+               e1000_enter_82542_rst(adapter);
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+       memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len);
+
+       e1000_rar_set(hw, hw->mac_addr, 0);
+
+       if (hw->mac_type == e1000_82542_rev2_0)
+               e1000_leave_82542_rst(adapter);
+
+       return 0;
+}
+
+/**
+ * e1000_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_rx_mode entry point is called whenever the unicast or multicast
+ * address lists or the network interface flags are updated. This routine is
+ * responsible for configuring the hardware for proper unicast, multicast,
+ * promiscuous mode, and all-multi behavior.
+ **/
+
+static void e1000_set_rx_mode(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct netdev_hw_addr *ha;
+       bool use_uc = false;
+       u32 rctl;
+       u32 hash_value;
+       int i, rar_entries = E1000_RAR_ENTRIES;
+       int mta_reg_count = E1000_NUM_MTA_REGISTERS;
+       u32 *mcarray = kcalloc(mta_reg_count, sizeof(u32), GFP_ATOMIC);
+
+       if (!mcarray) {
+               e_err(probe, "memory allocation failed\n");
+               return;
+       }
+
+       /* Check for Promiscuous and All Multicast modes */
+
+       rctl = er32(RCTL);
+
+       if (netdev->flags & IFF_PROMISC) {
+               rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
+               rctl &= ~E1000_RCTL_VFE;
+       } else {
+               if (netdev->flags & IFF_ALLMULTI)
+                       rctl |= E1000_RCTL_MPE;
+               else
+                       rctl &= ~E1000_RCTL_MPE;
+               /* Enable VLAN filter if there is a VLAN */
+               if (e1000_vlan_used(adapter))
+                       rctl |= E1000_RCTL_VFE;
+       }
+
+       if (netdev_uc_count(netdev) > rar_entries - 1) {
+               rctl |= E1000_RCTL_UPE;
+       } else if (!(netdev->flags & IFF_PROMISC)) {
+               rctl &= ~E1000_RCTL_UPE;
+               use_uc = true;
+       }
+
+       ew32(RCTL, rctl);
+
+       /* 82542 2.0 needs to be in reset to write receive address registers */
+
+       if (hw->mac_type == e1000_82542_rev2_0)
+               e1000_enter_82542_rst(adapter);
+
+       /* load the first 14 addresses into the exact filters 1-14. Unicast
+        * addresses take precedence to avoid disabling unicast filtering
+        * when possible.
+        *
+        * RAR 0 is used for the station MAC address
+        * if there are not 14 addresses, go ahead and clear the filters
+        */
+       i = 1;
+       if (use_uc)
+               netdev_for_each_uc_addr(ha, netdev) {
+                       if (i == rar_entries)
+                               break;
+                       e1000_rar_set(hw, ha->addr, i++);
+               }
+
+       netdev_for_each_mc_addr(ha, netdev) {
+               if (i == rar_entries) {
+                       /* load any remaining addresses into the hash table */
+                       u32 hash_reg, hash_bit, mta;
+                       hash_value = e1000_hash_mc_addr(hw, ha->addr);
+                       hash_reg = (hash_value >> 5) & 0x7F;
+                       hash_bit = hash_value & 0x1F;
+                       mta = (1 << hash_bit);
+                       mcarray[hash_reg] |= mta;
+               } else {
+                       e1000_rar_set(hw, ha->addr, i++);
+               }
+       }
+
+       for (; i < rar_entries; i++) {
+               E1000_WRITE_REG_ARRAY(hw, RA, i << 1, 0);
+               E1000_WRITE_FLUSH();
+               E1000_WRITE_REG_ARRAY(hw, RA, (i << 1) + 1, 0);
+               E1000_WRITE_FLUSH();
+       }
+
+       /* write the hash table completely, write from bottom to avoid
+        * both stupid write combining chipsets, and flushing each write */
+       for (i = mta_reg_count - 1; i >= 0 ; i--) {
+               /*
+                * If we are on an 82544 has an errata where writing odd
+                * offsets overwrites the previous even offset, but writing
+                * backwards over the range solves the issue by always
+                * writing the odd offset first
+                */
+               E1000_WRITE_REG_ARRAY(hw, MTA, i, mcarray[i]);
+       }
+       E1000_WRITE_FLUSH();
+
+       if (hw->mac_type == e1000_82542_rev2_0)
+               e1000_leave_82542_rst(adapter);
+
+       kfree(mcarray);
+}
+
+/* Need to wait a few seconds after link up to get diagnostic information from
+ * the phy */
+
+static void e1000_update_phy_info(unsigned long data)
+{
+       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
+       schedule_work(&adapter->phy_info_task);
+}
+
+static void e1000_update_phy_info_task(struct work_struct *work)
+{
+       struct e1000_adapter *adapter = container_of(work,
+                                                    struct e1000_adapter,
+                                                    phy_info_task);
+       struct e1000_hw *hw = &adapter->hw;
+
+       rtnl_lock();
+       e1000_phy_get_info(hw, &adapter->phy_info);
+       rtnl_unlock();
+}
+
+/**
+ * e1000_82547_tx_fifo_stall - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+static void e1000_82547_tx_fifo_stall(unsigned long data)
+{
+       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
+       schedule_work(&adapter->fifo_stall_task);
+}
+
+/**
+ * e1000_82547_tx_fifo_stall_task - task to complete work
+ * @work: work struct contained inside adapter struct
+ **/
+static void e1000_82547_tx_fifo_stall_task(struct work_struct *work)
+{
+       struct e1000_adapter *adapter = container_of(work,
+                                                    struct e1000_adapter,
+                                                    fifo_stall_task);
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u32 tctl;
+
+       rtnl_lock();
+       if (atomic_read(&adapter->tx_fifo_stall)) {
+               if ((er32(TDT) == er32(TDH)) &&
+                  (er32(TDFT) == er32(TDFH)) &&
+                  (er32(TDFTS) == er32(TDFHS))) {
+                       tctl = er32(TCTL);
+                       ew32(TCTL, tctl & ~E1000_TCTL_EN);
+                       ew32(TDFT, adapter->tx_head_addr);
+                       ew32(TDFH, adapter->tx_head_addr);
+                       ew32(TDFTS, adapter->tx_head_addr);
+                       ew32(TDFHS, adapter->tx_head_addr);
+                       ew32(TCTL, tctl);
+                       E1000_WRITE_FLUSH();
+
+                       adapter->tx_fifo_head = 0;
+                       atomic_set(&adapter->tx_fifo_stall, 0);
+                       netif_wake_queue(netdev);
+               } else if (!test_bit(__E1000_DOWN, &adapter->flags)) {
+                       mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
+               }
+       }
+       rtnl_unlock();
+}
+
+bool e1000_has_link(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       bool link_active = false;
+
+       /* get_link_status is set on LSC (link status) interrupt or rx
+        * sequence error interrupt (except on intel ce4100).
+        * get_link_status will stay false until the
+        * e1000_check_for_link establishes link for copper adapters
+        * ONLY
+        */
+       switch (hw->media_type) {
+       case e1000_media_type_copper:
+               if (hw->mac_type == e1000_ce4100)
+                       hw->get_link_status = 1;
+               if (hw->get_link_status) {
+                       e1000_check_for_link(hw);
+                       link_active = !hw->get_link_status;
+               } else {
+                       link_active = true;
+               }
+               break;
+       case e1000_media_type_fiber:
+               e1000_check_for_link(hw);
+               link_active = !!(er32(STATUS) & E1000_STATUS_LU);
+               break;
+       case e1000_media_type_internal_serdes:
+               e1000_check_for_link(hw);
+               link_active = hw->serdes_has_link;
+               break;
+       default:
+               break;
+       }
+
+       return link_active;
+}
+
+/**
+ * e1000_watchdog - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+static void e1000_watchdog(unsigned long data)
+{
+       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_tx_ring *txdr = adapter->tx_ring;
+       u32 link, tctl;
+
+       link = e1000_has_link(adapter);
+       if ((netif_carrier_ok(netdev)) && link)
+               goto link_up;
+
+       if (link) {
+               if (!netif_carrier_ok(netdev)) {
+                       u32 ctrl;
+                       bool txb2b = true;
+                       /* update snapshot of PHY registers on LSC */
+                       e1000_get_speed_and_duplex(hw,
+                                                  &adapter->link_speed,
+                                                  &adapter->link_duplex);
+
+                       ctrl = er32(CTRL);
+                       pr_info("%s NIC Link is Up %d Mbps %s, "
+                               "Flow Control: %s\n",
+                               netdev->name,
+                               adapter->link_speed,
+                               adapter->link_duplex == FULL_DUPLEX ?
+                               "Full Duplex" : "Half Duplex",
+                               ((ctrl & E1000_CTRL_TFCE) && (ctrl &
+                               E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
+                               E1000_CTRL_RFCE) ? "RX" : ((ctrl &
+                               E1000_CTRL_TFCE) ? "TX" : "None")));
+
+                       /* adjust timeout factor according to speed/duplex */
+                       adapter->tx_timeout_factor = 1;
+                       switch (adapter->link_speed) {
+                       case SPEED_10:
+                               txb2b = false;
+                               adapter->tx_timeout_factor = 16;
+                               break;
+                       case SPEED_100:
+                               txb2b = false;
+                               /* maybe add some timeout factor ? */
+                               break;
+                       }
+
+                       /* enable transmits in the hardware */
+                       tctl = er32(TCTL);
+                       tctl |= E1000_TCTL_EN;
+                       ew32(TCTL, tctl);
+
+                       netif_carrier_on(netdev);
+                       if (!test_bit(__E1000_DOWN, &adapter->flags))
+                               mod_timer(&adapter->phy_info_timer,
+                                         round_jiffies(jiffies + 2 * HZ));
+                       adapter->smartspeed = 0;
+               }
+       } else {
+               if (netif_carrier_ok(netdev)) {
+                       adapter->link_speed = 0;
+                       adapter->link_duplex = 0;
+                       pr_info("%s NIC Link is Down\n",
+                               netdev->name);
+                       netif_carrier_off(netdev);
+
+                       if (!test_bit(__E1000_DOWN, &adapter->flags))
+                               mod_timer(&adapter->phy_info_timer,
+                                         round_jiffies(jiffies + 2 * HZ));
+               }
+
+               e1000_smartspeed(adapter);
+       }
+
+link_up:
+       e1000_update_stats(adapter);
+
+       hw->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
+       adapter->tpt_old = adapter->stats.tpt;
+       hw->collision_delta = adapter->stats.colc - adapter->colc_old;
+       adapter->colc_old = adapter->stats.colc;
+
+       adapter->gorcl = adapter->stats.gorcl - adapter->gorcl_old;
+       adapter->gorcl_old = adapter->stats.gorcl;
+       adapter->gotcl = adapter->stats.gotcl - adapter->gotcl_old;
+       adapter->gotcl_old = adapter->stats.gotcl;
+
+       e1000_update_adaptive(hw);
+
+       if (!netif_carrier_ok(netdev)) {
+               if (E1000_DESC_UNUSED(txdr) + 1 < txdr->count) {
+                       /* We've lost link, so the controller stops DMA,
+                        * but we've got queued Tx work that's never going
+                        * to get done, so reset controller to flush Tx.
+                        * (Do the reset outside of interrupt context). */
+                       adapter->tx_timeout_count++;
+                       schedule_work(&adapter->reset_task);
+                       /* return immediately since reset is imminent */
+                       return;
+               }
+       }
+
+       /* Simple mode for Interrupt Throttle Rate (ITR) */
+       if (hw->mac_type >= e1000_82540 && adapter->itr_setting == 4) {
+               /*
+                * Symmetric Tx/Rx gets a reduced ITR=2000;
+                * Total asymmetrical Tx or Rx gets ITR=8000;
+                * everyone else is between 2000-8000.
+                */
+               u32 goc = (adapter->gotcl + adapter->gorcl) / 10000;
+               u32 dif = (adapter->gotcl > adapter->gorcl ?
+                           adapter->gotcl - adapter->gorcl :
+                           adapter->gorcl - adapter->gotcl) / 10000;
+               u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
+
+               ew32(ITR, 1000000000 / (itr * 256));
+       }
+
+       /* Cause software interrupt to ensure rx ring is cleaned */
+       ew32(ICS, E1000_ICS_RXDMT0);
+
+       /* Force detection of hung controller every watchdog period */
+       adapter->detect_tx_hung = true;
+
+       /* Reset the timer */
+       if (!test_bit(__E1000_DOWN, &adapter->flags))
+               mod_timer(&adapter->watchdog_timer,
+                         round_jiffies(jiffies + 2 * HZ));
+}
+
+enum latency_range {
+       lowest_latency = 0,
+       low_latency = 1,
+       bulk_latency = 2,
+       latency_invalid = 255
+};
+
+/**
+ * e1000_update_itr - update the dynamic ITR value based on statistics
+ * @adapter: pointer to adapter
+ * @itr_setting: current adapter->itr
+ * @packets: the number of packets during this measurement interval
+ * @bytes: the number of bytes during this measurement interval
+ *
+ *      Stores a new ITR value based on packets and byte
+ *      counts during the last interrupt.  The advantage of per interrupt
+ *      computation is faster updates and more accurate ITR for the current
+ *      traffic pattern.  Constants in this function were computed
+ *      based on theoretical maximum wire speed and thresholds were set based
+ *      on testing data as well as attempting to minimize response time
+ *      while increasing bulk throughput.
+ *      this functionality is controlled by the InterruptThrottleRate module
+ *      parameter (see e1000_param.c)
+ **/
+static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
+                                    u16 itr_setting, int packets, int bytes)
+{
+       unsigned int retval = itr_setting;
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (unlikely(hw->mac_type < e1000_82540))
+               goto update_itr_done;
+
+       if (packets == 0)
+               goto update_itr_done;
+
+       switch (itr_setting) {
+       case lowest_latency:
+               /* jumbo frames get bulk treatment*/
+               if (bytes/packets > 8000)
+                       retval = bulk_latency;
+               else if ((packets < 5) && (bytes > 512))
+                       retval = low_latency;
+               break;
+       case low_latency:  /* 50 usec aka 20000 ints/s */
+               if (bytes > 10000) {
+                       /* jumbo frames need bulk latency setting */
+                       if (bytes/packets > 8000)
+                               retval = bulk_latency;
+                       else if ((packets < 10) || ((bytes/packets) > 1200))
+                               retval = bulk_latency;
+                       else if ((packets > 35))
+                               retval = lowest_latency;
+               } else if (bytes/packets > 2000)
+                       retval = bulk_latency;
+               else if (packets <= 2 && bytes < 512)
+                       retval = lowest_latency;
+               break;
+       case bulk_latency: /* 250 usec aka 4000 ints/s */
+               if (bytes > 25000) {
+                       if (packets > 35)
+                               retval = low_latency;
+               } else if (bytes < 6000) {
+                       retval = low_latency;
+               }
+               break;
+       }
+
+update_itr_done:
+       return retval;
+}
+
+static void e1000_set_itr(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 current_itr;
+       u32 new_itr = adapter->itr;
+
+       if (unlikely(hw->mac_type < e1000_82540))
+               return;
+
+       /* for non-gigabit speeds, just fix the interrupt rate at 4000 */
+       if (unlikely(adapter->link_speed != SPEED_1000)) {
+               current_itr = 0;
+               new_itr = 4000;
+               goto set_itr_now;
+       }
+
+       adapter->tx_itr = e1000_update_itr(adapter,
+                                   adapter->tx_itr,
+                                   adapter->total_tx_packets,
+                                   adapter->total_tx_bytes);
+       /* conservative mode (itr 3) eliminates the lowest_latency setting */
+       if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
+               adapter->tx_itr = low_latency;
+
+       adapter->rx_itr = e1000_update_itr(adapter,
+                                   adapter->rx_itr,
+                                   adapter->total_rx_packets,
+                                   adapter->total_rx_bytes);
+       /* conservative mode (itr 3) eliminates the lowest_latency setting */
+       if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
+               adapter->rx_itr = low_latency;
+
+       current_itr = max(adapter->rx_itr, adapter->tx_itr);
+
+       switch (current_itr) {
+       /* counts and packets in update_itr are dependent on these numbers */
+       case lowest_latency:
+               new_itr = 70000;
+               break;
+       case low_latency:
+               new_itr = 20000; /* aka hwitr = ~200 */
+               break;
+       case bulk_latency:
+               new_itr = 4000;
+               break;
+       default:
+               break;
+       }
+
+set_itr_now:
+       if (new_itr != adapter->itr) {
+               /* this attempts to bias the interrupt rate towards Bulk
+                * by adding intermediate steps when interrupt rate is
+                * increasing */
+               new_itr = new_itr > adapter->itr ?
+                            min(adapter->itr + (new_itr >> 2), new_itr) :
+                            new_itr;
+               adapter->itr = new_itr;
+               ew32(ITR, 1000000000 / (new_itr * 256));
+       }
+}
+
+#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
+
+static int e1000_tso(struct e1000_adapter *adapter,
+                    struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
+{
+       struct e1000_context_desc *context_desc;
+       struct e1000_buffer *buffer_info;
+       unsigned int i;
+       u32 cmd_length = 0;
+       u16 ipcse = 0, tucse, mss;
+       u8 ipcss, ipcso, tucss, tucso, hdr_len;
+       int err;
+
+       if (skb_is_gso(skb)) {
+               if (skb_header_cloned(skb)) {
+                       err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+                       if (err)
+                               return err;
+               }
+
+               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+               mss = skb_shinfo(skb)->gso_size;
+               if (skb->protocol == htons(ETH_P_IP)) {
+                       struct iphdr *iph = ip_hdr(skb);
+                       iph->tot_len = 0;
+                       iph->check = 0;
+                       tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                                iph->daddr, 0,
+                                                                IPPROTO_TCP,
+                                                                0);
+                       cmd_length = E1000_TXD_CMD_IP;
+                       ipcse = skb_transport_offset(skb) - 1;
+               } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                       ipv6_hdr(skb)->payload_len = 0;
+                       tcp_hdr(skb)->check =
+                               ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                                &ipv6_hdr(skb)->daddr,
+                                                0, IPPROTO_TCP, 0);
+                       ipcse = 0;
+               }
+               ipcss = skb_network_offset(skb);
+               ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
+               tucss = skb_transport_offset(skb);
+               tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
+               tucse = 0;
+
+               cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
+                              E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
+
+               i = tx_ring->next_to_use;
+               context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
+               buffer_info = &tx_ring->buffer_info[i];
+
+               context_desc->lower_setup.ip_fields.ipcss  = ipcss;
+               context_desc->lower_setup.ip_fields.ipcso  = ipcso;
+               context_desc->lower_setup.ip_fields.ipcse  = cpu_to_le16(ipcse);
+               context_desc->upper_setup.tcp_fields.tucss = tucss;
+               context_desc->upper_setup.tcp_fields.tucso = tucso;
+               context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
+               context_desc->tcp_seg_setup.fields.mss     = cpu_to_le16(mss);
+               context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
+               context_desc->cmd_and_length = cpu_to_le32(cmd_length);
+
+               buffer_info->time_stamp = jiffies;
+               buffer_info->next_to_watch = i;
+
+               if (++i == tx_ring->count) i = 0;
+               tx_ring->next_to_use = i;
+
+               return true;
+       }
+       return false;
+}
+
+static bool e1000_tx_csum(struct e1000_adapter *adapter,
+                         struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
+{
+       struct e1000_context_desc *context_desc;
+       struct e1000_buffer *buffer_info;
+       unsigned int i;
+       u8 css;
+       u32 cmd_len = E1000_TXD_CMD_DEXT;
+
+       if (skb->ip_summed != CHECKSUM_PARTIAL)
+               return false;
+
+       switch (skb->protocol) {
+       case cpu_to_be16(ETH_P_IP):
+               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                       cmd_len |= E1000_TXD_CMD_TCP;
+               break;
+       case cpu_to_be16(ETH_P_IPV6):
+               /* XXX not handling all IPV6 headers */
+               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                       cmd_len |= E1000_TXD_CMD_TCP;
+               break;
+       default:
+               if (unlikely(net_ratelimit()))
+                       e_warn(drv, "checksum_partial proto=%x!\n",
+                              skb->protocol);
+               break;
+       }
+
+       css = skb_checksum_start_offset(skb);
+
+       i = tx_ring->next_to_use;
+       buffer_info = &tx_ring->buffer_info[i];
+       context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
+
+       context_desc->lower_setup.ip_config = 0;
+       context_desc->upper_setup.tcp_fields.tucss = css;
+       context_desc->upper_setup.tcp_fields.tucso =
+               css + skb->csum_offset;
+       context_desc->upper_setup.tcp_fields.tucse = 0;
+       context_desc->tcp_seg_setup.data = 0;
+       context_desc->cmd_and_length = cpu_to_le32(cmd_len);
+
+       buffer_info->time_stamp = jiffies;
+       buffer_info->next_to_watch = i;
+
+       if (unlikely(++i == tx_ring->count)) i = 0;
+       tx_ring->next_to_use = i;
+
+       return true;
+}
+
+#define E1000_MAX_TXD_PWR      12
+#define E1000_MAX_DATA_PER_TXD (1<<E1000_MAX_TXD_PWR)
+
+static int e1000_tx_map(struct e1000_adapter *adapter,
+                       struct e1000_tx_ring *tx_ring,
+                       struct sk_buff *skb, unsigned int first,
+                       unsigned int max_per_txd, unsigned int nr_frags,
+                       unsigned int mss)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_buffer *buffer_info;
+       unsigned int len = skb_headlen(skb);
+       unsigned int offset = 0, size, count = 0, i;
+       unsigned int f;
+
+       i = tx_ring->next_to_use;
+
+       while (len) {
+               buffer_info = &tx_ring->buffer_info[i];
+               size = min(len, max_per_txd);
+               /* Workaround for Controller erratum --
+                * descriptor for non-tso packet in a linear SKB that follows a
+                * tso gets written back prematurely before the data is fully
+                * DMA'd to the controller */
+               if (!skb->data_len && tx_ring->last_tx_tso &&
+                   !skb_is_gso(skb)) {
+                       tx_ring->last_tx_tso = 0;
+                       size -= 4;
+               }
+
+               /* Workaround for premature desc write-backs
+                * in TSO mode.  Append 4-byte sentinel desc */
+               if (unlikely(mss && !nr_frags && size == len && size > 8))
+                       size -= 4;
+               /* work-around for errata 10 and it applies
+                * to all controllers in PCI-X mode
+                * The fix is to make sure that the first descriptor of a
+                * packet is smaller than 2048 - 16 - 16 (or 2016) bytes
+                */
+               if (unlikely((hw->bus_type == e1000_bus_type_pcix) &&
+                               (size > 2015) && count == 0))
+                       size = 2015;
+
+               /* Workaround for potential 82544 hang in PCI-X.  Avoid
+                * terminating buffers within evenly-aligned dwords. */
+               if (unlikely(adapter->pcix_82544 &&
+                  !((unsigned long)(skb->data + offset + size - 1) & 4) &&
+                  size > 4))
+                       size -= 4;
+
+               buffer_info->length = size;
+               /* set time_stamp *before* dma to help avoid a possible race */
+               buffer_info->time_stamp = jiffies;
+               buffer_info->mapped_as_page = false;
+               buffer_info->dma = dma_map_single(&pdev->dev,
+                                                 skb->data + offset,
+                                                 size, DMA_TO_DEVICE);
+               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                       goto dma_error;
+               buffer_info->next_to_watch = i;
+
+               len -= size;
+               offset += size;
+               count++;
+               if (len) {
+                       i++;
+                       if (unlikely(i == tx_ring->count))
+                               i = 0;
+               }
+       }
+
+       for (f = 0; f < nr_frags; f++) {
+               struct skb_frag_struct *frag;
+
+               frag = &skb_shinfo(skb)->frags[f];
+               len = frag->size;
+               offset = frag->page_offset;
+
+               while (len) {
+                       i++;
+                       if (unlikely(i == tx_ring->count))
+                               i = 0;
+
+                       buffer_info = &tx_ring->buffer_info[i];
+                       size = min(len, max_per_txd);
+                       /* Workaround for premature desc write-backs
+                        * in TSO mode.  Append 4-byte sentinel desc */
+                       if (unlikely(mss && f == (nr_frags-1) && size == len && size > 8))
+                               size -= 4;
+                       /* Workaround for potential 82544 hang in PCI-X.
+                        * Avoid terminating buffers within evenly-aligned
+                        * dwords. */
+                       if (unlikely(adapter->pcix_82544 &&
+                           !((unsigned long)(page_to_phys(frag->page) + offset
+                                             + size - 1) & 4) &&
+                           size > 4))
+                               size -= 4;
+
+                       buffer_info->length = size;
+                       buffer_info->time_stamp = jiffies;
+                       buffer_info->mapped_as_page = true;
+                       buffer_info->dma = dma_map_page(&pdev->dev, frag->page,
+                                                       offset, size,
+                                                       DMA_TO_DEVICE);
+                       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                               goto dma_error;
+                       buffer_info->next_to_watch = i;
+
+                       len -= size;
+                       offset += size;
+                       count++;
+               }
+       }
+
+       tx_ring->buffer_info[i].skb = skb;
+       tx_ring->buffer_info[first].next_to_watch = i;
+
+       return count;
+
+dma_error:
+       dev_err(&pdev->dev, "TX DMA map failed\n");
+       buffer_info->dma = 0;
+       if (count)
+               count--;
+
+       while (count--) {
+               if (i==0)
+                       i += tx_ring->count;
+               i--;
+               buffer_info = &tx_ring->buffer_info[i];
+               e1000_unmap_and_free_tx_resource(adapter, buffer_info);
+       }
+
+       return 0;
+}
+
+static void e1000_tx_queue(struct e1000_adapter *adapter,
+                          struct e1000_tx_ring *tx_ring, int tx_flags,
+                          int count)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_tx_desc *tx_desc = NULL;
+       struct e1000_buffer *buffer_info;
+       u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
+       unsigned int i;
+
+       if (likely(tx_flags & E1000_TX_FLAGS_TSO)) {
+               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
+                            E1000_TXD_CMD_TSE;
+               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
+
+               if (likely(tx_flags & E1000_TX_FLAGS_IPV4))
+                       txd_upper |= E1000_TXD_POPTS_IXSM << 8;
+       }
+
+       if (likely(tx_flags & E1000_TX_FLAGS_CSUM)) {
+               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
+               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
+       }
+
+       if (unlikely(tx_flags & E1000_TX_FLAGS_VLAN)) {
+               txd_lower |= E1000_TXD_CMD_VLE;
+               txd_upper |= (tx_flags & E1000_TX_FLAGS_VLAN_MASK);
+       }
+
+       i = tx_ring->next_to_use;
+
+       while (count--) {
+               buffer_info = &tx_ring->buffer_info[i];
+               tx_desc = E1000_TX_DESC(*tx_ring, i);
+               tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
+               tx_desc->lower.data =
+                       cpu_to_le32(txd_lower | buffer_info->length);
+               tx_desc->upper.data = cpu_to_le32(txd_upper);
+               if (unlikely(++i == tx_ring->count)) i = 0;
+       }
+
+       tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
+
+       /* Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64). */
+       wmb();
+
+       tx_ring->next_to_use = i;
+       writel(i, hw->hw_addr + tx_ring->tdt);
+       /* we need this if more than one processor can write to our tail
+        * at a time, it syncronizes IO on IA64/Altix systems */
+       mmiowb();
+}
+
+/**
+ * 82547 workaround to avoid controller hang in half-duplex environment.
+ * The workaround is to avoid queuing a large packet that would span
+ * the internal Tx FIFO ring boundary by notifying the stack to resend
+ * the packet at a later time.  This gives the Tx FIFO an opportunity to
+ * flush all packets.  When that occurs, we reset the Tx FIFO pointers
+ * to the beginning of the Tx FIFO.
+ **/
+
+#define E1000_FIFO_HDR                 0x10
+#define E1000_82547_PAD_LEN            0x3E0
+
+static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
+                                      struct sk_buff *skb)
+{
+       u32 fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
+       u32 skb_fifo_len = skb->len + E1000_FIFO_HDR;
+
+       skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
+
+       if (adapter->link_duplex != HALF_DUPLEX)
+               goto no_fifo_stall_required;
+
+       if (atomic_read(&adapter->tx_fifo_stall))
+               return 1;
+
+       if (skb_fifo_len >= (E1000_82547_PAD_LEN + fifo_space)) {
+               atomic_set(&adapter->tx_fifo_stall, 1);
+               return 1;
+       }
+
+no_fifo_stall_required:
+       adapter->tx_fifo_head += skb_fifo_len;
+       if (adapter->tx_fifo_head >= adapter->tx_fifo_size)
+               adapter->tx_fifo_head -= adapter->tx_fifo_size;
+       return 0;
+}
+
+static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_tx_ring *tx_ring = adapter->tx_ring;
+
+       netif_stop_queue(netdev);
+       /* Herbert's original patch had:
+        *  smp_mb__after_netif_stop_queue();
+        * but since that doesn't exist yet, just open code it. */
+       smp_mb();
+
+       /* We need to check again in a case another CPU has just
+        * made room available. */
+       if (likely(E1000_DESC_UNUSED(tx_ring) < size))
+               return -EBUSY;
+
+       /* A reprieve! */
+       netif_start_queue(netdev);
+       ++adapter->restart_queue;
+       return 0;
+}
+
+static int e1000_maybe_stop_tx(struct net_device *netdev,
+                               struct e1000_tx_ring *tx_ring, int size)
+{
+       if (likely(E1000_DESC_UNUSED(tx_ring) >= size))
+               return 0;
+       return __e1000_maybe_stop_tx(netdev, size);
+}
+
+#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
+static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
+                                   struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_tx_ring *tx_ring;
+       unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD;
+       unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
+       unsigned int tx_flags = 0;
+       unsigned int len = skb_headlen(skb);
+       unsigned int nr_frags;
+       unsigned int mss;
+       int count = 0;
+       int tso;
+       unsigned int f;
+
+       /* This goes back to the question of how to logically map a tx queue
+        * to a flow.  Right now, performance is impacted slightly negatively
+        * if using multiple tx queues.  If the stack breaks away from a
+        * single qdisc implementation, we can look at this again. */
+       tx_ring = adapter->tx_ring;
+
+       if (unlikely(skb->len <= 0)) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       mss = skb_shinfo(skb)->gso_size;
+       /* The controller does a simple calculation to
+        * make sure there is enough room in the FIFO before
+        * initiating the DMA for each buffer.  The calc is:
+        * 4 = ceil(buffer len/mss).  To make sure we don't
+        * overrun the FIFO, adjust the max buffer len if mss
+        * drops. */
+       if (mss) {
+               u8 hdr_len;
+               max_per_txd = min(mss << 2, max_per_txd);
+               max_txd_pwr = fls(max_per_txd) - 1;
+
+               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+               if (skb->data_len && hdr_len == len) {
+                       switch (hw->mac_type) {
+                               unsigned int pull_size;
+                       case e1000_82544:
+                               /* Make sure we have room to chop off 4 bytes,
+                                * and that the end alignment will work out to
+                                * this hardware's requirements
+                                * NOTE: this is a TSO only workaround
+                                * if end byte alignment not correct move us
+                                * into the next dword */
+                               if ((unsigned long)(skb_tail_pointer(skb) - 1) & 4)
+                                       break;
+                               /* fall through */
+                               pull_size = min((unsigned int)4, skb->data_len);
+                               if (!__pskb_pull_tail(skb, pull_size)) {
+                                       e_err(drv, "__pskb_pull_tail "
+                                             "failed.\n");
+                                       dev_kfree_skb_any(skb);
+                                       return NETDEV_TX_OK;
+                               }
+                               len = skb_headlen(skb);
+                               break;
+                       default:
+                               /* do nothing */
+                               break;
+                       }
+               }
+       }
+
+       /* reserve a descriptor for the offload context */
+       if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
+               count++;
+       count++;
+
+       /* Controller Erratum workaround */
+       if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
+               count++;
+
+       count += TXD_USE_COUNT(len, max_txd_pwr);
+
+       if (adapter->pcix_82544)
+               count++;
+
+       /* work-around for errata 10 and it applies to all controllers
+        * in PCI-X mode, so add one more descriptor to the count
+        */
+       if (unlikely((hw->bus_type == e1000_bus_type_pcix) &&
+                       (len > 2015)))
+               count++;
+
+       nr_frags = skb_shinfo(skb)->nr_frags;
+       for (f = 0; f < nr_frags; f++)
+               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
+                                      max_txd_pwr);
+       if (adapter->pcix_82544)
+               count += nr_frags;
+
+       /* need: count + 2 desc gap to keep tail from touching
+        * head, otherwise try next time */
+       if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2)))
+               return NETDEV_TX_BUSY;
+
+       if (unlikely(hw->mac_type == e1000_82547)) {
+               if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) {
+                       netif_stop_queue(netdev);
+                       if (!test_bit(__E1000_DOWN, &adapter->flags))
+                               mod_timer(&adapter->tx_fifo_stall_timer,
+                                         jiffies + 1);
+                       return NETDEV_TX_BUSY;
+               }
+       }
+
+       if (vlan_tx_tag_present(skb)) {
+               tx_flags |= E1000_TX_FLAGS_VLAN;
+               tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
+       }
+
+       first = tx_ring->next_to_use;
+
+       tso = e1000_tso(adapter, tx_ring, skb);
+       if (tso < 0) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (likely(tso)) {
+               if (likely(hw->mac_type != e1000_82544))
+                       tx_ring->last_tx_tso = 1;
+               tx_flags |= E1000_TX_FLAGS_TSO;
+       } else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))
+               tx_flags |= E1000_TX_FLAGS_CSUM;
+
+       if (likely(skb->protocol == htons(ETH_P_IP)))
+               tx_flags |= E1000_TX_FLAGS_IPV4;
+
+       count = e1000_tx_map(adapter, tx_ring, skb, first, max_per_txd,
+                            nr_frags, mss);
+
+       if (count) {
+               e1000_tx_queue(adapter, tx_ring, tx_flags, count);
+               /* Make sure there is space in the ring for the next send. */
+               e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
+
+       } else {
+               dev_kfree_skb_any(skb);
+               tx_ring->buffer_info[first].time_stamp = 0;
+               tx_ring->next_to_use = first;
+       }
+
+       return NETDEV_TX_OK;
+}
+
+/**
+ * e1000_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+
+static void e1000_tx_timeout(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       /* Do the reset outside of interrupt context */
+       adapter->tx_timeout_count++;
+       schedule_work(&adapter->reset_task);
+}
+
+static void e1000_reset_task(struct work_struct *work)
+{
+       struct e1000_adapter *adapter =
+               container_of(work, struct e1000_adapter, reset_task);
+
+       e1000_reinit_safe(adapter);
+}
+
+/**
+ * e1000_get_stats - Get System Network Statistics
+ * @netdev: network interface device structure
+ *
+ * Returns the address of the device statistics structure.
+ * The statistics are actually updated from the timer callback.
+ **/
+
+static struct net_device_stats *e1000_get_stats(struct net_device *netdev)
+{
+       /* only return the current stats */
+       return &netdev->stats;
+}
+
+/**
+ * e1000_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
+
+       if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
+           (max_frame > MAX_JUMBO_FRAME_SIZE)) {
+               e_err(probe, "Invalid MTU setting\n");
+               return -EINVAL;
+       }
+
+       /* Adapter-specific max frame size limits. */
+       switch (hw->mac_type) {
+       case e1000_undefined ... e1000_82542_rev2_1:
+               if (max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN)) {
+                       e_err(probe, "Jumbo Frames not supported.\n");
+                       return -EINVAL;
+               }
+               break;
+       default:
+               /* Capable of supporting up to MAX_JUMBO_FRAME_SIZE limit. */
+               break;
+       }
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+               msleep(1);
+       /* e1000_down has a dependency on max_frame_size */
+       hw->max_frame_size = max_frame;
+       if (netif_running(netdev))
+               e1000_down(adapter);
+
+       /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
+        * means we reserve 2 more, this pushes us to allocate from the next
+        * larger slab size.
+        * i.e. RXBUFFER_2048 --> size-4096 slab
+        *  however with the new *_jumbo_rx* routines, jumbo receives will use
+        *  fragmented skbs */
+
+       if (max_frame <= E1000_RXBUFFER_2048)
+               adapter->rx_buffer_len = E1000_RXBUFFER_2048;
+       else
+#if (PAGE_SIZE >= E1000_RXBUFFER_16384)
+               adapter->rx_buffer_len = E1000_RXBUFFER_16384;
+#elif (PAGE_SIZE >= E1000_RXBUFFER_4096)
+               adapter->rx_buffer_len = PAGE_SIZE;
+#endif
+
+       /* adjust allocation if LPE protects us, and we aren't using SBP */
+       if (!hw->tbi_compatibility_on &&
+           ((max_frame == (ETH_FRAME_LEN + ETH_FCS_LEN)) ||
+            (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE)))
+               adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+
+       pr_info("%s changing MTU from %d to %d\n",
+               netdev->name, netdev->mtu, new_mtu);
+       netdev->mtu = new_mtu;
+
+       if (netif_running(netdev))
+               e1000_up(adapter);
+       else
+               e1000_reset(adapter);
+
+       clear_bit(__E1000_RESETTING, &adapter->flags);
+
+       return 0;
+}
+
+/**
+ * e1000_update_stats - Update the board statistics counters
+ * @adapter: board private structure
+ **/
+
+void e1000_update_stats(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+       unsigned long flags;
+       u16 phy_tmp;
+
+#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
+
+       /*
+        * Prevent stats update while adapter is being reset, or if the pci
+        * connection is down.
+        */
+       if (adapter->link_speed == 0)
+               return;
+       if (pci_channel_offline(pdev))
+               return;
+
+       spin_lock_irqsave(&adapter->stats_lock, flags);
+
+       /* these counters are modified from e1000_tbi_adjust_stats,
+        * called from the interrupt context, so they must only
+        * be written while holding adapter->stats_lock
+        */
+
+       adapter->stats.crcerrs += er32(CRCERRS);
+       adapter->stats.gprc += er32(GPRC);
+       adapter->stats.gorcl += er32(GORCL);
+       adapter->stats.gorch += er32(GORCH);
+       adapter->stats.bprc += er32(BPRC);
+       adapter->stats.mprc += er32(MPRC);
+       adapter->stats.roc += er32(ROC);
+
+       adapter->stats.prc64 += er32(PRC64);
+       adapter->stats.prc127 += er32(PRC127);
+       adapter->stats.prc255 += er32(PRC255);
+       adapter->stats.prc511 += er32(PRC511);
+       adapter->stats.prc1023 += er32(PRC1023);
+       adapter->stats.prc1522 += er32(PRC1522);
+
+       adapter->stats.symerrs += er32(SYMERRS);
+       adapter->stats.mpc += er32(MPC);
+       adapter->stats.scc += er32(SCC);
+       adapter->stats.ecol += er32(ECOL);
+       adapter->stats.mcc += er32(MCC);
+       adapter->stats.latecol += er32(LATECOL);
+       adapter->stats.dc += er32(DC);
+       adapter->stats.sec += er32(SEC);
+       adapter->stats.rlec += er32(RLEC);
+       adapter->stats.xonrxc += er32(XONRXC);
+       adapter->stats.xontxc += er32(XONTXC);
+       adapter->stats.xoffrxc += er32(XOFFRXC);
+       adapter->stats.xofftxc += er32(XOFFTXC);
+       adapter->stats.fcruc += er32(FCRUC);
+       adapter->stats.gptc += er32(GPTC);
+       adapter->stats.gotcl += er32(GOTCL);
+       adapter->stats.gotch += er32(GOTCH);
+       adapter->stats.rnbc += er32(RNBC);
+       adapter->stats.ruc += er32(RUC);
+       adapter->stats.rfc += er32(RFC);
+       adapter->stats.rjc += er32(RJC);
+       adapter->stats.torl += er32(TORL);
+       adapter->stats.torh += er32(TORH);
+       adapter->stats.totl += er32(TOTL);
+       adapter->stats.toth += er32(TOTH);
+       adapter->stats.tpr += er32(TPR);
+
+       adapter->stats.ptc64 += er32(PTC64);
+       adapter->stats.ptc127 += er32(PTC127);
+       adapter->stats.ptc255 += er32(PTC255);
+       adapter->stats.ptc511 += er32(PTC511);
+       adapter->stats.ptc1023 += er32(PTC1023);
+       adapter->stats.ptc1522 += er32(PTC1522);
+
+       adapter->stats.mptc += er32(MPTC);
+       adapter->stats.bptc += er32(BPTC);
+
+       /* used for adaptive IFS */
+
+       hw->tx_packet_delta = er32(TPT);
+       adapter->stats.tpt += hw->tx_packet_delta;
+       hw->collision_delta = er32(COLC);
+       adapter->stats.colc += hw->collision_delta;
+
+       if (hw->mac_type >= e1000_82543) {
+               adapter->stats.algnerrc += er32(ALGNERRC);
+               adapter->stats.rxerrc += er32(RXERRC);
+               adapter->stats.tncrs += er32(TNCRS);
+               adapter->stats.cexterr += er32(CEXTERR);
+               adapter->stats.tsctc += er32(TSCTC);
+               adapter->stats.tsctfc += er32(TSCTFC);
+       }
+
+       /* Fill out the OS statistics structure */
+       netdev->stats.multicast = adapter->stats.mprc;
+       netdev->stats.collisions = adapter->stats.colc;
+
+       /* Rx Errors */
+
+       /* RLEC on some newer hardware can be incorrect so build
+       * our own version based on RUC and ROC */
+       netdev->stats.rx_errors = adapter->stats.rxerrc +
+               adapter->stats.crcerrs + adapter->stats.algnerrc +
+               adapter->stats.ruc + adapter->stats.roc +
+               adapter->stats.cexterr;
+       adapter->stats.rlerrc = adapter->stats.ruc + adapter->stats.roc;
+       netdev->stats.rx_length_errors = adapter->stats.rlerrc;
+       netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
+       netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
+       netdev->stats.rx_missed_errors = adapter->stats.mpc;
+
+       /* Tx Errors */
+       adapter->stats.txerrc = adapter->stats.ecol + adapter->stats.latecol;
+       netdev->stats.tx_errors = adapter->stats.txerrc;
+       netdev->stats.tx_aborted_errors = adapter->stats.ecol;
+       netdev->stats.tx_window_errors = adapter->stats.latecol;
+       netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
+       if (hw->bad_tx_carr_stats_fd &&
+           adapter->link_duplex == FULL_DUPLEX) {
+               netdev->stats.tx_carrier_errors = 0;
+               adapter->stats.tncrs = 0;
+       }
+
+       /* Tx Dropped needs to be maintained elsewhere */
+
+       /* Phy Stats */
+       if (hw->media_type == e1000_media_type_copper) {
+               if ((adapter->link_speed == SPEED_1000) &&
+                  (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
+                       phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
+                       adapter->phy_stats.idle_errors += phy_tmp;
+               }
+
+               if ((hw->mac_type <= e1000_82546) &&
+                  (hw->phy_type == e1000_phy_m88) &&
+                  !e1000_read_phy_reg(hw, M88E1000_RX_ERR_CNTR, &phy_tmp))
+                       adapter->phy_stats.receive_errors += phy_tmp;
+       }
+
+       /* Management Stats */
+       if (hw->has_smbus) {
+               adapter->stats.mgptc += er32(MGTPTC);
+               adapter->stats.mgprc += er32(MGTPRC);
+               adapter->stats.mgpdc += er32(MGTPDC);
+       }
+
+       spin_unlock_irqrestore(&adapter->stats_lock, flags);
+}
+
+/**
+ * e1000_intr - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+
+static irqreturn_t e1000_intr(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 icr = er32(ICR);
+
+       if (unlikely((!icr)))
+               return IRQ_NONE;  /* Not our interrupt */
+
+       /*
+        * we might have caused the interrupt, but the above
+        * read cleared it, and just in case the driver is
+        * down there is nothing to do so return handled
+        */
+       if (unlikely(test_bit(__E1000_DOWN, &adapter->flags)))
+               return IRQ_HANDLED;
+
+       if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
+               hw->get_link_status = 1;
+               /* guard against interrupt when we're going down */
+               if (!test_bit(__E1000_DOWN, &adapter->flags))
+                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+       }
+
+       /* disable interrupts, without the synchronize_irq bit */
+       ew32(IMC, ~0);
+       E1000_WRITE_FLUSH();
+
+       if (likely(napi_schedule_prep(&adapter->napi))) {
+               adapter->total_tx_bytes = 0;
+               adapter->total_tx_packets = 0;
+               adapter->total_rx_bytes = 0;
+               adapter->total_rx_packets = 0;
+               __napi_schedule(&adapter->napi);
+       } else {
+               /* this really should not happen! if it does it is basically a
+                * bug, but not a hard error, so enable ints and continue */
+               if (!test_bit(__E1000_DOWN, &adapter->flags))
+                       e1000_irq_enable(adapter);
+       }
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * e1000_clean - NAPI Rx polling callback
+ * @adapter: board private structure
+ **/
+static int e1000_clean(struct napi_struct *napi, int budget)
+{
+       struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
+       int tx_clean_complete = 0, work_done = 0;
+
+       tx_clean_complete = e1000_clean_tx_irq(adapter, &adapter->tx_ring[0]);
+
+       adapter->clean_rx(adapter, &adapter->rx_ring[0], &work_done, budget);
+
+       if (!tx_clean_complete)
+               work_done = budget;
+
+       /* If budget not fully consumed, exit the polling mode */
+       if (work_done < budget) {
+               if (likely(adapter->itr_setting & 3))
+                       e1000_set_itr(adapter);
+               napi_complete(napi);
+               if (!test_bit(__E1000_DOWN, &adapter->flags))
+                       e1000_irq_enable(adapter);
+       }
+
+       return work_done;
+}
+
+/**
+ * e1000_clean_tx_irq - Reclaim resources after transmit completes
+ * @adapter: board private structure
+ **/
+static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
+                              struct e1000_tx_ring *tx_ring)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_tx_desc *tx_desc, *eop_desc;
+       struct e1000_buffer *buffer_info;
+       unsigned int i, eop;
+       unsigned int count = 0;
+       unsigned int total_tx_bytes=0, total_tx_packets=0;
+
+       i = tx_ring->next_to_clean;
+       eop = tx_ring->buffer_info[i].next_to_watch;
+       eop_desc = E1000_TX_DESC(*tx_ring, eop);
+
+       while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) &&
+              (count < tx_ring->count)) {
+               bool cleaned = false;
+               rmb();  /* read buffer_info after eop_desc */
+               for ( ; !cleaned; count++) {
+                       tx_desc = E1000_TX_DESC(*tx_ring, i);
+                       buffer_info = &tx_ring->buffer_info[i];
+                       cleaned = (i == eop);
+
+                       if (cleaned) {
+                               struct sk_buff *skb = buffer_info->skb;
+                               unsigned int segs, bytecount;
+                               segs = skb_shinfo(skb)->gso_segs ?: 1;
+                               /* multiply data chunks by size of headers */
+                               bytecount = ((segs - 1) * skb_headlen(skb)) +
+                                           skb->len;
+                               total_tx_packets += segs;
+                               total_tx_bytes += bytecount;
+                       }
+                       e1000_unmap_and_free_tx_resource(adapter, buffer_info);
+                       tx_desc->upper.data = 0;
+
+                       if (unlikely(++i == tx_ring->count)) i = 0;
+               }
+
+               eop = tx_ring->buffer_info[i].next_to_watch;
+               eop_desc = E1000_TX_DESC(*tx_ring, eop);
+       }
+
+       tx_ring->next_to_clean = i;
+
+#define TX_WAKE_THRESHOLD 32
+       if (unlikely(count && netif_carrier_ok(netdev) &&
+                    E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) {
+               /* Make sure that anybody stopping the queue after this
+                * sees the new next_to_clean.
+                */
+               smp_mb();
+
+               if (netif_queue_stopped(netdev) &&
+                   !(test_bit(__E1000_DOWN, &adapter->flags))) {
+                       netif_wake_queue(netdev);
+                       ++adapter->restart_queue;
+               }
+       }
+
+       if (adapter->detect_tx_hung) {
+               /* Detect a transmit hang in hardware, this serializes the
+                * check with the clearing of time_stamp and movement of i */
+               adapter->detect_tx_hung = false;
+               if (tx_ring->buffer_info[eop].time_stamp &&
+                   time_after(jiffies, tx_ring->buffer_info[eop].time_stamp +
+                              (adapter->tx_timeout_factor * HZ)) &&
+                   !(er32(STATUS) & E1000_STATUS_TXOFF)) {
+
+                       /* detected Tx unit hang */
+                       e_err(drv, "Detected Tx Unit Hang\n"
+                             "  Tx Queue             <%lu>\n"
+                             "  TDH                  <%x>\n"
+                             "  TDT                  <%x>\n"
+                             "  next_to_use          <%x>\n"
+                             "  next_to_clean        <%x>\n"
+                             "buffer_info[next_to_clean]\n"
+                             "  time_stamp           <%lx>\n"
+                             "  next_to_watch        <%x>\n"
+                             "  jiffies              <%lx>\n"
+                             "  next_to_watch.status <%x>\n",
+                               (unsigned long)((tx_ring - adapter->tx_ring) /
+                                       sizeof(struct e1000_tx_ring)),
+                               readl(hw->hw_addr + tx_ring->tdh),
+                               readl(hw->hw_addr + tx_ring->tdt),
+                               tx_ring->next_to_use,
+                               tx_ring->next_to_clean,
+                               tx_ring->buffer_info[eop].time_stamp,
+                               eop,
+                               jiffies,
+                               eop_desc->upper.fields.status);
+                       netif_stop_queue(netdev);
+               }
+       }
+       adapter->total_tx_bytes += total_tx_bytes;
+       adapter->total_tx_packets += total_tx_packets;
+       netdev->stats.tx_bytes += total_tx_bytes;
+       netdev->stats.tx_packets += total_tx_packets;
+       return count < tx_ring->count;
+}
+
+/**
+ * e1000_rx_checksum - Receive Checksum Offload for 82543
+ * @adapter:     board private structure
+ * @status_err:  receive descriptor status and error fields
+ * @csum:        receive descriptor csum field
+ * @sk_buff:     socket buffer with received data
+ **/
+
+static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
+                             u32 csum, struct sk_buff *skb)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 status = (u16)status_err;
+       u8 errors = (u8)(status_err >> 24);
+
+       skb_checksum_none_assert(skb);
+
+       /* 82543 or newer only */
+       if (unlikely(hw->mac_type < e1000_82543)) return;
+       /* Ignore Checksum bit is set */
+       if (unlikely(status & E1000_RXD_STAT_IXSM)) return;
+       /* TCP/UDP checksum error bit is set */
+       if (unlikely(errors & E1000_RXD_ERR_TCPE)) {
+               /* let the stack verify checksum errors */
+               adapter->hw_csum_err++;
+               return;
+       }
+       /* TCP/UDP Checksum has not been calculated */
+       if (!(status & E1000_RXD_STAT_TCPCS))
+               return;
+
+       /* It must be a TCP or UDP packet with a valid checksum */
+       if (likely(status & E1000_RXD_STAT_TCPCS)) {
+               /* TCP checksum is good */
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+       }
+       adapter->hw_csum_good++;
+}
+
+/**
+ * e1000_consume_page - helper function
+ **/
+static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb,
+                               u16 length)
+{
+       bi->page = NULL;
+       skb->len += length;
+       skb->data_len += length;
+       skb->truesize += length;
+}
+
+/**
+ * e1000_receive_skb - helper function to handle rx indications
+ * @adapter: board private structure
+ * @status: descriptor status field as written by hardware
+ * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
+ * @skb: pointer to sk_buff to be indicated to stack
+ */
+static void e1000_receive_skb(struct e1000_adapter *adapter, u8 status,
+                             __le16 vlan, struct sk_buff *skb)
+{
+       skb->protocol = eth_type_trans(skb, adapter->netdev);
+
+       if (status & E1000_RXD_STAT_VP) {
+               u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
+
+               __vlan_hwaccel_put_tag(skb, vid);
+       }
+       napi_gro_receive(&adapter->napi, skb);
+}
+
+/**
+ * e1000_clean_jumbo_rx_irq - Send received data up the network stack; legacy
+ * @adapter: board private structure
+ * @rx_ring: ring to clean
+ * @work_done: amount of napi work completed this call
+ * @work_to_do: max amount of work allowed for this call to do
+ *
+ * the return value indicates whether actual cleaning was done, there
+ * is no guarantee that everything was cleaned
+ */
+static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
+                                    struct e1000_rx_ring *rx_ring,
+                                    int *work_done, int work_to_do)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_rx_desc *rx_desc, *next_rxd;
+       struct e1000_buffer *buffer_info, *next_buffer;
+       unsigned long irq_flags;
+       u32 length;
+       unsigned int i;
+       int cleaned_count = 0;
+       bool cleaned = false;
+       unsigned int total_rx_bytes=0, total_rx_packets=0;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = E1000_RX_DESC(*rx_ring, i);
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (rx_desc->status & E1000_RXD_STAT_DD) {
+               struct sk_buff *skb;
+               u8 status;
+
+               if (*work_done >= work_to_do)
+                       break;
+               (*work_done)++;
+               rmb(); /* read descriptor and rx_buffer_info after status DD */
+
+               status = rx_desc->status;
+               skb = buffer_info->skb;
+               buffer_info->skb = NULL;
+
+               if (++i == rx_ring->count) i = 0;
+               next_rxd = E1000_RX_DESC(*rx_ring, i);
+               prefetch(next_rxd);
+
+               next_buffer = &rx_ring->buffer_info[i];
+
+               cleaned = true;
+               cleaned_count++;
+               dma_unmap_page(&pdev->dev, buffer_info->dma,
+                              buffer_info->length, DMA_FROM_DEVICE);
+               buffer_info->dma = 0;
+
+               length = le16_to_cpu(rx_desc->length);
+
+               /* errors is only valid for DD + EOP descriptors */
+               if (unlikely((status & E1000_RXD_STAT_EOP) &&
+                   (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK))) {
+                       u8 last_byte = *(skb->data + length - 1);
+                       if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
+                                      last_byte)) {
+                               spin_lock_irqsave(&adapter->stats_lock,
+                                                 irq_flags);
+                               e1000_tbi_adjust_stats(hw, &adapter->stats,
+                                                      length, skb->data);
+                               spin_unlock_irqrestore(&adapter->stats_lock,
+                                                      irq_flags);
+                               length--;
+                       } else {
+                               /* recycle both page and skb */
+                               buffer_info->skb = skb;
+                               /* an error means any chain goes out the window
+                                * too */
+                               if (rx_ring->rx_skb_top)
+                                       dev_kfree_skb(rx_ring->rx_skb_top);
+                               rx_ring->rx_skb_top = NULL;
+                               goto next_desc;
+                       }
+               }
+
+#define rxtop rx_ring->rx_skb_top
+               if (!(status & E1000_RXD_STAT_EOP)) {
+                       /* this descriptor is only the beginning (or middle) */
+                       if (!rxtop) {
+                               /* this is the beginning of a chain */
+                               rxtop = skb;
+                               skb_fill_page_desc(rxtop, 0, buffer_info->page,
+                                                  0, length);
+                       } else {
+                               /* this is the middle of a chain */
+                               skb_fill_page_desc(rxtop,
+                                   skb_shinfo(rxtop)->nr_frags,
+                                   buffer_info->page, 0, length);
+                               /* re-use the skb, only consumed the page */
+                               buffer_info->skb = skb;
+                       }
+                       e1000_consume_page(buffer_info, rxtop, length);
+                       goto next_desc;
+               } else {
+                       if (rxtop) {
+                               /* end of the chain */
+                               skb_fill_page_desc(rxtop,
+                                   skb_shinfo(rxtop)->nr_frags,
+                                   buffer_info->page, 0, length);
+                               /* re-use the current skb, we only consumed the
+                                * page */
+                               buffer_info->skb = skb;
+                               skb = rxtop;
+                               rxtop = NULL;
+                               e1000_consume_page(buffer_info, skb, length);
+                       } else {
+                               /* no chain, got EOP, this buf is the packet
+                                * copybreak to save the put_page/alloc_page */
+                               if (length <= copybreak &&
+                                   skb_tailroom(skb) >= length) {
+                                       u8 *vaddr;
+                                       vaddr = kmap_atomic(buffer_info->page,
+                                                           KM_SKB_DATA_SOFTIRQ);
+                                       memcpy(skb_tail_pointer(skb), vaddr, length);
+                                       kunmap_atomic(vaddr,
+                                                     KM_SKB_DATA_SOFTIRQ);
+                                       /* re-use the page, so don't erase
+                                        * buffer_info->page */
+                                       skb_put(skb, length);
+                               } else {
+                                       skb_fill_page_desc(skb, 0,
+                                                          buffer_info->page, 0,
+                                                          length);
+                                       e1000_consume_page(buffer_info, skb,
+                                                          length);
+                               }
+                       }
+               }
+
+               /* Receive Checksum Offload XXX recompute due to CRC strip? */
+               e1000_rx_checksum(adapter,
+                                 (u32)(status) |
+                                 ((u32)(rx_desc->errors) << 24),
+                                 le16_to_cpu(rx_desc->csum), skb);
+
+               pskb_trim(skb, skb->len - 4);
+
+               /* probably a little skewed due to removing CRC */
+               total_rx_bytes += skb->len;
+               total_rx_packets++;
+
+               /* eth type trans needs skb->data to point to something */
+               if (!pskb_may_pull(skb, ETH_HLEN)) {
+                       e_err(drv, "pskb_may_pull failed.\n");
+                       dev_kfree_skb(skb);
+                       goto next_desc;
+               }
+
+               e1000_receive_skb(adapter, status, rx_desc->special, skb);
+
+next_desc:
+               rx_desc->status = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
+                       adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+       }
+       rx_ring->next_to_clean = i;
+
+       cleaned_count = E1000_DESC_UNUSED(rx_ring);
+       if (cleaned_count)
+               adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
+
+       adapter->total_rx_packets += total_rx_packets;
+       adapter->total_rx_bytes += total_rx_bytes;
+       netdev->stats.rx_bytes += total_rx_bytes;
+       netdev->stats.rx_packets += total_rx_packets;
+       return cleaned;
+}
+
+/*
+ * this should improve performance for small packets with large amounts
+ * of reassembly being done in the stack
+ */
+static void e1000_check_copybreak(struct net_device *netdev,
+                                struct e1000_buffer *buffer_info,
+                                u32 length, struct sk_buff **skb)
+{
+       struct sk_buff *new_skb;
+
+       if (length > copybreak)
+               return;
+
+       new_skb = netdev_alloc_skb_ip_align(netdev, length);
+       if (!new_skb)
+               return;
+
+       skb_copy_to_linear_data_offset(new_skb, -NET_IP_ALIGN,
+                                      (*skb)->data - NET_IP_ALIGN,
+                                      length + NET_IP_ALIGN);
+       /* save the skb in buffer_info as good */
+       buffer_info->skb = *skb;
+       *skb = new_skb;
+}
+
+/**
+ * e1000_clean_rx_irq - Send received data up the network stack; legacy
+ * @adapter: board private structure
+ * @rx_ring: ring to clean
+ * @work_done: amount of napi work completed this call
+ * @work_to_do: max amount of work allowed for this call to do
+ */
+static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                              struct e1000_rx_ring *rx_ring,
+                              int *work_done, int work_to_do)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_rx_desc *rx_desc, *next_rxd;
+       struct e1000_buffer *buffer_info, *next_buffer;
+       unsigned long flags;
+       u32 length;
+       unsigned int i;
+       int cleaned_count = 0;
+       bool cleaned = false;
+       unsigned int total_rx_bytes=0, total_rx_packets=0;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = E1000_RX_DESC(*rx_ring, i);
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (rx_desc->status & E1000_RXD_STAT_DD) {
+               struct sk_buff *skb;
+               u8 status;
+
+               if (*work_done >= work_to_do)
+                       break;
+               (*work_done)++;
+               rmb(); /* read descriptor and rx_buffer_info after status DD */
+
+               status = rx_desc->status;
+               skb = buffer_info->skb;
+               buffer_info->skb = NULL;
+
+               prefetch(skb->data - NET_IP_ALIGN);
+
+               if (++i == rx_ring->count) i = 0;
+               next_rxd = E1000_RX_DESC(*rx_ring, i);
+               prefetch(next_rxd);
+
+               next_buffer = &rx_ring->buffer_info[i];
+
+               cleaned = true;
+               cleaned_count++;
+               dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                buffer_info->length, DMA_FROM_DEVICE);
+               buffer_info->dma = 0;
+
+               length = le16_to_cpu(rx_desc->length);
+               /* !EOP means multiple descriptors were used to store a single
+                * packet, if thats the case we need to toss it.  In fact, we
+                * to toss every packet with the EOP bit clear and the next
+                * frame that _does_ have the EOP bit set, as it is by
+                * definition only a frame fragment
+                */
+               if (unlikely(!(status & E1000_RXD_STAT_EOP)))
+                       adapter->discarding = true;
+
+               if (adapter->discarding) {
+                       /* All receives must fit into a single buffer */
+                       e_dbg("Receive packet consumed multiple buffers\n");
+                       /* recycle */
+                       buffer_info->skb = skb;
+                       if (status & E1000_RXD_STAT_EOP)
+                               adapter->discarding = false;
+                       goto next_desc;
+               }
+
+               if (unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) {
+                       u8 last_byte = *(skb->data + length - 1);
+                       if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
+                                      last_byte)) {
+                               spin_lock_irqsave(&adapter->stats_lock, flags);
+                               e1000_tbi_adjust_stats(hw, &adapter->stats,
+                                                      length, skb->data);
+                               spin_unlock_irqrestore(&adapter->stats_lock,
+                                                      flags);
+                               length--;
+                       } else {
+                               /* recycle */
+                               buffer_info->skb = skb;
+                               goto next_desc;
+                       }
+               }
+
+               /* adjust length to remove Ethernet CRC, this must be
+                * done after the TBI_ACCEPT workaround above */
+               length -= 4;
+
+               /* probably a little skewed due to removing CRC */
+               total_rx_bytes += length;
+               total_rx_packets++;
+
+               e1000_check_copybreak(netdev, buffer_info, length, &skb);
+
+               skb_put(skb, length);
+
+               /* Receive Checksum Offload */
+               e1000_rx_checksum(adapter,
+                                 (u32)(status) |
+                                 ((u32)(rx_desc->errors) << 24),
+                                 le16_to_cpu(rx_desc->csum), skb);
+
+               e1000_receive_skb(adapter, status, rx_desc->special, skb);
+
+next_desc:
+               rx_desc->status = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
+                       adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+       }
+       rx_ring->next_to_clean = i;
+
+       cleaned_count = E1000_DESC_UNUSED(rx_ring);
+       if (cleaned_count)
+               adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
+
+       adapter->total_rx_packets += total_rx_packets;
+       adapter->total_rx_bytes += total_rx_bytes;
+       netdev->stats.rx_bytes += total_rx_bytes;
+       netdev->stats.rx_packets += total_rx_packets;
+       return cleaned;
+}
+
+/**
+ * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers
+ * @adapter: address of board private structure
+ * @rx_ring: pointer to receive ring structure
+ * @cleaned_count: number of buffers to allocate this pass
+ **/
+
+static void
+e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
+                             struct e1000_rx_ring *rx_ring, int cleaned_count)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_rx_desc *rx_desc;
+       struct e1000_buffer *buffer_info;
+       struct sk_buff *skb;
+       unsigned int i;
+       unsigned int bufsz = 256 - 16 /*for skb_reserve */ ;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (cleaned_count--) {
+               skb = buffer_info->skb;
+               if (skb) {
+                       skb_trim(skb, 0);
+                       goto check_page;
+               }
+
+               skb = netdev_alloc_skb_ip_align(netdev, bufsz);
+               if (unlikely(!skb)) {
+                       /* Better luck next round */
+                       adapter->alloc_rx_buff_failed++;
+                       break;
+               }
+
+               /* Fix for errata 23, can't cross 64kB boundary */
+               if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
+                       struct sk_buff *oldskb = skb;
+                       e_err(rx_err, "skb align check failed: %u bytes at "
+                             "%p\n", bufsz, skb->data);
+                       /* Try again, without freeing the previous */
+                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
+                       /* Failed allocation, critical failure */
+                       if (!skb) {
+                               dev_kfree_skb(oldskb);
+                               adapter->alloc_rx_buff_failed++;
+                               break;
+                       }
+
+                       if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
+                               /* give up */
+                               dev_kfree_skb(skb);
+                               dev_kfree_skb(oldskb);
+                               break; /* while (cleaned_count--) */
+                       }
+
+                       /* Use new allocation */
+                       dev_kfree_skb(oldskb);
+               }
+               buffer_info->skb = skb;
+               buffer_info->length = adapter->rx_buffer_len;
+check_page:
+               /* allocate a new page if necessary */
+               if (!buffer_info->page) {
+                       buffer_info->page = alloc_page(GFP_ATOMIC);
+                       if (unlikely(!buffer_info->page)) {
+                               adapter->alloc_rx_buff_failed++;
+                               break;
+                       }
+               }
+
+               if (!buffer_info->dma) {
+                       buffer_info->dma = dma_map_page(&pdev->dev,
+                                                       buffer_info->page, 0,
+                                                       buffer_info->length,
+                                                       DMA_FROM_DEVICE);
+                       if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
+                               put_page(buffer_info->page);
+                               dev_kfree_skb(skb);
+                               buffer_info->page = NULL;
+                               buffer_info->skb = NULL;
+                               buffer_info->dma = 0;
+                               adapter->alloc_rx_buff_failed++;
+                               break; /* while !buffer_info->skb */
+                       }
+               }
+
+               rx_desc = E1000_RX_DESC(*rx_ring, i);
+               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
+
+               if (unlikely(++i == rx_ring->count))
+                       i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+       if (likely(rx_ring->next_to_use != i)) {
+               rx_ring->next_to_use = i;
+               if (unlikely(i-- == 0))
+                       i = (rx_ring->count - 1);
+
+               /* Force memory writes to complete before letting h/w
+                * know there are new descriptors to fetch.  (Only
+                * applicable for weak-ordered memory model archs,
+                * such as IA-64). */
+               wmb();
+               writel(i, adapter->hw.hw_addr + rx_ring->rdt);
+       }
+}
+
+/**
+ * e1000_alloc_rx_buffers - Replace used receive buffers; legacy & extended
+ * @adapter: address of board private structure
+ **/
+
+static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
+                                  struct e1000_rx_ring *rx_ring,
+                                  int cleaned_count)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_rx_desc *rx_desc;
+       struct e1000_buffer *buffer_info;
+       struct sk_buff *skb;
+       unsigned int i;
+       unsigned int bufsz = adapter->rx_buffer_len;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (cleaned_count--) {
+               skb = buffer_info->skb;
+               if (skb) {
+                       skb_trim(skb, 0);
+                       goto map_skb;
+               }
+
+               skb = netdev_alloc_skb_ip_align(netdev, bufsz);
+               if (unlikely(!skb)) {
+                       /* Better luck next round */
+                       adapter->alloc_rx_buff_failed++;
+                       break;
+               }
+
+               /* Fix for errata 23, can't cross 64kB boundary */
+               if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
+                       struct sk_buff *oldskb = skb;
+                       e_err(rx_err, "skb align check failed: %u bytes at "
+                             "%p\n", bufsz, skb->data);
+                       /* Try again, without freeing the previous */
+                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
+                       /* Failed allocation, critical failure */
+                       if (!skb) {
+                               dev_kfree_skb(oldskb);
+                               adapter->alloc_rx_buff_failed++;
+                               break;
+                       }
+
+                       if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
+                               /* give up */
+                               dev_kfree_skb(skb);
+                               dev_kfree_skb(oldskb);
+                               adapter->alloc_rx_buff_failed++;
+                               break; /* while !buffer_info->skb */
+                       }
+
+                       /* Use new allocation */
+                       dev_kfree_skb(oldskb);
+               }
+               buffer_info->skb = skb;
+               buffer_info->length = adapter->rx_buffer_len;
+map_skb:
+               buffer_info->dma = dma_map_single(&pdev->dev,
+                                                 skb->data,
+                                                 buffer_info->length,
+                                                 DMA_FROM_DEVICE);
+               if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
+                       dev_kfree_skb(skb);
+                       buffer_info->skb = NULL;
+                       buffer_info->dma = 0;
+                       adapter->alloc_rx_buff_failed++;
+                       break; /* while !buffer_info->skb */
+               }
+
+               /*
+                * XXX if it was allocated cleanly it will never map to a
+                * boundary crossing
+                */
+
+               /* Fix for errata 23, can't cross 64kB boundary */
+               if (!e1000_check_64k_bound(adapter,
+                                       (void *)(unsigned long)buffer_info->dma,
+                                       adapter->rx_buffer_len)) {
+                       e_err(rx_err, "dma align check failed: %u bytes at "
+                             "%p\n", adapter->rx_buffer_len,
+                             (void *)(unsigned long)buffer_info->dma);
+                       dev_kfree_skb(skb);
+                       buffer_info->skb = NULL;
+
+                       dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                        adapter->rx_buffer_len,
+                                        DMA_FROM_DEVICE);
+                       buffer_info->dma = 0;
+
+                       adapter->alloc_rx_buff_failed++;
+                       break; /* while !buffer_info->skb */
+               }
+               rx_desc = E1000_RX_DESC(*rx_ring, i);
+               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
+
+               if (unlikely(++i == rx_ring->count))
+                       i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+       if (likely(rx_ring->next_to_use != i)) {
+               rx_ring->next_to_use = i;
+               if (unlikely(i-- == 0))
+                       i = (rx_ring->count - 1);
+
+               /* Force memory writes to complete before letting h/w
+                * know there are new descriptors to fetch.  (Only
+                * applicable for weak-ordered memory model archs,
+                * such as IA-64). */
+               wmb();
+               writel(i, hw->hw_addr + rx_ring->rdt);
+       }
+}
+
+/**
+ * e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers.
+ * @adapter:
+ **/
+
+static void e1000_smartspeed(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 phy_status;
+       u16 phy_ctrl;
+
+       if ((hw->phy_type != e1000_phy_igp) || !hw->autoneg ||
+          !(hw->autoneg_advertised & ADVERTISE_1000_FULL))
+               return;
+
+       if (adapter->smartspeed == 0) {
+               /* If Master/Slave config fault is asserted twice,
+                * we assume back-to-back */
+               e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);
+               if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
+               e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);
+               if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
+               e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);
+               if (phy_ctrl & CR_1000T_MS_ENABLE) {
+                       phy_ctrl &= ~CR_1000T_MS_ENABLE;
+                       e1000_write_phy_reg(hw, PHY_1000T_CTRL,
+                                           phy_ctrl);
+                       adapter->smartspeed++;
+                       if (!e1000_phy_setup_autoneg(hw) &&
+                          !e1000_read_phy_reg(hw, PHY_CTRL,
+                                              &phy_ctrl)) {
+                               phy_ctrl |= (MII_CR_AUTO_NEG_EN |
+                                            MII_CR_RESTART_AUTO_NEG);
+                               e1000_write_phy_reg(hw, PHY_CTRL,
+                                                   phy_ctrl);
+                       }
+               }
+               return;
+       } else if (adapter->smartspeed == E1000_SMARTSPEED_DOWNSHIFT) {
+               /* If still no link, perhaps using 2/3 pair cable */
+               e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);
+               phy_ctrl |= CR_1000T_MS_ENABLE;
+               e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_ctrl);
+               if (!e1000_phy_setup_autoneg(hw) &&
+                  !e1000_read_phy_reg(hw, PHY_CTRL, &phy_ctrl)) {
+                       phy_ctrl |= (MII_CR_AUTO_NEG_EN |
+                                    MII_CR_RESTART_AUTO_NEG);
+                       e1000_write_phy_reg(hw, PHY_CTRL, phy_ctrl);
+               }
+       }
+       /* Restart process after E1000_SMARTSPEED_MAX iterations */
+       if (adapter->smartspeed++ == E1000_SMARTSPEED_MAX)
+               adapter->smartspeed = 0;
+}
+
+/**
+ * e1000_ioctl -
+ * @netdev:
+ * @ifreq:
+ * @cmd:
+ **/
+
+static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+       switch (cmd) {
+       case SIOCGMIIPHY:
+       case SIOCGMIIREG:
+       case SIOCSMIIREG:
+               return e1000_mii_ioctl(netdev, ifr, cmd);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+/**
+ * e1000_mii_ioctl -
+ * @netdev:
+ * @ifreq:
+ * @cmd:
+ **/
+
+static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
+                          int cmd)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct mii_ioctl_data *data = if_mii(ifr);
+       int retval;
+       u16 mii_reg;
+       unsigned long flags;
+
+       if (hw->media_type != e1000_media_type_copper)
+               return -EOPNOTSUPP;
+
+       switch (cmd) {
+       case SIOCGMIIPHY:
+               data->phy_id = hw->phy_addr;
+               break;
+       case SIOCGMIIREG:
+               spin_lock_irqsave(&adapter->stats_lock, flags);
+               if (e1000_read_phy_reg(hw, data->reg_num & 0x1F,
+                                  &data->val_out)) {
+                       spin_unlock_irqrestore(&adapter->stats_lock, flags);
+                       return -EIO;
+               }
+               spin_unlock_irqrestore(&adapter->stats_lock, flags);
+               break;
+       case SIOCSMIIREG:
+               if (data->reg_num & ~(0x1F))
+                       return -EFAULT;
+               mii_reg = data->val_in;
+               spin_lock_irqsave(&adapter->stats_lock, flags);
+               if (e1000_write_phy_reg(hw, data->reg_num,
+                                       mii_reg)) {
+                       spin_unlock_irqrestore(&adapter->stats_lock, flags);
+                       return -EIO;
+               }
+               spin_unlock_irqrestore(&adapter->stats_lock, flags);
+               if (hw->media_type == e1000_media_type_copper) {
+                       switch (data->reg_num) {
+                       case PHY_CTRL:
+                               if (mii_reg & MII_CR_POWER_DOWN)
+                                       break;
+                               if (mii_reg & MII_CR_AUTO_NEG_EN) {
+                                       hw->autoneg = 1;
+                                       hw->autoneg_advertised = 0x2F;
+                               } else {
+                                       u32 speed;
+                                       if (mii_reg & 0x40)
+                                               speed = SPEED_1000;
+                                       else if (mii_reg & 0x2000)
+                                               speed = SPEED_100;
+                                       else
+                                               speed = SPEED_10;
+                                       retval = e1000_set_spd_dplx(
+                                               adapter, speed,
+                                               ((mii_reg & 0x100)
+                                                ? DUPLEX_FULL :
+                                                DUPLEX_HALF));
+                                       if (retval)
+                                               return retval;
+                               }
+                               if (netif_running(adapter->netdev))
+                                       e1000_reinit_locked(adapter);
+                               else
+                                       e1000_reset(adapter);
+                               break;
+                       case M88E1000_PHY_SPEC_CTRL:
+                       case M88E1000_EXT_PHY_SPEC_CTRL:
+                               if (e1000_phy_reset(hw))
+                                       return -EIO;
+                               break;
+                       }
+               } else {
+                       switch (data->reg_num) {
+                       case PHY_CTRL:
+                               if (mii_reg & MII_CR_POWER_DOWN)
+                                       break;
+                               if (netif_running(adapter->netdev))
+                                       e1000_reinit_locked(adapter);
+                               else
+                                       e1000_reset(adapter);
+                               break;
+                       }
+               }
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
+       return E1000_SUCCESS;
+}
+
+void e1000_pci_set_mwi(struct e1000_hw *hw)
+{
+       struct e1000_adapter *adapter = hw->back;
+       int ret_val = pci_set_mwi(adapter->pdev);
+
+       if (ret_val)
+               e_err(probe, "Error in setting MWI\n");
+}
+
+void e1000_pci_clear_mwi(struct e1000_hw *hw)
+{
+       struct e1000_adapter *adapter = hw->back;
+
+       pci_clear_mwi(adapter->pdev);
+}
+
+int e1000_pcix_get_mmrbc(struct e1000_hw *hw)
+{
+       struct e1000_adapter *adapter = hw->back;
+       return pcix_get_mmrbc(adapter->pdev);
+}
+
+void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc)
+{
+       struct e1000_adapter *adapter = hw->back;
+       pcix_set_mmrbc(adapter->pdev, mmrbc);
+}
+
+void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value)
+{
+       outl(value, port);
+}
+
+static bool e1000_vlan_used(struct e1000_adapter *adapter)
+{
+       u16 vid;
+
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               return true;
+       return false;
+}
+
+static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
+                                    bool filter_on)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+
+       if (!test_bit(__E1000_DOWN, &adapter->flags))
+               e1000_irq_disable(adapter);
+
+       if (filter_on) {
+               /* enable VLAN receive filtering */
+               rctl = er32(RCTL);
+               rctl &= ~E1000_RCTL_CFIEN;
+               if (!(adapter->netdev->flags & IFF_PROMISC))
+                       rctl |= E1000_RCTL_VFE;
+               ew32(RCTL, rctl);
+               e1000_update_mng_vlan(adapter);
+       } else {
+               /* disable VLAN receive filtering */
+               rctl = er32(RCTL);
+               rctl &= ~E1000_RCTL_VFE;
+               ew32(RCTL, rctl);
+       }
+
+       if (!test_bit(__E1000_DOWN, &adapter->flags))
+               e1000_irq_enable(adapter);
+}
+
+static void e1000_vlan_mode(struct net_device *netdev, u32 features)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl;
+
+       if (!test_bit(__E1000_DOWN, &adapter->flags))
+               e1000_irq_disable(adapter);
+
+       ctrl = er32(CTRL);
+       if (features & NETIF_F_HW_VLAN_RX) {
+               /* enable VLAN tag insert/strip */
+               ctrl |= E1000_CTRL_VME;
+       } else {
+               /* disable VLAN tag insert/strip */
+               ctrl &= ~E1000_CTRL_VME;
+       }
+       ew32(CTRL, ctrl);
+
+       if (!test_bit(__E1000_DOWN, &adapter->flags))
+               e1000_irq_enable(adapter);
+}
+
+static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vfta, index;
+
+       if ((hw->mng_cookie.status &
+            E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
+           (vid == adapter->mng_vlan_id))
+               return;
+
+       if (!e1000_vlan_used(adapter))
+               e1000_vlan_filter_on_off(adapter, true);
+
+       /* add VID to filter table */
+       index = (vid >> 5) & 0x7F;
+       vfta = E1000_READ_REG_ARRAY(hw, VFTA, index);
+       vfta |= (1 << (vid & 0x1F));
+       e1000_write_vfta(hw, index, vfta);
+
+       set_bit(vid, adapter->active_vlans);
+}
+
+static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vfta, index;
+
+       if (!test_bit(__E1000_DOWN, &adapter->flags))
+               e1000_irq_disable(adapter);
+       if (!test_bit(__E1000_DOWN, &adapter->flags))
+               e1000_irq_enable(adapter);
+
+       /* remove VID from filter table */
+       index = (vid >> 5) & 0x7F;
+       vfta = E1000_READ_REG_ARRAY(hw, VFTA, index);
+       vfta &= ~(1 << (vid & 0x1F));
+       e1000_write_vfta(hw, index, vfta);
+
+       clear_bit(vid, adapter->active_vlans);
+
+       if (!e1000_vlan_used(adapter))
+               e1000_vlan_filter_on_off(adapter, false);
+}
+
+static void e1000_restore_vlan(struct e1000_adapter *adapter)
+{
+       u16 vid;
+
+       if (!e1000_vlan_used(adapter))
+               return;
+
+       e1000_vlan_filter_on_off(adapter, true);
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               e1000_vlan_rx_add_vid(adapter->netdev, vid);
+}
+
+int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       hw->autoneg = 0;
+
+       /* Make sure dplx is at most 1 bit and lsb of speed is not set
+        * for the switch() below to work */
+       if ((spd & 1) || (dplx & ~1))
+               goto err_inval;
+
+       /* Fiber NICs only allow 1000 gbps Full duplex */
+       if ((hw->media_type == e1000_media_type_fiber) &&
+           spd != SPEED_1000 &&
+           dplx != DUPLEX_FULL)
+               goto err_inval;
+
+       switch (spd + dplx) {
+       case SPEED_10 + DUPLEX_HALF:
+               hw->forced_speed_duplex = e1000_10_half;
+               break;
+       case SPEED_10 + DUPLEX_FULL:
+               hw->forced_speed_duplex = e1000_10_full;
+               break;
+       case SPEED_100 + DUPLEX_HALF:
+               hw->forced_speed_duplex = e1000_100_half;
+               break;
+       case SPEED_100 + DUPLEX_FULL:
+               hw->forced_speed_duplex = e1000_100_full;
+               break;
+       case SPEED_1000 + DUPLEX_FULL:
+               hw->autoneg = 1;
+               hw->autoneg_advertised = ADVERTISE_1000_FULL;
+               break;
+       case SPEED_1000 + DUPLEX_HALF: /* not supported */
+       default:
+               goto err_inval;
+       }
+       return 0;
+
+err_inval:
+       e_err(probe, "Unsupported Speed/Duplex configuration\n");
+       return -EINVAL;
+}
+
+static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl, ctrl_ext, rctl, status;
+       u32 wufc = adapter->wol;
+#ifdef CONFIG_PM
+       int retval = 0;
+#endif
+
+       netif_device_detach(netdev);
+
+       if (netif_running(netdev)) {
+               WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
+               e1000_down(adapter);
+       }
+
+#ifdef CONFIG_PM
+       retval = pci_save_state(pdev);
+       if (retval)
+               return retval;
+#endif
+
+       status = er32(STATUS);
+       if (status & E1000_STATUS_LU)
+               wufc &= ~E1000_WUFC_LNKC;
+
+       if (wufc) {
+               e1000_setup_rctl(adapter);
+               e1000_set_rx_mode(netdev);
+
+               /* turn on all-multi mode if wake on multicast is enabled */
+               if (wufc & E1000_WUFC_MC) {
+                       rctl = er32(RCTL);
+                       rctl |= E1000_RCTL_MPE;
+                       ew32(RCTL, rctl);
+               }
+
+               if (hw->mac_type >= e1000_82540) {
+                       ctrl = er32(CTRL);
+                       /* advertise wake from D3Cold */
+                       #define E1000_CTRL_ADVD3WUC 0x00100000
+                       /* phy power management enable */
+                       #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
+                       ctrl |= E1000_CTRL_ADVD3WUC |
+                               E1000_CTRL_EN_PHY_PWR_MGMT;
+                       ew32(CTRL, ctrl);
+               }
+
+               if (hw->media_type == e1000_media_type_fiber ||
+                   hw->media_type == e1000_media_type_internal_serdes) {
+                       /* keep the laser running in D3 */
+                       ctrl_ext = er32(CTRL_EXT);
+                       ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA;
+                       ew32(CTRL_EXT, ctrl_ext);
+               }
+
+               ew32(WUC, E1000_WUC_PME_EN);
+               ew32(WUFC, wufc);
+       } else {
+               ew32(WUC, 0);
+               ew32(WUFC, 0);
+       }
+
+       e1000_release_manageability(adapter);
+
+       *enable_wake = !!wufc;
+
+       /* make sure adapter isn't asleep if manageability is enabled */
+       if (adapter->en_mng_pt)
+               *enable_wake = true;
+
+       if (netif_running(netdev))
+               e1000_free_irq(adapter);
+
+       pci_disable_device(pdev);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       int retval;
+       bool wake;
+
+       retval = __e1000_shutdown(pdev, &wake);
+       if (retval)
+               return retval;
+
+       if (wake) {
+               pci_prepare_to_sleep(pdev);
+       } else {
+               pci_wake_from_d3(pdev, false);
+               pci_set_power_state(pdev, PCI_D3hot);
+       }
+
+       return 0;
+}
+
+static int e1000_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 err;
+
+       pci_set_power_state(pdev, PCI_D0);
+       pci_restore_state(pdev);
+       pci_save_state(pdev);
+
+       if (adapter->need_ioport)
+               err = pci_enable_device(pdev);
+       else
+               err = pci_enable_device_mem(pdev);
+       if (err) {
+               pr_err("Cannot enable PCI device from suspend\n");
+               return err;
+       }
+       pci_set_master(pdev);
+
+       pci_enable_wake(pdev, PCI_D3hot, 0);
+       pci_enable_wake(pdev, PCI_D3cold, 0);
+
+       if (netif_running(netdev)) {
+               err = e1000_request_irq(adapter);
+               if (err)
+                       return err;
+       }
+
+       e1000_power_up_phy(adapter);
+       e1000_reset(adapter);
+       ew32(WUS, ~0);
+
+       e1000_init_manageability(adapter);
+
+       if (netif_running(netdev))
+               e1000_up(adapter);
+
+       netif_device_attach(netdev);
+
+       return 0;
+}
+#endif
+
+static void e1000_shutdown(struct pci_dev *pdev)
+{
+       bool wake;
+
+       __e1000_shutdown(pdev, &wake);
+
+       if (system_state == SYSTEM_POWER_OFF) {
+               pci_wake_from_d3(pdev, wake);
+               pci_set_power_state(pdev, PCI_D3hot);
+       }
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void e1000_netpoll(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       disable_irq(adapter->pdev->irq);
+       e1000_intr(adapter->pdev->irq, netdev);
+       enable_irq(adapter->pdev->irq);
+}
+#endif
+
+/**
+ * e1000_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci connection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
+                                               pci_channel_state_t state)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       netif_device_detach(netdev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       if (netif_running(netdev))
+               e1000_down(adapter);
+       pci_disable_device(pdev);
+
+       /* Request a slot slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * e1000_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot. Implementation
+ * resembles the first-half of the e1000_resume routine.
+ */
+static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int err;
+
+       if (adapter->need_ioport)
+               err = pci_enable_device(pdev);
+       else
+               err = pci_enable_device_mem(pdev);
+       if (err) {
+               pr_err("Cannot re-enable PCI device after reset.\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+       pci_set_master(pdev);
+
+       pci_enable_wake(pdev, PCI_D3hot, 0);
+       pci_enable_wake(pdev, PCI_D3cold, 0);
+
+       e1000_reset(adapter);
+       ew32(WUS, ~0);
+
+       return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * e1000_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation. Implementation resembles the
+ * second-half of the e1000_resume routine.
+ */
+static void e1000_io_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       e1000_init_manageability(adapter);
+
+       if (netif_running(netdev)) {
+               if (e1000_up(adapter)) {
+                       pr_info("can't bring device back up after reset\n");
+                       return;
+               }
+       }
+
+       netif_device_attach(netdev);
+}
+
+/* e1000_main.c */
diff --git a/drivers/net/ethernet/intel/e1000/e1000_osdep.h b/drivers/net/ethernet/intel/e1000/e1000_osdep.h
new file mode 100644 (file)
index 0000000..33e7c45
--- /dev/null
@@ -0,0 +1,109 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+*******************************************************************************/
+
+
+/* glue for the OS independent part of e1000
+ * includes register access macros
+ */
+
+#ifndef _E1000_OSDEP_H_
+#define _E1000_OSDEP_H_
+
+#include <asm/io.h>
+
+#define CONFIG_RAM_BASE         0x60000
+#define GBE_CONFIG_OFFSET       0x0
+
+#define GBE_CONFIG_RAM_BASE \
+       ((unsigned int)(CONFIG_RAM_BASE + GBE_CONFIG_OFFSET))
+
+#define GBE_CONFIG_BASE_VIRT \
+       ((void __iomem *)phys_to_virt(GBE_CONFIG_RAM_BASE))
+
+#define GBE_CONFIG_FLASH_WRITE(base, offset, count, data) \
+       (iowrite16_rep(base + offset, data, count))
+
+#define GBE_CONFIG_FLASH_READ(base, offset, count, data) \
+       (ioread16_rep(base + (offset << 1), data, count))
+
+#define er32(reg)                                                      \
+       (readl(hw->hw_addr + ((hw->mac_type >= e1000_82543)             \
+                              ? E1000_##reg : E1000_82542_##reg)))
+
+#define ew32(reg, value)                                               \
+       (writel((value), (hw->hw_addr + ((hw->mac_type >= e1000_82543)  \
+                                        ? E1000_##reg : E1000_82542_##reg))))
+
+#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
+    writel((value), ((a)->hw_addr + \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
+        ((offset) << 2))))
+
+#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
+    readl((a)->hw_addr + \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##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 + \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
+        ((offset) << 1))))
+
+#define E1000_READ_REG_ARRAY_WORD(a, reg, offset) ( \
+    readw((a)->hw_addr + \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
+        ((offset) << 1)))
+
+#define E1000_WRITE_REG_ARRAY_BYTE(a, reg, offset, value) ( \
+    writeb((value), ((a)->hw_addr + \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
+        (offset))))
+
+#define E1000_READ_REG_ARRAY_BYTE(a, reg, offset) ( \
+    readb((a)->hw_addr + \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
+        (offset)))
+
+#define E1000_WRITE_FLUSH() er32(STATUS)
+
+#define E1000_WRITE_ICH_FLASH_REG(a, reg, value) ( \
+    writel((value), ((a)->flash_address + reg)))
+
+#define E1000_READ_ICH_FLASH_REG(a, reg) ( \
+    readl((a)->flash_address + reg))
+
+#define E1000_WRITE_ICH_FLASH_REG16(a, reg, value) ( \
+    writew((value), ((a)->flash_address + reg)))
+
+#define E1000_READ_ICH_FLASH_REG16(a, reg) ( \
+    readw((a)->flash_address + reg))
+
+#endif /* _E1000_OSDEP_H_ */
diff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c
new file mode 100644 (file)
index 0000000..1301eba
--- /dev/null
@@ -0,0 +1,755 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2006 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
+
+*******************************************************************************/
+
+#include "e1000.h"
+
+/* This is the only thing that needs to be changed to adjust the
+ * maximum number of ports that the driver can manage.
+ */
+
+#define E1000_MAX_NIC 32
+
+#define OPTION_UNSET   -1
+#define OPTION_DISABLED 0
+#define OPTION_ENABLED  1
+
+/* All parameters are treated the same, as an integer array of values.
+ * This macro just reduces the need to repeat the same declaration code
+ * over and over (plus this helps to avoid typo bugs).
+ */
+
+#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
+#define E1000_PARAM(X, desc) \
+       static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
+       static unsigned int num_##X; \
+       module_param_array_named(X, X, int, &num_##X, 0); \
+       MODULE_PARM_DESC(X, desc);
+
+/* Transmit Descriptor Count
+ *
+ * Valid Range: 80-256 for 82542 and 82543 gigabit ethernet controllers
+ * Valid Range: 80-4096 for 82544 and newer
+ *
+ * Default Value: 256
+ */
+E1000_PARAM(TxDescriptors, "Number of transmit descriptors");
+
+/* Receive Descriptor Count
+ *
+ * Valid Range: 80-256 for 82542 and 82543 gigabit ethernet controllers
+ * Valid Range: 80-4096 for 82544 and newer
+ *
+ * Default Value: 256
+ */
+E1000_PARAM(RxDescriptors, "Number of receive descriptors");
+
+/* User Specified Speed Override
+ *
+ * Valid Range: 0, 10, 100, 1000
+ *  - 0    - auto-negotiate at all supported speeds
+ *  - 10   - only link at 10 Mbps
+ *  - 100  - only link at 100 Mbps
+ *  - 1000 - only link at 1000 Mbps
+ *
+ * Default Value: 0
+ */
+E1000_PARAM(Speed, "Speed setting");
+
+/* User Specified Duplex Override
+ *
+ * Valid Range: 0-2
+ *  - 0 - auto-negotiate for duplex
+ *  - 1 - only link at half duplex
+ *  - 2 - only link at full duplex
+ *
+ * Default Value: 0
+ */
+E1000_PARAM(Duplex, "Duplex setting");
+
+/* Auto-negotiation Advertisement Override
+ *
+ * Valid Range: 0x01-0x0F, 0x20-0x2F (copper); 0x20 (fiber)
+ *
+ * The AutoNeg value is a bit mask describing which speed and duplex
+ * combinations should be advertised during auto-negotiation.
+ * The supported speed and duplex modes are listed below
+ *
+ * Bit           7     6     5      4      3     2     1      0
+ * Speed (Mbps)  N/A   N/A   1000   N/A    100   100   10     10
+ * Duplex                    Full          Full  Half  Full   Half
+ *
+ * Default Value: 0x2F (copper); 0x20 (fiber)
+ */
+E1000_PARAM(AutoNeg, "Advertised auto-negotiation setting");
+#define AUTONEG_ADV_DEFAULT  0x2F
+#define AUTONEG_ADV_MASK     0x2F
+
+/* User Specified Flow Control Override
+ *
+ * Valid Range: 0-3
+ *  - 0 - No Flow Control
+ *  - 1 - Rx only, respond to PAUSE frames but do not generate them
+ *  - 2 - Tx only, generate PAUSE frames but ignore them on receive
+ *  - 3 - Full Flow Control Support
+ *
+ * Default Value: Read flow control settings from the EEPROM
+ */
+E1000_PARAM(FlowControl, "Flow Control setting");
+#define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL
+
+/* XsumRX - Receive Checksum Offload Enable/Disable
+ *
+ * Valid Range: 0, 1
+ *  - 0 - disables all checksum offload
+ *  - 1 - enables receive IP/TCP/UDP checksum offload
+ *        on 82543 and newer -based NICs
+ *
+ * Default Value: 1
+ */
+E1000_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
+
+/* Transmit Interrupt Delay in units of 1.024 microseconds
+ *  Tx interrupt delay needs to typically be set to something non zero
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(TxIntDelay, "Transmit Interrupt Delay");
+#define DEFAULT_TIDV                   8
+#define MAX_TXDELAY               0xFFFF
+#define MIN_TXDELAY                    0
+
+/* Transmit Absolute Interrupt Delay in units of 1.024 microseconds
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(TxAbsIntDelay, "Transmit Absolute Interrupt Delay");
+#define DEFAULT_TADV                  32
+#define MAX_TXABSDELAY            0xFFFF
+#define MIN_TXABSDELAY                 0
+
+/* Receive Interrupt Delay in units of 1.024 microseconds
+ *   hardware will likely hang if you set this to anything but zero.
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(RxIntDelay, "Receive Interrupt Delay");
+#define DEFAULT_RDTR                   0
+#define MAX_RXDELAY               0xFFFF
+#define MIN_RXDELAY                    0
+
+/* Receive Absolute Interrupt Delay in units of 1.024 microseconds
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
+#define DEFAULT_RADV                   8
+#define MAX_RXABSDELAY            0xFFFF
+#define MIN_RXABSDELAY                 0
+
+/* Interrupt Throttle Rate (interrupts/sec)
+ *
+ * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
+ */
+E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
+#define DEFAULT_ITR                    3
+#define MAX_ITR                   100000
+#define MIN_ITR                      100
+
+/* Enable Smart Power Down of the PHY
+ *
+ * Valid Range: 0, 1
+ *
+ * Default Value: 0 (disabled)
+ */
+E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
+
+struct e1000_option {
+       enum { enable_option, range_option, list_option } type;
+       const char *name;
+       const char *err;
+       int def;
+       union {
+               struct { /* range_option info */
+                       int min;
+                       int max;
+               } r;
+               struct { /* list_option info */
+                       int nr;
+                       const struct e1000_opt_list { int i; char *str; } *p;
+               } l;
+       } arg;
+};
+
+static int __devinit e1000_validate_option(unsigned int *value,
+                                          const struct e1000_option *opt,
+                                          struct e1000_adapter *adapter)
+{
+       if (*value == OPTION_UNSET) {
+               *value = opt->def;
+               return 0;
+       }
+
+       switch (opt->type) {
+       case enable_option:
+               switch (*value) {
+               case OPTION_ENABLED:
+                       e_dev_info("%s Enabled\n", opt->name);
+                       return 0;
+               case OPTION_DISABLED:
+                       e_dev_info("%s Disabled\n", opt->name);
+                       return 0;
+               }
+               break;
+       case range_option:
+               if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
+                       e_dev_info("%s set to %i\n", opt->name, *value);
+                       return 0;
+               }
+               break;
+       case list_option: {
+               int i;
+               const struct e1000_opt_list *ent;
+
+               for (i = 0; i < opt->arg.l.nr; i++) {
+                       ent = &opt->arg.l.p[i];
+                       if (*value == ent->i) {
+                               if (ent->str[0] != '\0')
+                                       e_dev_info("%s\n", ent->str);
+                               return 0;
+                       }
+               }
+       }
+               break;
+       default:
+               BUG();
+       }
+
+       e_dev_info("Invalid %s value specified (%i) %s\n",
+              opt->name, *value, opt->err);
+       *value = opt->def;
+       return -1;
+}
+
+static void e1000_check_fiber_options(struct e1000_adapter *adapter);
+static void e1000_check_copper_options(struct e1000_adapter *adapter);
+
+/**
+ * e1000_check_options - Range Checking for Command Line Parameters
+ * @adapter: board private structure
+ *
+ * This routine checks all command line parameters for valid user
+ * input.  If an invalid value is given, or if no user specified
+ * value exists, a default value is used.  The final value is stored
+ * in a variable in the adapter structure.
+ **/
+
+void __devinit e1000_check_options(struct e1000_adapter *adapter)
+{
+       struct e1000_option opt;
+       int bd = adapter->bd_number;
+
+       if (bd >= E1000_MAX_NIC) {
+               e_dev_warn("Warning: no configuration for board #%i "
+                          "using defaults for all values\n", bd);
+       }
+
+       { /* Transmit Descriptor Count */
+               struct e1000_tx_ring *tx_ring = adapter->tx_ring;
+               int i;
+               e1000_mac_type mac_type = adapter->hw.mac_type;
+
+               opt = (struct e1000_option) {
+                       .type = range_option,
+                       .name = "Transmit Descriptors",
+                       .err  = "using default of "
+                               __MODULE_STRING(E1000_DEFAULT_TXD),
+                       .def  = E1000_DEFAULT_TXD,
+                       .arg  = { .r = {
+                               .min = E1000_MIN_TXD,
+                               .max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD
+                               }}
+               };
+
+               if (num_TxDescriptors > bd) {
+                       tx_ring->count = TxDescriptors[bd];
+                       e1000_validate_option(&tx_ring->count, &opt, adapter);
+                       tx_ring->count = ALIGN(tx_ring->count,
+                                               REQ_TX_DESCRIPTOR_MULTIPLE);
+               } else {
+                       tx_ring->count = opt.def;
+               }
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       tx_ring[i].count = tx_ring->count;
+       }
+       { /* Receive Descriptor Count */
+               struct e1000_rx_ring *rx_ring = adapter->rx_ring;
+               int i;
+               e1000_mac_type mac_type = adapter->hw.mac_type;
+
+               opt = (struct e1000_option) {
+                       .type = range_option,
+                       .name = "Receive Descriptors",
+                       .err  = "using default of "
+                               __MODULE_STRING(E1000_DEFAULT_RXD),
+                       .def  = E1000_DEFAULT_RXD,
+                       .arg  = { .r = {
+                               .min = E1000_MIN_RXD,
+                               .max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD
+                       }}
+               };
+
+               if (num_RxDescriptors > bd) {
+                       rx_ring->count = RxDescriptors[bd];
+                       e1000_validate_option(&rx_ring->count, &opt, adapter);
+                       rx_ring->count = ALIGN(rx_ring->count,
+                                               REQ_RX_DESCRIPTOR_MULTIPLE);
+               } else {
+                       rx_ring->count = opt.def;
+               }
+               for (i = 0; i < adapter->num_rx_queues; i++)
+                       rx_ring[i].count = rx_ring->count;
+       }
+       { /* Checksum Offload Enable/Disable */
+               opt = (struct e1000_option) {
+                       .type = enable_option,
+                       .name = "Checksum Offload",
+                       .err  = "defaulting to Enabled",
+                       .def  = OPTION_ENABLED
+               };
+
+               if (num_XsumRX > bd) {
+                       unsigned int rx_csum = XsumRX[bd];
+                       e1000_validate_option(&rx_csum, &opt, adapter);
+                       adapter->rx_csum = rx_csum;
+               } else {
+                       adapter->rx_csum = opt.def;
+               }
+       }
+       { /* Flow Control */
+
+               static const struct e1000_opt_list fc_list[] = {
+                      { E1000_FC_NONE, "Flow Control Disabled" },
+                      { E1000_FC_RX_PAUSE, "Flow Control Receive Only" },
+                      { E1000_FC_TX_PAUSE, "Flow Control Transmit Only" },
+                      { E1000_FC_FULL, "Flow Control Enabled" },
+                      { E1000_FC_DEFAULT, "Flow Control Hardware Default" }
+               };
+
+               opt = (struct e1000_option) {
+                       .type = list_option,
+                       .name = "Flow Control",
+                       .err  = "reading default settings from EEPROM",
+                       .def  = E1000_FC_DEFAULT,
+                       .arg  = { .l = { .nr = ARRAY_SIZE(fc_list),
+                                        .p = fc_list }}
+               };
+
+               if (num_FlowControl > bd) {
+                       unsigned int fc = FlowControl[bd];
+                       e1000_validate_option(&fc, &opt, adapter);
+                       adapter->hw.fc = adapter->hw.original_fc = fc;
+               } else {
+                       adapter->hw.fc = adapter->hw.original_fc = opt.def;
+               }
+       }
+       { /* Transmit Interrupt Delay */
+               opt = (struct e1000_option) {
+                       .type = range_option,
+                       .name = "Transmit Interrupt Delay",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
+                       .def  = DEFAULT_TIDV,
+                       .arg  = { .r = { .min = MIN_TXDELAY,
+                                        .max = MAX_TXDELAY }}
+               };
+
+               if (num_TxIntDelay > bd) {
+                       adapter->tx_int_delay = TxIntDelay[bd];
+                       e1000_validate_option(&adapter->tx_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->tx_int_delay = opt.def;
+               }
+       }
+       { /* Transmit Absolute Interrupt Delay */
+               opt = (struct e1000_option) {
+                       .type = range_option,
+                       .name = "Transmit Absolute Interrupt Delay",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_TADV),
+                       .def  = DEFAULT_TADV,
+                       .arg  = { .r = { .min = MIN_TXABSDELAY,
+                                        .max = MAX_TXABSDELAY }}
+               };
+
+               if (num_TxAbsIntDelay > bd) {
+                       adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
+                       e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->tx_abs_int_delay = opt.def;
+               }
+       }
+       { /* Receive Interrupt Delay */
+               opt = (struct e1000_option) {
+                       .type = range_option,
+                       .name = "Receive Interrupt Delay",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
+                       .def  = DEFAULT_RDTR,
+                       .arg  = { .r = { .min = MIN_RXDELAY,
+                                        .max = MAX_RXDELAY }}
+               };
+
+               if (num_RxIntDelay > bd) {
+                       adapter->rx_int_delay = RxIntDelay[bd];
+                       e1000_validate_option(&adapter->rx_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->rx_int_delay = opt.def;
+               }
+       }
+       { /* Receive Absolute Interrupt Delay */
+               opt = (struct e1000_option) {
+                       .type = range_option,
+                       .name = "Receive Absolute Interrupt Delay",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_RADV),
+                       .def  = DEFAULT_RADV,
+                       .arg  = { .r = { .min = MIN_RXABSDELAY,
+                                        .max = MAX_RXABSDELAY }}
+               };
+
+               if (num_RxAbsIntDelay > bd) {
+                       adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
+                       e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->rx_abs_int_delay = opt.def;
+               }
+       }
+       { /* Interrupt Throttling Rate */
+               opt = (struct e1000_option) {
+                       .type = range_option,
+                       .name = "Interrupt Throttling Rate (ints/sec)",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_ITR),
+                       .def  = DEFAULT_ITR,
+                       .arg  = { .r = { .min = MIN_ITR,
+                                        .max = MAX_ITR }}
+               };
+
+               if (num_InterruptThrottleRate > bd) {
+                       adapter->itr = InterruptThrottleRate[bd];
+                       switch (adapter->itr) {
+                       case 0:
+                               e_dev_info("%s turned off\n", opt.name);
+                               break;
+                       case 1:
+                               e_dev_info("%s set to dynamic mode\n",
+                                          opt.name);
+                               adapter->itr_setting = adapter->itr;
+                               adapter->itr = 20000;
+                               break;
+                       case 3:
+                               e_dev_info("%s set to dynamic conservative "
+                                          "mode\n", opt.name);
+                               adapter->itr_setting = adapter->itr;
+                               adapter->itr = 20000;
+                               break;
+                       case 4:
+                               e_dev_info("%s set to simplified "
+                                          "(2000-8000) ints mode\n", opt.name);
+                               adapter->itr_setting = adapter->itr;
+                               break;
+                       default:
+                               e1000_validate_option(&adapter->itr, &opt,
+                                       adapter);
+                               /* save the setting, because the dynamic bits
+                                * change itr.
+                                * clear the lower two bits because they are
+                                * used as control */
+                               adapter->itr_setting = adapter->itr & ~3;
+                               break;
+                       }
+               } else {
+                       adapter->itr_setting = opt.def;
+                       adapter->itr = 20000;
+               }
+       }
+       { /* Smart Power Down */
+               opt = (struct e1000_option) {
+                       .type = enable_option,
+                       .name = "PHY Smart Power Down",
+                       .err  = "defaulting to Disabled",
+                       .def  = OPTION_DISABLED
+               };
+
+               if (num_SmartPowerDownEnable > bd) {
+                       unsigned int spd = SmartPowerDownEnable[bd];
+                       e1000_validate_option(&spd, &opt, adapter);
+                       adapter->smart_power_down = spd;
+               } else {
+                       adapter->smart_power_down = opt.def;
+               }
+       }
+
+       switch (adapter->hw.media_type) {
+       case e1000_media_type_fiber:
+       case e1000_media_type_internal_serdes:
+               e1000_check_fiber_options(adapter);
+               break;
+       case e1000_media_type_copper:
+               e1000_check_copper_options(adapter);
+               break;
+       default:
+               BUG();
+       }
+}
+
+/**
+ * e1000_check_fiber_options - Range Checking for Link Options, Fiber Version
+ * @adapter: board private structure
+ *
+ * Handles speed and duplex options on fiber adapters
+ **/
+
+static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)
+{
+       int bd = adapter->bd_number;
+       if (num_Speed > bd) {
+               e_dev_info("Speed not valid for fiber adapters, parameter "
+                          "ignored\n");
+       }
+
+       if (num_Duplex > bd) {
+               e_dev_info("Duplex not valid for fiber adapters, parameter "
+                          "ignored\n");
+       }
+
+       if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
+               e_dev_info("AutoNeg other than 1000/Full is not valid for fiber"
+                          "adapters, parameter ignored\n");
+       }
+}
+
+/**
+ * e1000_check_copper_options - Range Checking for Link Options, Copper Version
+ * @adapter: board private structure
+ *
+ * Handles speed and duplex options on copper adapters
+ **/
+
+static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
+{
+       struct e1000_option opt;
+       unsigned int speed, dplx, an;
+       int bd = adapter->bd_number;
+
+       { /* Speed */
+               static const struct e1000_opt_list speed_list[] = {
+                       {          0, "" },
+                       {   SPEED_10, "" },
+                       {  SPEED_100, "" },
+                       { SPEED_1000, "" }};
+
+               opt = (struct e1000_option) {
+                       .type = list_option,
+                       .name = "Speed",
+                       .err  = "parameter ignored",
+                       .def  = 0,
+                       .arg  = { .l = { .nr = ARRAY_SIZE(speed_list),
+                                        .p = speed_list }}
+               };
+
+               if (num_Speed > bd) {
+                       speed = Speed[bd];
+                       e1000_validate_option(&speed, &opt, adapter);
+               } else {
+                       speed = opt.def;
+               }
+       }
+       { /* Duplex */
+               static const struct e1000_opt_list dplx_list[] = {
+                       {           0, "" },
+                       { HALF_DUPLEX, "" },
+                       { FULL_DUPLEX, "" }};
+
+               opt = (struct e1000_option) {
+                       .type = list_option,
+                       .name = "Duplex",
+                       .err  = "parameter ignored",
+                       .def  = 0,
+                       .arg  = { .l = { .nr = ARRAY_SIZE(dplx_list),
+                                        .p = dplx_list }}
+               };
+
+               if (num_Duplex > bd) {
+                       dplx = Duplex[bd];
+                       e1000_validate_option(&dplx, &opt, adapter);
+               } else {
+                       dplx = opt.def;
+               }
+       }
+
+       if ((num_AutoNeg > bd) && (speed != 0 || dplx != 0)) {
+               e_dev_info("AutoNeg specified along with Speed or Duplex, "
+                          "parameter ignored\n");
+               adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT;
+       } else { /* Autoneg */
+               static const struct e1000_opt_list an_list[] =
+                       #define AA "AutoNeg advertising "
+                       {{ 0x01, AA "10/HD" },
+                        { 0x02, AA "10/FD" },
+                        { 0x03, AA "10/FD, 10/HD" },
+                        { 0x04, AA "100/HD" },
+                        { 0x05, AA "100/HD, 10/HD" },
+                        { 0x06, AA "100/HD, 10/FD" },
+                        { 0x07, AA "100/HD, 10/FD, 10/HD" },
+                        { 0x08, AA "100/FD" },
+                        { 0x09, AA "100/FD, 10/HD" },
+                        { 0x0a, AA "100/FD, 10/FD" },
+                        { 0x0b, AA "100/FD, 10/FD, 10/HD" },
+                        { 0x0c, AA "100/FD, 100/HD" },
+                        { 0x0d, AA "100/FD, 100/HD, 10/HD" },
+                        { 0x0e, AA "100/FD, 100/HD, 10/FD" },
+                        { 0x0f, AA "100/FD, 100/HD, 10/FD, 10/HD" },
+                        { 0x20, AA "1000/FD" },
+                        { 0x21, AA "1000/FD, 10/HD" },
+                        { 0x22, AA "1000/FD, 10/FD" },
+                        { 0x23, AA "1000/FD, 10/FD, 10/HD" },
+                        { 0x24, AA "1000/FD, 100/HD" },
+                        { 0x25, AA "1000/FD, 100/HD, 10/HD" },
+                        { 0x26, AA "1000/FD, 100/HD, 10/FD" },
+                        { 0x27, AA "1000/FD, 100/HD, 10/FD, 10/HD" },
+                        { 0x28, AA "1000/FD, 100/FD" },
+                        { 0x29, AA "1000/FD, 100/FD, 10/HD" },
+                        { 0x2a, AA "1000/FD, 100/FD, 10/FD" },
+                        { 0x2b, AA "1000/FD, 100/FD, 10/FD, 10/HD" },
+                        { 0x2c, AA "1000/FD, 100/FD, 100/HD" },
+                        { 0x2d, AA "1000/FD, 100/FD, 100/HD, 10/HD" },
+                        { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },
+                        { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }};
+
+               opt = (struct e1000_option) {
+                       .type = list_option,
+                       .name = "AutoNeg",
+                       .err  = "parameter ignored",
+                       .def  = AUTONEG_ADV_DEFAULT,
+                       .arg  = { .l = { .nr = ARRAY_SIZE(an_list),
+                                        .p = an_list }}
+               };
+
+               if (num_AutoNeg > bd) {
+                       an = AutoNeg[bd];
+                       e1000_validate_option(&an, &opt, adapter);
+               } else {
+                       an = opt.def;
+               }
+               adapter->hw.autoneg_advertised = an;
+       }
+
+       switch (speed + dplx) {
+       case 0:
+               adapter->hw.autoneg = adapter->fc_autoneg = 1;
+               if ((num_Speed > bd) && (speed != 0 || dplx != 0))
+                       e_dev_info("Speed and duplex autonegotiation "
+                                  "enabled\n");
+               break;
+       case HALF_DUPLEX:
+               e_dev_info("Half Duplex specified without Speed\n");
+               e_dev_info("Using Autonegotiation at Half Duplex only\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 1;
+               adapter->hw.autoneg_advertised = ADVERTISE_10_HALF |
+                                                ADVERTISE_100_HALF;
+               break;
+       case FULL_DUPLEX:
+               e_dev_info("Full Duplex specified without Speed\n");
+               e_dev_info("Using Autonegotiation at Full Duplex only\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 1;
+               adapter->hw.autoneg_advertised = ADVERTISE_10_FULL |
+                                                ADVERTISE_100_FULL |
+                                                ADVERTISE_1000_FULL;
+               break;
+       case SPEED_10:
+               e_dev_info("10 Mbps Speed specified without Duplex\n");
+               e_dev_info("Using Autonegotiation at 10 Mbps only\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 1;
+               adapter->hw.autoneg_advertised = ADVERTISE_10_HALF |
+                                                ADVERTISE_10_FULL;
+               break;
+       case SPEED_10 + HALF_DUPLEX:
+               e_dev_info("Forcing to 10 Mbps Half Duplex\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 0;
+               adapter->hw.forced_speed_duplex = e1000_10_half;
+               adapter->hw.autoneg_advertised = 0;
+               break;
+       case SPEED_10 + FULL_DUPLEX:
+               e_dev_info("Forcing to 10 Mbps Full Duplex\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 0;
+               adapter->hw.forced_speed_duplex = e1000_10_full;
+               adapter->hw.autoneg_advertised = 0;
+               break;
+       case SPEED_100:
+               e_dev_info("100 Mbps Speed specified without Duplex\n");
+               e_dev_info("Using Autonegotiation at 100 Mbps only\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 1;
+               adapter->hw.autoneg_advertised = ADVERTISE_100_HALF |
+                                                ADVERTISE_100_FULL;
+               break;
+       case SPEED_100 + HALF_DUPLEX:
+               e_dev_info("Forcing to 100 Mbps Half Duplex\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 0;
+               adapter->hw.forced_speed_duplex = e1000_100_half;
+               adapter->hw.autoneg_advertised = 0;
+               break;
+       case SPEED_100 + FULL_DUPLEX:
+               e_dev_info("Forcing to 100 Mbps Full Duplex\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 0;
+               adapter->hw.forced_speed_duplex = e1000_100_full;
+               adapter->hw.autoneg_advertised = 0;
+               break;
+       case SPEED_1000:
+               e_dev_info("1000 Mbps Speed specified without Duplex\n");
+               goto full_duplex_only;
+       case SPEED_1000 + HALF_DUPLEX:
+               e_dev_info("Half Duplex is not supported at 1000 Mbps\n");
+               /* fall through */
+       case SPEED_1000 + FULL_DUPLEX:
+full_duplex_only:
+               e_dev_info("Using Autonegotiation at 1000 Mbps Full Duplex "
+                          "only\n");
+               adapter->hw.autoneg = adapter->fc_autoneg = 1;
+               adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
+               break;
+       default:
+               BUG();
+       }
+
+       /* Speed, AutoNeg and MDI/MDI-X must all play nice */
+       if (e1000_validate_mdi_setting(&(adapter->hw)) < 0) {
+               e_dev_info("Speed, AutoNeg and MDI-X specs are incompatible. "
+                          "Setting MDI-X to a compatible value.\n");
+       }
+}
+
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
new file mode 100644 (file)
index 0000000..e4f4225
--- /dev/null
@@ -0,0 +1,1516 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+/*
+ * 80003ES2LAN Gigabit Ethernet Controller (Copper)
+ * 80003ES2LAN Gigabit Ethernet Controller (Serdes)
+ */
+
+#include "e1000.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 Disab. */
+#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_25                 0x0007
+
+#define GG82563_MSCR_ASSERT_CRS_ON_TX           0x0010 /* 1=Assert */
+
+/* DSP Distance Register (Page 5, Register 26) */
+#define GG82563_DSPD_CABLE_LENGTH               0x0007 /* 0 = <50M
+                                                          1 = 50-80M
+                                                          2 = 80-110M
+                                                          3 = 110-140M
+                                                          4 = >140M */
+
+/* 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 */
+
+/*
+ * 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 \
+               ARRAY_SIZE(e1000_gg82563_cable_length_table)
+
+static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
+static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
+static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw);
+static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw);
+static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex);
+static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw);
+static s32  e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
+                                            u16 *data);
+static s32  e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
+                                             u16 data);
+static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw);
+
+/**
+ *  e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs.
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+
+       if (hw->phy.media_type != e1000_media_type_copper) {
+               phy->type       = e1000_phy_none;
+               return 0;
+       } else {
+               phy->ops.power_up = e1000_power_up_phy_copper;
+               phy->ops.power_down = e1000_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;
+
+       /* 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)
+               return -E1000_ERR_PHY;
+
+       return ret_val;
+}
+
+/**
+ *  e1000_init_nvm_params_80003es2lan - Init ESB2 NVM func ptrs.
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_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;
+
+       return 0;
+}
+
+/**
+ *  e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs.
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_mac_info *mac = &hw->mac;
+       struct e1000_mac_operations *func = &mac->ops;
+
+       /* Set media type */
+       switch (adapter->pdev->device) {
+       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;
+       /* FWSM register */
+       mac->has_fwsm = true;
+       /* ARC supported; valid only if manageability features are enabled. */
+       mac->arc_subsystem_valid =
+               (er32(FWSM) & E1000_FWSM_MODE_MASK)
+                       ? true : false;
+       /* Adaptive IFS not supported */
+       mac->adaptive_ifs = false;
+
+       /* check for link */
+       switch (hw->phy.media_type) {
+       case e1000_media_type_copper:
+               func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
+               func->check_for_link = e1000e_check_for_copper_link;
+               break;
+       case e1000_media_type_fiber:
+               func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
+               func->check_for_link = e1000e_check_for_fiber_link;
+               break;
+       case e1000_media_type_internal_serdes:
+               func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
+               func->check_for_link = e1000e_check_for_serdes_link;
+               break;
+       default:
+               return -E1000_ERR_CONFIG;
+               break;
+       }
+
+       /* set lan id for port to determine which phy lock to use */
+       hw->mac.ops.set_lan_id(hw);
+
+       return 0;
+}
+
+static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       s32 rc;
+
+       rc = e1000_init_mac_params_80003es2lan(adapter);
+       if (rc)
+               return rc;
+
+       rc = e1000_init_nvm_params_80003es2lan(hw);
+       if (rc)
+               return rc;
+
+       rc = e1000_init_phy_params_80003es2lan(hw);
+       if (rc)
+               return rc;
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw)
+{
+       u16 mask;
+
+       mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM;
+       return e1000_acquire_swfw_sync_80003es2lan(hw, mask);
+}
+
+/**
+ *  e1000_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 e1000_release_phy_80003es2lan(struct e1000_hw *hw)
+{
+       u16 mask;
+
+       mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM;
+       e1000_release_swfw_sync_80003es2lan(hw, mask);
+}
+
+/**
+ *  e1000_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 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw)
+{
+       u16 mask;
+
+       mask = E1000_SWFW_CSR_SM;
+
+       return e1000_acquire_swfw_sync_80003es2lan(hw, mask);
+}
+
+/**
+ *  e1000_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 e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw)
+{
+       u16 mask;
+
+       mask = E1000_SWFW_CSR_SM;
+
+       e1000_release_swfw_sync_80003es2lan(hw, mask);
+}
+
+/**
+ *  e1000_acquire_nvm_80003es2lan - Acquire rights to access NVM
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire the semaphore to access the EEPROM.
+ **/
+static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw)
+{
+       s32 ret_val;
+
+       ret_val = e1000_acquire_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000e_acquire_nvm(hw);
+
+       if (ret_val)
+               e1000_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_release_nvm_80003es2lan - Relinquish rights to access NVM
+ *  @hw: pointer to the HW structure
+ *
+ *  Release the semaphore used to access the EEPROM.
+ **/
+static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw)
+{
+       e1000e_release_nvm(hw);
+       e1000_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
+}
+
+/**
+ *  e1000_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 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
+{
+       u32 swfw_sync;
+       u32 swmask = mask;
+       u32 fwmask = mask << 16;
+       s32 i = 0;
+       s32 timeout = 50;
+
+       while (i < timeout) {
+               if (e1000e_get_hw_semaphore(hw))
+                       return -E1000_ERR_SWFW_SYNC;
+
+               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");
+               return -E1000_ERR_SWFW_SYNC;
+       }
+
+       swfw_sync |= swmask;
+       ew32(SW_FW_SYNC, swfw_sync);
+
+       e1000e_put_hw_semaphore(hw);
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
+{
+       u32 swfw_sync;
+
+       while (e1000e_get_hw_semaphore(hw) != 0)
+               ; /* Empty */
+
+       swfw_sync = er32(SW_FW_SYNC);
+       swfw_sync &= ~mask;
+       ew32(SW_FW_SYNC, swfw_sync);
+
+       e1000e_put_hw_semaphore(hw);
+}
+
+/**
+ *  e1000_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 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
+                                                 u32 offset, u16 *data)
+{
+       s32 ret_val;
+       u32 page_select;
+       u16 temp;
+
+       ret_val = e1000_acquire_phy_80003es2lan(hw);
+       if (ret_val)
+               return ret_val;
+
+       /* 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) {
+               e1000_release_phy_80003es2lan(hw);
+               return ret_val;
+       }
+
+       if (hw->dev_spec.e80003es2lan.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;
+                       e1000_release_phy_80003es2lan(hw);
+                       return ret_val;
+               }
+
+               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);
+       }
+
+       e1000_release_phy_80003es2lan(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
+                                                  u32 offset, u16 data)
+{
+       s32 ret_val;
+       u32 page_select;
+       u16 temp;
+
+       ret_val = e1000_acquire_phy_80003es2lan(hw);
+       if (ret_val)
+               return ret_val;
+
+       /* 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) {
+               e1000_release_phy_80003es2lan(hw);
+               return ret_val;
+       }
+
+       if (hw->dev_spec.e80003es2lan.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) {
+                       e1000_release_phy_80003es2lan(hw);
+                       return -E1000_ERR_PHY;
+               }
+
+               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);
+       }
+
+       e1000_release_phy_80003es2lan(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset,
+                                      u16 words, u16 *data)
+{
+       return e1000e_write_nvm_spi(hw, offset, words, data);
+}
+
+/**
+ *  e1000_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 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw)
+{
+       s32 timeout = PHY_CFG_TIMEOUT;
+       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;
+               usleep_range(1000, 2000);
+               timeout--;
+       }
+       if (!timeout) {
+               e_dbg("MNG configuration cycle has not completed.\n");
+               return -E1000_ERR_RESET;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
+{
+       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)
+               return ret_val;
+
+       phy_data &= ~GG82563_PSCR_CROSSOVER_MODE_AUTO;
+       ret_val = e1e_wphy(hw, GG82563_PHY_SPEC_CTRL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       e_dbg("GG82563 PSCR: %X\n", phy_data);
+
+       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       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)
+               return ret_val;
+
+       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)
+                       return ret_val;
+
+               if (!link) {
+                       /*
+                        * We didn't get link.
+                        * Reset the DSP and cross our fingers.
+                        */
+                       ret_val = e1000e_phy_reset_dsp(hw);
+                       if (ret_val)
+                               return ret_val;
+               }
+
+               /* Try once more */
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       ret_val = e1e_rphy(hw, GG82563_PHY_MAC_SPEC_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /*
+        * 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);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val = 0;
+       u16 phy_data, index;
+
+       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;
+}
+
+/**
+ *  e1000_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 e1000_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;
+}
+
+/**
+ *  e1000_reset_hw_80003es2lan - Reset the ESB2 controller
+ *  @hw: pointer to the HW structure
+ *
+ *  Perform a global reset to the ESB2 controller.
+ **/
+static s32 e1000_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();
+
+       usleep_range(10000, 20000);
+
+       ctrl = er32(CTRL);
+
+       ret_val = e1000_acquire_phy_80003es2lan(hw);
+       e_dbg("Issuing a global reset to MAC\n");
+       ew32(CTRL, ctrl | E1000_CTRL_RST);
+       e1000_release_phy_80003es2lan(hw);
+
+       ret_val = e1000e_get_auto_rd_done(hw);
+       if (ret_val)
+               /* We don't want to continue accessing MAC registers. */
+               return ret_val;
+
+       /* Clear any pending interrupt events. */
+       ew32(IMC, 0xffffffff);
+       er32(ICR);
+
+       ret_val = e1000_check_alt_mac_addr_generic(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       u32 reg_data;
+       s32 ret_val;
+       u16 kum_reg_data;
+       u16 i;
+
+       e1000_initialize_hw_bits_80003es2lan(hw);
+
+       /* Initialize identification LED */
+       ret_val = e1000e_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");
+       mac->ops.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 = e1000e_setup_link(hw);
+
+       /* Disable IBIST slave mode (far-end loopback) */
+       e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                       &kum_reg_data);
+       kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
+       e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                        kum_reg_data);
+
+       /* 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.e80003es2lan.mdic_wa_enable = true;
+
+       ret_val = e1000_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.e80003es2lan.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.
+        */
+       e1000_clear_hw_cntrs_80003es2lan(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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);
+}
+
+/**
+ *  e1000_copper_link_setup_gg82563_80003es2lan - Configure GG82563 Link
+ *  @hw: pointer to the HW structure
+ *
+ *  Setup some GG82563 PHY registers for obtaining link
+ **/
+static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u32 ctrl_ext;
+       u16 data;
+
+       ret_val = e1e_rphy(hw, GG82563_PHY_MAC_SPEC_CTRL, &data);
+       if (ret_val)
+               return ret_val;
+
+       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)
+               return ret_val;
+
+       /*
+        * 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)
+               return ret_val;
+
+       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)
+               return ret_val;
+
+       /* 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");
+               return ret_val;
+       }
+
+       /* Bypass Rx and Tx FIFO's */
+       ret_val = e1000_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)
+               return ret_val;
+
+       ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
+                                      E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
+                                      &data);
+       if (ret_val)
+               return ret_val;
+       data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE;
+       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
+                                       E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
+                                       data);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1e_rphy(hw, GG82563_PHY_SPEC_CTRL_2, &data);
+       if (ret_val)
+               return ret_val;
+
+       data &= ~GG82563_PSCR2_REVERSE_AUTO_NEG;
+       ret_val = e1e_wphy(hw, GG82563_PHY_SPEC_CTRL_2, data);
+       if (ret_val)
+               return ret_val;
+
+       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)
+               return ret_val;
+
+       /*
+        * 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 (!e1000e_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)
+                       return ret_val;
+
+               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL, &data);
+               if (ret_val)
+                       return ret_val;
+
+               data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
+               ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, data);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /*
+        * 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)
+               return ret_val;
+
+       data |= GG82563_ICR_DIS_PADDING;
+       ret_val = e1e_wphy(hw, GG82563_PHY_INBAND_CTRL, data);
+       if (ret_val)
+               return ret_val;
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_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 = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4),
+                                                  0xFFFF);
+       if (ret_val)
+               return ret_val;
+       ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
+                                                 &reg_data);
+       if (ret_val)
+               return ret_val;
+       reg_data |= 0x3F;
+       ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
+                                                  reg_data);
+       if (ret_val)
+               return ret_val;
+       ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
+                                     E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+                                     &reg_data);
+       if (ret_val)
+               return ret_val;
+       reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING;
+       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
+                                       E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+                                       reg_data);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000_copper_link_setup_gg82563_80003es2lan(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000e_setup_copper_link(hw);
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       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)
+                       return ret_val;
+
+               if (speed == SPEED_1000)
+                       ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw);
+               else
+                       ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, duplex);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
+{
+       s32 ret_val;
+       u32 tipg;
+       u32 i = 0;
+       u16 reg_data, reg_data2;
+
+       reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;
+       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
+                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                      reg_data);
+       if (ret_val)
+               return ret_val;
+
+       /* 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)
+                       return ret_val;
+
+               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL, &reg_data2);
+               if (ret_val)
+                       return ret_val;
+               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);
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 reg_data, reg_data2;
+       u32 tipg;
+       u32 i = 0;
+
+       reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
+       ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
+                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+                                      reg_data);
+       if (ret_val)
+               return ret_val;
+
+       /* 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)
+                       return ret_val;
+
+               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL, &reg_data2);
+               if (ret_val)
+                       return ret_val;
+               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);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
+                                          u16 *data)
+{
+       u32 kmrnctrlsta;
+       s32 ret_val = 0;
+
+       ret_val = e1000_acquire_mac_csr_80003es2lan(hw);
+       if (ret_val)
+               return ret_val;
+
+       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
+                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
+       ew32(KMRNCTRLSTA, kmrnctrlsta);
+       e1e_flush();
+
+       udelay(2);
+
+       kmrnctrlsta = er32(KMRNCTRLSTA);
+       *data = (u16)kmrnctrlsta;
+
+       e1000_release_mac_csr_80003es2lan(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
+                                           u16 data)
+{
+       u32 kmrnctrlsta;
+       s32 ret_val = 0;
+
+       ret_val = e1000_acquire_mac_csr_80003es2lan(hw);
+       if (ret_val)
+               return ret_val;
+
+       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
+                      E1000_KMRNCTRLSTA_OFFSET) | data;
+       ew32(KMRNCTRLSTA, kmrnctrlsta);
+       e1e_flush();
+
+       udelay(2);
+
+       e1000_release_mac_csr_80003es2lan(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_read_mac_addr_80003es2lan - Read device MAC address
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+
+       /*
+        * If there's an alternate MAC address place it in RAR0
+        * so that it will override the Si installed default perm
+        * address.
+        */
+       ret_val = e1000_check_alt_mac_addr_generic(hw);
+       if (ret_val)
+               goto out;
+
+       ret_val = e1000_read_mac_addr_generic(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ * e1000_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 e1000_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) ||
+             hw->phy.ops.check_reset_block(hw)))
+               e1000_power_down_phy_copper(hw);
+}
+
+/**
+ *  e1000_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 e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
+{
+       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);
+}
+
+static struct e1000_mac_operations es2_mac_ops = {
+       .read_mac_addr          = e1000_read_mac_addr_80003es2lan,
+       .id_led_init            = e1000e_id_led_init,
+       .blink_led              = e1000e_blink_led_generic,
+       .check_mng_mode         = e1000e_check_mng_mode_generic,
+       /* check_for_link dependent on media type */
+       .cleanup_led            = e1000e_cleanup_led_generic,
+       .clear_hw_cntrs         = e1000_clear_hw_cntrs_80003es2lan,
+       .get_bus_info           = e1000e_get_bus_info_pcie,
+       .set_lan_id             = e1000_set_lan_id_multi_port_pcie,
+       .get_link_up_info       = e1000_get_link_up_info_80003es2lan,
+       .led_on                 = e1000e_led_on_generic,
+       .led_off                = e1000e_led_off_generic,
+       .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
+       .write_vfta             = e1000_write_vfta_generic,
+       .clear_vfta             = e1000_clear_vfta_generic,
+       .reset_hw               = e1000_reset_hw_80003es2lan,
+       .init_hw                = e1000_init_hw_80003es2lan,
+       .setup_link             = e1000e_setup_link,
+       /* setup_physical_interface dependent on media type */
+       .setup_led              = e1000e_setup_led_generic,
+};
+
+static struct e1000_phy_operations es2_phy_ops = {
+       .acquire                = e1000_acquire_phy_80003es2lan,
+       .check_polarity         = e1000_check_polarity_m88,
+       .check_reset_block      = e1000e_check_reset_block_generic,
+       .commit                 = e1000e_phy_sw_reset,
+       .force_speed_duplex     = e1000_phy_force_speed_duplex_80003es2lan,
+       .get_cfg_done           = e1000_get_cfg_done_80003es2lan,
+       .get_cable_length       = e1000_get_cable_length_80003es2lan,
+       .get_info               = e1000e_get_phy_info_m88,
+       .read_reg               = e1000_read_phy_reg_gg82563_80003es2lan,
+       .release                = e1000_release_phy_80003es2lan,
+       .reset                  = e1000e_phy_hw_reset_generic,
+       .set_d0_lplu_state      = NULL,
+       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
+       .write_reg              = e1000_write_phy_reg_gg82563_80003es2lan,
+       .cfg_on_link_up         = e1000_cfg_on_link_up_80003es2lan,
+};
+
+static struct e1000_nvm_operations es2_nvm_ops = {
+       .acquire                = e1000_acquire_nvm_80003es2lan,
+       .read                   = e1000e_read_nvm_eerd,
+       .release                = e1000_release_nvm_80003es2lan,
+       .update                 = e1000e_update_nvm_checksum_generic,
+       .valid_led_default      = e1000e_valid_led_default,
+       .validate               = e1000e_validate_nvm_checksum_generic,
+       .write                  = e1000_write_nvm_80003es2lan,
+};
+
+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,
+       .flags2                 = FLAG2_DMA_BURST,
+       .pba                    = 38,
+       .max_hw_frame_size      = DEFAULT_JUMBO,
+       .get_variants           = e1000_get_variants_80003es2lan,
+       .mac_ops                = &es2_mac_ops,
+       .phy_ops                = &es2_phy_ops,
+       .nvm_ops                = &es2_nvm_ops,
+};
+
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
new file mode 100644 (file)
index 0000000..480f259
--- /dev/null
@@ -0,0 +1,2115 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+/*
+ * 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
+ * 82583V Gigabit Network Connection
+ */
+
+#include "e1000.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
+#define AN_RETRY_COUNT          5 /* Autoneg Retry Count value */
+#define E1000_BASE1000T_STATUS          10
+#define E1000_IDLE_ERROR_COUNT_MASK     0xFF
+#define E1000_RECEIVE_ERROR_COUNTER     21
+#define E1000_RECEIVE_ERROR_MAX         0xFFFF
+
+#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */
+
+static s32 e1000_get_phy_id_82571(struct e1000_hw *hw);
+static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw);
+static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw);
+static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw);
+static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
+                                     u16 words, u16 *data);
+static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw);
+static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw);
+static s32 e1000_setup_link_82571(struct e1000_hw *hw);
+static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw);
+static void e1000_clear_vfta_82571(struct e1000_hw *hw);
+static bool e1000_check_mng_mode_82574(struct e1000_hw *hw);
+static s32 e1000_led_on_82574(struct e1000_hw *hw);
+static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw);
+static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw);
+static void e1000_put_hw_semaphore_82573(struct e1000_hw *hw);
+static s32 e1000_get_hw_semaphore_82574(struct e1000_hw *hw);
+static void e1000_put_hw_semaphore_82574(struct e1000_hw *hw);
+static s32 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active);
+static s32 e1000_set_d3_lplu_state_82574(struct e1000_hw *hw, bool active);
+
+/**
+ *  e1000_init_phy_params_82571 - Init PHY func ptrs.
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+
+       if (hw->phy.media_type != e1000_media_type_copper) {
+               phy->type = e1000_phy_none;
+               return 0;
+       }
+
+       phy->addr                        = 1;
+       phy->autoneg_mask                = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+       phy->reset_delay_us              = 100;
+
+       phy->ops.power_up                = e1000_power_up_phy_copper;
+       phy->ops.power_down              = e1000_power_down_phy_copper_82571;
+
+       switch (hw->mac.type) {
+       case e1000_82571:
+       case e1000_82572:
+               phy->type                = e1000_phy_igp_2;
+               break;
+       case e1000_82573:
+               phy->type                = e1000_phy_m88;
+               break;
+       case e1000_82574:
+       case e1000_82583:
+               phy->type                = e1000_phy_bm;
+               phy->ops.acquire = e1000_get_hw_semaphore_82574;
+               phy->ops.release = e1000_put_hw_semaphore_82574;
+               phy->ops.set_d0_lplu_state = e1000_set_d0_lplu_state_82574;
+               phy->ops.set_d3_lplu_state = e1000_set_d3_lplu_state_82574;
+               break;
+       default:
+               return -E1000_ERR_PHY;
+               break;
+       }
+
+       /* This can only be done after all function pointers are setup. */
+       ret_val = e1000_get_phy_id_82571(hw);
+       if (ret_val) {
+               e_dbg("Error getting PHY ID\n");
+               return ret_val;
+       }
+
+       /* Verify phy id */
+       switch (hw->mac.type) {
+       case e1000_82571:
+       case e1000_82572:
+               if (phy->id != IGP01E1000_I_PHY_ID)
+                       ret_val = -E1000_ERR_PHY;
+               break;
+       case e1000_82573:
+               if (phy->id != M88E1111_I_PHY_ID)
+                       ret_val = -E1000_ERR_PHY;
+               break;
+       case e1000_82574:
+       case e1000_82583:
+               if (phy->id != BME1000_E_PHY_ID_R2)
+                       ret_val = -E1000_ERR_PHY;
+               break;
+       default:
+               ret_val = -E1000_ERR_PHY;
+               break;
+       }
+
+       if (ret_val)
+               e_dbg("PHY ID unknown: type = 0x%08x\n", phy->id);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_init_nvm_params_82571 - Init NVM func ptrs.
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_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 */
+       switch (hw->mac.type) {
+       case e1000_82574:
+       case e1000_82583:
+               nvm->ops.acquire = e1000_get_hw_semaphore_82574;
+               nvm->ops.release = e1000_put_hw_semaphore_82574;
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_init_mac_params_82571 - Init MAC func ptrs.
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_mac_info *mac = &hw->mac;
+       struct e1000_mac_operations *func = &mac->ops;
+       u32 swsm = 0;
+       u32 swsm2 = 0;
+       bool force_clear_smbi = false;
+
+       /* Set media type */
+       switch (adapter->pdev->device) {
+       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_82572EI_SERDES:
+       case E1000_DEV_ID_82571EB_SERDES_DUAL:
+       case E1000_DEV_ID_82571EB_SERDES_QUAD:
+               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;
+       /* Adaptive IFS supported */
+       mac->adaptive_ifs = true;
+
+       /* check for link */
+       switch (hw->phy.media_type) {
+       case e1000_media_type_copper:
+               func->setup_physical_interface = e1000_setup_copper_link_82571;
+               func->check_for_link = e1000e_check_for_copper_link;
+               func->get_link_up_info = e1000e_get_speed_and_duplex_copper;
+               break;
+       case e1000_media_type_fiber:
+               func->setup_physical_interface =
+                       e1000_setup_fiber_serdes_link_82571;
+               func->check_for_link = e1000e_check_for_fiber_link;
+               func->get_link_up_info =
+                       e1000e_get_speed_and_duplex_fiber_serdes;
+               break;
+       case e1000_media_type_internal_serdes:
+               func->setup_physical_interface =
+                       e1000_setup_fiber_serdes_link_82571;
+               func->check_for_link = e1000_check_for_serdes_link_82571;
+               func->get_link_up_info =
+                       e1000e_get_speed_and_duplex_fiber_serdes;
+               break;
+       default:
+               return -E1000_ERR_CONFIG;
+               break;
+       }
+
+       switch (hw->mac.type) {
+       case e1000_82573:
+               func->set_lan_id = e1000_set_lan_id_single_port;
+               func->check_mng_mode = e1000e_check_mng_mode_generic;
+               func->led_on = e1000e_led_on_generic;
+               func->blink_led = e1000e_blink_led_generic;
+
+               /* FWSM register */
+               mac->has_fwsm = true;
+               /*
+                * ARC supported; valid only if manageability features are
+                * enabled.
+                */
+               mac->arc_subsystem_valid =
+                       (er32(FWSM) & E1000_FWSM_MODE_MASK)
+                       ? true : false;
+               break;
+       case e1000_82574:
+       case e1000_82583:
+               func->set_lan_id = e1000_set_lan_id_single_port;
+               func->check_mng_mode = e1000_check_mng_mode_82574;
+               func->led_on = e1000_led_on_82574;
+               break;
+       default:
+               func->check_mng_mode = e1000e_check_mng_mode_generic;
+               func->led_on = e1000e_led_on_generic;
+               func->blink_led = e1000e_blink_led_generic;
+
+               /* FWSM register */
+               mac->has_fwsm = true;
+               break;
+       }
+
+       /*
+        * Ensure that the inter-port SWSM.SMBI lock bit is clear before
+        * first NVM or PHY access. 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);
+       }
+
+       /*
+        * Initialize device specific counter of SMBI acquisition
+        * timeouts.
+        */
+        hw->dev_spec.e82571.smb_counter = 0;
+
+       return 0;
+}
+
+static s32 e1000_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_dev *pdev = adapter->pdev;
+       int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1;
+       s32 rc;
+
+       rc = e1000_init_mac_params_82571(adapter);
+       if (rc)
+               return rc;
+
+       rc = e1000_init_nvm_params_82571(hw);
+       if (rc)
+               return rc;
+
+       rc = e1000_init_phy_params_82571(hw);
+       if (rc)
+               return rc;
+
+       /* 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) {
+                       adapter->flags |= FLAG_HAS_JUMBO_FRAMES;
+                       adapter->max_hw_frame_size = DEFAULT_JUMBO;
+               }
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_get_phy_id_82571(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       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:
+               return e1000e_get_phy_id(hw);
+               break;
+       case e1000_82574:
+       case e1000_82583:
+               ret_val = e1e_rphy(hw, PHY_ID1, &phy_id);
+               if (ret_val)
+                       return ret_val;
+
+               phy->id = (u32)(phy_id << 16);
+               udelay(20);
+               ret_val = e1e_rphy(hw, PHY_ID2, &phy_id);
+               if (ret_val)
+                       return ret_val;
+
+               phy->id |= (u32)(phy_id);
+               phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+               break;
+       default:
+               return -E1000_ERR_PHY;
+               break;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_get_hw_semaphore_82571 - Acquire hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire the HW semaphore to access the PHY or NVM
+ **/
+static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
+{
+       u32 swsm;
+       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.e82571.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.e82571.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 */
+               e1000_put_hw_semaphore_82571(hw);
+               e_dbg("Driver can't access the NVM\n");
+               return -E1000_ERR_NVM;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_put_hw_semaphore_82571 - Release hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Release hardware semaphore used to access the PHY or NVM
+ **/
+static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw)
+{
+       u32 swsm;
+
+       swsm = er32(SWSM);
+       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
+       ew32(SWSM, swsm);
+}
+/**
+ *  e1000_get_hw_semaphore_82573 - Acquire hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire the HW semaphore during reset.
+ *
+ **/
+static s32 e1000_get_hw_semaphore_82573(struct e1000_hw *hw)
+{
+       u32 extcnf_ctrl;
+       s32 ret_val = 0;
+       s32 i = 0;
+
+       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;
+
+               usleep_range(2000, 4000);
+               i++;
+       } while (i < MDIO_OWNERSHIP_TIMEOUT);
+
+       if (i == MDIO_OWNERSHIP_TIMEOUT) {
+               /* Release semaphores */
+               e1000_put_hw_semaphore_82573(hw);
+               e_dbg("Driver can't access the PHY\n");
+               ret_val = -E1000_ERR_PHY;
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_put_hw_semaphore_82573 - Release hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Release hardware semaphore used during reset.
+ *
+ **/
+static void e1000_put_hw_semaphore_82573(struct e1000_hw *hw)
+{
+       u32 extcnf_ctrl;
+
+       extcnf_ctrl = er32(EXTCNF_CTRL);
+       extcnf_ctrl &= ~E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
+       ew32(EXTCNF_CTRL, extcnf_ctrl);
+}
+
+static DEFINE_MUTEX(swflag_mutex);
+
+/**
+ *  e1000_get_hw_semaphore_82574 - Acquire hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire the HW semaphore to access the PHY or NVM.
+ *
+ **/
+static s32 e1000_get_hw_semaphore_82574(struct e1000_hw *hw)
+{
+       s32 ret_val;
+
+       mutex_lock(&swflag_mutex);
+       ret_val = e1000_get_hw_semaphore_82573(hw);
+       if (ret_val)
+               mutex_unlock(&swflag_mutex);
+       return ret_val;
+}
+
+/**
+ *  e1000_put_hw_semaphore_82574 - Release hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Release hardware semaphore used to access the PHY or NVM
+ *
+ **/
+static void e1000_put_hw_semaphore_82574(struct e1000_hw *hw)
+{
+       e1000_put_hw_semaphore_82573(hw);
+       mutex_unlock(&swflag_mutex);
+}
+
+/**
+ *  e1000_set_d0_lplu_state_82574 - 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.
+ *  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 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active)
+{
+       u16 data = er32(POEMB);
+
+       if (active)
+               data |= E1000_PHY_CTRL_D0A_LPLU;
+       else
+               data &= ~E1000_PHY_CTRL_D0A_LPLU;
+
+       ew32(POEMB, data);
+       return 0;
+}
+
+/**
+ *  e1000_set_d3_lplu_state_82574 - Sets low power link up state for D3
+ *  @hw: pointer to the HW structure
+ *  @active: boolean used to enable/disable lplu
+ *
+ *  The low power link up (lplu) state is set to the power management level D3
+ *  when active is true, else clear lplu for D3. 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_82574(struct e1000_hw *hw, bool active)
+{
+       u16 data = er32(POEMB);
+
+       if (!active) {
+               data &= ~E1000_PHY_CTRL_NOND0A_LPLU;
+       } else if ((hw->phy.autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
+                  (hw->phy.autoneg_advertised == E1000_ALL_NOT_GIG) ||
+                  (hw->phy.autoneg_advertised == E1000_ALL_10_SPEED)) {
+               data |= E1000_PHY_CTRL_NOND0A_LPLU;
+       }
+
+       ew32(POEMB, data);
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_acquire_nvm_82571(struct e1000_hw *hw)
+{
+       s32 ret_val;
+
+       ret_val = e1000_get_hw_semaphore_82571(hw);
+       if (ret_val)
+               return ret_val;
+
+       switch (hw->mac.type) {
+       case e1000_82573:
+               break;
+       default:
+               ret_val = e1000e_acquire_nvm(hw);
+               break;
+       }
+
+       if (ret_val)
+               e1000_put_hw_semaphore_82571(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_release_nvm_82571(struct e1000_hw *hw)
+{
+       e1000e_release_nvm(hw);
+       e1000_put_hw_semaphore_82571(hw);
+}
+
+/**
+ *  e1000_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 e1000_write_nvm_82571(struct e1000_hw *hw, u16 offset, u16 words,
+                                u16 *data)
+{
+       s32 ret_val;
+
+       switch (hw->mac.type) {
+       case e1000_82573:
+       case e1000_82574:
+       case e1000_82583:
+               ret_val = e1000_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;
+}
+
+/**
+ *  e1000_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 e1000_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)
+               return ret_val;
+
+       /*
+        * 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)
+               return ret_val;
+
+       /* Check for pending operations. */
+       for (i = 0; i < E1000_FLASH_UPDATES; i++) {
+               usleep_range(1000, 2000);
+               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+                       break;
+       }
+
+       if (i == E1000_FLASH_UPDATES)
+               return -E1000_ERR_NVM;
+
+       /* 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++) {
+               usleep_range(1000, 2000);
+               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+                       break;
+       }
+
+       if (i == E1000_FLASH_UPDATES)
+               return -E1000_ERR_NVM;
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_validate_nvm_checksum_82571(struct e1000_hw *hw)
+{
+       if (hw->nvm.type == e1000_nvm_flash_hw)
+               e1000_fix_nvm_checksum_82571(hw);
+
+       return e1000e_validate_nvm_checksum_generic(hw);
+}
+
+/**
+ *  e1000_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 e1000_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");
+               return -E1000_ERR_NVM;
+       }
+
+       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;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_get_cfg_done_82571(struct e1000_hw *hw)
+{
+       s32 timeout = PHY_CFG_TIMEOUT;
+
+       while (timeout) {
+               if (er32(EEMNGCTL) &
+                   E1000_NVM_CFG_DONE_PORT_0)
+                       break;
+               usleep_range(1000, 2000);
+               timeout--;
+       }
+       if (!timeout) {
+               e_dbg("MNG configuration cycle has not completed.\n");
+               return -E1000_ERR_RESET;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 data;
+
+       ret_val = e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &data);
+       if (ret_val)
+               return ret_val;
+
+       if (active) {
+               data |= IGP02E1000_PM_D0_LPLU;
+               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, data);
+               if (ret_val)
+                       return ret_val;
+
+               /* 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)
+                       return ret_val;
+       } 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)
+                               return ret_val;
+
+                       data |= IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               } else if (phy->smart_speed == e1000_smart_speed_off) {
+                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          &data);
+                       if (ret_val)
+                               return ret_val;
+
+                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_reset_hw_82571 - Reset hardware
+ *  @hw: pointer to the HW structure
+ *
+ *  This resets the hardware into a known state.
+ **/
+static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
+{
+       u32 ctrl, ctrl_ext;
+       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();
+
+       usleep_range(10000, 20000);
+
+       /*
+        * Must acquire the MDIO ownership before MAC reset.
+        * Ownership defaults to firmware after a reset.
+        */
+       switch (hw->mac.type) {
+       case e1000_82573:
+               ret_val = e1000_get_hw_semaphore_82573(hw);
+               break;
+       case e1000_82574:
+       case e1000_82583:
+               ret_val = e1000_get_hw_semaphore_82574(hw);
+               break;
+       default:
+               break;
+       }
+       if (ret_val)
+               e_dbg("Cannot acquire MDIO ownership\n");
+
+       ctrl = er32(CTRL);
+
+       e_dbg("Issuing a global reset to MAC\n");
+       ew32(CTRL, ctrl | E1000_CTRL_RST);
+
+       /* Must release MDIO ownership and mutex after MAC reset. */
+       switch (hw->mac.type) {
+       case e1000_82574:
+       case e1000_82583:
+               e1000_put_hw_semaphore_82574(hw);
+               break;
+       default:
+               break;
+       }
+
+       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. */
+               return ret_val;
+
+       /*
+        * 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_82573:
+       case e1000_82574:
+       case e1000_82583:
+               msleep(25);
+               break;
+       default:
+               break;
+       }
+
+       /* Clear any pending interrupt events. */
+       ew32(IMC, 0xffffffff);
+       er32(ICR);
+
+       if (hw->mac.type == e1000_82571) {
+               /* Install any alternate MAC address into RAR0 */
+               ret_val = e1000_check_alt_mac_addr_generic(hw);
+               if (ret_val)
+                       return ret_val;
+
+               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;
+
+       return 0;
+}
+
+/**
+ *  e1000_init_hw_82571 - Initialize hardware
+ *  @hw: pointer to the HW structure
+ *
+ *  This inits the hardware readying it for operation.
+ **/
+static s32 e1000_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;
+
+       e1000_initialize_hw_bits_82571(hw);
+
+       /* Initialize identification LED */
+       ret_val = e1000e_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");
+       mac->ops.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 = e1000_setup_link_82571(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_82573:
+               e1000e_enable_tx_pkt_filtering(hw);
+               /* fall through */
+       case e1000_82574:
+       case e1000_82583:
+               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.
+        */
+       e1000_clear_hw_cntrs_82571(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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_82573:
+       case e1000_82574:
+       case e1000_82583:
+               reg = er32(CTRL);
+               reg &= ~(1 << 29);
+               ew32(CTRL, reg);
+               break;
+       default:
+               break;
+       }
+
+       /* Extended Device Control */
+       switch (hw->mac.type) {
+       case e1000_82573:
+       case e1000_82574:
+       case e1000_82583:
+               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;
+       }
+}
+
+/**
+ *  e1000_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 e1000_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_82573:
+       case e1000_82574:
+       case e1000_82583:
+               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);
+               }
+               break;
+       default:
+               break;
+       }
+       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();
+       }
+}
+
+/**
+ *  e1000_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 e1000_check_mng_mode_82574(struct e1000_hw *hw)
+{
+       u16 data;
+
+       e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+       return (data & E1000_NVM_INIT_CTRL2_MNGM) != 0;
+}
+
+/**
+ *  e1000_led_on_82574 - Turn LED on
+ *  @hw: pointer to the HW structure
+ *
+ *  Turn LED on.
+ **/
+static s32 e1000_led_on_82574(struct e1000_hw *hw)
+{
+       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);
+
+       return 0;
+}
+
+/**
+ *  e1000_check_phy_82574 - check 82574 phy hung state
+ *  @hw: pointer to the HW structure
+ *
+ *  Returns whether phy is hung or not
+ **/
+bool e1000_check_phy_82574(struct e1000_hw *hw)
+{
+       u16 status_1kbt = 0;
+       u16 receive_errors = 0;
+       bool phy_hung = false;
+       s32 ret_val = 0;
+
+       /*
+        * Read PHY Receive Error counter first, if its is max - all F's then
+        * read the Base1000T status register If both are max then PHY is hung.
+        */
+       ret_val = e1e_rphy(hw, E1000_RECEIVE_ERROR_COUNTER, &receive_errors);
+
+       if (ret_val)
+               goto out;
+       if (receive_errors == E1000_RECEIVE_ERROR_MAX)  {
+               ret_val = e1e_rphy(hw, E1000_BASE1000T_STATUS, &status_1kbt);
+               if (ret_val)
+                       goto out;
+               if ((status_1kbt & E1000_IDLE_ERROR_COUNT_MASK) ==
+                   E1000_IDLE_ERROR_COUNT_MASK)
+                       phy_hung = true;
+       }
+out:
+       return phy_hung;
+}
+
+/**
+ *  e1000_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 e1000_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_82573:
+       case e1000_82574:
+       case e1000_82583:
+               if (hw->fc.requested_mode == e1000_fc_default)
+                       hw->fc.requested_mode = e1000_fc_full;
+               break;
+       default:
+               break;
+       }
+
+       return e1000e_setup_link(hw);
+}
+
+/**
+ *  e1000_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 e1000_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:
+               return -E1000_ERR_PHY;
+               break;
+       }
+
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000e_setup_copper_link(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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);
+}
+
+/**
+ *  e1000_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 autonegotiation. 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 successfully autonegotiated)
+ *  4) forced_up (the link has been forced up, it did not autonegotiate)
+ *
+ **/
+static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       u32 rxcw;
+       u32 ctrl;
+       u32 status;
+       u32 txcw;
+       u32 i;
+       s32 ret_val = 0;
+
+       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");
+                       } else {
+                               mac->serdes_has_link = true;
+                       }
+                       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 the partner code word is null, stop forcing
+                        * and restart auto negotiation.
+                        */
+                       if ((rxcw & E1000_RXCW_C) || !(rxcw & E1000_RXCW_CW))  {
+                               /* 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");
+                       } else {
+                               mac->serdes_has_link = true;
+                       }
+                       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;
+                       mac->serdes_has_link = false;
+                       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 {
+                       /*
+                        * Check several times, if Sync and Config
+                        * both are consistently 1 then simply ignore
+                        * the Invalid bit and restart Autoneg
+                        */
+                       for (i = 0; i < AN_RETRY_COUNT; i++) {
+                               udelay(10);
+                               rxcw = er32(RXCW);
+                               if ((rxcw & E1000_RXCW_IV) &&
+                                   !((rxcw & E1000_RXCW_SYNCH) &&
+                                     (rxcw & E1000_RXCW_C))) {
+                                       mac->serdes_has_link = false;
+                                       mac->serdes_link_state =
+                                           e1000_serdes_link_down;
+                                       e_dbg("ANYSTATE  -> DOWN\n");
+                                       break;
+                               }
+                       }
+
+                       if (i == AN_RETRY_COUNT) {
+                               txcw = er32(TXCW);
+                               txcw |= E1000_TXCW_ANE;
+                               ew32(TXCW, txcw);
+                               mac->serdes_link_state =
+                                   e1000_serdes_link_autoneg_progress;
+                               mac->serdes_has_link = false;
+                               e_dbg("ANYSTATE  -> AN_PROG\n");
+                       }
+               }
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data)
+{
+       s32 ret_val;
+
+       ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
+       if (ret_val) {
+               e_dbg("NVM Read Error\n");
+               return ret_val;
+       }
+
+       switch (hw->mac.type) {
+       case e1000_82573:
+       case e1000_82574:
+       case e1000_82583:
+               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;
+       }
+
+       return 0;
+}
+
+/**
+ *  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.e82571.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.e82571.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);
+}
+
+/**
+ *  e1000_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 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw)
+{
+       struct e1000_nvm_info *nvm = &hw->nvm;
+       s32 ret_val;
+       u16 data;
+
+       if (nvm->type != e1000_nvm_flash_hw)
+               return 0;
+
+       /*
+        * Check bit 4 of word 10h.  If it is 0, firmware is done updating
+        * 10h-12h.  Checksum may need to be fixed.
+        */
+       ret_val = e1000_read_nvm(hw, 0x10, 1, &data);
+       if (ret_val)
+               return ret_val;
+
+       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 = e1000_read_nvm(hw, 0x23, 1, &data);
+               if (ret_val)
+                       return ret_val;
+
+               if (!(data & 0x8000)) {
+                       data |= 0x8000;
+                       ret_val = e1000_write_nvm(hw, 0x23, 1, &data);
+                       if (ret_val)
+                               return ret_val;
+                       ret_val = e1000e_update_nvm_checksum(hw);
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_read_mac_addr_82571 - Read device MAC address
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_read_mac_addr_82571(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+
+       if (hw->mac.type == e1000_82571) {
+               /*
+                * If there's an alternate MAC address place it in RAR0
+                * so that it will override the Si installed default perm
+                * address.
+                */
+               ret_val = e1000_check_alt_mac_addr_generic(hw);
+               if (ret_val)
+                       goto out;
+       }
+
+       ret_val = e1000_read_mac_addr_generic(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ * e1000_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 e1000_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) || phy->ops.check_reset_block(hw)))
+               e1000_power_down_phy_copper(hw);
+}
+
+/**
+ *  e1000_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 e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
+{
+       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);
+}
+
+static struct e1000_mac_operations e82571_mac_ops = {
+       /* .check_mng_mode: mac type dependent */
+       /* .check_for_link: media type dependent */
+       .id_led_init            = e1000e_id_led_init,
+       .cleanup_led            = e1000e_cleanup_led_generic,
+       .clear_hw_cntrs         = e1000_clear_hw_cntrs_82571,
+       .get_bus_info           = e1000e_get_bus_info_pcie,
+       .set_lan_id             = e1000_set_lan_id_multi_port_pcie,
+       /* .get_link_up_info: media type dependent */
+       /* .led_on: mac type dependent */
+       .led_off                = e1000e_led_off_generic,
+       .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
+       .write_vfta             = e1000_write_vfta_generic,
+       .clear_vfta             = e1000_clear_vfta_82571,
+       .reset_hw               = e1000_reset_hw_82571,
+       .init_hw                = e1000_init_hw_82571,
+       .setup_link             = e1000_setup_link_82571,
+       /* .setup_physical_interface: media type dependent */
+       .setup_led              = e1000e_setup_led_generic,
+       .read_mac_addr          = e1000_read_mac_addr_82571,
+};
+
+static struct e1000_phy_operations e82_phy_ops_igp = {
+       .acquire                = e1000_get_hw_semaphore_82571,
+       .check_polarity         = e1000_check_polarity_igp,
+       .check_reset_block      = e1000e_check_reset_block_generic,
+       .commit                 = NULL,
+       .force_speed_duplex     = e1000e_phy_force_speed_duplex_igp,
+       .get_cfg_done           = e1000_get_cfg_done_82571,
+       .get_cable_length       = e1000e_get_cable_length_igp_2,
+       .get_info               = e1000e_get_phy_info_igp,
+       .read_reg               = e1000e_read_phy_reg_igp,
+       .release                = e1000_put_hw_semaphore_82571,
+       .reset                  = e1000e_phy_hw_reset_generic,
+       .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
+       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
+       .write_reg              = e1000e_write_phy_reg_igp,
+       .cfg_on_link_up         = NULL,
+};
+
+static struct e1000_phy_operations e82_phy_ops_m88 = {
+       .acquire                = e1000_get_hw_semaphore_82571,
+       .check_polarity         = e1000_check_polarity_m88,
+       .check_reset_block      = e1000e_check_reset_block_generic,
+       .commit                 = e1000e_phy_sw_reset,
+       .force_speed_duplex     = e1000e_phy_force_speed_duplex_m88,
+       .get_cfg_done           = e1000e_get_cfg_done,
+       .get_cable_length       = e1000e_get_cable_length_m88,
+       .get_info               = e1000e_get_phy_info_m88,
+       .read_reg               = e1000e_read_phy_reg_m88,
+       .release                = e1000_put_hw_semaphore_82571,
+       .reset                  = e1000e_phy_hw_reset_generic,
+       .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
+       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
+       .write_reg              = e1000e_write_phy_reg_m88,
+       .cfg_on_link_up         = NULL,
+};
+
+static struct e1000_phy_operations e82_phy_ops_bm = {
+       .acquire                = e1000_get_hw_semaphore_82571,
+       .check_polarity         = e1000_check_polarity_m88,
+       .check_reset_block      = e1000e_check_reset_block_generic,
+       .commit                 = e1000e_phy_sw_reset,
+       .force_speed_duplex     = e1000e_phy_force_speed_duplex_m88,
+       .get_cfg_done           = e1000e_get_cfg_done,
+       .get_cable_length       = e1000e_get_cable_length_m88,
+       .get_info               = e1000e_get_phy_info_m88,
+       .read_reg               = e1000e_read_phy_reg_bm2,
+       .release                = e1000_put_hw_semaphore_82571,
+       .reset                  = e1000e_phy_hw_reset_generic,
+       .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
+       .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
+       .write_reg              = e1000e_write_phy_reg_bm2,
+       .cfg_on_link_up         = NULL,
+};
+
+static struct e1000_nvm_operations e82571_nvm_ops = {
+       .acquire                = e1000_acquire_nvm_82571,
+       .read                   = e1000e_read_nvm_eerd,
+       .release                = e1000_release_nvm_82571,
+       .update                 = e1000_update_nvm_checksum_82571,
+       .valid_led_default      = e1000_valid_led_default_82571,
+       .validate               = e1000_validate_nvm_checksum_82571,
+       .write                  = e1000_write_nvm_82571,
+};
+
+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,
+       .flags2                 = FLAG2_DISABLE_ASPM_L1 /* errata 13 */
+                                 | FLAG2_DMA_BURST,
+       .pba                    = 38,
+       .max_hw_frame_size      = DEFAULT_JUMBO,
+       .get_variants           = e1000_get_variants_82571,
+       .mac_ops                = &e82571_mac_ops,
+       .phy_ops                = &e82_phy_ops_igp,
+       .nvm_ops                = &e82571_nvm_ops,
+};
+
+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 */
+       .flags2                 = FLAG2_DISABLE_ASPM_L1 /* errata 13 */
+                                 | FLAG2_DMA_BURST,
+       .pba                    = 38,
+       .max_hw_frame_size      = DEFAULT_JUMBO,
+       .get_variants           = e1000_get_variants_82571,
+       .mac_ops                = &e82571_mac_ops,
+       .phy_ops                = &e82_phy_ops_igp,
+       .nvm_ops                = &e82571_nvm_ops,
+};
+
+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_SWSM_ON_LOAD,
+       .flags2                 = FLAG2_DISABLE_ASPM_L1
+                                 | FLAG2_DISABLE_ASPM_L0S,
+       .pba                    = 20,
+       .max_hw_frame_size      = ETH_FRAME_LEN + ETH_FCS_LEN,
+       .get_variants           = e1000_get_variants_82571,
+       .mac_ops                = &e82571_mac_ops,
+       .phy_ops                = &e82_phy_ops_m88,
+       .nvm_ops                = &e82571_nvm_ops,
+};
+
+struct e1000_info e1000_82574_info = {
+       .mac                    = e1000_82574,
+       .flags                  = FLAG_HAS_HW_VLAN_FILTER
+                                 | FLAG_HAS_MSIX
+                                 | 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,
+       .flags2                   = FLAG2_CHECK_PHY_HANG
+                                 | FLAG2_DISABLE_ASPM_L0S,
+       .pba                    = 32,
+       .max_hw_frame_size      = DEFAULT_JUMBO,
+       .get_variants           = e1000_get_variants_82571,
+       .mac_ops                = &e82571_mac_ops,
+       .phy_ops                = &e82_phy_ops_bm,
+       .nvm_ops                = &e82571_nvm_ops,
+};
+
+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_JUMBO_FRAMES
+                                 | FLAG_HAS_CTRLEXT_ON_LOAD,
+       .flags2                 = FLAG2_DISABLE_ASPM_L0S,
+       .pba                    = 32,
+       .max_hw_frame_size      = DEFAULT_JUMBO,
+       .get_variants           = e1000_get_variants_82571,
+       .mac_ops                = &e82571_mac_ops,
+       .phy_ops                = &e82_phy_ops_bm,
+       .nvm_ops                = &e82571_nvm_ops,
+};
+
diff --git a/drivers/net/ethernet/intel/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile
new file mode 100644 (file)
index 0000000..948c05d
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#
+# Intel PRO/1000 Linux driver
+# Copyright(c) 1999 - 2011 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
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) PRO/1000 ethernet driver
+#
+
+obj-$(CONFIG_E1000E) += e1000e.o
+
+e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
+              lib.o phy.o param.o ethtool.o netdev.o
+
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
new file mode 100644 (file)
index 0000000..c516a74
--- /dev/null
@@ -0,0 +1,844 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_DEFINES_H_
+#define _E1000_DEFINES_H_
+
+#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 */
+
+/* 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_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 */
+
+/* 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
+
+/* Extended Device Control */
+#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
+#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
+#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_PCIE_SERDES  0x00C00000
+#define E1000_CTRL_EXT_EIAME          0x01000000
+#define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
+#define E1000_CTRL_EXT_IAME           0x08000000 /* Interrupt acknowledge Auto-mask */
+#define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000 /* Clear Interrupt timers after IMS clear */
+#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
+#define E1000_CTRL_EXT_LSECCK         0x00001000
+#define E1000_CTRL_EXT_PHYPDEN        0x00100000
+
+/* 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_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_RXE       0x80    /* Rx Data Error */
+#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
+
+#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_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_RXDPS_HDRSTAT_HDRSP              0x00008000
+
+/* Management Control */
+#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
+#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
+#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
+#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets 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
+
+#define E1000_MANC2H_PORT_623    0x00000020 /* Port 0x26f */
+#define E1000_MANC2H_PORT_664    0x00000040 /* Port 0x298 */
+#define E1000_MDEF_PORT_623      0x00000800 /* Port 0x26f */
+#define E1000_MDEF_PORT_664      0x00000400 /* Port 0x298 */
+
+/* Receive Control */
+#define E1000_RCTL_EN             0x00000002    /* enable */
+#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
+#define E1000_RCTL_UPE            0x00000008    /* unicast promiscuous enable */
+#define E1000_RCTL_MPE            0x00000010    /* multicast promiscuous enab */
+#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_TCVR       0x000000C0    /* tcvr loopback mode */
+#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */
+#define E1000_RCTL_RDMTS_HALF     0x00000000    /* Rx desc min threshold size */
+#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
+#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */
+#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_PMCF           0x00800000    /* pass MAC control frames */
+#define E1000_RCTL_BSEX           0x02000000    /* Buffer size extension */
+#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
+
+/*
+ * 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   0x1
+#define E1000_SWFW_PHY0_SM  0x2
+#define E1000_SWFW_PHY1_SM  0x4
+#define E1000_SWFW_CSR_SM   0x8
+
+/* Device Control */
+#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
+#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master requests */
+#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
+#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_FRCSPD   0x00000800  /* Force Speed */
+#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
+#define E1000_CTRL_LANPHYPC_OVERRIDE 0x00010000 /* SW control of LANPHYPC */
+#define E1000_CTRL_LANPHYPC_VALUE    0x00020000 /* SW value of LANPHYPC */
+#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
+#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
+#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 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_VME      0x40000000  /* IEEE VLAN mode enable */
+#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
+
+/*
+ * Bit definitions for the Management Data IO (MDIO) and Management Data
+ * Clock (MDC) pins in the Device Control Register.
+ */
+
+/* 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_1     0x00000004      /* Function 1 */
+#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
+#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_PHYRA      0x00000400      /* PHY Reset Asserted */
+#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */
+
+/* Constants used to interpret the masked PCI-X bus speed. */
+
+#define HALF_DUPLEX 1
+#define FULL_DUPLEX 2
+
+
+#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_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_MASK               0x0000001F
+
+#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
+#define E1000_LEDCTL_LED0_MODE_SHIFT      0
+#define E1000_LEDCTL_LED0_IVRT            0x00000040
+#define E1000_LEDCTL_LED0_BLINK           0x00000080
+
+#define E1000_LEDCTL_MODE_LINK_UP       0x2
+#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_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 */
+
+/* Transmit Control */
+#define E1000_TCTL_EN     0x00000002    /* enable Tx */
+#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_RTLC   0x01000000    /* Re-transmit on late collision */
+#define E1000_TCTL_MULR   0x10000000    /* Multiple request support */
+
+/* Transmit Arbitration Count */
+
+/* SerDes Control */
+#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
+
+/* Receive Checksum Control */
+#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
+#define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
+
+/* Header split receive */
+#define E1000_RFCTL_NFSW_DIS            0x00000040
+#define E1000_RFCTL_NFSR_DIS            0x00000080
+#define E1000_RFCTL_ACK_DIS             0x00001000
+#define E1000_RFCTL_EXTEN               0x00008000
+#define E1000_RFCTL_IPV6_EX_DIS         0x00010000
+#define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000
+
+/* 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_COPPER 8
+
+#define E1000_TIPG_IPGT_MASK  0x000003FF
+
+#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
+
+#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_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_8K  0x0008    /* 8KB */
+#define E1000_PBA_16K 0x0010    /* 16KB */
+
+#define E1000_PBS_16K E1000_PBA_16K
+
+#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_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_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_RXT0          0x00000080 /* Rx timer intr (ring 0) */
+#define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver should claim the interrupt */
+#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 /* ECC correction enable */
+#define E1000_PBA_ECC_STAT_CLR      0x00000002 /* Clear ECC error counter */
+#define E1000_PBA_ECC_INT_EN        0x00000004 /* Enable ICR bit 5 for ECC */
+
+/*
+ * 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      /* Transmit desc written back */
+#define E1000_IMS_LSC       E1000_ICR_LSC       /* Link Status Change */
+#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */
+#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */
+#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* Rx timer intr */
+#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_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 */
+
+/* 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_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 desc. 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 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
+
+/* Error Codes */
+#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_INVALID_ARGUMENT  16
+#define E1000_ERR_NO_SPACE          17
+#define E1000_ERR_NVM_PBA_SECTION   18
+
+/* 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_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_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_ANE        0x80000000        /* Auto-neg enable */
+
+/* Receive Configuration Word */
+#define E1000_RXCW_CW         0x0000ffff        /* RxConfigWord mask */
+#define E1000_RXCW_IV         0x08000000        /* Receive config invalid */
+#define E1000_RXCW_C          0x20000000        /* Receive config */
+#define E1000_RXCW_SYNCH      0x40000000        /* Receive config synch */
+
+/* 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 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_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
+#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
+#define MII_CR_POWER_DOWN       0x0800  /* Power down */
+#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
+#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_LINK_STATUS       0x0004 /* Link Status 1 = link */
+#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
+
+/* Autoneg Advertisement Register */
+#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_PAUSE            0x0400   /* Pause operation desired */
+#define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
+
+/* Link Partner Ability Register (Base Page) */
+#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
+#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
+
+/* Autoneg Expansion Register */
+#define NWAY_ER_LP_NWAY_CAPS     0x0001 /* LP has Auto Neg Capability */
+
+/* 1000BASE-T Control Register */
+#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
+#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
+                                       /* 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 */
+
+/* 1000BASE-T Status Register */
+#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
+#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
+
+
+/* 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_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_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_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_FLUPD     0x00080000 /* Update FLASH */
+#define E1000_EECD_AUPDEN    0x00100000 /* Enable Autonomous FLASH update */
+#define E1000_EECD_SEC1VAL   0x00400000 /* Sector One Valid */
+#define E1000_EECD_SEC1VAL_VALID_MASK (E1000_EECD_AUTO_RD | E1000_EECD_PRES)
+
+#define E1000_NVM_RW_REG_DATA   16   /* Offset to data in NVM read/write registers */
+#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_INIT_CONTROL2_REG      0x000F
+#define NVM_INIT_CONTROL3_PORT_B   0x0014
+#define NVM_INIT_3GIO_3            0x001A
+#define NVM_INIT_CONTROL3_PORT_A   0x0024
+#define NVM_CFG                    0x0012
+#define NVM_ALT_MAC_ADDR_PTR       0x0037
+#define NVM_CHECKSUM_REG           0x003F
+
+#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */
+
+#define E1000_NVM_CFG_DONE_PORT_0  0x40000 /* MNG config cycle done */
+#define E1000_NVM_CFG_DONE_PORT_1  0x80000 /* ...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
+
+/* Mask bits for fields in Word 0x1a of the NVM */
+#define NVM_WORD1A_ASPM_MASK  0x000C
+
+/* Mask bits for fields in Word 0x03 of the EEPROM */
+#define NVM_COMPAT_LOM    0x0800
+
+/* length of string needed to store PBA number */
+#define E1000_PBANUM_LENGTH             11
+
+/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
+#define NVM_SUM                    0xBABA
+
+/* PBA (printed board assembly) number words */
+#define NVM_PBA_OFFSET_0           8
+#define NVM_PBA_OFFSET_1           9
+#define NVM_PBA_PTR_GUARD          0xFAFA
+#define NVM_WORD_SIZE_BASE_SHIFT   6
+
+/* 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_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
+
+/* SPI NVM Status Register */
+#define NVM_STATUS_RDY_SPI         0x01
+
+/* 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 PCI_HEADER_TYPE_MULTIFUNC    0x80
+#define PCIE_LINK_WIDTH_MASK         0x3F0
+#define PCIE_LINK_WIDTH_SHIFT        4
+
+#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 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
+
+/* 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_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
+
+#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
+#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
+
+/* M88E1000 PHY Specific Control Register */
+#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
+#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_ASSERT_CRS_ON_TX 0x0800 /* 1=Assert CRS on Transmit */
+
+/* M88E1000 PHY Specific Status Register */
+#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_SPEED              0xC000 /* Speed, bits 14:15 */
+#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
+
+#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
+
+/*
+ * 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
+/*
+ * 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_1X    0x0100
+#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
+
+/* M88EC018 Rev 2 specific DownShift settings */
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
+
+#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 */
+
+
+#define PHY_PAGE_SHIFT 5
+#define PHY_REG(page, reg) (((page) << PHY_PAGE_SHIFT) | \
+                           ((reg) & MAX_PHY_REG_ADDRESS))
+
+/*
+ * 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_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_MAC_SPEC_CTRL       \
+       GG82563_REG(2, 21) /* MAC Specific Control Register */
+
+#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_PWR_MGMT_CTRL       \
+       GG82563_REG(193, 20) /* Power Management Control */
+
+/* Page 194 - KMRN Registers */
+#define GG82563_PHY_INBAND_CTRL         \
+       GG82563_REG(194, 18) /* Inband Control */
+
+/* MDI Control */
+#define E1000_MDIC_REG_SHIFT 16
+#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_ERROR     0x40000000
+
+/* SerDes Control */
+#define E1000_GEN_POLL_TIMEOUT          640
+
+#endif /* _E1000_DEFINES_H_ */
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
new file mode 100644 (file)
index 0000000..638d175
--- /dev/null
@@ -0,0 +1,736 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+/* Linux PRO/1000 Ethernet Driver main header file */
+
+#ifndef _E1000_H_
+#define _E1000_H_
+
+#include <linux/bitops.h>
+#include <linux/types.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
+#include <linux/io.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <linux/pci-aspm.h>
+#include <linux/crc32.h>
+#include <linux/if_vlan.h>
+
+#include "hw.h"
+
+struct e1000_info;
+
+#define e_dbg(format, arg...) \
+       netdev_dbg(hw->adapter->netdev, format, ## arg)
+#define e_err(format, arg...) \
+       netdev_err(adapter->netdev, format, ## arg)
+#define e_info(format, arg...) \
+       netdev_info(adapter->netdev, format, ## arg)
+#define e_warn(format, arg...) \
+       netdev_warn(adapter->netdev, format, ## arg)
+#define e_notice(format, arg...) \
+       netdev_notice(adapter->netdev, format, ## arg)
+
+
+/* Interrupt modes, as used by the IntMode parameter */
+#define E1000E_INT_MODE_LEGACY         0
+#define E1000E_INT_MODE_MSI            1
+#define E1000E_INT_MODE_MSIX           2
+
+/* 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 DEFAULT_JUMBO                  9234
+
+/* BM/HV Specific Registers */
+#define BM_PORT_CTRL_PAGE                 769
+
+#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)))
+
+/* PHY Wakeup Registers and defines */
+#define BM_PORT_GEN_CFG PHY_REG(BM_PORT_CTRL_PAGE, 17)
+#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_STATS_PAGE  778
+#define HV_SCC_UPPER   PHY_REG(HV_STATS_PAGE, 16) /* Single Collision Count */
+#define HV_SCC_LOWER   PHY_REG(HV_STATS_PAGE, 17)
+#define HV_ECOL_UPPER  PHY_REG(HV_STATS_PAGE, 18) /* Excessive Coll. Count */
+#define HV_ECOL_LOWER  PHY_REG(HV_STATS_PAGE, 19)
+#define HV_MCC_UPPER   PHY_REG(HV_STATS_PAGE, 20) /* Multiple Coll. Count */
+#define HV_MCC_LOWER   PHY_REG(HV_STATS_PAGE, 21)
+#define HV_LATECOL_UPPER PHY_REG(HV_STATS_PAGE, 23) /* Late Collision Count */
+#define HV_LATECOL_LOWER PHY_REG(HV_STATS_PAGE, 24)
+#define HV_COLC_UPPER  PHY_REG(HV_STATS_PAGE, 25) /* Collision Count */
+#define HV_COLC_LOWER  PHY_REG(HV_STATS_PAGE, 26)
+#define HV_DC_UPPER    PHY_REG(HV_STATS_PAGE, 27) /* Defer Count */
+#define HV_DC_LOWER    PHY_REG(HV_STATS_PAGE, 28)
+#define HV_TNCRS_UPPER PHY_REG(HV_STATS_PAGE, 29) /* Transmit with no CRS */
+#define HV_TNCRS_LOWER PHY_REG(HV_STATS_PAGE, 30)
+
+#define E1000_FCRTV_PCH     0x05F40 /* PCH Flow Control Refresh Timer Value */
+
+/* BM PHY Copper Specific Status */
+#define BM_CS_STATUS                      17
+#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
+
+/* Time to wait before putting the device into D3 if there's no link (in ms). */
+#define LINK_TIMEOUT           100
+
+#define DEFAULT_RDTR                   0
+#define DEFAULT_RADV                   8
+#define BURST_RDTR                     0x20
+#define BURST_RADV                     0x20
+
+/*
+ * in the case of WTHRESH, it appears at least the 82571/2 hardware
+ * writes back 4 descriptors when WTHRESH=5, and 3 descriptors when
+ * WTHRESH=4, and since we want 64 bytes at a time written back, set
+ * it to 5
+ */
+#define E1000_TXDCTL_DMA_BURST_ENABLE                          \
+       (E1000_TXDCTL_GRAN | /* set descriptor granularity */  \
+        E1000_TXDCTL_COUNT_DESC |                             \
+        (5 << 16) | /* wthresh must be +1 more than desired */\
+        (1 << 8)  | /* hthresh */                             \
+        0x1f)       /* pthresh */
+
+#define E1000_RXDCTL_DMA_BURST_ENABLE                          \
+       (0x01000000 | /* set descriptor granularity */         \
+        (4 << 16)  | /* set writeback threshold    */         \
+        (4 << 8)   | /* set prefetch threshold     */         \
+        0x20)        /* set hthresh                */
+
+#define E1000_TIDV_FPD (1 << 31)
+#define E1000_RDTR_FPD (1 << 31)
+
+enum e1000_boards {
+       board_82571,
+       board_82572,
+       board_82573,
+       board_82574,
+       board_82583,
+       board_80003es2lan,
+       board_ich8lan,
+       board_ich9lan,
+       board_ich10lan,
+       board_pchlan,
+       board_pch2lan,
+};
+
+struct e1000_ps_page {
+       struct page *page;
+       u64 dma; /* must be u64 - written to hw */
+};
+
+/*
+ * wrappers around a pointer to a socket buffer,
+ * so a DMA handle can be stored along with the buffer
+ */
+struct e1000_buffer {
+       dma_addr_t dma;
+       struct sk_buff *skb;
+       union {
+               /* Tx */
+               struct {
+                       unsigned long time_stamp;
+                       u16 length;
+                       u16 next_to_watch;
+                       unsigned int segs;
+                       unsigned int bytecount;
+                       u16 mapped_as_page;
+               };
+               /* Rx */
+               struct {
+                       /* arrays of page information for packet split */
+                       struct e1000_ps_page *ps_pages;
+                       struct page *page;
+               };
+       };
+};
+
+struct e1000_ring {
+       void *desc;                     /* pointer to ring memory  */
+       dma_addr_t dma;                 /* phys address of ring    */
+       unsigned int size;              /* length of ring in bytes */
+       unsigned int count;             /* number of desc. in ring */
+
+       u16 next_to_use;
+       u16 next_to_clean;
+
+       u16 head;
+       u16 tail;
+
+       /* array of buffer information structs */
+       struct e1000_buffer *buffer_info;
+
+       char name[IFNAMSIZ + 5];
+       u32 ims_val;
+       u32 itr_val;
+       u16 itr_register;
+       int set_itr;
+
+       struct sk_buff *rx_skb_top;
+};
+
+/* PHY register snapshot values */
+struct e1000_phy_regs {
+       u16 bmcr;               /* basic mode control register    */
+       u16 bmsr;               /* basic mode status register     */
+       u16 advertise;          /* auto-negotiation advertisement */
+       u16 lpa;                /* link partner ability register  */
+       u16 expansion;          /* auto-negotiation expansion reg */
+       u16 ctrl1000;           /* 1000BASE-T control register    */
+       u16 stat1000;           /* 1000BASE-T status register     */
+       u16 estatus;            /* extended status register       */
+};
+
+/* board specific private data structure */
+struct e1000_adapter {
+       struct timer_list watchdog_timer;
+       struct timer_list phy_info_timer;
+       struct timer_list blink_timer;
+
+       struct work_struct reset_task;
+       struct work_struct watchdog_task;
+
+       const struct e1000_info *ei;
+
+       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       u32 bd_number;
+       u32 rx_buffer_len;
+       u16 mng_vlan_id;
+       u16 link_speed;
+       u16 link_duplex;
+       u16 eeprom_vers;
+
+       /* track device up/down/testing state */
+       unsigned long state;
+
+       /* Interrupt Throttle Rate */
+       u32 itr;
+       u32 itr_setting;
+       u16 tx_itr;
+       u16 rx_itr;
+
+       /*
+        * Tx
+        */
+       struct e1000_ring *tx_ring /* One per active queue */
+                                               ____cacheline_aligned_in_smp;
+
+       struct napi_struct napi;
+
+       unsigned int restart_queue;
+       u32 txd_cmd;
+
+       bool detect_tx_hung;
+       u8 tx_timeout_factor;
+
+       u32 tx_int_delay;
+       u32 tx_abs_int_delay;
+
+       unsigned int total_tx_bytes;
+       unsigned int total_tx_packets;
+       unsigned int total_rx_bytes;
+       unsigned int total_rx_packets;
+
+       /* Tx stats */
+       u64 tpt_old;
+       u64 colc_old;
+       u32 gotc;
+       u64 gotc_old;
+       u32 tx_timeout_count;
+       u32 tx_fifo_head;
+       u32 tx_head_addr;
+       u32 tx_fifo_size;
+       u32 tx_dma_failed;
+
+       /*
+        * Rx
+        */
+       bool (*clean_rx) (struct e1000_adapter *adapter,
+                         int *work_done, int work_to_do)
+                                               ____cacheline_aligned_in_smp;
+       void (*alloc_rx_buf) (struct e1000_adapter *adapter,
+                             int cleaned_count, gfp_t gfp);
+       struct e1000_ring *rx_ring;
+
+       u32 rx_int_delay;
+       u32 rx_abs_int_delay;
+
+       /* Rx stats */
+       u64 hw_csum_err;
+       u64 hw_csum_good;
+       u64 rx_hdr_split;
+       u32 gorc;
+       u64 gorc_old;
+       u32 alloc_rx_buff_failed;
+       u32 rx_dma_failed;
+
+       unsigned int rx_ps_pages;
+       u16 rx_ps_bsize0;
+       u32 max_frame_size;
+       u32 min_frame_size;
+
+       /* OS defined structs */
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+
+       /* structs defined in e1000_hw.h */
+       struct e1000_hw hw;
+
+       spinlock_t stats64_lock;
+       struct e1000_hw_stats stats;
+       struct e1000_phy_info phy_info;
+       struct e1000_phy_stats phy_stats;
+
+       /* Snapshot of PHY registers */
+       struct e1000_phy_regs phy_regs;
+
+       struct e1000_ring test_tx_ring;
+       struct e1000_ring test_rx_ring;
+       u32 test_icr;
+
+       u32 msg_enable;
+       unsigned int num_vectors;
+       struct msix_entry *msix_entries;
+       int int_mode;
+       u32 eiac_mask;
+
+       u32 eeprom_wol;
+       u32 wol;
+       u32 pba;
+       u32 max_hw_frame_size;
+
+       bool fc_autoneg;
+
+       unsigned int flags;
+       unsigned int flags2;
+       struct work_struct downshift_task;
+       struct work_struct update_phy_task;
+       struct work_struct print_hang_task;
+
+       bool idle_check;
+       int phy_hang_count;
+};
+
+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 *);
+       struct e1000_mac_operations *mac_ops;
+       struct e1000_phy_operations *phy_ops;
+       struct e1000_nvm_operations *nvm_ops;
+};
+
+/* 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_READ_ONLY_NVM                (1 << 8)
+#define FLAG_IS_ICH                       (1 << 9)
+#define FLAG_HAS_MSIX                     (1 << 10)
+#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 FLAG2_IS_DISCARDING               (1 << 2)
+#define FLAG2_DISABLE_ASPM_L1             (1 << 3)
+#define FLAG2_HAS_PHY_STATS               (1 << 4)
+#define FLAG2_HAS_EEE                     (1 << 5)
+#define FLAG2_DMA_BURST                   (1 << 6)
+#define FLAG2_DISABLE_ASPM_L0S            (1 << 7)
+#define FLAG2_DISABLE_AIM                 (1 << 8)
+#define FLAG2_CHECK_PHY_HANG              (1 << 9)
+
+#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 {
+       __E1000_TESTING,
+       __E1000_RESETTING,
+       __E1000_DOWN
+};
+
+enum latency_range {
+       lowest_latency = 0,
+       low_latency = 1,
+       bulk_latency = 2,
+       latency_invalid = 255
+};
+
+extern char e1000e_driver_name[];
+extern const char e1000e_driver_version[];
+
+extern void e1000e_check_options(struct e1000_adapter *adapter);
+extern void e1000e_set_ethtool_ops(struct net_device *netdev);
+
+extern int e1000e_up(struct e1000_adapter *adapter);
+extern void e1000e_down(struct e1000_adapter *adapter);
+extern void e1000e_reinit_locked(struct e1000_adapter *adapter);
+extern void e1000e_reset(struct e1000_adapter *adapter);
+extern void e1000e_power_up_phy(struct e1000_adapter *adapter);
+extern int e1000e_setup_rx_resources(struct e1000_adapter *adapter);
+extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
+extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
+extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
+extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
+                                                    struct rtnl_link_stats64
+                                                    *stats);
+extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
+extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);
+extern void e1000e_get_hw_control(struct e1000_adapter *adapter);
+extern void e1000e_release_hw_control(struct e1000_adapter *adapter);
+
+extern unsigned int copybreak;
+
+extern char *e1000e_get_hw_dev_name(struct e1000_hw *hw);
+
+extern struct e1000_info e1000_82571_info;
+extern struct e1000_info e1000_82572_info;
+extern struct e1000_info e1000_82573_info;
+extern struct e1000_info e1000_82574_info;
+extern struct e1000_info e1000_82583_info;
+extern struct e1000_info e1000_ich8_info;
+extern struct e1000_info e1000_ich9_info;
+extern struct e1000_info e1000_ich10_info;
+extern struct e1000_info e1000_pch_info;
+extern struct e1000_info e1000_pch2_info;
+extern struct e1000_info e1000_es2_info;
+
+extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
+                                        u32 pba_num_size);
+
+extern s32  e1000e_commit_phy(struct e1000_hw *hw);
+
+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_write_protect_nvm_ich8lan(struct e1000_hw *hw);
+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 e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw);
+extern void e1000_resume_workarounds_pchlan(struct e1000_hw *hw);
+extern s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable);
+extern s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable);
+extern void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw);
+
+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_setup_led_generic(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 void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
+extern void e1000_set_lan_id_single_port(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);
+extern void e1000_clear_vfta_generic(struct e1000_hw *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_generic(struct e1000_hw *hw);
+extern void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
+extern s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw);
+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 s32 e1000e_get_phy_id(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);
+extern s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw);
+extern s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw);
+extern s32 e1000e_get_phy_info_igp(struct e1000_hw *hw);
+extern s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page);
+extern s32 e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
+extern s32 e1000e_read_phy_reg_igp_locked(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_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset,
+                                           u16 data);
+extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw);
+extern s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);
+extern s32 e1000e_get_cfg_done(struct e1000_hw *hw);
+extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);
+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 s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw);
+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);
+extern s32 e1000_enable_phy_wakeup_reg_access_bm(struct e1000_hw *hw,
+                                                u16 *phy_reg);
+extern s32 e1000_disable_phy_wakeup_reg_access_bm(struct e1000_hw *hw,
+                                                 u16 *phy_reg);
+extern s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data);
+extern s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);
+extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
+extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
+extern s32 e1000e_write_kmrn_reg_locked(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_read_kmrn_reg_locked(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 void e1000_power_up_phy_copper(struct e1000_hw *hw);
+extern void e1000_power_down_phy_copper(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);
+extern s32 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data);
+extern s32 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
+                                        u16 *data);
+extern s32 e1000_read_phy_reg_page_hv(struct e1000_hw *hw, u32 offset,
+                                     u16 *data);
+extern s32 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);
+extern s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset,
+                                         u16 data);
+extern s32 e1000_write_phy_reg_page_hv(struct e1000_hw *hw, u32 offset,
+                                      u16 data);
+extern s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw);
+extern s32 e1000_copper_link_setup_82577(struct e1000_hw *hw);
+extern s32 e1000_check_polarity_82577(struct e1000_hw *hw);
+extern s32 e1000_get_phy_info_82577(struct e1000_hw *hw);
+extern s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw);
+extern s32 e1000_get_cable_length_82577(struct e1000_hw *hw);
+
+extern s32 e1000_check_polarity_m88(struct e1000_hw *hw);
+extern s32 e1000_get_phy_info_ife(struct e1000_hw *hw);
+extern s32 e1000_check_polarity_ife(struct e1000_hw *hw);
+extern s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw);
+extern s32 e1000_check_polarity_igp(struct e1000_hw *hw);
+extern bool e1000_check_phy_82574(struct e1000_hw *hw);
+
+static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw)
+{
+       return hw->phy.ops.reset(hw);
+}
+
+static inline s32 e1000_check_reset_block(struct e1000_hw *hw)
+{
+       return hw->phy.ops.check_reset_block(hw);
+}
+
+static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       return hw->phy.ops.read_reg(hw, offset, data);
+}
+
+static inline s32 e1e_wphy(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       return hw->phy.ops.write_reg(hw, offset, data);
+}
+
+static inline s32 e1000_get_cable_length(struct e1000_hw *hw)
+{
+       return hw->phy.ops.get_cable_length(hw);
+}
+
+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);
+extern void e1000e_reload_nvm(struct e1000_hw *hw);
+extern s32 e1000_read_mac_addr_generic(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 e1000_read_mac_addr_generic(hw);
+}
+
+static inline s32 e1000_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 e1000_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
+       return hw->nvm.ops.read(hw, offset, words, data);
+}
+
+static inline s32 e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
+       return hw->nvm.ops.write(hw, offset, words, data);
+}
+
+static inline s32 e1000_get_phy_info(struct e1000_hw *hw)
+{
+       return hw->phy.ops.get_info(hw);
+}
+
+static inline s32 e1000e_check_mng_mode(struct e1000_hw *hw)
+{
+       return hw->mac.ops.check_mng_mode(hw);
+}
+
+extern bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);
+extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);
+extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);
+
+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);
+}
+
+#endif /* _E1000_H_ */
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
new file mode 100644 (file)
index 0000000..06d88f3
--- /dev/null
@@ -0,0 +1,2081 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+/* ethtool support for e1000 */
+
+#include <linux/netdevice.h>
+#include <linux/interrupt.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+
+#include "e1000.h"
+
+enum {NETDEV_STATS, E1000_STATS};
+
+struct e1000_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int type;
+       int sizeof_stat;
+       int stat_offset;
+};
+
+#define E1000_STAT(str, m) { \
+               .stat_string = str, \
+               .type = E1000_STATS, \
+               .sizeof_stat = sizeof(((struct e1000_adapter *)0)->m), \
+               .stat_offset = offsetof(struct e1000_adapter, m) }
+#define E1000_NETDEV_STAT(str, m) { \
+               .stat_string = str, \
+               .type = NETDEV_STATS, \
+               .sizeof_stat = sizeof(((struct rtnl_link_stats64 *)0)->m), \
+               .stat_offset = offsetof(struct rtnl_link_stats64, m) }
+
+static const struct e1000_stats e1000_gstrings_stats[] = {
+       E1000_STAT("rx_packets", stats.gprc),
+       E1000_STAT("tx_packets", stats.gptc),
+       E1000_STAT("rx_bytes", stats.gorc),
+       E1000_STAT("tx_bytes", stats.gotc),
+       E1000_STAT("rx_broadcast", stats.bprc),
+       E1000_STAT("tx_broadcast", stats.bptc),
+       E1000_STAT("rx_multicast", stats.mprc),
+       E1000_STAT("tx_multicast", stats.mptc),
+       E1000_NETDEV_STAT("rx_errors", rx_errors),
+       E1000_NETDEV_STAT("tx_errors", tx_errors),
+       E1000_NETDEV_STAT("tx_dropped", tx_dropped),
+       E1000_STAT("multicast", stats.mprc),
+       E1000_STAT("collisions", stats.colc),
+       E1000_NETDEV_STAT("rx_length_errors", rx_length_errors),
+       E1000_NETDEV_STAT("rx_over_errors", rx_over_errors),
+       E1000_STAT("rx_crc_errors", stats.crcerrs),
+       E1000_NETDEV_STAT("rx_frame_errors", rx_frame_errors),
+       E1000_STAT("rx_no_buffer_count", stats.rnbc),
+       E1000_STAT("rx_missed_errors", stats.mpc),
+       E1000_STAT("tx_aborted_errors", stats.ecol),
+       E1000_STAT("tx_carrier_errors", stats.tncrs),
+       E1000_NETDEV_STAT("tx_fifo_errors", tx_fifo_errors),
+       E1000_NETDEV_STAT("tx_heartbeat_errors", tx_heartbeat_errors),
+       E1000_STAT("tx_window_errors", stats.latecol),
+       E1000_STAT("tx_abort_late_coll", stats.latecol),
+       E1000_STAT("tx_deferred_ok", stats.dc),
+       E1000_STAT("tx_single_coll_ok", stats.scc),
+       E1000_STAT("tx_multi_coll_ok", stats.mcc),
+       E1000_STAT("tx_timeout_count", tx_timeout_count),
+       E1000_STAT("tx_restart_queue", restart_queue),
+       E1000_STAT("rx_long_length_errors", stats.roc),
+       E1000_STAT("rx_short_length_errors", stats.ruc),
+       E1000_STAT("rx_align_errors", stats.algnerrc),
+       E1000_STAT("tx_tcp_seg_good", stats.tsctc),
+       E1000_STAT("tx_tcp_seg_failed", stats.tsctfc),
+       E1000_STAT("rx_flow_control_xon", stats.xonrxc),
+       E1000_STAT("rx_flow_control_xoff", stats.xoffrxc),
+       E1000_STAT("tx_flow_control_xon", stats.xontxc),
+       E1000_STAT("tx_flow_control_xoff", stats.xofftxc),
+       E1000_STAT("rx_long_byte_count", stats.gorc),
+       E1000_STAT("rx_csum_offload_good", hw_csum_good),
+       E1000_STAT("rx_csum_offload_errors", hw_csum_err),
+       E1000_STAT("rx_header_split", rx_hdr_split),
+       E1000_STAT("alloc_rx_buff_failed", alloc_rx_buff_failed),
+       E1000_STAT("tx_smbus", stats.mgptc),
+       E1000_STAT("rx_smbus", stats.mgprc),
+       E1000_STAT("dropped_smbus", stats.mgpdc),
+       E1000_STAT("rx_dma_failed", rx_dma_failed),
+       E1000_STAT("tx_dma_failed", tx_dma_failed),
+};
+
+#define E1000_GLOBAL_STATS_LEN ARRAY_SIZE(e1000_gstrings_stats)
+#define E1000_STATS_LEN (E1000_GLOBAL_STATS_LEN)
+static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
+       "Register test  (offline)", "Eeprom test    (offline)",
+       "Interrupt test (offline)", "Loopback test  (offline)",
+       "Link test   (on/offline)"
+};
+#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
+
+static int e1000_get_settings(struct net_device *netdev,
+                             struct ethtool_cmd *ecmd)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 speed;
+
+       if (hw->phy.media_type == e1000_media_type_copper) {
+
+               ecmd->supported = (SUPPORTED_10baseT_Half |
+                                  SUPPORTED_10baseT_Full |
+                                  SUPPORTED_100baseT_Half |
+                                  SUPPORTED_100baseT_Full |
+                                  SUPPORTED_1000baseT_Full |
+                                  SUPPORTED_Autoneg |
+                                  SUPPORTED_TP);
+               if (hw->phy.type == e1000_phy_ife)
+                       ecmd->supported &= ~SUPPORTED_1000baseT_Full;
+               ecmd->advertising = ADVERTISED_TP;
+
+               if (hw->mac.autoneg == 1) {
+                       ecmd->advertising |= ADVERTISED_Autoneg;
+                       /* the e1000 autoneg seems to match ethtool nicely */
+                       ecmd->advertising |= hw->phy.autoneg_advertised;
+               }
+
+               ecmd->port = PORT_TP;
+               ecmd->phy_address = hw->phy.addr;
+               ecmd->transceiver = XCVR_INTERNAL;
+
+       } else {
+               ecmd->supported   = (SUPPORTED_1000baseT_Full |
+                                    SUPPORTED_FIBRE |
+                                    SUPPORTED_Autoneg);
+
+               ecmd->advertising = (ADVERTISED_1000baseT_Full |
+                                    ADVERTISED_FIBRE |
+                                    ADVERTISED_Autoneg);
+
+               ecmd->port = PORT_FIBRE;
+               ecmd->transceiver = XCVR_EXTERNAL;
+       }
+
+       speed = -1;
+       ecmd->duplex = -1;
+
+       if (netif_running(netdev)) {
+               if (netif_carrier_ok(netdev)) {
+                       speed = adapter->link_speed;
+                       ecmd->duplex = adapter->link_duplex - 1;
+               }
+       } else {
+               u32 status = er32(STATUS);
+               if (status & E1000_STATUS_LU) {
+                       if (status & E1000_STATUS_SPEED_1000)
+                               speed = SPEED_1000;
+                       else if (status & E1000_STATUS_SPEED_100)
+                               speed = SPEED_100;
+                       else
+                               speed = SPEED_10;
+
+                       if (status & E1000_STATUS_FD)
+                               ecmd->duplex = DUPLEX_FULL;
+                       else
+                               ecmd->duplex = DUPLEX_HALF;
+               }
+       }
+
+       ethtool_cmd_speed_set(ecmd, speed);
+       ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) ||
+                        hw->mac.autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+
+       /* MDI-X => 2; MDI =>1; Invalid =>0 */
+       if ((hw->phy.media_type == e1000_media_type_copper) &&
+           netif_carrier_ok(netdev))
+               ecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X :
+                                                     ETH_TP_MDI;
+       else
+               ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;
+
+       return 0;
+}
+
+static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
+{
+       struct e1000_mac_info *mac = &adapter->hw.mac;
+
+       mac->autoneg = 0;
+
+       /* Make sure dplx is at most 1 bit and lsb of speed is not set
+        * for the switch() below to work */
+       if ((spd & 1) || (dplx & ~1))
+               goto err_inval;
+
+       /* Fiber NICs only allow 1000 gbps Full duplex */
+       if ((adapter->hw.phy.media_type == e1000_media_type_fiber) &&
+           spd != SPEED_1000 &&
+           dplx != DUPLEX_FULL) {
+               goto err_inval;
+       }
+
+       switch (spd + dplx) {
+       case SPEED_10 + DUPLEX_HALF:
+               mac->forced_speed_duplex = ADVERTISE_10_HALF;
+               break;
+       case SPEED_10 + DUPLEX_FULL:
+               mac->forced_speed_duplex = ADVERTISE_10_FULL;
+               break;
+       case SPEED_100 + DUPLEX_HALF:
+               mac->forced_speed_duplex = ADVERTISE_100_HALF;
+               break;
+       case SPEED_100 + DUPLEX_FULL:
+               mac->forced_speed_duplex = ADVERTISE_100_FULL;
+               break;
+       case SPEED_1000 + DUPLEX_FULL:
+               mac->autoneg = 1;
+               adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;
+               break;
+       case SPEED_1000 + DUPLEX_HALF: /* not supported */
+       default:
+               goto err_inval;
+       }
+       return 0;
+
+err_inval:
+       e_err("Unsupported Speed/Duplex configuration\n");
+       return -EINVAL;
+}
+
+static int e1000_set_settings(struct net_device *netdev,
+                             struct ethtool_cmd *ecmd)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       /*
+        * When SoL/IDER sessions are active, autoneg/speed/duplex
+        * cannot be changed
+        */
+       if (e1000_check_reset_block(hw)) {
+               e_err("Cannot change link characteristics when SoL/IDER is "
+                     "active.\n");
+               return -EINVAL;
+       }
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
+               usleep_range(1000, 2000);
+
+       if (ecmd->autoneg == AUTONEG_ENABLE) {
+               hw->mac.autoneg = 1;
+               if (hw->phy.media_type == e1000_media_type_fiber)
+                       hw->phy.autoneg_advertised = ADVERTISED_1000baseT_Full |
+                                                    ADVERTISED_FIBRE |
+                                                    ADVERTISED_Autoneg;
+               else
+                       hw->phy.autoneg_advertised = ecmd->advertising |
+                                                    ADVERTISED_TP |
+                                                    ADVERTISED_Autoneg;
+               ecmd->advertising = hw->phy.autoneg_advertised;
+               if (adapter->fc_autoneg)
+                       hw->fc.requested_mode = e1000_fc_default;
+       } else {
+               u32 speed = ethtool_cmd_speed(ecmd);
+               if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {
+                       clear_bit(__E1000_RESETTING, &adapter->state);
+                       return -EINVAL;
+               }
+       }
+
+       /* reset the link */
+
+       if (netif_running(adapter->netdev)) {
+               e1000e_down(adapter);
+               e1000e_up(adapter);
+       } else {
+               e1000e_reset(adapter);
+       }
+
+       clear_bit(__E1000_RESETTING, &adapter->state);
+       return 0;
+}
+
+static void e1000_get_pauseparam(struct net_device *netdev,
+                                struct ethtool_pauseparam *pause)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       pause->autoneg =
+               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
+
+       if (hw->fc.current_mode == e1000_fc_rx_pause) {
+               pause->rx_pause = 1;
+       } else if (hw->fc.current_mode == e1000_fc_tx_pause) {
+               pause->tx_pause = 1;
+       } else if (hw->fc.current_mode == e1000_fc_full) {
+               pause->rx_pause = 1;
+               pause->tx_pause = 1;
+       }
+}
+
+static int e1000_set_pauseparam(struct net_device *netdev,
+                               struct ethtool_pauseparam *pause)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int retval = 0;
+
+       adapter->fc_autoneg = pause->autoneg;
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
+               usleep_range(1000, 2000);
+
+       if (adapter->fc_autoneg == AUTONEG_ENABLE) {
+               hw->fc.requested_mode = e1000_fc_default;
+               if (netif_running(adapter->netdev)) {
+                       e1000e_down(adapter);
+                       e1000e_up(adapter);
+               } else {
+                       e1000e_reset(adapter);
+               }
+       } else {
+               if (pause->rx_pause && pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_full;
+               else if (pause->rx_pause && !pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_rx_pause;
+               else if (!pause->rx_pause && pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_tx_pause;
+               else if (!pause->rx_pause && !pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_none;
+
+               hw->fc.current_mode = hw->fc.requested_mode;
+
+               if (hw->phy.media_type == e1000_media_type_fiber) {
+                       retval = hw->mac.ops.setup_link(hw);
+                       /* implicit goto out */
+               } else {
+                       retval = e1000e_force_mac_fc(hw);
+                       if (retval)
+                               goto out;
+                       e1000e_set_fc_watermarks(hw);
+               }
+       }
+
+out:
+       clear_bit(__E1000_RESETTING, &adapter->state);
+       return retval;
+}
+
+static u32 e1000_get_rx_csum(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       return adapter->flags & FLAG_RX_CSUM_ENABLED;
+}
+
+static int e1000_set_rx_csum(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (data)
+               adapter->flags |= FLAG_RX_CSUM_ENABLED;
+       else
+               adapter->flags &= ~FLAG_RX_CSUM_ENABLED;
+
+       if (netif_running(netdev))
+               e1000e_reinit_locked(adapter);
+       else
+               e1000e_reset(adapter);
+       return 0;
+}
+
+static u32 e1000_get_tx_csum(struct net_device *netdev)
+{
+       return (netdev->features & NETIF_F_HW_CSUM) != 0;
+}
+
+static int e1000_set_tx_csum(struct net_device *netdev, u32 data)
+{
+       if (data)
+               netdev->features |= NETIF_F_HW_CSUM;
+       else
+               netdev->features &= ~NETIF_F_HW_CSUM;
+
+       return 0;
+}
+
+static int e1000_set_tso(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (data) {
+               netdev->features |= NETIF_F_TSO;
+               netdev->features |= NETIF_F_TSO6;
+       } else {
+               netdev->features &= ~NETIF_F_TSO;
+               netdev->features &= ~NETIF_F_TSO6;
+       }
+
+       adapter->flags |= FLAG_TSO_FORCE;
+       return 0;
+}
+
+static u32 e1000_get_msglevel(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       return adapter->msg_enable;
+}
+
+static void e1000_set_msglevel(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       adapter->msg_enable = data;
+}
+
+static int e1000_get_regs_len(struct net_device *netdev)
+{
+#define E1000_REGS_LEN 32 /* overestimate */
+       return E1000_REGS_LEN * sizeof(u32);
+}
+
+static void e1000_get_regs(struct net_device *netdev,
+                          struct ethtool_regs *regs, void *p)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 *regs_buff = p;
+       u16 phy_data;
+
+       memset(p, 0, E1000_REGS_LEN * sizeof(u32));
+
+       regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
+                       adapter->pdev->device;
+
+       regs_buff[0]  = er32(CTRL);
+       regs_buff[1]  = er32(STATUS);
+
+       regs_buff[2]  = er32(RCTL);
+       regs_buff[3]  = er32(RDLEN);
+       regs_buff[4]  = er32(RDH);
+       regs_buff[5]  = er32(RDT);
+       regs_buff[6]  = er32(RDTR);
+
+       regs_buff[7]  = er32(TCTL);
+       regs_buff[8]  = er32(TDLEN);
+       regs_buff[9]  = er32(TDH);
+       regs_buff[10] = er32(TDT);
+       regs_buff[11] = er32(TIDV);
+
+       regs_buff[12] = adapter->hw.phy.type;  /* PHY type (IGP=1, M88=0) */
+
+       /* ethtool doesn't use anything past this point, so all this
+        * code is likely legacy junk for apps that may or may not
+        * exist */
+       if (hw->phy.type == e1000_phy_m88) {
+               e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+               regs_buff[13] = (u32)phy_data; /* cable length */
+               regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+               regs_buff[17] = (u32)phy_data; /* extended 10bt distance */
+               regs_buff[18] = regs_buff[13]; /* cable polarity */
+               regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
+               regs_buff[20] = regs_buff[17]; /* polarity correction */
+               /* phy receive errors */
+               regs_buff[22] = adapter->phy_stats.receive_errors;
+               regs_buff[23] = regs_buff[13]; /* mdix mode */
+       }
+       regs_buff[21] = 0; /* was idle_errors */
+       e1e_rphy(hw, PHY_1000T_STATUS, &phy_data);
+       regs_buff[24] = (u32)phy_data;  /* phy local receiver status */
+       regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
+}
+
+static int e1000_get_eeprom_len(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       return adapter->hw.nvm.word_size * 2;
+}
+
+static int e1000_get_eeprom(struct net_device *netdev,
+                           struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       int first_word;
+       int last_word;
+       int ret_val = 0;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EINVAL;
+
+       eeprom->magic = adapter->pdev->vendor | (adapter->pdev->device << 16);
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+
+       eeprom_buff = kmalloc(sizeof(u16) *
+                       (last_word - first_word + 1), GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       if (hw->nvm.type == e1000_nvm_eeprom_spi) {
+               ret_val = e1000_read_nvm(hw, first_word,
+                                        last_word - first_word + 1,
+                                        eeprom_buff);
+       } else {
+               for (i = 0; i < last_word - first_word + 1; i++) {
+                       ret_val = e1000_read_nvm(hw, first_word + i, 1,
+                                                     &eeprom_buff[i]);
+                       if (ret_val)
+                               break;
+               }
+       }
+
+       if (ret_val) {
+               /* a read error occurred, throw away the result */
+               memset(eeprom_buff, 0xff, sizeof(u16) *
+                      (last_word - first_word + 1));
+       } else {
+               /* Device's eeprom is always little-endian, word addressable */
+               for (i = 0; i < last_word - first_word + 1; i++)
+                       le16_to_cpus(&eeprom_buff[i]);
+       }
+
+       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
+       kfree(eeprom_buff);
+
+       return ret_val;
+}
+
+static int e1000_set_eeprom(struct net_device *netdev,
+                           struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       void *ptr;
+       int max_len;
+       int first_word;
+       int last_word;
+       int ret_val = 0;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EOPNOTSUPP;
+
+       if (eeprom->magic != (adapter->pdev->vendor | (adapter->pdev->device << 16)))
+               return -EFAULT;
+
+       if (adapter->flags & FLAG_READ_ONLY_NVM)
+               return -EINVAL;
+
+       max_len = hw->nvm.word_size * 2;
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       ptr = (void *)eeprom_buff;
+
+       if (eeprom->offset & 1) {
+               /* need read/modify/write of first changed EEPROM word */
+               /* only the second byte of the word is being modified */
+               ret_val = e1000_read_nvm(hw, first_word, 1, &eeprom_buff[0]);
+               ptr++;
+       }
+       if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0))
+               /* need read/modify/write of last changed EEPROM word */
+               /* only the first byte of the word is being modified */
+               ret_val = e1000_read_nvm(hw, last_word, 1,
+                                 &eeprom_buff[last_word - first_word]);
+
+       if (ret_val)
+               goto out;
+
+       /* Device's eeprom is always little-endian, word addressable */
+       for (i = 0; i < last_word - first_word + 1; i++)
+               le16_to_cpus(&eeprom_buff[i]);
+
+       memcpy(ptr, bytes, eeprom->len);
+
+       for (i = 0; i < last_word - first_word + 1; i++)
+               eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
+
+       ret_val = e1000_write_nvm(hw, first_word,
+                                 last_word - first_word + 1, eeprom_buff);
+
+       if (ret_val)
+               goto out;
+
+       /*
+        * Update the checksum over the first part of the EEPROM if needed
+        * and flush shadow RAM for applicable controllers
+        */
+       if ((first_word <= NVM_CHECKSUM_REG) ||
+           (hw->mac.type == e1000_82583) ||
+           (hw->mac.type == e1000_82574) ||
+           (hw->mac.type == e1000_82573))
+               ret_val = e1000e_update_nvm_checksum(hw);
+
+out:
+       kfree(eeprom_buff);
+       return ret_val;
+}
+
+static void e1000_get_drvinfo(struct net_device *netdev,
+                             struct ethtool_drvinfo *drvinfo)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       char firmware_version[32];
+
+       strncpy(drvinfo->driver,  e1000e_driver_name,
+               sizeof(drvinfo->driver) - 1);
+       strncpy(drvinfo->version, e1000e_driver_version,
+               sizeof(drvinfo->version) - 1);
+
+       /*
+        * EEPROM image version # is reported as firmware version # for
+        * PCI-E controllers
+        */
+       snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
+               (adapter->eeprom_vers & 0xF000) >> 12,
+               (adapter->eeprom_vers & 0x0FF0) >> 4,
+               (adapter->eeprom_vers & 0x000F));
+
+       strncpy(drvinfo->fw_version, firmware_version,
+               sizeof(drvinfo->fw_version) - 1);
+       strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
+               sizeof(drvinfo->bus_info) - 1);
+       drvinfo->regdump_len = e1000_get_regs_len(netdev);
+       drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
+}
+
+static void e1000_get_ringparam(struct net_device *netdev,
+                               struct ethtool_ringparam *ring)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+
+       ring->rx_max_pending = E1000_MAX_RXD;
+       ring->tx_max_pending = E1000_MAX_TXD;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = rx_ring->count;
+       ring->tx_pending = tx_ring->count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int e1000_set_ringparam(struct net_device *netdev,
+                              struct ethtool_ringparam *ring)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_ring *tx_ring, *tx_old;
+       struct e1000_ring *rx_ring, *rx_old;
+       int err;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
+               usleep_range(1000, 2000);
+
+       if (netif_running(adapter->netdev))
+               e1000e_down(adapter);
+
+       tx_old = adapter->tx_ring;
+       rx_old = adapter->rx_ring;
+
+       err = -ENOMEM;
+       tx_ring = kmemdup(tx_old, sizeof(struct e1000_ring), GFP_KERNEL);
+       if (!tx_ring)
+               goto err_alloc_tx;
+
+       rx_ring = kmemdup(rx_old, sizeof(struct e1000_ring), GFP_KERNEL);
+       if (!rx_ring)
+               goto err_alloc_rx;
+
+       adapter->tx_ring = tx_ring;
+       adapter->rx_ring = rx_ring;
+
+       rx_ring->count = max(ring->rx_pending, (u32)E1000_MIN_RXD);
+       rx_ring->count = min(rx_ring->count, (u32)(E1000_MAX_RXD));
+       rx_ring->count = ALIGN(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+
+       tx_ring->count = max(ring->tx_pending, (u32)E1000_MIN_TXD);
+       tx_ring->count = min(tx_ring->count, (u32)(E1000_MAX_TXD));
+       tx_ring->count = ALIGN(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+
+       if (netif_running(adapter->netdev)) {
+               /* Try to get new resources before deleting old */
+               err = e1000e_setup_rx_resources(adapter);
+               if (err)
+                       goto err_setup_rx;
+               err = e1000e_setup_tx_resources(adapter);
+               if (err)
+                       goto err_setup_tx;
+
+               /*
+                * restore the old in order to free it,
+                * then add in the new
+                */
+               adapter->rx_ring = rx_old;
+               adapter->tx_ring = tx_old;
+               e1000e_free_rx_resources(adapter);
+               e1000e_free_tx_resources(adapter);
+               kfree(tx_old);
+               kfree(rx_old);
+               adapter->rx_ring = rx_ring;
+               adapter->tx_ring = tx_ring;
+               err = e1000e_up(adapter);
+               if (err)
+                       goto err_setup;
+       }
+
+       clear_bit(__E1000_RESETTING, &adapter->state);
+       return 0;
+err_setup_tx:
+       e1000e_free_rx_resources(adapter);
+err_setup_rx:
+       adapter->rx_ring = rx_old;
+       adapter->tx_ring = tx_old;
+       kfree(rx_ring);
+err_alloc_rx:
+       kfree(tx_ring);
+err_alloc_tx:
+       e1000e_up(adapter);
+err_setup:
+       clear_bit(__E1000_RESETTING, &adapter->state);
+       return err;
+}
+
+static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
+                            int reg, int offset, u32 mask, u32 write)
+{
+       u32 pat, val;
+       static const u32 test[] = {
+               0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
+       for (pat = 0; pat < ARRAY_SIZE(test); pat++) {
+               E1000_WRITE_REG_ARRAY(&adapter->hw, reg, offset,
+                                     (test[pat] & write));
+               val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
+               if (val != (test[pat] & write & mask)) {
+                       e_err("pattern test reg %04X failed: got 0x%08X "
+                             "expected 0x%08X\n", reg + offset, val,
+                             (test[pat] & write & mask));
+                       *data = reg;
+                       return 1;
+               }
+       }
+       return 0;
+}
+
+static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
+                             int reg, u32 mask, u32 write)
+{
+       u32 val;
+       __ew32(&adapter->hw, reg, write & mask);
+       val = __er32(&adapter->hw, reg);
+       if ((write & mask) != (val & mask)) {
+               e_err("set/check reg %04X test failed: got 0x%08X "
+                     "expected 0x%08X\n", reg, (val & mask), (write & mask));
+               *data = reg;
+               return 1;
+       }
+       return 0;
+}
+#define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write)                       \
+       do {                                                                   \
+               if (reg_pattern_test(adapter, data, reg, offset, mask, write)) \
+                       return 1;                                              \
+       } while (0)
+#define REG_PATTERN_TEST(reg, mask, write)                                     \
+       REG_PATTERN_TEST_ARRAY(reg, 0, mask, write)
+
+#define REG_SET_AND_CHECK(reg, mask, write)                                    \
+       do {                                                                   \
+               if (reg_set_and_check(adapter, data, reg, mask, write))        \
+                       return 1;                                              \
+       } while (0)
+
+static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_mac_info *mac = &adapter->hw.mac;
+       u32 value;
+       u32 before;
+       u32 after;
+       u32 i;
+       u32 toggle;
+       u32 mask;
+
+       /*
+        * The status register is Read Only, so a write should fail.
+        * Some bits that get toggled are ignored.
+        */
+       switch (mac->type) {
+       /* there are several bits on newer hardware that are r/w */
+       case e1000_82571:
+       case e1000_82572:
+       case e1000_80003es2lan:
+               toggle = 0x7FFFF3FF;
+               break;
+        default:
+               toggle = 0x7FFFF033;
+               break;
+       }
+
+       before = er32(STATUS);
+       value = (er32(STATUS) & toggle);
+       ew32(STATUS, toggle);
+       after = er32(STATUS) & toggle;
+       if (value != after) {
+               e_err("failed STATUS register test got: 0x%08X expected: "
+                     "0x%08X\n", after, value);
+               *data = 1;
+               return 1;
+       }
+       /* restore previous status */
+       ew32(STATUS, before);
+
+       if (!(adapter->flags & FLAG_IS_ICH)) {
+               REG_PATTERN_TEST(E1000_FCAL, 0xFFFFFFFF, 0xFFFFFFFF);
+               REG_PATTERN_TEST(E1000_FCAH, 0x0000FFFF, 0xFFFFFFFF);
+               REG_PATTERN_TEST(E1000_FCT, 0x0000FFFF, 0xFFFFFFFF);
+               REG_PATTERN_TEST(E1000_VET, 0x0000FFFF, 0xFFFFFFFF);
+       }
+
+       REG_PATTERN_TEST(E1000_RDTR, 0x0000FFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_RDLEN, 0x000FFF80, 0x000FFFFF);
+       REG_PATTERN_TEST(E1000_RDH, 0x0000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(E1000_RDT, 0x0000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(E1000_FCRTH, 0x0000FFF8, 0x0000FFF8);
+       REG_PATTERN_TEST(E1000_FCTTV, 0x0000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(E1000_TIPG, 0x3FFFFFFF, 0x3FFFFFFF);
+       REG_PATTERN_TEST(E1000_TDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_TDLEN, 0x000FFF80, 0x000FFFFF);
+
+       REG_SET_AND_CHECK(E1000_RCTL, 0xFFFFFFFF, 0x00000000);
+
+       before = ((adapter->flags & FLAG_IS_ICH) ? 0x06C3B33E : 0x06DFB3FE);
+       REG_SET_AND_CHECK(E1000_RCTL, before, 0x003FFFFB);
+       REG_SET_AND_CHECK(E1000_TCTL, 0xFFFFFFFF, 0x00000000);
+
+       REG_SET_AND_CHECK(E1000_RCTL, before, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+       if (!(adapter->flags & FLAG_IS_ICH))
+               REG_PATTERN_TEST(E1000_TXCW, 0xC000FFFF, 0x0000FFFF);
+       REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+       REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
+       mask = 0x8003FFFF;
+       switch (mac->type) {
+       case e1000_ich10lan:
+       case e1000_pchlan:
+       case e1000_pch2lan:
+               mask |= (1 << 18);
+               break;
+       default:
+               break;
+       }
+       for (i = 0; i < mac->rar_entry_count; i++)
+               REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
+                                      mask, 0xFFFFFFFF);
+
+       for (i = 0; i < mac->mta_reg_count; i++)
+               REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
+
+       *data = 0;
+       return 0;
+}
+
+static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
+{
+       u16 temp;
+       u16 checksum = 0;
+       u16 i;
+
+       *data = 0;
+       /* Read and add up the contents of the EEPROM */
+       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
+               if ((e1000_read_nvm(&adapter->hw, i, 1, &temp)) < 0) {
+                       *data = 1;
+                       return *data;
+               }
+               checksum += temp;
+       }
+
+       /* If Checksum is not Correct return error else test passed */
+       if ((checksum != (u16) NVM_SUM) && !(*data))
+               *data = 2;
+
+       return *data;
+}
+
+static irqreturn_t e1000_test_intr(int irq, void *data)
+{
+       struct net_device *netdev = (struct net_device *) data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       adapter->test_icr |= er32(ICR);
+
+       return IRQ_HANDLED;
+}
+
+static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 mask;
+       u32 shared_int = 1;
+       u32 irq = adapter->pdev->irq;
+       int i;
+       int ret_val = 0;
+       int int_mode = E1000E_INT_MODE_LEGACY;
+
+       *data = 0;
+
+       /* NOTE: we don't test MSI/MSI-X interrupts here, yet */
+       if (adapter->int_mode == E1000E_INT_MODE_MSIX) {
+               int_mode = adapter->int_mode;
+               e1000e_reset_interrupt_capability(adapter);
+               adapter->int_mode = E1000E_INT_MODE_LEGACY;
+               e1000e_set_interrupt_capability(adapter);
+       }
+       /* Hook up test interrupt handler just for this test */
+       if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
+                        netdev)) {
+               shared_int = 0;
+       } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
+                netdev->name, netdev)) {
+               *data = 1;
+               ret_val = -1;
+               goto out;
+       }
+       e_info("testing %s interrupt\n", (shared_int ? "shared" : "unshared"));
+
+       /* Disable all the interrupts */
+       ew32(IMC, 0xFFFFFFFF);
+       e1e_flush();
+       usleep_range(10000, 20000);
+
+       /* Test each interrupt */
+       for (i = 0; i < 10; i++) {
+               /* Interrupt to test */
+               mask = 1 << i;
+
+               if (adapter->flags & FLAG_IS_ICH) {
+                       switch (mask) {
+                       case E1000_ICR_RXSEQ:
+                               continue;
+                       case 0x00000100:
+                               if (adapter->hw.mac.type == e1000_ich8lan ||
+                                   adapter->hw.mac.type == e1000_ich9lan)
+                                       continue;
+                               break;
+                       default:
+                               break;
+                       }
+               }
+
+               if (!shared_int) {
+                       /*
+                        * Disable the interrupt to be reported in
+                        * the cause register and then force the same
+                        * interrupt and see if one gets posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+                       ew32(IMC, mask);
+                       ew32(ICS, mask);
+                       e1e_flush();
+                       usleep_range(10000, 20000);
+
+                       if (adapter->test_icr & mask) {
+                               *data = 3;
+                               break;
+                       }
+               }
+
+               /*
+                * Enable the interrupt to be reported in
+                * the cause register and then force the same
+                * interrupt and see if one gets posted.  If
+                * an interrupt was not posted to the bus, the
+                * test failed.
+                */
+               adapter->test_icr = 0;
+               ew32(IMS, mask);
+               ew32(ICS, mask);
+               e1e_flush();
+               usleep_range(10000, 20000);
+
+               if (!(adapter->test_icr & mask)) {
+                       *data = 4;
+                       break;
+               }
+
+               if (!shared_int) {
+                       /*
+                        * Disable the other interrupts to be reported in
+                        * the cause register and then force the other
+                        * interrupts and see if any get posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+                       ew32(IMC, ~mask & 0x00007FFF);
+                       ew32(ICS, ~mask & 0x00007FFF);
+                       e1e_flush();
+                       usleep_range(10000, 20000);
+
+                       if (adapter->test_icr) {
+                               *data = 5;
+                               break;
+                       }
+               }
+       }
+
+       /* Disable all the interrupts */
+       ew32(IMC, 0xFFFFFFFF);
+       e1e_flush();
+       usleep_range(10000, 20000);
+
+       /* Unhook test interrupt handler */
+       free_irq(irq, netdev);
+
+out:
+       if (int_mode == E1000E_INT_MODE_MSIX) {
+               e1000e_reset_interrupt_capability(adapter);
+               adapter->int_mode = int_mode;
+               e1000e_set_interrupt_capability(adapter);
+       }
+
+       return ret_val;
+}
+
+static void e1000_free_desc_rings(struct e1000_adapter *adapter)
+{
+       struct e1000_ring *tx_ring = &adapter->test_tx_ring;
+       struct e1000_ring *rx_ring = &adapter->test_rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       int i;
+
+       if (tx_ring->desc && tx_ring->buffer_info) {
+               for (i = 0; i < tx_ring->count; i++) {
+                       if (tx_ring->buffer_info[i].dma)
+                               dma_unmap_single(&pdev->dev,
+                                       tx_ring->buffer_info[i].dma,
+                                       tx_ring->buffer_info[i].length,
+                                       DMA_TO_DEVICE);
+                       if (tx_ring->buffer_info[i].skb)
+                               dev_kfree_skb(tx_ring->buffer_info[i].skb);
+               }
+       }
+
+       if (rx_ring->desc && rx_ring->buffer_info) {
+               for (i = 0; i < rx_ring->count; i++) {
+                       if (rx_ring->buffer_info[i].dma)
+                               dma_unmap_single(&pdev->dev,
+                                       rx_ring->buffer_info[i].dma,
+                                       2048, DMA_FROM_DEVICE);
+                       if (rx_ring->buffer_info[i].skb)
+                               dev_kfree_skb(rx_ring->buffer_info[i].skb);
+               }
+       }
+
+       if (tx_ring->desc) {
+               dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
+                                 tx_ring->dma);
+               tx_ring->desc = NULL;
+       }
+       if (rx_ring->desc) {
+               dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
+                                 rx_ring->dma);
+               rx_ring->desc = NULL;
+       }
+
+       kfree(tx_ring->buffer_info);
+       tx_ring->buffer_info = NULL;
+       kfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+}
+
+static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
+{
+       struct e1000_ring *tx_ring = &adapter->test_tx_ring;
+       struct e1000_ring *rx_ring = &adapter->test_rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+       int i;
+       int ret_val;
+
+       /* Setup Tx descriptor ring and Tx buffers */
+
+       if (!tx_ring->count)
+               tx_ring->count = E1000_DEFAULT_TXD;
+
+       tx_ring->buffer_info = kcalloc(tx_ring->count,
+                                      sizeof(struct e1000_buffer),
+                                      GFP_KERNEL);
+       if (!(tx_ring->buffer_info)) {
+               ret_val = 1;
+               goto err_nomem;
+       }
+
+       tx_ring->size = tx_ring->count * sizeof(struct e1000_tx_desc);
+       tx_ring->size = ALIGN(tx_ring->size, 4096);
+       tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
+                                          &tx_ring->dma, GFP_KERNEL);
+       if (!tx_ring->desc) {
+               ret_val = 2;
+               goto err_nomem;
+       }
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+
+       ew32(TDBAL, ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
+       ew32(TDBAH, ((u64) tx_ring->dma >> 32));
+       ew32(TDLEN, tx_ring->count * sizeof(struct e1000_tx_desc));
+       ew32(TDH, 0);
+       ew32(TDT, 0);
+       ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN | E1000_TCTL_MULR |
+            E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
+            E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT);
+
+       for (i = 0; i < tx_ring->count; i++) {
+               struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*tx_ring, i);
+               struct sk_buff *skb;
+               unsigned int skb_size = 1024;
+
+               skb = alloc_skb(skb_size, GFP_KERNEL);
+               if (!skb) {
+                       ret_val = 3;
+                       goto err_nomem;
+               }
+               skb_put(skb, skb_size);
+               tx_ring->buffer_info[i].skb = skb;
+               tx_ring->buffer_info[i].length = skb->len;
+               tx_ring->buffer_info[i].dma =
+                       dma_map_single(&pdev->dev, skb->data, skb->len,
+                                      DMA_TO_DEVICE);
+               if (dma_mapping_error(&pdev->dev,
+                                     tx_ring->buffer_info[i].dma)) {
+                       ret_val = 4;
+                       goto err_nomem;
+               }
+               tx_desc->buffer_addr = cpu_to_le64(tx_ring->buffer_info[i].dma);
+               tx_desc->lower.data = cpu_to_le32(skb->len);
+               tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
+                                                  E1000_TXD_CMD_IFCS |
+                                                  E1000_TXD_CMD_RS);
+               tx_desc->upper.data = 0;
+       }
+
+       /* Setup Rx descriptor ring and Rx buffers */
+
+       if (!rx_ring->count)
+               rx_ring->count = E1000_DEFAULT_RXD;
+
+       rx_ring->buffer_info = kcalloc(rx_ring->count,
+                                      sizeof(struct e1000_buffer),
+                                      GFP_KERNEL);
+       if (!(rx_ring->buffer_info)) {
+               ret_val = 5;
+               goto err_nomem;
+       }
+
+       rx_ring->size = rx_ring->count * sizeof(struct e1000_rx_desc);
+       rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
+                                          &rx_ring->dma, GFP_KERNEL);
+       if (!rx_ring->desc) {
+               ret_val = 6;
+               goto err_nomem;
+       }
+       rx_ring->next_to_use = 0;
+       rx_ring->next_to_clean = 0;
+
+       rctl = er32(RCTL);
+       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+       ew32(RDBAL, ((u64) rx_ring->dma & 0xFFFFFFFF));
+       ew32(RDBAH, ((u64) rx_ring->dma >> 32));
+       ew32(RDLEN, rx_ring->size);
+       ew32(RDH, 0);
+       ew32(RDT, 0);
+       rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
+               E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_LPE |
+               E1000_RCTL_SBP | E1000_RCTL_SECRC |
+               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+               (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
+       ew32(RCTL, rctl);
+
+       for (i = 0; i < rx_ring->count; i++) {
+               struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rx_ring, i);
+               struct sk_buff *skb;
+
+               skb = alloc_skb(2048 + NET_IP_ALIGN, GFP_KERNEL);
+               if (!skb) {
+                       ret_val = 7;
+                       goto err_nomem;
+               }
+               skb_reserve(skb, NET_IP_ALIGN);
+               rx_ring->buffer_info[i].skb = skb;
+               rx_ring->buffer_info[i].dma =
+                       dma_map_single(&pdev->dev, skb->data, 2048,
+                                      DMA_FROM_DEVICE);
+               if (dma_mapping_error(&pdev->dev,
+                                     rx_ring->buffer_info[i].dma)) {
+                       ret_val = 8;
+                       goto err_nomem;
+               }
+               rx_desc->buffer_addr =
+                       cpu_to_le64(rx_ring->buffer_info[i].dma);
+               memset(skb->data, 0x00, skb->len);
+       }
+
+       return 0;
+
+err_nomem:
+       e1000_free_desc_rings(adapter);
+       return ret_val;
+}
+
+static void e1000_phy_disable_receiver(struct e1000_adapter *adapter)
+{
+       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
+       e1e_wphy(&adapter->hw, 29, 0x001F);
+       e1e_wphy(&adapter->hw, 30, 0x8FFC);
+       e1e_wphy(&adapter->hw, 29, 0x001A);
+       e1e_wphy(&adapter->hw, 30, 0x8FF0);
+}
+
+static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl_reg = 0;
+       u16 phy_reg = 0;
+       s32 ret_val = 0;
+
+       hw->mac.autoneg = 0;
+
+       if (hw->phy.type == e1000_phy_ife) {
+               /* force 100, set loopback */
+               e1e_wphy(hw, PHY_CONTROL, 0x6100);
+
+               /* Now set up the MAC to the same speed/duplex as the PHY. */
+               ctrl_reg = er32(CTRL);
+               ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
+               ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
+                            E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
+                            E1000_CTRL_SPD_100 |/* Force Speed to 100 */
+                            E1000_CTRL_FD);     /* Force Duplex to FULL */
+
+               ew32(CTRL, ctrl_reg);
+               e1e_flush();
+               udelay(500);
+
+               return 0;
+       }
+
+       /* Specific PHY configuration for loopback */
+       switch (hw->phy.type) {
+       case e1000_phy_m88:
+               /* Auto-MDI/MDIX Off */
+               e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
+               /* reset to update Auto-MDI/MDIX */
+               e1e_wphy(hw, PHY_CONTROL, 0x9140);
+               /* autoneg off */
+               e1e_wphy(hw, PHY_CONTROL, 0x8140);
+               break;
+       case e1000_phy_gg82563:
+               e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, 0x1CC);
+               break;
+       case e1000_phy_bm:
+               /* Set Default MAC Interface speed to 1GB */
+               e1e_rphy(hw, PHY_REG(2, 21), &phy_reg);
+               phy_reg &= ~0x0007;
+               phy_reg |= 0x006;
+               e1e_wphy(hw, PHY_REG(2, 21), phy_reg);
+               /* Assert SW reset for above settings to take effect */
+               e1000e_commit_phy(hw);
+               mdelay(1);
+               /* Force Full Duplex */
+               e1e_rphy(hw, PHY_REG(769, 16), &phy_reg);
+               e1e_wphy(hw, PHY_REG(769, 16), phy_reg | 0x000C);
+               /* Set Link Up (in force link) */
+               e1e_rphy(hw, PHY_REG(776, 16), &phy_reg);
+               e1e_wphy(hw, PHY_REG(776, 16), phy_reg | 0x0040);
+               /* Force Link */
+               e1e_rphy(hw, PHY_REG(769, 16), &phy_reg);
+               e1e_wphy(hw, PHY_REG(769, 16), phy_reg | 0x0040);
+               /* Set Early Link Enable */
+               e1e_rphy(hw, PHY_REG(769, 20), &phy_reg);
+               e1e_wphy(hw, PHY_REG(769, 20), phy_reg | 0x0400);
+               break;
+       case e1000_phy_82577:
+       case e1000_phy_82578:
+               /* Workaround: K1 must be disabled for stable 1Gbps operation */
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val) {
+                       e_err("Cannot setup 1Gbps loopback.\n");
+                       return ret_val;
+               }
+               e1000_configure_k1_ich8lan(hw, false);
+               hw->phy.ops.release(hw);
+               break;
+       case e1000_phy_82579:
+               /* Disable PHY energy detect power down */
+               e1e_rphy(hw, PHY_REG(0, 21), &phy_reg);
+               e1e_wphy(hw, PHY_REG(0, 21), phy_reg & ~(1 << 3));
+               /* Disable full chip energy detect */
+               e1e_rphy(hw, PHY_REG(776, 18), &phy_reg);
+               e1e_wphy(hw, PHY_REG(776, 18), phy_reg | 1);
+               /* Enable loopback on the PHY */
+#define I82577_PHY_LBK_CTRL          19
+               e1e_wphy(hw, I82577_PHY_LBK_CTRL, 0x8001);
+               break;
+       default:
+               break;
+       }
+
+       /* force 1000, set loopback */
+       e1e_wphy(hw, PHY_CONTROL, 0x4140);
+       mdelay(250);
+
+       /* Now set up the MAC to the same speed/duplex as the PHY. */
+       ctrl_reg = er32(CTRL);
+       ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
+       ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
+                    E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
+                    E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
+                    E1000_CTRL_FD);     /* Force Duplex to FULL */
+
+       if (adapter->flags & FLAG_IS_ICH)
+               ctrl_reg |= E1000_CTRL_SLU;     /* Set Link Up */
+
+       if (hw->phy.media_type == e1000_media_type_copper &&
+           hw->phy.type == e1000_phy_m88) {
+               ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
+       } else {
+               /*
+                * Set the ILOS bit on the fiber Nic if half duplex link is
+                * detected.
+                */
+               if ((er32(STATUS) & E1000_STATUS_FD) == 0)
+                       ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
+       }
+
+       ew32(CTRL, ctrl_reg);
+
+       /*
+        * Disable the receiver on the PHY so when a cable is plugged in, the
+        * PHY does not begin to autoneg when a cable is reconnected to the NIC.
+        */
+       if (hw->phy.type == e1000_phy_m88)
+               e1000_phy_disable_receiver(adapter);
+
+       udelay(500);
+
+       return 0;
+}
+
+static int e1000_set_82571_fiber_loopback(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl = er32(CTRL);
+       int link = 0;
+
+       /* special requirements for 82571/82572 fiber adapters */
+
+       /*
+        * jump through hoops to make sure link is up because serdes
+        * link is hardwired up
+        */
+       ctrl |= E1000_CTRL_SLU;
+       ew32(CTRL, ctrl);
+
+       /* disable autoneg */
+       ctrl = er32(TXCW);
+       ctrl &= ~(1 << 31);
+       ew32(TXCW, ctrl);
+
+       link = (er32(STATUS) & E1000_STATUS_LU);
+
+       if (!link) {
+               /* set invert loss of signal */
+               ctrl = er32(CTRL);
+               ctrl |= E1000_CTRL_ILOS;
+               ew32(CTRL, ctrl);
+       }
+
+       /*
+        * special write to serdes control register to enable SerDes analog
+        * loopback
+        */
+#define E1000_SERDES_LB_ON 0x410
+       ew32(SCTL, E1000_SERDES_LB_ON);
+       e1e_flush();
+       usleep_range(10000, 20000);
+
+       return 0;
+}
+
+/* only call this for fiber/serdes connections to es2lan */
+static int e1000_set_es2lan_mac_loopback(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrlext = er32(CTRL_EXT);
+       u32 ctrl = er32(CTRL);
+
+       /*
+        * save CTRL_EXT to restore later, reuse an empty variable (unused
+        * on mac_type 80003es2lan)
+        */
+       adapter->tx_fifo_head = ctrlext;
+
+       /* clear the serdes mode bits, putting the device into mac loopback */
+       ctrlext &= ~E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES;
+       ew32(CTRL_EXT, ctrlext);
+
+       /* force speed to 1000/FD, link up */
+       ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
+       ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX |
+                E1000_CTRL_SPD_1000 | E1000_CTRL_FD);
+       ew32(CTRL, ctrl);
+
+       /* set mac loopback */
+       ctrl = er32(RCTL);
+       ctrl |= E1000_RCTL_LBM_MAC;
+       ew32(RCTL, ctrl);
+
+       /* set testing mode parameters (no need to reset later) */
+#define KMRNCTRLSTA_OPMODE (0x1F << 16)
+#define KMRNCTRLSTA_OPMODE_1GB_FD_GMII 0x0582
+       ew32(KMRNCTRLSTA,
+            (KMRNCTRLSTA_OPMODE | KMRNCTRLSTA_OPMODE_1GB_FD_GMII));
+
+       return 0;
+}
+
+static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+
+       if (hw->phy.media_type == e1000_media_type_fiber ||
+           hw->phy.media_type == e1000_media_type_internal_serdes) {
+               switch (hw->mac.type) {
+               case e1000_80003es2lan:
+                       return e1000_set_es2lan_mac_loopback(adapter);
+                       break;
+               case e1000_82571:
+               case e1000_82572:
+                       return e1000_set_82571_fiber_loopback(adapter);
+                       break;
+               default:
+                       rctl = er32(RCTL);
+                       rctl |= E1000_RCTL_LBM_TCVR;
+                       ew32(RCTL, rctl);
+                       return 0;
+               }
+       } else if (hw->phy.media_type == e1000_media_type_copper) {
+               return e1000_integrated_phy_loopback(adapter);
+       }
+
+       return 7;
+}
+
+static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+       u16 phy_reg;
+
+       rctl = er32(RCTL);
+       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
+       ew32(RCTL, rctl);
+
+       switch (hw->mac.type) {
+       case e1000_80003es2lan:
+               if (hw->phy.media_type == e1000_media_type_fiber ||
+                   hw->phy.media_type == e1000_media_type_internal_serdes) {
+                       /* restore CTRL_EXT, stealing space from tx_fifo_head */
+                       ew32(CTRL_EXT, adapter->tx_fifo_head);
+                       adapter->tx_fifo_head = 0;
+               }
+               /* fall through */
+       case e1000_82571:
+       case e1000_82572:
+               if (hw->phy.media_type == e1000_media_type_fiber ||
+                   hw->phy.media_type == e1000_media_type_internal_serdes) {
+#define E1000_SERDES_LB_OFF 0x400
+                       ew32(SCTL, E1000_SERDES_LB_OFF);
+                       e1e_flush();
+                       usleep_range(10000, 20000);
+                       break;
+               }
+               /* Fall Through */
+       default:
+               hw->mac.autoneg = 1;
+               if (hw->phy.type == e1000_phy_gg82563)
+                       e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, 0x180);
+               e1e_rphy(hw, PHY_CONTROL, &phy_reg);
+               if (phy_reg & MII_CR_LOOPBACK) {
+                       phy_reg &= ~MII_CR_LOOPBACK;
+                       e1e_wphy(hw, PHY_CONTROL, phy_reg);
+                       e1000e_commit_phy(hw);
+               }
+               break;
+       }
+}
+
+static void e1000_create_lbtest_frame(struct sk_buff *skb,
+                                     unsigned int frame_size)
+{
+       memset(skb->data, 0xFF, frame_size);
+       frame_size &= ~1;
+       memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
+       memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
+       memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
+}
+
+static int e1000_check_lbtest_frame(struct sk_buff *skb,
+                                   unsigned int frame_size)
+{
+       frame_size &= ~1;
+       if (*(skb->data + 3) == 0xFF)
+               if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
+                  (*(skb->data + frame_size / 2 + 12) == 0xAF))
+                       return 0;
+       return 13;
+}
+
+static int e1000_run_loopback_test(struct e1000_adapter *adapter)
+{
+       struct e1000_ring *tx_ring = &adapter->test_tx_ring;
+       struct e1000_ring *rx_ring = &adapter->test_rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_hw *hw = &adapter->hw;
+       int i, j, k, l;
+       int lc;
+       int good_cnt;
+       int ret_val = 0;
+       unsigned long time;
+
+       ew32(RDT, rx_ring->count - 1);
+
+       /*
+        * Calculate the loop count based on the largest descriptor ring
+        * The idea is to wrap the largest ring a number of times using 64
+        * send/receive pairs during each loop
+        */
+
+       if (rx_ring->count <= tx_ring->count)
+               lc = ((tx_ring->count / 64) * 2) + 1;
+       else
+               lc = ((rx_ring->count / 64) * 2) + 1;
+
+       k = 0;
+       l = 0;
+       for (j = 0; j <= lc; j++) { /* loop count loop */
+               for (i = 0; i < 64; i++) { /* send the packets */
+                       e1000_create_lbtest_frame(tx_ring->buffer_info[k].skb,
+                                                 1024);
+                       dma_sync_single_for_device(&pdev->dev,
+                                       tx_ring->buffer_info[k].dma,
+                                       tx_ring->buffer_info[k].length,
+                                       DMA_TO_DEVICE);
+                       k++;
+                       if (k == tx_ring->count)
+                               k = 0;
+               }
+               ew32(TDT, k);
+               e1e_flush();
+               msleep(200);
+               time = jiffies; /* set the start time for the receive */
+               good_cnt = 0;
+               do { /* receive the sent packets */
+                       dma_sync_single_for_cpu(&pdev->dev,
+                                       rx_ring->buffer_info[l].dma, 2048,
+                                       DMA_FROM_DEVICE);
+
+                       ret_val = e1000_check_lbtest_frame(
+                                       rx_ring->buffer_info[l].skb, 1024);
+                       if (!ret_val)
+                               good_cnt++;
+                       l++;
+                       if (l == rx_ring->count)
+                               l = 0;
+                       /*
+                        * time + 20 msecs (200 msecs on 2.4) is more than
+                        * enough time to complete the receives, if it's
+                        * exceeded, break and error off
+                        */
+               } while ((good_cnt < 64) && !time_after(jiffies, time + 20));
+               if (good_cnt != 64) {
+                       ret_val = 13; /* ret_val is the same as mis-compare */
+                       break;
+               }
+               if (jiffies >= (time + 20)) {
+                       ret_val = 14; /* error code for time out error */
+                       break;
+               }
+       } /* end loop count loop */
+       return ret_val;
+}
+
+static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
+{
+       /*
+        * PHY loopback cannot be performed if SoL/IDER
+        * sessions are active
+        */
+       if (e1000_check_reset_block(&adapter->hw)) {
+               e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");
+               *data = 0;
+               goto out;
+       }
+
+       *data = e1000_setup_desc_rings(adapter);
+       if (*data)
+               goto out;
+
+       *data = e1000_setup_loopback_test(adapter);
+       if (*data)
+               goto err_loopback;
+
+       *data = e1000_run_loopback_test(adapter);
+       e1000_loopback_cleanup(adapter);
+
+err_loopback:
+       e1000_free_desc_rings(adapter);
+out:
+       return *data;
+}
+
+static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       *data = 0;
+       if (hw->phy.media_type == e1000_media_type_internal_serdes) {
+               int i = 0;
+               hw->mac.serdes_has_link = false;
+
+               /*
+                * On some blade server designs, link establishment
+                * could take as long as 2-3 minutes
+                */
+               do {
+                       hw->mac.ops.check_for_link(hw);
+                       if (hw->mac.serdes_has_link)
+                               return *data;
+                       msleep(20);
+               } while (i++ < 3750);
+
+               *data = 1;
+       } else {
+               hw->mac.ops.check_for_link(hw);
+               if (hw->mac.autoneg)
+                       /*
+                        * On some Phy/switch combinations, link establishment
+                        * can take a few seconds more than expected.
+                        */
+                       msleep(5000);
+
+               if (!(er32(STATUS) & E1000_STATUS_LU))
+                       *data = 1;
+       }
+       return *data;
+}
+
+static int e1000e_get_sset_count(struct net_device *netdev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_TEST:
+               return E1000_TEST_LEN;
+       case ETH_SS_STATS:
+               return E1000_STATS_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static void e1000_diag_test(struct net_device *netdev,
+                           struct ethtool_test *eth_test, u64 *data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       u16 autoneg_advertised;
+       u8 forced_speed_duplex;
+       u8 autoneg;
+       bool if_running = netif_running(netdev);
+
+       set_bit(__E1000_TESTING, &adapter->state);
+
+       if (!if_running) {
+               /* Get control of and reset hardware */
+               if (adapter->flags & FLAG_HAS_AMT)
+                       e1000e_get_hw_control(adapter);
+
+               e1000e_power_up_phy(adapter);
+
+               adapter->hw.phy.autoneg_wait_to_complete = 1;
+               e1000e_reset(adapter);
+               adapter->hw.phy.autoneg_wait_to_complete = 0;
+       }
+
+       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
+               /* Offline tests */
+
+               /* save speed, duplex, autoneg settings */
+               autoneg_advertised = adapter->hw.phy.autoneg_advertised;
+               forced_speed_duplex = adapter->hw.mac.forced_speed_duplex;
+               autoneg = adapter->hw.mac.autoneg;
+
+               e_info("offline testing starting\n");
+
+               if (if_running)
+                       /* indicate we're in test mode */
+                       dev_close(netdev);
+
+               if (e1000_reg_test(adapter, &data[0]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               e1000e_reset(adapter);
+               if (e1000_eeprom_test(adapter, &data[1]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               e1000e_reset(adapter);
+               if (e1000_intr_test(adapter, &data[2]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               e1000e_reset(adapter);
+               if (e1000_loopback_test(adapter, &data[3]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* force this routine to wait until autoneg complete/timeout */
+               adapter->hw.phy.autoneg_wait_to_complete = 1;
+               e1000e_reset(adapter);
+               adapter->hw.phy.autoneg_wait_to_complete = 0;
+
+               if (e1000_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* restore speed, duplex, autoneg settings */
+               adapter->hw.phy.autoneg_advertised = autoneg_advertised;
+               adapter->hw.mac.forced_speed_duplex = forced_speed_duplex;
+               adapter->hw.mac.autoneg = autoneg;
+               e1000e_reset(adapter);
+
+               clear_bit(__E1000_TESTING, &adapter->state);
+               if (if_running)
+                       dev_open(netdev);
+       } else {
+               /* Online tests */
+
+               e_info("online testing starting\n");
+
+               /* register, eeprom, intr and loopback tests not run online */
+               data[0] = 0;
+               data[1] = 0;
+               data[2] = 0;
+               data[3] = 0;
+
+               if (e1000_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               clear_bit(__E1000_TESTING, &adapter->state);
+       }
+
+       if (!if_running) {
+               e1000e_reset(adapter);
+
+               if (adapter->flags & FLAG_HAS_AMT)
+                       e1000e_release_hw_control(adapter);
+       }
+
+       msleep_interruptible(4 * 1000);
+}
+
+static void e1000_get_wol(struct net_device *netdev,
+                         struct ethtool_wolinfo *wol)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       wol->supported = 0;
+       wol->wolopts = 0;
+
+       if (!(adapter->flags & FLAG_HAS_WOL) ||
+           !device_can_wakeup(&adapter->pdev->dev))
+               return;
+
+       wol->supported = WAKE_UCAST | WAKE_MCAST |
+           WAKE_BCAST | WAKE_MAGIC | WAKE_PHY;
+
+       /* apply any specific unsupported masks here */
+       if (adapter->flags & FLAG_NO_WAKE_UCAST) {
+               wol->supported &= ~WAKE_UCAST;
+
+               if (adapter->wol & E1000_WUFC_EX)
+                       e_err("Interface does not support directed (unicast) "
+                             "frame wake-up packets\n");
+       }
+
+       if (adapter->wol & E1000_WUFC_EX)
+               wol->wolopts |= WAKE_UCAST;
+       if (adapter->wol & E1000_WUFC_MC)
+               wol->wolopts |= WAKE_MCAST;
+       if (adapter->wol & E1000_WUFC_BC)
+               wol->wolopts |= WAKE_BCAST;
+       if (adapter->wol & E1000_WUFC_MAG)
+               wol->wolopts |= WAKE_MAGIC;
+       if (adapter->wol & E1000_WUFC_LNKC)
+               wol->wolopts |= WAKE_PHY;
+}
+
+static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (!(adapter->flags & FLAG_HAS_WOL) ||
+           !device_can_wakeup(&adapter->pdev->dev) ||
+           (wol->wolopts & ~(WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |
+                             WAKE_MAGIC | WAKE_PHY)))
+               return -EOPNOTSUPP;
+
+       /* these settings will always override what we currently have */
+       adapter->wol = 0;
+
+       if (wol->wolopts & WAKE_UCAST)
+               adapter->wol |= E1000_WUFC_EX;
+       if (wol->wolopts & WAKE_MCAST)
+               adapter->wol |= E1000_WUFC_MC;
+       if (wol->wolopts & WAKE_BCAST)
+               adapter->wol |= E1000_WUFC_BC;
+       if (wol->wolopts & WAKE_MAGIC)
+               adapter->wol |= E1000_WUFC_MAG;
+       if (wol->wolopts & WAKE_PHY)
+               adapter->wol |= E1000_WUFC_LNKC;
+
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       return 0;
+}
+
+static int e1000_set_phys_id(struct net_device *netdev,
+                            enum ethtool_phys_id_state state)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       switch (state) {
+       case ETHTOOL_ID_ACTIVE:
+               if (!hw->mac.ops.blink_led)
+                       return 2;       /* cycle on/off twice per second */
+
+               hw->mac.ops.blink_led(hw);
+               break;
+
+       case ETHTOOL_ID_INACTIVE:
+               if (hw->phy.type == e1000_phy_ife)
+                       e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
+               hw->mac.ops.led_off(hw);
+               hw->mac.ops.cleanup_led(hw);
+               break;
+
+       case ETHTOOL_ID_ON:
+               adapter->hw.mac.ops.led_on(&adapter->hw);
+               break;
+
+       case ETHTOOL_ID_OFF:
+               adapter->hw.mac.ops.led_off(&adapter->hw);
+               break;
+       }
+       return 0;
+}
+
+static int e1000_get_coalesce(struct net_device *netdev,
+                             struct ethtool_coalesce *ec)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (adapter->itr_setting <= 4)
+               ec->rx_coalesce_usecs = adapter->itr_setting;
+       else
+               ec->rx_coalesce_usecs = 1000000 / adapter->itr_setting;
+
+       return 0;
+}
+
+static int e1000_set_coalesce(struct net_device *netdev,
+                             struct ethtool_coalesce *ec)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       if ((ec->rx_coalesce_usecs > E1000_MAX_ITR_USECS) ||
+           ((ec->rx_coalesce_usecs > 4) &&
+            (ec->rx_coalesce_usecs < E1000_MIN_ITR_USECS)) ||
+           (ec->rx_coalesce_usecs == 2))
+               return -EINVAL;
+
+       if (ec->rx_coalesce_usecs == 4) {
+               adapter->itr = adapter->itr_setting = 4;
+       } else if (ec->rx_coalesce_usecs <= 3) {
+               adapter->itr = 20000;
+               adapter->itr_setting = ec->rx_coalesce_usecs;
+       } else {
+               adapter->itr = (1000000 / ec->rx_coalesce_usecs);
+               adapter->itr_setting = adapter->itr & ~3;
+       }
+
+       if (adapter->itr_setting != 0)
+               ew32(ITR, 1000000000 / (adapter->itr * 256));
+       else
+               ew32(ITR, 0);
+
+       return 0;
+}
+
+static int e1000_nway_reset(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (!netif_running(netdev))
+               return -EAGAIN;
+
+       if (!adapter->hw.mac.autoneg)
+               return -EINVAL;
+
+       e1000e_reinit_locked(adapter);
+
+       return 0;
+}
+
+static void e1000_get_ethtool_stats(struct net_device *netdev,
+                                   struct ethtool_stats *stats,
+                                   u64 *data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct rtnl_link_stats64 net_stats;
+       int i;
+       char *p = NULL;
+
+       e1000e_get_stats64(netdev, &net_stats);
+       for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
+               switch (e1000_gstrings_stats[i].type) {
+               case NETDEV_STATS:
+                       p = (char *) &net_stats +
+                                       e1000_gstrings_stats[i].stat_offset;
+                       break;
+               case E1000_STATS:
+                       p = (char *) adapter +
+                                       e1000_gstrings_stats[i].stat_offset;
+                       break;
+               default:
+                       data[i] = 0;
+                       continue;
+               }
+
+               data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
+                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+       }
+}
+
+static void e1000_get_strings(struct net_device *netdev, u32 stringset,
+                             u8 *data)
+{
+       u8 *p = data;
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_TEST:
+               memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test));
+               break;
+       case ETH_SS_STATS:
+               for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
+                       memcpy(p, e1000_gstrings_stats[i].stat_string,
+                              ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+               break;
+       }
+}
+
+static int e1000e_set_flags(struct net_device *netdev, u32 data)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       bool need_reset = false;
+       int rc;
+
+       need_reset = (data & ETH_FLAG_RXVLAN) !=
+                    (netdev->features & NETIF_F_HW_VLAN_RX);
+
+       rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
+                                 ETH_FLAG_TXVLAN);
+
+       if (rc)
+               return rc;
+
+       if (need_reset) {
+               if (netif_running(netdev))
+                       e1000e_reinit_locked(adapter);
+               else
+                       e1000e_reset(adapter);
+       }
+
+       return 0;
+}
+
+static const struct ethtool_ops e1000_ethtool_ops = {
+       .get_settings           = e1000_get_settings,
+       .set_settings           = e1000_set_settings,
+       .get_drvinfo            = e1000_get_drvinfo,
+       .get_regs_len           = e1000_get_regs_len,
+       .get_regs               = e1000_get_regs,
+       .get_wol                = e1000_get_wol,
+       .set_wol                = e1000_set_wol,
+       .get_msglevel           = e1000_get_msglevel,
+       .set_msglevel           = e1000_set_msglevel,
+       .nway_reset             = e1000_nway_reset,
+       .get_link               = ethtool_op_get_link,
+       .get_eeprom_len         = e1000_get_eeprom_len,
+       .get_eeprom             = e1000_get_eeprom,
+       .set_eeprom             = e1000_set_eeprom,
+       .get_ringparam          = e1000_get_ringparam,
+       .set_ringparam          = e1000_set_ringparam,
+       .get_pauseparam         = e1000_get_pauseparam,
+       .set_pauseparam         = e1000_set_pauseparam,
+       .get_rx_csum            = e1000_get_rx_csum,
+       .set_rx_csum            = e1000_set_rx_csum,
+       .get_tx_csum            = e1000_get_tx_csum,
+       .set_tx_csum            = e1000_set_tx_csum,
+       .get_sg                 = ethtool_op_get_sg,
+       .set_sg                 = ethtool_op_set_sg,
+       .get_tso                = ethtool_op_get_tso,
+       .set_tso                = e1000_set_tso,
+       .self_test              = e1000_diag_test,
+       .get_strings            = e1000_get_strings,
+       .set_phys_id            = e1000_set_phys_id,
+       .get_ethtool_stats      = e1000_get_ethtool_stats,
+       .get_sset_count         = e1000e_get_sset_count,
+       .get_coalesce           = e1000_get_coalesce,
+       .set_coalesce           = e1000_set_coalesce,
+       .get_flags              = ethtool_op_get_flags,
+       .set_flags              = e1000e_set_flags,
+};
+
+void e1000e_set_ethtool_ops(struct net_device *netdev)
+{
+       SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
+}
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
new file mode 100644 (file)
index 0000000..2967039
--- /dev/null
@@ -0,0 +1,984 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_HW_H_
+#define _E1000_HW_H_
+
+#include <linux/types.h>
+
+struct e1000_hw;
+struct e1000_adapter;
+
+#include "defines.h"
+
+#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_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)))
+
+enum e1e_registers {
+       E1000_CTRL     = 0x00000, /* Device Control - RW */
+       E1000_STATUS   = 0x00008, /* Device Status - RO */
+       E1000_EECD     = 0x00010, /* EEPROM/Flash Control - RW */
+       E1000_EERD     = 0x00014, /* EEPROM Read - RW */
+       E1000_CTRL_EXT = 0x00018, /* Extended Device Control - RW */
+       E1000_FLA      = 0x0001C, /* Flash Access - RW */
+       E1000_MDIC     = 0x00020, /* MDI Control - RW */
+       E1000_SCTL     = 0x00024, /* SerDes Control - RW */
+       E1000_FCAL     = 0x00028, /* Flow Control Address Low - RW */
+       E1000_FCAH     = 0x0002C, /* Flow Control Address High -RW */
+       E1000_FEXTNVM4 = 0x00024, /* Future Extended NVM 4 - RW */
+       E1000_FEXTNVM  = 0x00028, /* Future Extended NVM - RW */
+       E1000_FCT      = 0x00030, /* Flow Control Type - RW */
+       E1000_VET      = 0x00038, /* VLAN Ether Type - RW */
+       E1000_ICR      = 0x000C0, /* Interrupt Cause Read - R/clr */
+       E1000_ITR      = 0x000C4, /* Interrupt Throttling Rate - RW */
+       E1000_ICS      = 0x000C8, /* Interrupt Cause Set - WO */
+       E1000_IMS      = 0x000D0, /* Interrupt Mask Set - RW */
+       E1000_IMC      = 0x000D8, /* Interrupt Mask Clear - WO */
+       E1000_EIAC_82574 = 0x000DC, /* Ext. Interrupt Auto Clear - RW */
+       E1000_IAM      = 0x000E0, /* Interrupt Acknowledge Auto Mask */
+       E1000_IVAR     = 0x000E4, /* Interrupt Vector Allocation - RW */
+       E1000_EITR_82574_BASE = 0x000E8, /* Interrupt Throttling - RW */
+#define E1000_EITR_82574(_n) (E1000_EITR_82574_BASE + (_n << 2))
+       E1000_RCTL     = 0x00100, /* Rx Control - RW */
+       E1000_FCTTV    = 0x00170, /* Flow Control Transmit Timer Value - RW */
+       E1000_TXCW     = 0x00178, /* Tx Configuration Word - RW */
+       E1000_RXCW     = 0x00180, /* Rx Configuration Word - RO */
+       E1000_TCTL     = 0x00400, /* Tx Control - RW */
+       E1000_TCTL_EXT = 0x00404, /* Extended Tx Control - RW */
+       E1000_TIPG     = 0x00410, /* Tx Inter-packet gap -RW */
+       E1000_AIT      = 0x00458, /* Adaptive Interframe Spacing Throttle -RW */
+       E1000_LEDCTL   = 0x00E00, /* LED Control - RW */
+       E1000_EXTCNF_CTRL  = 0x00F00, /* Extended Configuration Control */
+       E1000_EXTCNF_SIZE  = 0x00F08, /* Extended Configuration Size */
+       E1000_PHY_CTRL     = 0x00F10, /* PHY Control Register in CSR */
+#define E1000_POEMB    E1000_PHY_CTRL  /* PHY OEM Bits */
+       E1000_PBA      = 0x01000, /* Packet Buffer Allocation - RW */
+       E1000_PBS      = 0x01008, /* Packet Buffer Size */
+       E1000_EEMNGCTL = 0x01010, /* MNG EEprom Control */
+       E1000_EEWR     = 0x0102C, /* EEPROM Write Register - RW */
+       E1000_FLOP     = 0x0103C, /* FLASH Opcode Register */
+       E1000_PBA_ECC  = 0x01100, /* PBA ECC Register */
+       E1000_ERT      = 0x02008, /* Early Rx Threshold - RW */
+       E1000_FCRTL    = 0x02160, /* Flow Control Receive Threshold Low - RW */
+       E1000_FCRTH    = 0x02168, /* Flow Control Receive Threshold High - RW */
+       E1000_PSRCTL   = 0x02170, /* Packet Split Receive Control - RW */
+       E1000_RDBAL    = 0x02800, /* Rx Descriptor Base Address Low - RW */
+       E1000_RDBAH    = 0x02804, /* Rx Descriptor Base Address High - RW */
+       E1000_RDLEN    = 0x02808, /* Rx Descriptor Length - RW */
+       E1000_RDH      = 0x02810, /* Rx Descriptor Head - RW */
+       E1000_RDT      = 0x02818, /* Rx Descriptor Tail - RW */
+       E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
+       E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */
+#define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))
+       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_REG(_n)   (E1000_RDBAL + (_n << 8))
+       E1000_KABGTXD  = 0x03004, /* AFE Band Gap Transmit Ref Data */
+       E1000_TDBAL    = 0x03800, /* Tx Descriptor Base Address Low - RW */
+       E1000_TDBAH    = 0x03804, /* Tx Descriptor Base Address High - RW */
+       E1000_TDLEN    = 0x03808, /* Tx Descriptor Length - RW */
+       E1000_TDH      = 0x03810, /* Tx Descriptor Head - RW */
+       E1000_TDT      = 0x03818, /* Tx Descriptor Tail - RW */
+       E1000_TIDV     = 0x03820, /* Tx Interrupt Delay Value - RW */
+       E1000_TXDCTL_BASE = 0x03828, /* Tx Descriptor Control - RW */
+#define E1000_TXDCTL(_n)   (E1000_TXDCTL_BASE + (_n << 8))
+       E1000_TADV     = 0x0382C, /* Tx Interrupt Absolute Delay Val - RW */
+       E1000_TARC_BASE = 0x03840, /* Tx Arbitration Count (0) */
+#define E1000_TARC(_n)   (E1000_TARC_BASE + (_n << 8))
+       E1000_CRCERRS  = 0x04000, /* CRC Error Count - R/clr */
+       E1000_ALGNERRC = 0x04004, /* Alignment Error Count - R/clr */
+       E1000_SYMERRS  = 0x04008, /* Symbol Error Count - R/clr */
+       E1000_RXERRC   = 0x0400C, /* Receive Error Count - R/clr */
+       E1000_MPC      = 0x04010, /* Missed Packet Count - R/clr */
+       E1000_SCC      = 0x04014, /* Single Collision Count - R/clr */
+       E1000_ECOL     = 0x04018, /* Excessive Collision Count - R/clr */
+       E1000_MCC      = 0x0401C, /* Multiple Collision Count - R/clr */
+       E1000_LATECOL  = 0x04020, /* Late Collision Count - R/clr */
+       E1000_COLC     = 0x04028, /* Collision Count - R/clr */
+       E1000_DC       = 0x04030, /* Defer Count - R/clr */
+       E1000_TNCRS    = 0x04034, /* Tx-No CRS - R/clr */
+       E1000_SEC      = 0x04038, /* Sequence Error Count - R/clr */
+       E1000_CEXTERR  = 0x0403C, /* Carrier Extension Error Count - R/clr */
+       E1000_RLEC     = 0x04040, /* Receive Length Error Count - R/clr */
+       E1000_XONRXC   = 0x04048, /* XON Rx Count - R/clr */
+       E1000_XONTXC   = 0x0404C, /* XON Tx Count - R/clr */
+       E1000_XOFFRXC  = 0x04050, /* XOFF Rx Count - R/clr */
+       E1000_XOFFTXC  = 0x04054, /* XOFF Tx Count - R/clr */
+       E1000_FCRUC    = 0x04058, /* Flow Control Rx Unsupported Count- R/clr */
+       E1000_PRC64    = 0x0405C, /* Packets Rx (64 bytes) - R/clr */
+       E1000_PRC127   = 0x04060, /* Packets Rx (65-127 bytes) - R/clr */
+       E1000_PRC255   = 0x04064, /* Packets Rx (128-255 bytes) - R/clr */
+       E1000_PRC511   = 0x04068, /* Packets Rx (255-511 bytes) - R/clr */
+       E1000_PRC1023  = 0x0406C, /* Packets Rx (512-1023 bytes) - R/clr */
+       E1000_PRC1522  = 0x04070, /* Packets Rx (1024-1522 bytes) - R/clr */
+       E1000_GPRC     = 0x04074, /* Good Packets Rx Count - R/clr */
+       E1000_BPRC     = 0x04078, /* Broadcast Packets Rx Count - R/clr */
+       E1000_MPRC     = 0x0407C, /* Multicast Packets Rx Count - R/clr */
+       E1000_GPTC     = 0x04080, /* Good Packets Tx Count - R/clr */
+       E1000_GORCL    = 0x04088, /* Good Octets Rx Count Low - R/clr */
+       E1000_GORCH    = 0x0408C, /* Good Octets Rx Count High - R/clr */
+       E1000_GOTCL    = 0x04090, /* Good Octets Tx Count Low - R/clr */
+       E1000_GOTCH    = 0x04094, /* Good Octets Tx Count High - R/clr */
+       E1000_RNBC     = 0x040A0, /* Rx No Buffers Count - R/clr */
+       E1000_RUC      = 0x040A4, /* Rx Undersize Count - R/clr */
+       E1000_RFC      = 0x040A8, /* Rx Fragment Count - R/clr */
+       E1000_ROC      = 0x040AC, /* Rx Oversize Count - R/clr */
+       E1000_RJC      = 0x040B0, /* Rx Jabber Count - R/clr */
+       E1000_MGTPRC   = 0x040B4, /* Management Packets Rx Count - R/clr */
+       E1000_MGTPDC   = 0x040B8, /* Management Packets Dropped Count - R/clr */
+       E1000_MGTPTC   = 0x040BC, /* Management Packets Tx Count - R/clr */
+       E1000_TORL     = 0x040C0, /* Total Octets Rx Low - R/clr */
+       E1000_TORH     = 0x040C4, /* Total Octets Rx High - R/clr */
+       E1000_TOTL     = 0x040C8, /* Total Octets Tx Low - R/clr */
+       E1000_TOTH     = 0x040CC, /* Total Octets Tx High - R/clr */
+       E1000_TPR      = 0x040D0, /* Total Packets Rx - R/clr */
+       E1000_TPT      = 0x040D4, /* Total Packets Tx - R/clr */
+       E1000_PTC64    = 0x040D8, /* Packets Tx (64 bytes) - R/clr */
+       E1000_PTC127   = 0x040DC, /* Packets Tx (65-127 bytes) - R/clr */
+       E1000_PTC255   = 0x040E0, /* Packets Tx (128-255 bytes) - R/clr */
+       E1000_PTC511   = 0x040E4, /* Packets Tx (256-511 bytes) - R/clr */
+       E1000_PTC1023  = 0x040E8, /* Packets Tx (512-1023 bytes) - R/clr */
+       E1000_PTC1522  = 0x040EC, /* Packets Tx (1024-1522 Bytes) - R/clr */
+       E1000_MPTC     = 0x040F0, /* Multicast Packets Tx Count - R/clr */
+       E1000_BPTC     = 0x040F4, /* Broadcast Packets Tx Count - R/clr */
+       E1000_TSCTC    = 0x040F8, /* TCP Segmentation Context Tx - R/clr */
+       E1000_TSCTFC   = 0x040FC, /* TCP Segmentation Context Tx Fail - R/clr */
+       E1000_IAC      = 0x04100, /* Interrupt Assertion Count */
+       E1000_ICRXPTC  = 0x04104, /* Irq Cause Rx Packet Timer Expire Count */
+       E1000_ICRXATC  = 0x04108, /* Irq Cause Rx Abs Timer Expire Count */
+       E1000_ICTXPTC  = 0x0410C, /* Irq Cause Tx Packet Timer Expire Count */
+       E1000_ICTXATC  = 0x04110, /* Irq Cause Tx Abs Timer Expire Count */
+       E1000_ICTXQEC  = 0x04118, /* Irq Cause Tx Queue Empty Count */
+       E1000_ICTXQMTC = 0x0411C, /* Irq Cause Tx Queue MinThreshold Count */
+       E1000_ICRXDMTC = 0x04120, /* Irq Cause Rx Desc MinThreshold Count */
+       E1000_ICRXOC   = 0x04124, /* Irq Cause Receiver Overrun Count */
+       E1000_RXCSUM   = 0x05000, /* Rx Checksum Control - RW */
+       E1000_RFCTL    = 0x05008, /* Receive Filter Control */
+       E1000_MTA      = 0x05200, /* Multicast Table Array - RW Array */
+       E1000_RAL_BASE = 0x05400, /* Receive Address Low - RW */
+#define E1000_RAL(_n)   (E1000_RAL_BASE + ((_n) * 8))
+#define E1000_RA        (E1000_RAL(0))
+       E1000_RAH_BASE = 0x05404, /* Receive Address High - RW */
+#define E1000_RAH(_n)   (E1000_RAH_BASE + ((_n) * 8))
+       E1000_VFTA     = 0x05600, /* VLAN Filter Table Array - RW Array */
+       E1000_WUC      = 0x05800, /* Wakeup Control - RW */
+       E1000_WUFC     = 0x05808, /* Wakeup Filter Control - RW */
+       E1000_WUS      = 0x05810, /* Wakeup Status - RO */
+       E1000_MANC     = 0x05820, /* Management Control - RW */
+       E1000_FFLT     = 0x05F00, /* Flexible Filter Length Table - RW Array */
+       E1000_HOST_IF  = 0x08800, /* Host Interface */
+
+       E1000_KMRNCTRLSTA = 0x00034, /* MAC-PHY interface - RW */
+       E1000_MANC2H    = 0x05860, /* Management Control To Host - RW */
+       E1000_MDEF_BASE = 0x05890, /* Management Decision Filters */
+#define E1000_MDEF(_n)   (E1000_MDEF_BASE + ((_n) * 4))
+       E1000_SW_FW_SYNC = 0x05B5C, /* Software-Firmware Synchronization - RW */
+       E1000_GCR       = 0x05B00, /* PCI-Ex Control */
+       E1000_GCR2      = 0x05B64, /* PCI-Ex Control #2 */
+       E1000_FACTPS    = 0x05B30, /* Function Active and Power State to MNG */
+       E1000_SWSM      = 0x05B50, /* SW Semaphore */
+       E1000_FWSM      = 0x05B54, /* FW Semaphore */
+       E1000_SWSM2     = 0x05B58, /* Driver-only SW semaphore */
+       E1000_FFLT_DBG  = 0x05F04, /* Debug Register */
+       E1000_PCH_RAICC_BASE = 0x05F50, /* Receive Address Initial CRC */
+#define E1000_PCH_RAICC(_n)    (E1000_PCH_RAICC_BASE + ((_n) * 4))
+#define E1000_CRC_OFFSET       E1000_PCH_RAICC_BASE
+       E1000_HICR      = 0x08F00, /* Host Interface Control */
+};
+
+#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 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 BM_WUC_PAGE                    800
+#define BM_WUC_ADDRESS_OPCODE          0x11
+#define BM_WUC_DATA_OPCODE             0x12
+#define BM_WUC_ENABLE_PAGE             769
+#define BM_WUC_ENABLE_REG              17
+#define BM_WUC_ENABLE_BIT              (1 << 2)
+#define BM_WUC_HOST_WU_BIT             (1 << 4)
+#define BM_WUC_ME_WU_BIT               (1 << 5)
+
+#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 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
+
+#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
+
+/* manage.c */
+#define E1000_VFTA_ENTRY_SHIFT         5
+#define E1000_VFTA_ENTRY_MASK          0x7F
+#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK        0x1F
+
+#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_FW_RESET_ENABLE     0x40
+#define E1000_HICR_FW_RESET            0x80
+
+#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
+
+/* nvm.c */
+#define E1000_STM_OPCODE  0xDB00
+
+#define E1000_KMRNCTRLSTA_OFFSET       0x001F0000
+#define E1000_KMRNCTRLSTA_OFFSET_SHIFT 16
+#define E1000_KMRNCTRLSTA_REN          0x00200000
+#define E1000_KMRNCTRLSTA_CTRL_OFFSET  0x1    /* Kumeran Control */
+#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_IBIST_DISABLE        0x0200 /* Kumeran IBIST Disable */
+#define E1000_KMRNCTRLSTA_DIAG_NELPBK  0x1000 /* Nearend Loopback mode */
+#define E1000_KMRNCTRLSTA_K1_CONFIG    0x7
+#define E1000_KMRNCTRLSTA_K1_ENABLE    0x0002
+#define E1000_KMRNCTRLSTA_HD_CTRL      0x10   /* Kumeran HD Control */
+
+#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
+
+/* 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 */
+
+#define E1000_CABLE_LENGTH_UNDEFINED   0xFF
+
+#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_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_82571EB_SERDES_DUAL       0x10D9
+#define E1000_DEV_ID_82571EB_SERDES_QUAD       0x10DA
+#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_AMT              0x10BD
+#define E1000_DEV_ID_ICH9_BM                   0x10E5
+#define E1000_DEV_ID_ICH9_IGP_M_AMT            0x10F5
+#define E1000_DEV_ID_ICH9_IGP_M                        0x10BF
+#define E1000_DEV_ID_ICH9_IGP_M_V              0x10CB
+#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_ICH10_D_BM_V              0x1525
+#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_4 4
+
+#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_82571,
+       e1000_82572,
+       e1000_82573,
+       e1000_82574,
+       e1000_82583,
+       e1000_80003es2lan,
+       e1000_ich8lan,
+       e1000_ich9lan,
+       e1000_ich10lan,
+       e1000_pchlan,
+       e1000_pch2lan,
+};
+
+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_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_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;
+};
+
+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];
+};
+
+/* Function pointers and static data for the MAC. */
+struct e1000_mac_operations {
+       s32  (*id_led_init)(struct e1000_hw *);
+       s32  (*blink_led)(struct e1000_hw *);
+       bool (*check_mng_mode)(struct e1000_hw *);
+       s32  (*check_for_link)(struct e1000_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);
+       s32  (*read_mac_addr)(struct e1000_hw *);
+};
+
+/*
+ * When to use various PHY register access functions:
+ *
+ *                 Func   Caller
+ *   Function      Does   Does    When to use
+ *   ~~~~~~~~~~~~  ~~~~~  ~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *   X_reg         L,P,A  n/a     for simple PHY reg accesses
+ *   X_reg_locked  P,A    L       for multiple accesses of different regs
+ *                                on different pages
+ *   X_reg_page    A      L,P     for multiple accesses of different regs
+ *                                on the same page
+ *
+ * Where X=[read|write], L=locking, P=sets page, A=register access
+ *
+ */
+struct e1000_phy_operations {
+       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 *);
+       s32  (*force_speed_duplex)(struct e1000_hw *);
+       s32  (*get_cfg_done)(struct e1000_hw *hw);
+       s32  (*get_cable_length)(struct e1000_hw *);
+       s32  (*get_info)(struct e1000_hw *);
+       s32  (*set_page)(struct e1000_hw *, u16);
+       s32  (*read_reg)(struct e1000_hw *, u32, u16 *);
+       s32  (*read_reg_locked)(struct e1000_hw *, u32, u16 *);
+       s32  (*read_reg_page)(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);
+       s32  (*write_reg_page)(struct e1000_hw *, u32, u16);
+       void (*power_up)(struct e1000_hw *);
+       void (*power_down)(struct e1000_hw *);
+};
+
+/* Function pointers for the NVM. */
+struct e1000_nvm_operations {
+       s32  (*acquire)(struct e1000_hw *);
+       s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
+       void (*release)(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[ETH_ALEN];
+       u8 perm_addr[ETH_ALEN];
+
+       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 has_fwsm;
+       bool arc_subsystem_valid;
+       bool autoneg;
+       bool autoneg_failed;
+       bool get_link_status;
+       bool in_ifs_mode;
+       bool serdes_has_link;
+       bool tx_pkt_filtering;
+       enum e1000_serdes_link_state serdes_link_state;
+};
+
+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 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_width width;
+
+       u16 func;
+};
+
+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 */
+       u16 refresh_time;        /* Flow control refresh 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;
+       bool eee_disable;
+};
+
+struct e1000_hw {
+       struct e1000_adapter *adapter;
+
+       u8 __iomem *hw_addr;
+       u8 __iomem *flash_address;
+
+       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     e82571;
+               struct e1000_dev_spec_80003es2lan e80003es2lan;
+               struct e1000_dev_spec_ich8lan   ich8lan;
+       } dev_spec;
+};
+
+#endif
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
new file mode 100644 (file)
index 0000000..4e36978
--- /dev/null
@@ -0,0 +1,4111 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+/*
+ * 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
+ * 82579LM Gigabit Network Connection
+ * 82579V Gigabit Network Connection
+ */
+
+#include "e1000.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
+#define ICH_FLASH_PR0                  0x0074
+
+#define ICH_FLASH_READ_COMMAND_TIMEOUT 500
+#define ICH_FLASH_WRITE_COMMAND_TIMEOUT        500
+#define ICH_FLASH_ERASE_COMMAND_TIMEOUT        3000000
+#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 E1000_ICH_FWSM_RSPCIPHY        0x00000040 /* Reset PHY on PCI Reset */
+/* 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_DEF1_OFF2 <<  8) | \
+                                (ID_LED_DEF1_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 E1000_FEXTNVM4_BEACON_DURATION_MASK    0x7
+#define E1000_FEXTNVM4_BEACON_DURATION_8USEC   0x7
+#define E1000_FEXTNVM4_BEACON_DURATION_16USEC  0x3
+
+#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_KMRN_DIAG_PCS_LOCK_LOSS   0x0002
+#define IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK 0x0300
+#define IGP3_VR_CTRL_MODE_SHUTDOWN     0x0200
+
+#define HV_LED_CONFIG          PHY_REG(768, 30) /* LED Configuration */
+
+#define SW_FLAG_TIMEOUT    1000 /* SW Semaphore flag timeout in milliseconds */
+
+/* SMBus Address Phy Register */
+#define HV_SMB_ADDR            PHY_REG(768, 26)
+#define HV_SMB_ADDR_MASK       0x007F
+#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)
+
+/* PHY Low Power Idle Control */
+#define I82579_LPI_CTRL                        PHY_REG(772, 20)
+#define I82579_LPI_CTRL_ENABLE_MASK    0x6000
+
+/* EMI Registers */
+#define I82579_EMI_ADDR         0x10
+#define I82579_EMI_DATA         0x11
+#define I82579_LPI_UPDATE_TIMER 0x4805 /* in 40ns units + 40 ns base value */
+
+/* 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 E1000_NVM_K1_CONFIG 0x1B /* NVM K1 Config Word */
+#define E1000_NVM_K1_ENABLE 0x1  /* NVM Enable K1 bit */
+
+/* KMRN Mode Control */
+#define HV_KMRN_MODE_CTRL      PHY_REG(769, 16)
+#define HV_KMRN_MDIO_SLOW      0x0400
+
+/* 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;
+};
+
+/* ICH Flash Protected Region */
+union ich8_flash_protected_range {
+       struct ich8_pr {
+               u32 base:13;     /* 0:12 Protected Range Base */
+               u32 reserved1:2; /* 13:14 Reserved */
+               u32 rpe:1;       /* 15 Read Protection Enable */
+               u32 limit:13;    /* 16:28 Protected Range Limit */
+               u32 reserved2:2; /* 29:30 Reserved */
+               u32 wpe:1;       /* 31 Write Protection Enable */
+       } range;
+       u32 regval;
+};
+
+static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw);
+static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw);
+static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw);
+static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank);
+static s32 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
+                                               u32 offset, u8 byte);
+static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
+                                        u8 *data);
+static s32 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
+                                        u16 *data);
+static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
+                                        u8 size, u16 *data);
+static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw);
+static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw);
+static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw);
+static s32 e1000_cleanup_led_ich8lan(struct e1000_hw *hw);
+static s32 e1000_led_on_ich8lan(struct e1000_hw *hw);
+static s32 e1000_led_off_ich8lan(struct e1000_hw *hw);
+static s32 e1000_id_led_init_pchlan(struct e1000_hw *hw);
+static s32 e1000_setup_led_pchlan(struct e1000_hw *hw);
+static s32 e1000_cleanup_led_pchlan(struct e1000_hw *hw);
+static s32 e1000_led_on_pchlan(struct e1000_hw *hw);
+static s32 e1000_led_off_pchlan(struct e1000_hw *hw);
+static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active);
+static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
+static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw);
+static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
+static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
+static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
+static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
+static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);
+static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);
+
+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))
+
+static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
+{
+       u32 ctrl;
+
+       ctrl = er32(CTRL);
+       ctrl |= E1000_CTRL_LANPHYPC_OVERRIDE;
+       ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
+       ew32(CTRL, ctrl);
+       e1e_flush();
+       udelay(10);
+       ctrl &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
+       ew32(CTRL, ctrl);
+}
+
+/**
+ *  e1000_init_phy_params_pchlan - Initialize PHY function pointers
+ *  @hw: pointer to the HW structure
+ *
+ *  Initialize family-specific PHY parameters and function pointers.
+ **/
+static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       u32 fwsm;
+       s32 ret_val = 0;
+
+       phy->addr                     = 1;
+       phy->reset_delay_us           = 100;
+
+       phy->ops.set_page             = e1000_set_page_igp;
+       phy->ops.read_reg             = e1000_read_phy_reg_hv;
+       phy->ops.read_reg_locked      = e1000_read_phy_reg_hv_locked;
+       phy->ops.read_reg_page        = e1000_read_phy_reg_page_hv;
+       phy->ops.set_d0_lplu_state    = e1000_set_lplu_state_pchlan;
+       phy->ops.set_d3_lplu_state    = e1000_set_lplu_state_pchlan;
+       phy->ops.write_reg            = e1000_write_phy_reg_hv;
+       phy->ops.write_reg_locked     = e1000_write_phy_reg_hv_locked;
+       phy->ops.write_reg_page       = e1000_write_phy_reg_page_hv;
+       phy->ops.power_up             = e1000_power_up_phy_copper;
+       phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;
+       phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+
+       /*
+        * The MAC-PHY interconnect may still be in SMBus mode
+        * after Sx->S0.  If the manageability engine (ME) is
+        * disabled, then toggle the LANPHYPC Value bit to force
+        * the interconnect to PCIe mode.
+        */
+       fwsm = er32(FWSM);
+       if (!(fwsm & E1000_ICH_FWSM_FW_VALID) && !e1000_check_reset_block(hw)) {
+               e1000_toggle_lanphypc_value_ich8lan(hw);
+               msleep(50);
+
+               /*
+                * Gate automatic PHY configuration by hardware on
+                * non-managed 82579
+                */
+               if (hw->mac.type == e1000_pch2lan)
+                       e1000_gate_hw_phy_config_ich8lan(hw, true);
+       }
+
+       /*
+        * Reset the PHY before any access to it.  Doing so, ensures that
+        * the PHY is in a known good state before we read/write PHY registers.
+        * The generic reset is sufficient here, because we haven't determined
+        * the PHY type yet.
+        */
+       ret_val = e1000e_phy_hw_reset_generic(hw);
+       if (ret_val)
+               goto out;
+
+       /* Ungate automatic PHY configuration on non-managed 82579 */
+       if ((hw->mac.type == e1000_pch2lan) &&
+           !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
+               usleep_range(10000, 20000);
+               e1000_gate_hw_phy_config_ich8lan(hw, false);
+       }
+
+       phy->id = e1000_phy_unknown;
+       switch (hw->mac.type) {
+       default:
+               ret_val = e1000e_get_phy_id(hw);
+               if (ret_val)
+                       goto out;
+               if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
+                       break;
+               /* fall-through */
+       case e1000_pch2lan:
+               /*
+                * In case the PHY needs to be in mdio slow mode,
+                * set slow mode and try to get the PHY id again.
+                */
+               ret_val = e1000_set_mdio_slow_mode_hv(hw);
+               if (ret_val)
+                       goto out;
+               ret_val = e1000e_get_phy_id(hw);
+               if (ret_val)
+                       goto out;
+               break;
+       }
+       phy->type = e1000e_get_phy_type_from_id(phy->id);
+
+       switch (phy->type) {
+       case e1000_phy_82577:
+       case e1000_phy_82579:
+               phy->ops.check_polarity = e1000_check_polarity_82577;
+               phy->ops.force_speed_duplex =
+                   e1000_phy_force_speed_duplex_82577;
+               phy->ops.get_cable_length = e1000_get_cable_length_82577;
+               phy->ops.get_info = e1000_get_phy_info_82577;
+               phy->ops.commit = e1000e_phy_sw_reset;
+               break;
+       case e1000_phy_82578:
+               phy->ops.check_polarity = e1000_check_polarity_m88;
+               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
+               phy->ops.get_cable_length = e1000e_get_cable_length_m88;
+               phy->ops.get_info = e1000e_get_phy_info_m88;
+               break;
+       default:
+               ret_val = -E1000_ERR_PHY;
+               break;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_init_phy_params_ich8lan - Initialize PHY function pointers
+ *  @hw: pointer to the HW structure
+ *
+ *  Initialize family-specific PHY parameters and function pointers.
+ **/
+static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 i = 0;
+
+       phy->addr                       = 1;
+       phy->reset_delay_us             = 100;
+
+       phy->ops.power_up               = e1000_power_up_phy_copper;
+       phy->ops.power_down             = e1000_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) {
+                       e_dbg("Cannot determine PHY addr. Erroring out\n");
+                       return ret_val;
+               }
+       }
+
+       phy->id = 0;
+       while ((e1000_phy_unknown == e1000e_get_phy_type_from_id(phy->id)) &&
+              (i++ < 100)) {
+               usleep_range(1000, 2000);
+               ret_val = e1000e_get_phy_id(hw);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /* 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;
+               phy->ops.get_info = e1000e_get_phy_info_igp;
+               phy->ops.check_polarity = e1000_check_polarity_igp;
+               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_igp;
+               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;
+               phy->ops.get_info = e1000_get_phy_info_ife;
+               phy->ops.check_polarity = e1000_check_polarity_ife;
+               phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_ife;
+               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;
+               phy->ops.get_info = e1000e_get_phy_info_m88;
+               phy->ops.check_polarity = e1000_check_polarity_m88;
+               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
+               break;
+       default:
+               return -E1000_ERR_PHY;
+               break;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_init_nvm_params_ich8lan - Initialize NVM function pointers
+ *  @hw: pointer to the HW structure
+ *
+ *  Initialize family-specific NVM parameters and function
+ *  pointers.
+ **/
+static s32 e1000_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;
+       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");
+               return -E1000_ERR_CONFIG;
+       }
+
+       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;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_init_mac_params_ich8lan - Initialize MAC function pointers
+ *  @hw: pointer to the HW structure
+ *
+ *  Initialize family-specific MAC parameters and function
+ *  pointers.
+ **/
+static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->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--;
+       /* FWSM register */
+       mac->has_fwsm = true;
+       /* ARC subsystem not supported */
+       mac->arc_subsystem_valid = false;
+       /* Adaptive IFS supported */
+       mac->adaptive_ifs = true;
+
+       /* LED operations */
+       switch (mac->type) {
+       case e1000_ich8lan:
+       case e1000_ich9lan:
+       case e1000_ich10lan:
+               /* check management mode */
+               mac->ops.check_mng_mode = e1000_check_mng_mode_ich8lan;
+               /* ID LED init */
+               mac->ops.id_led_init = e1000e_id_led_init;
+               /* blink LED */
+               mac->ops.blink_led = e1000e_blink_led_generic;
+               /* setup LED */
+               mac->ops.setup_led = e1000e_setup_led_generic;
+               /* cleanup LED */
+               mac->ops.cleanup_led = e1000_cleanup_led_ich8lan;
+               /* turn on/off LED */
+               mac->ops.led_on = e1000_led_on_ich8lan;
+               mac->ops.led_off = e1000_led_off_ich8lan;
+               break;
+       case e1000_pchlan:
+       case e1000_pch2lan:
+               /* check management mode */
+               mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
+               /* ID LED init */
+               mac->ops.id_led_init = e1000_id_led_init_pchlan;
+               /* setup LED */
+               mac->ops.setup_led = e1000_setup_led_pchlan;
+               /* cleanup LED */
+               mac->ops.cleanup_led = e1000_cleanup_led_pchlan;
+               /* turn on/off LED */
+               mac->ops.led_on = e1000_led_on_pchlan;
+               mac->ops.led_off = e1000_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);
+
+       /* Gate automatic PHY configuration by hardware on managed 82579 */
+       if ((mac->type == e1000_pch2lan) &&
+           (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
+               e1000_gate_hw_phy_config_ich8lan(hw, true);
+
+       return 0;
+}
+
+/**
+ *  e1000_set_eee_pchlan - Enable/disable EEE support
+ *  @hw: pointer to the HW structure
+ *
+ *  Enable/disable EEE based on setting in dev_spec structure.  The bits in
+ *  the LPI Control register will remain set only if/when link is up.
+ **/
+static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 phy_reg;
+
+       if (hw->phy.type != e1000_phy_82579)
+               goto out;
+
+       ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg);
+       if (ret_val)
+               goto out;
+
+       if (hw->dev_spec.ich8lan.eee_disable)
+               phy_reg &= ~I82579_LPI_CTRL_ENABLE_MASK;
+       else
+               phy_reg |= I82579_LPI_CTRL_ENABLE_MASK;
+
+       ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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 = 0;
+               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 = e1000_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 = e1000_link_stall_workaround_hv(hw);
+               if (ret_val)
+                       goto out;
+       }
+
+       if (hw->mac.type == e1000_pch2lan) {
+               ret_val = e1000_k1_workaround_lv(hw);
+               if (ret_val)
+                       goto out;
+       }
+
+       /*
+        * Check if there was DownShift, must be checked
+        * immediately after link-up
+        */
+       e1000e_check_downshift(hw);
+
+       /* Enable/Disable EEE after link up */
+       ret_val = e1000_set_eee_pchlan(hw);
+       if (ret_val)
+               goto out;
+
+       /*
+        * 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;
+}
+
+static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       s32 rc;
+
+       rc = e1000_init_mac_params_ich8lan(adapter);
+       if (rc)
+               return rc;
+
+       rc = e1000_init_nvm_params_ich8lan(hw);
+       if (rc)
+               return rc;
+
+       switch (hw->mac.type) {
+       case e1000_ich8lan:
+       case e1000_ich9lan:
+       case e1000_ich10lan:
+               rc = e1000_init_phy_params_ich8lan(hw);
+               break;
+       case e1000_pchlan:
+       case e1000_pch2lan:
+               rc = e1000_init_phy_params_pchlan(hw);
+               break;
+       default:
+               break;
+       }
+       if (rc)
+               return rc;
+
+       /*
+        * Disable Jumbo Frame support on parts with Intel 10/100 PHY or
+        * on parts with MACsec enabled in NVM (reflected in CTRL_EXT).
+        */
+       if ((adapter->hw.phy.type == e1000_phy_ife) ||
+           ((adapter->hw.mac.type >= e1000_pch2lan) &&
+            (!(er32(CTRL_EXT) & E1000_CTRL_EXT_LSECCK)))) {
+               adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES;
+               adapter->max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN;
+
+               hw->mac.ops.blink_led = NULL;
+       }
+
+       if ((adapter->hw.mac.type == e1000_ich8lan) &&
+           (adapter->hw.phy.type == e1000_phy_igp_3))
+               adapter->flags |= FLAG_LSC_GIG_SPEED_DROP;
+
+       /* Disable EEE by default until IEEE802.3az spec is finalized */
+       if (adapter->flags2 & FLAG2_HAS_EEE)
+               adapter->hw.dev_spec.ich8lan.eee_disable = true;
+
+       return 0;
+}
+
+static DEFINE_MUTEX(nvm_mutex);
+
+/**
+ *  e1000_acquire_nvm_ich8lan - Acquire NVM mutex
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquires the mutex for performing NVM operations.
+ **/
+static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw)
+{
+       mutex_lock(&nvm_mutex);
+
+       return 0;
+}
+
+/**
+ *  e1000_release_nvm_ich8lan - Release NVM mutex
+ *  @hw: pointer to the HW structure
+ *
+ *  Releases the mutex used while performing NVM operations.
+ **/
+static void e1000_release_nvm_ich8lan(struct e1000_hw *hw)
+{
+       mutex_unlock(&nvm_mutex);
+}
+
+static DEFINE_MUTEX(swflag_mutex);
+
+/**
+ *  e1000_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 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
+{
+       u32 extcnf_ctrl, timeout = PHY_CFG_TIMEOUT;
+       s32 ret_val = 0;
+
+       mutex_lock(&swflag_mutex);
+
+       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 (ret_val)
+               mutex_unlock(&swflag_mutex);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_release_swflag_ich8lan(struct e1000_hw *hw)
+{
+       u32 extcnf_ctrl;
+
+       extcnf_ctrl = er32(EXTCNF_CTRL);
+
+       if (extcnf_ctrl & E1000_EXTCNF_CTRL_SWFLAG) {
+               extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
+               ew32(EXTCNF_CTRL, extcnf_ctrl);
+       } else {
+               e_dbg("Semaphore unexpectedly released by sw/fw/hw\n");
+       }
+
+       mutex_unlock(&swflag_mutex);
+}
+
+/**
+ *  e1000_check_mng_mode_ich8lan - Checks management mode
+ *  @hw: pointer to the HW structure
+ *
+ *  This checks if the adapter has any manageability enabled.
+ *  This is a function pointer entry point only called by read/write
+ *  routines for the PHY and NVM parts.
+ **/
+static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
+{
+       u32 fwsm;
+
+       fwsm = er32(FWSM);
+       return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
+              ((fwsm & E1000_FWSM_MODE_MASK) ==
+               (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+}
+
+/**
+ *  e1000_check_mng_mode_pchlan - Checks management mode
+ *  @hw: pointer to the HW structure
+ *
+ *  This checks if the adapter has iAMT enabled.
+ *  This is a function pointer entry point only called by read/write
+ *  routines for the PHY and NVM parts.
+ **/
+static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
+{
+       u32 fwsm;
+
+       fwsm = er32(FWSM);
+       return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
+              (fwsm & (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+}
+
+/**
+ *  e1000_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 e1000_check_reset_block_ich8lan(struct e1000_hw *hw)
+{
+       u32 fwsm;
+
+       fwsm = er32(FWSM);
+
+       return (fwsm & E1000_ICH_FWSM_RSPCIPHY) ? 0 : E1000_BLK_PHY_RESET;
+}
+
+/**
+ *  e1000_write_smbus_addr - Write SMBus address to PHY needed during Sx states
+ *  @hw: pointer to the HW structure
+ *
+ *  Assumes semaphore already acquired.
+ *
+ **/
+static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
+{
+       u16 phy_data;
+       u32 strap = er32(STRAP);
+       s32 ret_val = 0;
+
+       strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
+
+       ret_val = e1000_read_phy_reg_hv_locked(hw, HV_SMB_ADDR, &phy_data);
+       if (ret_val)
+               goto out;
+
+       phy_data &= ~HV_SMB_ADDR_MASK;
+       phy_data |= (strap >> E1000_STRAP_SMBUS_ADDRESS_SHIFT);
+       phy_data |= HV_SMB_ADDR_PEC_EN | HV_SMB_ADDR_VALID;
+       ret_val = e1000_write_phy_reg_hv_locked(hw, HV_SMB_ADDR, phy_data);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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 = 0;
+       u16 word_addr, reg_data, reg_addr, phy_page = 0;
+
+       /*
+        * 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.
+        */
+       switch (hw->mac.type) {
+       case e1000_ich8lan:
+               if (phy->type != e1000_phy_igp_3)
+                       return ret_val;
+
+               if ((hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) ||
+                   (hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_C)) {
+                       sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
+                       break;
+               }
+               /* Fall-thru */
+       case e1000_pchlan:
+       case e1000_pch2lan:
+               sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
+               break;
+       default:
+               return ret_val;
+       }
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       data = er32(FEXTNVM);
+       if (!(data & sw_cfg_mask))
+               goto out;
+
+       /*
+        * Make sure HW does not configure LCD from PHY
+        * extended configuration before SW configuration
+        */
+       data = er32(EXTCNF_CTRL);
+       if (!(hw->mac.type == e1000_pch2lan)) {
+               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.
+                */
+               ret_val = e1000_write_smbus_addr(hw);
+               if (ret_val)
+                       goto out;
+
+               data = er32(LEDCTL);
+               ret_val = e1000_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 = e1000_read_nvm(hw, (word_addr + i * 2), 1,
+                                        &reg_data);
+               if (ret_val)
+                       goto out;
+
+               ret_val = e1000_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;
+}
+
+/**
+ *  e1000_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 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
+{
+       s32 ret_val = 0;
+       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 = e1000_configure_k1_ich8lan(hw, k1_enable);
+
+release:
+       hw->phy.ops.release(hw);
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
+{
+       s32 ret_val = 0;
+       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);
+
+       ew32(CTRL_EXT, ctrl_ext | E1000_CTRL_EXT_SPD_BYPS);
+       e1e_flush();
+       udelay(20);
+       ew32(CTRL, ctrl_reg);
+       ew32(CTRL_EXT, ctrl_ext);
+       e1e_flush();
+       udelay(20);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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.
+ **/
+static s32 e1000_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_pch2lan) && (hw->mac.type != e1000_pchlan))
+               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 (!e1000_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;
+}
+
+
+/**
+ *  e1000_set_mdio_slow_mode_hv - Set slow MDIO access mode
+ *  @hw:   pointer to the HW structure
+ **/
+static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 data;
+
+       ret_val = e1e_rphy(hw, HV_KMRN_MODE_CTRL, &data);
+       if (ret_val)
+               return ret_val;
+
+       data |= HV_KMRN_MDIO_SLOW;
+
+       ret_val = e1e_wphy(hw, HV_KMRN_MODE_CTRL, data);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_hv_phy_workarounds_ich8lan - A series of Phy workarounds to be
+ *  done after every PHY reset.
+ **/
+static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 phy_data;
+
+       if (hw->mac.type != e1000_pchlan)
+               return ret_val;
+
+       /* Set MDIO slow mode before any other MDIO access */
+       if (hw->phy.type == e1000_phy_82577) {
+               ret_val = e1000_set_mdio_slow_mode_hv(hw);
+               if (ret_val)
+                       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)
+                       return ret_val;
+
+               /* Preamble tuning for SSC */
+               ret_val = e1e_wphy(hw, PHY_REG(770, 16), 0xA204);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       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)
+               return ret_val;
+
+       hw->phy.addr = 1;
+       ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, 0);
+       hw->phy.ops.release(hw);
+       if (ret_val)
+               goto out;
+
+       /*
+        * Configure the K1 Si workaround during phy reset assuming there is
+        * link so that it disables K1 if link is in 1Gbps.
+        */
+       ret_val = e1000_k1_gig_workaround_hv(hw, true);
+       if (ret_val)
+               goto out;
+
+       /* Workaround for link disconnects on a busy hub in half duplex */
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               goto out;
+       ret_val = hw->phy.ops.read_reg_locked(hw, BM_PORT_GEN_CFG, &phy_data);
+       if (ret_val)
+               goto release;
+       ret_val = hw->phy.ops.write_reg_locked(hw, BM_PORT_GEN_CFG,
+                                              phy_data & 0x00FF);
+release:
+       hw->phy.ops.release(hw);
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_copy_rx_addrs_to_phy_ich8lan - Copy Rx addresses from MAC to PHY
+ *  @hw:   pointer to the HW structure
+ **/
+void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw)
+{
+       u32 mac_reg;
+       u16 i, phy_reg = 0;
+       s32 ret_val;
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return;
+       ret_val = e1000_enable_phy_wakeup_reg_access_bm(hw, &phy_reg);
+       if (ret_val)
+               goto release;
+
+       /* Copy both RAL/H (rar_entry_count) and SHRAL/H (+4) to PHY */
+       for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
+               mac_reg = er32(RAL(i));
+               hw->phy.ops.write_reg_page(hw, BM_RAR_L(i),
+                                          (u16)(mac_reg & 0xFFFF));
+               hw->phy.ops.write_reg_page(hw, BM_RAR_M(i),
+                                          (u16)((mac_reg >> 16) & 0xFFFF));
+
+               mac_reg = er32(RAH(i));
+               hw->phy.ops.write_reg_page(hw, BM_RAR_H(i),
+                                          (u16)(mac_reg & 0xFFFF));
+               hw->phy.ops.write_reg_page(hw, BM_RAR_CTRL(i),
+                                          (u16)((mac_reg & E1000_RAH_AV)
+                                                >> 16));
+       }
+
+       e1000_disable_phy_wakeup_reg_access_bm(hw, &phy_reg);
+
+release:
+       hw->phy.ops.release(hw);
+}
+
+/**
+ *  e1000_lv_jumbo_workaround_ich8lan - required for jumbo frame operation
+ *  with 82579 PHY
+ *  @hw: pointer to the HW structure
+ *  @enable: flag to enable/disable workaround when enabling/disabling jumbos
+ **/
+s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
+{
+       s32 ret_val = 0;
+       u16 phy_reg, data;
+       u32 mac_reg;
+       u16 i;
+
+       if (hw->mac.type != e1000_pch2lan)
+               goto out;
+
+       /* disable Rx path while enabling/disabling workaround */
+       e1e_rphy(hw, PHY_REG(769, 20), &phy_reg);
+       ret_val = e1e_wphy(hw, PHY_REG(769, 20), phy_reg | (1 << 14));
+       if (ret_val)
+               goto out;
+
+       if (enable) {
+               /*
+                * Write Rx addresses (rar_entry_count for RAL/H, +4 for
+                * SHRAL/H) and initial CRC values to the MAC
+                */
+               for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
+                       u8 mac_addr[ETH_ALEN] = {0};
+                       u32 addr_high, addr_low;
+
+                       addr_high = er32(RAH(i));
+                       if (!(addr_high & E1000_RAH_AV))
+                               continue;
+                       addr_low = er32(RAL(i));
+                       mac_addr[0] = (addr_low & 0xFF);
+                       mac_addr[1] = ((addr_low >> 8) & 0xFF);
+                       mac_addr[2] = ((addr_low >> 16) & 0xFF);
+                       mac_addr[3] = ((addr_low >> 24) & 0xFF);
+                       mac_addr[4] = (addr_high & 0xFF);
+                       mac_addr[5] = ((addr_high >> 8) & 0xFF);
+
+                       ew32(PCH_RAICC(i), ~ether_crc_le(ETH_ALEN, mac_addr));
+               }
+
+               /* Write Rx addresses to the PHY */
+               e1000_copy_rx_addrs_to_phy_ich8lan(hw);
+
+               /* Enable jumbo frame workaround in the MAC */
+               mac_reg = er32(FFLT_DBG);
+               mac_reg &= ~(1 << 14);
+               mac_reg |= (7 << 15);
+               ew32(FFLT_DBG, mac_reg);
+
+               mac_reg = er32(RCTL);
+               mac_reg |= E1000_RCTL_SECRC;
+               ew32(RCTL, mac_reg);
+
+               ret_val = e1000e_read_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                               &data);
+               if (ret_val)
+                       goto out;
+               ret_val = e1000e_write_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                               data | (1 << 0));
+               if (ret_val)
+                       goto out;
+               ret_val = e1000e_read_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_HD_CTRL,
+                                               &data);
+               if (ret_val)
+                       goto out;
+               data &= ~(0xF << 8);
+               data |= (0xB << 8);
+               ret_val = e1000e_write_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_HD_CTRL,
+                                               data);
+               if (ret_val)
+                       goto out;
+
+               /* Enable jumbo frame workaround in the PHY */
+               e1e_rphy(hw, PHY_REG(769, 23), &data);
+               data &= ~(0x7F << 5);
+               data |= (0x37 << 5);
+               ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);
+               if (ret_val)
+                       goto out;
+               e1e_rphy(hw, PHY_REG(769, 16), &data);
+               data &= ~(1 << 13);
+               ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
+               if (ret_val)
+                       goto out;
+               e1e_rphy(hw, PHY_REG(776, 20), &data);
+               data &= ~(0x3FF << 2);
+               data |= (0x1A << 2);
+               ret_val = e1e_wphy(hw, PHY_REG(776, 20), data);
+               if (ret_val)
+                       goto out;
+               ret_val = e1e_wphy(hw, PHY_REG(776, 23), 0xFE00);
+               if (ret_val)
+                       goto out;
+               e1e_rphy(hw, HV_PM_CTRL, &data);
+               ret_val = e1e_wphy(hw, HV_PM_CTRL, data | (1 << 10));
+               if (ret_val)
+                       goto out;
+       } else {
+               /* Write MAC register values back to h/w defaults */
+               mac_reg = er32(FFLT_DBG);
+               mac_reg &= ~(0xF << 14);
+               ew32(FFLT_DBG, mac_reg);
+
+               mac_reg = er32(RCTL);
+               mac_reg &= ~E1000_RCTL_SECRC;
+               ew32(RCTL, mac_reg);
+
+               ret_val = e1000e_read_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                               &data);
+               if (ret_val)
+                       goto out;
+               ret_val = e1000e_write_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_CTRL_OFFSET,
+                                               data & ~(1 << 0));
+               if (ret_val)
+                       goto out;
+               ret_val = e1000e_read_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_HD_CTRL,
+                                               &data);
+               if (ret_val)
+                       goto out;
+               data &= ~(0xF << 8);
+               data |= (0xB << 8);
+               ret_val = e1000e_write_kmrn_reg(hw,
+                                               E1000_KMRNCTRLSTA_HD_CTRL,
+                                               data);
+               if (ret_val)
+                       goto out;
+
+               /* Write PHY register values back to h/w defaults */
+               e1e_rphy(hw, PHY_REG(769, 23), &data);
+               data &= ~(0x7F << 5);
+               ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);
+               if (ret_val)
+                       goto out;
+               e1e_rphy(hw, PHY_REG(769, 16), &data);
+               data |= (1 << 13);
+               ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
+               if (ret_val)
+                       goto out;
+               e1e_rphy(hw, PHY_REG(776, 20), &data);
+               data &= ~(0x3FF << 2);
+               data |= (0x8 << 2);
+               ret_val = e1e_wphy(hw, PHY_REG(776, 20), data);
+               if (ret_val)
+                       goto out;
+               ret_val = e1e_wphy(hw, PHY_REG(776, 23), 0x7E00);
+               if (ret_val)
+                       goto out;
+               e1e_rphy(hw, HV_PM_CTRL, &data);
+               ret_val = e1e_wphy(hw, HV_PM_CTRL, data & ~(1 << 10));
+               if (ret_val)
+                       goto out;
+       }
+
+       /* re-enable Rx path after enabling/disabling workaround */
+       ret_val = e1e_wphy(hw, PHY_REG(769, 20), phy_reg & ~(1 << 14));
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_lv_phy_workarounds_ich8lan - A series of Phy workarounds to be
+ *  done after every PHY reset.
+ **/
+static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+
+       if (hw->mac.type != e1000_pch2lan)
+               goto out;
+
+       /* Set MDIO slow mode before any other MDIO access */
+       ret_val = e1000_set_mdio_slow_mode_hv(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_k1_gig_workaround_lv - K1 Si workaround
+ *  @hw:   pointer to the HW structure
+ *
+ *  Workaround to set the K1 beacon duration for 82579 parts
+ **/
+static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 status_reg = 0;
+       u32 mac_reg;
+
+       if (hw->mac.type != e1000_pch2lan)
+               goto out;
+
+       /* Set K1 beacon duration based on 1Gbps speed or otherwise */
+       ret_val = e1e_rphy(hw, HV_M_STATUS, &status_reg);
+       if (ret_val)
+               goto out;
+
+       if ((status_reg & (HV_M_STATUS_LINK_UP | HV_M_STATUS_AUTONEG_COMPLETE))
+           == (HV_M_STATUS_LINK_UP | HV_M_STATUS_AUTONEG_COMPLETE)) {
+               mac_reg = er32(FEXTNVM4);
+               mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK;
+
+               if (status_reg & HV_M_STATUS_SPEED_1000)
+                       mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC;
+               else
+                       mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_16USEC;
+
+               ew32(FEXTNVM4, mac_reg);
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_gate_hw_phy_config_ich8lan - disable PHY config via hardware
+ *  @hw:   pointer to the HW structure
+ *  @gate: boolean set to true to gate, false to ungate
+ *
+ *  Gate/ungate the automatic PHY configuration via hardware; perform
+ *  the configuration via software instead.
+ **/
+static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
+{
+       u32 extcnf_ctrl;
+
+       if (hw->mac.type != e1000_pch2lan)
+               return;
+
+       extcnf_ctrl = er32(EXTCNF_CTRL);
+
+       if (gate)
+               extcnf_ctrl |= E1000_EXTCNF_CTRL_GATE_PHY_CFG;
+       else
+               extcnf_ctrl &= ~E1000_EXTCNF_CTRL_GATE_PHY_CFG;
+
+       ew32(EXTCNF_CTRL, extcnf_ctrl);
+       return;
+}
+
+/**
+ *  e1000_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 e1000_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);
+}
+
+/**
+ *  e1000_post_phy_reset_ich8lan - Perform steps required after a PHY reset
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 reg;
+
+       if (e1000_check_reset_block(hw))
+               goto out;
+
+       /* Allow time for h/w to get to quiescent state after reset */
+       usleep_range(10000, 20000);
+
+       /* Perform any necessary post-reset workarounds */
+       switch (hw->mac.type) {
+       case e1000_pchlan:
+               ret_val = e1000_hv_phy_workarounds_ich8lan(hw);
+               if (ret_val)
+                       goto out;
+               break;
+       case e1000_pch2lan:
+               ret_val = e1000_lv_phy_workarounds_ich8lan(hw);
+               if (ret_val)
+                       goto out;
+               break;
+       default:
+               break;
+       }
+
+       /* Clear the host wakeup bit after lcd reset */
+       if (hw->mac.type >= e1000_pchlan) {
+               e1e_rphy(hw, BM_PORT_GEN_CFG, &reg);
+               reg &= ~BM_WUC_HOST_WU_BIT;
+               e1e_wphy(hw, BM_PORT_GEN_CFG, reg);
+       }
+
+       /* Configure the LCD with the extended configuration region in NVM */
+       ret_val = e1000_sw_lcd_config_ich8lan(hw);
+       if (ret_val)
+               goto out;
+
+       /* Configure the LCD with the OEM bits in NVM */
+       ret_val = e1000_oem_bits_config_ich8lan(hw, true);
+
+       if (hw->mac.type == e1000_pch2lan) {
+               /* Ungate automatic PHY configuration on non-managed 82579 */
+               if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
+                       usleep_range(10000, 20000);
+                       e1000_gate_hw_phy_config_ich8lan(hw, false);
+               }
+
+               /* Set EEE LPI Update Timer to 200usec */
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val)
+                       goto out;
+               ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+                                                      I82579_LPI_UPDATE_TIMER);
+               if (ret_val)
+                       goto release;
+               ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA,
+                                                      0x1387);
+release:
+               hw->phy.ops.release(hw);
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+
+       /* Gate automatic PHY configuration by hardware on non-managed 82579 */
+       if ((hw->mac.type == e1000_pch2lan) &&
+           !(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
+               e1000_gate_hw_phy_config_ich8lan(hw, true);
+
+       ret_val = e1000e_phy_hw_reset_generic(hw);
+       if (ret_val)
+               goto out;
+
+       ret_val = e1000_post_phy_reset_ich8lan(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)
+{
+       s32 ret_val = 0;
+       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;
+}
+
+/**
+ *  e1000_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 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       u32 phy_ctrl;
+       s32 ret_val = 0;
+       u16 data;
+
+       if (phy->type == e1000_phy_ife)
+               return ret_val;
+
+       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)
+                       return 0;
+
+               /*
+                * 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)
+                       return ret_val;
+       } else {
+               phy_ctrl &= ~E1000_PHY_CTRL_D0A_LPLU;
+               ew32(PHY_CTRL, phy_ctrl);
+
+               if (phy->type != e1000_phy_igp_3)
+                       return 0;
+
+               /*
+                * 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)
+                               return ret_val;
+
+                       data |= IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               } else if (phy->smart_speed == e1000_smart_speed_off) {
+                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          &data);
+                       if (ret_val)
+                               return ret_val;
+
+                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       u32 phy_ctrl;
+       s32 ret_val;
+       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)
+                       return 0;
+
+               /*
+                * 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)
+                               return ret_val;
+
+                       data |= IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               } else if (phy->smart_speed == e1000_smart_speed_off) {
+                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          &data);
+                       if (ret_val)
+                               return ret_val;
+
+                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               }
+       } 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)
+                       return 0;
+
+               /*
+                * 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)
+                       return ret_val;
+
+               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+               ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG, data);
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_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 = 0;
+
+       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;
+
+                       return 0;
+               }
+               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 = e1000_read_flash_byte_ich8lan(hw, act_offset,
+                                                       &sig_byte);
+               if (ret_val)
+                       return ret_val;
+               if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
+                   E1000_ICH_NVM_SIG_VALUE) {
+                       *bank = 0;
+                       return 0;
+               }
+
+               /* Check bank 1 */
+               ret_val = e1000_read_flash_byte_ich8lan(hw, act_offset +
+                                                       bank1_offset,
+                                                       &sig_byte);
+               if (ret_val)
+                       return ret_val;
+               if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
+                   E1000_ICH_NVM_SIG_VALUE) {
+                       *bank = 1;
+                       return 0;
+               }
+
+               e_dbg("ERROR: No valid NVM bank present\n");
+               return -E1000_ERR_NVM;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_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 = 0;
+       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 = e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
+       if (ret_val) {
+               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 = 0;
+       for (i = 0; i < words; i++) {
+               if (dev_spec->shadow_ram[offset+i].modified) {
+                       data[i] = dev_spec->shadow_ram[offset+i].value;
+               } else {
+                       ret_val = e1000_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;
+}
+
+/**
+ *  e1000_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 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
+{
+       union ich8_hws_flash_status hsfsts;
+       s32 ret_val = -E1000_ERR_NVM;
+
+       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.\n");
+               return -E1000_ERR_NVM;
+       }
+
+       /* 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 = 0;
+       } else {
+               s32 i = 0;
+
+               /*
+                * 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(hw, ICH_FLASH_HSFSTS);
+                       if (hsfsts.hsf_status.flcinprog == 0) {
+                               ret_val = 0;
+                               break;
+                       }
+                       udelay(1);
+               }
+               if (ret_val == 0) {
+                       /*
+                        * 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\n");
+               }
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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)
+               return 0;
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
+                                        u16 *data)
+{
+       /* Must convert offset into bytes. */
+       offset <<= 1;
+
+       return e1000_read_flash_data_ich8lan(hw, offset, 2, data);
+}
+
+/**
+ *  e1000_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 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
+                                        u8 *data)
+{
+       s32 ret_val;
+       u16 word = 0;
+
+       ret_val = e1000_read_flash_data_ich8lan(hw, offset, 1, &word);
+       if (ret_val)
+               return ret_val;
+
+       *data = (u8)word;
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_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)
+               return -E1000_ERR_NVM;
+
+       flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
+                           hw->nvm.flash_base_addr;
+
+       do {
+               udelay(1);
+               /* Steps */
+               ret_val = e1000_flash_cycle_init_ich8lan(hw);
+               if (ret_val != 0)
+                       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 = e1000_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 == 0) {
+                       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.\n");
+                               break;
+                       }
+               }
+       } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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;
+       u16 i;
+
+       if ((offset >= nvm->word_size) || (words > nvm->word_size - offset) ||
+           (words == 0)) {
+               e_dbg("nvm parameter(s) out of bounds\n");
+               return -E1000_ERR_NVM;
+       }
+
+       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);
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_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 =  e1000_valid_nvm_bank_detect_ich8lan(hw, &bank);
+       if (ret_val) {
+               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 = e1000_erase_flash_bank_ich8lan(hw, 1);
+               if (ret_val)
+                       goto release;
+       } else {
+               old_bank_offset = nvm->flash_bank_size;
+               new_bank_offset = 0;
+               ret_val = e1000_erase_flash_bank_ich8lan(hw, 0);
+               if (ret_val)
+                       goto release;
+       }
+
+       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 = e1000_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 = e1000_retry_write_flash_byte_ich8lan(hw,
+                                                              act_offset,
+                                                              (u8)data);
+               if (ret_val)
+                       break;
+
+               udelay(100);
+               ret_val = e1000_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) {
+               /* Possibly read-only, see e1000e_write_protect_nvm_ich8lan() */
+               e_dbg("Flash commit failed.\n");
+               goto release;
+       }
+
+       /*
+        * 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 = e1000_read_flash_word_ich8lan(hw, act_offset, &data);
+       if (ret_val)
+               goto release;
+
+       data &= 0xBFFF;
+       ret_val = e1000_retry_write_flash_byte_ich8lan(hw,
+                                                      act_offset * 2 + 1,
+                                                      (u8)(data >> 8));
+       if (ret_val)
+               goto release;
+
+       /*
+        * 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 = e1000_retry_write_flash_byte_ich8lan(hw, act_offset, 0);
+       if (ret_val)
+               goto release;
+
+       /* 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;
+       }
+
+release:
+       nvm->ops.release(hw);
+
+       /*
+        * Reload the EEPROM, or else modifications will not appear
+        * until after the next adapter reset.
+        */
+       if (!ret_val) {
+               e1000e_reload_nvm(hw);
+               usleep_range(10000, 20000);
+       }
+
+out:
+       if (ret_val)
+               e_dbg("NVM update error: %d\n", ret_val);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       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 = e1000_read_nvm(hw, 0x19, 1, &data);
+       if (ret_val)
+               return ret_val;
+
+       if ((data & 0x40) == 0) {
+               data |= 0x40;
+               ret_val = e1000_write_nvm(hw, 0x19, 1, &data);
+               if (ret_val)
+                       return ret_val;
+               ret_val = e1000e_update_nvm_checksum(hw);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       return e1000e_validate_nvm_checksum_generic(hw);
+}
+
+/**
+ *  e1000e_write_protect_nvm_ich8lan - Make the NVM read-only
+ *  @hw: pointer to the HW structure
+ *
+ *  To prevent malicious write/erase of the NVM, set it to be read-only
+ *  so that the hardware ignores all write/erase cycles of the NVM via
+ *  the flash control registers.  The shadow-ram copy of the NVM will
+ *  still be updated, however any updates to this copy will not stick
+ *  across driver reloads.
+ **/
+void e1000e_write_protect_nvm_ich8lan(struct e1000_hw *hw)
+{
+       struct e1000_nvm_info *nvm = &hw->nvm;
+       union ich8_flash_protected_range pr0;
+       union ich8_hws_flash_status hsfsts;
+       u32 gfpreg;
+
+       nvm->ops.acquire(hw);
+
+       gfpreg = er32flash(ICH_FLASH_GFPREG);
+
+       /* Write-protect GbE Sector of NVM */
+       pr0.regval = er32flash(ICH_FLASH_PR0);
+       pr0.range.base = gfpreg & FLASH_GFPREG_BASE_MASK;
+       pr0.range.limit = ((gfpreg >> 16) & FLASH_GFPREG_BASE_MASK);
+       pr0.range.wpe = true;
+       ew32flash(ICH_FLASH_PR0, pr0.regval);
+
+       /*
+        * Lock down a subset of GbE Flash Control Registers, e.g.
+        * PR0 to prevent the write-protection from being lifted.
+        * Once FLOCKDN is set, the registers protected by it cannot
+        * be written until FLOCKDN is cleared by a hardware reset.
+        */
+       hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
+       hsfsts.hsf_status.flockdn = true;
+       ew32flash(ICH_FLASH_HSFSTS, hsfsts.regval);
+
+       nvm->ops.release(hw);
+}
+
+/**
+ *  e1000_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 e1000_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;
+       u8 count = 0;
+
+       if (size < 1 || size > 2 || data > size * 0xff ||
+           offset > ICH_FLASH_LINEAR_ADDR_MASK)
+               return -E1000_ERR_NVM;
+
+       flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
+                           hw->nvm.flash_base_addr;
+
+       do {
+               udelay(1);
+               /* Steps */
+               ret_val = e1000_flash_cycle_init_ich8lan(hw);
+               if (ret_val)
+                       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 = e1000_flash_cycle_ich8lan(hw,
+                                              ICH_FLASH_WRITE_COMMAND_TIMEOUT);
+               if (!ret_val)
+                       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;
+               if (hsfsts.hsf_status.flcdone == 0) {
+                       e_dbg("Timeout error - flash cycle "
+                                "did not complete.");
+                       break;
+               }
+       } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_write_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
+                                         u8 data)
+{
+       u16 word = (u16)data;
+
+       return e1000_write_flash_data_ich8lan(hw, offset, 1, word);
+}
+
+/**
+ *  e1000_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 e1000_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
+                                               u32 offset, u8 byte)
+{
+       s32 ret_val;
+       u16 program_retries;
+
+       ret_val = e1000_write_flash_byte_ich8lan(hw, offset, byte);
+       if (!ret_val)
+               return ret_val;
+
+       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 = e1000_write_flash_byte_ich8lan(hw, offset, byte);
+               if (!ret_val)
+                       break;
+       }
+       if (program_retries == 100)
+               return -E1000_ERR_NVM;
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_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;
+       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:
+               return -E1000_ERR_NVM;
+       }
+
+       /* 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 = e1000_flash_cycle_init_ich8lan(hw);
+                       if (ret_val)
+                               return ret_val;
+
+                       /*
+                        * 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 = e1000_flash_cycle_ich8lan(hw,
+                                              ICH_FLASH_ERASE_COMMAND_TIMEOUT);
+                       if (ret_val == 0)
+                               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)
+                               return ret_val;
+               } while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data)
+{
+       s32 ret_val;
+
+       ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
+       if (ret_val) {
+               e_dbg("NVM Read Error\n");
+               return ret_val;
+       }
+
+       if (*data == ID_LED_RESERVED_0000 ||
+           *data == ID_LED_RESERVED_FFFF)
+               *data = ID_LED_DEFAULT_ICH8LAN;
+
+       return 0;
+}
+
+/**
+ *  e1000_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 e1000_led_[on|off]_pchlan().
+ **/
+static s32 e1000_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;
+}
+
+/**
+ *  e1000_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 e1000_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;
+}
+
+/**
+ *  e1000_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 e1000_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();
+
+       usleep_range(10000, 20000);
+
+       /* 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 = e1000_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 (!e1000_check_reset_block(hw)) {
+               /*
+                * Full-chip reset requires MAC and PHY reset at the same
+                * time to make sure the interface between MAC and the
+                * external PHY is reset.
+                */
+               ctrl |= E1000_CTRL_PHY_RST;
+
+               /*
+                * Gate automatic PHY configuration by hardware on
+                * non-managed 82579
+                */
+               if ((hw->mac.type == e1000_pch2lan) &&
+                   !(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
+                       e1000_gate_hw_phy_config_ich8lan(hw, true);
+       }
+       ret_val = e1000_acquire_swflag_ich8lan(hw);
+       e_dbg("Issuing a global reset to ich8lan\n");
+       ew32(CTRL, (ctrl | E1000_CTRL_RST));
+       /* cannot issue a flush here because it hangs the hardware */
+       msleep(20);
+
+       if (!ret_val)
+               mutex_unlock(&swflag_mutex);
+
+       if (ctrl & E1000_CTRL_PHY_RST) {
+               ret_val = hw->phy.ops.get_cfg_done(hw);
+               if (ret_val)
+                       goto out;
+
+               ret_val = e1000_post_phy_reset_ich8lan(hw);
+               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);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_init_hw_ich8lan(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       u32 ctrl_ext, txdctl, snoop;
+       s32 ret_val;
+       u16 i;
+
+       e1000_initialize_hw_bits_ich8lan(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 */
+
+       /* 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.  Disable wakeup by clearing 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_PORT_GEN_CFG, &i);
+               i &= ~BM_WUC_HOST_WU_BIT;
+               e1e_wphy(hw, BM_PORT_GEN_CFG, i);
+               ret_val = e1000_phy_hw_reset_ich8lan(hw);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /* Setup link and flow control */
+       ret_val = e1000_setup_link_ich8lan(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.
+        */
+       e1000_clear_hw_cntrs_ich8lan(hw);
+
+       return 0;
+}
+/**
+ *  e1000_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 e1000_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);
+       }
+
+       /*
+        * work-around descriptor data corruption issue during nfs v2 udp
+        * traffic, just disable the nfs filtering capability
+        */
+       reg = er32(RFCTL);
+       reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
+       ew32(RFCTL, reg);
+}
+
+/**
+ *  e1000_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 e1000_setup_link_ich8lan(struct e1000_hw *hw)
+{
+       s32 ret_val;
+
+       if (e1000_check_reset_block(hw))
+               return 0;
+
+       /*
+        * 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) {
+               /* Workaround h/w hang when Tx flow control enabled */
+               if (hw->mac.type == e1000_pchlan)
+                       hw->fc.requested_mode = e1000_fc_rx_pause;
+               else
+                       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 = e1000_setup_copper_link_ich8lan(hw);
+       if (ret_val)
+               return ret_val;
+
+       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)) {
+               ew32(FCRTV_PCH, hw->fc.refresh_time);
+
+               ret_val = e1e_wphy(hw, PHY_REG(BM_PORT_CTRL_PAGE, 27),
+                                  hw->fc.pause_time);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       return e1000e_set_fc_watermarks(hw);
+}
+
+/**
+ *  e1000_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 e1000_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)
+               return ret_val;
+       ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                      &reg_data);
+       if (ret_val)
+               return ret_val;
+       reg_data |= 0x3F;
+       ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                       reg_data);
+       if (ret_val)
+               return ret_val;
+
+       switch (hw->phy.type) {
+       case e1000_phy_igp_3:
+               ret_val = e1000e_copper_link_setup_igp(hw);
+               if (ret_val)
+                       return ret_val;
+               break;
+       case e1000_phy_bm:
+       case e1000_phy_82578:
+               ret_val = e1000e_copper_link_setup_m88(hw);
+               if (ret_val)
+                       return ret_val;
+               break;
+       case e1000_phy_82577:
+       case e1000_phy_82579:
+               ret_val = e1000_copper_link_setup_82577(hw);
+               if (ret_val)
+                       return ret_val;
+               break;
+       case e1000_phy_ife:
+               ret_val = e1e_rphy(hw, IFE_PHY_MDIX_CONTROL, &reg_data);
+               if (ret_val)
+                       return ret_val;
+
+               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)
+                       return ret_val;
+               break;
+       default:
+               break;
+       }
+       return e1000e_setup_copper_link(hw);
+}
+
+/**
+ *  e1000_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 e1000_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)
+               return ret_val;
+
+       if ((hw->mac.type == e1000_ich8lan) &&
+           (hw->phy.type == e1000_phy_igp_3) &&
+           (*speed == SPEED_1000)) {
+               ret_val = e1000_kmrn_lock_loss_workaround_ich8lan(hw);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_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;
+       u16 i, data;
+       bool link;
+
+       if (!dev_spec->kmrn_lock_loss_workaround_enabled)
+               return 0;
+
+       /*
+        * 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)
+               return 0;
+
+       for (i = 0; i < 10; i++) {
+               /* read once to clear */
+               ret_val = e1e_rphy(hw, IGP3_KMRN_DIAG, &data);
+               if (ret_val)
+                       return ret_val;
+               /* and again to get new status */
+               ret_val = e1e_rphy(hw, IGP3_KMRN_DIAG, &data);
+               if (ret_val)
+                       return ret_val;
+
+               /* check for PCS lock */
+               if (!(data & IGP3_KMRN_DIAG_PCS_LOCK_LOSS))
+                       return 0;
+
+               /* Issue PHY reset */
+               e1000_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 */
+       return -E1000_ERR_PHY;
+}
+
+/**
+ *  e1000_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;
+}
+
+/**
+ *  e1000_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)
+               return;
+
+       /* 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);
+}
+
+/**
+ *  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;
+       u16 reg_data;
+
+       if ((hw->mac.type != e1000_ich8lan) ||
+           (hw->phy.type != e1000_phy_igp_3))
+               return;
+
+       ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
+                                     &reg_data);
+       if (ret_val)
+               return;
+       reg_data |= E1000_KMRNCTRLSTA_DIAG_NELPBK;
+       ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
+                                      reg_data);
+       if (ret_val)
+               return;
+       reg_data &= ~E1000_KMRNCTRLSTA_DIAG_NELPBK;
+       ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
+                                      reg_data);
+}
+
+/**
+ *  e1000_suspend_workarounds_ich8lan - workarounds needed during S0->Sx
+ *  @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.  For PCH and newer parts, the OEM bits PHY register
+ *  (LED, GbE disable and LPLU configurations) also needs to be written.
+ **/
+void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
+{
+       u32 phy_ctrl;
+       s32 ret_val;
+
+       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) {
+               e1000_oem_bits_config_ich8lan(hw, false);
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val)
+                       return;
+               e1000_write_smbus_addr(hw);
+               hw->phy.ops.release(hw);
+       }
+}
+
+/**
+ *  e1000_resume_workarounds_pchlan - workarounds needed during Sx->S0
+ *  @hw: pointer to the HW structure
+ *
+ *  During Sx to S0 transitions on non-managed devices or managed devices
+ *  on which PHY resets are not blocked, if the PHY registers cannot be
+ *  accessed properly by the s/w toggle the LANPHYPC value to power cycle
+ *  the PHY.
+ **/
+void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
+{
+       u32 fwsm;
+
+       if (hw->mac.type != e1000_pch2lan)
+               return;
+
+       fwsm = er32(FWSM);
+       if (!(fwsm & E1000_ICH_FWSM_FW_VALID) || !e1000_check_reset_block(hw)) {
+               u16 phy_id1, phy_id2;
+               s32 ret_val;
+
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val) {
+                       e_dbg("Failed to acquire PHY semaphore in resume\n");
+                       return;
+               }
+
+               /* Test access to the PHY registers by reading the ID regs */
+               ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_id1);
+               if (ret_val)
+                       goto release;
+               ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_id2);
+               if (ret_val)
+                       goto release;
+
+               if (hw->phy.id == ((u32)(phy_id1 << 16) |
+                                  (u32)(phy_id2 & PHY_REVISION_MASK)))
+                       goto release;
+
+               e1000_toggle_lanphypc_value_ich8lan(hw);
+
+               hw->phy.ops.release(hw);
+               msleep(50);
+               e1000_phy_hw_reset(hw);
+               msleep(50);
+               return;
+       }
+
+release:
+       hw->phy.ops.release(hw);
+
+       return;
+}
+
+/**
+ *  e1000_cleanup_led_ich8lan - Restore the default LED operation
+ *  @hw: pointer to the HW structure
+ *
+ *  Return the LED back to the default configuration.
+ **/
+static s32 e1000_cleanup_led_ich8lan(struct e1000_hw *hw)
+{
+       if (hw->phy.type == e1000_phy_ife)
+               return e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
+
+       ew32(LEDCTL, hw->mac.ledctl_default);
+       return 0;
+}
+
+/**
+ *  e1000_led_on_ich8lan - Turn LEDs on
+ *  @hw: pointer to the HW structure
+ *
+ *  Turn on the LEDs.
+ **/
+static s32 e1000_led_on_ich8lan(struct e1000_hw *hw)
+{
+       if (hw->phy.type == e1000_phy_ife)
+               return e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED,
+                               (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_ON));
+
+       ew32(LEDCTL, hw->mac.ledctl_mode2);
+       return 0;
+}
+
+/**
+ *  e1000_led_off_ich8lan - Turn LEDs off
+ *  @hw: pointer to the HW structure
+ *
+ *  Turn off the LEDs.
+ **/
+static s32 e1000_led_off_ich8lan(struct e1000_hw *hw)
+{
+       if (hw->phy.type == e1000_phy_ife)
+               return e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED,
+                               (IFE_PSCL_PROBE_MODE |
+                                IFE_PSCL_PROBE_LEDS_OFF));
+
+       ew32(LEDCTL, hw->mac.ledctl_mode1);
+       return 0;
+}
+
+/**
+ *  e1000_setup_led_pchlan - Configures SW controllable LED
+ *  @hw: pointer to the HW structure
+ *
+ *  This prepares the SW controllable LED for use.
+ **/
+static s32 e1000_setup_led_pchlan(struct e1000_hw *hw)
+{
+       return e1e_wphy(hw, HV_LED_CONFIG, (u16)hw->mac.ledctl_mode1);
+}
+
+/**
+ *  e1000_cleanup_led_pchlan - Restore the default LED operation
+ *  @hw: pointer to the HW structure
+ *
+ *  Return the LED back to the default configuration.
+ **/
+static s32 e1000_cleanup_led_pchlan(struct e1000_hw *hw)
+{
+       return e1e_wphy(hw, HV_LED_CONFIG, (u16)hw->mac.ledctl_default);
+}
+
+/**
+ *  e1000_led_on_pchlan - Turn LEDs on
+ *  @hw: pointer to the HW structure
+ *
+ *  Turn on the LEDs.
+ **/
+static s32 e1000_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);
+}
+
+/**
+ *  e1000_led_off_pchlan - Turn LEDs off
+ *  @hw: pointer to the HW structure
+ *
+ *  Turn off the LEDs.
+ **/
+static s32 e1000_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);
+}
+
+/**
+ *  e1000_get_cfg_done_ich8lan - Read config done bit after Full or PHY reset
+ *  @hw: pointer to the HW structure
+ *
+ *  Read appropriate register for the config done bit for completion status
+ *  and configure the PHY through s/w for EEPROM-less parts.
+ *
+ *  NOTE: some silicon which is EEPROM-less will fail trying to read the
+ *  config done bit, so only an error is logged and continues.  If we were
+ *  to return with error, EEPROM-less silicon would not be able to be reset
+ *  or change link.
+ **/
+static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u32 bank = 0;
+       u32 status;
+
+       e1000e_get_cfg_done(hw);
+
+       /* Wait for indication from h/w that it has completed basic config */
+       if (hw->mac.type >= e1000_ich10lan) {
+               e1000_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");
+                       ret_val = 0;
+               }
+       }
+
+       /* Clear PHY Reset Asserted bit */
+       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");
+
+       /* If EEPROM is not marked present, init the IGP 3 PHY manually */
+       if (hw->mac.type <= e1000_ich9lan) {
+               if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
+                   (hw->phy.type == e1000_phy_igp_3)) {
+                       e1000e_phy_init_script_igp3(hw);
+               }
+       } else {
+               if (e1000_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;
+}
+
+/**
+ * e1000_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 e1000_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) ||
+             hw->phy.ops.check_reset_block(hw)))
+               e1000_power_down_phy_copper(hw);
+}
+
+/**
+ *  e1000_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 e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
+{
+       u16 phy_data;
+       s32 ret_val;
+
+       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)) {
+               ret_val = hw->phy.ops.acquire(hw);
+               if (ret_val)
+                       return;
+               ret_val = hw->phy.ops.set_page(hw,
+                                              HV_STATS_PAGE << IGP_PAGE_SHIFT);
+               if (ret_val)
+                       goto release;
+               hw->phy.ops.read_reg_page(hw, HV_SCC_UPPER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_SCC_LOWER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_ECOL_UPPER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_ECOL_LOWER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_MCC_UPPER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_MCC_LOWER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_LATECOL_UPPER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_LATECOL_LOWER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_COLC_UPPER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_COLC_LOWER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_DC_UPPER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_DC_LOWER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_TNCRS_UPPER, &phy_data);
+               hw->phy.ops.read_reg_page(hw, HV_TNCRS_LOWER, &phy_data);
+release:
+               hw->phy.ops.release(hw);
+       }
+}
+
+static struct e1000_mac_operations ich8_mac_ops = {
+       .id_led_init            = e1000e_id_led_init,
+       /* check_mng_mode dependent on mac type */
+       .check_for_link         = e1000_check_for_copper_link_ich8lan,
+       /* cleanup_led dependent on mac type */
+       .clear_hw_cntrs         = e1000_clear_hw_cntrs_ich8lan,
+       .get_bus_info           = e1000_get_bus_info_ich8lan,
+       .set_lan_id             = e1000_set_lan_id_single_port,
+       .get_link_up_info       = e1000_get_link_up_info_ich8lan,
+       /* led_on dependent on mac type */
+       /* led_off dependent on mac type */
+       .update_mc_addr_list    = e1000e_update_mc_addr_list_generic,
+       .reset_hw               = e1000_reset_hw_ich8lan,
+       .init_hw                = e1000_init_hw_ich8lan,
+       .setup_link             = e1000_setup_link_ich8lan,
+       .setup_physical_interface= e1000_setup_copper_link_ich8lan,
+       /* id_led_init dependent on mac type */
+};
+
+static struct e1000_phy_operations ich8_phy_ops = {
+       .acquire                = e1000_acquire_swflag_ich8lan,
+       .check_reset_block      = e1000_check_reset_block_ich8lan,
+       .commit                 = NULL,
+       .get_cfg_done           = e1000_get_cfg_done_ich8lan,
+       .get_cable_length       = e1000e_get_cable_length_igp_2,
+       .read_reg               = e1000e_read_phy_reg_igp,
+       .release                = e1000_release_swflag_ich8lan,
+       .reset                  = e1000_phy_hw_reset_ich8lan,
+       .set_d0_lplu_state      = e1000_set_d0_lplu_state_ich8lan,
+       .set_d3_lplu_state      = e1000_set_d3_lplu_state_ich8lan,
+       .write_reg              = e1000e_write_phy_reg_igp,
+};
+
+static struct e1000_nvm_operations ich8_nvm_ops = {
+       .acquire                = e1000_acquire_nvm_ich8lan,
+       .read                   = e1000_read_nvm_ich8lan,
+       .release                = e1000_release_nvm_ich8lan,
+       .update                 = e1000_update_nvm_checksum_ich8lan,
+       .valid_led_default      = e1000_valid_led_default_ich8lan,
+       .validate               = e1000_validate_nvm_checksum_ich8lan,
+       .write                  = e1000_write_nvm_ich8lan,
+};
+
+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,
+       .get_variants           = e1000_get_variants_ich8lan,
+       .mac_ops                = &ich8_mac_ops,
+       .phy_ops                = &ich8_phy_ops,
+       .nvm_ops                = &ich8_nvm_ops,
+};
+
+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,
+       .get_variants           = e1000_get_variants_ich8lan,
+       .mac_ops                = &ich8_mac_ops,
+       .phy_ops                = &ich8_phy_ops,
+       .nvm_ops                = &ich8_nvm_ops,
+};
+
+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,
+       .get_variants           = e1000_get_variants_ich8lan,
+       .mac_ops                = &ich8_mac_ops,
+       .phy_ops                = &ich8_phy_ops,
+       .nvm_ops                = &ich8_nvm_ops,
+};
+
+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,
+       .flags2                 = FLAG2_HAS_PHY_STATS,
+       .pba                    = 26,
+       .max_hw_frame_size      = 4096,
+       .get_variants           = e1000_get_variants_ich8lan,
+       .mac_ops                = &ich8_mac_ops,
+       .phy_ops                = &ich8_phy_ops,
+       .nvm_ops                = &ich8_nvm_ops,
+};
+
+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,
+       .flags2                 = FLAG2_HAS_PHY_STATS
+                                 | FLAG2_HAS_EEE,
+       .pba                    = 26,
+       .max_hw_frame_size      = DEFAULT_JUMBO,
+       .get_variants           = e1000_get_variants_ich8lan,
+       .mac_ops                = &ich8_mac_ops,
+       .phy_ops                = &ich8_phy_ops,
+       .nvm_ops                = &ich8_nvm_ops,
+};
diff --git a/drivers/net/ethernet/intel/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c
new file mode 100644 (file)
index 0000000..7898a67
--- /dev/null
@@ -0,0 +1,2692 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include "e1000.h"
+
+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
+
+/* Intel(R) Active Management Technology signature */
+#define E1000_IAMT_SIGNATURE           0x544D4149
+
+/**
+ *  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;
+       struct e1000_adapter *adapter = hw->adapter;
+       u16 pcie_link_status, cap_offset;
+
+       cap_offset = adapter->pdev->pcie_cap;
+       if (!cap_offset) {
+               bus->width = e1000_bus_width_unknown;
+       } else {
+               pci_read_config_word(adapter->pdev,
+                                    cap_offset + PCIE_LINK_STATUS,
+                                    &pcie_link_status);
+               bus->width = (enum e1000_bus_width)((pcie_link_status &
+                                                    PCIE_LINK_WIDTH_MASK) >>
+                                                   PCIE_LINK_WIDTH_SHIFT);
+       }
+
+       mac->ops.set_lan_id(hw);
+
+       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.
+ **/
+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 = er32(STATUS);
+       bus->func = (reg & E1000_STATUS_FUNC_MASK) >> E1000_STATUS_FUNC_SHIFT;
+}
+
+/**
+ *  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;
+
+       for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
+               E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, 0);
+               e1e_flush();
+       }
+}
+
+/**
+ *  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)
+{
+       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
+ *
+ *  Setup 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_ALEN] = {0};
+
+       /* Setup the receive address */
+       e_dbg("Programming MAC Address into RAR[0]\n");
+
+       e1000e_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++)
+               e1000e_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 = 0;
+       u16 offset, nvm_alt_mac_addr_offset, nvm_data;
+       u8 alt_mac_addr[ETH_ALEN];
+
+       ret_val = e1000_read_nvm(hw, NVM_COMPAT, 1, &nvm_data);
+       if (ret_val)
+               goto out;
+
+       /* Check for LOM (vs. NIC) or one of two valid mezzanine cards */
+       if (!((nvm_data & NVM_COMPAT_LOM) ||
+             (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||
+             (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)))
+               goto out;
+
+       ret_val = e1000_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_ALEN; i += 2) {
+               offset = nvm_alt_mac_addr_offset + (i >> 1);
+               ret_val = e1000_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 (is_multicast_ether_addr(alt_mac_addr)) {
+               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.
+        */
+       e1000e_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();
+}
+
+/**
+ *  e1000_hash_mc_addr - 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()
+ **/
+static u32 e1000_hash_mc_addr(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_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 = e1000_hash_mc_addr(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_ALEN);
+       }
+
+       /* 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_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)
+{
+       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);
+}
+
+/**
+ *  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)
+               return 0;
+
+       /*
+        * 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)
+               return ret_val;
+
+       if (!link)
+               return ret_val; /* 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;
+               return ret_val;
+       }
+
+       /*
+        * 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");
+
+       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;
+
+       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;
+                       return 0;
+               }
+               e_dbg("NOT Rx'ing /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");
+                       return ret_val;
+               }
+       } 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("Rx'ing /C/, enable AutoNeg and stop forcing link.\n");
+               ew32(TXCW, mac->txcw);
+               ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
+
+               mac->serdes_has_link = true;
+       }
+
+       return 0;
+}
+
+/**
+ *  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;
+
+       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;
+                       return 0;
+               }
+               e_dbg("NOT Rx'ing /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");
+                       return ret_val;
+               }
+       } 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("Rx'ing /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 successfully.\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");
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  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.
+ **/
+static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       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 = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
+
+       if (ret_val) {
+               e_dbg("NVM Read Error\n");
+               return ret_val;
+       }
+
+       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;
+
+       return 0;
+}
+
+/**
+ *  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)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       s32 ret_val;
+
+       /*
+        * In the case of the phy reset being blocked, we already have a link.
+        * We do not need to set it up again.
+        */
+       if (e1000_check_reset_block(hw))
+               return 0;
+
+       /*
+        * 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)
+                       return ret_val;
+       }
+
+       /*
+        * 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 = mac->ops.setup_physical_interface(hw);
+       if (ret_val)
+               return ret_val;
+
+       /*
+        * 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);
+
+       return e1000e_set_fc_watermarks(hw);
+}
+
+/**
+ *  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.
+ **/
+static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       u32 txcw;
+
+       /*
+        * 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");
+               return -E1000_ERR_CONFIG;
+               break;
+       }
+
+       ew32(TXCW, txcw);
+       mac->txcw = txcw;
+
+       return 0;
+}
+
+/**
+ *  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.
+ **/
+static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       u32 i, status;
+       s32 ret_val;
+
+       /*
+        * 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++) {
+               usleep_range(10000, 20000);
+               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 = mac->ops.check_for_link(hw);
+               if (ret_val) {
+                       e_dbg("Error while checking for link\n");
+                       return ret_val;
+               }
+               mac->autoneg_failed = 0;
+       } else {
+               mac->autoneg_failed = 0;
+               e_dbg("Valid Link Found\n");
+       }
+
+       return 0;
+}
+
+/**
+ *  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;
+
+       ctrl = er32(CTRL);
+
+       /* Take the link out of reset */
+       ctrl &= ~E1000_CTRL_LRST;
+
+       e1000e_config_collision_dist(hw);
+
+       ret_val = e1000_commit_fc_settings_generic(hw);
+       if (ret_val)
+               return ret_val;
+
+       /*
+        * 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();
+       usleep_range(1000, 2000);
+
+       /*
+        * 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 = e1000_poll_fiber_serdes_link_generic(hw);
+       } else {
+               e_dbg("No signal detected\n");
+       }
+
+       return 0;
+}
+
+/**
+ *  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_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)
+{
+       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;
+               fcrtl |= E1000_FCRTL_XONE;
+               fcrth = hw->fc.high_water;
+       }
+       ew32(FCRTL, fcrtl);
+       ew32(FCRTH, fcrth);
+
+       return 0;
+}
+
+/**
+ *  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;
+
+       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");
+               return -E1000_ERR_CONFIG;
+       }
+
+       ew32(CTRL, ctrl);
+
+       return 0;
+}
+
+/**
+ *  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 = 0;
+       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");
+               return ret_val;
+       }
+
+       /*
+        * 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)
+                       return ret_val;
+               ret_val = e1e_rphy(hw, PHY_STATUS, &mii_status_reg);
+               if (ret_val)
+                       return ret_val;
+
+               if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) {
+                       e_dbg("Copper PHY and Auto Neg "
+                                "has not completed.\n");
+                       return ret_val;
+               }
+
+               /*
+                * 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)
+                       return ret_val;
+               ret_val =
+                   e1e_rphy(hw, PHY_LP_ABILITY, &mii_nway_lp_ability_reg);
+               if (ret_val)
+                       return ret_val;
+
+               /*
+                * 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");
+                       return ret_val;
+               }
+
+               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");
+                       return ret_val;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  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;
+       else if (status & E1000_STATUS_SPEED_100)
+               *speed = SPEED_100;
+       else
+               *speed = SPEED_10;
+
+       if (status & E1000_STATUS_FD)
+               *duplex = FULL_DUPLEX;
+       else
+               *duplex = HALF_DUPLEX;
+
+       e_dbg("%u Mbps, %s Duplex\n",
+             *speed == SPEED_1000 ? 1000 : *speed == SPEED_100 ? 100 : 10,
+             *duplex == FULL_DUPLEX ? "Full" : "Half");
+
+       return 0;
+}
+
+/**
+ *  e1000e_get_speed_and_duplex_fiber_serdes - 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, u16 *speed, u16 *duplex)
+{
+       *speed = SPEED_1000;
+       *duplex = FULL_DUPLEX;
+
+       return 0;
+}
+
+/**
+ *  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 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");
+               return -E1000_ERR_NVM;
+       }
+
+       /* 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");
+               return -E1000_ERR_NVM;
+       }
+
+       return 0;
+}
+
+/**
+ *  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;
+
+       while (i < AUTO_READ_DONE_TIMEOUT) {
+               if (er32(EECD) & E1000_EECD_AUTO_RD)
+                       break;
+               usleep_range(1000, 2000);
+               i++;
+       }
+
+       if (i == AUTO_READ_DONE_TIMEOUT) {
+               e_dbg("Auto read by HW from NVM has not completed.\n");
+               return -E1000_ERR_RESET;
+       }
+
+       return 0;
+}
+
+/**
+ *  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 = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
+       if (ret_val) {
+               e_dbg("NVM Read Error\n");
+               return ret_val;
+       }
+
+       if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
+               *data = ID_LED_DEFAULT;
+
+       return 0;
+}
+
+/**
+ *  e1000e_id_led_init -
+ *  @hw: pointer to the HW structure
+ *
+ **/
+s32 e1000e_id_led_init(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;
+
+       ret_val = hw->nvm.ops.valid_led_default(hw, &data);
+       if (ret_val)
+               return ret_val;
+
+       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;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  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)
+{
+       u32 ledctl;
+
+       if (hw->mac.ops.setup_led != e1000e_setup_led_generic)
+               return -E1000_ERR_CONFIG;
+
+       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);
+       }
+
+       return 0;
+}
+
+/**
+ *  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)
+{
+       ew32(LEDCTL, hw->mac.ledctl_default);
+       return 0;
+}
+
+/**
+ *  e1000e_blink_led_generic - Blink LED
+ *  @hw: pointer to the HW structure
+ *
+ *  Blink the LEDs which are set to be on.
+ **/
+s32 e1000e_blink_led_generic(struct e1000_hw *hw)
+{
+       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);
+
+       return 0;
+}
+
+/**
+ *  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)
+{
+       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;
+       }
+
+       return 0;
+}
+
+/**
+ *  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)
+{
+       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;
+       }
+
+       return 0;
+}
+
+/**
+ *  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 (no_snoop) {
+               gcr = er32(GCR);
+               gcr &= ~(PCIE_NO_SNOOP_ALL);
+               gcr |= no_snoop;
+               ew32(GCR, gcr);
+       }
+}
+
+/**
+ *  e1000e_disable_pcie_master - Disables PCI-express master access
+ *  @hw: pointer to the HW structure
+ *
+ *  Returns 0 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;
+
+       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");
+               return -E1000_ERR_MASTER_REQUESTS_PENDING;
+       }
+
+       return 0;
+}
+
+/**
+ *  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;
+}
+
+/**
+ *  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;
+       ew32(EECD, *eecd);
+       e1e_flush();
+       udelay(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;
+       ew32(EECD, *eecd);
+       e1e_flush();
+       udelay(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 = 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);
+
+               e1000_raise_eec_clk(hw, &eecd);
+               e1000_lower_eec_clk(hw, &eecd);
+
+               mask >>= 1;
+       } while (mask);
+
+       eecd &= ~E1000_EECD_DI;
+       ew32(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;
+
+       eecd = er32(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 = er32(EECD);
+
+               eecd &= ~E1000_EECD_DI;
+               if (eecd & E1000_EECD_DO)
+                       data |= 1;
+
+               e1000_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;
+
+       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)
+                       return 0;
+
+               udelay(5);
+       }
+
+       return -E1000_ERR_NVM;
+}
+
+/**
+ *  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;
+
+       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");
+               return -E1000_ERR_NVM;
+       }
+
+       return 0;
+}
+
+/**
+ *  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 = 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);
+       }
+}
+
+/**
+ *  e1000_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 e1000_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;
+               e1000_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;
+
+       e1000_stop_nvm(hw);
+
+       eecd = er32(EECD);
+       eecd &= ~E1000_EECD_REQ;
+       ew32(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 = er32(EECD);
+       u8 spi_stat_reg;
+
+       if (nvm->type == e1000_nvm_eeprom_spi) {
+               u16 timeout = NVM_MAX_RETRY_SPI;
+
+               /* Clear SK and CS */
+               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
+               ew32(EECD, eecd);
+               e1e_flush();
+               udelay(1);
+
+               /*
+                * 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;
+
+                       udelay(5);
+                       e1000_standby_nvm(hw);
+                       timeout--;
+               }
+
+               if (!timeout) {
+                       e_dbg("SPI NVM Status error\n");
+                       return -E1000_ERR_NVM;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  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 = 0;
+
+       /*
+        * 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");
+               return -E1000_ERR_NVM;
+       }
+
+       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);
+       }
+
+       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");
+               return -E1000_ERR_NVM;
+       }
+
+       ret_val = nvm->ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       while (widx < words) {
+               u8 write_opcode = NVM_WRITE_OPCODE_SPI;
+
+               ret_val = e1000_ready_nvm_eeprom(hw);
+               if (ret_val) {
+                       nvm->ops.release(hw);
+                       return ret_val;
+               }
+
+               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;
+                       }
+               }
+       }
+
+       usleep_range(10000, 20000);
+       nvm->ops.release(hw);
+       return 0;
+}
+
+/**
+ *  e1000_read_pba_string_generic - Read device part number
+ *  @hw: pointer to the HW structure
+ *  @pba_num: pointer to device part number
+ *  @pba_num_size: size of part number buffer
+ *
+ *  Reads the product board assembly (PBA) number from the EEPROM and stores
+ *  the value in pba_num.
+ **/
+s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
+                                 u32 pba_num_size)
+{
+       s32 ret_val;
+       u16 nvm_data;
+       u16 pba_ptr;
+       u16 offset;
+       u16 length;
+
+       if (pba_num == NULL) {
+               e_dbg("PBA string buffer was null\n");
+               ret_val = E1000_ERR_INVALID_ARGUMENT;
+               goto out;
+       }
+
+       ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
+       if (ret_val) {
+               e_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &pba_ptr);
+       if (ret_val) {
+               e_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       /*
+        * if nvm_data is not ptr guard the PBA must be in legacy format which
+        * means pba_ptr is actually our second data word for the PBA number
+        * and we can decode it into an ascii string
+        */
+       if (nvm_data != NVM_PBA_PTR_GUARD) {
+               e_dbg("NVM PBA number is not stored as string\n");
+
+               /* we will need 11 characters to store the PBA */
+               if (pba_num_size < 11) {
+                       e_dbg("PBA string buffer too small\n");
+                       return E1000_ERR_NO_SPACE;
+               }
+
+               /* extract hex string from data and pba_ptr */
+               pba_num[0] = (nvm_data >> 12) & 0xF;
+               pba_num[1] = (nvm_data >> 8) & 0xF;
+               pba_num[2] = (nvm_data >> 4) & 0xF;
+               pba_num[3] = nvm_data & 0xF;
+               pba_num[4] = (pba_ptr >> 12) & 0xF;
+               pba_num[5] = (pba_ptr >> 8) & 0xF;
+               pba_num[6] = '-';
+               pba_num[7] = 0;
+               pba_num[8] = (pba_ptr >> 4) & 0xF;
+               pba_num[9] = pba_ptr & 0xF;
+
+               /* put a null character on the end of our string */
+               pba_num[10] = '\0';
+
+               /* switch all the data but the '-' to hex char */
+               for (offset = 0; offset < 10; offset++) {
+                       if (pba_num[offset] < 0xA)
+                               pba_num[offset] += '0';
+                       else if (pba_num[offset] < 0x10)
+                               pba_num[offset] += 'A' - 0xA;
+               }
+
+               goto out;
+       }
+
+       ret_val = e1000_read_nvm(hw, pba_ptr, 1, &length);
+       if (ret_val) {
+               e_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       if (length == 0xFFFF || length == 0) {
+               e_dbg("NVM PBA number section invalid length\n");
+               ret_val = E1000_ERR_NVM_PBA_SECTION;
+               goto out;
+       }
+       /* check if pba_num buffer is big enough */
+       if (pba_num_size < (((u32)length * 2) - 1)) {
+               e_dbg("PBA string buffer too small\n");
+               ret_val = E1000_ERR_NO_SPACE;
+               goto out;
+       }
+
+       /* trim pba length from start of string */
+       pba_ptr++;
+       length--;
+
+       for (offset = 0; offset < length; offset++) {
+               ret_val = e1000_read_nvm(hw, pba_ptr + offset, 1, &nvm_data);
+               if (ret_val) {
+                       e_dbg("NVM Read Error\n");
+                       goto out;
+               }
+               pba_num[offset * 2] = (u8)(nvm_data >> 8);
+               pba_num[(offset * 2) + 1] = (u8)(nvm_data & 0xFF);
+       }
+       pba_num[offset * 2] = '\0';
+
+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 = 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_ALEN; i++)
+               hw->mac.addr[i] = hw->mac.perm_addr[i];
+
+       return 0;
+}
+
+/**
+ *  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;
+       u16 checksum = 0;
+       u16 i, nvm_data;
+
+       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
+               ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
+               if (ret_val) {
+                       e_dbg("NVM Read Error\n");
+                       return ret_val;
+               }
+               checksum += nvm_data;
+       }
+
+       if (checksum != (u16) NVM_SUM) {
+               e_dbg("NVM Checksum Invalid\n");
+               return -E1000_ERR_NVM;
+       }
+
+       return 0;
+}
+
+/**
+ *  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 = e1000_read_nvm(hw, i, 1, &nvm_data);
+               if (ret_val) {
+                       e_dbg("NVM Read Error while updating checksum.\n");
+                       return ret_val;
+               }
+               checksum += nvm_data;
+       }
+       checksum = (u16) NVM_SUM - checksum;
+       ret_val = e1000_write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum);
+       if (ret_val)
+               e_dbg("NVM Write Error while updating checksum.\n");
+
+       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.
+ **/
+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();
+}
+
+/**
+ *  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;
+
+       if (!buffer)
+               return 0;
+
+       for (i = 0; i < length; i++)
+               sum += buffer[i];
+
+       return (u8) (0 - sum);
+}
+
+/**
+ *  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.
+ **/
+static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
+{
+       u32 hicr;
+       u8 i;
+
+       if (!(hw->mac.arc_subsystem_valid)) {
+               e_dbg("ARC subsystem not valid.\n");
+               return -E1000_ERR_HOST_INTERFACE_COMMAND;
+       }
+
+       /* Check that the host interface is enabled. */
+       hicr = er32(HICR);
+       if ((hicr & E1000_HICR_EN) == 0) {
+               e_dbg("E1000_HOST_EN bit disabled.\n");
+               return -E1000_ERR_HOST_INTERFACE_COMMAND;
+       }
+       /* 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");
+               return -E1000_ERR_HOST_INTERFACE_COMMAND;
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000e_check_mng_mode_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 = 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;
+
+       hw->mac.tx_pkt_filtering = true;
+
+       /* No manageability, no filtering */
+       if (!e1000e_check_mng_mode(hw)) {
+               hw->mac.tx_pkt_filtering = false;
+               goto out;
+       }
+
+       /*
+        * If we can't read from the host interface for whatever
+        * reason, disable filtering.
+        */
+       ret_val = e1000_mng_enable_host_if(hw);
+       if (ret_val) {
+               hw->mac.tx_pkt_filtering = 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(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) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
+               hw->mac.tx_pkt_filtering = true;
+               goto out;
+       }
+
+       /* Cookie area is valid, make the final check for filtering. */
+       if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
+               hw->mac.tx_pkt_filtering = false;
+               goto out;
+       }
+
+out:
+       return hw->mac.tx_pkt_filtering;
+}
+
+/**
+ *  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.
+ **/
+static s32 e1000_mng_write_cmd_header(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 = 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(hw, E1000_HOST_IF, i,
+                                           *((u32 *) hdr + i));
+               e1e_flush();
+       }
+
+       return 0;
+}
+
+/**
+ *  e1000_mng_host_if_write - 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.
+ **/
+static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer,
+                                  u16 length, u16 offset, u8 *sum)
+{
+       u8 *tmp;
+       u8 *bufptr = buffer;
+       u32 data = 0;
+       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)
+               return -E1000_ERR_PARAM;
+
+       tmp = (u8 *)&data;
+       prev_bytes = offset & 0x3;
+       offset >>= 2;
+
+       if (prev_bytes) {
+               data = E1000_READ_REG_ARRAY(hw, E1000_HOST_IF, offset);
+               for (j = prev_bytes; j < sizeof(u32); j++) {
+                       *(tmp + j) = *bufptr++;
+                       *sum += *(tmp + j);
+               }
+               E1000_WRITE_REG_ARRAY(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(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(hw, E1000_HOST_IF, offset + i, data);
+       }
+
+       return 0;
+}
+
+/**
+ *  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 = e1000_mng_enable_host_if(hw);
+       if (ret_val)
+               return ret_val;
+
+       /* Populate the host interface with the contents of "buffer". */
+       ret_val = e1000_mng_host_if_write(hw, buffer, length,
+                                         sizeof(hdr), &(hdr.checksum));
+       if (ret_val)
+               return ret_val;
+
+       /* Write the manageability command header */
+       ret_val = e1000_mng_write_cmd_header(hw, &hdr);
+       if (ret_val)
+               return ret_val;
+
+       /* Tell the ARC a new command is pending. */
+       hicr = er32(HICR);
+       ew32(HICR, hicr | E1000_HICR_C);
+
+       return 0;
+}
+
+/**
+ *  e1000e_enable_mng_pass_thru - Check if management passthrough is needed
+ *  @hw: pointer to the HW structure
+ *
+ *  Verifies the hardware needs to leave interface enabled so that frames can
+ *  be directed to and from the management interface.
+ **/
+bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
+{
+       u32 manc;
+       u32 fwsm, factps;
+       bool ret_val = false;
+
+       manc = er32(MANC);
+
+       if (!(manc & E1000_MANC_RCV_TCO_EN))
+               goto out;
+
+       if (hw->mac.has_fwsm) {
+               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 ((hw->mac.type == e1000_82574) ||
+                  (hw->mac.type == e1000_82583)) {
+               u16 data;
+
+               factps = er32(FACTPS);
+               e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+
+               if (!(factps & E1000_FACTPS_MNGCG) &&
+                   ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
+                    (e1000_mng_mode_pt << 13))) {
+                       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;
+}
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
new file mode 100644 (file)
index 0000000..ab4be80
--- /dev/null
@@ -0,0 +1,6312 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/vmalloc.h>
+#include <linux/pagemap.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/interrupt.h>
+#include <linux/tcp.h>
+#include <linux/ipv6.h>
+#include <linux/slab.h>
+#include <net/checksum.h>
+#include <net/ip6_checksum.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+#include <linux/cpu.h>
+#include <linux/smp.h>
+#include <linux/pm_qos_params.h>
+#include <linux/pm_runtime.h>
+#include <linux/aer.h>
+#include <linux/prefetch.h>
+
+#include "e1000.h"
+
+#define DRV_EXTRAVERSION "-k"
+
+#define DRV_VERSION "1.3.16" DRV_EXTRAVERSION
+char e1000e_driver_name[] = "e1000e";
+const char e1000e_driver_version[] = DRV_VERSION;
+
+static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);
+
+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,
+};
+
+struct e1000_reg_info {
+       u32 ofs;
+       char *name;
+};
+
+#define E1000_RDFH     0x02410 /* Rx Data FIFO Head - RW */
+#define E1000_RDFT     0x02418 /* Rx Data FIFO Tail - RW */
+#define E1000_RDFHS    0x02420 /* Rx Data FIFO Head Saved - RW */
+#define E1000_RDFTS    0x02428 /* Rx Data FIFO Tail Saved - RW */
+#define E1000_RDFPC    0x02430 /* Rx Data FIFO Packet Count - 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 */
+
+static const struct e1000_reg_info e1000_reg_info_tbl[] = {
+
+       /* General Registers */
+       {E1000_CTRL, "CTRL"},
+       {E1000_STATUS, "STATUS"},
+       {E1000_CTRL_EXT, "CTRL_EXT"},
+
+       /* Interrupt Registers */
+       {E1000_ICR, "ICR"},
+
+       /* Rx Registers */
+       {E1000_RCTL, "RCTL"},
+       {E1000_RDLEN, "RDLEN"},
+       {E1000_RDH, "RDH"},
+       {E1000_RDT, "RDT"},
+       {E1000_RDTR, "RDTR"},
+       {E1000_RXDCTL(0), "RXDCTL"},
+       {E1000_ERT, "ERT"},
+       {E1000_RDBAL, "RDBAL"},
+       {E1000_RDBAH, "RDBAH"},
+       {E1000_RDFH, "RDFH"},
+       {E1000_RDFT, "RDFT"},
+       {E1000_RDFHS, "RDFHS"},
+       {E1000_RDFTS, "RDFTS"},
+       {E1000_RDFPC, "RDFPC"},
+
+       /* Tx Registers */
+       {E1000_TCTL, "TCTL"},
+       {E1000_TDBAL, "TDBAL"},
+       {E1000_TDBAH, "TDBAH"},
+       {E1000_TDLEN, "TDLEN"},
+       {E1000_TDH, "TDH"},
+       {E1000_TDT, "TDT"},
+       {E1000_TIDV, "TIDV"},
+       {E1000_TXDCTL(0), "TXDCTL"},
+       {E1000_TADV, "TADV"},
+       {E1000_TARC(0), "TARC"},
+       {E1000_TDFH, "TDFH"},
+       {E1000_TDFT, "TDFT"},
+       {E1000_TDFHS, "TDFHS"},
+       {E1000_TDFTS, "TDFTS"},
+       {E1000_TDFPC, "TDFPC"},
+
+       /* List Terminator */
+       {}
+};
+
+/*
+ * e1000_regdump - register printout routine
+ */
+static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo)
+{
+       int n = 0;
+       char rname[16];
+       u32 regs[8];
+
+       switch (reginfo->ofs) {
+       case E1000_RXDCTL(0):
+               for (n = 0; n < 2; n++)
+                       regs[n] = __er32(hw, E1000_RXDCTL(n));
+               break;
+       case E1000_TXDCTL(0):
+               for (n = 0; n < 2; n++)
+                       regs[n] = __er32(hw, E1000_TXDCTL(n));
+               break;
+       case E1000_TARC(0):
+               for (n = 0; n < 2; n++)
+                       regs[n] = __er32(hw, E1000_TARC(n));
+               break;
+       default:
+               printk(KERN_INFO "%-15s %08x\n",
+                      reginfo->name, __er32(hw, reginfo->ofs));
+               return;
+       }
+
+       snprintf(rname, 16, "%s%s", reginfo->name, "[0-1]");
+       printk(KERN_INFO "%-15s ", rname);
+       for (n = 0; n < 2; n++)
+               printk(KERN_CONT "%08x ", regs[n]);
+       printk(KERN_CONT "\n");
+}
+
+/*
+ * e1000e_dump - Print registers, Tx-ring and Rx-ring
+ */
+static void e1000e_dump(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_reg_info *reginfo;
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_tx_desc *tx_desc;
+       struct my_u0 {
+               u64 a;
+               u64 b;
+       } *u0;
+       struct e1000_buffer *buffer_info;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       union e1000_rx_desc_packet_split *rx_desc_ps;
+       struct e1000_rx_desc *rx_desc;
+       struct my_u1 {
+               u64 a;
+               u64 b;
+               u64 c;
+               u64 d;
+       } *u1;
+       u32 staterr;
+       int i = 0;
+
+       if (!netif_msg_hw(adapter))
+               return;
+
+       /* Print netdevice Info */
+       if (netdev) {
+               dev_info(&adapter->pdev->dev, "Net device Info\n");
+               printk(KERN_INFO "Device Name     state            "
+                      "trans_start      last_rx\n");
+               printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",
+                      netdev->name, netdev->state, netdev->trans_start,
+                      netdev->last_rx);
+       }
+
+       /* Print Registers */
+       dev_info(&adapter->pdev->dev, "Register Dump\n");
+       printk(KERN_INFO " Register Name   Value\n");
+       for (reginfo = (struct e1000_reg_info *)e1000_reg_info_tbl;
+            reginfo->name; reginfo++) {
+               e1000_regdump(hw, reginfo);
+       }
+
+       /* Print Tx Ring Summary */
+       if (!netdev || !netif_running(netdev))
+               goto exit;
+
+       dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");
+       printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma  ]"
+              " leng ntw timestamp\n");
+       buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
+       printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",
+              0, tx_ring->next_to_use, tx_ring->next_to_clean,
+              (unsigned long long)buffer_info->dma,
+              buffer_info->length,
+              buffer_info->next_to_watch,
+              (unsigned long long)buffer_info->time_stamp);
+
+       /* Print Tx Ring */
+       if (!netif_msg_tx_done(adapter))
+               goto rx_ring_summary;
+
+       dev_info(&adapter->pdev->dev, "Tx Ring Dump\n");
+
+       /* Transmit Descriptor Formats - DEXT[29] is 0 (Legacy) or 1 (Extended)
+        *
+        * Legacy Transmit Descriptor
+        *   +--------------------------------------------------------------+
+        * 0 |         Buffer Address [63:0] (Reserved on Write Back)       |
+        *   +--------------------------------------------------------------+
+        * 8 | Special  |    CSS     | Status |  CMD    |  CSO   |  Length  |
+        *   +--------------------------------------------------------------+
+        *   63       48 47        36 35    32 31     24 23    16 15        0
+        *
+        * Extended Context Descriptor (DTYP=0x0) for TSO or checksum offload
+        *   63      48 47    40 39       32 31             16 15    8 7      0
+        *   +----------------------------------------------------------------+
+        * 0 |  TUCSE  | TUCS0  |   TUCSS   |     IPCSE       | IPCS0 | IPCSS |
+        *   +----------------------------------------------------------------+
+        * 8 |   MSS   | HDRLEN | RSV | STA | TUCMD | DTYP |      PAYLEN      |
+        *   +----------------------------------------------------------------+
+        *   63      48 47    40 39 36 35 32 31   24 23  20 19                0
+        *
+        * Extended Data Descriptor (DTYP=0x1)
+        *   +----------------------------------------------------------------+
+        * 0 |                     Buffer Address [63:0]                      |
+        *   +----------------------------------------------------------------+
+        * 8 | VLAN tag |  POPTS  | Rsvd | Status | Command | DTYP |  DTALEN  |
+        *   +----------------------------------------------------------------+
+        *   63       48 47     40 39  36 35    32 31     24 23  20 19        0
+        */
+       printk(KERN_INFO "Tl[desc]     [address 63:0  ] [SpeCssSCmCsLen]"
+              " [bi->dma       ] leng  ntw timestamp        bi->skb "
+              "<-- Legacy format\n");
+       printk(KERN_INFO "Tc[desc]     [Ce CoCsIpceCoS] [MssHlRSCm0Plen]"
+              " [bi->dma       ] leng  ntw timestamp        bi->skb "
+              "<-- Ext Context format\n");
+       printk(KERN_INFO "Td[desc]     [address 63:0  ] [VlaPoRSCm1Dlen]"
+              " [bi->dma       ] leng  ntw timestamp        bi->skb "
+              "<-- Ext Data format\n");
+       for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
+               tx_desc = E1000_TX_DESC(*tx_ring, i);
+               buffer_info = &tx_ring->buffer_info[i];
+               u0 = (struct my_u0 *)tx_desc;
+               printk(KERN_INFO "T%c[0x%03X]    %016llX %016llX %016llX "
+                      "%04X  %3X %016llX %p",
+                      (!(le64_to_cpu(u0->b) & (1 << 29)) ? 'l' :
+                       ((le64_to_cpu(u0->b) & (1 << 20)) ? 'd' : 'c')), i,
+                      (unsigned long long)le64_to_cpu(u0->a),
+                      (unsigned long long)le64_to_cpu(u0->b),
+                      (unsigned long long)buffer_info->dma,
+                      buffer_info->length, buffer_info->next_to_watch,
+                      (unsigned long long)buffer_info->time_stamp,
+                      buffer_info->skb);
+               if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean)
+                       printk(KERN_CONT " NTC/U\n");
+               else if (i == tx_ring->next_to_use)
+                       printk(KERN_CONT " NTU\n");
+               else if (i == tx_ring->next_to_clean)
+                       printk(KERN_CONT " NTC\n");
+               else
+                       printk(KERN_CONT "\n");
+
+               if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
+                       print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,
+                                      16, 1, phys_to_virt(buffer_info->dma),
+                                      buffer_info->length, true);
+       }
+
+       /* Print Rx Ring Summary */
+rx_ring_summary:
+       dev_info(&adapter->pdev->dev, "Rx Ring Summary\n");
+       printk(KERN_INFO "Queue [NTU] [NTC]\n");
+       printk(KERN_INFO " %5d %5X %5X\n", 0,
+              rx_ring->next_to_use, rx_ring->next_to_clean);
+
+       /* Print Rx Ring */
+       if (!netif_msg_rx_status(adapter))
+               goto exit;
+
+       dev_info(&adapter->pdev->dev, "Rx Ring Dump\n");
+       switch (adapter->rx_ps_pages) {
+       case 1:
+       case 2:
+       case 3:
+               /* [Extended] Packet Split Receive Descriptor Format
+                *
+                *    +-----------------------------------------------------+
+                *  0 |                Buffer Address 0 [63:0]              |
+                *    +-----------------------------------------------------+
+                *  8 |                Buffer Address 1 [63:0]              |
+                *    +-----------------------------------------------------+
+                * 16 |                Buffer Address 2 [63:0]              |
+                *    +-----------------------------------------------------+
+                * 24 |                Buffer Address 3 [63:0]              |
+                *    +-----------------------------------------------------+
+                */
+               printk(KERN_INFO "R  [desc]      [buffer 0 63:0 ] "
+                      "[buffer 1 63:0 ] "
+                      "[buffer 2 63:0 ] [buffer 3 63:0 ] [bi->dma       ] "
+                      "[bi->skb] <-- Ext Pkt Split format\n");
+               /* [Extended] Receive Descriptor (Write-Back) Format
+                *
+                *   63       48 47    32 31     13 12    8 7    4 3        0
+                *   +------------------------------------------------------+
+                * 0 | Packet   | IP     |  Rsvd   | MRQ   | Rsvd | MRQ RSS |
+                *   | Checksum | Ident  |         | Queue |      |  Type   |
+                *   +------------------------------------------------------+
+                * 8 | VLAN Tag | Length | Extended Error | Extended Status |
+                *   +------------------------------------------------------+
+                *   63       48 47    32 31            20 19               0
+                */
+               printk(KERN_INFO "RWB[desc]      [ck ipid mrqhsh] "
+                      "[vl   l0 ee  es] "
+                      "[ l3  l2  l1 hs] [reserved      ] ---------------- "
+                      "[bi->skb] <-- Ext Rx Write-Back format\n");
+               for (i = 0; i < rx_ring->count; i++) {
+                       buffer_info = &rx_ring->buffer_info[i];
+                       rx_desc_ps = E1000_RX_DESC_PS(*rx_ring, i);
+                       u1 = (struct my_u1 *)rx_desc_ps;
+                       staterr =
+                           le32_to_cpu(rx_desc_ps->wb.middle.status_error);
+                       if (staterr & E1000_RXD_STAT_DD) {
+                               /* Descriptor Done */
+                               printk(KERN_INFO "RWB[0x%03X]     %016llX "
+                                      "%016llX %016llX %016llX "
+                                      "---------------- %p", i,
+                                      (unsigned long long)le64_to_cpu(u1->a),
+                                      (unsigned long long)le64_to_cpu(u1->b),
+                                      (unsigned long long)le64_to_cpu(u1->c),
+                                      (unsigned long long)le64_to_cpu(u1->d),
+                                      buffer_info->skb);
+                       } else {
+                               printk(KERN_INFO "R  [0x%03X]     %016llX "
+                                      "%016llX %016llX %016llX %016llX %p", i,
+                                      (unsigned long long)le64_to_cpu(u1->a),
+                                      (unsigned long long)le64_to_cpu(u1->b),
+                                      (unsigned long long)le64_to_cpu(u1->c),
+                                      (unsigned long long)le64_to_cpu(u1->d),
+                                      (unsigned long long)buffer_info->dma,
+                                      buffer_info->skb);
+
+                               if (netif_msg_pktdata(adapter))
+                                       print_hex_dump(KERN_INFO, "",
+                                               DUMP_PREFIX_ADDRESS, 16, 1,
+                                               phys_to_virt(buffer_info->dma),
+                                               adapter->rx_ps_bsize0, true);
+                       }
+
+                       if (i == rx_ring->next_to_use)
+                               printk(KERN_CONT " NTU\n");
+                       else if (i == rx_ring->next_to_clean)
+                               printk(KERN_CONT " NTC\n");
+                       else
+                               printk(KERN_CONT "\n");
+               }
+               break;
+       default:
+       case 0:
+               /* Legacy Receive Descriptor Format
+                *
+                * +-----------------------------------------------------+
+                * |                Buffer Address [63:0]                |
+                * +-----------------------------------------------------+
+                * | VLAN Tag | Errors | Status 0 | Packet csum | Length |
+                * +-----------------------------------------------------+
+                * 63       48 47    40 39      32 31         16 15      0
+                */
+               printk(KERN_INFO "Rl[desc]     [address 63:0  ] "
+                      "[vl er S cks ln] [bi->dma       ] [bi->skb] "
+                      "<-- Legacy format\n");
+               for (i = 0; rx_ring->desc && (i < rx_ring->count); i++) {
+                       rx_desc = E1000_RX_DESC(*rx_ring, i);
+                       buffer_info = &rx_ring->buffer_info[i];
+                       u0 = (struct my_u0 *)rx_desc;
+                       printk(KERN_INFO "Rl[0x%03X]    %016llX %016llX "
+                              "%016llX %p", i,
+                              (unsigned long long)le64_to_cpu(u0->a),
+                              (unsigned long long)le64_to_cpu(u0->b),
+                              (unsigned long long)buffer_info->dma,
+                              buffer_info->skb);
+                       if (i == rx_ring->next_to_use)
+                               printk(KERN_CONT " NTU\n");
+                       else if (i == rx_ring->next_to_clean)
+                               printk(KERN_CONT " NTC\n");
+                       else
+                               printk(KERN_CONT "\n");
+
+                       if (netif_msg_pktdata(adapter))
+                               print_hex_dump(KERN_INFO, "",
+                                              DUMP_PREFIX_ADDRESS,
+                                              16, 1,
+                                              phys_to_virt(buffer_info->dma),
+                                              adapter->rx_buffer_len, true);
+               }
+       }
+
+exit:
+       return;
+}
+
+/**
+ * e1000_desc_unused - calculate if we have unused descriptors
+ **/
+static int e1000_desc_unused(struct e1000_ring *ring)
+{
+       if (ring->next_to_clean > ring->next_to_use)
+               return ring->next_to_clean - ring->next_to_use - 1;
+
+       return ring->count + ring->next_to_clean - ring->next_to_use - 1;
+}
+
+/**
+ * e1000_receive_skb - helper function to handle Rx indications
+ * @adapter: board private structure
+ * @status: descriptor status field as written by hardware
+ * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
+ * @skb: pointer to sk_buff to be indicated to stack
+ **/
+static void e1000_receive_skb(struct e1000_adapter *adapter,
+                             struct net_device *netdev, struct sk_buff *skb,
+                             u8 status, __le16 vlan)
+{
+       u16 tag = le16_to_cpu(vlan);
+       skb->protocol = eth_type_trans(skb, netdev);
+
+       if (status & E1000_RXD_STAT_VP)
+               __vlan_hwaccel_put_tag(skb, tag);
+
+       napi_gro_receive(&adapter->napi, skb);
+}
+
+/**
+ * e1000_rx_checksum - Receive Checksum Offload
+ * @adapter:     board private structure
+ * @status_err:  receive descriptor status and error fields
+ * @csum:      receive descriptor csum field
+ * @sk_buff:     socket buffer with received data
+ **/
+static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
+                             u32 csum, struct sk_buff *skb)
+{
+       u16 status = (u16)status_err;
+       u8 errors = (u8)(status_err >> 24);
+
+       skb_checksum_none_assert(skb);
+
+       /* Ignore Checksum bit is set */
+       if (status & E1000_RXD_STAT_IXSM)
+               return;
+       /* TCP/UDP checksum error bit is set */
+       if (errors & E1000_RXD_ERR_TCPE) {
+               /* let the stack verify checksum errors */
+               adapter->hw_csum_err++;
+               return;
+       }
+
+       /* TCP/UDP Checksum has not been calculated */
+       if (!(status & (E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_UDPCS)))
+               return;
+
+       /* It must be a TCP or UDP packet with a valid checksum */
+       if (status & E1000_RXD_STAT_TCPCS) {
+               /* TCP checksum is good */
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+       } else {
+               /*
+                * IP fragment with UDP payload
+                * Hardware complements the payload checksum, so we undo it
+                * and then put the value in host order for further stack use.
+                */
+               __sum16 sum = (__force __sum16)htons(csum);
+               skb->csum = csum_unfold(~sum);
+               skb->ip_summed = CHECKSUM_COMPLETE;
+       }
+       adapter->hw_csum_good++;
+}
+
+/**
+ * e1000_alloc_rx_buffers - Replace used receive buffers; legacy & extended
+ * @adapter: address of board private structure
+ **/
+static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
+                                  int cleaned_count, gfp_t gfp)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_rx_desc *rx_desc;
+       struct e1000_buffer *buffer_info;
+       struct sk_buff *skb;
+       unsigned int i;
+       unsigned int bufsz = adapter->rx_buffer_len;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (cleaned_count--) {
+               skb = buffer_info->skb;
+               if (skb) {
+                       skb_trim(skb, 0);
+                       goto map_skb;
+               }
+
+               skb = __netdev_alloc_skb_ip_align(netdev, bufsz, gfp);
+               if (!skb) {
+                       /* Better luck next round */
+                       adapter->alloc_rx_buff_failed++;
+                       break;
+               }
+
+               buffer_info->skb = skb;
+map_skb:
+               buffer_info->dma = dma_map_single(&pdev->dev, skb->data,
+                                                 adapter->rx_buffer_len,
+                                                 DMA_FROM_DEVICE);
+               if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
+                       dev_err(&pdev->dev, "Rx DMA map failed\n");
+                       adapter->rx_dma_failed++;
+                       break;
+               }
+
+               rx_desc = E1000_RX_DESC(*rx_ring, i);
+               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
+
+               if (unlikely(!(i & (E1000_RX_BUFFER_WRITE - 1)))) {
+                       /*
+                        * Force memory writes to complete before letting h/w
+                        * know there are new descriptors to fetch.  (Only
+                        * applicable for weak-ordered memory model archs,
+                        * such as IA-64).
+                        */
+                       wmb();
+                       writel(i, adapter->hw.hw_addr + rx_ring->tail);
+               }
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+       rx_ring->next_to_use = i;
+}
+
+/**
+ * e1000_alloc_rx_buffers_ps - Replace used receive buffers; packet split
+ * @adapter: address of board private structure
+ **/
+static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
+                                     int cleaned_count, gfp_t gfp)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       union e1000_rx_desc_packet_split *rx_desc;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_buffer *buffer_info;
+       struct e1000_ps_page *ps_page;
+       struct sk_buff *skb;
+       unsigned int i, j;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (cleaned_count--) {
+               rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
+
+               for (j = 0; j < PS_PAGE_BUFFERS; j++) {
+                       ps_page = &buffer_info->ps_pages[j];
+                       if (j >= adapter->rx_ps_pages) {
+                               /* all unused desc entries get hw null ptr */
+                               rx_desc->read.buffer_addr[j + 1] =
+                                   ~cpu_to_le64(0);
+                               continue;
+                       }
+                       if (!ps_page->page) {
+                               ps_page->page = alloc_page(gfp);
+                               if (!ps_page->page) {
+                                       adapter->alloc_rx_buff_failed++;
+                                       goto no_buffers;
+                               }
+                               ps_page->dma = dma_map_page(&pdev->dev,
+                                                           ps_page->page,
+                                                           0, PAGE_SIZE,
+                                                           DMA_FROM_DEVICE);
+                               if (dma_mapping_error(&pdev->dev,
+                                                     ps_page->dma)) {
+                                       dev_err(&adapter->pdev->dev,
+                                               "Rx DMA page map failed\n");
+                                       adapter->rx_dma_failed++;
+                                       goto no_buffers;
+                               }
+                       }
+                       /*
+                        * Refresh the desc even if buffer_addrs
+                        * didn't change because each write-back
+                        * erases this info.
+                        */
+                       rx_desc->read.buffer_addr[j + 1] =
+                           cpu_to_le64(ps_page->dma);
+               }
+
+               skb = __netdev_alloc_skb_ip_align(netdev,
+                                                 adapter->rx_ps_bsize0,
+                                                 gfp);
+
+               if (!skb) {
+                       adapter->alloc_rx_buff_failed++;
+                       break;
+               }
+
+               buffer_info->skb = skb;
+               buffer_info->dma = dma_map_single(&pdev->dev, skb->data,
+                                                 adapter->rx_ps_bsize0,
+                                                 DMA_FROM_DEVICE);
+               if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
+                       dev_err(&pdev->dev, "Rx DMA map failed\n");
+                       adapter->rx_dma_failed++;
+                       /* cleanup skb */
+                       dev_kfree_skb_any(skb);
+                       buffer_info->skb = NULL;
+                       break;
+               }
+
+               rx_desc->read.buffer_addr[0] = cpu_to_le64(buffer_info->dma);
+
+               if (unlikely(!(i & (E1000_RX_BUFFER_WRITE - 1)))) {
+                       /*
+                        * Force memory writes to complete before letting h/w
+                        * know there are new descriptors to fetch.  (Only
+                        * applicable for weak-ordered memory model archs,
+                        * such as IA-64).
+                        */
+                       wmb();
+                       writel(i << 1, adapter->hw.hw_addr + rx_ring->tail);
+               }
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+no_buffers:
+       rx_ring->next_to_use = i;
+}
+
+/**
+ * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers
+ * @adapter: address of board private structure
+ * @cleaned_count: number of buffers to allocate this pass
+ **/
+
+static void e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
+                                        int cleaned_count, gfp_t gfp)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_rx_desc *rx_desc;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_buffer *buffer_info;
+       struct sk_buff *skb;
+       unsigned int i;
+       unsigned int bufsz = 256 - 16 /* for skb_reserve */;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (cleaned_count--) {
+               skb = buffer_info->skb;
+               if (skb) {
+                       skb_trim(skb, 0);
+                       goto check_page;
+               }
+
+               skb = __netdev_alloc_skb_ip_align(netdev, bufsz, gfp);
+               if (unlikely(!skb)) {
+                       /* Better luck next round */
+                       adapter->alloc_rx_buff_failed++;
+                       break;
+               }
+
+               buffer_info->skb = skb;
+check_page:
+               /* allocate a new page if necessary */
+               if (!buffer_info->page) {
+                       buffer_info->page = alloc_page(gfp);
+                       if (unlikely(!buffer_info->page)) {
+                               adapter->alloc_rx_buff_failed++;
+                               break;
+                       }
+               }
+
+               if (!buffer_info->dma)
+                       buffer_info->dma = dma_map_page(&pdev->dev,
+                                                       buffer_info->page, 0,
+                                                       PAGE_SIZE,
+                                                       DMA_FROM_DEVICE);
+
+               rx_desc = E1000_RX_DESC(*rx_ring, i);
+               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
+
+               if (unlikely(++i == rx_ring->count))
+                       i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+       if (likely(rx_ring->next_to_use != i)) {
+               rx_ring->next_to_use = i;
+               if (unlikely(i-- == 0))
+                       i = (rx_ring->count - 1);
+
+               /* Force memory writes to complete before letting h/w
+                * know there are new descriptors to fetch.  (Only
+                * applicable for weak-ordered memory model archs,
+                * such as IA-64). */
+               wmb();
+               writel(i, adapter->hw.hw_addr + rx_ring->tail);
+       }
+}
+
+/**
+ * e1000_clean_rx_irq - Send received data up the network stack; legacy
+ * @adapter: board private structure
+ *
+ * the return value indicates whether actual cleaning was done, there
+ * is no guarantee that everything was cleaned
+ **/
+static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                              int *work_done, int work_to_do)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_rx_desc *rx_desc, *next_rxd;
+       struct e1000_buffer *buffer_info, *next_buffer;
+       u32 length;
+       unsigned int i;
+       int cleaned_count = 0;
+       bool cleaned = 0;
+       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = E1000_RX_DESC(*rx_ring, i);
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (rx_desc->status & E1000_RXD_STAT_DD) {
+               struct sk_buff *skb;
+               u8 status;
+
+               if (*work_done >= work_to_do)
+                       break;
+               (*work_done)++;
+               rmb();  /* read descriptor and rx_buffer_info after status DD */
+
+               status = rx_desc->status;
+               skb = buffer_info->skb;
+               buffer_info->skb = NULL;
+
+               prefetch(skb->data - NET_IP_ALIGN);
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               next_rxd = E1000_RX_DESC(*rx_ring, i);
+               prefetch(next_rxd);
+
+               next_buffer = &rx_ring->buffer_info[i];
+
+               cleaned = 1;
+               cleaned_count++;
+               dma_unmap_single(&pdev->dev,
+                                buffer_info->dma,
+                                adapter->rx_buffer_len,
+                                DMA_FROM_DEVICE);
+               buffer_info->dma = 0;
+
+               length = le16_to_cpu(rx_desc->length);
+
+               /*
+                * !EOP means multiple descriptors were used to store a single
+                * packet, if that's the case we need to toss it.  In fact, we
+                * need to toss every packet with the EOP bit clear and the
+                * next frame that _does_ have the EOP bit set, as it is by
+                * definition only a frame fragment
+                */
+               if (unlikely(!(status & E1000_RXD_STAT_EOP)))
+                       adapter->flags2 |= FLAG2_IS_DISCARDING;
+
+               if (adapter->flags2 & FLAG2_IS_DISCARDING) {
+                       /* All receives must fit into a single buffer */
+                       e_dbg("Receive packet consumed multiple buffers\n");
+                       /* recycle */
+                       buffer_info->skb = skb;
+                       if (status & E1000_RXD_STAT_EOP)
+                               adapter->flags2 &= ~FLAG2_IS_DISCARDING;
+                       goto next_desc;
+               }
+
+               if (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK) {
+                       /* recycle */
+                       buffer_info->skb = skb;
+                       goto next_desc;
+               }
+
+               /* adjust length to remove Ethernet CRC */
+               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
+                       length -= 4;
+
+               total_rx_bytes += length;
+               total_rx_packets++;
+
+               /*
+                * code added for copybreak, this should improve
+                * performance for small packets with large amounts
+                * of reassembly being done in the stack
+                */
+               if (length < copybreak) {
+                       struct sk_buff *new_skb =
+                           netdev_alloc_skb_ip_align(netdev, length);
+                       if (new_skb) {
+                               skb_copy_to_linear_data_offset(new_skb,
+                                                              -NET_IP_ALIGN,
+                                                              (skb->data -
+                                                               NET_IP_ALIGN),
+                                                              (length +
+                                                               NET_IP_ALIGN));
+                               /* save the skb in buffer_info as good */
+                               buffer_info->skb = skb;
+                               skb = new_skb;
+                       }
+                       /* else just continue with the old one */
+               }
+               /* end copybreak code */
+               skb_put(skb, length);
+
+               /* Receive Checksum Offload */
+               e1000_rx_checksum(adapter,
+                                 (u32)(status) |
+                                 ((u32)(rx_desc->errors) << 24),
+                                 le16_to_cpu(rx_desc->csum), skb);
+
+               e1000_receive_skb(adapter, netdev, skb,status,rx_desc->special);
+
+next_desc:
+               rx_desc->status = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (cleaned_count >= E1000_RX_BUFFER_WRITE) {
+                       adapter->alloc_rx_buf(adapter, cleaned_count,
+                                             GFP_ATOMIC);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+       }
+       rx_ring->next_to_clean = i;
+
+       cleaned_count = e1000_desc_unused(rx_ring);
+       if (cleaned_count)
+               adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
+
+       adapter->total_rx_bytes += total_rx_bytes;
+       adapter->total_rx_packets += total_rx_packets;
+       return cleaned;
+}
+
+static void e1000_put_txbuf(struct e1000_adapter *adapter,
+                            struct e1000_buffer *buffer_info)
+{
+       if (buffer_info->dma) {
+               if (buffer_info->mapped_as_page)
+                       dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
+                                      buffer_info->length, DMA_TO_DEVICE);
+               else
+                       dma_unmap_single(&adapter->pdev->dev, buffer_info->dma,
+                                        buffer_info->length, DMA_TO_DEVICE);
+               buffer_info->dma = 0;
+       }
+       if (buffer_info->skb) {
+               dev_kfree_skb_any(buffer_info->skb);
+               buffer_info->skb = NULL;
+       }
+       buffer_info->time_stamp = 0;
+}
+
+static void e1000_print_hw_hang(struct work_struct *work)
+{
+       struct e1000_adapter *adapter = container_of(work,
+                                                    struct e1000_adapter,
+                                                    print_hang_task);
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       unsigned int i = tx_ring->next_to_clean;
+       unsigned int eop = tx_ring->buffer_info[i].next_to_watch;
+       struct e1000_tx_desc *eop_desc = E1000_TX_DESC(*tx_ring, eop);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 phy_status, phy_1000t_status, phy_ext_status;
+       u16 pci_status;
+
+       if (test_bit(__E1000_DOWN, &adapter->state))
+               return;
+
+       e1e_rphy(hw, PHY_STATUS, &phy_status);
+       e1e_rphy(hw, PHY_1000T_STATUS, &phy_1000t_status);
+       e1e_rphy(hw, PHY_EXT_STATUS, &phy_ext_status);
+
+       pci_read_config_word(adapter->pdev, PCI_STATUS, &pci_status);
+
+       /* detected Hardware unit hang */
+       e_err("Detected Hardware Unit Hang:\n"
+             "  TDH                  <%x>\n"
+             "  TDT                  <%x>\n"
+             "  next_to_use          <%x>\n"
+             "  next_to_clean        <%x>\n"
+             "buffer_info[next_to_clean]:\n"
+             "  time_stamp           <%lx>\n"
+             "  next_to_watch        <%x>\n"
+             "  jiffies              <%lx>\n"
+             "  next_to_watch.status <%x>\n"
+             "MAC Status             <%x>\n"
+             "PHY Status             <%x>\n"
+             "PHY 1000BASE-T Status  <%x>\n"
+             "PHY Extended Status    <%x>\n"
+             "PCI Status             <%x>\n",
+             readl(adapter->hw.hw_addr + tx_ring->head),
+             readl(adapter->hw.hw_addr + tx_ring->tail),
+             tx_ring->next_to_use,
+             tx_ring->next_to_clean,
+             tx_ring->buffer_info[eop].time_stamp,
+             eop,
+             jiffies,
+             eop_desc->upper.fields.status,
+             er32(STATUS),
+             phy_status,
+             phy_1000t_status,
+             phy_ext_status,
+             pci_status);
+}
+
+/**
+ * e1000_clean_tx_irq - Reclaim resources after transmit completes
+ * @adapter: board private structure
+ *
+ * the return value indicates whether actual cleaning was done, there
+ * is no guarantee that everything was cleaned
+ **/
+static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_tx_desc *tx_desc, *eop_desc;
+       struct e1000_buffer *buffer_info;
+       unsigned int i, eop;
+       unsigned int count = 0;
+       unsigned int total_tx_bytes = 0, total_tx_packets = 0;
+
+       i = tx_ring->next_to_clean;
+       eop = tx_ring->buffer_info[i].next_to_watch;
+       eop_desc = E1000_TX_DESC(*tx_ring, eop);
+
+       while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) &&
+              (count < tx_ring->count)) {
+               bool cleaned = false;
+               rmb(); /* read buffer_info after eop_desc */
+               for (; !cleaned; count++) {
+                       tx_desc = E1000_TX_DESC(*tx_ring, i);
+                       buffer_info = &tx_ring->buffer_info[i];
+                       cleaned = (i == eop);
+
+                       if (cleaned) {
+                               total_tx_packets += buffer_info->segs;
+                               total_tx_bytes += buffer_info->bytecount;
+                       }
+
+                       e1000_put_txbuf(adapter, buffer_info);
+                       tx_desc->upper.data = 0;
+
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+
+               if (i == tx_ring->next_to_use)
+                       break;
+               eop = tx_ring->buffer_info[i].next_to_watch;
+               eop_desc = E1000_TX_DESC(*tx_ring, eop);
+       }
+
+       tx_ring->next_to_clean = i;
+
+#define TX_WAKE_THRESHOLD 32
+       if (count && netif_carrier_ok(netdev) &&
+           e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) {
+               /* Make sure that anybody stopping the queue after this
+                * sees the new next_to_clean.
+                */
+               smp_mb();
+
+               if (netif_queue_stopped(netdev) &&
+                   !(test_bit(__E1000_DOWN, &adapter->state))) {
+                       netif_wake_queue(netdev);
+                       ++adapter->restart_queue;
+               }
+       }
+
+       if (adapter->detect_tx_hung) {
+               /*
+                * Detect a transmit hang in hardware, this serializes the
+                * check with the clearing of time_stamp and movement of i
+                */
+               adapter->detect_tx_hung = 0;
+               if (tx_ring->buffer_info[i].time_stamp &&
+                   time_after(jiffies, tx_ring->buffer_info[i].time_stamp
+                              + (adapter->tx_timeout_factor * HZ)) &&
+                   !(er32(STATUS) & E1000_STATUS_TXOFF)) {
+                       schedule_work(&adapter->print_hang_task);
+                       netif_stop_queue(netdev);
+               }
+       }
+       adapter->total_tx_bytes += total_tx_bytes;
+       adapter->total_tx_packets += total_tx_packets;
+       return count < tx_ring->count;
+}
+
+/**
+ * e1000_clean_rx_irq_ps - Send received data up the network stack; packet split
+ * @adapter: board private structure
+ *
+ * the return value indicates whether actual cleaning was done, there
+ * is no guarantee that everything was cleaned
+ **/
+static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
+                                 int *work_done, int work_to_do)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       union e1000_rx_desc_packet_split *rx_desc, *next_rxd;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_buffer *buffer_info, *next_buffer;
+       struct e1000_ps_page *ps_page;
+       struct sk_buff *skb;
+       unsigned int i, j;
+       u32 length, staterr;
+       int cleaned_count = 0;
+       bool cleaned = 0;
+       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = E1000_RX_DESC_PS(*rx_ring, i);
+       staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (staterr & E1000_RXD_STAT_DD) {
+               if (*work_done >= work_to_do)
+                       break;
+               (*work_done)++;
+               skb = buffer_info->skb;
+               rmb();  /* read descriptor and rx_buffer_info after status DD */
+
+               /* in the packet split case this is header only */
+               prefetch(skb->data - NET_IP_ALIGN);
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               next_rxd = E1000_RX_DESC_PS(*rx_ring, i);
+               prefetch(next_rxd);
+
+               next_buffer = &rx_ring->buffer_info[i];
+
+               cleaned = 1;
+               cleaned_count++;
+               dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                adapter->rx_ps_bsize0, DMA_FROM_DEVICE);
+               buffer_info->dma = 0;
+
+               /* see !EOP comment in other Rx routine */
+               if (!(staterr & E1000_RXD_STAT_EOP))
+                       adapter->flags2 |= FLAG2_IS_DISCARDING;
+
+               if (adapter->flags2 & FLAG2_IS_DISCARDING) {
+                       e_dbg("Packet Split buffers didn't pick up the full "
+                             "packet\n");
+                       dev_kfree_skb_irq(skb);
+                       if (staterr & E1000_RXD_STAT_EOP)
+                               adapter->flags2 &= ~FLAG2_IS_DISCARDING;
+                       goto next_desc;
+               }
+
+               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
+                       dev_kfree_skb_irq(skb);
+                       goto next_desc;
+               }
+
+               length = le16_to_cpu(rx_desc->wb.middle.length0);
+
+               if (!length) {
+                       e_dbg("Last part of the packet spanning multiple "
+                             "descriptors\n");
+                       dev_kfree_skb_irq(skb);
+                       goto next_desc;
+               }
+
+               /* Good Receive */
+               skb_put(skb, length);
+
+               {
+               /*
+                * this looks ugly, but it seems compiler issues make it
+                * more efficient than reusing j
+                */
+               int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
+
+               /*
+                * page alloc/put takes too long and effects small packet
+                * throughput, so unsplit small packets and save the alloc/put
+                * only valid in softirq (napi) context to call kmap_*
+                */
+               if (l1 && (l1 <= copybreak) &&
+                   ((length + l1) <= adapter->rx_ps_bsize0)) {
+                       u8 *vaddr;
+
+                       ps_page = &buffer_info->ps_pages[0];
+
+                       /*
+                        * there is no documentation about how to call
+                        * kmap_atomic, so we can't hold the mapping
+                        * very long
+                        */
+                       dma_sync_single_for_cpu(&pdev->dev, ps_page->dma,
+                                               PAGE_SIZE, DMA_FROM_DEVICE);
+                       vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
+                       memcpy(skb_tail_pointer(skb), vaddr, l1);
+                       kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+                       dma_sync_single_for_device(&pdev->dev, ps_page->dma,
+                                                  PAGE_SIZE, DMA_FROM_DEVICE);
+
+                       /* remove the CRC */
+                       if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
+                               l1 -= 4;
+
+                       skb_put(skb, l1);
+                       goto copydone;
+               } /* if */
+               }
+
+               for (j = 0; j < PS_PAGE_BUFFERS; j++) {
+                       length = le16_to_cpu(rx_desc->wb.upper.length[j]);
+                       if (!length)
+                               break;
+
+                       ps_page = &buffer_info->ps_pages[j];
+                       dma_unmap_page(&pdev->dev, ps_page->dma, PAGE_SIZE,
+                                      DMA_FROM_DEVICE);
+                       ps_page->dma = 0;
+                       skb_fill_page_desc(skb, j, ps_page->page, 0, length);
+                       ps_page->page = NULL;
+                       skb->len += length;
+                       skb->data_len += length;
+                       skb->truesize += length;
+               }
+
+               /* strip the ethernet crc, problem is we're using pages now so
+                * this whole operation can get a little cpu intensive
+                */
+               if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
+                       pskb_trim(skb, skb->len - 4);
+
+copydone:
+               total_rx_bytes += skb->len;
+               total_rx_packets++;
+
+               e1000_rx_checksum(adapter, staterr, le16_to_cpu(
+                       rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);
+
+               if (rx_desc->wb.upper.header_status &
+                          cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
+                       adapter->rx_hdr_split++;
+
+               e1000_receive_skb(adapter, netdev, skb,
+                                 staterr, rx_desc->wb.middle.vlan);
+
+next_desc:
+               rx_desc->wb.middle.status_error &= cpu_to_le32(~0xFF);
+               buffer_info->skb = NULL;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (cleaned_count >= E1000_RX_BUFFER_WRITE) {
+                       adapter->alloc_rx_buf(adapter, cleaned_count,
+                                             GFP_ATOMIC);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+
+               staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
+       }
+       rx_ring->next_to_clean = i;
+
+       cleaned_count = e1000_desc_unused(rx_ring);
+       if (cleaned_count)
+               adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
+
+       adapter->total_rx_bytes += total_rx_bytes;
+       adapter->total_rx_packets += total_rx_packets;
+       return cleaned;
+}
+
+/**
+ * e1000_consume_page - helper function
+ **/
+static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb,
+                               u16 length)
+{
+       bi->page = NULL;
+       skb->len += length;
+       skb->data_len += length;
+       skb->truesize += length;
+}
+
+/**
+ * e1000_clean_jumbo_rx_irq - Send received data up the network stack; legacy
+ * @adapter: board private structure
+ *
+ * the return value indicates whether actual cleaning was done, there
+ * is no guarantee that everything was cleaned
+ **/
+
+static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
+                                     int *work_done, int work_to_do)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_rx_desc *rx_desc, *next_rxd;
+       struct e1000_buffer *buffer_info, *next_buffer;
+       u32 length;
+       unsigned int i;
+       int cleaned_count = 0;
+       bool cleaned = false;
+       unsigned int total_rx_bytes=0, total_rx_packets=0;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = E1000_RX_DESC(*rx_ring, i);
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (rx_desc->status & E1000_RXD_STAT_DD) {
+               struct sk_buff *skb;
+               u8 status;
+
+               if (*work_done >= work_to_do)
+                       break;
+               (*work_done)++;
+               rmb();  /* read descriptor and rx_buffer_info after status DD */
+
+               status = rx_desc->status;
+               skb = buffer_info->skb;
+               buffer_info->skb = NULL;
+
+               ++i;
+               if (i == rx_ring->count)
+                       i = 0;
+               next_rxd = E1000_RX_DESC(*rx_ring, i);
+               prefetch(next_rxd);
+
+               next_buffer = &rx_ring->buffer_info[i];
+
+               cleaned = true;
+               cleaned_count++;
+               dma_unmap_page(&pdev->dev, buffer_info->dma, PAGE_SIZE,
+                              DMA_FROM_DEVICE);
+               buffer_info->dma = 0;
+
+               length = le16_to_cpu(rx_desc->length);
+
+               /* errors is only valid for DD + EOP descriptors */
+               if (unlikely((status & E1000_RXD_STAT_EOP) &&
+                   (rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK))) {
+                               /* recycle both page and skb */
+                               buffer_info->skb = skb;
+                               /* an error means any chain goes out the window
+                                * too */
+                               if (rx_ring->rx_skb_top)
+                                       dev_kfree_skb_irq(rx_ring->rx_skb_top);
+                               rx_ring->rx_skb_top = NULL;
+                               goto next_desc;
+               }
+
+#define rxtop (rx_ring->rx_skb_top)
+               if (!(status & E1000_RXD_STAT_EOP)) {
+                       /* this descriptor is only the beginning (or middle) */
+                       if (!rxtop) {
+                               /* this is the beginning of a chain */
+                               rxtop = skb;
+                               skb_fill_page_desc(rxtop, 0, buffer_info->page,
+                                                  0, length);
+                       } else {
+                               /* this is the middle of a chain */
+                               skb_fill_page_desc(rxtop,
+                                   skb_shinfo(rxtop)->nr_frags,
+                                   buffer_info->page, 0, length);
+                               /* re-use the skb, only consumed the page */
+                               buffer_info->skb = skb;
+                       }
+                       e1000_consume_page(buffer_info, rxtop, length);
+                       goto next_desc;
+               } else {
+                       if (rxtop) {
+                               /* end of the chain */
+                               skb_fill_page_desc(rxtop,
+                                   skb_shinfo(rxtop)->nr_frags,
+                                   buffer_info->page, 0, length);
+                               /* re-use the current skb, we only consumed the
+                                * page */
+                               buffer_info->skb = skb;
+                               skb = rxtop;
+                               rxtop = NULL;
+                               e1000_consume_page(buffer_info, skb, length);
+                       } else {
+                               /* no chain, got EOP, this buf is the packet
+                                * copybreak to save the put_page/alloc_page */
+                               if (length <= copybreak &&
+                                   skb_tailroom(skb) >= length) {
+                                       u8 *vaddr;
+                                       vaddr = kmap_atomic(buffer_info->page,
+                                                          KM_SKB_DATA_SOFTIRQ);
+                                       memcpy(skb_tail_pointer(skb), vaddr,
+                                              length);
+                                       kunmap_atomic(vaddr,
+                                                     KM_SKB_DATA_SOFTIRQ);
+                                       /* re-use the page, so don't erase
+                                        * buffer_info->page */
+                                       skb_put(skb, length);
+                               } else {
+                                       skb_fill_page_desc(skb, 0,
+                                                          buffer_info->page, 0,
+                                                          length);
+                                       e1000_consume_page(buffer_info, skb,
+                                                          length);
+                               }
+                       }
+               }
+
+               /* Receive Checksum Offload XXX recompute due to CRC strip? */
+               e1000_rx_checksum(adapter,
+                                 (u32)(status) |
+                                 ((u32)(rx_desc->errors) << 24),
+                                 le16_to_cpu(rx_desc->csum), skb);
+
+               /* probably a little skewed due to removing CRC */
+               total_rx_bytes += skb->len;
+               total_rx_packets++;
+
+               /* eth type trans needs skb->data to point to something */
+               if (!pskb_may_pull(skb, ETH_HLEN)) {
+                       e_err("pskb_may_pull failed.\n");
+                       dev_kfree_skb_irq(skb);
+                       goto next_desc;
+               }
+
+               e1000_receive_skb(adapter, netdev, skb, status,
+                                 rx_desc->special);
+
+next_desc:
+               rx_desc->status = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
+                       adapter->alloc_rx_buf(adapter, cleaned_count,
+                                             GFP_ATOMIC);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+       }
+       rx_ring->next_to_clean = i;
+
+       cleaned_count = e1000_desc_unused(rx_ring);
+       if (cleaned_count)
+               adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
+
+       adapter->total_rx_bytes += total_rx_bytes;
+       adapter->total_rx_packets += total_rx_packets;
+       return cleaned;
+}
+
+/**
+ * e1000_clean_rx_ring - Free Rx Buffers per Queue
+ * @adapter: board private structure
+ **/
+static void e1000_clean_rx_ring(struct e1000_adapter *adapter)
+{
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_buffer *buffer_info;
+       struct e1000_ps_page *ps_page;
+       struct pci_dev *pdev = adapter->pdev;
+       unsigned int i, j;
+
+       /* Free all the Rx ring sk_buffs */
+       for (i = 0; i < rx_ring->count; i++) {
+               buffer_info = &rx_ring->buffer_info[i];
+               if (buffer_info->dma) {
+                       if (adapter->clean_rx == e1000_clean_rx_irq)
+                               dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                                adapter->rx_buffer_len,
+                                                DMA_FROM_DEVICE);
+                       else if (adapter->clean_rx == e1000_clean_jumbo_rx_irq)
+                               dma_unmap_page(&pdev->dev, buffer_info->dma,
+                                              PAGE_SIZE,
+                                              DMA_FROM_DEVICE);
+                       else if (adapter->clean_rx == e1000_clean_rx_irq_ps)
+                               dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                                adapter->rx_ps_bsize0,
+                                                DMA_FROM_DEVICE);
+                       buffer_info->dma = 0;
+               }
+
+               if (buffer_info->page) {
+                       put_page(buffer_info->page);
+                       buffer_info->page = NULL;
+               }
+
+               if (buffer_info->skb) {
+                       dev_kfree_skb(buffer_info->skb);
+                       buffer_info->skb = NULL;
+               }
+
+               for (j = 0; j < PS_PAGE_BUFFERS; j++) {
+                       ps_page = &buffer_info->ps_pages[j];
+                       if (!ps_page->page)
+                               break;
+                       dma_unmap_page(&pdev->dev, ps_page->dma, PAGE_SIZE,
+                                      DMA_FROM_DEVICE);
+                       ps_page->dma = 0;
+                       put_page(ps_page->page);
+                       ps_page->page = NULL;
+               }
+       }
+
+       /* there also may be some cached data from a chained receive */
+       if (rx_ring->rx_skb_top) {
+               dev_kfree_skb(rx_ring->rx_skb_top);
+               rx_ring->rx_skb_top = NULL;
+       }
+
+       /* Zero out the descriptor ring */
+       memset(rx_ring->desc, 0, rx_ring->size);
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+       adapter->flags2 &= ~FLAG2_IS_DISCARDING;
+
+       writel(0, adapter->hw.hw_addr + rx_ring->head);
+       writel(0, adapter->hw.hw_addr + rx_ring->tail);
+}
+
+static void e1000e_downshift_workaround(struct work_struct *work)
+{
+       struct e1000_adapter *adapter = container_of(work,
+                                       struct e1000_adapter, downshift_task);
+
+       if (test_bit(__E1000_DOWN, &adapter->state))
+               return;
+
+       e1000e_gig_downshift_workaround_ich8lan(&adapter->hw);
+}
+
+/**
+ * e1000_intr_msi - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+static irqreturn_t e1000_intr_msi(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 icr = er32(ICR);
+
+       /*
+        * read ICR disables interrupts using IAM
+        */
+
+       if (icr & E1000_ICR_LSC) {
+               hw->mac.get_link_status = 1;
+               /*
+                * ICH8 workaround-- Call gig speed drop workaround on cable
+                * disconnect (LSC) before accessing any PHY registers
+                */
+               if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
+                   (!(er32(STATUS) & E1000_STATUS_LU)))
+                       schedule_work(&adapter->downshift_task);
+
+               /*
+                * 80003ES2LAN workaround-- For packet buffer work-around on
+                * link down event; disable receives here in the ISR and reset
+                * adapter in watchdog
+                */
+               if (netif_carrier_ok(netdev) &&
+                   adapter->flags & FLAG_RX_NEEDS_RESTART) {
+                       /* disable receives */
+                       u32 rctl = er32(RCTL);
+                       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+                       adapter->flags |= FLAG_RX_RESTART_NOW;
+               }
+               /* guard against interrupt when we're going down */
+               if (!test_bit(__E1000_DOWN, &adapter->state))
+                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+       }
+
+       if (napi_schedule_prep(&adapter->napi)) {
+               adapter->total_tx_bytes = 0;
+               adapter->total_tx_packets = 0;
+               adapter->total_rx_bytes = 0;
+               adapter->total_rx_packets = 0;
+               __napi_schedule(&adapter->napi);
+       }
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * e1000_intr - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+static irqreturn_t e1000_intr(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl, icr = er32(ICR);
+
+       if (!icr || test_bit(__E1000_DOWN, &adapter->state))
+               return IRQ_NONE;  /* Not our interrupt */
+
+       /*
+        * IMS will not auto-mask if INT_ASSERTED is not set, and if it is
+        * not set, then the adapter didn't send an interrupt
+        */
+       if (!(icr & E1000_ICR_INT_ASSERTED))
+               return IRQ_NONE;
+
+       /*
+        * Interrupt Auto-Mask...upon reading ICR,
+        * interrupts are masked.  No need for the
+        * IMC write
+        */
+
+       if (icr & E1000_ICR_LSC) {
+               hw->mac.get_link_status = 1;
+               /*
+                * ICH8 workaround-- Call gig speed drop workaround on cable
+                * disconnect (LSC) before accessing any PHY registers
+                */
+               if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
+                   (!(er32(STATUS) & E1000_STATUS_LU)))
+                       schedule_work(&adapter->downshift_task);
+
+               /*
+                * 80003ES2LAN workaround--
+                * For packet buffer work-around on link down event;
+                * disable receives here in the ISR and
+                * reset adapter in watchdog
+                */
+               if (netif_carrier_ok(netdev) &&
+                   (adapter->flags & FLAG_RX_NEEDS_RESTART)) {
+                       /* disable receives */
+                       rctl = er32(RCTL);
+                       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+                       adapter->flags |= FLAG_RX_RESTART_NOW;
+               }
+               /* guard against interrupt when we're going down */
+               if (!test_bit(__E1000_DOWN, &adapter->state))
+                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+       }
+
+       if (napi_schedule_prep(&adapter->napi)) {
+               adapter->total_tx_bytes = 0;
+               adapter->total_tx_packets = 0;
+               adapter->total_rx_bytes = 0;
+               adapter->total_rx_packets = 0;
+               __napi_schedule(&adapter->napi);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t e1000_msix_other(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 icr = er32(ICR);
+
+       if (!(icr & E1000_ICR_INT_ASSERTED)) {
+               if (!test_bit(__E1000_DOWN, &adapter->state))
+                       ew32(IMS, E1000_IMS_OTHER);
+               return IRQ_NONE;
+       }
+
+       if (icr & adapter->eiac_mask)
+               ew32(ICS, (icr & adapter->eiac_mask));
+
+       if (icr & E1000_ICR_OTHER) {
+               if (!(icr & E1000_ICR_LSC))
+                       goto no_link_interrupt;
+               hw->mac.get_link_status = 1;
+               /* guard against interrupt when we're going down */
+               if (!test_bit(__E1000_DOWN, &adapter->state))
+                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+       }
+
+no_link_interrupt:
+       if (!test_bit(__E1000_DOWN, &adapter->state))
+               ew32(IMS, E1000_IMS_LSC | E1000_IMS_OTHER);
+
+       return IRQ_HANDLED;
+}
+
+
+static irqreturn_t e1000_intr_msix_tx(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+
+
+       adapter->total_tx_bytes = 0;
+       adapter->total_tx_packets = 0;
+
+       if (!e1000_clean_tx_irq(adapter))
+               /* Ring was not completely cleaned, so fire another interrupt */
+               ew32(ICS, tx_ring->ims_val);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t e1000_intr_msix_rx(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       /* Write the ITR value calculated at the end of the
+        * previous interrupt.
+        */
+       if (adapter->rx_ring->set_itr) {
+               writel(1000000000 / (adapter->rx_ring->itr_val * 256),
+                      adapter->hw.hw_addr + adapter->rx_ring->itr_register);
+               adapter->rx_ring->set_itr = 0;
+       }
+
+       if (napi_schedule_prep(&adapter->napi)) {
+               adapter->total_rx_bytes = 0;
+               adapter->total_rx_packets = 0;
+               __napi_schedule(&adapter->napi);
+       }
+       return IRQ_HANDLED;
+}
+
+/**
+ * e1000_configure_msix - Configure MSI-X hardware
+ *
+ * e1000_configure_msix sets up the hardware to properly
+ * generate MSI-X interrupts.
+ **/
+static void e1000_configure_msix(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       int vector = 0;
+       u32 ctrl_ext, ivar = 0;
+
+       adapter->eiac_mask = 0;
+
+       /* Workaround issue with spurious interrupts on 82574 in MSI-X mode */
+       if (hw->mac.type == e1000_82574) {
+               u32 rfctl = er32(RFCTL);
+               rfctl |= E1000_RFCTL_ACK_DIS;
+               ew32(RFCTL, rfctl);
+       }
+
+#define E1000_IVAR_INT_ALLOC_VALID     0x8
+       /* Configure Rx vector */
+       rx_ring->ims_val = E1000_IMS_RXQ0;
+       adapter->eiac_mask |= rx_ring->ims_val;
+       if (rx_ring->itr_val)
+               writel(1000000000 / (rx_ring->itr_val * 256),
+                      hw->hw_addr + rx_ring->itr_register);
+       else
+               writel(1, hw->hw_addr + rx_ring->itr_register);
+       ivar = E1000_IVAR_INT_ALLOC_VALID | vector;
+
+       /* Configure Tx vector */
+       tx_ring->ims_val = E1000_IMS_TXQ0;
+       vector++;
+       if (tx_ring->itr_val)
+               writel(1000000000 / (tx_ring->itr_val * 256),
+                      hw->hw_addr + tx_ring->itr_register);
+       else
+               writel(1, hw->hw_addr + tx_ring->itr_register);
+       adapter->eiac_mask |= tx_ring->ims_val;
+       ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) << 8);
+
+       /* set vector for Other Causes, e.g. link changes */
+       vector++;
+       ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) << 16);
+       if (rx_ring->itr_val)
+               writel(1000000000 / (rx_ring->itr_val * 256),
+                      hw->hw_addr + E1000_EITR_82574(vector));
+       else
+               writel(1, hw->hw_addr + E1000_EITR_82574(vector));
+
+       /* Cause Tx interrupts on every write back */
+       ivar |= (1 << 31);
+
+       ew32(IVAR, ivar);
+
+       /* enable MSI-X PBA support */
+       ctrl_ext = er32(CTRL_EXT);
+       ctrl_ext |= E1000_CTRL_EXT_PBA_CLR;
+
+       /* Auto-Mask Other interrupts upon ICR read */
+#define E1000_EIAC_MASK_82574   0x01F00000
+       ew32(IAM, ~E1000_EIAC_MASK_82574 | E1000_IMS_OTHER);
+       ctrl_ext |= E1000_CTRL_EXT_EIAME;
+       ew32(CTRL_EXT, ctrl_ext);
+       e1e_flush();
+}
+
+void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
+{
+       if (adapter->msix_entries) {
+               pci_disable_msix(adapter->pdev);
+               kfree(adapter->msix_entries);
+               adapter->msix_entries = NULL;
+       } else if (adapter->flags & FLAG_MSI_ENABLED) {
+               pci_disable_msi(adapter->pdev);
+               adapter->flags &= ~FLAG_MSI_ENABLED;
+       }
+}
+
+/**
+ * e1000e_set_interrupt_capability - set MSI or MSI-X if supported
+ *
+ * Attempt to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
+{
+       int err;
+       int i;
+
+       switch (adapter->int_mode) {
+       case E1000E_INT_MODE_MSIX:
+               if (adapter->flags & FLAG_HAS_MSIX) {
+                       adapter->num_vectors = 3; /* RxQ0, TxQ0 and other */
+                       adapter->msix_entries = kcalloc(adapter->num_vectors,
+                                                     sizeof(struct msix_entry),
+                                                     GFP_KERNEL);
+                       if (adapter->msix_entries) {
+                               for (i = 0; i < adapter->num_vectors; i++)
+                                       adapter->msix_entries[i].entry = i;
+
+                               err = pci_enable_msix(adapter->pdev,
+                                                     adapter->msix_entries,
+                                                     adapter->num_vectors);
+                               if (err == 0)
+                                       return;
+                       }
+                       /* MSI-X failed, so fall through and try MSI */
+                       e_err("Failed to initialize MSI-X interrupts.  "
+                             "Falling back to MSI interrupts.\n");
+                       e1000e_reset_interrupt_capability(adapter);
+               }
+               adapter->int_mode = E1000E_INT_MODE_MSI;
+               /* Fall through */
+       case E1000E_INT_MODE_MSI:
+               if (!pci_enable_msi(adapter->pdev)) {
+                       adapter->flags |= FLAG_MSI_ENABLED;
+               } else {
+                       adapter->int_mode = E1000E_INT_MODE_LEGACY;
+                       e_err("Failed to initialize MSI interrupts.  Falling "
+                             "back to legacy interrupts.\n");
+               }
+               /* Fall through */
+       case E1000E_INT_MODE_LEGACY:
+               /* Don't do anything; this is the system default */
+               break;
+       }
+
+       /* store the number of vectors being used */
+       adapter->num_vectors = 1;
+}
+
+/**
+ * e1000_request_msix - Initialize MSI-X interrupts
+ *
+ * e1000_request_msix allocates MSI-X vectors and requests interrupts from the
+ * kernel.
+ **/
+static int e1000_request_msix(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int err = 0, vector = 0;
+
+       if (strlen(netdev->name) < (IFNAMSIZ - 5))
+               snprintf(adapter->rx_ring->name,
+                        sizeof(adapter->rx_ring->name) - 1,
+                        "%s-rx-0", netdev->name);
+       else
+               memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         e1000_intr_msix_rx, 0, adapter->rx_ring->name,
+                         netdev);
+       if (err)
+               goto out;
+       adapter->rx_ring->itr_register = E1000_EITR_82574(vector);
+       adapter->rx_ring->itr_val = adapter->itr;
+       vector++;
+
+       if (strlen(netdev->name) < (IFNAMSIZ - 5))
+               snprintf(adapter->tx_ring->name,
+                        sizeof(adapter->tx_ring->name) - 1,
+                        "%s-tx-0", netdev->name);
+       else
+               memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         e1000_intr_msix_tx, 0, adapter->tx_ring->name,
+                         netdev);
+       if (err)
+               goto out;
+       adapter->tx_ring->itr_register = E1000_EITR_82574(vector);
+       adapter->tx_ring->itr_val = adapter->itr;
+       vector++;
+
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         e1000_msix_other, 0, netdev->name, netdev);
+       if (err)
+               goto out;
+
+       e1000_configure_msix(adapter);
+       return 0;
+out:
+       return err;
+}
+
+/**
+ * e1000_request_irq - initialize interrupts
+ *
+ * Attempts to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+static int e1000_request_irq(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int err;
+
+       if (adapter->msix_entries) {
+               err = e1000_request_msix(adapter);
+               if (!err)
+                       return err;
+               /* fall back to MSI */
+               e1000e_reset_interrupt_capability(adapter);
+               adapter->int_mode = E1000E_INT_MODE_MSI;
+               e1000e_set_interrupt_capability(adapter);
+       }
+       if (adapter->flags & FLAG_MSI_ENABLED) {
+               err = request_irq(adapter->pdev->irq, e1000_intr_msi, 0,
+                                 netdev->name, netdev);
+               if (!err)
+                       return err;
+
+               /* fall back to legacy interrupt */
+               e1000e_reset_interrupt_capability(adapter);
+               adapter->int_mode = E1000E_INT_MODE_LEGACY;
+       }
+
+       err = request_irq(adapter->pdev->irq, e1000_intr, IRQF_SHARED,
+                         netdev->name, netdev);
+       if (err)
+               e_err("Unable to allocate interrupt, Error: %d\n", err);
+
+       return err;
+}
+
+static void e1000_free_irq(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+
+       if (adapter->msix_entries) {
+               int vector = 0;
+
+               free_irq(adapter->msix_entries[vector].vector, netdev);
+               vector++;
+
+               free_irq(adapter->msix_entries[vector].vector, netdev);
+               vector++;
+
+               /* Other Causes interrupt vector */
+               free_irq(adapter->msix_entries[vector].vector, netdev);
+               return;
+       }
+
+       free_irq(adapter->pdev->irq, netdev);
+}
+
+/**
+ * e1000_irq_disable - Mask off interrupt generation on the NIC
+ **/
+static void e1000_irq_disable(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       ew32(IMC, ~0);
+       if (adapter->msix_entries)
+               ew32(EIAC_82574, 0);
+       e1e_flush();
+
+       if (adapter->msix_entries) {
+               int i;
+               for (i = 0; i < adapter->num_vectors; i++)
+                       synchronize_irq(adapter->msix_entries[i].vector);
+       } else {
+               synchronize_irq(adapter->pdev->irq);
+       }
+}
+
+/**
+ * e1000_irq_enable - Enable default interrupt generation settings
+ **/
+static void e1000_irq_enable(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (adapter->msix_entries) {
+               ew32(EIAC_82574, adapter->eiac_mask & E1000_EIAC_MASK_82574);
+               ew32(IMS, adapter->eiac_mask | E1000_IMS_OTHER | E1000_IMS_LSC);
+       } else {
+               ew32(IMS, IMS_ENABLE_MASK);
+       }
+       e1e_flush();
+}
+
+/**
+ * e1000e_get_hw_control - get control of the h/w from f/w
+ * @adapter: address of board private structure
+ *
+ * e1000e_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.
+ **/
+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_release_hw_control - release control of the h/w to f/w
+ * @adapter: address of board private structure
+ *
+ * e1000e_release_hw_control resets {CTRL_EXT|SWSM}:DRV_LOAD bit.
+ * For ASF and Pass Through versions of f/w this means that the
+ * driver is no longer loaded. For AMT version (only with 82573) i
+ * of the f/w this means that the network i/f is closed.
+ *
+ **/
+void e1000e_release_hw_control(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl_ext;
+       u32 swsm;
+
+       /* Let firmware taken over control of h/w */
+       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);
+       }
+}
+
+/**
+ * @e1000_alloc_ring - allocate memory for a ring structure
+ **/
+static int e1000_alloc_ring_dma(struct e1000_adapter *adapter,
+                               struct e1000_ring *ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+
+       ring->desc = dma_alloc_coherent(&pdev->dev, ring->size, &ring->dma,
+                                       GFP_KERNEL);
+       if (!ring->desc)
+               return -ENOMEM;
+
+       return 0;
+}
+
+/**
+ * e1000e_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+int e1000e_setup_tx_resources(struct e1000_adapter *adapter)
+{
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       int err = -ENOMEM, size;
+
+       size = sizeof(struct e1000_buffer) * tx_ring->count;
+       tx_ring->buffer_info = vzalloc(size);
+       if (!tx_ring->buffer_info)
+               goto err;
+
+       /* round up to nearest 4K */
+       tx_ring->size = tx_ring->count * sizeof(struct e1000_tx_desc);
+       tx_ring->size = ALIGN(tx_ring->size, 4096);
+
+       err = e1000_alloc_ring_dma(adapter, tx_ring);
+       if (err)
+               goto err;
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+
+       return 0;
+err:
+       vfree(tx_ring->buffer_info);
+       e_err("Unable to allocate memory for the transmit descriptor ring\n");
+       return err;
+}
+
+/**
+ * e1000e_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+int e1000e_setup_rx_resources(struct e1000_adapter *adapter)
+{
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       struct e1000_buffer *buffer_info;
+       int i, size, desc_len, err = -ENOMEM;
+
+       size = sizeof(struct e1000_buffer) * rx_ring->count;
+       rx_ring->buffer_info = vzalloc(size);
+       if (!rx_ring->buffer_info)
+               goto err;
+
+       for (i = 0; i < rx_ring->count; i++) {
+               buffer_info = &rx_ring->buffer_info[i];
+               buffer_info->ps_pages = kcalloc(PS_PAGE_BUFFERS,
+                                               sizeof(struct e1000_ps_page),
+                                               GFP_KERNEL);
+               if (!buffer_info->ps_pages)
+                       goto err_pages;
+       }
+
+       desc_len = sizeof(union e1000_rx_desc_packet_split);
+
+       /* Round up to nearest 4K */
+       rx_ring->size = rx_ring->count * desc_len;
+       rx_ring->size = ALIGN(rx_ring->size, 4096);
+
+       err = e1000_alloc_ring_dma(adapter, rx_ring);
+       if (err)
+               goto err_pages;
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+       rx_ring->rx_skb_top = NULL;
+
+       return 0;
+
+err_pages:
+       for (i = 0; i < rx_ring->count; i++) {
+               buffer_info = &rx_ring->buffer_info[i];
+               kfree(buffer_info->ps_pages);
+       }
+err:
+       vfree(rx_ring->buffer_info);
+       e_err("Unable to allocate memory for the receive descriptor ring\n");
+       return err;
+}
+
+/**
+ * e1000_clean_tx_ring - Free Tx Buffers
+ * @adapter: board private structure
+ **/
+static void e1000_clean_tx_ring(struct e1000_adapter *adapter)
+{
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_buffer *buffer_info;
+       unsigned long size;
+       unsigned int i;
+
+       for (i = 0; i < tx_ring->count; i++) {
+               buffer_info = &tx_ring->buffer_info[i];
+               e1000_put_txbuf(adapter, buffer_info);
+       }
+
+       size = sizeof(struct e1000_buffer) * tx_ring->count;
+       memset(tx_ring->buffer_info, 0, size);
+
+       memset(tx_ring->desc, 0, tx_ring->size);
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+
+       writel(0, adapter->hw.hw_addr + tx_ring->head);
+       writel(0, adapter->hw.hw_addr + tx_ring->tail);
+}
+
+/**
+ * e1000e_free_tx_resources - Free Tx Resources per Queue
+ * @adapter: board private structure
+ *
+ * Free all transmit software resources
+ **/
+void e1000e_free_tx_resources(struct e1000_adapter *adapter)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+
+       e1000_clean_tx_ring(adapter);
+
+       vfree(tx_ring->buffer_info);
+       tx_ring->buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
+                         tx_ring->dma);
+       tx_ring->desc = NULL;
+}
+
+/**
+ * e1000e_free_rx_resources - Free Rx Resources
+ * @adapter: board private structure
+ *
+ * Free all receive software resources
+ **/
+
+void e1000e_free_rx_resources(struct e1000_adapter *adapter)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       int i;
+
+       e1000_clean_rx_ring(adapter);
+
+       for (i = 0; i < rx_ring->count; i++)
+               kfree(rx_ring->buffer_info[i].ps_pages);
+
+       vfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
+                         rx_ring->dma);
+       rx_ring->desc = NULL;
+}
+
+/**
+ * e1000_update_itr - update the dynamic ITR value based on statistics
+ * @adapter: pointer to adapter
+ * @itr_setting: current adapter->itr
+ * @packets: the number of packets during this measurement interval
+ * @bytes: the number of bytes during this measurement interval
+ *
+ *      Stores a new ITR value based on packets and byte
+ *      counts during the last interrupt.  The advantage of per interrupt
+ *      computation is faster updates and more accurate ITR for the current
+ *      traffic pattern.  Constants in this function were computed
+ *      based on theoretical maximum wire speed and thresholds were set based
+ *      on testing data as well as attempting to minimize response time
+ *      while increasing bulk throughput.  This functionality is controlled
+ *      by the InterruptThrottleRate module parameter.
+ **/
+static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
+                                    u16 itr_setting, int packets,
+                                    int bytes)
+{
+       unsigned int retval = itr_setting;
+
+       if (packets == 0)
+               goto update_itr_done;
+
+       switch (itr_setting) {
+       case lowest_latency:
+               /* handle TSO and jumbo frames */
+               if (bytes/packets > 8000)
+                       retval = bulk_latency;
+               else if ((packets < 5) && (bytes > 512))
+                       retval = low_latency;
+               break;
+       case low_latency:  /* 50 usec aka 20000 ints/s */
+               if (bytes > 10000) {
+                       /* this if handles the TSO accounting */
+                       if (bytes/packets > 8000)
+                               retval = bulk_latency;
+                       else if ((packets < 10) || ((bytes/packets) > 1200))
+                               retval = bulk_latency;
+                       else if ((packets > 35))
+                               retval = lowest_latency;
+               } else if (bytes/packets > 2000) {
+                       retval = bulk_latency;
+               } else if (packets <= 2 && bytes < 512) {
+                       retval = lowest_latency;
+               }
+               break;
+       case bulk_latency: /* 250 usec aka 4000 ints/s */
+               if (bytes > 25000) {
+                       if (packets > 35)
+                               retval = low_latency;
+               } else if (bytes < 6000) {
+                       retval = low_latency;
+               }
+               break;
+       }
+
+update_itr_done:
+       return retval;
+}
+
+static void e1000_set_itr(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 current_itr;
+       u32 new_itr = adapter->itr;
+
+       /* for non-gigabit speeds, just fix the interrupt rate at 4000 */
+       if (adapter->link_speed != SPEED_1000) {
+               current_itr = 0;
+               new_itr = 4000;
+               goto set_itr_now;
+       }
+
+       if (adapter->flags2 & FLAG2_DISABLE_AIM) {
+               new_itr = 0;
+               goto set_itr_now;
+       }
+
+       adapter->tx_itr = e1000_update_itr(adapter,
+                                   adapter->tx_itr,
+                                   adapter->total_tx_packets,
+                                   adapter->total_tx_bytes);
+       /* conservative mode (itr 3) eliminates the lowest_latency setting */
+       if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
+               adapter->tx_itr = low_latency;
+
+       adapter->rx_itr = e1000_update_itr(adapter,
+                                   adapter->rx_itr,
+                                   adapter->total_rx_packets,
+                                   adapter->total_rx_bytes);
+       /* conservative mode (itr 3) eliminates the lowest_latency setting */
+       if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
+               adapter->rx_itr = low_latency;
+
+       current_itr = max(adapter->rx_itr, adapter->tx_itr);
+
+       switch (current_itr) {
+       /* counts and packets in update_itr are dependent on these numbers */
+       case lowest_latency:
+               new_itr = 70000;
+               break;
+       case low_latency:
+               new_itr = 20000; /* aka hwitr = ~200 */
+               break;
+       case bulk_latency:
+               new_itr = 4000;
+               break;
+       default:
+               break;
+       }
+
+set_itr_now:
+       if (new_itr != adapter->itr) {
+               /*
+                * this attempts to bias the interrupt rate towards Bulk
+                * by adding intermediate steps when interrupt rate is
+                * increasing
+                */
+               new_itr = new_itr > adapter->itr ?
+                            min(adapter->itr + (new_itr >> 2), new_itr) :
+                            new_itr;
+               adapter->itr = new_itr;
+               adapter->rx_ring->itr_val = new_itr;
+               if (adapter->msix_entries)
+                       adapter->rx_ring->set_itr = 1;
+               else
+                       if (new_itr)
+                               ew32(ITR, 1000000000 / (new_itr * 256));
+                       else
+                               ew32(ITR, 0);
+       }
+}
+
+/**
+ * e1000_alloc_queues - Allocate memory for all rings
+ * @adapter: board private structure to initialize
+ **/
+static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
+{
+       adapter->tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+       if (!adapter->tx_ring)
+               goto err;
+
+       adapter->rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+       if (!adapter->rx_ring)
+               goto err;
+
+       return 0;
+err:
+       e_err("Unable to allocate memory for queues\n");
+       kfree(adapter->rx_ring);
+       kfree(adapter->tx_ring);
+       return -ENOMEM;
+}
+
+/**
+ * e1000_clean - NAPI Rx polling callback
+ * @napi: struct associated with this polling callback
+ * @budget: amount of packets driver is allowed to process this poll
+ **/
+static int e1000_clean(struct napi_struct *napi, int budget)
+{
+       struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *poll_dev = adapter->netdev;
+       int tx_cleaned = 1, work_done = 0;
+
+       adapter = netdev_priv(poll_dev);
+
+       if (adapter->msix_entries &&
+           !(adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
+               goto clean_rx;
+
+       tx_cleaned = e1000_clean_tx_irq(adapter);
+
+clean_rx:
+       adapter->clean_rx(adapter, &work_done, budget);
+
+       if (!tx_cleaned)
+               work_done = budget;
+
+       /* If budget not fully consumed, exit the polling mode */
+       if (work_done < budget) {
+               if (adapter->itr_setting & 3)
+                       e1000_set_itr(adapter);
+               napi_complete(napi);
+               if (!test_bit(__E1000_DOWN, &adapter->state)) {
+                       if (adapter->msix_entries)
+                               ew32(IMS, adapter->rx_ring->ims_val);
+                       else
+                               e1000_irq_enable(adapter);
+               }
+       }
+
+       return work_done;
+}
+
+static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vfta, index;
+
+       /* don't update vlan cookie if already programmed */
+       if ((adapter->hw.mng_cookie.status &
+            E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
+           (vid == adapter->mng_vlan_id))
+               return;
+
+       /* add VID to filter table */
+       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
+               index = (vid >> 5) & 0x7F;
+               vfta = E1000_READ_REG_ARRAY(hw, E1000_VFTA, index);
+               vfta |= (1 << (vid & 0x1F));
+               hw->mac.ops.write_vfta(hw, index, vfta);
+       }
+
+       set_bit(vid, adapter->active_vlans);
+}
+
+static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vfta, index;
+
+       if ((adapter->hw.mng_cookie.status &
+            E1000_MNG_DHCP_COOKIE_STATUS_VLAN) &&
+           (vid == adapter->mng_vlan_id)) {
+               /* release control to f/w */
+               e1000e_release_hw_control(adapter);
+               return;
+       }
+
+       /* remove VID from filter table */
+       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
+               index = (vid >> 5) & 0x7F;
+               vfta = E1000_READ_REG_ARRAY(hw, E1000_VFTA, index);
+               vfta &= ~(1 << (vid & 0x1F));
+               hw->mac.ops.write_vfta(hw, index, vfta);
+       }
+
+       clear_bit(vid, adapter->active_vlans);
+}
+
+/**
+ * e1000e_vlan_filter_disable - helper to disable hw VLAN filtering
+ * @adapter: board private structure to initialize
+ **/
+static void e1000e_vlan_filter_disable(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+
+       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
+               /* disable VLAN receive filtering */
+               rctl = er32(RCTL);
+               rctl &= ~(E1000_RCTL_VFE | E1000_RCTL_CFIEN);
+               ew32(RCTL, rctl);
+
+               if (adapter->mng_vlan_id != (u16)E1000_MNG_VLAN_NONE) {
+                       e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
+                       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
+               }
+       }
+}
+
+/**
+ * e1000e_vlan_filter_enable - helper to enable HW VLAN filtering
+ * @adapter: board private structure to initialize
+ **/
+static void e1000e_vlan_filter_enable(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+
+       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER) {
+               /* enable VLAN receive filtering */
+               rctl = er32(RCTL);
+               rctl |= E1000_RCTL_VFE;
+               rctl &= ~E1000_RCTL_CFIEN;
+               ew32(RCTL, rctl);
+       }
+}
+
+/**
+ * e1000e_vlan_strip_enable - helper to disable HW VLAN stripping
+ * @adapter: board private structure to initialize
+ **/
+static void e1000e_vlan_strip_disable(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl;
+
+       /* disable VLAN tag insert/strip */
+       ctrl = er32(CTRL);
+       ctrl &= ~E1000_CTRL_VME;
+       ew32(CTRL, ctrl);
+}
+
+/**
+ * e1000e_vlan_strip_enable - helper to enable HW VLAN stripping
+ * @adapter: board private structure to initialize
+ **/
+static void e1000e_vlan_strip_enable(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl;
+
+       /* enable VLAN tag insert/strip */
+       ctrl = er32(CTRL);
+       ctrl |= E1000_CTRL_VME;
+       ew32(CTRL, ctrl);
+}
+
+static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       u16 vid = adapter->hw.mng_cookie.vlan_id;
+       u16 old_vid = adapter->mng_vlan_id;
+
+       if (adapter->hw.mng_cookie.status &
+           E1000_MNG_DHCP_COOKIE_STATUS_VLAN) {
+               e1000_vlan_rx_add_vid(netdev, vid);
+               adapter->mng_vlan_id = vid;
+       }
+
+       if ((old_vid != (u16)E1000_MNG_VLAN_NONE) && (vid != old_vid))
+               e1000_vlan_rx_kill_vid(netdev, old_vid);
+}
+
+static void e1000_restore_vlan(struct e1000_adapter *adapter)
+{
+       u16 vid;
+
+       e1000_vlan_rx_add_vid(adapter->netdev, 0);
+
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               e1000_vlan_rx_add_vid(adapter->netdev, vid);
+}
+
+static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 manc, manc2h, mdef, i, j;
+
+       if (!(adapter->flags & FLAG_MNG_PT_ENABLED))
+               return;
+
+       manc = er32(MANC);
+
+       /*
+        * enable receiving management packets to the host. this will probably
+        * generate destination unreachable messages from the host OS, but
+        * the packets will be handled on SMBUS
+        */
+       manc |= E1000_MANC_EN_MNG2HOST;
+       manc2h = er32(MANC2H);
+
+       switch (hw->mac.type) {
+       default:
+               manc2h |= (E1000_MANC2H_PORT_623 | E1000_MANC2H_PORT_664);
+               break;
+       case e1000_82574:
+       case e1000_82583:
+               /*
+                * Check if IPMI pass-through decision filter already exists;
+                * if so, enable it.
+                */
+               for (i = 0, j = 0; i < 8; i++) {
+                       mdef = er32(MDEF(i));
+
+                       /* Ignore filters with anything other than IPMI ports */
+                       if (mdef & ~(E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
+                               continue;
+
+                       /* Enable this decision filter in MANC2H */
+                       if (mdef)
+                               manc2h |= (1 << i);
+
+                       j |= mdef;
+               }
+
+               if (j == (E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
+                       break;
+
+               /* Create new decision filter in an empty filter */
+               for (i = 0, j = 0; i < 8; i++)
+                       if (er32(MDEF(i)) == 0) {
+                               ew32(MDEF(i), (E1000_MDEF_PORT_623 |
+                                              E1000_MDEF_PORT_664));
+                               manc2h |= (1 << 1);
+                               j++;
+                               break;
+                       }
+
+               if (!j)
+                       e_warn("Unable to create IPMI pass-through filter\n");
+               break;
+       }
+
+       ew32(MANC2H, manc2h);
+       ew32(MANC, manc);
+}
+
+/**
+ * e1000_configure_tx - Configure 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;
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       u64 tdba;
+       u32 tdlen, tctl, tipg, tarc;
+       u32 ipgr1, ipgr2;
+
+       /* Setup the HW Tx Head and Tail descriptor pointers */
+       tdba = tx_ring->dma;
+       tdlen = tx_ring->count * sizeof(struct e1000_tx_desc);
+       ew32(TDBAL, (tdba & DMA_BIT_MASK(32)));
+       ew32(TDBAH, (tdba >> 32));
+       ew32(TDLEN, tdlen);
+       ew32(TDH, 0);
+       ew32(TDT, 0);
+       tx_ring->head = E1000_TDH;
+       tx_ring->tail = E1000_TDT;
+
+       /* 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);
+
+       /* Set the Tx Interrupt Delay register */
+       ew32(TIDV, adapter->tx_int_delay);
+       /* Tx irq moderation */
+       ew32(TADV, adapter->tx_abs_int_delay);
+
+       if (adapter->flags2 & FLAG2_DMA_BURST) {
+               u32 txdctl = er32(TXDCTL(0));
+               txdctl &= ~(E1000_TXDCTL_PTHRESH | E1000_TXDCTL_HTHRESH |
+                           E1000_TXDCTL_WTHRESH);
+               /*
+                * set up some performance related parameters to encourage the
+                * hardware to use the bus more efficiently in bursts, depends
+                * on the tx_int_delay to be enabled,
+                * wthresh = 5 ==> burst write a cacheline (64 bytes) at a time
+                * hthresh = 1 ==> prefetch when one or more available
+                * pthresh = 0x1f ==> prefetch if internal cache 31 or less
+                * BEWARE: this seems to work but should be considered first if
+                * there are Tx hangs or other Tx related bugs
+                */
+               txdctl |= E1000_TXDCTL_DMA_BURST_ENABLE;
+               ew32(TXDCTL(0), txdctl);
+               /* erratum work around: set txdctl the same for both queues */
+               ew32(TXDCTL(1), txdctl);
+       }
+
+       /* 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;
+
+       /* only set IDE if we are delaying interrupts using the timers */
+       if (adapter->tx_int_delay)
+               adapter->txd_cmd |= E1000_TXD_CMD_IDE;
+
+       /* enable Report Status bit */
+       adapter->txd_cmd |= E1000_TXD_CMD_RS;
+
+       ew32(TCTL, tctl);
+
+       e1000e_config_collision_dist(hw);
+}
+
+/**
+ * e1000_setup_rctl - configure the receive control registers
+ * @adapter: Board private structure
+ **/
+#define PAGE_USE_COUNT(S) (((S) >> PAGE_SHIFT) + \
+                          (((S) & (PAGE_SIZE - 1)) ? 1 : 0))
+static void e1000_setup_rctl(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl, rfctl;
+       u32 pages = 0;
+
+       /* Workaround Si errata on 82579 - configure jumbo frame flow */
+       if (hw->mac.type == e1000_pch2lan) {
+               s32 ret_val;
+
+               if (adapter->netdev->mtu > ETH_DATA_LEN)
+                       ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);
+               else
+                       ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, false);
+
+               if (ret_val)
+                       e_dbg("failed to enable jumbo frame workaround mode\n");
+       }
+
+       /* Program MC offset vector base */
+       rctl = er32(RCTL);
+       rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
+       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
+               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+               (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
+
+       /* Do not Store bad packets */
+       rctl &= ~E1000_RCTL_SBP;
+
+       /* Enable Long Packet receive */
+       if (adapter->netdev->mtu <= ETH_DATA_LEN)
+               rctl &= ~E1000_RCTL_LPE;
+       else
+               rctl |= E1000_RCTL_LPE;
+
+       /* Some systems expect that the CRC is included in SMBUS traffic. The
+        * hardware strips the CRC before sending to both SMBUS (BMC) and to
+        * host memory when this is enabled
+        */
+       if (adapter->flags2 & FLAG2_CRC_STRIPPING)
+               rctl |= E1000_RCTL_SECRC;
+
+       /* Workaround Si errata on 82577 PHY - configure IPG for jumbos */
+       if ((hw->phy.type == e1000_phy_82577) && (rctl & E1000_RCTL_LPE)) {
+               u16 phy_data;
+
+               e1e_rphy(hw, PHY_REG(770, 26), &phy_data);
+               phy_data &= 0xfff8;
+               phy_data |= (1 << 2);
+               e1e_wphy(hw, PHY_REG(770, 26), phy_data);
+
+               e1e_rphy(hw, 22, &phy_data);
+               phy_data &= 0x0fff;
+               phy_data |= (1 << 14);
+               e1e_wphy(hw, 0x10, 0x2823);
+               e1e_wphy(hw, 0x11, 0x0003);
+               e1e_wphy(hw, 22, phy_data);
+       }
+
+       /* Setup buffer sizes */
+       rctl &= ~E1000_RCTL_SZ_4096;
+       rctl |= E1000_RCTL_BSEX;
+       switch (adapter->rx_buffer_len) {
+       case 2048:
+       default:
+               rctl |= E1000_RCTL_SZ_2048;
+               rctl &= ~E1000_RCTL_BSEX;
+               break;
+       case 4096:
+               rctl |= E1000_RCTL_SZ_4096;
+               break;
+       case 8192:
+               rctl |= E1000_RCTL_SZ_8192;
+               break;
+       case 16384:
+               rctl |= E1000_RCTL_SZ_16384;
+               break;
+       }
+
+       /*
+        * 82571 and greater support packet-split where the protocol
+        * header is placed in skb->data and the packet data is
+        * placed in pages hanging off of skb_shinfo(skb)->nr_frags.
+        * In the case of a non-split, skb->data is linearly filled,
+        * followed by the page buffers.  Therefore, skb->data is
+        * sized to hold the largest protocol header.
+        *
+        * allocations using alloc_page take too long for regular MTU
+        * so only enable packet split for jumbo frames
+        *
+        * Using pages when the page size is greater than 16k wastes
+        * a lot of memory, since we allocate 3 pages at all times
+        * per packet.
+        */
+       pages = PAGE_USE_COUNT(adapter->netdev->mtu);
+       if (!(adapter->flags & FLAG_HAS_ERT) && (pages <= 3) &&
+           (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE))
+               adapter->rx_ps_pages = pages;
+       else
+               adapter->rx_ps_pages = 0;
+
+       if (adapter->rx_ps_pages) {
+               u32 psrctl = 0;
+
+               /* Configure extra packet-split registers */
+               rfctl = er32(RFCTL);
+               rfctl |= E1000_RFCTL_EXTEN;
+               /*
+                * disable packet split support for IPv6 extension headers,
+                * because some malformed IPv6 headers can hang the Rx
+                */
+               rfctl |= (E1000_RFCTL_IPV6_EX_DIS |
+                         E1000_RFCTL_NEW_IPV6_EXT_DIS);
+
+               ew32(RFCTL, rfctl);
+
+               /* Enable Packet split descriptors */
+               rctl |= E1000_RCTL_DTYP_PS;
+
+               psrctl |= adapter->rx_ps_bsize0 >>
+                       E1000_PSRCTL_BSIZE0_SHIFT;
+
+               switch (adapter->rx_ps_pages) {
+               case 3:
+                       psrctl |= PAGE_SIZE <<
+                               E1000_PSRCTL_BSIZE3_SHIFT;
+               case 2:
+                       psrctl |= PAGE_SIZE <<
+                               E1000_PSRCTL_BSIZE2_SHIFT;
+               case 1:
+                       psrctl |= PAGE_SIZE >>
+                               E1000_PSRCTL_BSIZE1_SHIFT;
+                       break;
+               }
+
+               ew32(PSRCTL, psrctl);
+       }
+
+       ew32(RCTL, rctl);
+       /* just started the receive unit, no need to restart */
+       adapter->flags &= ~FLAG_RX_RESTART_NOW;
+}
+
+/**
+ * e1000_configure_rx - Configure 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;
+       struct e1000_ring *rx_ring = adapter->rx_ring;
+       u64 rdba;
+       u32 rdlen, rctl, rxcsum, ctrl_ext;
+
+       if (adapter->rx_ps_pages) {
+               /* this is a 32 byte descriptor */
+               rdlen = rx_ring->count *
+                   sizeof(union e1000_rx_desc_packet_split);
+               adapter->clean_rx = e1000_clean_rx_irq_ps;
+               adapter->alloc_rx_buf = e1000_alloc_rx_buffers_ps;
+       } else if (adapter->netdev->mtu > ETH_FRAME_LEN + ETH_FCS_LEN) {
+               rdlen = rx_ring->count * sizeof(struct e1000_rx_desc);
+               adapter->clean_rx = e1000_clean_jumbo_rx_irq;
+               adapter->alloc_rx_buf = e1000_alloc_jumbo_rx_buffers;
+       } else {
+               rdlen = rx_ring->count * sizeof(struct e1000_rx_desc);
+               adapter->clean_rx = e1000_clean_rx_irq;
+               adapter->alloc_rx_buf = e1000_alloc_rx_buffers;
+       }
+
+       /* disable receives while setting up the descriptors */
+       rctl = er32(RCTL);
+       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+       e1e_flush();
+       usleep_range(10000, 20000);
+
+       if (adapter->flags2 & FLAG2_DMA_BURST) {
+               /*
+                * set the writeback threshold (only takes effect if the RDTR
+                * is set). set GRAN=1 and write back up to 0x4 worth, and
+                * enable prefetching of 0x20 Rx descriptors
+                * granularity = 01
+                * wthresh = 04,
+                * hthresh = 04,
+                * pthresh = 0x20
+                */
+               ew32(RXDCTL(0), E1000_RXDCTL_DMA_BURST_ENABLE);
+               ew32(RXDCTL(1), E1000_RXDCTL_DMA_BURST_ENABLE);
+
+               /*
+                * override the delay timers for enabling bursting, only if
+                * the value was not set by the user via module options
+                */
+               if (adapter->rx_int_delay == DEFAULT_RDTR)
+                       adapter->rx_int_delay = BURST_RDTR;
+               if (adapter->rx_abs_int_delay == DEFAULT_RADV)
+                       adapter->rx_abs_int_delay = BURST_RADV;
+       }
+
+       /* set the Receive Delay Timer Register */
+       ew32(RDTR, adapter->rx_int_delay);
+
+       /* irq moderation */
+       ew32(RADV, adapter->rx_abs_int_delay);
+       if ((adapter->itr_setting != 0) && (adapter->itr != 0))
+               ew32(ITR, 1000000000 / (adapter->itr * 256));
+
+       ctrl_ext = er32(CTRL_EXT);
+       /* Auto-Mask interrupts upon ICR access */
+       ctrl_ext |= E1000_CTRL_EXT_IAME;
+       ew32(IAM, 0xffffffff);
+       ew32(CTRL_EXT, ctrl_ext);
+       e1e_flush();
+
+       /*
+        * Setup the HW Rx Head and Tail Descriptor Pointers and
+        * the Base and Length of the Rx Descriptor Ring
+        */
+       rdba = rx_ring->dma;
+       ew32(RDBAL, (rdba & DMA_BIT_MASK(32)));
+       ew32(RDBAH, (rdba >> 32));
+       ew32(RDLEN, rdlen);
+       ew32(RDH, 0);
+       ew32(RDT, 0);
+       rx_ring->head = E1000_RDH;
+       rx_ring->tail = E1000_RDT;
+
+       /* Enable Receive Checksum Offload for TCP and UDP */
+       rxcsum = er32(RXCSUM);
+       if (adapter->flags & FLAG_RX_CSUM_ENABLED) {
+               rxcsum |= E1000_RXCSUM_TUOFL;
+
+               /*
+                * IPv4 payload checksum for UDP fragments must be
+                * used in conjunction with packet-split.
+                */
+               if (adapter->rx_ps_pages)
+                       rxcsum |= E1000_RXCSUM_IPPCSE;
+       } else {
+               rxcsum &= ~E1000_RXCSUM_TUOFL;
+               /* no need to clear IPPCSE as it defaults to 0 */
+       }
+       ew32(RXCSUM, rxcsum);
+
+       /*
+        * Enable early receives on supported devices, only takes effect when
+        * packet size is equal or larger than the specified value (in 8 byte
+        * units), e.g. using jumbo frames when setting to E1000_ERT_2048
+        */
+       if ((adapter->flags & FLAG_HAS_ERT) ||
+           (adapter->hw.mac.type == e1000_pch2lan)) {
+               if (adapter->netdev->mtu > ETH_DATA_LEN) {
+                       u32 rxdctl = er32(RXDCTL(0));
+                       ew32(RXDCTL(0), rxdctl | 0x3);
+                       if (adapter->flags & FLAG_HAS_ERT)
+                               ew32(ERT, E1000_ERT_2048 | (1 << 13));
+                       /*
+                        * With jumbo frames and early-receive enabled,
+                        * excessive C-state transition latencies result in
+                        * dropped transactions.
+                        */
+                       pm_qos_update_request(&adapter->netdev->pm_qos_req, 55);
+               } else {
+                       pm_qos_update_request(&adapter->netdev->pm_qos_req,
+                                             PM_QOS_DEFAULT_VALUE);
+               }
+       }
+
+       /* Enable Receives */
+       ew32(RCTL, rctl);
+}
+
+/**
+ *  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.
+ **/
+static void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
+                                     u32 mc_addr_count)
+{
+       hw->mac.ops.update_mc_addr_list(hw, mc_addr_list, mc_addr_count);
+}
+
+/**
+ * e1000_set_multi - Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_multi entry point is called whenever the multicast address
+ * list or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper multicast,
+ * promiscuous mode, and all-multi behavior.
+ **/
+static void e1000_set_multi(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct netdev_hw_addr *ha;
+       u8  *mta_list;
+       u32 rctl;
+
+       /* Check for Promiscuous and All Multicast modes */
+
+       rctl = er32(RCTL);
+
+       if (netdev->flags & IFF_PROMISC) {
+               rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
+               rctl &= ~E1000_RCTL_VFE;
+               /* Do not hardware filter VLANs in promisc mode */
+               e1000e_vlan_filter_disable(adapter);
+       } else {
+               if (netdev->flags & IFF_ALLMULTI) {
+                       rctl |= E1000_RCTL_MPE;
+                       rctl &= ~E1000_RCTL_UPE;
+               } else {
+                       rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE);
+               }
+               e1000e_vlan_filter_enable(adapter);
+       }
+
+       ew32(RCTL, rctl);
+
+       if (!netdev_mc_empty(netdev)) {
+               int i = 0;
+
+               mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
+               if (!mta_list)
+                       return;
+
+               /* prepare a packed array of only addresses. */
+               netdev_for_each_mc_addr(ha, netdev)
+                       memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
+
+               e1000_update_mc_addr_list(hw, mta_list, i);
+               kfree(mta_list);
+       } else {
+               /*
+                * if we're called from probe, we might not have
+                * anything to do here, so clear out the list
+                */
+               e1000_update_mc_addr_list(hw, NULL, 0);
+       }
+
+       if (netdev->features & NETIF_F_HW_VLAN_RX)
+               e1000e_vlan_strip_enable(adapter);
+       else
+               e1000e_vlan_strip_disable(adapter);
+}
+
+/**
+ * e1000_configure - configure the hardware for Rx and Tx
+ * @adapter: private board structure
+ **/
+static void e1000_configure(struct e1000_adapter *adapter)
+{
+       e1000_set_multi(adapter->netdev);
+
+       e1000_restore_vlan(adapter);
+       e1000_init_manageability_pt(adapter);
+
+       e1000_configure_tx(adapter);
+       e1000_setup_rctl(adapter);
+       e1000_configure_rx(adapter);
+       adapter->alloc_rx_buf(adapter, e1000_desc_unused(adapter->rx_ring),
+                             GFP_KERNEL);
+}
+
+/**
+ * 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.
+ */
+static void e1000_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;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 tx_space, min_tx_space, min_rx_space;
+       u32 pba = adapter->pba;
+       u16 hwm;
+
+       /* reset Packet Buffer Allocation to default */
+       ew32(PBA, pba);
+
+       if (adapter->max_frame_size > ETH_FRAME_LEN + ETH_FCS_LEN) {
+               /*
+                * To maintain wire speed transmits, the Tx FIFO should be
+                * large enough to accommodate two full transmit packets,
+                * rounded up to the next 1KB and expressed in KB.  Likewise,
+                * the Rx FIFO should be large enough to accommodate at least
+                * one full receive packet and is similarly rounded up and
+                * expressed in KB.
+                */
+               pba = er32(PBA);
+               /* upper 16 bits has Tx packet buffer allocation size in KB */
+               tx_space = pba >> 16;
+               /* lower 16 bits has Rx packet buffer allocation size in KB */
+               pba &= 0xffff;
+               /*
+                * the Tx fifo also stores 16 bytes of information about the Tx
+                * but don't include ethernet FCS because hardware appends it
+                */
+               min_tx_space = (adapter->max_frame_size +
+                               sizeof(struct e1000_tx_desc) -
+                               ETH_FCS_LEN) * 2;
+               min_tx_space = ALIGN(min_tx_space, 1024);
+               min_tx_space >>= 10;
+               /* software strips receive CRC, so leave room for it */
+               min_rx_space = adapter->max_frame_size;
+               min_rx_space = ALIGN(min_rx_space, 1024);
+               min_rx_space >>= 10;
+
+               /*
+                * If current Tx allocation is less than the min Tx FIFO size,
+                * and the min Tx FIFO size is less than the current Rx FIFO
+                * allocation, take space away from current Rx allocation
+                */
+               if ((tx_space < min_tx_space) &&
+                   ((min_tx_space - tx_space) < pba)) {
+                       pba -= min_tx_space - tx_space;
+
+                       /*
+                        * if short on Rx space, Rx wins and must trump Tx
+                        * adjustment or use Early Receive if available
+                        */
+                       if ((pba < min_rx_space) &&
+                           (!(adapter->flags & FLAG_HAS_ERT)))
+                               /* ERT enabled in e1000_configure_rx */
+                               pba = min_rx_space;
+               }
+
+               ew32(PBA, pba);
+       }
+
+       /*
+        * 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, and
+        * - the full Rx FIFO size minus the early receive size (for parts
+        *   with ERT support assuming ERT set to E1000_ERT_2048), or
+        * - the full Rx FIFO size minus one full frame
+        */
+       if (adapter->flags & FLAG_DISABLE_FC_PAUSE_TIME)
+               fc->pause_time = 0xFFFF;
+       else
+               fc->pause_time = E1000_FC_PAUSE_TIME;
+       fc->send_xon = 1;
+       fc->current_mode = fc->requested_mode;
+
+       switch (hw->mac.type) {
+       default:
+               if ((adapter->flags & FLAG_HAS_ERT) &&
+                   (adapter->netdev->mtu > ETH_DATA_LEN))
+                       hwm = min(((pba << 10) * 9 / 10),
+                                 ((pba << 10) - (E1000_ERT_2048 << 3)));
+               else
+                       hwm = min(((pba << 10) * 9 / 10),
+                                 ((pba << 10) - adapter->max_frame_size));
+
+               fc->high_water = hwm & E1000_FCRTH_RTH; /* 8-byte granularity */
+               fc->low_water = fc->high_water - 8;
+               break;
+       case e1000_pchlan:
+               /*
+                * Workaround PCH LOM adapter hangs with certain network
+                * loads.  If hangs persist, try disabling Tx flow control.
+                */
+               if (adapter->netdev->mtu > ETH_DATA_LEN) {
+                       fc->high_water = 0x3500;
+                       fc->low_water  = 0x1500;
+               } else {
+                       fc->high_water = 0x5000;
+                       fc->low_water  = 0x3000;
+               }
+               fc->refresh_time = 0x1000;
+               break;
+       case e1000_pch2lan:
+               fc->high_water = 0x05C20;
+               fc->low_water = 0x05048;
+               fc->pause_time = 0x0650;
+               fc->refresh_time = 0x0400;
+               if (adapter->netdev->mtu > ETH_DATA_LEN) {
+                       pba = 14;
+                       ew32(PBA, pba);
+               }
+               break;
+       }
+
+       /*
+        * Disable Adaptive Interrupt Moderation if 2 full packets cannot
+        * fit in receive buffer and early-receive not supported.
+        */
+       if (adapter->itr_setting & 0x3) {
+               if (((adapter->max_frame_size * 2) > (pba << 10)) &&
+                   !(adapter->flags & FLAG_HAS_ERT)) {
+                       if (!(adapter->flags2 & FLAG2_DISABLE_AIM)) {
+                               dev_info(&adapter->pdev->dev,
+                                       "Interrupt Throttle Rate turned off\n");
+                               adapter->flags2 |= FLAG2_DISABLE_AIM;
+                               ew32(ITR, 0);
+                       }
+               } else if (adapter->flags2 & FLAG2_DISABLE_AIM) {
+                       dev_info(&adapter->pdev->dev,
+                                "Interrupt Throttle Rate turned on\n");
+                       adapter->flags2 &= ~FLAG2_DISABLE_AIM;
+                       adapter->itr = 20000;
+                       ew32(ITR, 1000000000 / (adapter->itr * 256));
+               }
+       }
+
+       /* 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 (mac->ops.init_hw(hw))
+               e_err("Hardware Error\n");
+
+       e1000_update_mng_vlan(adapter);
+
+       /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
+       ew32(VET, ETH_P_8021Q);
+
+       e1000e_reset_adaptive(hw);
+
+       if (!netif_running(adapter->netdev) &&
+           !test_bit(__E1000_TESTING, &adapter->state)) {
+               e1000_power_down_phy(adapter);
+               return;
+       }
+
+       e1000_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);
+       }
+}
+
+int e1000e_up(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* hardware has been reset, we need to reload some things */
+       e1000_configure(adapter);
+
+       clear_bit(__E1000_DOWN, &adapter->state);
+
+       napi_enable(&adapter->napi);
+       if (adapter->msix_entries)
+               e1000_configure_msix(adapter);
+       e1000_irq_enable(adapter);
+
+       netif_start_queue(adapter->netdev);
+
+       /* fire a link change interrupt to start the watchdog */
+       if (adapter->msix_entries)
+               ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);
+       else
+               ew32(ICS, E1000_ICS_LSC);
+
+       return 0;
+}
+
+static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (!(adapter->flags2 & FLAG2_DMA_BURST))
+               return;
+
+       /* flush pending descriptor writebacks to memory */
+       ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
+       ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
+
+       /* execute the writes immediately */
+       e1e_flush();
+}
+
+static void e1000e_update_stats(struct e1000_adapter *adapter);
+
+void e1000e_down(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 tctl, rctl;
+
+       /*
+        * signal that we're down so the interrupt handler does not
+        * reschedule our watchdog timer
+        */
+       set_bit(__E1000_DOWN, &adapter->state);
+
+       /* disable receives in the hardware */
+       rctl = er32(RCTL);
+       ew32(RCTL, rctl & ~E1000_RCTL_EN);
+       /* flush and sleep below */
+
+       netif_stop_queue(netdev);
+
+       /* disable transmits in the hardware */
+       tctl = er32(TCTL);
+       tctl &= ~E1000_TCTL_EN;
+       ew32(TCTL, tctl);
+       /* flush both disables and wait for them to finish */
+       e1e_flush();
+       usleep_range(10000, 20000);
+
+       napi_disable(&adapter->napi);
+       e1000_irq_disable(adapter);
+
+       del_timer_sync(&adapter->watchdog_timer);
+       del_timer_sync(&adapter->phy_info_timer);
+
+       netif_carrier_off(netdev);
+
+       spin_lock(&adapter->stats64_lock);
+       e1000e_update_stats(adapter);
+       spin_unlock(&adapter->stats64_lock);
+
+       e1000e_flush_descriptors(adapter);
+       e1000_clean_tx_ring(adapter);
+       e1000_clean_rx_ring(adapter);
+
+       adapter->link_speed = 0;
+       adapter->link_duplex = 0;
+
+       if (!pci_channel_offline(adapter->pdev))
+               e1000e_reset(adapter);
+
+       /*
+        * TODO: for power management, we could drop the link and
+        * pci_disable_device here.
+        */
+}
+
+void e1000e_reinit_locked(struct e1000_adapter *adapter)
+{
+       might_sleep();
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
+               usleep_range(1000, 2000);
+       e1000e_down(adapter);
+       e1000e_up(adapter);
+       clear_bit(__E1000_RESETTING, &adapter->state);
+}
+
+/**
+ * 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 __devinit e1000_sw_init(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+
+       adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN;
+       adapter->rx_ps_bsize0 = 128;
+       adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
+
+       spin_lock_init(&adapter->stats64_lock);
+
+       e1000e_set_interrupt_capability(adapter);
+
+       if (e1000_alloc_queues(adapter))
+               return -ENOMEM;
+
+       /* Explicitly disable IRQ since the NIC can be in any state. */
+       e1000_irq_disable(adapter);
+
+       set_bit(__E1000_DOWN, &adapter->state);
+       return 0;
+}
+
+/**
+ * e1000_intr_msi_test - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+static irqreturn_t e1000_intr_msi_test(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 icr = er32(ICR);
+
+       e_dbg("icr is %08X\n", icr);
+       if (icr & E1000_ICR_RXSEQ) {
+               adapter->flags &= ~FLAG_MSI_TEST_FAILED;
+               wmb();
+       }
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * e1000_test_msi_interrupt - Returns 0 for successful test
+ * @adapter: board private struct
+ *
+ * code flow taken from tg3.c
+ **/
+static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       int err;
+
+       /* poll_enable hasn't been called yet, so don't need disable */
+       /* clear any pending events */
+       er32(ICR);
+
+       /* free the real vector and request a test handler */
+       e1000_free_irq(adapter);
+       e1000e_reset_interrupt_capability(adapter);
+
+       /* Assume that the test fails, if it succeeds then the test
+        * MSI irq handler will unset this flag */
+       adapter->flags |= FLAG_MSI_TEST_FAILED;
+
+       err = pci_enable_msi(adapter->pdev);
+       if (err)
+               goto msi_test_failed;
+
+       err = request_irq(adapter->pdev->irq, e1000_intr_msi_test, 0,
+                         netdev->name, netdev);
+       if (err) {
+               pci_disable_msi(adapter->pdev);
+               goto msi_test_failed;
+       }
+
+       wmb();
+
+       e1000_irq_enable(adapter);
+
+       /* fire an unusual interrupt on the test handler */
+       ew32(ICS, E1000_ICS_RXSEQ);
+       e1e_flush();
+       msleep(50);
+
+       e1000_irq_disable(adapter);
+
+       rmb();
+
+       if (adapter->flags & FLAG_MSI_TEST_FAILED) {
+               adapter->int_mode = E1000E_INT_MODE_LEGACY;
+               e_info("MSI interrupt test failed, using legacy interrupt.\n");
+       } else
+               e_dbg("MSI interrupt test succeeded!\n");
+
+       free_irq(adapter->pdev->irq, netdev);
+       pci_disable_msi(adapter->pdev);
+
+msi_test_failed:
+       e1000e_set_interrupt_capability(adapter);
+       return e1000_request_irq(adapter);
+}
+
+/**
+ * e1000_test_msi - Returns 0 if MSI test succeeds or INTx mode is restored
+ * @adapter: board private struct
+ *
+ * code flow taken from tg3.c, called with e1000 interrupts disabled.
+ **/
+static int e1000_test_msi(struct e1000_adapter *adapter)
+{
+       int err;
+       u16 pci_cmd;
+
+       if (!(adapter->flags & FLAG_MSI_ENABLED))
+               return 0;
+
+       /* disable SERR in case the MSI write causes a master abort */
+       pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
+       if (pci_cmd & PCI_COMMAND_SERR)
+               pci_write_config_word(adapter->pdev, PCI_COMMAND,
+                                     pci_cmd & ~PCI_COMMAND_SERR);
+
+       err = e1000_test_msi_interrupt(adapter);
+
+       /* re-enable SERR */
+       if (pci_cmd & PCI_COMMAND_SERR) {
+               pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
+               pci_cmd |= PCI_COMMAND_SERR;
+               pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
+       }
+
+       return err;
+}
+
+/**
+ * e1000_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+static int e1000_open(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+       int err;
+
+       /* disallow open during test */
+       if (test_bit(__E1000_TESTING, &adapter->state))
+               return -EBUSY;
+
+       pm_runtime_get_sync(&pdev->dev);
+
+       netif_carrier_off(netdev);
+
+       /* allocate transmit descriptors */
+       err = e1000e_setup_tx_resources(adapter);
+       if (err)
+               goto err_setup_tx;
+
+       /* allocate receive descriptors */
+       err = e1000e_setup_rx_resources(adapter);
+       if (err)
+               goto err_setup_rx;
+
+       /*
+        * If AMT is enabled, let the firmware know that the network
+        * interface is now open and reset the part to a known state.
+        */
+       if (adapter->flags & FLAG_HAS_AMT) {
+               e1000e_get_hw_control(adapter);
+               e1000e_reset(adapter);
+       }
+
+       e1000e_power_up_phy(adapter);
+
+       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
+       if ((adapter->hw.mng_cookie.status &
+            E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
+               e1000_update_mng_vlan(adapter);
+
+       /* DMA latency requirement to workaround early-receive/jumbo issue */
+       if ((adapter->flags & FLAG_HAS_ERT) ||
+           (adapter->hw.mac.type == e1000_pch2lan))
+               pm_qos_add_request(&adapter->netdev->pm_qos_req,
+                                  PM_QOS_CPU_DMA_LATENCY,
+                                  PM_QOS_DEFAULT_VALUE);
+
+       /*
+        * before we allocate an interrupt, we must be ready to handle it.
+        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
+        * as soon as we call pci_request_irq, so we have to setup our
+        * clean_rx handler before we do so.
+        */
+       e1000_configure(adapter);
+
+       err = e1000_request_irq(adapter);
+       if (err)
+               goto err_req_irq;
+
+       /*
+        * Work around PCIe errata with MSI interrupts causing some chipsets to
+        * ignore e1000e MSI messages, which means we need to test our MSI
+        * interrupt now
+        */
+       if (adapter->int_mode != E1000E_INT_MODE_LEGACY) {
+               err = e1000_test_msi(adapter);
+               if (err) {
+                       e_err("Interrupt allocation failed\n");
+                       goto err_req_irq;
+               }
+       }
+
+       /* From here on the code is the same as e1000e_up() */
+       clear_bit(__E1000_DOWN, &adapter->state);
+
+       napi_enable(&adapter->napi);
+
+       e1000_irq_enable(adapter);
+
+       netif_start_queue(netdev);
+
+       adapter->idle_check = true;
+       pm_runtime_put(&pdev->dev);
+
+       /* fire a link status change interrupt to start the watchdog */
+       if (adapter->msix_entries)
+               ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);
+       else
+               ew32(ICS, E1000_ICS_LSC);
+
+       return 0;
+
+err_req_irq:
+       e1000e_release_hw_control(adapter);
+       e1000_power_down_phy(adapter);
+       e1000e_free_rx_resources(adapter);
+err_setup_rx:
+       e1000e_free_tx_resources(adapter);
+err_setup_tx:
+       e1000e_reset(adapter);
+       pm_runtime_put_sync(&pdev->dev);
+
+       return err;
+}
+
+/**
+ * e1000_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+static int e1000_close(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct pci_dev *pdev = adapter->pdev;
+
+       WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
+
+       pm_runtime_get_sync(&pdev->dev);
+
+       if (!test_bit(__E1000_DOWN, &adapter->state)) {
+               e1000e_down(adapter);
+               e1000_free_irq(adapter);
+       }
+       e1000_power_down_phy(adapter);
+
+       e1000e_free_tx_resources(adapter);
+       e1000e_free_rx_resources(adapter);
+
+       /*
+        * kill manageability vlan ID if supported, but not if a vlan with
+        * the same ID is registered on the host OS (let 8021q kill it)
+        */
+       if (adapter->hw.mng_cookie.status &
+           E1000_MNG_DHCP_COOKIE_STATUS_VLAN)
+               e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
+
+       /*
+        * If AMT is enabled, let the firmware know that the network
+        * interface is now closed
+        */
+       if ((adapter->flags & FLAG_HAS_AMT) &&
+           !test_bit(__E1000_TESTING, &adapter->state))
+               e1000e_release_hw_control(adapter);
+
+       if ((adapter->flags & FLAG_HAS_ERT) ||
+           (adapter->hw.mac.type == e1000_pch2lan))
+               pm_qos_remove_request(&adapter->netdev->pm_qos_req);
+
+       pm_runtime_put_sync(&pdev->dev);
+
+       return 0;
+}
+/**
+ * e1000_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int e1000_set_mac(struct net_device *netdev, void *p)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+       memcpy(adapter->hw.mac.addr, addr->sa_data, netdev->addr_len);
+
+       e1000e_rar_set(&adapter->hw, adapter->hw.mac.addr, 0);
+
+       if (adapter->flags & FLAG_RESET_OVERWRITES_LAA) {
+               /* activate the work around */
+               e1000e_set_laa_state_82571(&adapter->hw, 1);
+
+               /*
+                * 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 (in e1000_watchdog), 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(&adapter->hw,
+                             adapter->hw.mac.addr,
+                             adapter->hw.mac.rar_entry_count - 1);
+       }
+
+       return 0;
+}
+
+/**
+ * e1000e_update_phy_task - work thread to update phy
+ * @work: pointer to our work struct
+ *
+ * this worker thread exists because we must acquire a
+ * semaphore to read the phy, which we could msleep while
+ * waiting for it, and we can't msleep in a timer.
+ **/
+static void e1000e_update_phy_task(struct work_struct *work)
+{
+       struct e1000_adapter *adapter = container_of(work,
+                                       struct e1000_adapter, update_phy_task);
+
+       if (test_bit(__E1000_DOWN, &adapter->state))
+               return;
+
+       e1000_get_phy_info(&adapter->hw);
+}
+
+/*
+ * Need to wait a few seconds after link up to get diagnostic information from
+ * the phy
+ */
+static void e1000_update_phy_info(unsigned long data)
+{
+       struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+
+       if (test_bit(__E1000_DOWN, &adapter->state))
+               return;
+
+       schedule_work(&adapter->update_phy_task);
+}
+
+/**
+ * e1000e_update_phy_stats - Update the PHY statistics counters
+ * @adapter: board private structure
+ *
+ * Read/clear the upper 16-bit PHY registers and read/accumulate lower
+ **/
+static void e1000e_update_phy_stats(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       s32 ret_val;
+       u16 phy_data;
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return;
+
+       /*
+        * A page set is expensive so check if already on desired page.
+        * If not, set to the page with the PHY status registers.
+        */
+       hw->phy.addr = 1;
+       ret_val = e1000e_read_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                          &phy_data);
+       if (ret_val)
+               goto release;
+       if (phy_data != (HV_STATS_PAGE << IGP_PAGE_SHIFT)) {
+               ret_val = hw->phy.ops.set_page(hw,
+                                              HV_STATS_PAGE << IGP_PAGE_SHIFT);
+               if (ret_val)
+                       goto release;
+       }
+
+       /* Single Collision Count */
+       hw->phy.ops.read_reg_page(hw, HV_SCC_UPPER, &phy_data);
+       ret_val = hw->phy.ops.read_reg_page(hw, HV_SCC_LOWER, &phy_data);
+       if (!ret_val)
+               adapter->stats.scc += phy_data;
+
+       /* Excessive Collision Count */
+       hw->phy.ops.read_reg_page(hw, HV_ECOL_UPPER, &phy_data);
+       ret_val = hw->phy.ops.read_reg_page(hw, HV_ECOL_LOWER, &phy_data);
+       if (!ret_val)
+               adapter->stats.ecol += phy_data;
+
+       /* Multiple Collision Count */
+       hw->phy.ops.read_reg_page(hw, HV_MCC_UPPER, &phy_data);
+       ret_val = hw->phy.ops.read_reg_page(hw, HV_MCC_LOWER, &phy_data);
+       if (!ret_val)
+               adapter->stats.mcc += phy_data;
+
+       /* Late Collision Count */
+       hw->phy.ops.read_reg_page(hw, HV_LATECOL_UPPER, &phy_data);
+       ret_val = hw->phy.ops.read_reg_page(hw, HV_LATECOL_LOWER, &phy_data);
+       if (!ret_val)
+               adapter->stats.latecol += phy_data;
+
+       /* Collision Count - also used for adaptive IFS */
+       hw->phy.ops.read_reg_page(hw, HV_COLC_UPPER, &phy_data);
+       ret_val = hw->phy.ops.read_reg_page(hw, HV_COLC_LOWER, &phy_data);
+       if (!ret_val)
+               hw->mac.collision_delta = phy_data;
+
+       /* Defer Count */
+       hw->phy.ops.read_reg_page(hw, HV_DC_UPPER, &phy_data);
+       ret_val = hw->phy.ops.read_reg_page(hw, HV_DC_LOWER, &phy_data);
+       if (!ret_val)
+               adapter->stats.dc += phy_data;
+
+       /* Transmit with no CRS */
+       hw->phy.ops.read_reg_page(hw, HV_TNCRS_UPPER, &phy_data);
+       ret_val = hw->phy.ops.read_reg_page(hw, HV_TNCRS_LOWER, &phy_data);
+       if (!ret_val)
+               adapter->stats.tncrs += phy_data;
+
+release:
+       hw->phy.ops.release(hw);
+}
+
+/**
+ * e1000e_update_stats - Update the board statistics counters
+ * @adapter: board private structure
+ **/
+static void e1000e_update_stats(struct e1000_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+
+       /*
+        * Prevent stats update while adapter is being reset, or if the pci
+        * connection is down.
+        */
+       if (adapter->link_speed == 0)
+               return;
+       if (pci_channel_offline(pdev))
+               return;
+
+       adapter->stats.crcerrs += er32(CRCERRS);
+       adapter->stats.gprc += er32(GPRC);
+       adapter->stats.gorc += er32(GORCL);
+       er32(GORCH); /* Clear gorc */
+       adapter->stats.bprc += er32(BPRC);
+       adapter->stats.mprc += er32(MPRC);
+       adapter->stats.roc += er32(ROC);
+
+       adapter->stats.mpc += er32(MPC);
+
+       /* Half-duplex statistics */
+       if (adapter->link_duplex == HALF_DUPLEX) {
+               if (adapter->flags2 & FLAG2_HAS_PHY_STATS) {
+                       e1000e_update_phy_stats(adapter);
+               } else {
+                       adapter->stats.scc += er32(SCC);
+                       adapter->stats.ecol += er32(ECOL);
+                       adapter->stats.mcc += er32(MCC);
+                       adapter->stats.latecol += er32(LATECOL);
+                       adapter->stats.dc += er32(DC);
+
+                       hw->mac.collision_delta = er32(COLC);
+
+                       if ((hw->mac.type != e1000_82574) &&
+                           (hw->mac.type != e1000_82583))
+                               adapter->stats.tncrs += er32(TNCRS);
+               }
+               adapter->stats.colc += hw->mac.collision_delta;
+       }
+
+       adapter->stats.xonrxc += er32(XONRXC);
+       adapter->stats.xontxc += er32(XONTXC);
+       adapter->stats.xoffrxc += er32(XOFFRXC);
+       adapter->stats.xofftxc += er32(XOFFTXC);
+       adapter->stats.gptc += er32(GPTC);
+       adapter->stats.gotc += er32(GOTCL);
+       er32(GOTCH); /* Clear gotc */
+       adapter->stats.rnbc += er32(RNBC);
+       adapter->stats.ruc += er32(RUC);
+
+       adapter->stats.mptc += er32(MPTC);
+       adapter->stats.bptc += er32(BPTC);
+
+       /* used for adaptive IFS */
+
+       hw->mac.tx_packet_delta = er32(TPT);
+       adapter->stats.tpt += hw->mac.tx_packet_delta;
+
+       adapter->stats.algnerrc += er32(ALGNERRC);
+       adapter->stats.rxerrc += er32(RXERRC);
+       adapter->stats.cexterr += er32(CEXTERR);
+       adapter->stats.tsctc += er32(TSCTC);
+       adapter->stats.tsctfc += er32(TSCTFC);
+
+       /* Fill out the OS statistics structure */
+       netdev->stats.multicast = adapter->stats.mprc;
+       netdev->stats.collisions = adapter->stats.colc;
+
+       /* Rx Errors */
+
+       /*
+        * RLEC on some newer hardware can be incorrect so build
+        * our own version based on RUC and ROC
+        */
+       netdev->stats.rx_errors = adapter->stats.rxerrc +
+               adapter->stats.crcerrs + adapter->stats.algnerrc +
+               adapter->stats.ruc + adapter->stats.roc +
+               adapter->stats.cexterr;
+       netdev->stats.rx_length_errors = adapter->stats.ruc +
+                                             adapter->stats.roc;
+       netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
+       netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
+       netdev->stats.rx_missed_errors = adapter->stats.mpc;
+
+       /* Tx Errors */
+       netdev->stats.tx_errors = adapter->stats.ecol +
+                                      adapter->stats.latecol;
+       netdev->stats.tx_aborted_errors = adapter->stats.ecol;
+       netdev->stats.tx_window_errors = adapter->stats.latecol;
+       netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
+
+       /* Tx Dropped needs to be maintained elsewhere */
+
+       /* Management Stats */
+       adapter->stats.mgptc += er32(MGTPTC);
+       adapter->stats.mgprc += er32(MGTPRC);
+       adapter->stats.mgpdc += er32(MGTPDC);
+}
+
+/**
+ * e1000_phy_read_status - Update the PHY register status snapshot
+ * @adapter: board private structure
+ **/
+static void e1000_phy_read_status(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_phy_regs *phy = &adapter->phy_regs;
+
+       if ((er32(STATUS) & E1000_STATUS_LU) &&
+           (adapter->hw.phy.media_type == e1000_media_type_copper)) {
+               int ret_val;
+
+               ret_val  = e1e_rphy(hw, PHY_CONTROL, &phy->bmcr);
+               ret_val |= e1e_rphy(hw, PHY_STATUS, &phy->bmsr);
+               ret_val |= e1e_rphy(hw, PHY_AUTONEG_ADV, &phy->advertise);
+               ret_val |= e1e_rphy(hw, PHY_LP_ABILITY, &phy->lpa);
+               ret_val |= e1e_rphy(hw, PHY_AUTONEG_EXP, &phy->expansion);
+               ret_val |= e1e_rphy(hw, PHY_1000T_CTRL, &phy->ctrl1000);
+               ret_val |= e1e_rphy(hw, PHY_1000T_STATUS, &phy->stat1000);
+               ret_val |= e1e_rphy(hw, PHY_EXT_STATUS, &phy->estatus);
+               if (ret_val)
+                       e_warn("Error reading PHY register\n");
+       } else {
+               /*
+                * Do not read PHY registers if link is not up
+                * Set values to typical power-on defaults
+                */
+               phy->bmcr = (BMCR_SPEED1000 | BMCR_ANENABLE | BMCR_FULLDPLX);
+               phy->bmsr = (BMSR_100FULL | BMSR_100HALF | BMSR_10FULL |
+                            BMSR_10HALF | BMSR_ESTATEN | BMSR_ANEGCAPABLE |
+                            BMSR_ERCAP);
+               phy->advertise = (ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP |
+                                 ADVERTISE_ALL | ADVERTISE_CSMA);
+               phy->lpa = 0;
+               phy->expansion = EXPANSION_ENABLENPAGE;
+               phy->ctrl1000 = ADVERTISE_1000FULL;
+               phy->stat1000 = 0;
+               phy->estatus = (ESTATUS_1000_TFULL | ESTATUS_1000_THALF);
+       }
+}
+
+static void e1000_print_link_info(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl = er32(CTRL);
+
+       /* Link status message must follow this format for user tools */
+       printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s, "
+              "Flow Control: %s\n",
+              adapter->netdev->name,
+              adapter->link_speed,
+              (adapter->link_duplex == FULL_DUPLEX) ?
+              "Full Duplex" : "Half Duplex",
+              ((ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE)) ?
+              "Rx/Tx" :
+              ((ctrl & E1000_CTRL_RFCE) ? "Rx" :
+               ((ctrl & E1000_CTRL_TFCE) ? "Tx" : "None")));
+}
+
+static bool e1000e_has_link(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       bool link_active = 0;
+       s32 ret_val = 0;
+
+       /*
+        * get_link_status is set on LSC (link status) interrupt or
+        * Rx sequence error interrupt.  get_link_status will stay
+        * false until the check_for_link establishes link
+        * for copper adapters ONLY
+        */
+       switch (hw->phy.media_type) {
+       case e1000_media_type_copper:
+               if (hw->mac.get_link_status) {
+                       ret_val = hw->mac.ops.check_for_link(hw);
+                       link_active = !hw->mac.get_link_status;
+               } else {
+                       link_active = 1;
+               }
+               break;
+       case e1000_media_type_fiber:
+               ret_val = hw->mac.ops.check_for_link(hw);
+               link_active = !!(er32(STATUS) & E1000_STATUS_LU);
+               break;
+       case e1000_media_type_internal_serdes:
+               ret_val = hw->mac.ops.check_for_link(hw);
+               link_active = adapter->hw.mac.serdes_has_link;
+               break;
+       default:
+       case e1000_media_type_unknown:
+               break;
+       }
+
+       if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
+           (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
+               /* See e1000_kmrn_lock_loss_workaround_ich8lan() */
+               e_info("Gigabit has been disabled, downgrading speed\n");
+       }
+
+       return link_active;
+}
+
+static void e1000e_enable_receives(struct e1000_adapter *adapter)
+{
+       /* make sure the receive unit is started */
+       if ((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
+           (adapter->flags & FLAG_RX_RESTART_NOW)) {
+               struct e1000_hw *hw = &adapter->hw;
+               u32 rctl = er32(RCTL);
+               ew32(RCTL, rctl | E1000_RCTL_EN);
+               adapter->flags &= ~FLAG_RX_RESTART_NOW;
+       }
+}
+
+static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /*
+        * With 82574 controllers, PHY needs to be checked periodically
+        * for hung state and reset, if two calls return true
+        */
+       if (e1000_check_phy_82574(hw))
+               adapter->phy_hang_count++;
+       else
+               adapter->phy_hang_count = 0;
+
+       if (adapter->phy_hang_count > 1) {
+               adapter->phy_hang_count = 0;
+               schedule_work(&adapter->reset_task);
+       }
+}
+
+/**
+ * e1000_watchdog - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+static void e1000_watchdog(unsigned long data)
+{
+       struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+
+       /* Do the rest outside of interrupt context */
+       schedule_work(&adapter->watchdog_task);
+
+       /* TODO: make this use queue_delayed_work() */
+}
+
+static void e1000_watchdog_task(struct work_struct *work)
+{
+       struct e1000_adapter *adapter = container_of(work,
+                                       struct e1000_adapter, watchdog_task);
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_mac_info *mac = &adapter->hw.mac;
+       struct e1000_phy_info *phy = &adapter->hw.phy;
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 link, tctl;
+
+       if (test_bit(__E1000_DOWN, &adapter->state))
+               return;
+
+       link = e1000e_has_link(adapter);
+       if ((netif_carrier_ok(netdev)) && link) {
+               /* Cancel scheduled suspend requests. */
+               pm_runtime_resume(netdev->dev.parent);
+
+               e1000e_enable_receives(adapter);
+               goto link_up;
+       }
+
+       if ((e1000e_enable_tx_pkt_filtering(hw)) &&
+           (adapter->mng_vlan_id != adapter->hw.mng_cookie.vlan_id))
+               e1000_update_mng_vlan(adapter);
+
+       if (link) {
+               if (!netif_carrier_ok(netdev)) {
+                       bool txb2b = 1;
+
+                       /* Cancel scheduled suspend requests. */
+                       pm_runtime_resume(netdev->dev.parent);
+
+                       /* update snapshot of PHY registers on LSC */
+                       e1000_phy_read_status(adapter);
+                       mac->ops.get_link_up_info(&adapter->hw,
+                                                  &adapter->link_speed,
+                                                  &adapter->link_duplex);
+                       e1000_print_link_info(adapter);
+                       /*
+                        * On supported PHYs, check for duplex mismatch only
+                        * if link has autonegotiated at 10/100 half
+                        */
+                       if ((hw->phy.type == e1000_phy_igp_3 ||
+                            hw->phy.type == e1000_phy_bm) &&
+                           (hw->mac.autoneg == true) &&
+                           (adapter->link_speed == SPEED_10 ||
+                            adapter->link_speed == SPEED_100) &&
+                           (adapter->link_duplex == HALF_DUPLEX)) {
+                               u16 autoneg_exp;
+
+                               e1e_rphy(hw, PHY_AUTONEG_EXP, &autoneg_exp);
+
+                               if (!(autoneg_exp & NWAY_ER_LP_NWAY_CAPS))
+                                       e_info("Autonegotiated half duplex but"
+                                              " link partner cannot autoneg. "
+                                              " Try forcing full duplex if "
+                                              "link gets many collisions.\n");
+                       }
+
+                       /* adjust timeout factor according to speed/duplex */
+                       adapter->tx_timeout_factor = 1;
+                       switch (adapter->link_speed) {
+                       case SPEED_10:
+                               txb2b = 0;
+                               adapter->tx_timeout_factor = 16;
+                               break;
+                       case SPEED_100:
+                               txb2b = 0;
+                               adapter->tx_timeout_factor = 10;
+                               break;
+                       }
+
+                       /*
+                        * workaround: re-program speed mode bit after
+                        * link-up event
+                        */
+                       if ((adapter->flags & FLAG_TARC_SPEED_MODE_BIT) &&
+                           !txb2b) {
+                               u32 tarc0;
+                               tarc0 = er32(TARC(0));
+                               tarc0 &= ~SPEED_MODE_BIT;
+                               ew32(TARC(0), tarc0);
+                       }
+
+                       /*
+                        * disable TSO for pcie and 10/100 speeds, to avoid
+                        * some hardware issues
+                        */
+                       if (!(adapter->flags & FLAG_TSO_FORCE)) {
+                               switch (adapter->link_speed) {
+                               case SPEED_10:
+                               case SPEED_100:
+                                       e_info("10/100 speed: disabling TSO\n");
+                                       netdev->features &= ~NETIF_F_TSO;
+                                       netdev->features &= ~NETIF_F_TSO6;
+                                       break;
+                               case SPEED_1000:
+                                       netdev->features |= NETIF_F_TSO;
+                                       netdev->features |= NETIF_F_TSO6;
+                                       break;
+                               default:
+                                       /* oops */
+                                       break;
+                               }
+                       }
+
+                       /*
+                        * enable transmits in the hardware, need to do this
+                        * after setting TARC(0)
+                        */
+                       tctl = er32(TCTL);
+                       tctl |= E1000_TCTL_EN;
+                       ew32(TCTL, tctl);
+
+                        /*
+                        * Perform any post-link-up configuration before
+                        * reporting link up.
+                        */
+                       if (phy->ops.cfg_on_link_up)
+                               phy->ops.cfg_on_link_up(hw);
+
+                       netif_carrier_on(netdev);
+
+                       if (!test_bit(__E1000_DOWN, &adapter->state))
+                               mod_timer(&adapter->phy_info_timer,
+                                         round_jiffies(jiffies + 2 * HZ));
+               }
+       } else {
+               if (netif_carrier_ok(netdev)) {
+                       adapter->link_speed = 0;
+                       adapter->link_duplex = 0;
+                       /* Link status message must follow this format */
+                       printk(KERN_INFO "e1000e: %s NIC Link is Down\n",
+                              adapter->netdev->name);
+                       netif_carrier_off(netdev);
+                       if (!test_bit(__E1000_DOWN, &adapter->state))
+                               mod_timer(&adapter->phy_info_timer,
+                                         round_jiffies(jiffies + 2 * HZ));
+
+                       if (adapter->flags & FLAG_RX_NEEDS_RESTART)
+                               schedule_work(&adapter->reset_task);
+                       else
+                               pm_schedule_suspend(netdev->dev.parent,
+                                                       LINK_TIMEOUT);
+               }
+       }
+
+link_up:
+       spin_lock(&adapter->stats64_lock);
+       e1000e_update_stats(adapter);
+
+       mac->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
+       adapter->tpt_old = adapter->stats.tpt;
+       mac->collision_delta = adapter->stats.colc - adapter->colc_old;
+       adapter->colc_old = adapter->stats.colc;
+
+       adapter->gorc = adapter->stats.gorc - adapter->gorc_old;
+       adapter->gorc_old = adapter->stats.gorc;
+       adapter->gotc = adapter->stats.gotc - adapter->gotc_old;
+       adapter->gotc_old = adapter->stats.gotc;
+       spin_unlock(&adapter->stats64_lock);
+
+       e1000e_update_adaptive(&adapter->hw);
+
+       if (!netif_carrier_ok(netdev) &&
+           (e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
+               /*
+                * We've lost link, so the controller stops DMA,
+                * but we've got queued Tx work that's never going
+                * to get done, so reset controller to flush Tx.
+                * (Do the reset outside of interrupt context).
+                */
+               schedule_work(&adapter->reset_task);
+               /* return immediately since reset is imminent */
+               return;
+       }
+
+       /* Simple mode for Interrupt Throttle Rate (ITR) */
+       if (adapter->itr_setting == 4) {
+               /*
+                * Symmetric Tx/Rx gets a reduced ITR=2000;
+                * Total asymmetrical Tx or Rx gets ITR=8000;
+                * everyone else is between 2000-8000.
+                */
+               u32 goc = (adapter->gotc + adapter->gorc) / 10000;
+               u32 dif = (adapter->gotc > adapter->gorc ?
+                           adapter->gotc - adapter->gorc :
+                           adapter->gorc - adapter->gotc) / 10000;
+               u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
+
+               ew32(ITR, 1000000000 / (itr * 256));
+       }
+
+       /* Cause software interrupt to ensure Rx ring is cleaned */
+       if (adapter->msix_entries)
+               ew32(ICS, adapter->rx_ring->ims_val);
+       else
+               ew32(ICS, E1000_ICS_RXDMT0);
+
+       /* flush pending descriptors to memory before detecting Tx hang */
+       e1000e_flush_descriptors(adapter);
+
+       /* Force detection of hung controller every watchdog period */
+       adapter->detect_tx_hung = 1;
+
+       /*
+        * With 82571 controllers, LAA may be overwritten due to controller
+        * reset from the other port. Set the appropriate LAA in RAR[0]
+        */
+       if (e1000e_get_laa_state_82571(hw))
+               e1000e_rar_set(hw, adapter->hw.mac.addr, 0);
+
+       if (adapter->flags2 & FLAG2_CHECK_PHY_HANG)
+               e1000e_check_82574_phy_workaround(adapter);
+
+       /* Reset the timer */
+       if (!test_bit(__E1000_DOWN, &adapter->state))
+               mod_timer(&adapter->watchdog_timer,
+                         round_jiffies(jiffies + 2 * HZ));
+}
+
+#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
+
+static int e1000_tso(struct e1000_adapter *adapter,
+                    struct sk_buff *skb)
+{
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_context_desc *context_desc;
+       struct e1000_buffer *buffer_info;
+       unsigned int i;
+       u32 cmd_length = 0;
+       u16 ipcse = 0, tucse, mss;
+       u8 ipcss, ipcso, tucss, tucso, hdr_len;
+
+       if (!skb_is_gso(skb))
+               return 0;
+
+       if (skb_header_cloned(skb)) {
+               int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+
+               if (err)
+                       return err;
+       }
+
+       hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+       mss = skb_shinfo(skb)->gso_size;
+       if (skb->protocol == htons(ETH_P_IP)) {
+               struct iphdr *iph = ip_hdr(skb);
+               iph->tot_len = 0;
+               iph->check = 0;
+               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                        0, IPPROTO_TCP, 0);
+               cmd_length = E1000_TXD_CMD_IP;
+               ipcse = skb_transport_offset(skb) - 1;
+       } else if (skb_is_gso_v6(skb)) {
+               ipv6_hdr(skb)->payload_len = 0;
+               tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                                      &ipv6_hdr(skb)->daddr,
+                                                      0, IPPROTO_TCP, 0);
+               ipcse = 0;
+       }
+       ipcss = skb_network_offset(skb);
+       ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
+       tucss = skb_transport_offset(skb);
+       tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
+       tucse = 0;
+
+       cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
+                      E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
+
+       i = tx_ring->next_to_use;
+       context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
+       buffer_info = &tx_ring->buffer_info[i];
+
+       context_desc->lower_setup.ip_fields.ipcss  = ipcss;
+       context_desc->lower_setup.ip_fields.ipcso  = ipcso;
+       context_desc->lower_setup.ip_fields.ipcse  = cpu_to_le16(ipcse);
+       context_desc->upper_setup.tcp_fields.tucss = tucss;
+       context_desc->upper_setup.tcp_fields.tucso = tucso;
+       context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
+       context_desc->tcp_seg_setup.fields.mss     = cpu_to_le16(mss);
+       context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
+       context_desc->cmd_and_length = cpu_to_le32(cmd_length);
+
+       buffer_info->time_stamp = jiffies;
+       buffer_info->next_to_watch = i;
+
+       i++;
+       if (i == tx_ring->count)
+               i = 0;
+       tx_ring->next_to_use = i;
+
+       return 1;
+}
+
+static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
+{
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_context_desc *context_desc;
+       struct e1000_buffer *buffer_info;
+       unsigned int i;
+       u8 css;
+       u32 cmd_len = E1000_TXD_CMD_DEXT;
+       __be16 protocol;
+
+       if (skb->ip_summed != CHECKSUM_PARTIAL)
+               return 0;
+
+       if (skb->protocol == cpu_to_be16(ETH_P_8021Q))
+               protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
+       else
+               protocol = skb->protocol;
+
+       switch (protocol) {
+       case cpu_to_be16(ETH_P_IP):
+               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                       cmd_len |= E1000_TXD_CMD_TCP;
+               break;
+       case cpu_to_be16(ETH_P_IPV6):
+               /* XXX not handling all IPV6 headers */
+               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                       cmd_len |= E1000_TXD_CMD_TCP;
+               break;
+       default:
+               if (unlikely(net_ratelimit()))
+                       e_warn("checksum_partial proto=%x!\n",
+                              be16_to_cpu(protocol));
+               break;
+       }
+
+       css = skb_checksum_start_offset(skb);
+
+       i = tx_ring->next_to_use;
+       buffer_info = &tx_ring->buffer_info[i];
+       context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
+
+       context_desc->lower_setup.ip_config = 0;
+       context_desc->upper_setup.tcp_fields.tucss = css;
+       context_desc->upper_setup.tcp_fields.tucso =
+                               css + skb->csum_offset;
+       context_desc->upper_setup.tcp_fields.tucse = 0;
+       context_desc->tcp_seg_setup.data = 0;
+       context_desc->cmd_and_length = cpu_to_le32(cmd_len);
+
+       buffer_info->time_stamp = jiffies;
+       buffer_info->next_to_watch = i;
+
+       i++;
+       if (i == tx_ring->count)
+               i = 0;
+       tx_ring->next_to_use = i;
+
+       return 1;
+}
+
+#define E1000_MAX_PER_TXD      8192
+#define E1000_MAX_TXD_PWR      12
+
+static int e1000_tx_map(struct e1000_adapter *adapter,
+                       struct sk_buff *skb, unsigned int first,
+                       unsigned int max_per_txd, unsigned int nr_frags,
+                       unsigned int mss)
+{
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_buffer *buffer_info;
+       unsigned int len = skb_headlen(skb);
+       unsigned int offset = 0, size, count = 0, i;
+       unsigned int f, bytecount, segs;
+
+       i = tx_ring->next_to_use;
+
+       while (len) {
+               buffer_info = &tx_ring->buffer_info[i];
+               size = min(len, max_per_txd);
+
+               buffer_info->length = size;
+               buffer_info->time_stamp = jiffies;
+               buffer_info->next_to_watch = i;
+               buffer_info->dma = dma_map_single(&pdev->dev,
+                                                 skb->data + offset,
+                                                 size, DMA_TO_DEVICE);
+               buffer_info->mapped_as_page = false;
+               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                       goto dma_error;
+
+               len -= size;
+               offset += size;
+               count++;
+
+               if (len) {
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+       }
+
+       for (f = 0; f < nr_frags; f++) {
+               struct skb_frag_struct *frag;
+
+               frag = &skb_shinfo(skb)->frags[f];
+               len = frag->size;
+               offset = frag->page_offset;
+
+               while (len) {
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+
+                       buffer_info = &tx_ring->buffer_info[i];
+                       size = min(len, max_per_txd);
+
+                       buffer_info->length = size;
+                       buffer_info->time_stamp = jiffies;
+                       buffer_info->next_to_watch = i;
+                       buffer_info->dma = dma_map_page(&pdev->dev, frag->page,
+                                                       offset, size,
+                                                       DMA_TO_DEVICE);
+                       buffer_info->mapped_as_page = true;
+                       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                               goto dma_error;
+
+                       len -= size;
+                       offset += size;
+                       count++;
+               }
+       }
+
+       segs = skb_shinfo(skb)->gso_segs ? : 1;
+       /* multiply data chunks by size of headers */
+       bytecount = ((segs - 1) * skb_headlen(skb)) + skb->len;
+
+       tx_ring->buffer_info[i].skb = skb;
+       tx_ring->buffer_info[i].segs = segs;
+       tx_ring->buffer_info[i].bytecount = bytecount;
+       tx_ring->buffer_info[first].next_to_watch = i;
+
+       return count;
+
+dma_error:
+       dev_err(&pdev->dev, "Tx DMA map failed\n");
+       buffer_info->dma = 0;
+       if (count)
+               count--;
+
+       while (count--) {
+               if (i == 0)
+                       i += tx_ring->count;
+               i--;
+               buffer_info = &tx_ring->buffer_info[i];
+               e1000_put_txbuf(adapter, buffer_info);
+       }
+
+       return 0;
+}
+
+static void e1000_tx_queue(struct e1000_adapter *adapter,
+                          int tx_flags, int count)
+{
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       struct e1000_tx_desc *tx_desc = NULL;
+       struct e1000_buffer *buffer_info;
+       u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
+       unsigned int i;
+
+       if (tx_flags & E1000_TX_FLAGS_TSO) {
+               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
+                            E1000_TXD_CMD_TSE;
+               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
+
+               if (tx_flags & E1000_TX_FLAGS_IPV4)
+                       txd_upper |= E1000_TXD_POPTS_IXSM << 8;
+       }
+
+       if (tx_flags & E1000_TX_FLAGS_CSUM) {
+               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
+               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
+       }
+
+       if (tx_flags & E1000_TX_FLAGS_VLAN) {
+               txd_lower |= E1000_TXD_CMD_VLE;
+               txd_upper |= (tx_flags & E1000_TX_FLAGS_VLAN_MASK);
+       }
+
+       i = tx_ring->next_to_use;
+
+       do {
+               buffer_info = &tx_ring->buffer_info[i];
+               tx_desc = E1000_TX_DESC(*tx_ring, i);
+               tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
+               tx_desc->lower.data =
+                       cpu_to_le32(txd_lower | buffer_info->length);
+               tx_desc->upper.data = cpu_to_le32(txd_upper);
+
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+       } while (--count > 0);
+
+       tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
+
+       /*
+        * Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64).
+        */
+       wmb();
+
+       tx_ring->next_to_use = i;
+       writel(i, adapter->hw.hw_addr + tx_ring->tail);
+       /*
+        * we need this if more than one processor can write to our tail
+        * at a time, it synchronizes IO on IA64/Altix systems
+        */
+       mmiowb();
+}
+
+#define MINIMUM_DHCP_PACKET_SIZE 282
+static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
+                                   struct sk_buff *skb)
+{
+       struct e1000_hw *hw =  &adapter->hw;
+       u16 length, offset;
+
+       if (vlan_tx_tag_present(skb)) {
+               if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) &&
+                   (adapter->hw.mng_cookie.status &
+                       E1000_MNG_DHCP_COOKIE_STATUS_VLAN)))
+                       return 0;
+       }
+
+       if (skb->len <= MINIMUM_DHCP_PACKET_SIZE)
+               return 0;
+
+       if (((struct ethhdr *) skb->data)->h_proto != htons(ETH_P_IP))
+               return 0;
+
+       {
+               const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data+14);
+               struct udphdr *udp;
+
+               if (ip->protocol != IPPROTO_UDP)
+                       return 0;
+
+               udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2));
+               if (ntohs(udp->dest) != 67)
+                       return 0;
+
+               offset = (u8 *)udp + 8 - skb->data;
+               length = skb->len - offset;
+               return e1000e_mng_write_dhcp_info(hw, (u8 *)udp + 8, length);
+       }
+
+       return 0;
+}
+
+static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       netif_stop_queue(netdev);
+       /*
+        * Herbert's original patch had:
+        *  smp_mb__after_netif_stop_queue();
+        * but since that doesn't exist yet, just open code it.
+        */
+       smp_mb();
+
+       /*
+        * We need to check again in a case another CPU has just
+        * made room available.
+        */
+       if (e1000_desc_unused(adapter->tx_ring) < size)
+               return -EBUSY;
+
+       /* A reprieve! */
+       netif_start_queue(netdev);
+       ++adapter->restart_queue;
+       return 0;
+}
+
+static int e1000_maybe_stop_tx(struct net_device *netdev, int size)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (e1000_desc_unused(adapter->tx_ring) >= size)
+               return 0;
+       return __e1000_maybe_stop_tx(netdev, size);
+}
+
+#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
+static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
+                                   struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_ring *tx_ring = adapter->tx_ring;
+       unsigned int first;
+       unsigned int max_per_txd = E1000_MAX_PER_TXD;
+       unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
+       unsigned int tx_flags = 0;
+       unsigned int len = skb_headlen(skb);
+       unsigned int nr_frags;
+       unsigned int mss;
+       int count = 0;
+       int tso;
+       unsigned int f;
+
+       if (test_bit(__E1000_DOWN, &adapter->state)) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (skb->len <= 0) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       mss = skb_shinfo(skb)->gso_size;
+       /*
+        * The controller does a simple calculation to
+        * make sure there is enough room in the FIFO before
+        * initiating the DMA for each buffer.  The calc is:
+        * 4 = ceil(buffer len/mss).  To make sure we don't
+        * overrun the FIFO, adjust the max buffer len if mss
+        * drops.
+        */
+       if (mss) {
+               u8 hdr_len;
+               max_per_txd = min(mss << 2, max_per_txd);
+               max_txd_pwr = fls(max_per_txd) - 1;
+
+               /*
+                * TSO Workaround for 82571/2/3 Controllers -- if skb->data
+                * points to just header, pull a few bytes of payload from
+                * frags into skb->data
+                */
+               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+               /*
+                * we do this workaround for ES2LAN, but it is un-necessary,
+                * avoiding it could save a lot of cycles
+                */
+               if (skb->data_len && (hdr_len == len)) {
+                       unsigned int pull_size;
+
+                       pull_size = min((unsigned int)4, skb->data_len);
+                       if (!__pskb_pull_tail(skb, pull_size)) {
+                               e_err("__pskb_pull_tail failed.\n");
+                               dev_kfree_skb_any(skb);
+                               return NETDEV_TX_OK;
+                       }
+                       len = skb_headlen(skb);
+               }
+       }
+
+       /* reserve a descriptor for the offload context */
+       if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
+               count++;
+       count++;
+
+       count += TXD_USE_COUNT(len, max_txd_pwr);
+
+       nr_frags = skb_shinfo(skb)->nr_frags;
+       for (f = 0; f < nr_frags; f++)
+               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
+                                      max_txd_pwr);
+
+       if (adapter->hw.mac.tx_pkt_filtering)
+               e1000_transfer_dhcp_info(adapter, skb);
+
+       /*
+        * need: count + 2 desc gap to keep tail from touching
+        * head, otherwise try next time
+        */
+       if (e1000_maybe_stop_tx(netdev, count + 2))
+               return NETDEV_TX_BUSY;
+
+       if (vlan_tx_tag_present(skb)) {
+               tx_flags |= E1000_TX_FLAGS_VLAN;
+               tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
+       }
+
+       first = tx_ring->next_to_use;
+
+       tso = e1000_tso(adapter, skb);
+       if (tso < 0) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (tso)
+               tx_flags |= E1000_TX_FLAGS_TSO;
+       else if (e1000_tx_csum(adapter, skb))
+               tx_flags |= E1000_TX_FLAGS_CSUM;
+
+       /*
+        * Old method was to assume IPv4 packet by default if TSO was enabled.
+        * 82571 hardware supports TSO capabilities for IPv6 as well...
+        * no longer assume, we must.
+        */
+       if (skb->protocol == htons(ETH_P_IP))
+               tx_flags |= E1000_TX_FLAGS_IPV4;
+
+       /* if count is 0 then mapping error has occurred */
+       count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss);
+       if (count) {
+               e1000_tx_queue(adapter, tx_flags, count);
+               /* Make sure there is space in the ring for the next send. */
+               e1000_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 2);
+
+       } else {
+               dev_kfree_skb_any(skb);
+               tx_ring->buffer_info[first].time_stamp = 0;
+               tx_ring->next_to_use = first;
+       }
+
+       return NETDEV_TX_OK;
+}
+
+/**
+ * e1000_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+static void e1000_tx_timeout(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       /* Do the reset outside of interrupt context */
+       adapter->tx_timeout_count++;
+       schedule_work(&adapter->reset_task);
+}
+
+static void e1000_reset_task(struct work_struct *work)
+{
+       struct e1000_adapter *adapter;
+       adapter = container_of(work, struct e1000_adapter, reset_task);
+
+       /* don't run the task if already down */
+       if (test_bit(__E1000_DOWN, &adapter->state))
+               return;
+
+       if (!((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
+             (adapter->flags & FLAG_RX_RESTART_NOW))) {
+               e1000e_dump(adapter);
+               e_err("Reset adapter\n");
+       }
+       e1000e_reinit_locked(adapter);
+}
+
+/**
+ * e1000_get_stats64 - Get System Network Statistics
+ * @netdev: network interface device structure
+ * @stats: rtnl_link_stats64 pointer
+ *
+ * Returns the address of the device statistics structure.
+ **/
+struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
+                                             struct rtnl_link_stats64 *stats)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       memset(stats, 0, sizeof(struct rtnl_link_stats64));
+       spin_lock(&adapter->stats64_lock);
+       e1000e_update_stats(adapter);
+       /* Fill out the OS statistics structure */
+       stats->rx_bytes = adapter->stats.gorc;
+       stats->rx_packets = adapter->stats.gprc;
+       stats->tx_bytes = adapter->stats.gotc;
+       stats->tx_packets = adapter->stats.gptc;
+       stats->multicast = adapter->stats.mprc;
+       stats->collisions = adapter->stats.colc;
+
+       /* Rx Errors */
+
+       /*
+        * RLEC on some newer hardware can be incorrect so build
+        * our own version based on RUC and ROC
+        */
+       stats->rx_errors = adapter->stats.rxerrc +
+               adapter->stats.crcerrs + adapter->stats.algnerrc +
+               adapter->stats.ruc + adapter->stats.roc +
+               adapter->stats.cexterr;
+       stats->rx_length_errors = adapter->stats.ruc +
+                                             adapter->stats.roc;
+       stats->rx_crc_errors = adapter->stats.crcerrs;
+       stats->rx_frame_errors = adapter->stats.algnerrc;
+       stats->rx_missed_errors = adapter->stats.mpc;
+
+       /* Tx Errors */
+       stats->tx_errors = adapter->stats.ecol +
+                                      adapter->stats.latecol;
+       stats->tx_aborted_errors = adapter->stats.ecol;
+       stats->tx_window_errors = adapter->stats.latecol;
+       stats->tx_carrier_errors = adapter->stats.tncrs;
+
+       /* Tx Dropped needs to be maintained elsewhere */
+
+       spin_unlock(&adapter->stats64_lock);
+       return stats;
+}
+
+/**
+ * e1000_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+
+       /* Jumbo frame support */
+       if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
+           !(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
+               e_err("Jumbo Frames not supported.\n");
+               return -EINVAL;
+       }
+
+       /* Supported frame sizes */
+       if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) ||
+           (max_frame > adapter->max_hw_frame_size)) {
+               e_err("Unsupported MTU setting\n");
+               return -EINVAL;
+       }
+
+       /* Jumbo frame workaround on 82579 requires CRC be stripped */
+       if ((adapter->hw.mac.type == e1000_pch2lan) &&
+           !(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
+           (new_mtu > ETH_DATA_LEN)) {
+               e_err("Jumbo Frames not supported on 82579 when CRC "
+                     "stripping is disabled.\n");
+               return -EINVAL;
+       }
+
+       /* 82573 Errata 17 */
+       if (((adapter->hw.mac.type == e1000_82573) ||
+            (adapter->hw.mac.type == e1000_82574)) &&
+           (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN)) {
+               adapter->flags2 |= FLAG2_DISABLE_ASPM_L1;
+               e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L1);
+       }
+
+       while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
+               usleep_range(1000, 2000);
+       /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */
+       adapter->max_frame_size = max_frame;
+       e_info("changing MTU from %d to %d\n", netdev->mtu, new_mtu);
+       netdev->mtu = new_mtu;
+       if (netif_running(netdev))
+               e1000e_down(adapter);
+
+       /*
+        * NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
+        * means we reserve 2 more, this pushes us to allocate from the next
+        * larger slab size.
+        * i.e. RXBUFFER_2048 --> size-4096 slab
+        * However with the new *_jumbo_rx* routines, jumbo receives will use
+        * fragmented skbs
+        */
+
+       if (max_frame <= 2048)
+               adapter->rx_buffer_len = 2048;
+       else
+               adapter->rx_buffer_len = 4096;
+
+       /* adjust allocation if LPE protects us, and we aren't using SBP */
+       if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||
+            (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
+               adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN
+                                        + ETH_FCS_LEN;
+
+       if (netif_running(netdev))
+               e1000e_up(adapter);
+       else
+               e1000e_reset(adapter);
+
+       clear_bit(__E1000_RESETTING, &adapter->state);
+
+       return 0;
+}
+
+static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
+                          int cmd)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct mii_ioctl_data *data = if_mii(ifr);
+
+       if (adapter->hw.phy.media_type != e1000_media_type_copper)
+               return -EOPNOTSUPP;
+
+       switch (cmd) {
+       case SIOCGMIIPHY:
+               data->phy_id = adapter->hw.phy.addr;
+               break;
+       case SIOCGMIIREG:
+               e1000_phy_read_status(adapter);
+
+               switch (data->reg_num & 0x1F) {
+               case MII_BMCR:
+                       data->val_out = adapter->phy_regs.bmcr;
+                       break;
+               case MII_BMSR:
+                       data->val_out = adapter->phy_regs.bmsr;
+                       break;
+               case MII_PHYSID1:
+                       data->val_out = (adapter->hw.phy.id >> 16);
+                       break;
+               case MII_PHYSID2:
+                       data->val_out = (adapter->hw.phy.id & 0xFFFF);
+                       break;
+               case MII_ADVERTISE:
+                       data->val_out = adapter->phy_regs.advertise;
+                       break;
+               case MII_LPA:
+                       data->val_out = adapter->phy_regs.lpa;
+                       break;
+               case MII_EXPANSION:
+                       data->val_out = adapter->phy_regs.expansion;
+                       break;
+               case MII_CTRL1000:
+                       data->val_out = adapter->phy_regs.ctrl1000;
+                       break;
+               case MII_STAT1000:
+                       data->val_out = adapter->phy_regs.stat1000;
+                       break;
+               case MII_ESTATUS:
+                       data->val_out = adapter->phy_regs.estatus;
+                       break;
+               default:
+                       return -EIO;
+               }
+               break;
+       case SIOCSMIIREG:
+       default:
+               return -EOPNOTSUPP;
+       }
+       return 0;
+}
+
+static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+       switch (cmd) {
+       case SIOCGMIIPHY:
+       case SIOCGMIIREG:
+       case SIOCSMIIREG:
+               return e1000_mii_ioctl(netdev, ifr, cmd);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 i, mac_reg;
+       u16 phy_reg, wuc_enable;
+       int retval = 0;
+
+       /* copy MAC RARs to PHY RARs */
+       e1000_copy_rx_addrs_to_phy_ich8lan(hw);
+
+       retval = hw->phy.ops.acquire(hw);
+       if (retval) {
+               e_err("Could not acquire PHY\n");
+               return retval;
+       }
+
+       /* Enable access to wakeup registers on and set page to BM_WUC_PAGE */
+       retval = e1000_enable_phy_wakeup_reg_access_bm(hw, &wuc_enable);
+       if (retval)
+               goto out;
+
+       /* copy MAC MTA to PHY MTA - only needed for pchlan */
+       for (i = 0; i < adapter->hw.mac.mta_reg_count; i++) {
+               mac_reg = E1000_READ_REG_ARRAY(hw, E1000_MTA, i);
+               hw->phy.ops.write_reg_page(hw, BM_MTA(i),
+                                          (u16)(mac_reg & 0xFFFF));
+               hw->phy.ops.write_reg_page(hw, BM_MTA(i) + 1,
+                                          (u16)((mac_reg >> 16) & 0xFFFF));
+       }
+
+       /* configure PHY Rx Control register */
+       hw->phy.ops.read_reg_page(&adapter->hw, BM_RCTL, &phy_reg);
+       mac_reg = er32(RCTL);
+       if (mac_reg & E1000_RCTL_UPE)
+               phy_reg |= BM_RCTL_UPE;
+       if (mac_reg & E1000_RCTL_MPE)
+               phy_reg |= BM_RCTL_MPE;
+       phy_reg &= ~(BM_RCTL_MO_MASK);
+       if (mac_reg & E1000_RCTL_MO_3)
+               phy_reg |= (((mac_reg & E1000_RCTL_MO_3) >> E1000_RCTL_MO_SHIFT)
+                               << BM_RCTL_MO_SHIFT);
+       if (mac_reg & E1000_RCTL_BAM)
+               phy_reg |= BM_RCTL_BAM;
+       if (mac_reg & E1000_RCTL_PMCF)
+               phy_reg |= BM_RCTL_PMCF;
+       mac_reg = er32(CTRL);
+       if (mac_reg & E1000_CTRL_RFCE)
+               phy_reg |= BM_RCTL_RFCE;
+       hw->phy.ops.write_reg_page(&adapter->hw, BM_RCTL, phy_reg);
+
+       /* enable PHY wakeup in MAC register */
+       ew32(WUFC, wufc);
+       ew32(WUC, E1000_WUC_PHY_WAKE | E1000_WUC_PME_EN);
+
+       /* configure and enable PHY wakeup in PHY registers */
+       hw->phy.ops.write_reg_page(&adapter->hw, BM_WUFC, wufc);
+       hw->phy.ops.write_reg_page(&adapter->hw, BM_WUC, E1000_WUC_PME_EN);
+
+       /* activate PHY wakeup */
+       wuc_enable |= BM_WUC_ENABLE_BIT | BM_WUC_HOST_WU_BIT;
+       retval = e1000_disable_phy_wakeup_reg_access_bm(hw, &wuc_enable);
+       if (retval)
+               e_err("Could not set PHY Host Wakeup bit\n");
+out:
+       hw->phy.ops.release(hw);
+
+       return retval;
+}
+
+static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
+                           bool runtime)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl, ctrl_ext, rctl, status;
+       /* Runtime suspend should only enable wakeup for link changes */
+       u32 wufc = runtime ? E1000_WUFC_LNKC : adapter->wol;
+       int retval = 0;
+
+       netif_device_detach(netdev);
+
+       if (netif_running(netdev)) {
+               WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
+               e1000e_down(adapter);
+               e1000_free_irq(adapter);
+       }
+       e1000e_reset_interrupt_capability(adapter);
+
+       retval = pci_save_state(pdev);
+       if (retval)
+               return retval;
+
+       status = er32(STATUS);
+       if (status & E1000_STATUS_LU)
+               wufc &= ~E1000_WUFC_LNKC;
+
+       if (wufc) {
+               e1000_setup_rctl(adapter);
+               e1000_set_multi(netdev);
+
+               /* turn on all-multi mode if wake on multicast is enabled */
+               if (wufc & E1000_WUFC_MC) {
+                       rctl = er32(RCTL);
+                       rctl |= E1000_RCTL_MPE;
+                       ew32(RCTL, rctl);
+               }
+
+               ctrl = er32(CTRL);
+               /* advertise wake from D3Cold */
+               #define E1000_CTRL_ADVD3WUC 0x00100000
+               /* phy power management enable */
+               #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
+               ctrl |= E1000_CTRL_ADVD3WUC;
+               if (!(adapter->flags2 & FLAG2_HAS_PHY_WAKEUP))
+                       ctrl |= E1000_CTRL_EN_PHY_PWR_MGMT;
+               ew32(CTRL, ctrl);
+
+               if (adapter->hw.phy.media_type == e1000_media_type_fiber ||
+                   adapter->hw.phy.media_type ==
+                   e1000_media_type_internal_serdes) {
+                       /* keep the laser running in D3 */
+                       ctrl_ext = er32(CTRL_EXT);
+                       ctrl_ext |= E1000_CTRL_EXT_SDP3_DATA;
+                       ew32(CTRL_EXT, ctrl_ext);
+               }
+
+               if (adapter->flags & FLAG_IS_ICH)
+                       e1000_suspend_workarounds_ich8lan(&adapter->hw);
+
+               /* Allow time for pending master requests to run */
+               e1000e_disable_pcie_master(&adapter->hw);
+
+               if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) {
+                       /* enable wakeup by the PHY */
+                       retval = e1000_init_phy_wakeup(adapter, wufc);
+                       if (retval)
+                               return retval;
+               } else {
+                       /* enable wakeup by the MAC */
+                       ew32(WUFC, wufc);
+                       ew32(WUC, E1000_WUC_PME_EN);
+               }
+       } else {
+               ew32(WUC, 0);
+               ew32(WUFC, 0);
+       }
+
+       *enable_wake = !!wufc;
+
+       /* make sure adapter isn't asleep if manageability is enabled */
+       if ((adapter->flags & FLAG_MNG_PT_ENABLED) ||
+           (hw->mac.ops.check_mng_mode(hw)))
+               *enable_wake = true;
+
+       if (adapter->hw.phy.type == e1000_phy_igp_3)
+               e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
+
+       /*
+        * Release control of h/w to f/w.  If f/w is AMT enabled, this
+        * would have already happened in close and is redundant.
+        */
+       e1000e_release_hw_control(adapter);
+
+       pci_disable_device(pdev);
+
+       return 0;
+}
+
+static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake)
+{
+       if (sleep && wake) {
+               pci_prepare_to_sleep(pdev);
+               return;
+       }
+
+       pci_wake_from_d3(pdev, wake);
+       pci_set_power_state(pdev, PCI_D3hot);
+}
+
+static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
+                                    bool wake)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       /*
+        * The pci-e switch on some quad port adapters will report a
+        * correctable error when the MAC transitions from D0 to D3.  To
+        * prevent this we need to mask off the correctable errors on the
+        * downstream port of the pci-e switch.
+        */
+       if (adapter->flags & FLAG_IS_QUAD_PORT) {
+               struct pci_dev *us_dev = pdev->bus->self;
+               int pos = pci_pcie_cap(us_dev);
+               u16 devctl;
+
+               pci_read_config_word(us_dev, pos + PCI_EXP_DEVCTL, &devctl);
+               pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL,
+                                     (devctl & ~PCI_EXP_DEVCTL_CERE));
+
+               e1000_power_off(pdev, sleep, wake);
+
+               pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL, devctl);
+       } else {
+               e1000_power_off(pdev, sleep, wake);
+       }
+}
+
+#ifdef CONFIG_PCIEASPM
+static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
+{
+       pci_disable_link_state_locked(pdev, state);
+}
+#else
+static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
+{
+       int pos;
+       u16 reg16;
+
+       /*
+        * Both device and parent should have the same ASPM setting.
+        * Disable ASPM in downstream component first and then upstream.
+        */
+       pos = pci_pcie_cap(pdev);
+       pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &reg16);
+       reg16 &= ~state;
+       pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);
+
+       if (!pdev->bus->self)
+               return;
+
+       pos = pci_pcie_cap(pdev->bus->self);
+       pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, &reg16);
+       reg16 &= ~state;
+       pci_write_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, reg16);
+}
+#endif
+static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
+{
+       dev_info(&pdev->dev, "Disabling ASPM %s %s\n",
+                (state & PCIE_LINK_STATE_L0S) ? "L0s" : "",
+                (state & PCIE_LINK_STATE_L1) ? "L1" : "");
+
+       __e1000e_disable_aspm(pdev, state);
+}
+
+#ifdef CONFIG_PM
+static bool e1000e_pm_ready(struct e1000_adapter *adapter)
+{
+       return !!adapter->tx_ring->buffer_info;
+}
+
+static int __e1000_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 aspm_disable_flag = 0;
+       u32 err;
+
+       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L0S)
+               aspm_disable_flag = PCIE_LINK_STATE_L0S;
+       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1)
+               aspm_disable_flag |= PCIE_LINK_STATE_L1;
+       if (aspm_disable_flag)
+               e1000e_disable_aspm(pdev, aspm_disable_flag);
+
+       pci_set_power_state(pdev, PCI_D0);
+       pci_restore_state(pdev);
+       pci_save_state(pdev);
+
+       e1000e_set_interrupt_capability(adapter);
+       if (netif_running(netdev)) {
+               err = e1000_request_irq(adapter);
+               if (err)
+                       return err;
+       }
+
+       if (hw->mac.type == e1000_pch2lan)
+               e1000_resume_workarounds_pchlan(&adapter->hw);
+
+       e1000e_power_up_phy(adapter);
+
+       /* report the system wakeup cause from S3/S4 */
+       if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) {
+               u16 phy_data;
+
+               e1e_rphy(&adapter->hw, BM_WUS, &phy_data);
+               if (phy_data) {
+                       e_info("PHY Wakeup cause - %s\n",
+                               phy_data & E1000_WUS_EX ? "Unicast Packet" :
+                               phy_data & E1000_WUS_MC ? "Multicast Packet" :
+                               phy_data & E1000_WUS_BC ? "Broadcast Packet" :
+                               phy_data & E1000_WUS_MAG ? "Magic Packet" :
+                               phy_data & E1000_WUS_LNKC ? "Link Status "
+                               " Change" : "other");
+               }
+               e1e_wphy(&adapter->hw, BM_WUS, ~0);
+       } else {
+               u32 wus = er32(WUS);
+               if (wus) {
+                       e_info("MAC Wakeup cause - %s\n",
+                               wus & E1000_WUS_EX ? "Unicast Packet" :
+                               wus & E1000_WUS_MC ? "Multicast Packet" :
+                               wus & E1000_WUS_BC ? "Broadcast Packet" :
+                               wus & E1000_WUS_MAG ? "Magic Packet" :
+                               wus & E1000_WUS_LNKC ? "Link Status Change" :
+                               "other");
+               }
+               ew32(WUS, ~0);
+       }
+
+       e1000e_reset(adapter);
+
+       e1000_init_manageability_pt(adapter);
+
+       if (netif_running(netdev))
+               e1000e_up(adapter);
+
+       netif_device_attach(netdev);
+
+       /*
+        * If the controller has AMT, do not set DRV_LOAD until the interface
+        * is up.  For all other cases, let the f/w know that the h/w is now
+        * under the control of the driver.
+        */
+       if (!(adapter->flags & FLAG_HAS_AMT))
+               e1000e_get_hw_control(adapter);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int e1000_suspend(struct device *dev)
+{
+       struct pci_dev *pdev = to_pci_dev(dev);
+       int retval;
+       bool wake;
+
+       retval = __e1000_shutdown(pdev, &wake, false);
+       if (!retval)
+               e1000_complete_shutdown(pdev, true, wake);
+
+       return retval;
+}
+
+static int e1000_resume(struct device *dev)
+{
+       struct pci_dev *pdev = to_pci_dev(dev);
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (e1000e_pm_ready(adapter))
+               adapter->idle_check = true;
+
+       return __e1000_resume(pdev);
+}
+#endif /* CONFIG_PM_SLEEP */
+
+#ifdef CONFIG_PM_RUNTIME
+static int e1000_runtime_suspend(struct device *dev)
+{
+       struct pci_dev *pdev = to_pci_dev(dev);
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (e1000e_pm_ready(adapter)) {
+               bool wake;
+
+               __e1000_shutdown(pdev, &wake, true);
+       }
+
+       return 0;
+}
+
+static int e1000_idle(struct device *dev)
+{
+       struct pci_dev *pdev = to_pci_dev(dev);
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (!e1000e_pm_ready(adapter))
+               return 0;
+
+       if (adapter->idle_check) {
+               adapter->idle_check = false;
+               if (!e1000e_has_link(adapter))
+                       pm_schedule_suspend(dev, MSEC_PER_SEC);
+       }
+
+       return -EBUSY;
+}
+
+static int e1000_runtime_resume(struct device *dev)
+{
+       struct pci_dev *pdev = to_pci_dev(dev);
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (!e1000e_pm_ready(adapter))
+               return 0;
+
+       adapter->idle_check = !dev->power.runtime_auto;
+       return __e1000_resume(pdev);
+}
+#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
+
+static void e1000_shutdown(struct pci_dev *pdev)
+{
+       bool wake = false;
+
+       __e1000_shutdown(pdev, &wake, false);
+
+       if (system_state == SYSTEM_POWER_OFF)
+               e1000_complete_shutdown(pdev, false, wake);
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+
+static irqreturn_t e1000_intr_msix(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       if (adapter->msix_entries) {
+               int vector, msix_irq;
+
+               vector = 0;
+               msix_irq = adapter->msix_entries[vector].vector;
+               disable_irq(msix_irq);
+               e1000_intr_msix_rx(msix_irq, netdev);
+               enable_irq(msix_irq);
+
+               vector++;
+               msix_irq = adapter->msix_entries[vector].vector;
+               disable_irq(msix_irq);
+               e1000_intr_msix_tx(msix_irq, netdev);
+               enable_irq(msix_irq);
+
+               vector++;
+               msix_irq = adapter->msix_entries[vector].vector;
+               disable_irq(msix_irq);
+               e1000_msix_other(msix_irq, netdev);
+               enable_irq(msix_irq);
+       }
+
+       return IRQ_HANDLED;
+}
+
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void e1000_netpoll(struct net_device *netdev)
+{
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       switch (adapter->int_mode) {
+       case E1000E_INT_MODE_MSIX:
+               e1000_intr_msix(adapter->pdev->irq, netdev);
+               break;
+       case E1000E_INT_MODE_MSI:
+               disable_irq(adapter->pdev->irq);
+               e1000_intr_msi(adapter->pdev->irq, netdev);
+               enable_irq(adapter->pdev->irq);
+               break;
+       default: /* E1000E_INT_MODE_LEGACY */
+               disable_irq(adapter->pdev->irq);
+               e1000_intr(adapter->pdev->irq, netdev);
+               enable_irq(adapter->pdev->irq);
+               break;
+       }
+}
+#endif
+
+/**
+ * e1000_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci connection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
+                                               pci_channel_state_t state)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       netif_device_detach(netdev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       if (netif_running(netdev))
+               e1000e_down(adapter);
+       pci_disable_device(pdev);
+
+       /* Request a slot slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * e1000_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot. Implementation
+ * resembles the first-half of the e1000_resume routine.
+ */
+static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 aspm_disable_flag = 0;
+       int err;
+       pci_ers_result_t result;
+
+       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L0S)
+               aspm_disable_flag = PCIE_LINK_STATE_L0S;
+       if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1)
+               aspm_disable_flag |= PCIE_LINK_STATE_L1;
+       if (aspm_disable_flag)
+               e1000e_disable_aspm(pdev, aspm_disable_flag);
+
+       err = pci_enable_device_mem(pdev);
+       if (err) {
+               dev_err(&pdev->dev,
+                       "Cannot re-enable PCI device after reset.\n");
+               result = PCI_ERS_RESULT_DISCONNECT;
+       } else {
+               pci_set_master(pdev);
+               pdev->state_saved = true;
+               pci_restore_state(pdev);
+
+               pci_enable_wake(pdev, PCI_D3hot, 0);
+               pci_enable_wake(pdev, PCI_D3cold, 0);
+
+               e1000e_reset(adapter);
+               ew32(WUS, ~0);
+               result = PCI_ERS_RESULT_RECOVERED;
+       }
+
+       pci_cleanup_aer_uncorrect_error_status(pdev);
+
+       return result;
+}
+
+/**
+ * e1000_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation. Implementation resembles the
+ * second-half of the e1000_resume routine.
+ */
+static void e1000_io_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+
+       e1000_init_manageability_pt(adapter);
+
+       if (netif_running(netdev)) {
+               if (e1000e_up(adapter)) {
+                       dev_err(&pdev->dev,
+                               "can't bring device back up after reset\n");
+                       return;
+               }
+       }
+
+       netif_device_attach(netdev);
+
+       /*
+        * If the controller has AMT, do not set DRV_LOAD until the interface
+        * is up.  For all other cases, let the f/w know that the h/w is now
+        * under the control of the driver.
+        */
+       if (!(adapter->flags & FLAG_HAS_AMT))
+               e1000e_get_hw_control(adapter);
+
+}
+
+static void e1000_print_device_info(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u32 ret_val;
+       u8 pba_str[E1000_PBANUM_LENGTH];
+
+       /* print bus type/speed/width info */
+       e_info("(PCI Express:2.5GT/s:%s) %pM\n",
+              /* bus width */
+              ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
+               "Width x1"),
+              /* MAC address */
+              netdev->dev_addr);
+       e_info("Intel(R) PRO/%s Network Connection\n",
+              (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
+       ret_val = e1000_read_pba_string_generic(hw, pba_str,
+                                               E1000_PBANUM_LENGTH);
+       if (ret_val)
+               strncpy((char *)pba_str, "Unknown", sizeof(pba_str) - 1);
+       e_info("MAC: %d, PHY: %d, PBA No: %s\n",
+              hw->mac.type, hw->phy.type, pba_str);
+}
+
+static void e1000_eeprom_checks(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       int ret_val;
+       u16 buf = 0;
+
+       if (hw->mac.type != e1000_82573)
+               return;
+
+       ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf);
+       if (!ret_val && (!(le16_to_cpu(buf) & (1 << 0)))) {
+               /* Deep Smart Power Down (DSPD) */
+               dev_warn(&adapter->pdev->dev,
+                        "Warning: detected DSPD enabled in EEPROM\n");
+       }
+}
+
+static const struct net_device_ops e1000e_netdev_ops = {
+       .ndo_open               = e1000_open,
+       .ndo_stop               = e1000_close,
+       .ndo_start_xmit         = e1000_xmit_frame,
+       .ndo_get_stats64        = e1000e_get_stats64,
+       .ndo_set_multicast_list = e1000_set_multi,
+       .ndo_set_mac_address    = e1000_set_mac,
+       .ndo_change_mtu         = e1000_change_mtu,
+       .ndo_do_ioctl           = e1000_ioctl,
+       .ndo_tx_timeout         = e1000_tx_timeout,
+       .ndo_validate_addr      = eth_validate_addr,
+
+       .ndo_vlan_rx_add_vid    = e1000_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = e1000_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = e1000_netpoll,
+#endif
+};
+
+/**
+ * e1000_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in e1000_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * e1000_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+static int __devinit e1000_probe(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+       struct net_device *netdev;
+       struct e1000_adapter *adapter;
+       struct e1000_hw *hw;
+       const struct e1000_info *ei = e1000_info_tbl[ent->driver_data];
+       resource_size_t mmio_start, mmio_len;
+       resource_size_t flash_start, flash_len;
+
+       static int cards_found;
+       u16 aspm_disable_flag = 0;
+       int i, err, pci_using_dac;
+       u16 eeprom_data = 0;
+       u16 eeprom_apme_mask = E1000_EEPROM_APME;
+
+       if (ei->flags2 & FLAG2_DISABLE_ASPM_L0S)
+               aspm_disable_flag = PCIE_LINK_STATE_L0S;
+       if (ei->flags2 & FLAG2_DISABLE_ASPM_L1)
+               aspm_disable_flag |= PCIE_LINK_STATE_L1;
+       if (aspm_disable_flag)
+               e1000e_disable_aspm(pdev, aspm_disable_flag);
+
+       err = pci_enable_device_mem(pdev);
+       if (err)
+               return err;
+
+       pci_using_dac = 0;
+       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+       if (!err) {
+               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+               if (!err)
+                       pci_using_dac = 1;
+       } else {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               if (err) {
+                       err = dma_set_coherent_mask(&pdev->dev,
+                                                   DMA_BIT_MASK(32));
+                       if (err) {
+                               dev_err(&pdev->dev, "No usable DMA "
+                                       "configuration, aborting\n");
+                               goto err_dma;
+                       }
+               }
+       }
+
+       err = pci_request_selected_regions_exclusive(pdev,
+                                         pci_select_bars(pdev, IORESOURCE_MEM),
+                                         e1000e_driver_name);
+       if (err)
+               goto err_pci_reg;
+
+       /* AER (Advanced Error Reporting) hooks */
+       pci_enable_pcie_error_reporting(pdev);
+
+       pci_set_master(pdev);
+       /* PCI config space info */
+       err = pci_save_state(pdev);
+       if (err)
+               goto err_alloc_etherdev;
+
+       err = -ENOMEM;
+       netdev = alloc_etherdev(sizeof(struct e1000_adapter));
+       if (!netdev)
+               goto err_alloc_etherdev;
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       netdev->irq = pdev->irq;
+
+       pci_set_drvdata(pdev, netdev);
+       adapter = netdev_priv(netdev);
+       hw = &adapter->hw;
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+       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 = ei->max_hw_frame_size;
+       adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
+
+       mmio_start = pci_resource_start(pdev, 0);
+       mmio_len = pci_resource_len(pdev, 0);
+
+       err = -EIO;
+       adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
+       if (!adapter->hw.hw_addr)
+               goto err_ioremap;
+
+       if ((adapter->flags & FLAG_HAS_FLASH) &&
+           (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
+               flash_start = pci_resource_start(pdev, 1);
+               flash_len = pci_resource_len(pdev, 1);
+               adapter->hw.flash_address = ioremap(flash_start, flash_len);
+               if (!adapter->hw.flash_address)
+                       goto err_flashmap;
+       }
+
+       /* construct the net_device struct */
+       netdev->netdev_ops              = &e1000e_netdev_ops;
+       e1000e_set_ethtool_ops(netdev);
+       netdev->watchdog_timeo          = 5 * HZ;
+       netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
+       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+
+       netdev->mem_start = mmio_start;
+       netdev->mem_end = mmio_start + mmio_len;
+
+       adapter->bd_number = cards_found++;
+
+       e1000e_check_options(adapter);
+
+       /* setup adapter struct */
+       err = e1000_sw_init(adapter);
+       if (err)
+               goto err_sw_init;
+
+       memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
+       memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
+       memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
+
+       err = ei->get_variants(adapter);
+       if (err)
+               goto err_hw_init;
+
+       if ((adapter->flags & FLAG_IS_ICH) &&
+           (adapter->flags & FLAG_READ_ONLY_NVM))
+               e1000e_write_protect_nvm_ich8lan(&adapter->hw);
+
+       hw->mac.ops.get_bus_info(&adapter->hw);
+
+       adapter->hw.phy.autoneg_wait_to_complete = 0;
+
+       /* 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;
+       }
+
+       if (e1000_check_reset_block(&adapter->hw))
+               e_info("PHY reset is blocked due to SOL/IDER session.\n");
+
+       netdev->features = NETIF_F_SG |
+                          NETIF_F_HW_CSUM |
+                          NETIF_F_HW_VLAN_TX |
+                          NETIF_F_HW_VLAN_RX;
+
+       if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
+               netdev->features |= NETIF_F_HW_VLAN_FILTER;
+
+       netdev->features |= NETIF_F_TSO;
+       netdev->features |= NETIF_F_TSO6;
+
+       netdev->vlan_features |= NETIF_F_TSO;
+       netdev->vlan_features |= NETIF_F_TSO6;
+       netdev->vlan_features |= NETIF_F_HW_CSUM;
+       netdev->vlan_features |= NETIF_F_SG;
+
+       if (pci_using_dac) {
+               netdev->features |= NETIF_F_HIGHDMA;
+               netdev->vlan_features |= NETIF_F_HIGHDMA;
+       }
+
+       if (e1000e_enable_mng_pass_thru(&adapter->hw))
+               adapter->flags |= FLAG_MNG_PT_ENABLED;
+
+       /*
+        * 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 (e1000_validate_nvm_checksum(&adapter->hw) >= 0)
+                       break;
+               if (i == 2) {
+                       e_err("The NVM Checksum Is Not Valid\n");
+                       err = -EIO;
+                       goto err_eeprom;
+               }
+       }
+
+       e1000_eeprom_checks(adapter);
+
+       /* copy the MAC address */
+       if (e1000e_read_mac_addr(&adapter->hw))
+               e_err("NVM Read Error while reading MAC address\n");
+
+       memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
+       memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
+
+       if (!is_valid_ether_addr(netdev->perm_addr)) {
+               e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
+               err = -EIO;
+               goto err_eeprom;
+       }
+
+       init_timer(&adapter->watchdog_timer);
+       adapter->watchdog_timer.function = e1000_watchdog;
+       adapter->watchdog_timer.data = (unsigned long) adapter;
+
+       init_timer(&adapter->phy_info_timer);
+       adapter->phy_info_timer.function = e1000_update_phy_info;
+       adapter->phy_info_timer.data = (unsigned long) adapter;
+
+       INIT_WORK(&adapter->reset_task, e1000_reset_task);
+       INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
+       INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround);
+       INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task);
+       INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang);
+
+       /* Initialize link parameters. User can change them with ethtool */
+       adapter->hw.mac.autoneg = 1;
+       adapter->fc_autoneg = 1;
+       adapter->hw.fc.requested_mode = e1000_fc_default;
+       adapter->hw.fc.current_mode = e1000_fc_default;
+       adapter->hw.phy.autoneg_advertised = 0x2f;
+
+       /* ring size defaults */
+       adapter->rx_ring->count = 256;
+       adapter->tx_ring->count = 256;
+
+       /*
+        * Initial Wake on LAN setting - If APM wake is enabled in
+        * the EEPROM, enable the ACPI Magic Packet filter
+        */
+       if (adapter->flags & FLAG_APME_IN_WUC) {
+               /* APME bit in EEPROM is mapped to WUC.APME */
+               eeprom_data = er32(WUC);
+               eeprom_apme_mask = E1000_WUC_APME;
+               if ((hw->mac.type > e1000_ich10lan) &&
+                   (eeprom_data & E1000_WUC_PHY_WAKE))
+                       adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP;
+       } else if (adapter->flags & FLAG_APME_IN_CTRL3) {
+               if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
+                   (adapter->hw.bus.func == 1))
+                       e1000_read_nvm(&adapter->hw,
+                               NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
+               else
+                       e1000_read_nvm(&adapter->hw,
+                               NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
+       }
+
+       /* fetch WoL from EEPROM */
+       if (eeprom_data & eeprom_apme_mask)
+               adapter->eeprom_wol |= E1000_WUFC_MAG;
+
+       /*
+        * now that we have the eeprom settings, apply the special cases
+        * where the eeprom may be wrong or the board simply won't support
+        * wake on lan on a particular port
+        */
+       if (!(adapter->flags & FLAG_HAS_WOL))
+               adapter->eeprom_wol = 0;
+
+       /* initialize the wol settings based on the eeprom settings */
+       adapter->wol = adapter->eeprom_wol;
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       /* save off EEPROM version number */
+       e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);
+
+       /* reset the hardware with the new settings */
+       e1000e_reset(adapter);
+
+       /*
+        * If the controller has AMT, do not set DRV_LOAD until the interface
+        * is up.  For all other cases, let the f/w know that the h/w is now
+        * under the control of the driver.
+        */
+       if (!(adapter->flags & FLAG_HAS_AMT))
+               e1000e_get_hw_control(adapter);
+
+       strncpy(netdev->name, "eth%d", sizeof(netdev->name) - 1);
+       err = register_netdev(netdev);
+       if (err)
+               goto err_register;
+
+       /* carrier off reporting is important to ethtool even BEFORE open */
+       netif_carrier_off(netdev);
+
+       e1000_print_device_info(adapter);
+
+       if (pci_dev_run_wake(pdev))
+               pm_runtime_put_noidle(&pdev->dev);
+
+       return 0;
+
+err_register:
+       if (!(adapter->flags & FLAG_HAS_AMT))
+               e1000e_release_hw_control(adapter);
+err_eeprom:
+       if (!e1000_check_reset_block(&adapter->hw))
+               e1000_phy_hw_reset(&adapter->hw);
+err_hw_init:
+       kfree(adapter->tx_ring);
+       kfree(adapter->rx_ring);
+err_sw_init:
+       if (adapter->hw.flash_address)
+               iounmap(adapter->hw.flash_address);
+       e1000e_reset_interrupt_capability(adapter);
+err_flashmap:
+       iounmap(adapter->hw.hw_addr);
+err_ioremap:
+       free_netdev(netdev);
+err_alloc_etherdev:
+       pci_release_selected_regions(pdev,
+                                    pci_select_bars(pdev, IORESOURCE_MEM));
+err_pci_reg:
+err_dma:
+       pci_disable_device(pdev);
+       return err;
+}
+
+/**
+ * e1000_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * e1000_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+static void __devexit e1000_remove(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct e1000_adapter *adapter = netdev_priv(netdev);
+       bool down = test_bit(__E1000_DOWN, &adapter->state);
+
+       /*
+        * The timers may be rescheduled, so explicitly disable them
+        * from being rescheduled.
+        */
+       if (!down)
+               set_bit(__E1000_DOWN, &adapter->state);
+       del_timer_sync(&adapter->watchdog_timer);
+       del_timer_sync(&adapter->phy_info_timer);
+
+       cancel_work_sync(&adapter->reset_task);
+       cancel_work_sync(&adapter->watchdog_task);
+       cancel_work_sync(&adapter->downshift_task);
+       cancel_work_sync(&adapter->update_phy_task);
+       cancel_work_sync(&adapter->print_hang_task);
+
+       if (!(netdev->flags & IFF_UP))
+               e1000_power_down_phy(adapter);
+
+       /* Don't lie to e1000_close() down the road. */
+       if (!down)
+               clear_bit(__E1000_DOWN, &adapter->state);
+       unregister_netdev(netdev);
+
+       if (pci_dev_run_wake(pdev))
+               pm_runtime_get_noresume(&pdev->dev);
+
+       /*
+        * Release control of h/w to f/w.  If f/w is AMT enabled, this
+        * would have already happened in close and is redundant.
+        */
+       e1000e_release_hw_control(adapter);
+
+       e1000e_reset_interrupt_capability(adapter);
+       kfree(adapter->tx_ring);
+       kfree(adapter->rx_ring);
+
+       iounmap(adapter->hw.hw_addr);
+       if (adapter->hw.flash_address)
+               iounmap(adapter->hw.flash_address);
+       pci_release_selected_regions(pdev,
+                                    pci_select_bars(pdev, IORESOURCE_MEM));
+
+       free_netdev(netdev);
+
+       /* AER disable */
+       pci_disable_pcie_error_reporting(pdev);
+
+       pci_disable_device(pdev);
+}
+
+/* PCI Error Recovery (ERS) */
+static struct pci_error_handlers e1000_err_handler = {
+       .error_detected = e1000_io_error_detected,
+       .slot_reset = e1000_io_slot_reset,
+       .resume = e1000_io_resume,
+};
+
+static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_COPPER), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_FIBER), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER_LP), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_FIBER), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_DUAL), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_QUAD), board_82571 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82571PT_QUAD_COPPER), board_82571 },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI), board_82572 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_COPPER), board_82572 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_FIBER), board_82572 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_SERDES), board_82572 },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E), board_82573 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT), board_82573 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L), board_82573 },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82574L), board_82574 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82574LA), board_82574 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82583V), board_82583 },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_DPT),
+         board_80003es2lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),
+         board_80003es2lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_DPT),
+         board_80003es2lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_SPT),
+         board_80003es2lan },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE), board_ich8lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_G), board_ich8lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_GT), board_ich8lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_AMT), board_ich8lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_C), board_ich8lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M), board_ich8lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M_AMT), board_ich8lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_82567V_3), board_ich8lan },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_V), board_ich9lan },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM), board_ich10lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF), board_ich10lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_V), board_ich10lan },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LM), board_pchlan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LC), board_pchlan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DM), board_pchlan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DC), board_pchlan },
+
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
+
+       { }     /* terminate list */
+};
+MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
+
+#ifdef CONFIG_PM
+static const struct dev_pm_ops e1000_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
+       SET_RUNTIME_PM_OPS(e1000_runtime_suspend,
+                               e1000_runtime_resume, e1000_idle)
+};
+#endif
+
+/* PCI Device API Driver */
+static struct pci_driver e1000_driver = {
+       .name     = e1000e_driver_name,
+       .id_table = e1000_pci_tbl,
+       .probe    = e1000_probe,
+       .remove   = __devexit_p(e1000_remove),
+#ifdef CONFIG_PM
+       .driver.pm = &e1000_pm_ops,
+#endif
+       .shutdown = e1000_shutdown,
+       .err_handler = &e1000_err_handler
+};
+
+/**
+ * e1000_init_module - Driver Registration Routine
+ *
+ * e1000_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init e1000_init_module(void)
+{
+       int ret;
+       pr_info("Intel(R) PRO/1000 Network Driver - %s\n",
+               e1000e_driver_version);
+       pr_info("Copyright(c) 1999 - 2011 Intel Corporation.\n");
+       ret = pci_register_driver(&e1000_driver);
+
+       return ret;
+}
+module_init(e1000_init_module);
+
+/**
+ * e1000_exit_module - Driver Exit Cleanup Routine
+ *
+ * e1000_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+static void __exit e1000_exit_module(void)
+{
+       pci_unregister_driver(&e1000_driver);
+}
+module_exit(e1000_exit_module);
+
+
+MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
+MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+/* e1000_main.c */
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
new file mode 100644 (file)
index 0000000..4dd9b63
--- /dev/null
@@ -0,0 +1,478 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+
+#include "e1000.h"
+
+/*
+ * This is the only thing that needs to be changed to adjust the
+ * maximum number of ports that the driver can manage.
+ */
+
+#define E1000_MAX_NIC 32
+
+#define OPTION_UNSET   -1
+#define OPTION_DISABLED 0
+#define OPTION_ENABLED  1
+
+#define COPYBREAK_DEFAULT 256
+unsigned int copybreak = COPYBREAK_DEFAULT;
+module_param(copybreak, uint, 0644);
+MODULE_PARM_DESC(copybreak,
+       "Maximum size of packet that is copied to a new buffer on receive");
+
+/*
+ * All parameters are treated the same, as an integer array of values.
+ * This macro just reduces the need to repeat the same declaration code
+ * over and over (plus this helps to avoid typo bugs).
+ */
+
+#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
+#define E1000_PARAM(X, desc)                                   \
+       static int __devinitdata X[E1000_MAX_NIC+1]             \
+               = E1000_PARAM_INIT;                             \
+       static unsigned int num_##X;                            \
+       module_param_array_named(X, X, int, &num_##X, 0);       \
+       MODULE_PARM_DESC(X, desc);
+
+/*
+ * Transmit Interrupt Delay in units of 1.024 microseconds
+ * Tx interrupt delay needs to typically be set to something non-zero
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(TxIntDelay, "Transmit Interrupt Delay");
+#define DEFAULT_TIDV 8
+#define MAX_TXDELAY 0xFFFF
+#define MIN_TXDELAY 0
+
+/*
+ * Transmit Absolute Interrupt Delay in units of 1.024 microseconds
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(TxAbsIntDelay, "Transmit Absolute Interrupt Delay");
+#define DEFAULT_TADV 32
+#define MAX_TXABSDELAY 0xFFFF
+#define MIN_TXABSDELAY 0
+
+/*
+ * Receive Interrupt Delay in units of 1.024 microseconds
+ * hardware will likely hang if you set this to anything but zero.
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(RxIntDelay, "Receive Interrupt Delay");
+#define MAX_RXDELAY 0xFFFF
+#define MIN_RXDELAY 0
+
+/*
+ * Receive Absolute Interrupt Delay in units of 1.024 microseconds
+ *
+ * Valid Range: 0-65535
+ */
+E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
+#define MAX_RXABSDELAY 0xFFFF
+#define MIN_RXABSDELAY 0
+
+/*
+ * Interrupt Throttle Rate (interrupts/sec)
+ *
+ * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
+ */
+E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
+#define DEFAULT_ITR 3
+#define MAX_ITR 100000
+#define MIN_ITR 100
+
+/* IntMode (Interrupt Mode)
+ *
+ * Valid Range: 0 - 2
+ *
+ * Default Value: 2 (MSI-X)
+ */
+E1000_PARAM(IntMode, "Interrupt Mode");
+#define MAX_INTMODE    2
+#define MIN_INTMODE    0
+
+/*
+ * Enable Smart Power Down of the PHY
+ *
+ * Valid Range: 0, 1
+ *
+ * Default Value: 0 (disabled)
+ */
+E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
+
+/*
+ * Enable Kumeran Lock Loss workaround
+ *
+ * Valid Range: 0, 1
+ *
+ * Default Value: 1 (enabled)
+ */
+E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");
+
+/*
+ * Write Protect NVM
+ *
+ * Valid Range: 0, 1
+ *
+ * Default Value: 1 (enabled)
+ */
+E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
+
+/*
+ * Enable CRC Stripping
+ *
+ * Valid Range: 0, 1
+ *
+ * Default Value: 1 (enabled)
+ */
+E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
+                          "the CRC");
+
+struct e1000_option {
+       enum { enable_option, range_option, list_option } type;
+       const char *name;
+       const char *err;
+       int def;
+       union {
+               struct { /* range_option info */
+                       int min;
+                       int max;
+               } r;
+               struct { /* list_option info */
+                       int nr;
+                       struct e1000_opt_list { int i; char *str; } *p;
+               } l;
+       } arg;
+};
+
+static int __devinit e1000_validate_option(unsigned int *value,
+                                          const struct e1000_option *opt,
+                                          struct e1000_adapter *adapter)
+{
+       if (*value == OPTION_UNSET) {
+               *value = opt->def;
+               return 0;
+       }
+
+       switch (opt->type) {
+       case enable_option:
+               switch (*value) {
+               case OPTION_ENABLED:
+                       e_info("%s Enabled\n", opt->name);
+                       return 0;
+               case OPTION_DISABLED:
+                       e_info("%s Disabled\n", opt->name);
+                       return 0;
+               }
+               break;
+       case range_option:
+               if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
+                       e_info("%s set to %i\n", opt->name, *value);
+                       return 0;
+               }
+               break;
+       case list_option: {
+               int i;
+               struct e1000_opt_list *ent;
+
+               for (i = 0; i < opt->arg.l.nr; i++) {
+                       ent = &opt->arg.l.p[i];
+                       if (*value == ent->i) {
+                               if (ent->str[0] != '\0')
+                                       e_info("%s\n", ent->str);
+                               return 0;
+                       }
+               }
+       }
+               break;
+       default:
+               BUG();
+       }
+
+       e_info("Invalid %s value specified (%i) %s\n", opt->name, *value,
+              opt->err);
+       *value = opt->def;
+       return -1;
+}
+
+/**
+ * e1000e_check_options - Range Checking for Command Line Parameters
+ * @adapter: board private structure
+ *
+ * This routine checks all command line parameters for valid user
+ * input.  If an invalid value is given, or if no user specified
+ * value exists, a default value is used.  The final value is stored
+ * in a variable in the adapter structure.
+ **/
+void __devinit e1000e_check_options(struct e1000_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       int bd = adapter->bd_number;
+
+       if (bd >= E1000_MAX_NIC) {
+               e_notice("Warning: no configuration for board #%i\n", bd);
+               e_notice("Using defaults for all values\n");
+       }
+
+       { /* Transmit Interrupt Delay */
+               static const struct e1000_option opt = {
+                       .type = range_option,
+                       .name = "Transmit Interrupt Delay",
+                       .err  = "using default of "
+                               __MODULE_STRING(DEFAULT_TIDV),
+                       .def  = DEFAULT_TIDV,
+                       .arg  = { .r = { .min = MIN_TXDELAY,
+                                        .max = MAX_TXDELAY } }
+               };
+
+               if (num_TxIntDelay > bd) {
+                       adapter->tx_int_delay = TxIntDelay[bd];
+                       e1000_validate_option(&adapter->tx_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->tx_int_delay = opt.def;
+               }
+       }
+       { /* Transmit Absolute Interrupt Delay */
+               static const struct e1000_option opt = {
+                       .type = range_option,
+                       .name = "Transmit Absolute Interrupt Delay",
+                       .err  = "using default of "
+                               __MODULE_STRING(DEFAULT_TADV),
+                       .def  = DEFAULT_TADV,
+                       .arg  = { .r = { .min = MIN_TXABSDELAY,
+                                        .max = MAX_TXABSDELAY } }
+               };
+
+               if (num_TxAbsIntDelay > bd) {
+                       adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
+                       e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->tx_abs_int_delay = opt.def;
+               }
+       }
+       { /* Receive Interrupt Delay */
+               static struct e1000_option opt = {
+                       .type = range_option,
+                       .name = "Receive Interrupt Delay",
+                       .err  = "using default of "
+                               __MODULE_STRING(DEFAULT_RDTR),
+                       .def  = DEFAULT_RDTR,
+                       .arg  = { .r = { .min = MIN_RXDELAY,
+                                        .max = MAX_RXDELAY } }
+               };
+
+               if (num_RxIntDelay > bd) {
+                       adapter->rx_int_delay = RxIntDelay[bd];
+                       e1000_validate_option(&adapter->rx_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->rx_int_delay = opt.def;
+               }
+       }
+       { /* Receive Absolute Interrupt Delay */
+               static const struct e1000_option opt = {
+                       .type = range_option,
+                       .name = "Receive Absolute Interrupt Delay",
+                       .err  = "using default of "
+                               __MODULE_STRING(DEFAULT_RADV),
+                       .def  = DEFAULT_RADV,
+                       .arg  = { .r = { .min = MIN_RXABSDELAY,
+                                        .max = MAX_RXABSDELAY } }
+               };
+
+               if (num_RxAbsIntDelay > bd) {
+                       adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
+                       e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
+                                             adapter);
+               } else {
+                       adapter->rx_abs_int_delay = opt.def;
+               }
+       }
+       { /* Interrupt Throttling Rate */
+               static const struct e1000_option opt = {
+                       .type = range_option,
+                       .name = "Interrupt Throttling Rate (ints/sec)",
+                       .err  = "using default of "
+                               __MODULE_STRING(DEFAULT_ITR),
+                       .def  = DEFAULT_ITR,
+                       .arg  = { .r = { .min = MIN_ITR,
+                                        .max = MAX_ITR } }
+               };
+
+               if (num_InterruptThrottleRate > bd) {
+                       adapter->itr = InterruptThrottleRate[bd];
+                       switch (adapter->itr) {
+                       case 0:
+                               e_info("%s turned off\n", opt.name);
+                               break;
+                       case 1:
+                               e_info("%s set to dynamic mode\n", opt.name);
+                               adapter->itr_setting = adapter->itr;
+                               adapter->itr = 20000;
+                               break;
+                       case 3:
+                               e_info("%s set to dynamic conservative mode\n",
+                                       opt.name);
+                               adapter->itr_setting = adapter->itr;
+                               adapter->itr = 20000;
+                               break;
+                       case 4:
+                               e_info("%s set to simplified (2000-8000 ints) "
+                                      "mode\n", opt.name);
+                               adapter->itr_setting = 4;
+                               break;
+                       default:
+                               /*
+                                * Save the setting, because the dynamic bits
+                                * change itr.
+                                */
+                               if (e1000_validate_option(&adapter->itr, &opt,
+                                                         adapter) &&
+                                   (adapter->itr == 3)) {
+                                       /*
+                                        * In case of invalid user value,
+                                        * default to conservative mode.
+                                        */
+                                       adapter->itr_setting = adapter->itr;
+                                       adapter->itr = 20000;
+                               } else {
+                                       /*
+                                        * Clear the lower two bits because
+                                        * they are used as control.
+                                        */
+                                       adapter->itr_setting =
+                                               adapter->itr & ~3;
+                               }
+                               break;
+                       }
+               } else {
+                       adapter->itr_setting = opt.def;
+                       adapter->itr = 20000;
+               }
+       }
+       { /* Interrupt Mode */
+               static struct e1000_option opt = {
+                       .type = range_option,
+                       .name = "Interrupt Mode",
+                       .err  = "defaulting to 2 (MSI-X)",
+                       .def  = E1000E_INT_MODE_MSIX,
+                       .arg  = { .r = { .min = MIN_INTMODE,
+                                        .max = MAX_INTMODE } }
+               };
+
+               if (num_IntMode > bd) {
+                       unsigned int int_mode = IntMode[bd];
+                       e1000_validate_option(&int_mode, &opt, adapter);
+                       adapter->int_mode = int_mode;
+               } else {
+                       adapter->int_mode = opt.def;
+               }
+       }
+       { /* Smart Power Down */
+               static const struct e1000_option opt = {
+                       .type = enable_option,
+                       .name = "PHY Smart Power Down",
+                       .err  = "defaulting to Disabled",
+                       .def  = OPTION_DISABLED
+               };
+
+               if (num_SmartPowerDownEnable > bd) {
+                       unsigned int spd = SmartPowerDownEnable[bd];
+                       e1000_validate_option(&spd, &opt, adapter);
+                       if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN)
+                           && spd)
+                               adapter->flags |= FLAG_SMART_POWER_DOWN;
+               }
+       }
+       { /* CRC Stripping */
+               static const struct e1000_option opt = {
+                       .type = enable_option,
+                       .name = "CRC Stripping",
+                       .err  = "defaulting to Enabled",
+                       .def  = OPTION_ENABLED
+               };
+
+               if (num_CrcStripping > bd) {
+                       unsigned int crc_stripping = CrcStripping[bd];
+                       e1000_validate_option(&crc_stripping, &opt, adapter);
+                       if (crc_stripping == OPTION_ENABLED)
+                               adapter->flags2 |= FLAG2_CRC_STRIPPING;
+               } else {
+                       adapter->flags2 |= FLAG2_CRC_STRIPPING;
+               }
+       }
+       { /* Kumeran Lock Loss Workaround */
+               static const struct e1000_option opt = {
+                       .type = enable_option,
+                       .name = "Kumeran Lock Loss Workaround",
+                       .err  = "defaulting to Enabled",
+                       .def  = OPTION_ENABLED
+               };
+
+               if (num_KumeranLockLoss > bd) {
+                       unsigned int kmrn_lock_loss = KumeranLockLoss[bd];
+                       e1000_validate_option(&kmrn_lock_loss, &opt, adapter);
+                       if (hw->mac.type == e1000_ich8lan)
+                               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
+                                                               kmrn_lock_loss);
+               } else {
+                       if (hw->mac.type == e1000_ich8lan)
+                               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
+                                                                      opt.def);
+               }
+       }
+       { /* Write-protect NVM */
+               static const struct e1000_option opt = {
+                       .type = enable_option,
+                       .name = "Write-protect NVM",
+                       .err  = "defaulting to Enabled",
+                       .def  = OPTION_ENABLED
+               };
+
+               if (adapter->flags & FLAG_IS_ICH) {
+                       if (num_WriteProtectNVM > bd) {
+                               unsigned int write_protect_nvm = WriteProtectNVM[bd];
+                               e1000_validate_option(&write_protect_nvm, &opt,
+                                                     adapter);
+                               if (write_protect_nvm)
+                                       adapter->flags |= FLAG_READ_ONLY_NVM;
+                       } else {
+                               if (opt.def)
+                                       adapter->flags |= FLAG_READ_ONLY_NVM;
+                       }
+               }
+       }
+}
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
new file mode 100644 (file)
index 0000000..8666476
--- /dev/null
@@ -0,0 +1,3377 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/delay.h>
+
+#include "e1000.h"
+
+static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
+static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
+static s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active);
+static s32 e1000_wait_autoneg(struct e1000_hw *hw);
+static u32 e1000_get_phy_addr_for_bm_page(u32 page, u32 reg);
+static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
+                                         u16 *data, bool read, bool page_set);
+static u32 e1000_get_phy_addr_for_hv_page(u32 page);
+static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
+                                          u16 *data, bool read);
+
+/* 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 \
+               ARRAY_SIZE(e1000_m88_cable_length_table)
+
+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 \
+               ARRAY_SIZE(e1000_igp_2_cable_length_table)
+
+#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_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
+
+/* 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 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
+
+/**
+ *  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 0, 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 : 0;
+}
+
+/**
+ *  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 = 0;
+       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;
+
+               retry_count++;
+       }
+out:
+       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;
+
+       ret_val = e1e_wphy(hw, M88E1000_PHY_GEN_CONTROL, 0xC1);
+       if (ret_val)
+               return ret_val;
+
+       return e1e_wphy(hw, M88E1000_PHY_GEN_CONTROL, 0);
+}
+
+/**
+ *  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;
+
+       if (offset > MAX_PHY_REG_ADDRESS) {
+               e_dbg("PHY Address %d is out of range\n", offset);
+               return -E1000_ERR_PARAM;
+       }
+
+       /*
+        * 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");
+               return -E1000_ERR_PHY;
+       }
+       if (mdic & E1000_MDIC_ERROR) {
+               e_dbg("MDI Error\n");
+               return -E1000_ERR_PHY;
+       }
+       *data = (u16) mdic;
+
+       /*
+        * Allow some time after each MDIC transaction to avoid
+        * reading duplicate data in the next MDIC transaction.
+        */
+       if (hw->mac.type == e1000_pch2lan)
+               udelay(100);
+
+       return 0;
+}
+
+/**
+ *  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;
+
+       if (offset > MAX_PHY_REG_ADDRESS) {
+               e_dbg("PHY Address %d is out of range\n", offset);
+               return -E1000_ERR_PARAM;
+       }
+
+       /*
+        * 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");
+               return -E1000_ERR_PHY;
+       }
+       if (mdic & E1000_MDIC_ERROR) {
+               e_dbg("MDI Error\n");
+               return -E1000_ERR_PHY;
+       }
+
+       /*
+        * Allow some time after each MDIC transaction to avoid
+        * reading duplicate data in the next MDIC transaction.
+        */
+       if (hw->mac.type == e1000_pch2lan)
+               udelay(100);
+
+       return 0;
+}
+
+/**
+ *  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;
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+                                          data);
+
+       hw->phy.ops.release(hw);
+
+       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;
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
+                                           data);
+
+       hw->phy.ops.release(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_set_page_igp - Set page as on IGP-like PHY(s)
+ *  @hw: pointer to the HW structure
+ *  @page: page to set (shifted left when necessary)
+ *
+ *  Sets PHY page required for PHY register access.  Assumes semaphore is
+ *  already acquired.  Note, this function sets phy.addr to 1 so the caller
+ *  must set it appropriately (if necessary) after this function returns.
+ **/
+s32 e1000_set_page_igp(struct e1000_hw *hw, u16 page)
+{
+       e_dbg("Setting page 0x%x\n", page);
+
+       hw->phy.addr = 1;
+
+       return e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, page);
+}
+
+/**
+ *  __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 = 0;
+
+       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 = 0;
+
+       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);
+}
+
+/**
+ *  __e1000_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 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
+                                 bool locked)
+{
+       u32 kmrnctrlsta;
+       s32 ret_val = 0;
+
+       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);
+       e1e_flush();
+
+       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 __e1000_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 __e1000_read_kmrn_reg(hw, offset, data, true);
+}
+
+/**
+ *  __e1000_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 __e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
+                                  bool locked)
+{
+       u32 kmrnctrlsta;
+       s32 ret_val = 0;
+
+       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);
+       e1e_flush();
+
+       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 __e1000_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 __e1000_write_kmrn_reg(hw, offset, data, true);
+}
+
+/**
+ *  e1000_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 e1000_copper_link_setup_82577(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 phy_data;
+
+       /* 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;
+
+       /* 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)
+               return ret_val;
+
+       /* 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)
+               return ret_val;
+
+       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)
+                       return ret_val;
+
+               phy_data |= M88E1000_EPSCR_TX_CLK_25;
+
+               if ((phy->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)
+                       return ret_val;
+       }
+
+       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)
+                       return ret_val;
+
+               /* Set PHY page 0, register 30 to 0x0000 */
+               ret_val = e1e_wphy(hw, 30, 0x0000);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       /* Commit the changes. */
+       ret_val = e1000e_commit_phy(hw);
+       if (ret_val) {
+               e_dbg("Error committing the PHY changes\n");
+               return ret_val;
+       }
+
+       if (phy->type == e1000_phy_82578) {
+               ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               /* 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)
+                       return ret_val;
+       }
+
+       return 0;
+}
+
+/**
+ *  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;
+
+       ret_val = e1000_phy_hw_reset(hw);
+       if (ret_val) {
+               e_dbg("Error resetting the PHY.\n");
+               return ret_val;
+       }
+
+       /*
+        * Wait 100ms for MAC to configure PHY from NVM settings, to avoid
+        * timeout issues when LFS is enabled.
+        */
+       msleep(100);
+
+       /* disable lplu d0 during driver init */
+       ret_val = e1000_set_d0_lplu_state(hw, false);
+       if (ret_val) {
+               e_dbg("Error Disabling LPLU D0\n");
+               return ret_val;
+       }
+       /* Configure mdi-mdix settings */
+       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CTRL, &data);
+       if (ret_val)
+               return ret_val;
+
+       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)
+               return ret_val;
+
+       /* 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)
+                               return ret_val;
+
+                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+
+                       /* Set auto Master/Slave resolution process */
+                       ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
+                       if (ret_val)
+                               return ret_val;
+
+                       data &= ~CR_1000T_MS_ENABLE;
+                       ret_val = e1e_wphy(hw, PHY_1000T_CTRL, data);
+                       if (ret_val)
+                               return ret_val;
+               }
+
+               ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
+               if (ret_val)
+                       return ret_val;
+
+               /* 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);
+       }
+
+       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.
+ **/
+static 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;
+
+       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)
+               return ret_val;
+
+       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)
+                       return ret_val;
+       }
+
+       /*
+        * 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;
+               return ret_val;
+       }
+
+       ret_val = e1e_wphy(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
+       if (ret_val)
+               return ret_val;
+
+       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);
+
+       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.
+ **/
+static s32 e1000_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 = e1000_phy_setup_autoneg(hw);
+       if (ret_val) {
+               e_dbg("Error Setting up Auto-Negotiation\n");
+               return ret_val;
+       }
+       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)
+               return ret_val;
+
+       phy_ctrl |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
+       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_ctrl);
+       if (ret_val)
+               return ret_val;
+
+       /*
+        * 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 = e1000_wait_autoneg(hw);
+               if (ret_val) {
+                       e_dbg("Error while waiting for "
+                                "autoneg to complete\n");
+                       return ret_val;
+               }
+       }
+
+       hw->mac.get_link_status = 1;
+
+       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 = e1000_copper_link_autoneg(hw);
+               if (ret_val)
+                       return ret_val;
+       } else {
+               /*
+                * PHY will be set to 10H, 10F, 100H or 100F
+                * depending on user settings.
+                */
+               e_dbg("Forcing Speed and Duplex\n");
+               ret_val = e1000_phy_force_speed_duplex(hw);
+               if (ret_val) {
+                       e_dbg("Error Forcing Speed and Duplex\n");
+                       return ret_val;
+               }
+       }
+
+       /*
+        * 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)
+               return ret_val;
+
+       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");
+       }
+
+       return ret_val;
+}
+
+/**
+ *  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)
+               return ret_val;
+
+       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
+
+       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /*
+        * 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)
+               return ret_val;
+
+       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)
+               return ret_val;
+
+       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)
+                       return ret_val;
+
+               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)
+                       return ret_val;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  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)
+               return ret_val;
+
+       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
+       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       e_dbg("M88E1000 PSCR: %X\n", phy_data);
+
+       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
+
+       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /* Reset the phy to commit changes. */
+       ret_val = e1000e_commit_phy(hw);
+       if (ret_val)
+               return ret_val;
+
+       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)
+                       return ret_val;
+
+               if (!link) {
+                       if (hw->phy.type != e1000_phy_m88) {
+                               e_dbg("Link taking longer than expected.\n");
+                       } else {
+                               /*
+                                * 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)
+                                       return ret_val;
+                               ret_val = e1000e_phy_reset_dsp(hw);
+                               if (ret_val)
+                                       return ret_val;
+                       }
+               }
+
+               /* Try once more */
+               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                    100000, &link);
+               if (ret_val)
+                       return ret_val;
+       }
+
+       if (hw->phy.type != e1000_phy_m88)
+               return 0;
+
+       ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       /*
+        * 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)
+               return ret_val;
+
+       /*
+        * 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)
+               return ret_val;
+
+       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
+       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+
+       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;
+
+       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;
+}
+
+/**
+ *  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);
+}
+
+/**
+ *  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;
+       u16 data;
+
+       ret_val = e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &data);
+       if (ret_val)
+               return ret_val;
+
+       if (!active) {
+               data &= ~IGP02E1000_PM_D3_LPLU;
+               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, data);
+               if (ret_val)
+                       return ret_val;
+               /*
+                * 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)
+                               return ret_val;
+
+                       data |= IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               } else if (phy->smart_speed == e1000_smart_speed_off) {
+                       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          &data);
+                       if (ret_val)
+                               return ret_val;
+
+                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+                       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
+                                          data);
+                       if (ret_val)
+                               return ret_val;
+               }
+       } 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)
+                       return ret_val;
+
+               /* When LPLU is enabled, we should disable SmartSpeed */
+               ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG, &data);
+               if (ret_val)
+                       return ret_val;
+
+               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
+               ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG, data);
+       }
+
+       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_3:
+               offset  = IGP01E1000_PHY_LINK_HEALTH;
+               mask    = IGP01E1000_PLHR_SS_DOWNGRADE;
+               break;
+       default:
+               /* speed downshift not supported */
+               phy->speed_downgraded = false;
+               return 0;
+       }
+
+       ret_val = e1e_rphy(hw, offset, &phy_data);
+
+       if (!ret_val)
+               phy->speed_downgraded = (phy_data & mask);
+
+       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;
+
+       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;
+}
+
+/**
+ *  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;
+
+       /*
+        * Polarity is determined based on the speed of
+        * our connection.
+        */
+       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_STATUS, &data);
+       if (ret_val)
+               return ret_val;
+
+       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;
+
+       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;
+
+       /*
+        * 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;
+}
+
+/**
+ *  e1000_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.
+ **/
+static s32 e1000_wait_autoneg(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 i, phy_status;
+
+       /* 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 = 0;
+       u16 i, phy_status;
+
+       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);
+
+       return ret_val;
+}
+
+/**
+ *  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;
+       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;
+       static const 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)
+                       return ret_val;
+
+               /*
+                * 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))
+                       return -E1000_ERR_PHY;
+
+               /* 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;
+
+       return ret_val;
+}
+
+/**
+ *  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");
+               return -E1000_ERR_CONFIG;
+       }
+
+       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
+       if (ret_val)
+               return ret_val;
+
+       if (!link) {
+               e_dbg("Phy info is only valid if link is up\n");
+               return -E1000_ERR_CONFIG;
+       }
+
+       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy->polarity_correction = (phy_data &
+                                   M88E1000_PSCR_POLARITY_REVERSAL);
+
+       ret_val = e1000_check_polarity_m88(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+       if (ret_val)
+               return ret_val;
+
+       phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX);
+
+       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
+               ret_val = e1000_get_cable_length(hw);
+               if (ret_val)
+                       return ret_val;
+
+               ret_val = e1e_rphy(hw, PHY_1000T_STATUS, &phy_data);
+               if (ret_val)
+                       return ret_val;
+
+               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;
+       }
+
+       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)
+               return ret_val;
+
+       if (!link) {
+               e_dbg("Phy info is only valid if link is up\n");
+               return -E1000_ERR_CONFIG;
+       }
+
+       phy->polarity_correction = true;
+
+       ret_val = e1000_check_polarity_igp(hw);
+       if (ret_val)
+               return ret_val;
+
+       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_STATUS, &data);
+       if (ret_val)
+               return ret_val;
+
+       phy->is_mdix = (data & IGP01E1000_PSSR_MDIX);
+
+       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
+           IGP01E1000_PSSR_SPEED_1000MBPS) {
+               ret_val = e1000_get_cable_length(hw);
+               if (ret_val)
+                       return ret_val;
+
+               ret_val = e1e_rphy(hw, PHY_1000T_STATUS, &data);
+               if (ret_val)
+                       return ret_val;
+
+               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 {
+               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
+               phy->local_rx = e1000_1000t_rx_status_undefined;
+               phy->remote_rx = e1000_1000t_rx_status_undefined;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_get_phy_info_ife - Retrieves various IFE PHY states
+ *  @hw: pointer to the HW structure
+ *
+ *  Populates "phy" structure with various feature states.
+ **/
+s32 e1000_get_phy_info_ife(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 = e1000_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_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;
+       u16 phy_ctrl;
+
+       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_ctrl);
+       if (ret_val)
+               return ret_val;
+
+       phy_ctrl |= MII_CR_RESET;
+       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_ctrl);
+       if (ret_val)
+               return ret_val;
+
+       udelay(1);
+
+       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;
+       u32 ctrl;
+
+       ret_val = e1000_check_reset_block(hw);
+       if (ret_val)
+               return 0;
+
+       ret_val = phy->ops.acquire(hw);
+       if (ret_val)
+               return ret_val;
+
+       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);
+
+       return e1000_get_phy_cfg_done(hw);
+}
+
+/**
+ *  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)
+{
+       mdelay(10);
+       return 0;
+}
+
+/**
+ *  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 0;
+}
+
+/* Internal function pointers */
+
+/**
+ *  e1000_get_phy_cfg_done - Generic PHY configuration done
+ *  @hw: pointer to the HW structure
+ *
+ *  Return success if silicon family did not implement a family specific
+ *  get_cfg_done function.
+ **/
+static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
+{
+       if (hw->phy.ops.get_cfg_done)
+               return hw->phy.ops.get_cfg_done(hw);
+
+       return 0;
+}
+
+/**
+ *  e1000_phy_force_speed_duplex - Generic force PHY speed/duplex
+ *  @hw: pointer to the HW structure
+ *
+ *  When the silicon family has not implemented a forced speed/duplex
+ *  function for the PHY, simply return 0.
+ **/
+static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
+{
+       if (hw->phy.ops.force_speed_duplex)
+               return hw->phy.ops.force_speed_duplex(hw);
+
+       return 0;
+}
+
+/**
+ *  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 = 0;
+                               goto out;
+                       }
+                       usleep_range(1000, 2000);
+                       i++;
+               } while (i < 10);
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_get_phy_addr_for_bm_page - Retrieve PHY page address
+ *  @page: page to access
+ *
+ *  Returns the phy address for the page requested.
+ **/
+static u32 e1000_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 = 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 = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
+                                                        false, false);
+               goto out;
+       }
+
+       hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
+
+       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+               u32 page_shift, page_select;
+
+               /*
+                * 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 = 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 = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
+                                                        true, false);
+               goto out;
+       }
+
+       hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
+
+       if (offset > MAX_PHY_MULTI_PAGE_REG) {
+               u32 page_shift, page_select;
+
+               /*
+                * 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 = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
+                                                        true, 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_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 = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
+                                                        false, 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;
+}
+
+/**
+ *  e1000_enable_phy_wakeup_reg_access_bm - enable access to BM wakeup registers
+ *  @hw: pointer to the HW structure
+ *  @phy_reg: pointer to store original contents of BM_WUC_ENABLE_REG
+ *
+ *  Assumes semaphore already acquired and phy_reg points to a valid memory
+ *  address to store contents of the BM_WUC_ENABLE_REG register.
+ **/
+s32 e1000_enable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg)
+{
+       s32 ret_val;
+       u16 temp;
+
+       /* All page select, port ctrl and wakeup registers use phy address 1 */
+       hw->phy.addr = 1;
+
+       /* Select Port Control Registers page */
+       ret_val = e1000_set_page_igp(hw, (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
+       if (ret_val) {
+               e_dbg("Could not set Port Control page\n");
+               goto out;
+       }
+
+       ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, phy_reg);
+       if (ret_val) {
+               e_dbg("Could not read PHY register %d.%d\n",
+                     BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
+               goto out;
+       }
+
+       /*
+        * Enable both PHY wakeup mode and Wakeup register page writes.
+        * Prevent a power state change by disabling ME and Host PHY wakeup.
+        */
+       temp = *phy_reg;
+       temp |= BM_WUC_ENABLE_BIT;
+       temp &= ~(BM_WUC_ME_WU_BIT | BM_WUC_HOST_WU_BIT);
+
+       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, temp);
+       if (ret_val) {
+               e_dbg("Could not write PHY register %d.%d\n",
+                     BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
+               goto out;
+       }
+
+       /* Select Host Wakeup Registers page */
+       ret_val = e1000_set_page_igp(hw, (BM_WUC_PAGE << IGP_PAGE_SHIFT));
+
+       /* caller now able to write registers on the Wakeup registers page */
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_disable_phy_wakeup_reg_access_bm - disable access to BM wakeup regs
+ *  @hw: pointer to the HW structure
+ *  @phy_reg: pointer to original contents of BM_WUC_ENABLE_REG
+ *
+ *  Restore BM_WUC_ENABLE_REG to its original value.
+ *
+ *  Assumes semaphore already acquired and *phy_reg is the contents of the
+ *  BM_WUC_ENABLE_REG before register(s) on BM_WUC_PAGE were accessed by
+ *  caller.
+ **/
+s32 e1000_disable_phy_wakeup_reg_access_bm(struct e1000_hw *hw, u16 *phy_reg)
+{
+       s32 ret_val = 0;
+
+       /* Select Port Control Registers page */
+       ret_val = e1000_set_page_igp(hw, (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
+       if (ret_val) {
+               e_dbg("Could not set Port Control page\n");
+               goto out;
+       }
+
+       /* Restore 769.17 to its original value */
+       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, *phy_reg);
+       if (ret_val)
+               e_dbg("Could not restore PHY register %d.%d\n",
+                     BM_PORT_CTRL_PAGE, BM_WUC_ENABLE_REG);
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_access_phy_wakeup_reg_bm - Read/write 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
+ *  @page_set: BM_WUC_PAGE already set and access enabled
+ *
+ *  Read the PHY register at offset and store the retrieved information in
+ *  data, or write data to PHY register at offset.  Note the procedure to
+ *  access the PHY wakeup registers is different than reading the other PHY
+ *  registers. It works as such:
+ *  1) Set 769.17.2 (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
+ *
+ *  Steps 1 and 2 are done by e1000_enable_phy_wakeup_reg_access_bm() and
+ *  step 5 is done by e1000_disable_phy_wakeup_reg_access_bm().
+ *
+ *  Assumes semaphore is already acquired.  When page_set==true, assumes
+ *  the PHY page is set to BM_WUC_PAGE (i.e. a function in the call stack
+ *  is responsible for calls to e1000_[enable|disable]_phy_wakeup_reg_bm()).
+ **/
+static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
+                                         u16 *data, bool read, bool page_set)
+{
+       s32 ret_val;
+       u16 reg = BM_PHY_REG_NUM(offset);
+       u16 page = BM_PHY_REG_PAGE(offset);
+       u16 phy_reg = 0;
+
+       /* Gig must be disabled for MDIO accesses to Host Wakeup reg page */
+       if ((hw->mac.type == e1000_pchlan) &&
+           (!(er32(PHY_CTRL) & E1000_PHY_CTRL_GBE_DISABLE)))
+               e_dbg("Attempting to access page %d while gig enabled.\n",
+                     page);
+
+       if (!page_set) {
+               /* Enable access to PHY wakeup registers */
+               ret_val = e1000_enable_phy_wakeup_reg_access_bm(hw, &phy_reg);
+               if (ret_val) {
+                       e_dbg("Could not enable PHY wakeup reg access\n");
+                       goto out;
+               }
+       }
+
+       e_dbg("Accessing PHY page %d reg 0x%x\n", page, reg);
+
+       /* Write the Wakeup register page 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 %d\n", page);
+               goto out;
+       }
+
+       if (read) {
+               /* Read the Wakeup register page value using opcode 0x12 */
+               ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
+                                                  data);
+       } else {
+               /* Write the Wakeup register page 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 PHY reg %d.%d\n", page, reg);
+               goto out;
+       }
+
+       if (!page_set)
+               ret_val = e1000_disable_phy_wakeup_reg_access_bm(hw, &phy_reg);
+
+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 */
+       e1e_rphy(hw, PHY_CONTROL, &mii_reg);
+       mii_reg &= ~MII_CR_POWER_DOWN;
+       e1e_wphy(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 */
+       e1e_rphy(hw, PHY_CONTROL, &mii_reg);
+       mii_reg |= MII_CR_POWER_DOWN;
+       e1e_wphy(hw, PHY_CONTROL, mii_reg);
+       usleep_range(1000, 2000);
+}
+
+/**
+ *  e1000e_commit_phy - 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 e1000e_commit_phy(struct e1000_hw *hw)
+{
+       if (hw->phy.ops.commit)
+               return hw->phy.ops.commit(hw);
+
+       return 0;
+}
+
+/**
+ *  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.
+ **/
+static 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 0;
+}
+
+/**
+ *  __e1000_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 __e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
+                                  bool locked, bool page_set)
+{
+       s32 ret_val;
+       u16 page = BM_PHY_REG_PAGE(offset);
+       u16 reg = BM_PHY_REG_NUM(offset);
+       u32 phy_addr = hw->phy.addr = e1000_get_phy_addr_for_hv_page(page);
+
+       if (!locked) {
+               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 = e1000_access_phy_wakeup_reg_bm(hw, offset, data,
+                                                        true, page_set);
+               goto out;
+       }
+
+       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
+               ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
+                                                        data, true);
+               goto out;
+       }
+
+       if (!page_set) {
+               if (page == HV_INTC_FC_PAGE_START)
+                       page = 0;
+
+               if (reg > MAX_PHY_MULTI_PAGE_REG) {
+                       /* Page is shifted left, PHY expects (page x 32) */
+                       ret_val = e1000_set_page_igp(hw,
+                                                    (page << IGP_PAGE_SHIFT));
+
+                       hw->phy.addr = phy_addr;
+
+                       if (ret_val)
+                               goto out;
+               }
+       }
+
+       e_dbg("reading PHY page %d (or 0x%x shifted) reg 0x%x\n", page,
+             page << IGP_PAGE_SHIFT, reg);
+
+       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
+                                         data);
+out:
+       if (!locked)
+               hw->phy.ops.release(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       return __e1000_read_phy_reg_hv(hw, offset, data, false, false);
+}
+
+/**
+ *  e1000_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 e1000_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       return __e1000_read_phy_reg_hv(hw, offset, data, true, false);
+}
+
+/**
+ *  e1000_read_phy_reg_page_hv - Read HV PHY register
+ *  @hw: pointer to the HW structure
+ *  @offset: register offset to write to
+ *  @data: data to write at register offset
+ *
+ *  Reads the PHY register at offset and stores the retrieved information
+ *  in data.  Assumes semaphore already acquired and page already set.
+ **/
+s32 e1000_read_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       return __e1000_read_phy_reg_hv(hw, offset, data, true, true);
+}
+
+/**
+ *  __e1000_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 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
+                                   bool locked, bool page_set)
+{
+       s32 ret_val;
+       u16 page = BM_PHY_REG_PAGE(offset);
+       u16 reg = BM_PHY_REG_NUM(offset);
+       u32 phy_addr = hw->phy.addr = e1000_get_phy_addr_for_hv_page(page);
+
+       if (!locked) {
+               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 = e1000_access_phy_wakeup_reg_bm(hw, offset, &data,
+                                                        false, page_set);
+               goto out;
+       }
+
+       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
+               ret_val = e1000_access_phy_debug_regs_hv(hw, offset,
+                                                        &data, false);
+               goto out;
+       }
+
+       if (!page_set) {
+               if (page == HV_INTC_FC_PAGE_START)
+                       page = 0;
+
+               /*
+                * Workaround MDIO accesses being disabled after entering IEEE
+                * Power Down (when 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 = e1000_access_phy_debug_regs_hv(hw,
+                                                                (1 << 6) | 0x3,
+                                                                &data2, false);
+                       if (ret_val)
+                               goto out;
+               }
+
+               if (reg > MAX_PHY_MULTI_PAGE_REG) {
+                       /* Page is shifted left, PHY expects (page x 32) */
+                       ret_val = e1000_set_page_igp(hw,
+                                                    (page << IGP_PAGE_SHIFT));
+
+                       hw->phy.addr = phy_addr;
+
+                       if (ret_val)
+                               goto out;
+               }
+       }
+
+       e_dbg("writing PHY page %d (or 0x%x shifted) reg 0x%x\n", page,
+             page << IGP_PAGE_SHIFT, reg);
+
+       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
+                                         data);
+
+out:
+       if (!locked)
+               hw->phy.ops.release(hw);
+
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       return __e1000_write_phy_reg_hv(hw, offset, data, false, false);
+}
+
+/**
+ *  e1000_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 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       return __e1000_write_phy_reg_hv(hw, offset, data, true, false);
+}
+
+/**
+ *  e1000_write_phy_reg_page_hv - 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 and page already set.
+ **/
+s32 e1000_write_phy_reg_page_hv(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       return __e1000_write_phy_reg_hv(hw, offset, data, true, true);
+}
+
+/**
+ *  e1000_get_phy_addr_for_hv_page - Get PHY address based on page
+ *  @page: page to be accessed
+ **/
+static u32 e1000_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;
+}
+
+/**
+ *  e1000_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 write
+ *
+ *  Reads the PHY register at offset and stores the retreived information
+ *  in data.  Assumes semaphore already acquired.  Note that the procedure
+ *  to access these regs uses the address port and data port to read/write.
+ *  These accesses done with PHY address 2 and without using pages.
+ **/
+static s32 e1000_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 the Address Offset port 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 access the Data port register\n");
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_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 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       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;
+
+       mdelay(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;
+}
+
+/**
+ *  e1000_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 e1000_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;
+}
+
+/**
+ *  e1000_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.
+ **/
+s32 e1000_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;
+
+       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;
+}
+
+/**
+ *  e1000_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 e1000_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 = e1000_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) {
+               ret_val = hw->phy.ops.get_cable_length(hw);
+               if (ret_val)
+                       goto out;
+
+               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;
+       } 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;
+}
+
+/**
+ *  e1000_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 e1000_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;
+}
diff --git a/drivers/net/ethernet/intel/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
new file mode 100644 (file)
index 0000000..c6e4621
--- /dev/null
@@ -0,0 +1,37 @@
+################################################################################
+#
+# Intel 82575 PCI-Express Ethernet Linux driver
+# Copyright(c) 1999 - 2011 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
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) 82575 PCI-Express ethernet driver
+#
+
+obj-$(CONFIG_IGB) += igb.o
+
+igb-objs := igb_main.o igb_ethtool.o e1000_82575.o \
+           e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o
+
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
new file mode 100644 (file)
index 0000000..c0857bd
--- /dev/null
@@ -0,0 +1,2084 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+/* e1000_82575
+ * e1000_82576
+ */
+
+#include <linux/types.h>
+#include <linux/if_ether.h>
+
+#include "e1000_mac.h"
+#include "e1000_82575.h"
+
+static s32  igb_get_invariants_82575(struct e1000_hw *);
+static s32  igb_acquire_phy_82575(struct e1000_hw *);
+static void igb_release_phy_82575(struct e1000_hw *);
+static s32  igb_acquire_nvm_82575(struct e1000_hw *);
+static void igb_release_nvm_82575(struct e1000_hw *);
+static s32  igb_check_for_link_82575(struct e1000_hw *);
+static s32  igb_get_cfg_done_82575(struct e1000_hw *);
+static s32  igb_init_hw_82575(struct e1000_hw *);
+static s32  igb_phy_hw_reset_sgmii_82575(struct e1000_hw *);
+static s32  igb_read_phy_reg_sgmii_82575(struct e1000_hw *, u32, u16 *);
+static s32  igb_read_phy_reg_82580(struct e1000_hw *, u32, u16 *);
+static s32  igb_write_phy_reg_82580(struct e1000_hw *, u32, u16);
+static s32  igb_reset_hw_82575(struct e1000_hw *);
+static s32  igb_reset_hw_82580(struct e1000_hw *);
+static s32  igb_set_d0_lplu_state_82575(struct e1000_hw *, bool);
+static s32  igb_setup_copper_link_82575(struct e1000_hw *);
+static s32  igb_setup_serdes_link_82575(struct e1000_hw *);
+static s32  igb_write_phy_reg_sgmii_82575(struct e1000_hw *, u32, u16);
+static void igb_clear_hw_cntrs_82575(struct e1000_hw *);
+static s32  igb_acquire_swfw_sync_82575(struct e1000_hw *, u16);
+static s32  igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *, u16 *,
+                                                u16 *);
+static s32  igb_get_phy_id_82575(struct e1000_hw *);
+static void igb_release_swfw_sync_82575(struct e1000_hw *, u16);
+static bool igb_sgmii_active_82575(struct e1000_hw *);
+static s32  igb_reset_init_script_82575(struct e1000_hw *);
+static s32  igb_read_mac_addr_82575(struct e1000_hw *);
+static s32  igb_set_pcie_completion_timeout(struct e1000_hw *hw);
+static s32  igb_reset_mdicnfg_82580(struct e1000_hw *hw);
+static s32  igb_validate_nvm_checksum_82580(struct e1000_hw *hw);
+static s32  igb_update_nvm_checksum_82580(struct e1000_hw *hw);
+static s32  igb_update_nvm_checksum_with_offset(struct e1000_hw *hw,
+                                               u16 offset);
+static s32 igb_validate_nvm_checksum_with_offset(struct e1000_hw *hw,
+                                               u16 offset);
+static s32 igb_validate_nvm_checksum_i350(struct e1000_hw *hw);
+static s32 igb_update_nvm_checksum_i350(struct e1000_hw *hw);
+static const u16 e1000_82580_rxpbs_table[] =
+       { 36, 72, 144, 1, 2, 4, 8, 16,
+         35, 70, 140 };
+#define E1000_82580_RXPBS_TABLE_SIZE \
+       (sizeof(e1000_82580_rxpbs_table)/sizeof(u16))
+
+/**
+ *  igb_sgmii_uses_mdio_82575 - Determine if I2C pins are for external MDIO
+ *  @hw: pointer to the HW structure
+ *
+ *  Called to determine if the I2C pins are being used for I2C or as an
+ *  external MDIO interface since the two options are mutually exclusive.
+ **/
+static bool igb_sgmii_uses_mdio_82575(struct e1000_hw *hw)
+{
+       u32 reg = 0;
+       bool ext_mdio = false;
+
+       switch (hw->mac.type) {
+       case e1000_82575:
+       case e1000_82576:
+               reg = rd32(E1000_MDIC);
+               ext_mdio = !!(reg & E1000_MDIC_DEST);
+               break;
+       case e1000_82580:
+       case e1000_i350:
+               reg = rd32(E1000_MDICNFG);
+               ext_mdio = !!(reg & E1000_MDICNFG_EXT_MDIO);
+               break;
+       default:
+               break;
+       }
+       return ext_mdio;
+}
+
+static s32 igb_get_invariants_82575(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       struct e1000_nvm_info *nvm = &hw->nvm;
+       struct e1000_mac_info *mac = &hw->mac;
+       struct e1000_dev_spec_82575 * dev_spec = &hw->dev_spec._82575;
+       u32 eecd;
+       s32 ret_val;
+       u16 size;
+       u32 ctrl_ext = 0;
+
+       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_NS:
+       case E1000_DEV_ID_82576_NS_SERDES:
+       case E1000_DEV_ID_82576_FIBER:
+       case E1000_DEV_ID_82576_SERDES:
+       case E1000_DEV_ID_82576_QUAD_COPPER:
+       case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
+       case E1000_DEV_ID_82576_SERDES_QUAD:
+               mac->type = e1000_82576;
+               break;
+       case E1000_DEV_ID_82580_COPPER:
+       case E1000_DEV_ID_82580_FIBER:
+       case E1000_DEV_ID_82580_QUAD_FIBER:
+       case E1000_DEV_ID_82580_SERDES:
+       case E1000_DEV_ID_82580_SGMII:
+       case E1000_DEV_ID_82580_COPPER_DUAL:
+       case E1000_DEV_ID_DH89XXCC_SGMII:
+       case E1000_DEV_ID_DH89XXCC_SERDES:
+       case E1000_DEV_ID_DH89XXCC_BACKPLANE:
+       case E1000_DEV_ID_DH89XXCC_SFP:
+               mac->type = e1000_82580;
+               break;
+       case E1000_DEV_ID_I350_COPPER:
+       case E1000_DEV_ID_I350_FIBER:
+       case E1000_DEV_ID_I350_SERDES:
+       case E1000_DEV_ID_I350_SGMII:
+               mac->type = e1000_i350;
+               break;
+       default:
+               return -E1000_ERR_MAC_INIT;
+               break;
+       }
+
+       /* 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.
+        */
+       phy->media_type = e1000_media_type_copper;
+       dev_spec->sgmii_active = false;
+
+       ctrl_ext = rd32(E1000_CTRL_EXT);
+       switch (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK) {
+       case E1000_CTRL_EXT_LINK_MODE_SGMII:
+               dev_spec->sgmii_active = true;
+               break;
+       case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX:
+       case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES:
+               hw->phy.media_type = e1000_media_type_internal_serdes;
+               break;
+       default:
+               break;
+       }
+
+       /* Set mta register count */
+       mac->mta_reg_count = 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;
+       if (mac->type == e1000_82580)
+               mac->rar_entry_count = E1000_RAR_ENTRIES_82580;
+       if (mac->type == e1000_i350)
+               mac->rar_entry_count = E1000_RAR_ENTRIES_I350;
+       /* reset */
+       if (mac->type >= e1000_82580)
+               mac->ops.reset_hw = igb_reset_hw_82580;
+       else
+               mac->ops.reset_hw = igb_reset_hw_82575;
+       /* Set if part includes ASF firmware */
+       mac->asf_firmware_present = true;
+       /* Set if manageability features are enabled. */
+       mac->arc_subsystem_valid =
+               (rd32(E1000_FWSM) & E1000_FWSM_MODE_MASK)
+                       ? true : false;
+       /* enable EEE on i350 parts */
+       if (mac->type == e1000_i350)
+               dev_spec->eee_disable = false;
+       else
+               dev_spec->eee_disable = true;
+       /* 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;
+
+       /* NVM initialization */
+       eecd = rd32(E1000_EECD);
+
+       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;
+
+       /*
+        * Check for invalid size
+        */
+       if ((hw->mac.type == e1000_82576) && (size > 15)) {
+               printk("igb: The NVM size is not valid, "
+                       "defaulting to 32K.\n");
+               size = 15;
+       }
+       nvm->word_size = 1 << size;
+       if (nvm->word_size == (1 << 15))
+               nvm->page_size = 128;
+
+       /* NVM Function Pointers */
+       nvm->ops.acquire = igb_acquire_nvm_82575;
+       if (nvm->word_size < (1 << 15))
+               nvm->ops.read = igb_read_nvm_eerd;
+       else
+               nvm->ops.read = igb_read_nvm_spi;
+
+       nvm->ops.release = igb_release_nvm_82575;
+       switch (hw->mac.type) {
+       case e1000_82580:
+               nvm->ops.validate = igb_validate_nvm_checksum_82580;
+               nvm->ops.update = igb_update_nvm_checksum_82580;
+               break;
+       case e1000_i350:
+               nvm->ops.validate = igb_validate_nvm_checksum_i350;
+               nvm->ops.update = igb_update_nvm_checksum_i350;
+               break;
+       default:
+               nvm->ops.validate = igb_validate_nvm_checksum;
+               nvm->ops.update = igb_update_nvm_checksum;
+       }
+       nvm->ops.write = igb_write_nvm_spi;
+
+       /* if part supports SR-IOV then initialize mailbox parameters */
+       switch (mac->type) {
+       case e1000_82576:
+       case e1000_i350:
+               igb_init_mbx_params_pf(hw);
+               break;
+       default:
+               break;
+       }
+
+       /* setup PHY parameters */
+       if (phy->media_type != e1000_media_type_copper) {
+               phy->type = e1000_phy_none;
+               return 0;
+       }
+
+       phy->autoneg_mask        = AUTONEG_ADVERTISE_SPEED_DEFAULT;
+       phy->reset_delay_us      = 100;
+
+       ctrl_ext = rd32(E1000_CTRL_EXT);
+
+       /* PHY function pointers */
+       if (igb_sgmii_active_82575(hw)) {
+               phy->ops.reset      = igb_phy_hw_reset_sgmii_82575;
+               ctrl_ext |= E1000_CTRL_I2C_ENA;
+       } else {
+               phy->ops.reset      = igb_phy_hw_reset;
+               ctrl_ext &= ~E1000_CTRL_I2C_ENA;
+       }
+
+       wr32(E1000_CTRL_EXT, ctrl_ext);
+       igb_reset_mdicnfg_82580(hw);
+
+       if (igb_sgmii_active_82575(hw) && !igb_sgmii_uses_mdio_82575(hw)) {
+               phy->ops.read_reg   = igb_read_phy_reg_sgmii_82575;
+               phy->ops.write_reg  = igb_write_phy_reg_sgmii_82575;
+       } else if (hw->mac.type >= e1000_82580) {
+               phy->ops.read_reg   = igb_read_phy_reg_82580;
+               phy->ops.write_reg  = igb_write_phy_reg_82580;
+       } else {
+               phy->ops.read_reg   = igb_read_phy_reg_igp;
+               phy->ops.write_reg  = igb_write_phy_reg_igp;
+       }
+
+       /* set lan id */
+       hw->bus.func = (rd32(E1000_STATUS) & E1000_STATUS_FUNC_MASK) >>
+                      E1000_STATUS_FUNC_SHIFT;
+
+       /* Set phy->phy_addr and phy->id. */
+       ret_val = igb_get_phy_id_82575(hw);
+       if (ret_val)
+               return ret_val;
+
+       /* Verify phy id and set remaining function pointers */
+       switch (phy->id) {
+       case I347AT4_E_PHY_ID:
+       case M88E1112_E_PHY_ID:
+       case M88E1111_I_PHY_ID:
+               phy->type                   = e1000_phy_m88;
+               phy->ops.get_phy_info       = igb_get_phy_info_m88;
+
+               if (phy->id == I347AT4_E_PHY_ID ||
+                   phy->id == M88E1112_E_PHY_ID)
+                       phy->ops.get_cable_length = igb_get_cable_length_m88_gen2;
+               else
+                       phy->ops.get_cable_length = igb_get_cable_length_m88;
+
+               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
+               break;
+       case IGP03E1000_E_PHY_ID:
+               phy->type                   = e1000_phy_igp_3;
+               phy->ops.get_phy_info       = igb_get_phy_info_igp;
+               phy->ops.get_cable_length   = igb_get_cable_length_igp_2;
+               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_igp;
+               phy->ops.set_d0_lplu_state  = igb_set_d0_lplu_state_82575;
+               phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state;
+               break;
+       case I82580_I_PHY_ID:
+       case I350_I_PHY_ID:
+               phy->type                   = e1000_phy_82580;
+               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_82580;
+               phy->ops.get_cable_length   = igb_get_cable_length_82580;
+               phy->ops.get_phy_info       = igb_get_phy_info_82580;
+               break;
+       default:
+               return -E1000_ERR_PHY;
+       }
+
+       return 0;
+}
+
+/**
+ *  igb_acquire_phy_82575 - Acquire rights to access PHY
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire access rights to the correct PHY.  This is a
+ *  function pointer entry point called by the api module.
+ **/
+static s32 igb_acquire_phy_82575(struct e1000_hw *hw)
+{
+       u16 mask = E1000_SWFW_PHY0_SM;
+
+       if (hw->bus.func == E1000_FUNC_1)
+               mask = E1000_SWFW_PHY1_SM;
+       else if (hw->bus.func == E1000_FUNC_2)
+               mask = E1000_SWFW_PHY2_SM;
+       else if (hw->bus.func == E1000_FUNC_3)
+               mask = E1000_SWFW_PHY3_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.  This is a
+ *  function pointer entry point called by the api module.
+ **/
+static void igb_release_phy_82575(struct e1000_hw *hw)
+{
+       u16 mask = E1000_SWFW_PHY0_SM;
+
+       if (hw->bus.func == E1000_FUNC_1)
+               mask = E1000_SWFW_PHY1_SM;
+       else if (hw->bus.func == E1000_FUNC_2)
+               mask = E1000_SWFW_PHY2_SM;
+       else if (hw->bus.func == E1000_FUNC_3)
+               mask = E1000_SWFW_PHY3_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;
+
+       if (offset > E1000_MAX_SGMII_PHY_REG_ADDR) {
+               hw_dbg("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;
+
+
+       if (offset > E1000_MAX_SGMII_PHY_REG_ADDR) {
+               hw_dbg("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 = 0;
+       u16 phy_id;
+       u32 ctrl_ext;
+       u32 mdic;
+
+       /*
+        * 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;
+       }
+
+       if (igb_sgmii_uses_mdio_82575(hw)) {
+               switch (hw->mac.type) {
+               case e1000_82575:
+               case e1000_82576:
+                       mdic = rd32(E1000_MDIC);
+                       mdic &= E1000_MDIC_PHY_MASK;
+                       phy->addr = mdic >> E1000_MDIC_PHY_SHIFT;
+                       break;
+               case e1000_82580:
+               case e1000_i350:
+                       mdic = rd32(E1000_MDICNFG);
+                       mdic &= E1000_MDICNFG_PHY_MASK;
+                       phy->addr = mdic >> E1000_MDICNFG_PHY_SHIFT;
+                       break;
+               default:
+                       ret_val = -E1000_ERR_PHY;
+                       goto out;
+                       break;
+               }
+               ret_val = igb_get_phy_id(hw);
+               goto out;
+       }
+
+       /* Power on sgmii phy if it is disabled */
+       ctrl_ext = rd32(E1000_CTRL_EXT);
+       wr32(E1000_CTRL_EXT, ctrl_ext & ~E1000_CTRL_EXT_SDP3_DATA);
+       wrfl();
+       msleep(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 == 0) {
+                       hw_dbg("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 {
+                       hw_dbg("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;
+               goto out;
+       } else {
+               ret_val = igb_get_phy_id(hw);
+       }
+
+       /* restore previous sfp cage power state */
+       wr32(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;
+
+       /*
+        * This isn't a true "hard" reset, but is the only reset
+        * available to us at this time.
+        */
+
+       hw_dbg("Soft resetting SGMII attached PHY...\n");
+
+       /*
+        * 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 = igb_phy_sw_reset(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;
+       u16 data;
+
+       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;
+
+       ret_val = igb_acquire_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
+       if (ret_val)
+               goto out;
+
+       ret_val = igb_acquire_nvm(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)
+{
+       igb_release_nvm(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 = 0;
+       s32 i = 0, timeout = 200; /* FIXME: find real value to use here */
+
+       while (i < timeout) {
+               if (igb_get_hw_semaphore(hw)) {
+                       ret_val = -E1000_ERR_SWFW_SYNC;
+                       goto out;
+               }
+
+               swfw_sync = rd32(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(hw);
+               mdelay(5);
+               i++;
+       }
+
+       if (i == timeout) {
+               hw_dbg("Driver can't access resource, SW_FW_SYNC timeout.\n");
+               ret_val = -E1000_ERR_SWFW_SYNC;
+               goto out;
+       }
+
+       swfw_sync |= swmask;
+       wr32(E1000_SW_FW_SYNC, swfw_sync);
+
+       igb_put_hw_semaphore(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;
+
+       while (igb_get_hw_semaphore(hw) != 0);
+       /* Empty */
+
+       swfw_sync = rd32(E1000_SW_FW_SYNC);
+       swfw_sync &= ~mask;
+       wr32(E1000_SW_FW_SYNC, swfw_sync);
+
+       igb_put_hw_semaphore(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
+ *  0.  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 = 0;
+       u32 mask = E1000_NVM_CFG_DONE_PORT_0;
+
+       if (hw->bus.func == 1)
+               mask = E1000_NVM_CFG_DONE_PORT_1;
+       else if (hw->bus.func == E1000_FUNC_2)
+               mask = E1000_NVM_CFG_DONE_PORT_2;
+       else if (hw->bus.func == E1000_FUNC_3)
+               mask = E1000_NVM_CFG_DONE_PORT_3;
+
+       while (timeout) {
+               if (rd32(E1000_EEMNGCTL) & mask)
+                       break;
+               msleep(1);
+               timeout--;
+       }
+       if (!timeout)
+               hw_dbg("MNG configuration cycle has not completed.\n");
+
+       /* If EEPROM is not marked present, init the PHY manually */
+       if (((rd32(E1000_EECD) & E1000_EECD_PRES) == 0) &&
+           (hw->phy.type == e1000_phy_igp_3))
+               igb_phy_init_script_igp3(hw);
+
+       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;
+
+       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(hw);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  igb_power_up_serdes_link_82575 - Power up the serdes link after shutdown
+ *  @hw: pointer to the HW structure
+ **/
+void igb_power_up_serdes_link_82575(struct e1000_hw *hw)
+{
+       u32 reg;
+
+
+       if ((hw->phy.media_type != e1000_media_type_internal_serdes) &&
+           !igb_sgmii_active_82575(hw))
+               return;
+
+       /* Enable PCS to turn on link */
+       reg = rd32(E1000_PCS_CFG0);
+       reg |= E1000_PCS_CFG_PCS_EN;
+       wr32(E1000_PCS_CFG0, reg);
+
+       /* Power up the laser */
+       reg = rd32(E1000_CTRL_EXT);
+       reg &= ~E1000_CTRL_EXT_SDP3_DATA;
+       wr32(E1000_CTRL_EXT, reg);
+
+       /* flush the write to verify completion */
+       wrfl();
+       msleep(1);
+}
+
+/**
+ *  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;
+
+       /* 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 = rd32(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 0;
+}
+
+/**
+ *  igb_shutdown_serdes_link_82575 - Remove link during power down
+ *  @hw: pointer to the HW structure
+ *
+ *  In the case of fiber serdes, shut down optics and PCS on driver unload
+ *  when management pass thru is not enabled.
+ **/
+void igb_shutdown_serdes_link_82575(struct e1000_hw *hw)
+{
+       u32 reg;
+
+       if (hw->phy.media_type != e1000_media_type_internal_serdes &&
+           igb_sgmii_active_82575(hw))
+               return;
+
+       if (!igb_enable_mng_pass_thru(hw)) {
+               /* Disable PCS to turn off link */
+               reg = rd32(E1000_PCS_CFG0);
+               reg &= ~E1000_PCS_CFG_PCS_EN;
+               wr32(E1000_PCS_CFG0, reg);
+
+               /* shutdown the laser */
+               reg = rd32(E1000_CTRL_EXT);
+               reg |= E1000_CTRL_EXT_SDP3_DATA;
+               wr32(E1000_CTRL_EXT, reg);
+
+               /* flush the write to verify completion */
+               wrfl();
+               msleep(1);
+       }
+}
+
+/**
+ *  igb_reset_hw_82575 - 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 the api module.
+ **/
+static s32 igb_reset_hw_82575(struct e1000_hw *hw)
+{
+       u32 ctrl, icr;
+       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 = igb_disable_pcie_master(hw);
+       if (ret_val)
+               hw_dbg("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) {
+               hw_dbg("PCI-E Set completion timeout has failed.\n");
+       }
+
+       hw_dbg("Masking off all interrupts\n");
+       wr32(E1000_IMC, 0xffffffff);
+
+       wr32(E1000_RCTL, 0);
+       wr32(E1000_TCTL, E1000_TCTL_PSP);
+       wrfl();
+
+       msleep(10);
+
+       ctrl = rd32(E1000_CTRL);
+
+       hw_dbg("Issuing a global reset to MAC\n");
+       wr32(E1000_CTRL, ctrl | E1000_CTRL_RST);
+
+       ret_val = igb_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.
+                */
+               hw_dbg("Auto Read Done did not complete\n");
+       }
+
+       /* If EEPROM is not present, run manual init scripts */
+       if ((rd32(E1000_EECD) & E1000_EECD_PRES) == 0)
+               igb_reset_init_script_82575(hw);
+
+       /* Clear any pending interrupt events. */
+       wr32(E1000_IMC, 0xffffffff);
+       icr = rd32(E1000_ICR);
+
+       /* Install any alternate MAC address into RAR0 */
+       ret_val = igb_check_alt_mac_addr(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;
+
+       /* Initialize identification LED */
+       ret_val = igb_id_led_init(hw);
+       if (ret_val) {
+               hw_dbg("Error initializing identification LED\n");
+               /* This is not fatal and we should not stop init due to this */
+       }
+
+       /* Disabling VLAN filtering */
+       hw_dbg("Initializing the IEEE VLAN\n");
+       igb_clear_vfta(hw);
+
+       /* Setup the receive address */
+       igb_init_rx_addrs(hw, rar_count);
+
+       /* Zero out the Multicast HASH table */
+       hw_dbg("Zeroing the MTA\n");
+       for (i = 0; i < mac->mta_reg_count; i++)
+               array_wr32(E1000_MTA, i, 0);
+
+       /* Zero out the Unicast HASH table */
+       hw_dbg("Zeroing the UTA\n");
+       for (i = 0; i < mac->uta_reg_count; i++)
+               array_wr32(E1000_UTA, i, 0);
+
+       /* Setup link and flow control */
+       ret_val = igb_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;
+
+       ctrl = rd32(E1000_CTRL);
+       ctrl |= E1000_CTRL_SLU;
+       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
+       wr32(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) {
+               /* allow time for SFP cage time to power up phy */
+               msleep(300);
+
+               ret_val = hw->phy.ops.reset(hw);
+               if (ret_val) {
+                       hw_dbg("Error resetting the PHY.\n");
+                       goto out;
+               }
+       }
+       switch (hw->phy.type) {
+       case e1000_phy_m88:
+               if (hw->phy.id == I347AT4_E_PHY_ID ||
+                   hw->phy.id == M88E1112_E_PHY_ID)
+                       ret_val = igb_copper_link_setup_m88_gen2(hw);
+               else
+                       ret_val = igb_copper_link_setup_m88(hw);
+               break;
+       case e1000_phy_igp_3:
+               ret_val = igb_copper_link_setup_igp(hw);
+               break;
+       case e1000_phy_82580:
+               ret_val = igb_copper_link_setup_82580(hw);
+               break;
+       default:
+               ret_val = -E1000_ERR_PHY;
+               break;
+       }
+
+       if (ret_val)
+               goto out;
+
+       ret_val = igb_setup_copper_link(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_ext, ctrl_reg, reg;
+       bool pcs_autoneg;
+       s32 ret_val = E1000_SUCCESS;
+       u16 data;
+
+       if ((hw->phy.media_type != e1000_media_type_internal_serdes) &&
+           !igb_sgmii_active_82575(hw))
+               return ret_val;
+
+
+       /*
+        * 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.
+        */
+       wr32(E1000_SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
+
+       /* power on the sfp cage if present */
+       ctrl_ext = rd32(E1000_CTRL_EXT);
+       ctrl_ext &= ~E1000_CTRL_EXT_SDP3_DATA;
+       wr32(E1000_CTRL_EXT, ctrl_ext);
+
+       ctrl_reg = rd32(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 = rd32(E1000_CONNSW);
+               reg |= E1000_CONNSW_ENRGSRC;
+               wr32(E1000_CONNSW, reg);
+       }
+
+       reg = rd32(E1000_PCS_LCTL);
+
+       /* default pcs_autoneg to the same setting as mac autoneg */
+       pcs_autoneg = hw->mac.autoneg;
+
+       switch (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK) {
+       case E1000_CTRL_EXT_LINK_MODE_SGMII:
+               /* sgmii mode lets the phy handle forcing speed/duplex */
+               pcs_autoneg = true;
+               /* autoneg time out should be disabled for SGMII mode */
+               reg &= ~(E1000_PCS_LCTL_AN_TIMEOUT);
+               break;
+       case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX:
+               /* disable PCS autoneg and support parallel detect only */
+               pcs_autoneg = false;
+       default:
+               if (hw->mac.type == e1000_82575 ||
+                   hw->mac.type == e1000_82576) {
+                       ret_val = hw->nvm.ops.read(hw, NVM_COMPAT, 1, &data);
+                       if (ret_val) {
+                               printk(KERN_DEBUG "NVM Read Error\n\n");
+                               return ret_val;
+                       }
+
+                       if (data & E1000_EEPROM_PCS_AUTONEG_DISABLE_BIT)
+                               pcs_autoneg = false;
+               }
+
+               /*
+                * non-SGMII modes only supports a speed of 1000/Full for the
+                * link so it is best to just force the MAC and let the pcs
+                * link either autoneg or be forced to 1000/Full
+                */
+               ctrl_reg |= E1000_CTRL_SPD_1000 | E1000_CTRL_FRCSPD |
+                           E1000_CTRL_FD | E1000_CTRL_FRCDPX;
+
+               /* set speed of 1000/Full if speed/duplex is forced */
+               reg |= E1000_PCS_LCTL_FSV_1000 | E1000_PCS_LCTL_FDV_FULL;
+               break;
+       }
+
+       wr32(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;
+
+       if (pcs_autoneg) {
+               /* Set PCS register for autoneg */
+               reg |= E1000_PCS_LCTL_AN_ENABLE | /* Enable Autoneg */
+                      E1000_PCS_LCTL_AN_RESTART; /* Restart autoneg */
+               hw_dbg("Configuring Autoneg:PCS_LCTL=0x%08X\n", reg);
+       } else {
+               /* Set PCS register for forced link */
+               reg |= E1000_PCS_LCTL_FSD;        /* Force Speed */
+
+               hw_dbg("Configuring Forced Link:PCS_LCTL=0x%08X\n", reg);
+       }
+
+       wr32(E1000_PCS_LCTL, reg);
+
+       if (!igb_sgmii_active_82575(hw))
+               igb_force_mac_fc(hw);
+
+       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)
+{
+       if (hw->mac.type == e1000_82575) {
+               hw_dbg("Running reset init script for 82575\n");
+               /* SerDes configuration via SERDESCTRL */
+               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x00, 0x0C);
+               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x01, 0x78);
+               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x1B, 0x23);
+               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x23, 0x15);
+
+               /* CCM configuration via CCMCTL register */
+               igb_write_8bit_ctrl_reg(hw, E1000_CCMCTL, 0x14, 0x00);
+               igb_write_8bit_ctrl_reg(hw, E1000_CCMCTL, 0x10, 0x00);
+
+               /* PCIe lanes configuration */
+               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x00, 0xEC);
+               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x61, 0xDF);
+               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x34, 0x05);
+               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x2F, 0x81);
+
+               /* PCIe PLL Configuration */
+               igb_write_8bit_ctrl_reg(hw, E1000_SCCTL, 0x02, 0x47);
+               igb_write_8bit_ctrl_reg(hw, E1000_SCCTL, 0x14, 0x00);
+               igb_write_8bit_ctrl_reg(hw, E1000_SCCTL, 0x10, 0x00);
+       }
+
+       return 0;
+}
+
+/**
+ *  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 = 0;
+
+       /*
+        * 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(hw);
+       if (ret_val)
+               goto out;
+
+       ret_val = igb_read_mac_addr(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.
+ **/
+void igb_power_down_phy_copper_82575(struct e1000_hw *hw)
+{
+       /* If the management interface is not enabled, then power down */
+       if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw)))
+               igb_power_down_phy_copper(hw);
+}
+
+/**
+ *  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)
+{
+       igb_clear_hw_cntrs_base(hw);
+
+       rd32(E1000_PRC64);
+       rd32(E1000_PRC127);
+       rd32(E1000_PRC255);
+       rd32(E1000_PRC511);
+       rd32(E1000_PRC1023);
+       rd32(E1000_PRC1522);
+       rd32(E1000_PTC64);
+       rd32(E1000_PTC127);
+       rd32(E1000_PTC255);
+       rd32(E1000_PTC511);
+       rd32(E1000_PTC1023);
+       rd32(E1000_PTC1522);
+
+       rd32(E1000_ALGNERRC);
+       rd32(E1000_RXERRC);
+       rd32(E1000_TNCRS);
+       rd32(E1000_CEXTERR);
+       rd32(E1000_TSCTC);
+       rd32(E1000_TSCTFC);
+
+       rd32(E1000_MGTPRC);
+       rd32(E1000_MGTPDC);
+       rd32(E1000_MGTPTC);
+
+       rd32(E1000_IAC);
+       rd32(E1000_ICRXOC);
+
+       rd32(E1000_ICRXPTC);
+       rd32(E1000_ICRXATC);
+       rd32(E1000_ICTXPTC);
+       rd32(E1000_ICTXATC);
+       rd32(E1000_ICTXQEC);
+       rd32(E1000_ICTXQMTC);
+       rd32(E1000_ICRXDMTC);
+
+       rd32(E1000_CBTMPC);
+       rd32(E1000_HTDPMC);
+       rd32(E1000_CBRMPC);
+       rd32(E1000_RPTHC);
+       rd32(E1000_HGPTC);
+       rd32(E1000_HTCBDPC);
+       rd32(E1000_HGORCL);
+       rd32(E1000_HGORCH);
+       rd32(E1000_HGOTCL);
+       rd32(E1000_HGOTCH);
+       rd32(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))
+               rd32(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;
+
+       if (hw->mac.type != e1000_82575 ||
+           !(rd32(E1000_MANC) & E1000_MANC_RCV_TCO_EN))
+               return;
+
+       /* Disable all RX queues */
+       for (i = 0; i < 4; i++) {
+               rxdctl[i] = rd32(E1000_RXDCTL(i));
+               wr32(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++) {
+               msleep(1);
+               rx_enabled = 0;
+               for (i = 0; i < 4; i++)
+                       rx_enabled |= rd32(E1000_RXDCTL(i));
+               if (!(rx_enabled & E1000_RXDCTL_QUEUE_ENABLE))
+                       break;
+       }
+
+       if (ms_wait == 10)
+               hw_dbg("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 = rd32(E1000_RFCTL);
+       wr32(E1000_RFCTL, rfctl & ~E1000_RFCTL_LEF);
+
+       rlpml = rd32(E1000_RLPML);
+       wr32(E1000_RLPML, 0);
+
+       rctl = rd32(E1000_RCTL);
+       temp_rctl = rctl & ~(E1000_RCTL_EN | E1000_RCTL_SBP);
+       temp_rctl |= E1000_RCTL_LPE;
+
+       wr32(E1000_RCTL, temp_rctl);
+       wr32(E1000_RCTL, temp_rctl | E1000_RCTL_EN);
+       wrfl();
+       msleep(2);
+
+       /* Enable RX queues that were previously enabled and restore our
+        * previous state
+        */
+       for (i = 0; i < 4; i++)
+               wr32(E1000_RXDCTL(i), rxdctl[i]);
+       wr32(E1000_RCTL, rctl);
+       wrfl();
+
+       wr32(E1000_RLPML, rlpml);
+       wr32(E1000_RFCTL, rfctl);
+
+       /* Flush receive errors generated by workaround */
+       rd32(E1000_ROC);
+       rd32(E1000_RNBC);
+       rd32(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 = rd32(E1000_GCR);
+       s32 ret_val = 0;
+       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;
+
+       wr32(E1000_GCR, gcr);
+       return ret_val;
+}
+
+/**
+ *  igb_vmdq_set_anti_spoofing_pf - enable or disable anti-spoofing
+ *  @hw: pointer to the hardware struct
+ *  @enable: state to enter, either enabled or disabled
+ *  @pf: Physical Function pool - do not set anti-spoofing for the PF
+ *
+ *  enables/disables L2 switch anti-spoofing functionality.
+ **/
+void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *hw, bool enable, int pf)
+{
+       u32 dtxswc;
+
+       switch (hw->mac.type) {
+       case e1000_82576:
+       case e1000_i350:
+               dtxswc = rd32(E1000_DTXSWC);
+               if (enable) {
+                       dtxswc |= (E1000_DTXSWC_MAC_SPOOF_MASK |
+                                  E1000_DTXSWC_VLAN_SPOOF_MASK);
+                       /* The PF can spoof - it has to in order to
+                        * support emulation mode NICs */
+                       dtxswc ^= (1 << pf | 1 << (pf + MAX_NUM_VFS));
+               } else {
+                       dtxswc &= ~(E1000_DTXSWC_MAC_SPOOF_MASK |
+                                   E1000_DTXSWC_VLAN_SPOOF_MASK);
+               }
+               wr32(E1000_DTXSWC, dtxswc);
+               break;
+       default:
+               break;
+       }
+}
+
+/**
+ *  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 = rd32(E1000_DTXSWC);
+
+       if (enable)
+               dtxswc |= E1000_DTXSWC_VMDQ_LOOPBACK_EN;
+       else
+               dtxswc &= ~E1000_DTXSWC_VMDQ_LOOPBACK_EN;
+
+       wr32(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 = rd32(E1000_VT_CTL);
+
+       if (enable)
+               vt_ctl |= E1000_VT_CTL_VM_REPL_EN;
+       else
+               vt_ctl &= ~E1000_VT_CTL_VM_REPL_EN;
+
+       wr32(E1000_VT_CTL, vt_ctl);
+}
+
+/**
+ *  igb_read_phy_reg_82580 - Read 82580 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.
+ **/
+static s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       s32 ret_val;
+
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               goto out;
+
+       ret_val = igb_read_phy_reg_mdic(hw, offset, data);
+
+       hw->phy.ops.release(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_write_phy_reg_82580 - Write 82580 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.
+ **/
+static s32 igb_write_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       s32 ret_val;
+
+
+       ret_val = hw->phy.ops.acquire(hw);
+       if (ret_val)
+               goto out;
+
+       ret_val = igb_write_phy_reg_mdic(hw, offset, data);
+
+       hw->phy.ops.release(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits
+ *  @hw: pointer to the HW structure
+ *
+ *  This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on
+ *  the values found in the EEPROM.  This addresses an issue in which these
+ *  bits are not restored from EEPROM after reset.
+ **/
+static s32 igb_reset_mdicnfg_82580(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u32 mdicnfg;
+       u16 nvm_data = 0;
+
+       if (hw->mac.type != e1000_82580)
+               goto out;
+       if (!igb_sgmii_active_82575(hw))
+               goto out;
+
+       ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
+                                  NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
+                                  &nvm_data);
+       if (ret_val) {
+               hw_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       mdicnfg = rd32(E1000_MDICNFG);
+       if (nvm_data & NVM_WORD24_EXT_MDIO)
+               mdicnfg |= E1000_MDICNFG_EXT_MDIO;
+       if (nvm_data & NVM_WORD24_COM_MDIO)
+               mdicnfg |= E1000_MDICNFG_COM_MDIO;
+       wr32(E1000_MDICNFG, mdicnfg);
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_reset_hw_82580 - Reset hardware
+ *  @hw: pointer to the HW structure
+ *
+ *  This resets function or entire device (all ports, etc.)
+ *  to a known state.
+ **/
+static s32 igb_reset_hw_82580(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       /* BH SW mailbox bit in SW_FW_SYNC */
+       u16 swmbsw_mask = E1000_SW_SYNCH_MB;
+       u32 ctrl, icr;
+       bool global_device_reset = hw->dev_spec._82575.global_device_reset;
+
+
+       hw->dev_spec._82575.global_device_reset = false;
+
+       /* Get current control state. */
+       ctrl = rd32(E1000_CTRL);
+
+       /*
+        * 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(hw);
+       if (ret_val)
+               hw_dbg("PCI-E Master disable polling has failed.\n");
+
+       hw_dbg("Masking off all interrupts\n");
+       wr32(E1000_IMC, 0xffffffff);
+       wr32(E1000_RCTL, 0);
+       wr32(E1000_TCTL, E1000_TCTL_PSP);
+       wrfl();
+
+       msleep(10);
+
+       /* Determine whether or not a global dev reset is requested */
+       if (global_device_reset &&
+               igb_acquire_swfw_sync_82575(hw, swmbsw_mask))
+                       global_device_reset = false;
+
+       if (global_device_reset &&
+               !(rd32(E1000_STATUS) & E1000_STAT_DEV_RST_SET))
+               ctrl |= E1000_CTRL_DEV_RST;
+       else
+               ctrl |= E1000_CTRL_RST;
+
+       wr32(E1000_CTRL, ctrl);
+       wrfl();
+
+       /* Add delay to insure DEV_RST has time to complete */
+       if (global_device_reset)
+               msleep(5);
+
+       ret_val = igb_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.
+                */
+               hw_dbg("Auto Read Done did not complete\n");
+       }
+
+       /* If EEPROM is not present, run manual init scripts */
+       if ((rd32(E1000_EECD) & E1000_EECD_PRES) == 0)
+               igb_reset_init_script_82575(hw);
+
+       /* clear global device reset status bit */
+       wr32(E1000_STATUS, E1000_STAT_DEV_RST_SET);
+
+       /* Clear any pending interrupt events. */
+       wr32(E1000_IMC, 0xffffffff);
+       icr = rd32(E1000_ICR);
+
+       ret_val = igb_reset_mdicnfg_82580(hw);
+       if (ret_val)
+               hw_dbg("Could not reset MDICNFG based on EEPROM\n");
+
+       /* Install any alternate MAC address into RAR0 */
+       ret_val = igb_check_alt_mac_addr(hw);
+
+       /* Release semaphore */
+       if (global_device_reset)
+               igb_release_swfw_sync_82575(hw, swmbsw_mask);
+
+       return ret_val;
+}
+
+/**
+ *  igb_rxpbs_adjust_82580 - adjust RXPBS value to reflect actual RX PBA size
+ *  @data: data received by reading RXPBS register
+ *
+ *  The 82580 uses a table based approach for packet buffer allocation sizes.
+ *  This function converts the retrieved value into the correct table value
+ *     0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7
+ *  0x0 36  72 144   1   2   4   8  16
+ *  0x8 35  70 140 rsv rsv rsv rsv rsv
+ */
+u16 igb_rxpbs_adjust_82580(u32 data)
+{
+       u16 ret_val = 0;
+
+       if (data < E1000_82580_RXPBS_TABLE_SIZE)
+               ret_val = e1000_82580_rxpbs_table[data];
+
+       return ret_val;
+}
+
+/**
+ *  igb_validate_nvm_checksum_with_offset - Validate EEPROM
+ *  checksum
+ *  @hw: pointer to the HW structure
+ *  @offset: offset in words of the checksum protected region
+ *
+ *  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_with_offset(struct e1000_hw *hw, u16 offset)
+{
+       s32 ret_val = 0;
+       u16 checksum = 0;
+       u16 i, nvm_data;
+
+       for (i = offset; i < ((NVM_CHECKSUM_REG + offset) + 1); i++) {
+               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
+               if (ret_val) {
+                       hw_dbg("NVM Read Error\n");
+                       goto out;
+               }
+               checksum += nvm_data;
+       }
+
+       if (checksum != (u16) NVM_SUM) {
+               hw_dbg("NVM Checksum Invalid\n");
+               ret_val = -E1000_ERR_NVM;
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_update_nvm_checksum_with_offset - Update EEPROM
+ *  checksum
+ *  @hw: pointer to the HW structure
+ *  @offset: offset in words of the checksum protected region
+ *
+ *  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_with_offset(struct e1000_hw *hw, u16 offset)
+{
+       s32 ret_val;
+       u16 checksum = 0;
+       u16 i, nvm_data;
+
+       for (i = offset; i < (NVM_CHECKSUM_REG + offset); i++) {
+               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
+               if (ret_val) {
+                       hw_dbg("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 + offset), 1,
+                               &checksum);
+       if (ret_val)
+               hw_dbg("NVM Write Error while updating checksum.\n");
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_validate_nvm_checksum_82580 - Validate EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Calculates the EEPROM section checksum by reading/adding each word of
+ *  the EEPROM and then verifies that the sum of the EEPROM is
+ *  equal to 0xBABA.
+ **/
+static s32 igb_validate_nvm_checksum_82580(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 eeprom_regions_count = 1;
+       u16 j, nvm_data;
+       u16 nvm_offset;
+
+       ret_val = hw->nvm.ops.read(hw, NVM_COMPATIBILITY_REG_3, 1, &nvm_data);
+       if (ret_val) {
+               hw_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       if (nvm_data & NVM_COMPATIBILITY_BIT_MASK) {
+               /* if checksums compatibility bit is set validate checksums
+                * for all 4 ports. */
+               eeprom_regions_count = 4;
+       }
+
+       for (j = 0; j < eeprom_regions_count; j++) {
+               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+               ret_val = igb_validate_nvm_checksum_with_offset(hw,
+                                                               nvm_offset);
+               if (ret_val != 0)
+                       goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_update_nvm_checksum_82580 - Update EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Updates the EEPROM section checksums for all 4 ports 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 igb_update_nvm_checksum_82580(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       u16 j, nvm_data;
+       u16 nvm_offset;
+
+       ret_val = hw->nvm.ops.read(hw, NVM_COMPATIBILITY_REG_3, 1, &nvm_data);
+       if (ret_val) {
+               hw_dbg("NVM Read Error while updating checksum"
+                       " compatibility bit.\n");
+               goto out;
+       }
+
+       if ((nvm_data & NVM_COMPATIBILITY_BIT_MASK) == 0) {
+               /* set compatibility bit to validate checksums appropriately */
+               nvm_data = nvm_data | NVM_COMPATIBILITY_BIT_MASK;
+               ret_val = hw->nvm.ops.write(hw, NVM_COMPATIBILITY_REG_3, 1,
+                                       &nvm_data);
+               if (ret_val) {
+                       hw_dbg("NVM Write Error while updating checksum"
+                               " compatibility bit.\n");
+                       goto out;
+               }
+       }
+
+       for (j = 0; j < 4; j++) {
+               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+               ret_val = igb_update_nvm_checksum_with_offset(hw, nvm_offset);
+               if (ret_val)
+                       goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_validate_nvm_checksum_i350 - Validate EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Calculates the EEPROM section checksum by reading/adding each word of
+ *  the EEPROM and then verifies that the sum of the EEPROM is
+ *  equal to 0xBABA.
+ **/
+static s32 igb_validate_nvm_checksum_i350(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 j;
+       u16 nvm_offset;
+
+       for (j = 0; j < 4; j++) {
+               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+               ret_val = igb_validate_nvm_checksum_with_offset(hw,
+                                                               nvm_offset);
+               if (ret_val != 0)
+                       goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_update_nvm_checksum_i350 - Update EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Updates the EEPROM section checksums for all 4 ports 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 igb_update_nvm_checksum_i350(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 j;
+       u16 nvm_offset;
+
+       for (j = 0; j < 4; j++) {
+               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+               ret_val = igb_update_nvm_checksum_with_offset(hw, nvm_offset);
+               if (ret_val != 0)
+                       goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_set_eee_i350 - Enable/disable EEE support
+ *  @hw: pointer to the HW structure
+ *
+ *  Enable/disable EEE based on setting in dev_spec structure.
+ *
+ **/
+s32 igb_set_eee_i350(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u32 ipcnfg, eeer, ctrl_ext;
+
+       ctrl_ext = rd32(E1000_CTRL_EXT);
+       if ((hw->mac.type != e1000_i350) ||
+           (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK))
+               goto out;
+       ipcnfg = rd32(E1000_IPCNFG);
+       eeer = rd32(E1000_EEER);
+
+       /* enable or disable per user setting */
+       if (!(hw->dev_spec._82575.eee_disable)) {
+               ipcnfg |= (E1000_IPCNFG_EEE_1G_AN |
+                       E1000_IPCNFG_EEE_100M_AN);
+               eeer |= (E1000_EEER_TX_LPI_EN |
+                       E1000_EEER_RX_LPI_EN |
+                       E1000_EEER_LPI_FC);
+
+       } else {
+               ipcnfg &= ~(E1000_IPCNFG_EEE_1G_AN |
+                       E1000_IPCNFG_EEE_100M_AN);
+               eeer &= ~(E1000_EEER_TX_LPI_EN |
+                       E1000_EEER_RX_LPI_EN |
+                       E1000_EEER_LPI_FC);
+       }
+       wr32(E1000_IPCNFG, ipcnfg);
+       wr32(E1000_EEER, eeer);
+out:
+
+       return ret_val;
+}
+
+static struct e1000_mac_operations e1000_mac_ops_82575 = {
+       .init_hw              = igb_init_hw_82575,
+       .check_for_link       = igb_check_for_link_82575,
+       .rar_set              = igb_rar_set,
+       .read_mac_addr        = igb_read_mac_addr_82575,
+       .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
+};
+
+static struct e1000_phy_operations e1000_phy_ops_82575 = {
+       .acquire              = igb_acquire_phy_82575,
+       .get_cfg_done         = igb_get_cfg_done_82575,
+       .release              = igb_release_phy_82575,
+};
+
+static struct e1000_nvm_operations e1000_nvm_ops_82575 = {
+       .acquire              = igb_acquire_nvm_82575,
+       .read                 = igb_read_nvm_eerd,
+       .release              = igb_release_nvm_82575,
+       .write                = igb_write_nvm_spi,
+};
+
+const struct e1000_info e1000_82575_info = {
+       .get_invariants = igb_get_invariants_82575,
+       .mac_ops = &e1000_mac_ops_82575,
+       .phy_ops = &e1000_phy_ops_82575,
+       .nvm_ops = &e1000_nvm_ops_82575,
+};
+
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
new file mode 100644 (file)
index 0000000..786e110
--- /dev/null
@@ -0,0 +1,258 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_82575_H_
+#define _E1000_82575_H_
+
+extern void igb_shutdown_serdes_link_82575(struct e1000_hw *hw);
+extern void igb_power_up_serdes_link_82575(struct e1000_hw *hw);
+extern void igb_power_down_phy_copper_82575(struct e1000_hw *hw);
+extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);
+
+#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))
+
+#define E1000_RAR_ENTRIES_82575        16
+#define E1000_RAR_ENTRIES_82576        24
+#define E1000_RAR_ENTRIES_82580        24
+#define E1000_RAR_ENTRIES_I350         32
+
+#define E1000_SW_SYNCH_MB              0x00000100
+#define E1000_STAT_DEV_RST_SET         0x00100000
+#define E1000_CTRL_DEV_RST             0x20000000
+
+/* SRRCTL bit definitions */
+#define E1000_SRRCTL_BSIZEPKT_SHIFT                     10 /* Shift _right_ */
+#define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT                 2  /* Shift _left_ */
+#define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF                0x02000000
+#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS          0x0A000000
+#define E1000_SRRCTL_DROP_EN                            0x80000000
+#define E1000_SRRCTL_TIMESTAMP                          0x40000000
+
+#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_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)
+
+/* Immediate Interrupt Rx (A.K.A. Low Latency Interrupt) */
+#define E1000_IMIREXT_SIZE_BP     0x00001000  /* Packet size bypass */
+#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 {
+                       struct {
+                               __le16 pkt_info;   /* RSS type, Packet type */
+                               __le16 hdr_info;   /* Split Header,
+                                                   * header buffer length */
+                       } 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_HDRBUFLEN_MASK      0x7FE0
+#define E1000_RXDADV_HDRBUFLEN_SHIFT     5
+#define E1000_RXDADV_STAT_TS             0x10000 /* Pkt was time stamped */
+#define E1000_RXDADV_STAT_TSIP           0x08000 /* timestamp in packet */
+
+/* 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_MAC_TSTAMP   0x00080000 /* IEEE1588 Timestamp packet */
+#define E1000_ADVTXD_DTYP_CTXT    0x00200000 /* Advanced Context Descriptor */
+#define E1000_ADVTXD_DTYP_DATA    0x00300000 /* Advanced Data Descriptor */
+#define E1000_ADVTXD_DCMD_IFCS    0x02000000 /* Insert FCS (Ethernet CRC) */
+#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_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_TUCMD_IPV4    0x00000400  /* IP Packet Type: 1=IPv4 */
+#define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800  /* L4 Packet TYPE of TCP */
+#define E1000_ADVTXD_TUCMD_L4T_SCTP 0x00001000 /* L4 packet TYPE of SCTP */
+/* IPSec Encrypt Enable for ESP */
+#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 */
+/* Adv ctxt IPSec ESP len mask */
+
+/* Additional Transmit Descriptor Control definitions */
+#define E1000_TXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Tx Queue */
+/* Tx Queue Arbitration Priority 0=low, 1=high */
+
+/* Additional Receive Descriptor Control definitions */
+#define E1000_RXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Rx Queue */
+
+/* Direct Cache Access (DCA) definitions */
+#define E1000_DCA_CTRL_DCA_MODE_DISABLE 0x01 /* DCA Disable */
+#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 */
+
+/* Additional DCA related definitions, note change in position of CPUID */
+#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 24 /* Tx CPUID now in the last byte */
+#define E1000_DCA_RXCTRL_CPUID_SHIFT 24 /* Rx CPUID now in the last byte */
+
+/* ETQF register bit definitions */
+#define E1000_ETQF_FILTER_ENABLE   (1 << 26)
+#define E1000_ETQF_1588            (1 << 30)
+
+/* FTQF register bit definitions */
+#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_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_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_VMVIR_VLANA_DEFAULT      0x40000000 /* Always use default VLAN */
+#define E1000_VMVIR_VLANA_NEVER        0x80000000 /* Never insert VLAN tag */
+
+#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 E1000_EEPROM_PCS_AUTONEG_DISABLE_BIT   (1 << 14)
+
+#define ALL_QUEUES   0xFFFF
+
+/* RX packet buffer size defines */
+#define E1000_RXPBS_SIZE_MASK_82576  0x0000007F
+void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *, bool, int);
+void igb_vmdq_set_loopback_pf(struct e1000_hw *, bool);
+void igb_vmdq_set_replication_pf(struct e1000_hw *, bool);
+u16 igb_rxpbs_adjust_82580(u32 data);
+s32 igb_set_eee_i350(struct e1000_hw *);
+
+#endif
diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
new file mode 100644 (file)
index 0000000..7b8ddd8
--- /dev/null
@@ -0,0 +1,834 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#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_PME_EN     0x00000002 /* PME Enable */
+
+/* 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 */
+
+/* Extended Device Control */
+#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Defineable Pin 3 */
+/* Physical Func Reset Done Indication */
+#define E1000_CTRL_EXT_PFRSTD    0x00004000
+#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
+#define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
+#define E1000_CTRL_EXT_LINK_MODE_1000BASE_KX  0x00400000
+#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
+#define E1000_CTRL_EXT_LINK_MODE_GMII   0x00000000
+#define E1000_CTRL_EXT_EIAME          0x01000000
+#define E1000_CTRL_EXT_IRCA           0x00000001
+/* Interrupt delay cancellation */
+/* Driver loaded bit for FW */
+#define E1000_CTRL_EXT_DRV_LOAD       0x10000000
+/* Interrupt acknowledge Auto-mask */
+/* Clear Interrupt timers after IMS clear */
+/* packet buffer parity error detection enabled */
+/* descriptor FIFO parity error detection enable */
+#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
+#define E1000_I2CCMD_REG_ADDR_SHIFT   16
+#define E1000_I2CCMD_PHY_ADDR_SHIFT   24
+#define E1000_I2CCMD_OPCODE_READ      0x08000000
+#define E1000_I2CCMD_OPCODE_WRITE     0x00000000
+#define E1000_I2CCMD_READY            0x20000000
+#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_TS       0x10000 /* Pkt was time stamped */
+
+#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
+
+/* 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_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              0x00100000
+#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
+
+
+/* Management Control */
+#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
+#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
+#define E1000_MANC_EN_BMC2OS     0x10000000 /* OSBMC is Enabled or not */
+/* Enable Neighbor Discovery Filtering */
+#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets 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
+
+/* Receive Control */
+#define E1000_RCTL_EN             0x00000002    /* enable */
+#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
+#define E1000_RCTL_UPE            0x00000008    /* unicast promiscuous enable */
+#define E1000_RCTL_MPE            0x00000010    /* multicast promiscuous enab */
+#define E1000_RCTL_LPE            0x00000020    /* long packet enable */
+#define E1000_RCTL_LBM_MAC        0x00000040    /* MAC loopback mode */
+#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */
+#define E1000_RCTL_RDMTS_HALF     0x00000000    /* rx desc min threshold size */
+#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
+#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */
+#define E1000_RCTL_SZ_512         0x00020000    /* rx buffer size 512 */
+#define E1000_RCTL_SZ_256         0x00030000    /* rx buffer size 256 */
+#define E1000_RCTL_VFE            0x00040000    /* vlan filter enable */
+#define E1000_RCTL_CFIEN          0x00080000    /* canonical form enable */
+#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
+
+/*
+ * 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   0x1
+#define E1000_SWFW_PHY0_SM  0x2
+#define E1000_SWFW_PHY1_SM  0x4
+#define E1000_SWFW_PHY2_SM  0x20
+#define E1000_SWFW_PHY3_SM  0x40
+
+/* FACTPS Definitions */
+/* Device Control */
+#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
+#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master requests */
+#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
+#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_100  0x00000100  /* Force 100Mb */
+#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
+#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
+#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
+/* Defined polarity of Dock/Undock indication in SDP[0] */
+/* Reset both PHY ports, through PHYRST_N pin */
+/* 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_SWDPIO0  0x00400000  /* SWDPIN 0 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_VME      0x40000000  /* IEEE VLAN mode enable */
+#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
+/* Initiate an interrupt to manageability engine */
+#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_CONNSW_ENRGSRC             0x4
+#define E1000_PCS_CFG_PCS_EN             8
+#define E1000_PCS_LCTL_FLV_LINK_UP       1
+#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_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_ENABLE_SERDES_LOOPBACK     0x0410
+
+#define E1000_PCS_LSTS_LINK_OK           1
+#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
+
+/* 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_1     0x00000004      /* Function 1 */
+#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
+#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
+#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
+/* Change in Dock/Undock state. Clear on write '0'. */
+/* Status of Master requests. */
+#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000
+/* BMC external code execution disabled */
+
+/* Constants used to intrepret the masked PCI-X bus speed. */
+
+#define SPEED_10    10
+#define SPEED_100   100
+#define SPEED_1000  1000
+#define HALF_DUPLEX 1
+#define FULL_DUPLEX 2
+
+
+#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_SHIFT      0
+#define E1000_LEDCTL_LED0_BLINK           0x00000080
+
+#define E1000_LEDCTL_MODE_LED_ON        0xE
+#define E1000_LEDCTL_MODE_LED_OFF       0xF
+
+/* Transmit Descriptor bit definitions */
+#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_RS     0x08000000 /* Report Status */
+#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
+#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
+/* Extended desc bits for Linksec and timesync */
+
+/* Transmit Control */
+#define E1000_TCTL_EN     0x00000002    /* enable tx */
+#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_RTLC   0x01000000    /* Re-transmit on late collision */
+
+/* DMA Coalescing register fields */
+#define E1000_DMACR_DMACWT_MASK         0x00003FFF /* DMA Coalescing
+                                                       * Watchdog Timer */
+#define E1000_DMACR_DMACTHR_MASK        0x00FF0000 /* DMA Coalescing Receive
+                                                       * Threshold */
+#define E1000_DMACR_DMACTHR_SHIFT       16
+#define E1000_DMACR_DMAC_LX_MASK        0x30000000 /* Lx when no PCIe
+                                                       * transactions */
+#define E1000_DMACR_DMAC_LX_SHIFT       28
+#define E1000_DMACR_DMAC_EN             0x80000000 /* Enable DMA Coalescing */
+
+#define E1000_DMCTXTH_DMCTTHR_MASK      0x00000FFF /* DMA Coalescing Transmit
+                                                       * Threshold */
+
+#define E1000_DMCTLX_TTLX_MASK          0x00000FFF /* Time to LX request */
+
+#define E1000_DMCRTRH_UTRESH_MASK       0x0007FFFF /* Receive Traffic Rate
+                                                       * Threshold */
+#define E1000_DMCRTRH_LRPRCW            0x80000000 /* Rcv packet rate in
+                                                       * current window */
+
+#define E1000_DMCCNT_CCOUNT_MASK        0x01FFFFFF /* DMA Coal Rcv Traffic
+                                                       * Current Cnt */
+
+#define E1000_FCRTC_RTH_COAL_MASK       0x0003FFF0 /* Flow ctrl Rcv Threshold
+                                                       * High val */
+#define E1000_FCRTC_RTH_COAL_SHIFT      4
+#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision */
+
+/* SerDes Control */
+#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
+
+/* Receive Checksum Control */
+#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
+#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
+#define E1000_RXCSUM_CRCOFL    0x00000800   /* CRC32 offload enable */
+#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
+
+/* Header split receive */
+#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
+
+/* Ethertype field values */
+#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
+
+#define MAX_JUMBO_FRAME_SIZE    0x3F00
+
+/* PBA constants */
+#define E1000_PBA_34K 0x0022
+#define E1000_PBA_64K 0x0040    /* 64KB */
+
+/* SW Semaphore Register */
+#define E1000_SWSM_SMBI         0x00000001 /* Driver Semaphore bit */
+#define E1000_SWSM_SWESMBI      0x00000002 /* FW Semaphore bit */
+
+/* Interrupt Cause Read */
+#define E1000_ICR_TXDW          0x00000001 /* Transmit desc written back */
+#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_RXT0          0x00000080 /* rx timer intr (ring 0) */
+#define E1000_ICR_VMMB          0x00000100 /* VM MB event */
+#define E1000_ICR_DRSTA         0x40000000 /* Device Reset Asserted */
+/* If this bit asserted, the driver should claim the interrupt */
+#define E1000_ICR_INT_ASSERTED  0x80000000
+/* LAN connected device generates an interrupt */
+#define E1000_ICR_DOUTSYNC      0x10000000 /* NIC DMA out of sync */
+
+/* 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_OTHER        0x80000000 /* Interrupt Cause Active */
+/* TCP Timer */
+
+/*
+ * 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    |    \
+    E1000_IMS_DOUTSYNC)
+
+/* Interrupt Mask Set */
+#define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Transmit desc written back */
+#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_RXT0      E1000_ICR_RXT0      /* rx timer intr */
+#define E1000_IMS_DRSTA     E1000_ICR_DRSTA     /* Device Reset Asserted */
+#define E1000_IMS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
+
+/* Extended Interrupt Mask Set */
+#define E1000_EIMS_OTHER        E1000_EICR_OTHER   /* Interrupt Cause Active */
+
+/* Interrupt Cause Set */
+#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
+#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
+#define E1000_ICS_DRSTA     E1000_ICR_DRSTA     /* Device Reset Aserted */
+
+/* Extended Interrupt Cause Set */
+
+/* Transmit Descriptor Control */
+/* Enable the counting of descriptors still to be processed. */
+
+/* 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_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_RESET   9
+#define E1000_ERR_MASTER_REQUESTS_PENDING 10
+#define E1000_BLK_PHY_RESET   12
+#define E1000_ERR_SWFW_SYNC 13
+#define E1000_NOT_IMPLEMENTED 14
+#define E1000_ERR_MBX      15
+#define E1000_ERR_INVALID_ARGUMENT  16
+#define E1000_ERR_NO_SPACE          17
+#define E1000_ERR_NVM_PBA_SECTION   18
+
+/* Loop limit on how long we wait for auto-negotiation to complete */
+#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. */
+/* Number of milliseconds for NVM auto read done after MAC reset. */
+#define AUTO_READ_DONE_TIMEOUT      10
+
+/* Flow Control */
+#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
+
+#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
+
+#define E1000_MDICNFG_EXT_MDIO    0x80000000      /* MDI ext/int destination */
+#define E1000_MDICNFG_COM_MDIO    0x40000000      /* MDI shared w/ lan 0 */
+#define E1000_MDICNFG_PHY_MASK    0x03E00000
+#define E1000_MDICNFG_PHY_SHIFT   21
+
+/* PCI Express Control */
+#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
+
+/* mPHY Address Control and Data Registers */
+#define E1000_MPHY_ADDR_CTL          0x0024 /* mPHY Address Control Register */
+#define E1000_MPHY_ADDR_CTL_OFFSET_MASK 0xFFFF0000
+#define E1000_MPHY_DATA                 0x0E10 /* mPHY Data Register */
+
+/* mPHY PCS CLK Register */
+#define E1000_MPHY_PCS_CLK_REG_OFFSET  0x0004 /* mPHY PCS CLK AFE CSR Offset */
+/* mPHY Near End Digital Loopback Override Bit */
+#define E1000_MPHY_PCS_CLK_REG_DIGINELBEN 0x10
+
+/* PHY Control Register */
+#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
+#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
+#define MII_CR_POWER_DOWN       0x0800  /* Power down */
+#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
+#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_LINK_STATUS       0x0004 /* Link Status 1 = link */
+#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
+
+/* Autoneg Advertisement Register */
+#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_PAUSE            0x0400   /* Pause operation desired */
+#define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
+
+/* Link Partner Ability Register (Base Page) */
+#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
+#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
+
+/* Autoneg Expansion Register */
+
+/* 1000BASE-T Control Register */
+#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
+#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
+#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 */
+
+/* 1000BASE-T Status Register */
+#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
+#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
+
+
+/* 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_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
+#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
+
+/* 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_REQ       0x00000040 /* NVM Access Request */
+#define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */
+#define E1000_EECD_PRES      0x00000100 /* NVM Present */
+/* NVM Addressing bits based on type 0=small, 1=large */
+#define E1000_EECD_ADDR_BITS 0x00000400
+#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
+
+/* Offset to data in NVM read/write registers */
+#define E1000_NVM_RW_REG_DATA   16
+#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_READ     0    /* Flag for polling for read complete */
+
+/* NVM Word Offsets */
+#define NVM_COMPAT                 0x0003
+#define NVM_ID_LED_SETTINGS        0x0004 /* SERDES output amplitude */
+#define NVM_INIT_CONTROL2_REG      0x000F
+#define NVM_INIT_CONTROL3_PORT_B   0x0014
+#define NVM_INIT_CONTROL3_PORT_A   0x0024
+#define NVM_ALT_MAC_ADDR_PTR       0x0037
+#define NVM_CHECKSUM_REG           0x003F
+#define NVM_COMPATIBILITY_REG_3    0x0003
+#define NVM_COMPATIBILITY_BIT_MASK 0x8000
+
+#define E1000_NVM_CFG_DONE_PORT_0  0x040000 /* MNG config cycle done */
+#define E1000_NVM_CFG_DONE_PORT_1  0x080000 /* ...for second port */
+#define E1000_NVM_CFG_DONE_PORT_2  0x100000 /* ...for third port */
+#define E1000_NVM_CFG_DONE_PORT_3  0x200000 /* ...for fourth port */
+
+#define NVM_82580_LAN_FUNC_OFFSET(a) (a ? (0x40 + (0x40 * a)) : 0)
+
+/* Mask bits for fields in Word 0x24 of the NVM */
+#define NVM_WORD24_COM_MDIO         0x0008 /* MDIO interface shared */
+#define NVM_WORD24_EXT_MDIO         0x0004 /* MDIO accesses routed external */
+
+/* Mask bits for fields in Word 0x0f of the NVM */
+#define NVM_WORD0F_PAUSE_MASK       0x3000
+#define NVM_WORD0F_ASM_DIR          0x2000
+
+/* Mask bits for fields in Word 0x1a of the NVM */
+
+/* length of string needed to store part num */
+#define E1000_PBANUM_LENGTH         11
+
+/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
+#define NVM_SUM                    0xBABA
+
+#define NVM_PBA_OFFSET_0           8
+#define NVM_PBA_OFFSET_1           9
+#define NVM_PBA_PTR_GUARD          0xFAFA
+#define NVM_WORD_SIZE_BASE_SHIFT   6
+
+/* NVM Commands - Microwire */
+
+/* NVM Commands - SPI */
+#define NVM_MAX_RETRY_SPI          5000 /* Max wait of 5ms, for RDY signal */
+#define NVM_WRITE_OPCODE_SPI       0x02 /* NVM write opcode */
+#define NVM_READ_OPCODE_SPI        0x03 /* NVM read 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_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
+
+/* SPI NVM Status Register */
+#define NVM_STATUS_RDY_SPI         0x01
+
+/* 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 PCIE_DEVICE_CONTROL2         0x28
+#define PCIE_DEVICE_CONTROL2_16ms    0x0005
+
+#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 M88E1111_I_PHY_ID    0x01410CC0
+#define M88E1112_E_PHY_ID    0x01410C90
+#define I347AT4_E_PHY_ID     0x01410DC0
+#define IGP03E1000_E_PHY_ID  0x02A80390
+#define I82580_I_PHY_ID      0x015403A0
+#define I350_I_PHY_ID        0x015403B0
+#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_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
+
+#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
+#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
+
+/* M88E1000 PHY Specific Control Register */
+#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
+/* 1=CLK125 low, 0=CLK125 toggling */
+#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
+ */
+/* 1=5-bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
+#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Transmit */
+
+/* M88E1000 PHY Specific Status Register */
+#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_SPEED              0xC000 /* Speed, bits 14:15 */
+#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
+
+#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
+
+/* M88E1000 Extended PHY Specific Control Register */
+/*
+ * 1 = Lost lock detect enabled.
+ * Will assert lost lock and bring
+ * link down if idle not seen
+ * within 1ms in 1000BASE-T
+ */
+/*
+ * 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
+/*
+ * 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_1X    0x0100
+#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
+
+/* Intel i347-AT4 Registers */
+
+#define I347AT4_PCDL                   0x10 /* PHY Cable Diagnostics Length */
+#define I347AT4_PCDC                   0x15 /* PHY Cable Diagnostics Control */
+#define I347AT4_PAGE_SELECT            0x16
+
+/* i347-AT4 Extended PHY Specific Control Register */
+
+/*
+ *  Number of times we will attempt to autonegotiate before downshifting if we
+ *  are the master
+ */
+#define I347AT4_PSCR_DOWNSHIFT_ENABLE 0x0800
+#define I347AT4_PSCR_DOWNSHIFT_MASK   0x7000
+#define I347AT4_PSCR_DOWNSHIFT_1X     0x0000
+#define I347AT4_PSCR_DOWNSHIFT_2X     0x1000
+#define I347AT4_PSCR_DOWNSHIFT_3X     0x2000
+#define I347AT4_PSCR_DOWNSHIFT_4X     0x3000
+#define I347AT4_PSCR_DOWNSHIFT_5X     0x4000
+#define I347AT4_PSCR_DOWNSHIFT_6X     0x5000
+#define I347AT4_PSCR_DOWNSHIFT_7X     0x6000
+#define I347AT4_PSCR_DOWNSHIFT_8X     0x7000
+
+/* i347-AT4 PHY Cable Diagnostics Control */
+#define I347AT4_PCDC_CABLE_LENGTH_UNIT 0x0400 /* 0=cm 1=meters */
+
+/* Marvell 1112 only registers */
+#define M88E1112_VCT_DSP_DISTANCE       0x001A
+
+/* M88EC018 Rev 2 specific DownShift settings */
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
+
+/* 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
+#define E1000_MDIC_DEST      0x80000000
+
+/* Thermal Sensor */
+#define E1000_THSTAT_PWR_DOWN       0x00000001 /* Power Down Event */
+#define E1000_THSTAT_LINK_THROTTLE  0x00000002 /* Link Speed Throttle Event */
+
+/* Energy Efficient Ethernet */
+#define E1000_IPCNFG_EEE_1G_AN       0x00000008  /* EEE Enable 1G AN */
+#define E1000_IPCNFG_EEE_100M_AN     0x00000004  /* EEE Enable 100M AN */
+#define E1000_EEER_TX_LPI_EN         0x00010000  /* EEE Tx LPI Enable */
+#define E1000_EEER_RX_LPI_EN         0x00020000  /* EEE Rx LPI Enable */
+#define E1000_EEER_LPI_FC            0x00040000  /* EEE Enable on FC */
+
+/* SerDes Control */
+#define E1000_GEN_CTL_READY             0x80000000
+#define E1000_GEN_CTL_ADDRESS_SHIFT     8
+#define E1000_GEN_POLL_TIMEOUT          640
+
+#define E1000_VFTA_ENTRY_SHIFT               5
+#define E1000_VFTA_ENTRY_MASK                0x7F
+#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F
+
+/* DMA Coalescing register fields */
+#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision based
+                                                      on DMA coal */
+
+/* Tx Rate-Scheduler Config fields */
+#define E1000_RTTBCNRC_RS_ENA          0x80000000
+#define E1000_RTTBCNRC_RF_DEC_MASK     0x00003FFF
+#define E1000_RTTBCNRC_RF_INT_SHIFT    14
+#define E1000_RTTBCNRC_RF_INT_MASK     \
+       (E1000_RTTBCNRC_RF_DEC_MASK << E1000_RTTBCNRC_RF_INT_SHIFT)
+
+#endif
diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
new file mode 100644 (file)
index 0000000..4519a13
--- /dev/null
@@ -0,0 +1,529 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_HW_H_
+#define _E1000_HW_H_
+
+#include <linux/types.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/netdevice.h>
+
+#include "e1000_regs.h"
+#include "e1000_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_QUAD_COPPER_ET2    0x1526
+#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_DEV_ID_82580_COPPER             0x150E
+#define E1000_DEV_ID_82580_FIBER              0x150F
+#define E1000_DEV_ID_82580_SERDES             0x1510
+#define E1000_DEV_ID_82580_SGMII              0x1511
+#define E1000_DEV_ID_82580_COPPER_DUAL        0x1516
+#define E1000_DEV_ID_82580_QUAD_FIBER         0x1527
+#define E1000_DEV_ID_DH89XXCC_SGMII           0x0438
+#define E1000_DEV_ID_DH89XXCC_SERDES          0x043A
+#define E1000_DEV_ID_DH89XXCC_BACKPLANE       0x043C
+#define E1000_DEV_ID_DH89XXCC_SFP             0x0440
+#define E1000_DEV_ID_I350_COPPER              0x1521
+#define E1000_DEV_ID_I350_FIBER               0x1522
+#define E1000_DEV_ID_I350_SERDES              0x1523
+#define E1000_DEV_ID_I350_SGMII               0x1524
+
+#define E1000_REVISION_2 2
+#define E1000_REVISION_4 4
+
+#define E1000_FUNC_0     0
+#define E1000_FUNC_1     1
+#define E1000_FUNC_2     2
+#define E1000_FUNC_3     3
+
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN2   6
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN3   9
+
+enum e1000_mac_type {
+       e1000_undefined = 0,
+       e1000_82575,
+       e1000_82576,
+       e1000_82580,
+       e1000_i350,
+       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_internal_serdes = 2,
+       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_82580,
+};
+
+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
+};
+
+/* 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;
+       u64 o2bgptc;
+       u64 o2bspc;
+       u64 b2ospc;
+       u64 b2ogprc;
+};
+
+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_mbx.h"
+
+struct e1000_mac_operations {
+       s32  (*check_for_link)(struct e1000_hw *);
+       s32  (*reset_hw)(struct e1000_hw *);
+       s32  (*init_hw)(struct e1000_hw *);
+       bool (*check_mng_mode)(struct e1000_hw *);
+       s32  (*setup_physical_interface)(struct e1000_hw *);
+       void (*rar_set)(struct e1000_hw *, u8 *, u32);
+       s32  (*read_mac_addr)(struct e1000_hw *);
+       s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
+};
+
+struct e1000_phy_operations {
+       s32  (*acquire)(struct e1000_hw *);
+       s32  (*check_polarity)(struct e1000_hw *);
+       s32  (*check_reset_block)(struct e1000_hw *);
+       s32  (*force_speed_duplex)(struct e1000_hw *);
+       s32  (*get_cfg_done)(struct e1000_hw *hw);
+       s32  (*get_cable_length)(struct e1000_hw *);
+       s32  (*get_phy_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);
+};
+
+struct e1000_nvm_operations {
+       s32  (*acquire)(struct e1000_hw *);
+       s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
+       void (*release)(struct e1000_hw *);
+       s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
+       s32  (*update)(struct e1000_hw *);
+       s32  (*validate)(struct e1000_hw *);
+};
+
+struct e1000_info {
+       s32 (*get_invariants)(struct e1000_hw *);
+       struct e1000_mac_operations *mac_ops;
+       struct e1000_phy_operations *phy_ops;
+       struct e1000_nvm_operations *nvm_ops;
+};
+
+extern const struct e1000_info e1000_82575_info;
+
+struct e1000_mac_info {
+       struct e1000_mac_operations ops;
+
+       u8 addr[6];
+       u8 perm_addr[6];
+
+       enum e1000_mac_type type;
+
+       u32 ledctl_default;
+       u32 ledctl_mode1;
+       u32 ledctl_mode2;
+       u32 mc_filter_type;
+       u32 txcw;
+
+       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 disable_hw_init_bits;
+       bool get_link_status;
+       bool ifs_params_forced;
+       bool in_ifs_mode;
+       bool report_tx_early;
+       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;
+
+       u32 snoop;
+
+       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; /* Type of flow control */
+       enum e1000_fc_mode requested_mode;
+};
+
+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;
+       bool eee_disable;
+};
+
+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;
+       } dev_spec;
+
+       u16 device_id;
+       u16 subsystem_vendor_id;
+       u16 subsystem_device_id;
+       u16 vendor_id;
+
+       u8  revision_id;
+};
+
+extern struct net_device *igb_get_hw_dev(struct e1000_hw *hw);
+#define hw_dbg(format, arg...) \
+       netdev_dbg(igb_get_hw_dev(hw), format, ##arg)
+
+/* 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 /* _E1000_HW_H_ */
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
new file mode 100644 (file)
index 0000000..2b5ef76
--- /dev/null
@@ -0,0 +1,1421 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#include <linux/if_ether.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+
+#include "e1000_mac.h"
+
+#include "igb.h"
+
+static s32 igb_set_default_fc(struct e1000_hw *hw);
+static s32 igb_set_fc_watermarks(struct e1000_hw *hw);
+
+/**
+ *  igb_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 igb_get_bus_info_pcie(struct e1000_hw *hw)
+{
+       struct e1000_bus_info *bus = &hw->bus;
+       s32 ret_val;
+       u32 reg;
+       u16 pcie_link_status;
+
+       bus->type = e1000_bus_type_pci_express;
+
+       ret_val = igb_read_pcie_cap_reg(hw,
+                                       PCI_EXP_LNKSTA,
+                                       &pcie_link_status);
+       if (ret_val) {
+               bus->width = e1000_bus_width_unknown;
+               bus->speed = e1000_bus_speed_unknown;
+       } else {
+               switch (pcie_link_status & PCI_EXP_LNKSTA_CLS) {
+               case PCI_EXP_LNKSTA_CLS_2_5GB:
+                       bus->speed = e1000_bus_speed_2500;
+                       break;
+               case PCI_EXP_LNKSTA_CLS_5_0GB:
+                       bus->speed = e1000_bus_speed_5000;
+                       break;
+               default:
+                       bus->speed = e1000_bus_speed_unknown;
+                       break;
+               }
+
+               bus->width = (enum e1000_bus_width)((pcie_link_status &
+                                                    PCI_EXP_LNKSTA_NLW) >>
+                                                    PCI_EXP_LNKSTA_NLW_SHIFT);
+       }
+
+       reg = rd32(E1000_STATUS);
+       bus->func = (reg & E1000_STATUS_FUNC_MASK) >> E1000_STATUS_FUNC_SHIFT;
+
+       return 0;
+}
+
+/**
+ *  igb_clear_vfta - 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(struct e1000_hw *hw)
+{
+       u32 offset;
+
+       for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
+               array_wr32(E1000_VFTA, offset, 0);
+               wrfl();
+       }
+}
+
+/**
+ *  igb_write_vfta - 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.
+ **/
+static void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
+{
+       array_wr32(E1000_VFTA, offset, value);
+       wrfl();
+}
+
+/**
+ *  igb_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 igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
+{
+       u32 i;
+       u8 mac_addr[ETH_ALEN] = {0};
+
+       /* Setup the receive address */
+       hw_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 */
+       hw_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);
+}
+
+/**
+ *  igb_vfta_set - enable or disable vlan in VLAN filter table
+ *  @hw: pointer to the HW structure
+ *  @vid: VLAN id to add or remove
+ *  @add: if true add filter, if false remove
+ *
+ *  Sets or clears a bit in the VLAN filter table array based on VLAN id
+ *  and if we are adding or removing the filter
+ **/
+s32 igb_vfta_set(struct e1000_hw *hw, u32 vid, bool add)
+{
+       u32 index = (vid >> E1000_VFTA_ENTRY_SHIFT) & E1000_VFTA_ENTRY_MASK;
+       u32 mask = 1 << (vid & E1000_VFTA_ENTRY_BIT_SHIFT_MASK);
+       u32 vfta = array_rd32(E1000_VFTA, index);
+       s32 ret_val = 0;
+
+       /* bit was set/cleared before we started */
+       if ((!!(vfta & mask)) == add) {
+               ret_val = -E1000_ERR_CONFIG;
+       } else {
+               if (add)
+                       vfta |= mask;
+               else
+                       vfta &= ~mask;
+       }
+
+       igb_write_vfta(hw, index, vfta);
+
+       return ret_val;
+}
+
+/**
+ *  igb_check_alt_mac_addr - 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 fopund it is saved in the hw struct and
+ *  prgrammed into RAR0 and the cuntion returns success, otherwise the
+ *  function returns an error.
+ **/
+s32 igb_check_alt_mac_addr(struct e1000_hw *hw)
+{
+       u32 i;
+       s32 ret_val = 0;
+       u16 offset, nvm_alt_mac_addr_offset, nvm_data;
+       u8 alt_mac_addr[ETH_ALEN];
+
+       ret_val = hw->nvm.ops.read(hw, NVM_ALT_MAC_ADDR_PTR, 1,
+                                &nvm_alt_mac_addr_offset);
+       if (ret_val) {
+               hw_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_ALEN; i += 2) {
+               offset = nvm_alt_mac_addr_offset + (i >> 1);
+               ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data);
+               if (ret_val) {
+                       hw_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 (is_multicast_ether_addr(alt_mac_addr)) {
+               hw_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;
+}
+
+/**
+ *  igb_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 igb_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.
+        */
+       wr32(E1000_RAL(index), rar_low);
+       wrfl();
+       wr32(E1000_RAH(index), rar_high);
+       wrfl();
+}
+
+/**
+ *  igb_mta_set - 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(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 = array_rd32(E1000_MTA, hash_reg);
+
+       mta |= (1 << hash_bit);
+
+       array_wr32(E1000_MTA, hash_reg, mta);
+       wrfl();
+}
+
+/**
+ *  igb_hash_mc_addr - 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()
+ **/
+static u32 igb_hash_mc_addr(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;
+}
+
+/**
+ *  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 entire 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)
+{
+       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 = igb_hash_mc_addr(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_ALEN);
+       }
+
+       /* replace the entire MTA table */
+       for (i = hw->mac.mta_reg_count - 1; i >= 0; i--)
+               array_wr32(E1000_MTA, i, hw->mac.mta_shadow[i]);
+       wrfl();
+}
+
+/**
+ *  igb_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 igb_clear_hw_cntrs_base(struct e1000_hw *hw)
+{
+       rd32(E1000_CRCERRS);
+       rd32(E1000_SYMERRS);
+       rd32(E1000_MPC);
+       rd32(E1000_SCC);
+       rd32(E1000_ECOL);
+       rd32(E1000_MCC);
+       rd32(E1000_LATECOL);
+       rd32(E1000_COLC);
+       rd32(E1000_DC);
+       rd32(E1000_SEC);
+       rd32(E1000_RLEC);
+       rd32(E1000_XONRXC);
+       rd32(E1000_XONTXC);
+       rd32(E1000_XOFFRXC);
+       rd32(E1000_XOFFTXC);
+       rd32(E1000_FCRUC);
+       rd32(E1000_GPRC);
+       rd32(E1000_BPRC);
+       rd32(E1000_MPRC);
+       rd32(E1000_GPTC);
+       rd32(E1000_GORCL);
+       rd32(E1000_GORCH);
+       rd32(E1000_GOTCL);
+       rd32(E1000_GOTCH);
+       rd32(E1000_RNBC);
+       rd32(E1000_RUC);
+       rd32(E1000_RFC);
+       rd32(E1000_ROC);
+       rd32(E1000_RJC);
+       rd32(E1000_TORL);
+       rd32(E1000_TORH);
+       rd32(E1000_TOTL);
+       rd32(E1000_TOTH);
+       rd32(E1000_TPR);
+       rd32(E1000_TPT);
+       rd32(E1000_MPTC);
+       rd32(E1000_BPTC);
+}
+
+/**
+ *  igb_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 igb_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 = 0;
+               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(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(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(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(hw);
+       if (ret_val)
+               hw_dbg("Error configuring flow control\n");
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_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 igb_setup_link(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+
+       /*
+        * In the case of the phy reset being blocked, we already have a link.
+        * We do not need to set it up again.
+        */
+       if (igb_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(hw);
+               if (ret_val)
+                       goto out;
+       }
+
+       /*
+        * We want to save off the original Flow Control configuration just
+        * in case we get disconnected and then reconnected into a different
+        * hub or switch with different Flow Control capabilities.
+        */
+       hw->fc.current_mode = hw->fc.requested_mode;
+
+       hw_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.
+        */
+       hw_dbg("Initializing the Flow Control address, type and timer regs\n");
+       wr32(E1000_FCT, FLOW_CONTROL_TYPE);
+       wr32(E1000_FCAH, FLOW_CONTROL_ADDRESS_HIGH);
+       wr32(E1000_FCAL, FLOW_CONTROL_ADDRESS_LOW);
+
+       wr32(E1000_FCTTV, hw->fc.pause_time);
+
+       ret_val = igb_set_fc_watermarks(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  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. Currently no func pointer exists and all
+ *  implementations are handled in the generic version of this function.
+ **/
+void igb_config_collision_dist(struct e1000_hw *hw)
+{
+       u32 tctl;
+
+       tctl = rd32(E1000_TCTL);
+
+       tctl &= ~E1000_TCTL_COLD;
+       tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT;
+
+       wr32(E1000_TCTL, tctl);
+       wrfl();
+}
+
+/**
+ *  igb_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
+ *  tansmission as well.
+ **/
+static s32 igb_set_fc_watermarks(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       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;
+       }
+       wr32(E1000_FCRTL, fcrtl);
+       wr32(E1000_FCRTH, fcrth);
+
+       return ret_val;
+}
+
+/**
+ *  igb_set_default_fc - 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(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       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 = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
+
+       if (ret_val) {
+               hw_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;
+}
+
+/**
+ *  igb_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 igb_force_mac_fc(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       s32 ret_val = 0;
+
+       ctrl = rd32(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.
+        */
+       hw_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:
+               hw_dbg("Flow control param set incorrectly\n");
+               ret_val = -E1000_ERR_CONFIG;
+               goto out;
+       }
+
+       wr32(E1000_CTRL, ctrl);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_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 igb_config_fc_after_link_up(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+       s32 ret_val = 0;
+       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_internal_serdes)
+                       ret_val = igb_force_mac_fc(hw);
+       } else {
+               if (hw->phy.media_type == e1000_media_type_copper)
+                       ret_val = igb_force_mac_fc(hw);
+       }
+
+       if (ret_val) {
+               hw_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 = 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)) {
+                       hw_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 = 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;
+                               hw_dbg("Flow Control = FULL.\r\n");
+                       } else {
+                               hw->fc.current_mode = e1000_fc_rx_pause;
+                               hw_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;
+                       hw_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;
+                       hw_dbg("Flow Control = RX PAUSE frames only.\r\n");
+               }
+               /*
+                * Per the IEEE spec, at this point flow control should be
+                * disabled.  However, we want to consider that we could
+                * be connected to a legacy switch that doesn't advertise
+                * desired flow control, but can be forced on the link
+                * partner.  So if we advertised no flow control, that is
+                * what we will resolve to.  If we advertised some kind of
+                * receive capability (Rx Pause Only or Full Flow Control)
+                * and the link partner advertised none, we will configure
+                * ourselves to enable Rx Flow Control only.  We can do
+                * this safely for two reasons:  If the link partner really
+                * didn't want flow control enabled, and we enable Rx, no
+                * harm done since we won't be receiving any PAUSE frames
+                * anyway.  If the intent on the link partner was to have
+                * flow control enabled, then by us enabling RX only, we
+                * can at least receive pause frames and process them.
+                * This is a good idea because in most cases, since we are
+                * predominantly a server NIC, more times than not we will
+                * be asked to delay transmission of packets than asking
+                * our link partner to pause transmission of frames.
+                */
+               else if ((hw->fc.requested_mode == e1000_fc_none ||
+                         hw->fc.requested_mode == e1000_fc_tx_pause) ||
+                        hw->fc.strict_ieee) {
+                       hw->fc.current_mode = e1000_fc_none;
+                       hw_dbg("Flow Control = NONE.\r\n");
+               } else {
+                       hw->fc.current_mode = e1000_fc_rx_pause;
+                       hw_dbg("Flow Control = RX PAUSE frames only.\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 = hw->mac.ops.get_speed_and_duplex(hw, &speed, &duplex);
+               if (ret_val) {
+                       hw_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 = igb_force_mac_fc(hw);
+               if (ret_val) {
+                       hw_dbg("Error forcing flow control settings\n");
+                       goto out;
+               }
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_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 igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
+                                     u16 *duplex)
+{
+       u32 status;
+
+       status = rd32(E1000_STATUS);
+       if (status & E1000_STATUS_SPEED_1000) {
+               *speed = SPEED_1000;
+               hw_dbg("1000 Mbs, ");
+       } else if (status & E1000_STATUS_SPEED_100) {
+               *speed = SPEED_100;
+               hw_dbg("100 Mbs, ");
+       } else {
+               *speed = SPEED_10;
+               hw_dbg("10 Mbs, ");
+       }
+
+       if (status & E1000_STATUS_FD) {
+               *duplex = FULL_DUPLEX;
+               hw_dbg("Full Duplex\n");
+       } else {
+               *duplex = HALF_DUPLEX;
+               hw_dbg("Half Duplex\n");
+       }
+
+       return 0;
+}
+
+/**
+ *  igb_get_hw_semaphore - Acquire hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Acquire the HW semaphore to access the PHY or NVM
+ **/
+s32 igb_get_hw_semaphore(struct e1000_hw *hw)
+{
+       u32 swsm;
+       s32 ret_val = 0;
+       s32 timeout = hw->nvm.word_size + 1;
+       s32 i = 0;
+
+       /* Get the SW semaphore */
+       while (i < timeout) {
+               swsm = rd32(E1000_SWSM);
+               if (!(swsm & E1000_SWSM_SMBI))
+                       break;
+
+               udelay(50);
+               i++;
+       }
+
+       if (i == timeout) {
+               hw_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 = rd32(E1000_SWSM);
+               wr32(E1000_SWSM, swsm | E1000_SWSM_SWESMBI);
+
+               /* Semaphore acquired if bit latched */
+               if (rd32(E1000_SWSM) & E1000_SWSM_SWESMBI)
+                       break;
+
+               udelay(50);
+       }
+
+       if (i == timeout) {
+               /* Release semaphores */
+               igb_put_hw_semaphore(hw);
+               hw_dbg("Driver can't access the NVM\n");
+               ret_val = -E1000_ERR_NVM;
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_put_hw_semaphore - Release hardware semaphore
+ *  @hw: pointer to the HW structure
+ *
+ *  Release hardware semaphore used to access the PHY or NVM
+ **/
+void igb_put_hw_semaphore(struct e1000_hw *hw)
+{
+       u32 swsm;
+
+       swsm = rd32(E1000_SWSM);
+
+       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
+
+       wr32(E1000_SWSM, swsm);
+}
+
+/**
+ *  igb_get_auto_rd_done - Check for auto read completion
+ *  @hw: pointer to the HW structure
+ *
+ *  Check EEPROM for Auto Read done bit.
+ **/
+s32 igb_get_auto_rd_done(struct e1000_hw *hw)
+{
+       s32 i = 0;
+       s32 ret_val = 0;
+
+
+       while (i < AUTO_READ_DONE_TIMEOUT) {
+               if (rd32(E1000_EECD) & E1000_EECD_AUTO_RD)
+                       break;
+               msleep(1);
+               i++;
+       }
+
+       if (i == AUTO_READ_DONE_TIMEOUT) {
+               hw_dbg("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 - 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(struct e1000_hw *hw, u16 *data)
+{
+       s32 ret_val;
+
+       ret_val = hw->nvm.ops.read(hw, NVM_ID_LED_SETTINGS, 1, data);
+       if (ret_val) {
+               hw_dbg("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_id_led_init -
+ *  @hw: pointer to the HW structure
+ *
+ **/
+s32 igb_id_led_init(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;
+
+       ret_val = igb_valid_led_default(hw, &data);
+       if (ret_val)
+               goto out;
+
+       mac->ledctl_default = rd32(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;
+}
+
+/**
+ *  igb_cleanup_led - 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(struct e1000_hw *hw)
+{
+       wr32(E1000_LEDCTL, hw->mac.ledctl_default);
+       return 0;
+}
+
+/**
+ *  igb_blink_led - Blink LED
+ *  @hw: pointer to the HW structure
+ *
+ *  Blink the led's which are set to be on.
+ **/
+s32 igb_blink_led(struct e1000_hw *hw)
+{
+       u32 ledctl_blink = 0;
+       u32 i;
+
+       /*
+        * 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));
+
+       wr32(E1000_LEDCTL, ledctl_blink);
+
+       return 0;
+}
+
+/**
+ *  igb_led_off - Turn LED off
+ *  @hw: pointer to the HW structure
+ *
+ *  Turn LED off.
+ **/
+s32 igb_led_off(struct e1000_hw *hw)
+{
+       switch (hw->phy.media_type) {
+       case e1000_media_type_copper:
+               wr32(E1000_LEDCTL, hw->mac.ledctl_mode1);
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+/**
+ *  igb_disable_pcie_master - Disables PCI-express master access
+ *  @hw: pointer to the HW structure
+ *
+ *  Returns 0 (0) if successful, else returns -10
+ *  (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not casued
+ *  the master requests to be disabled.
+ *
+ *  Disables PCI-Express master access and verifies there are no pending
+ *  requests.
+ **/
+s32 igb_disable_pcie_master(struct e1000_hw *hw)
+{
+       u32 ctrl;
+       s32 timeout = MASTER_DISABLE_TIMEOUT;
+       s32 ret_val = 0;
+
+       if (hw->bus.type != e1000_bus_type_pci_express)
+               goto out;
+
+       ctrl = rd32(E1000_CTRL);
+       ctrl |= E1000_CTRL_GIO_MASTER_DISABLE;
+       wr32(E1000_CTRL, ctrl);
+
+       while (timeout) {
+               if (!(rd32(E1000_STATUS) &
+                     E1000_STATUS_GIO_MASTER_ENABLE))
+                       break;
+               udelay(100);
+               timeout--;
+       }
+
+       if (!timeout) {
+               hw_dbg("Master requests are pending.\n");
+               ret_val = -E1000_ERR_MASTER_REQUESTS_PENDING;
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_validate_mdi_setting - Verify MDI/MDIx settings
+ *  @hw: pointer to the HW structure
+ *
+ *  Verify that when not using auto-negotitation that MDI/MDIx is correctly
+ *  set, which is forced to MDI mode only.
+ **/
+s32 igb_validate_mdi_setting(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+
+       if (!hw->mac.autoneg && (hw->phy.mdix == 0 || hw->phy.mdix == 3)) {
+               hw_dbg("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 - 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(struct e1000_hw *hw, u32 reg,
+                             u32 offset, u8 data)
+{
+       u32 i, regvalue = 0;
+       s32 ret_val = 0;
+
+       /* Set up the address and data */
+       regvalue = ((u32)data) | (offset << E1000_GEN_CTL_ADDRESS_SHIFT);
+       wr32(reg, regvalue);
+
+       /* Poll the ready bit to see if the MDI read completed */
+       for (i = 0; i < E1000_GEN_POLL_TIMEOUT; i++) {
+               udelay(5);
+               regvalue = rd32(reg);
+               if (regvalue & E1000_GEN_CTL_READY)
+                       break;
+       }
+       if (!(regvalue & E1000_GEN_CTL_READY)) {
+               hw_dbg("Reg %08x did not indicate ready\n", reg);
+               ret_val = -E1000_ERR_PHY;
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_enable_mng_pass_thru - Enable processing of ARP's
+ *  @hw: pointer to the HW structure
+ *
+ *  Verifies the hardware needs to leave interface enabled so that frames can
+ *  be directed to and from the management interface.
+ **/
+bool igb_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 = rd32(E1000_MANC);
+
+       if (!(manc & E1000_MANC_RCV_TCO_EN))
+               goto out;
+
+       if (hw->mac.arc_subsystem_valid) {
+               fwsm = rd32(E1000_FWSM);
+               factps = rd32(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;
+}
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h
new file mode 100644 (file)
index 0000000..4927f61
--- /dev/null
@@ -0,0 +1,90 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_MAC_H_
+#define _E1000_MAC_H_
+
+#include "e1000_hw.h"
+
+#include "e1000_phy.h"
+#include "e1000_nvm.h"
+#include "e1000_defines.h"
+
+/*
+ * Functions that should not be called directly from drivers but can be used
+ * by other files in this 'shared code'
+ */
+s32  igb_blink_led(struct e1000_hw *hw);
+s32  igb_check_for_copper_link(struct e1000_hw *hw);
+s32  igb_cleanup_led(struct e1000_hw *hw);
+s32  igb_config_fc_after_link_up(struct e1000_hw *hw);
+s32  igb_disable_pcie_master(struct e1000_hw *hw);
+s32  igb_force_mac_fc(struct e1000_hw *hw);
+s32  igb_get_auto_rd_done(struct e1000_hw *hw);
+s32  igb_get_bus_info_pcie(struct e1000_hw *hw);
+s32  igb_get_hw_semaphore(struct e1000_hw *hw);
+s32  igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
+                                      u16 *duplex);
+s32  igb_id_led_init(struct e1000_hw *hw);
+s32  igb_led_off(struct e1000_hw *hw);
+void igb_update_mc_addr_list(struct e1000_hw *hw,
+                            u8 *mc_addr_list, u32 mc_addr_count);
+s32  igb_setup_link(struct e1000_hw *hw);
+s32  igb_validate_mdi_setting(struct e1000_hw *hw);
+s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,
+                              u32 offset, u8 data);
+
+void igb_clear_hw_cntrs_base(struct e1000_hw *hw);
+void igb_clear_vfta(struct e1000_hw *hw);
+s32  igb_vfta_set(struct e1000_hw *hw, u32 vid, bool add);
+void igb_config_collision_dist(struct e1000_hw *hw);
+void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
+void igb_mta_set(struct e1000_hw *hw, u32 hash_value);
+void igb_put_hw_semaphore(struct e1000_hw *hw);
+void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
+s32  igb_check_alt_mac_addr(struct e1000_hw *hw);
+
+bool igb_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_DHCP_COOKIE_STATUS_VLAN    0x2
+
+extern void e1000_init_function_pointers_82575(struct e1000_hw *hw);
+
+#endif
diff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c
new file mode 100644 (file)
index 0000000..74f2f11
--- /dev/null
@@ -0,0 +1,446 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#include "e1000_mbx.h"
+
+/**
+ *  igb_read_mbx - Reads a message from the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to read
+ *
+ *  returns SUCCESS if it successfuly read message from buffer
+ **/
+s32 igb_read_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       /* limit read to size of mailbox */
+       if (size > mbx->size)
+               size = mbx->size;
+
+       if (mbx->ops.read)
+               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  igb_write_mbx - Write a message to the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer
+ **/
+s32 igb_write_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = 0;
+
+       if (size > mbx->size)
+               ret_val = -E1000_ERR_MBX;
+
+       else if (mbx->ops.write)
+               ret_val = mbx->ops.write(hw, msg, size, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  igb_check_for_msg - checks to see if someone sent us mail
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to check
+ *
+ *  returns SUCCESS if the Status bit was found or else ERR_MBX
+ **/
+s32 igb_check_for_msg(struct e1000_hw *hw, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (mbx->ops.check_for_msg)
+               ret_val = mbx->ops.check_for_msg(hw, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  igb_check_for_ack - checks to see if someone sent us ACK
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to check
+ *
+ *  returns SUCCESS if the Status bit was found or else ERR_MBX
+ **/
+s32 igb_check_for_ack(struct e1000_hw *hw, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (mbx->ops.check_for_ack)
+               ret_val = mbx->ops.check_for_ack(hw, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  igb_check_for_rst - checks to see if other side has reset
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to check
+ *
+ *  returns SUCCESS if the Status bit was found or else ERR_MBX
+ **/
+s32 igb_check_for_rst(struct e1000_hw *hw, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (mbx->ops.check_for_rst)
+               ret_val = mbx->ops.check_for_rst(hw, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  igb_poll_for_msg - Wait for message notification
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully received a message notification
+ **/
+static s32 igb_poll_for_msg(struct e1000_hw *hw, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       if (!countdown || !mbx->ops.check_for_msg)
+               goto out;
+
+       while (countdown && mbx->ops.check_for_msg(hw, mbx_id)) {
+               countdown--;
+               if (!countdown)
+                       break;
+               udelay(mbx->usec_delay);
+       }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
+out:
+       return countdown ? 0 : -E1000_ERR_MBX;
+}
+
+/**
+ *  igb_poll_for_ack - Wait for message acknowledgement
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully received a message acknowledgement
+ **/
+static s32 igb_poll_for_ack(struct e1000_hw *hw, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       if (!countdown || !mbx->ops.check_for_ack)
+               goto out;
+
+       while (countdown && mbx->ops.check_for_ack(hw, mbx_id)) {
+               countdown--;
+               if (!countdown)
+                       break;
+               udelay(mbx->usec_delay);
+       }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
+out:
+       return countdown ? 0 : -E1000_ERR_MBX;
+}
+
+/**
+ *  igb_read_posted_mbx - Wait for message notification and receive message
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully received a message notification and
+ *  copied it into the receive buffer.
+ **/
+static s32 igb_read_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (!mbx->ops.read)
+               goto out;
+
+       ret_val = igb_poll_for_msg(hw, mbx_id);
+
+       if (!ret_val)
+               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_write_posted_mbx - Write a message to the mailbox, wait for ack
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer and
+ *  received an ack to that message within delay * timeout period
+ **/
+static s32 igb_write_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       /* exit if either we can't write or there isn't a defined timeout */
+       if (!mbx->ops.write || !mbx->timeout)
+               goto out;
+
+       /* send msg */
+       ret_val = mbx->ops.write(hw, msg, size, mbx_id);
+
+       /* if msg sent wait until we receive an ack */
+       if (!ret_val)
+               ret_val = igb_poll_for_ack(hw, mbx_id);
+out:
+       return ret_val;
+}
+
+static s32 igb_check_for_bit_pf(struct e1000_hw *hw, u32 mask)
+{
+       u32 mbvficr = rd32(E1000_MBVFICR);
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (mbvficr & mask) {
+               ret_val = 0;
+               wr32(E1000_MBVFICR, mask);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  igb_check_for_msg_pf - checks to see if the VF has sent mail
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
+ **/
+static s32 igb_check_for_msg_pf(struct e1000_hw *hw, u16 vf_number)
+{
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (!igb_check_for_bit_pf(hw, E1000_MBVFICR_VFREQ_VF1 << vf_number)) {
+               ret_val = 0;
+               hw->mbx.stats.reqs++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  igb_check_for_ack_pf - checks to see if the VF has ACKed
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
+ **/
+static s32 igb_check_for_ack_pf(struct e1000_hw *hw, u16 vf_number)
+{
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (!igb_check_for_bit_pf(hw, E1000_MBVFICR_VFACK_VF1 << vf_number)) {
+               ret_val = 0;
+               hw->mbx.stats.acks++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  igb_check_for_rst_pf - checks to see if the VF has reset
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
+ **/
+static s32 igb_check_for_rst_pf(struct e1000_hw *hw, u16 vf_number)
+{
+       u32 vflre = rd32(E1000_VFLRE);
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (vflre & (1 << vf_number)) {
+               ret_val = 0;
+               wr32(E1000_VFLRE, (1 << vf_number));
+               hw->mbx.stats.rsts++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  igb_obtain_mbx_lock_pf - obtain mailbox lock
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  return SUCCESS if we obtained the mailbox lock
+ **/
+static s32 igb_obtain_mbx_lock_pf(struct e1000_hw *hw, u16 vf_number)
+{
+       s32 ret_val = -E1000_ERR_MBX;
+       u32 p2v_mailbox;
+
+
+       /* Take ownership of the buffer */
+       wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_PFU);
+
+       /* reserve mailbox for vf use */
+       p2v_mailbox = rd32(E1000_P2VMAILBOX(vf_number));
+       if (p2v_mailbox & E1000_P2VMAILBOX_PFU)
+               ret_val = 0;
+
+       return ret_val;
+}
+
+/**
+ *  igb_write_mbx_pf - Places a message in the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer
+ **/
+static s32 igb_write_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
+                              u16 vf_number)
+{
+       s32 ret_val;
+       u16 i;
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       ret_val = igb_obtain_mbx_lock_pf(hw, vf_number);
+       if (ret_val)
+               goto out_no_write;
+
+       /* flush msg and acks as we are overwriting the message buffer */
+       igb_check_for_msg_pf(hw, vf_number);
+       igb_check_for_ack_pf(hw, vf_number);
+
+       /* copy the caller specified message to the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               array_wr32(E1000_VMBMEM(vf_number), i, msg[i]);
+
+       /* Interrupt VF to tell it a message has been sent and release buffer*/
+       wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_STS);
+
+       /* update stats */
+       hw->mbx.stats.msgs_tx++;
+
+out_no_write:
+       return ret_val;
+
+}
+
+/**
+ *  igb_read_mbx_pf - Read a message from the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @vf_number: the VF index
+ *
+ *  This function copies a message from the mailbox buffer to the caller's
+ *  memory buffer.  The presumption is that the caller knows that there was
+ *  a message due to a VF request so no polling for message is needed.
+ **/
+static s32 igb_read_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
+                             u16 vf_number)
+{
+       s32 ret_val;
+       u16 i;
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       ret_val = igb_obtain_mbx_lock_pf(hw, vf_number);
+       if (ret_val)
+               goto out_no_read;
+
+       /* copy the message to the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               msg[i] = array_rd32(E1000_VMBMEM(vf_number), i);
+
+       /* Acknowledge the message and release buffer */
+       wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_ACK);
+
+       /* update stats */
+       hw->mbx.stats.msgs_rx++;
+
+out_no_read:
+       return ret_val;
+}
+
+/**
+ *  e1000_init_mbx_params_pf - set initial values for pf mailbox
+ *  @hw: pointer to the HW structure
+ *
+ *  Initializes the hw->mbx struct to correct values for pf mailbox
+ */
+s32 igb_init_mbx_params_pf(struct e1000_hw *hw)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+
+       mbx->timeout = 0;
+       mbx->usec_delay = 0;
+
+       mbx->size = E1000_VFMAILBOX_SIZE;
+
+       mbx->ops.read = igb_read_mbx_pf;
+       mbx->ops.write = igb_write_mbx_pf;
+       mbx->ops.read_posted = igb_read_posted_mbx;
+       mbx->ops.write_posted = igb_write_posted_mbx;
+       mbx->ops.check_for_msg = igb_check_for_msg_pf;
+       mbx->ops.check_for_ack = igb_check_for_ack_pf;
+       mbx->ops.check_for_rst = igb_check_for_rst_pf;
+
+       mbx->stats.msgs_tx = 0;
+       mbx->stats.msgs_rx = 0;
+       mbx->stats.reqs = 0;
+       mbx->stats.acks = 0;
+       mbx->stats.rsts = 0;
+
+       return 0;
+}
+
diff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.h b/drivers/net/ethernet/intel/igb/e1000_mbx.h
new file mode 100644 (file)
index 0000000..eddb0f8
--- /dev/null
@@ -0,0 +1,77 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_MBX_H_
+#define _E1000_MBX_H_
+
+#include "e1000_hw.h"
+
+#define E1000_P2VMAILBOX_STS   0x00000001 /* Initiate message send to VF */
+#define E1000_P2VMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
+#define E1000_P2VMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
+#define E1000_P2VMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
+#define E1000_P2VMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
+
+#define E1000_MBVFICR_VFREQ_MASK 0x000000FF /* bits for VF messages */
+#define E1000_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
+#define E1000_MBVFICR_VFACK_MASK 0x00FF0000 /* bits for VF acks */
+#define E1000_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
+
+#define E1000_VFMAILBOX_SIZE   16 /* 16 32 bit words - 64 bytes */
+
+/* If it's a E1000_VF_* msg then it originates in the VF and is sent to the
+ * PF.  The reverse is true if it is E1000_PF_*.
+ * Message ACK's are the value or'd with 0xF0000000
+ */
+#define E1000_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
+                                               * this are the ACK */
+#define E1000_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
+                                               * this are the NACK */
+#define E1000_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
+                                                 clear to send requests */
+#define E1000_VT_MSGINFO_SHIFT    16
+/* bits 23:16 are used for exra info for certain messages */
+#define E1000_VT_MSGINFO_MASK     (0xFF << E1000_VT_MSGINFO_SHIFT)
+
+#define E1000_VF_RESET            0x01 /* VF requests reset */
+#define E1000_VF_SET_MAC_ADDR     0x02 /* VF requests to set MAC addr */
+#define E1000_VF_SET_MULTICAST    0x03 /* VF requests to set MC addr */
+#define E1000_VF_SET_VLAN         0x04 /* VF requests to set VLAN */
+#define E1000_VF_SET_LPE          0x05 /* VF requests to set VMOLR.LPE */
+#define E1000_VF_SET_PROMISC      0x06 /*VF requests to clear VMOLR.ROPE/MPME*/
+#define E1000_VF_SET_PROMISC_MULTICAST    (0x02 << E1000_VT_MSGINFO_SHIFT)
+
+#define E1000_PF_CONTROL_MSG      0x0100 /* PF control message */
+
+s32 igb_read_mbx(struct e1000_hw *, u32 *, u16, u16);
+s32 igb_write_mbx(struct e1000_hw *, u32 *, u16, u16);
+s32 igb_check_for_msg(struct e1000_hw *, u16);
+s32 igb_check_for_ack(struct e1000_hw *, u16);
+s32 igb_check_for_rst(struct e1000_hw *, u16);
+s32 igb_init_mbx_params_pf(struct e1000_hw *);
+
+#endif /* _E1000_MBX_H_ */
diff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c
new file mode 100644 (file)
index 0000000..4040712
--- /dev/null
@@ -0,0 +1,713 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#include <linux/if_ether.h>
+#include <linux/delay.h>
+
+#include "e1000_mac.h"
+#include "e1000_nvm.h"
+
+/**
+ *  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;
+       wr32(E1000_EECD, *eecd);
+       wrfl();
+       udelay(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;
+       wr32(E1000_EECD, *eecd);
+       wrfl();
+       udelay(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 = rd32(E1000_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;
+
+               wr32(E1000_EECD, eecd);
+               wrfl();
+
+               udelay(nvm->delay_usec);
+
+               igb_raise_eec_clk(hw, &eecd);
+               igb_lower_eec_clk(hw, &eecd);
+
+               mask >>= 1;
+       } while (mask);
+
+       eecd &= ~E1000_EECD_DI;
+       wr32(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;
+
+       eecd = rd32(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 = rd32(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'.
+ **/
+static 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;
+
+       for (i = 0; i < attempts; i++) {
+               if (ee_reg == E1000_NVM_POLL_READ)
+                       reg = rd32(E1000_EERD);
+               else
+                       reg = rd32(E1000_EEWR);
+
+               if (reg & E1000_NVM_RW_REG_DONE) {
+                       ret_val = 0;
+                       break;
+               }
+
+               udelay(5);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  igb_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 igb_acquire_nvm(struct e1000_hw *hw)
+{
+       u32 eecd = rd32(E1000_EECD);
+       s32 timeout = E1000_NVM_GRANT_ATTEMPTS;
+       s32 ret_val = 0;
+
+
+       wr32(E1000_EECD, eecd | E1000_EECD_REQ);
+       eecd = rd32(E1000_EECD);
+
+       while (timeout) {
+               if (eecd & E1000_EECD_GNT)
+                       break;
+               udelay(5);
+               eecd = rd32(E1000_EECD);
+               timeout--;
+       }
+
+       if (!timeout) {
+               eecd &= ~E1000_EECD_REQ;
+               wr32(E1000_EECD, eecd);
+               hw_dbg("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 = rd32(E1000_EECD);
+
+       if (nvm->type == e1000_nvm_eeprom_spi) {
+               /* Toggle CS to flush commands */
+               eecd |= E1000_EECD_CS;
+               wr32(E1000_EECD, eecd);
+               wrfl();
+               udelay(nvm->delay_usec);
+               eecd &= ~E1000_EECD_CS;
+               wr32(E1000_EECD, eecd);
+               wrfl();
+               udelay(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.
+ **/
+static void e1000_stop_nvm(struct e1000_hw *hw)
+{
+       u32 eecd;
+
+       eecd = rd32(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 - 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(struct e1000_hw *hw)
+{
+       u32 eecd;
+
+       e1000_stop_nvm(hw);
+
+       eecd = rd32(E1000_EECD);
+       eecd &= ~E1000_EECD_REQ;
+       wr32(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 = rd32(E1000_EECD);
+       s32 ret_val = 0;
+       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);
+               wr32(E1000_EECD, eecd);
+               wrfl();
+               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) {
+                       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;
+
+                       udelay(5);
+                       igb_standby_nvm(hw);
+                       timeout--;
+               }
+
+               if (!timeout) {
+                       hw_dbg("SPI NVM Status error\n");
+                       ret_val = -E1000_ERR_NVM;
+                       goto out;
+               }
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_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 igb_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;
+
+       /*
+        * 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)) {
+               hw_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;
+
+       ret_val = igb_ready_nvm_eeprom(hw);
+       if (ret_val)
+               goto release;
+
+       igb_standby_nvm(hw);
+
+       if ((nvm->address_bits == 8) && (offset >= 128))
+               read_opcode |= NVM_A8_OPCODE_SPI;
+
+       /* Send the READ command (opcode + addr) */
+       igb_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);
+       igb_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 = igb_shift_in_eec_bits(hw, 16);
+               data[i] = (word_in >> 8) | (word_in << 8);
+       }
+
+release:
+       nvm->ops.release(hw);
+
+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 = 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)) {
+               hw_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;
+
+               wr32(E1000_EERD, eerd);
+               ret_val = igb_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
+               if (ret_val)
+                       break;
+
+               data[i] = (rd32(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 likley 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;
+
+       /*
+        * 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)) {
+               hw_dbg("nvm parameter(s) out of bounds\n");
+               ret_val = -E1000_ERR_NVM;
+               goto out;
+       }
+
+       ret_val = hw->nvm.ops.acquire(hw);
+       if (ret_val)
+               goto out;
+
+       msleep(10);
+
+       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;
+                       }
+               }
+       }
+
+       msleep(10);
+release:
+       hw->nvm.ops.release(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_read_part_string - Read device part number
+ *  @hw: pointer to the HW structure
+ *  @part_num: pointer to device part number
+ *  @part_num_size: size of part number buffer
+ *
+ *  Reads the product board assembly (PBA) number from the EEPROM and stores
+ *  the value in part_num.
+ **/
+s32 igb_read_part_string(struct e1000_hw *hw, u8 *part_num, u32 part_num_size)
+{
+       s32 ret_val;
+       u16 nvm_data;
+       u16 pointer;
+       u16 offset;
+       u16 length;
+
+       if (part_num == NULL) {
+               hw_dbg("PBA string buffer was null\n");
+               ret_val = E1000_ERR_INVALID_ARGUMENT;
+               goto out;
+       }
+
+       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
+       if (ret_val) {
+               hw_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_1, 1, &pointer);
+       if (ret_val) {
+               hw_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       /*
+        * if nvm_data is not ptr guard the PBA must be in legacy format which
+        * means pointer is actually our second data word for the PBA number
+        * and we can decode it into an ascii string
+        */
+       if (nvm_data != NVM_PBA_PTR_GUARD) {
+               hw_dbg("NVM PBA number is not stored as string\n");
+
+               /* we will need 11 characters to store the PBA */
+               if (part_num_size < 11) {
+                       hw_dbg("PBA string buffer too small\n");
+                       return E1000_ERR_NO_SPACE;
+               }
+
+               /* extract hex string from data and pointer */
+               part_num[0] = (nvm_data >> 12) & 0xF;
+               part_num[1] = (nvm_data >> 8) & 0xF;
+               part_num[2] = (nvm_data >> 4) & 0xF;
+               part_num[3] = nvm_data & 0xF;
+               part_num[4] = (pointer >> 12) & 0xF;
+               part_num[5] = (pointer >> 8) & 0xF;
+               part_num[6] = '-';
+               part_num[7] = 0;
+               part_num[8] = (pointer >> 4) & 0xF;
+               part_num[9] = pointer & 0xF;
+
+               /* put a null character on the end of our string */
+               part_num[10] = '\0';
+
+               /* switch all the data but the '-' to hex char */
+               for (offset = 0; offset < 10; offset++) {
+                       if (part_num[offset] < 0xA)
+                               part_num[offset] += '0';
+                       else if (part_num[offset] < 0x10)
+                               part_num[offset] += 'A' - 0xA;
+               }
+
+               goto out;
+       }
+
+       ret_val = hw->nvm.ops.read(hw, pointer, 1, &length);
+       if (ret_val) {
+               hw_dbg("NVM Read Error\n");
+               goto out;
+       }
+
+       if (length == 0xFFFF || length == 0) {
+               hw_dbg("NVM PBA number section invalid length\n");
+               ret_val = E1000_ERR_NVM_PBA_SECTION;
+               goto out;
+       }
+       /* check if part_num buffer is big enough */
+       if (part_num_size < (((u32)length * 2) - 1)) {
+               hw_dbg("PBA string buffer too small\n");
+               ret_val = E1000_ERR_NO_SPACE;
+               goto out;
+       }
+
+       /* trim pba length from start of string */
+       pointer++;
+       length--;
+
+       for (offset = 0; offset < length; offset++) {
+               ret_val = hw->nvm.ops.read(hw, pointer + offset, 1, &nvm_data);
+               if (ret_val) {
+                       hw_dbg("NVM Read Error\n");
+                       goto out;
+               }
+               part_num[offset * 2] = (u8)(nvm_data >> 8);
+               part_num[(offset * 2) + 1] = (u8)(nvm_data & 0xFF);
+       }
+       part_num[offset * 2] = '\0';
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_read_mac_addr - 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(struct e1000_hw *hw)
+{
+       u32 rar_high;
+       u32 rar_low;
+       u16 i;
+
+       rar_high = rd32(E1000_RAH(0));
+       rar_low = rd32(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_ALEN; i++)
+               hw->mac.addr[i] = hw->mac.perm_addr[i];
+
+       return 0;
+}
+
+/**
+ *  igb_validate_nvm_checksum - 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(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 checksum = 0;
+       u16 i, nvm_data;
+
+       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
+               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
+               if (ret_val) {
+                       hw_dbg("NVM Read Error\n");
+                       goto out;
+               }
+               checksum += nvm_data;
+       }
+
+       if (checksum != (u16) NVM_SUM) {
+               hw_dbg("NVM Checksum Invalid\n");
+               ret_val = -E1000_ERR_NVM;
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_update_nvm_checksum - 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(struct e1000_hw *hw)
+{
+       s32  ret_val;
+       u16 checksum = 0;
+       u16 i, nvm_data;
+
+       for (i = 0; i < NVM_CHECKSUM_REG; i++) {
+               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
+               if (ret_val) {
+                       hw_dbg("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)
+               hw_dbg("NVM Write Error while updating checksum.\n");
+
+out:
+       return ret_val;
+}
+
diff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.h b/drivers/net/ethernet/intel/igb/e1000_nvm.h
new file mode 100644 (file)
index 0000000..a2a7ca9
--- /dev/null
@@ -0,0 +1,43 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_NVM_H_
+#define _E1000_NVM_H_
+
+s32  igb_acquire_nvm(struct e1000_hw *hw);
+void igb_release_nvm(struct e1000_hw *hw);
+s32  igb_read_mac_addr(struct e1000_hw *hw);
+s32  igb_read_part_num(struct e1000_hw *hw, u32 *part_num);
+s32  igb_read_part_string(struct e1000_hw *hw, u8 *part_num,
+                          u32 part_num_size);
+s32  igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+s32  igb_read_nvm_spi(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_validate_nvm_checksum(struct e1000_hw *hw);
+s32  igb_update_nvm_checksum(struct e1000_hw *hw);
+
+#endif
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
new file mode 100644 (file)
index 0000000..e662554
--- /dev/null
@@ -0,0 +1,2341 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#include <linux/if_ether.h>
+#include <linux/delay.h>
+
+#include "e1000_mac.h"
+#include "e1000_phy.h"
+
+static s32  igb_phy_setup_autoneg(struct e1000_hw *hw);
+static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw,
+                                              u16 *phy_ctrl);
+static s32  igb_wait_autoneg(struct e1000_hw *hw);
+
+/* 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]))
+
+/**
+ *  igb_check_reset_block - 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 0, otherwise
+ *  return E1000_BLK_PHY_RESET (12).
+ **/
+s32 igb_check_reset_block(struct e1000_hw *hw)
+{
+       u32 manc;
+
+       manc = rd32(E1000_MANC);
+
+       return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
+              E1000_BLK_PHY_RESET : 0;
+}
+
+/**
+ *  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 = 0;
+       u16 phy_id;
+
+       ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+       if (ret_val)
+               goto out;
+
+       phy->id = (u32)(phy_id << 16);
+       udelay(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 - Reset PHY DSP
+ *  @hw: pointer to the HW structure
+ *
+ *  Reset the digital signal processor.
+ **/
+static s32 igb_phy_reset_dsp(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+
+       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 regsiter 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 = 0;
+
+       if (offset > MAX_PHY_REG_ADDRESS) {
+               hw_dbg("PHY Address %d is out of range\n", offset);
+               ret_val = -E1000_ERR_PARAM;
+               goto out;
+       }
+
+       /*
+        * 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));
+
+       wr32(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++) {
+               udelay(50);
+               mdic = rd32(E1000_MDIC);
+               if (mdic & E1000_MDIC_READY)
+                       break;
+       }
+       if (!(mdic & E1000_MDIC_READY)) {
+               hw_dbg("MDI Read did not complete\n");
+               ret_val = -E1000_ERR_PHY;
+               goto out;
+       }
+       if (mdic & E1000_MDIC_ERROR) {
+               hw_dbg("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 = 0;
+
+       if (offset > MAX_PHY_REG_ADDRESS) {
+               hw_dbg("PHY Address %d is out of range\n", offset);
+               ret_val = -E1000_ERR_PARAM;
+               goto out;
+       }
+
+       /*
+        * 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));
+
+       wr32(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++) {
+               udelay(50);
+               mdic = rd32(E1000_MDIC);
+               if (mdic & E1000_MDIC_READY)
+                       break;
+       }
+       if (!(mdic & E1000_MDIC_READY)) {
+               hw_dbg("MDI Write did not complete\n");
+               ret_val = -E1000_ERR_PHY;
+               goto out;
+       }
+       if (mdic & E1000_MDIC_ERROR) {
+               hw_dbg("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;
+
+
+       /*
+        * 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));
+
+       wr32(E1000_I2CCMD, i2ccmd);
+
+       /* Poll the ready bit to see if the I2C read completed */
+       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
+               udelay(50);
+               i2ccmd = rd32(E1000_I2CCMD);
+               if (i2ccmd & E1000_I2CCMD_READY)
+                       break;
+       }
+       if (!(i2ccmd & E1000_I2CCMD_READY)) {
+               hw_dbg("I2CCMD Read did not complete\n");
+               return -E1000_ERR_PHY;
+       }
+       if (i2ccmd & E1000_I2CCMD_ERROR) {
+               hw_dbg("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 0;
+}
+
+/**
+ *  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;
+
+
+       /* 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);
+
+       wr32(E1000_I2CCMD, i2ccmd);
+
+       /* Poll the ready bit to see if the I2C read completed */
+       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
+               udelay(50);
+               i2ccmd = rd32(E1000_I2CCMD);
+               if (i2ccmd & E1000_I2CCMD_READY)
+                       break;
+       }
+       if (!(i2ccmd & E1000_I2CCMD_READY)) {
+               hw_dbg("I2CCMD Write did not complete\n");
+               return -E1000_ERR_PHY;
+       }
+       if (i2ccmd & E1000_I2CCMD_ERROR) {
+               hw_dbg("I2CCMD Error bit set\n");
+               return -E1000_ERR_PHY;
+       }
+
+       return 0;
+}
+
+/**
+ *  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, 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_igp(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+       s32 ret_val = 0;
+
+       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) {
+                       hw->phy.ops.release(hw);
+                       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_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 igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
+{
+       s32 ret_val = 0;
+
+       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) {
+                       hw->phy.ops.release(hw);
+                       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_copper_link_setup_82580 - Setup 82580 PHY for copper link
+ *  @hw: pointer to the HW structure
+ *
+ *  Sets up Carrier-sense on Transmit and downshift values.
+ **/
+s32 igb_copper_link_setup_82580(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_data;
+
+
+       if (phy->reset_disable) {
+               ret_val = 0;
+               goto out;
+       }
+
+       if (phy->type == e1000_phy_82580) {
+               ret_val = hw->phy.ops.reset(hw);
+               if (ret_val) {
+                       hw_dbg("Error resetting the PHY.\n");
+                       goto out;
+               }
+       }
+
+       /* Enable CRS on TX. This must be set for half-duplex operation. */
+       ret_val = phy->ops.read_reg(hw, I82580_CFG_REG, &phy_data);
+       if (ret_val)
+               goto out;
+
+       phy_data |= I82580_CFG_ASSERT_CRS_ON_TX;
+
+       /* Enable downshift */
+       phy_data |= I82580_CFG_ENABLE_DOWNSHIFT;
+
+       ret_val = phy->ops.write_reg(hw, I82580_CFG_REG, phy_data);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  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;
+
+       if (phy->reset_disable) {
+               ret_val = 0;
+               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 = igb_phy_sw_reset(hw);
+       if (ret_val) {
+               hw_dbg("Error committing the PHY changes\n");
+               goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_copper_link_setup_m88_gen2 - Setup m88 PHY's for copper link
+ *  @hw: pointer to the HW structure
+ *
+ *  Sets up MDI/MDI-X and polarity for i347-AT4, m88e1322 and m88e1112 PHY's.
+ *  Also enables and sets the downshift parameters.
+ **/
+s32 igb_copper_link_setup_m88_gen2(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_data;
+
+       if (phy->reset_disable) {
+               ret_val = 0;
+               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;
+
+       /*
+        * 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:
+               /* M88E1112 does not support this mode) */
+               if (phy->id != M88E1112_E_PHY_ID) {
+                       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 and setting it to X6 */
+       phy_data &= ~I347AT4_PSCR_DOWNSHIFT_MASK;
+       phy_data |= I347AT4_PSCR_DOWNSHIFT_6X;
+       phy_data |= I347AT4_PSCR_DOWNSHIFT_ENABLE;
+
+       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+       if (ret_val)
+               goto out;
+
+       /* Commit the changes. */
+       ret_val = igb_phy_sw_reset(hw);
+       if (ret_val) {
+               hw_dbg("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;
+
+       if (phy->reset_disable) {
+               ret_val = 0;
+               goto out;
+       }
+
+       ret_val = phy->ops.reset(hw);
+       if (ret_val) {
+               hw_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 */
+               if (phy->ops.set_d3_lplu_state)
+                       ret_val = phy->ops.set_d3_lplu_state(hw, false);
+               if (ret_val) {
+                       hw_dbg("Error Disabling LPLU D3\n");
+                       goto out;
+               }
+       }
+
+       /* disable lplu d0 during driver init */
+       ret_val = phy->ops.set_d0_lplu_state(hw, false);
+       if (ret_val) {
+               hw_dbg("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.
+ **/
+static s32 igb_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;
+
+       hw_dbg("Reconfiguring auto-neg advertisement params\n");
+       ret_val = igb_phy_setup_autoneg(hw);
+       if (ret_val) {
+               hw_dbg("Error Setting up Auto-Negotiation\n");
+               goto out;
+       }
+       hw_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 = 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 = igb_wait_autoneg(hw);
+               if (ret_val) {
+                       hw_dbg("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;
+
+       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);
+
+       hw_dbg("autoneg_advertised %x\n", phy->autoneg_advertised);
+
+       /* Do we want to advertise 10 Mb Half Duplex? */
+       if (phy->autoneg_advertised & ADVERTISE_10_HALF) {
+               hw_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) {
+               hw_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) {
+               hw_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) {
+               hw_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)
+               hw_dbg("Advertise 1000mb Half duplex request denied!\n");
+
+       /* Do we want to advertise 1000 Mb Full Duplex? */
+       if (phy->autoneg_advertised & ADVERTISE_1000_FULL) {
+               hw_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 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:
+               hw_dbg("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;
+
+       hw_dbg("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 - 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(struct e1000_hw *hw)
+{
+       s32 ret_val;
+       bool link;
+
+
+       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 {
+               /*
+                * PHY will be set to 10H, 10F, 100H or 100F
+                * depending on user settings.
+                */
+               hw_dbg("Forcing Speed and Duplex\n");
+               ret_val = hw->phy.ops.force_speed_duplex(hw);
+               if (ret_val) {
+                       hw_dbg("Error Forcing Speed and Duplex\n");
+                       goto out;
+               }
+       }
+
+       /*
+        * Check link status. Wait up to 100 microseconds for link to become
+        * valid.
+        */
+       ret_val = igb_phy_has_link(hw,
+                                  COPPER_LINK_UP_LIMIT,
+                                  10,
+                                  &link);
+       if (ret_val)
+               goto out;
+
+       if (link) {
+               hw_dbg("Valid link established!!!\n");
+               igb_config_collision_dist(hw);
+               ret_val = igb_config_fc_after_link_up(hw);
+       } else {
+               hw_dbg("Unable to establish link!!!\n");
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  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;
+
+       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;
+
+       hw_dbg("IGP PSCR: %X\n", phy_data);
+
+       udelay(1);
+
+       if (phy->autoneg_wait_to_complete) {
+               hw_dbg("Waiting for forced speed/duplex link on IGP phy.\n");
+
+               ret_val = igb_phy_has_link(hw,
+                                                    PHY_FORCE_LIMIT,
+                                                    100000,
+                                                    &link);
+               if (ret_val)
+                       goto out;
+
+               if (!link)
+                       hw_dbg("Link taking longer than expected.\n");
+
+               /* Try once more */
+               ret_val = igb_phy_has_link(hw,
+                                                    PHY_FORCE_LIMIT,
+                                                    100000,
+                                                    &link);
+               if (ret_val)
+                       goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  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;
+
+       /*
+        * 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;
+
+       hw_dbg("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 = igb_phy_sw_reset(hw);
+       if (ret_val)
+               goto out;
+
+       if (phy->autoneg_wait_to_complete) {
+               hw_dbg("Waiting for forced speed/duplex link on M88 phy.\n");
+
+               ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT, 100000, &link);
+               if (ret_val)
+                       goto out;
+
+               if (!link) {
+                       if (hw->phy.type != e1000_phy_m88 ||
+                           hw->phy.id == I347AT4_E_PHY_ID ||
+                           hw->phy.id == M88E1112_E_PHY_ID) {
+                               hw_dbg("Link taking longer than expected.\n");
+                       } else {
+
+                               /*
+                                * 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(hw);
+                               if (ret_val)
+                                       goto out;
+                       }
+               }
+
+               /* Try once more */
+               ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT,
+                                          100000, &link);
+               if (ret_val)
+                       goto out;
+       }
+
+       if (hw->phy.type != e1000_phy_m88 ||
+           hw->phy.id == I347AT4_E_PHY_ID ||
+           hw->phy.id == M88E1112_E_PHY_ID)
+               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;
+}
+
+/**
+ *  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.
+ **/
+static void igb_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 = rd32(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;
+               hw_dbg("Half Duplex\n");
+       } else {
+               ctrl |= E1000_CTRL_FD;
+               *phy_ctrl |= MII_CR_FULL_DUPLEX;
+               hw_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);
+               hw_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);
+               hw_dbg("Forcing 10mb\n");
+       }
+
+       igb_config_collision_dist(hw);
+
+       wr32(E1000_CTRL, ctrl);
+}
+
+/**
+ *  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.
+ **/
+s32 igb_set_d3_lplu_state(struct e1000_hw *hw, bool active)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val = 0;
+       u16 data;
+
+       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 - 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(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:
+               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 = 0;
+               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.
+ **/
+static s32 igb_check_polarity_m88(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 data;
+
+       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).
+ **/
+static s32 igb_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 = 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_wait_autoneg - Wait for auto-neg compeletion
+ *  @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.
+ **/
+static s32 igb_wait_autoneg(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 i, phy_status;
+
+       /* 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;
+               msleep(100);
+       }
+
+       /*
+        * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
+        * has completed.
+        */
+       return ret_val;
+}
+
+/**
+ *  igb_phy_has_link - 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(struct e1000_hw *hw, u32 iterations,
+                              u32 usec_interval, bool *success)
+{
+       s32 ret_val = 0;
+       u16 i, phy_status;
+
+       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.
+                        */
+                       udelay(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)
+                       mdelay(usec_interval/1000);
+               else
+                       udelay(usec_interval);
+       }
+
+       *success = (i < iterations) ? true : false;
+
+       return ret_val;
+}
+
+/**
+ *  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;
+
+       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;
+}
+
+s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_data, phy_data2, index, default_page, is_cm;
+
+       switch (hw->phy.id) {
+       case I347AT4_E_PHY_ID:
+               /* Remember the original page select and set it to 7 */
+               ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
+                                           &default_page);
+               if (ret_val)
+                       goto out;
+
+               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0x07);
+               if (ret_val)
+                       goto out;
+
+               /* Get cable length from PHY Cable Diagnostics Control Reg */
+               ret_val = phy->ops.read_reg(hw, (I347AT4_PCDL + phy->addr),
+                                           &phy_data);
+               if (ret_val)
+                       goto out;
+
+               /* Check if the unit of cable length is meters or cm */
+               ret_val = phy->ops.read_reg(hw, I347AT4_PCDC, &phy_data2);
+               if (ret_val)
+                       goto out;
+
+               is_cm = !(phy_data & I347AT4_PCDC_CABLE_LENGTH_UNIT);
+
+               /* Populate the phy structure with cable length in meters */
+               phy->min_cable_length = phy_data / (is_cm ? 100 : 1);
+               phy->max_cable_length = phy_data / (is_cm ? 100 : 1);
+               phy->cable_length = phy_data / (is_cm ? 100 : 1);
+
+               /* Reset the page selec to its original value */
+               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT,
+                                            default_page);
+               if (ret_val)
+                       goto out;
+               break;
+       case M88E1112_E_PHY_ID:
+               /* Remember the original page select and set it to 5 */
+               ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
+                                           &default_page);
+               if (ret_val)
+                       goto out;
+
+               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0x05);
+               if (ret_val)
+                       goto out;
+
+               ret_val = phy->ops.read_reg(hw, M88E1112_VCT_DSP_DISTANCE,
+                                           &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;
+
+               /* Reset the page select to its original value */
+               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT,
+                                            default_page);
+               if (ret_val)
+                       goto out;
+
+               break;
+       default:
+               ret_val = -E1000_ERR_PHY;
+               goto out;
+       }
+
+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 = 0;
+       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;
+       static const 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 = 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;
+}
+
+/**
+ *  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;
+
+       if (phy->media_type != e1000_media_type_copper) {
+               hw_dbg("Phy info is only valid for copper media\n");
+               ret_val = -E1000_ERR_CONFIG;
+               goto out;
+       }
+
+       ret_val = igb_phy_has_link(hw, 1, 0, &link);
+       if (ret_val)
+               goto out;
+
+       if (!link) {
+               hw_dbg("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) {
+               ret_val = phy->ops.get_cable_length(hw);
+               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;
+}
+
+/**
+ *  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;
+
+       ret_val = igb_phy_has_link(hw, 1, 0, &link);
+       if (ret_val)
+               goto out;
+
+       if (!link) {
+               hw_dbg("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) {
+               ret_val = 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 {
+               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 - 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(struct e1000_hw *hw)
+{
+       s32 ret_val = 0;
+       u16 phy_ctrl;
+
+       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;
+
+       udelay(1);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_phy_hw_reset - 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 relase the semaphore (if necessary).
+ **/
+s32 igb_phy_hw_reset(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32  ret_val;
+       u32 ctrl;
+
+       ret_val = igb_check_reset_block(hw);
+       if (ret_val) {
+               ret_val = 0;
+               goto out;
+       }
+
+       ret_val = phy->ops.acquire(hw);
+       if (ret_val)
+               goto out;
+
+       ctrl = rd32(E1000_CTRL);
+       wr32(E1000_CTRL, ctrl | E1000_CTRL_PHY_RST);
+       wrfl();
+
+       udelay(phy->reset_delay_us);
+
+       wr32(E1000_CTRL, ctrl);
+       wrfl();
+
+       udelay(150);
+
+       phy->ops.release(hw);
+
+       ret_val = phy->ops.get_cfg_done(hw);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  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)
+{
+       hw_dbg("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 Giga 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 0;
+}
+
+/**
+ * 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, 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 - Power down copper PHY
+ * @hw: pointer to the HW structure
+ *
+ * Power down PHY to save power when interface is down and wake on lan
+ * is not enabled.
+ **/
+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);
+       msleep(1);
+}
+
+/**
+ *  igb_check_polarity_82580 - 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.
+ **/
+static s32 igb_check_polarity_82580(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 data;
+
+
+       ret_val = phy->ops.read_reg(hw, I82580_PHY_STATUS_2, &data);
+
+       if (!ret_val)
+               phy->cable_polarity = (data & I82580_PHY_STATUS2_REV_POLARITY)
+                                     ? e1000_rev_polarity_reversed
+                                     : e1000_rev_polarity_normal;
+
+       return ret_val;
+}
+
+/**
+ *  igb_phy_force_speed_duplex_82580 - Force speed/duplex for I82580 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_82580(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_data;
+       bool link;
+
+
+       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.  82580 requires MDI
+        * forced whenever speed and duplex are forced.
+        */
+       ret_val = phy->ops.read_reg(hw, I82580_PHY_CTRL_2, &phy_data);
+       if (ret_val)
+               goto out;
+
+       phy_data &= ~I82580_PHY_CTRL2_AUTO_MDIX;
+       phy_data &= ~I82580_PHY_CTRL2_FORCE_MDI_MDIX;
+
+       ret_val = phy->ops.write_reg(hw, I82580_PHY_CTRL_2, phy_data);
+       if (ret_val)
+               goto out;
+
+       hw_dbg("I82580_PHY_CTRL_2: %X\n", phy_data);
+
+       udelay(1);
+
+       if (phy->autoneg_wait_to_complete) {
+               hw_dbg("Waiting for forced speed/duplex link on 82580 phy\n");
+
+               ret_val = igb_phy_has_link(hw,
+                                          PHY_FORCE_LIMIT,
+                                          100000,
+                                          &link);
+               if (ret_val)
+                       goto out;
+
+               if (!link)
+                       hw_dbg("Link taking longer than expected.\n");
+
+               /* Try once more */
+               ret_val = igb_phy_has_link(hw,
+                                          PHY_FORCE_LIMIT,
+                                          100000,
+                                          &link);
+               if (ret_val)
+                       goto out;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  igb_get_phy_info_82580 - Retrieve I82580 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_82580(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 data;
+       bool link;
+
+
+       ret_val = igb_phy_has_link(hw, 1, 0, &link);
+       if (ret_val)
+               goto out;
+
+       if (!link) {
+               hw_dbg("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_82580(hw);
+       if (ret_val)
+               goto out;
+
+       ret_val = phy->ops.read_reg(hw, I82580_PHY_STATUS_2, &data);
+       if (ret_val)
+               goto out;
+
+       phy->is_mdix = (data & I82580_PHY_STATUS2_MDIX) ? true : false;
+
+       if ((data & I82580_PHY_STATUS2_SPEED_MASK) ==
+           I82580_PHY_STATUS2_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 {
+               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_cable_length_82580 - Determine cable length for 82580 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 igb_get_cable_length_82580(struct e1000_hw *hw)
+{
+       struct e1000_phy_info *phy = &hw->phy;
+       s32 ret_val;
+       u16 phy_data, length;
+
+
+       ret_val = phy->ops.read_reg(hw, I82580_PHY_DIAG_STATUS, &phy_data);
+       if (ret_val)
+               goto out;
+
+       length = (phy_data & I82580_DSTATUS_CABLE_LENGTH) >>
+                I82580_DSTATUS_CABLE_LENGTH_SHIFT;
+
+       if (length == E1000_CABLE_LENGTH_UNDEFINED)
+               ret_val = -E1000_ERR_PHY;
+
+       phy->cable_length = length;
+
+out:
+       return ret_val;
+}
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h
new file mode 100644 (file)
index 0000000..8510797
--- /dev/null
@@ -0,0 +1,136 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_PHY_H_
+#define _E1000_PHY_H_
+
+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
+};
+
+s32  igb_check_downshift(struct e1000_hw *hw);
+s32  igb_check_reset_block(struct e1000_hw *hw);
+s32  igb_copper_link_setup_igp(struct e1000_hw *hw);
+s32  igb_copper_link_setup_m88(struct e1000_hw *hw);
+s32  igb_copper_link_setup_m88_gen2(struct e1000_hw *hw);
+s32  igb_phy_force_speed_duplex_igp(struct e1000_hw *hw);
+s32  igb_phy_force_speed_duplex_m88(struct e1000_hw *hw);
+s32  igb_get_cable_length_m88(struct e1000_hw *hw);
+s32  igb_get_cable_length_m88_gen2(struct e1000_hw *hw);
+s32  igb_get_cable_length_igp_2(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(struct e1000_hw *hw);
+s32  igb_phy_hw_reset(struct e1000_hw *hw);
+s32  igb_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
+s32  igb_set_d3_lplu_state(struct e1000_hw *hw, bool active);
+s32  igb_setup_copper_link(struct e1000_hw *hw);
+s32  igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
+s32  igb_phy_has_link(struct e1000_hw *hw, u32 iterations,
+                               u32 usec_interval, bool *success);
+void igb_power_up_phy_copper(struct e1000_hw *hw);
+void igb_power_down_phy_copper(struct e1000_hw *hw);
+s32  igb_phy_init_script_igp3(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);
+s32  igb_copper_link_setup_82580(struct e1000_hw *hw);
+s32  igb_get_phy_info_82580(struct e1000_hw *hw);
+s32  igb_phy_force_speed_duplex_82580(struct e1000_hw *hw);
+s32  igb_get_cable_length_82580(struct e1000_hw *hw);
+
+/* 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 IGP02E1000_PHY_POWER_MGMT         0x19 /* Power Management */
+#define IGP01E1000_PHY_PAGE_SELECT        0x1F /* Page Select */
+#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
+
+#define I82580_ADDR_REG                   16
+#define I82580_CFG_REG                    22
+#define I82580_CFG_ASSERT_CRS_ON_TX       (1 << 15)
+#define I82580_CFG_ENABLE_DOWNSHIFT       (3 << 10) /* auto downshift 100/10 */
+#define I82580_CTRL_REG                   23
+#define I82580_CTRL_DOWNSHIFT_MASK        (7 << 10)
+
+/* 82580 specific PHY registers */
+#define I82580_PHY_CTRL_2            18
+#define I82580_PHY_LBK_CTRL          19
+#define I82580_PHY_STATUS_2          26
+#define I82580_PHY_DIAG_STATUS       31
+
+/* I82580 PHY Status 2 */
+#define I82580_PHY_STATUS2_REV_POLARITY   0x0400
+#define I82580_PHY_STATUS2_MDIX           0x0800
+#define I82580_PHY_STATUS2_SPEED_MASK     0x0300
+#define I82580_PHY_STATUS2_SPEED_1000MBPS 0x0200
+#define I82580_PHY_STATUS2_SPEED_100MBPS  0x0100
+
+/* I82580 PHY Control 2 */
+#define I82580_PHY_CTRL2_AUTO_MDIX        0x0400
+#define I82580_PHY_CTRL2_FORCE_MDI_MDIX   0x0200
+
+/* I82580 PHY Diagnostics Status */
+#define I82580_DSTATUS_CABLE_LENGTH       0x03FC
+#define I82580_DSTATUS_CABLE_LENGTH_SHIFT 2
+/* Enable flexible speed on link-up */
+#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 E1000_CABLE_LENGTH_UNDEFINED      0xFF
+
+#endif
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
new file mode 100644 (file)
index 0000000..0990f6d
--- /dev/null
@@ -0,0 +1,354 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#ifndef _E1000_REGS_H_
+#define _E1000_REGS_H_
+
+#define E1000_CTRL     0x00000  /* Device Control - 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_MDIC     0x00020  /* MDI Control - RW */
+#define E1000_MDICNFG  0x00E04  /* MDI Config - 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_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_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_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
+#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
+#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
+#define E1000_PBS      0x01008  /* Packet Buffer Size */
+#define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */
+#define E1000_EEWR     0x0102C  /* EEPROM Write Register - RW */
+#define E1000_I2CCMD   0x01028  /* SFPI2C Command Register - RW */
+#define E1000_FRTIMER  0x01048  /* Free Running Timer - RW */
+#define E1000_TCPTIMER 0x0104C  /* TCP Timer - RW */
+#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
+#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
+#define E1000_FCRTV    0x02460  /* Flow Control Refresh Timer Value - RW */
+
+/* IEEE 1588 TIMESYNCH */
+#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 */
+#define E1000_TSAUXC     0x0B640 /* Timesync Auxiliary Control register */
+#define E1000_SYSTIMR    0x0B6F8 /* System time register Residue */
+
+/* Filtering Registers */
+#define E1000_SAQF(_n) (0x5980 + 4 * (_n))
+#define E1000_DAQF(_n) (0x59A0 + 4 * (_n))
+#define E1000_SPQF(_n) (0x59C0 + 4 * (_n))
+#define E1000_FTQF(_n) (0x59E0 + 4 * (_n))
+#define E1000_SAQF0 E1000_SAQF(0)
+#define E1000_DAQF0 E1000_DAQF(0)
+#define E1000_SPQF0 E1000_SPQF(0)
+#define E1000_FTQF0 E1000_FTQF(0)
+#define E1000_SYNQF(_n) (0x055FC + (4 * (_n))) /* SYN Packet Queue Fltr */
+#define E1000_ETQF(_n)  (0x05CB0 + (4 * (_n))) /* EType Queue Fltr */
+
+#define E1000_RQDPC(_n) (0x0C030 + ((_n) * 0x40))
+
+/* DMA Coalescing registers */
+#define E1000_DMACR             0x02508 /* Control Register */
+#define E1000_DMCTXTH           0x03550 /* Transmit Threshold */
+#define E1000_DMCTLX            0x02514 /* Time to Lx Request */
+#define E1000_DMCRTRH           0x05DD0 /* Receive Packet Rate Threshold */
+#define E1000_DMCCNT            0x05DD4 /* Current Rx Count */
+#define E1000_FCRTC             0x02170 /* Flow Control Rx high watermark */
+#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
+
+/* TX Rate Limit Registers */
+#define E1000_RTTDQSEL 0x3604  /* Tx Desc Plane Queue Select - WO */
+#define E1000_RTTBCNRC 0x36B0  /* Tx BCN Rate-Scheduler Config - WO */
+
+/* Split and Replication RX Control - RW */
+#define E1000_RXPBS    0x02404  /* Rx Packet Buffer Size - 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_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_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_TDFPC    0x03430  /* TX Data FIFO Packet Count - RW */
+#define E1000_DTXCTL   0x03590  /* DMA TX Control - 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 */
+/* Interrupt Cause Rx Packet Timer Expire Count */
+#define E1000_ICRXPTC  0x04104
+/* Interrupt Cause Rx Absolute Timer Expire Count */
+#define E1000_ICRXATC  0x04108
+/* Interrupt Cause Tx Packet Timer Expire Count */
+#define E1000_ICTXPTC  0x0410C
+/* Interrupt Cause Tx Absolute Timer Expire Count */
+#define E1000_ICTXATC  0x04110
+/* Interrupt Cause Tx Queue Empty Count */
+#define E1000_ICTXQEC  0x04118
+/* Interrupt Cause Tx Queue Minimum Threshold Count */
+#define E1000_ICTXQMTC 0x0411C
+/* Interrupt Cause Rx Descriptor Minimum Threshold Count */
+#define E1000_ICRXDMTC 0x04120
+#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_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_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_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_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_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
+#define E1000_VT_CTL   0x0581C  /* VMDq Control - RW */
+#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_WUPL     0x05900  /* Wakeup Packet Length - 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_FACTPS    0x05B30 /* Function Active and Power State to MNG */
+#define E1000_SWSM      0x05B50 /* SW Semaphore */
+#define E1000_FWSM      0x05B54 /* FW Semaphore */
+#define E1000_DCA_CTRL  0x05B74 /* DCA Control - RW */
+
+/* RSS registers */
+#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 */
+/* MSI-X Allocation Register (_i) - RW */
+#define E1000_MSIXBM(_i)    (0x01600 + ((_i) * 4))
+/* Redirection Table - RW Array */
+#define E1000_RETA(_i)  (0x05C00 + ((_i) * 4))
+#define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW Array */
+
+/* VT Registers */
+#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_WVBR      0x03554 /* VM Wrong Behavior - RWS */
+#define E1000_RPLOLR    0x05AF0 /* Replication Offload - RW */
+#define E1000_UTA       0x0A000 /* Unicast Table Array - RW */
+#define E1000_IOVTCL    0x05BBC /* IOV Control Register */
+/* These act per VF so an array friendly macro is used */
+#define E1000_P2VMAILBOX(_n)   (0x00C00 + (4 * (_n)))
+#define E1000_VMBMEM(_n)       (0x00800 + (64 * (_n)))
+#define E1000_VMOLR(_n)        (0x05AD0 + (4 * (_n)))
+#define E1000_VLVF(_n)         (0x05D00 + (4 * (_n))) /* VLAN Virtual Machine
+                                                       * Filter - RW */
+#define E1000_VMVIR(_n)        (0x03700 + (4 * (_n)))
+
+#define wr32(reg, value) (writel(value, hw->hw_addr + reg))
+#define rd32(reg) (readl(hw->hw_addr + reg))
+#define wrfl() ((void)rd32(E1000_STATUS))
+
+#define array_wr32(reg, offset, value) \
+       (writel(value, hw->hw_addr + reg + ((offset) << 2)))
+#define array_rd32(reg, offset) \
+       (readl(hw->hw_addr + reg + ((offset) << 2)))
+
+/* DMA Coalescing registers */
+#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
+
+/* Energy Efficient Ethernet "EEE" register */
+#define E1000_IPCNFG  0x0E38  /* Internal PHY Configuration */
+#define E1000_EEER    0x0E30  /* Energy Efficient Ethernet */
+
+/* Thermal Sensor Register */
+#define E1000_THSTAT    0x08110 /* Thermal Sensor Status */
+
+/* OS2BMC Registers */
+#define E1000_B2OSPC    0x08FE0 /* BMC2OS packets sent by BMC */
+#define E1000_B2OGPRC   0x04158 /* BMC2OS packets received by host */
+#define E1000_O2BGPTC   0x08FE4 /* OS2BMC packets received by BMC */
+#define E1000_O2BSPC    0x0415C /* OS2BMC packets transmitted by host */
+
+#endif
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
new file mode 100644 (file)
index 0000000..265e151
--- /dev/null
@@ -0,0 +1,415 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+
+/* Linux PRO/1000 Ethernet Driver main header file */
+
+#ifndef _IGB_H_
+#define _IGB_H_
+
+#include "e1000_mac.h"
+#include "e1000_82575.h"
+
+#include <linux/clocksource.h>
+#include <linux/timecompare.h>
+#include <linux/net_tstamp.h>
+#include <linux/bitops.h>
+#include <linux/if_vlan.h>
+
+struct igb_adapter;
+
+/* ((1000000000ns / (6000ints/s * 1024ns)) << 2 = 648 */
+#define IGB_START_ITR 648
+
+/* 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_DEFAULT_ITR                    3 /* dynamic */
+#define IGB_MAX_ITR_USECS              10000
+#define IGB_MIN_ITR_USECS                 10
+#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
+
+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 vlans_enabled;
+       u32 flags;
+       unsigned long last_nack;
+       u16 pf_vlan; /* When set, guest VLAN config not allowed. */
+       u16 pf_qos;
+       u16 tx_rate;
+};
+
+#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 */
+#define IGB_VF_FLAG_PF_SET_MAC     0x00000008 /* PF has set MAC address */
+
+/* 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                     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) ? 1 : 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_64    64     /* Used for packet split */
+#define IGB_RXBUFFER_128   128    /* Used for packet split */
+#define IGB_RXBUFFER_1024  1024
+#define IGB_RXBUFFER_2048  2048
+#define IGB_RXBUFFER_16384 16384
+
+#define MAX_STD_JUMBO_FRAME_SIZE 9234
+
+/* How many Tx Descriptors do we need to call netif_wake_queue ? */
+#define IGB_TX_QUEUE_WAKE      16
+/* 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;
+       union {
+               /* TX */
+               struct {
+                       unsigned long time_stamp;
+                       u16 length;
+                       u16 next_to_watch;
+                       unsigned int bytecount;
+                       u16 gso_segs;
+                       u8 tx_flags;
+                       u8 mapped_as_page;
+               };
+               /* RX */
+               struct {
+                       struct page *page;
+                       dma_addr_t page_dma;
+                       u16 page_offset;
+               };
+       };
+};
+
+struct igb_tx_queue_stats {
+       u64 packets;
+       u64 bytes;
+       u64 restart_queue;
+       u64 restart_queue2;
+};
+
+struct igb_rx_queue_stats {
+       u64 packets;
+       u64 bytes;
+       u64 drops;
+       u64 csum_err;
+       u64 alloc_failed;
+};
+
+struct igb_q_vector {
+       struct igb_adapter *adapter; /* backlink */
+       struct igb_ring *rx_ring;
+       struct igb_ring *tx_ring;
+       struct napi_struct napi;
+
+       u32 eims_value;
+       u16 cpu;
+
+       u16 itr_val;
+       u8 set_itr;
+       void __iomem *itr_register;
+
+       char name[IFNAMSIZ + 9];
+};
+
+struct igb_ring {
+       struct igb_q_vector *q_vector; /* backlink to q_vector */
+       struct net_device *netdev;     /* back pointer to net_device */
+       struct device *dev;            /* device pointer 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;
+
+       u32 flags;
+
+       union {
+               /* TX */
+               struct {
+                       struct igb_tx_queue_stats tx_stats;
+                       struct u64_stats_sync tx_syncp;
+                       struct u64_stats_sync tx_syncp2;
+                       bool detect_tx_hung;
+               };
+               /* RX */
+               struct {
+                       struct igb_rx_queue_stats rx_stats;
+                       struct u64_stats_sync rx_syncp;
+                       u32 rx_buffer_len;
+               };
+       };
+};
+
+#define IGB_RING_FLAG_RX_CSUM        0x00000001 /* RX CSUM enabled */
+#define IGB_RING_FLAG_RX_SCTP_CSUM   0x00000002 /* SCTP CSUM offload enabled */
+
+#define IGB_RING_FLAG_TX_CTX_IDX     0x00000001 /* HW requires context index */
+
+#define IGB_ADVTXD_DCMD (E1000_TXD_CMD_EOP | E1000_TXD_CMD_RS)
+
+#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]))
+
+/* igb_desc_unused - calculate if we have unused descriptors */
+static inline int igb_desc_unused(struct igb_ring *ring)
+{
+       if (ring->next_to_clean > ring->next_to_use)
+               return ring->next_to_clean - ring->next_to_use - 1;
+
+       return ring->count + ring->next_to_clean - ring->next_to_use - 1;
+}
+
+/* board specific private data structure */
+struct igb_adapter {
+       struct timer_list watchdog_timer;
+       struct timer_list phy_info_timer;
+       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       u16 mng_vlan_id;
+       u32 bd_number;
+       u32 wol;
+       u32 en_mng_pt;
+       u16 link_speed;
+       u16 link_duplex;
+
+       /* Interrupt Throttle Rate */
+       u32 rx_itr_setting;
+       u32 tx_itr_setting;
+       u16 tx_itr;
+       u16 rx_itr;
+
+       struct work_struct reset_task;
+       struct work_struct watchdog_task;
+       bool fc_autoneg;
+       u8  tx_timeout_factor;
+       struct timer_list blink_timer;
+       unsigned long led_status;
+
+       /* TX */
+       struct igb_ring *tx_ring[16];
+       u32 tx_timeout_count;
+
+       /* RX */
+       struct igb_ring *rx_ring[16];
+       int num_tx_queues;
+       int num_rx_queues;
+
+       u32 max_frame_size;
+       u32 min_frame_size;
+
+       /* OS defined structs */
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+       struct cyclecounter cycles;
+       struct timecounter clock;
+       struct timecompare compare;
+       struct hwtstamp_config hwtstamp_config;
+
+       spinlock_t stats64_lock;
+       struct rtnl_link_stats64 stats64;
+
+       /* 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;
+
+       u32 test_icr;
+       struct igb_ring test_tx_ring;
+       struct igb_ring test_rx_ring;
+
+       int msg_enable;
+
+       unsigned int num_q_vectors;
+       struct igb_q_vector *q_vector[MAX_Q_VECTORS];
+       struct msix_entry *msix_entries;
+       u32 eims_enable_mask;
+       u32 eims_other;
+
+       /* to not mess up cache alignment, always add to the bottom */
+       unsigned long state;
+       unsigned int flags;
+       u32 eeprom_wol;
+
+       struct igb_ring *multi_tx_table[IGB_ABS_MAX_TX_QUEUES];
+       u16 tx_ring_count;
+       u16 rx_ring_count;
+       unsigned int vfs_allocated_count;
+       struct vf_data_storage *vf_data;
+       int vf_rate_link_speed;
+       u32 rss_queues;
+       u32 wvbr;
+};
+
+#define IGB_FLAG_HAS_MSI           (1 << 0)
+#define IGB_FLAG_DCA_ENABLED       (1 << 1)
+#define IGB_FLAG_QUAD_PORT_A       (1 << 2)
+#define IGB_FLAG_QUEUE_PAIRS       (1 << 3)
+#define IGB_FLAG_DMAC              (1 << 4)
+
+/* DMA Coalescing defines */
+#define IGB_MIN_TXPBSIZE           20408
+#define IGB_TX_BUF_4096            4096
+#define IGB_DMCTLX_DCFLUSH_DIS     0x80000000  /* Disable DMA Coal Flush */
+
+#define IGB_82576_TSYNC_SHIFT 19
+#define IGB_82580_TSYNC_SHIFT 24
+#define IGB_TS_HDR_LEN        16
+enum e1000_state_t {
+       __IGB_TESTING,
+       __IGB_RESETTING,
+       __IGB_DOWN
+};
+
+enum igb_boards {
+       board_82575,
+};
+
+extern char igb_driver_name[];
+extern char igb_driver_version[];
+
+extern int igb_up(struct igb_adapter *);
+extern void igb_down(struct igb_adapter *);
+extern void igb_reinit_locked(struct igb_adapter *);
+extern void igb_reset(struct igb_adapter *);
+extern int igb_set_spd_dplx(struct igb_adapter *, u32, u8);
+extern int igb_setup_tx_resources(struct igb_ring *);
+extern int igb_setup_rx_resources(struct igb_ring *);
+extern void igb_free_tx_resources(struct igb_ring *);
+extern void igb_free_rx_resources(struct igb_ring *);
+extern void igb_configure_tx_ring(struct igb_adapter *, struct igb_ring *);
+extern void igb_configure_rx_ring(struct igb_adapter *, struct igb_ring *);
+extern void igb_setup_tctl(struct igb_adapter *);
+extern void igb_setup_rctl(struct igb_adapter *);
+extern netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *, struct igb_ring *);
+extern void igb_unmap_and_free_tx_resource(struct igb_ring *,
+                                          struct igb_buffer *);
+extern void igb_alloc_rx_buffers_adv(struct igb_ring *, int);
+extern void igb_update_stats(struct igb_adapter *, struct rtnl_link_stats64 *);
+extern bool igb_has_link(struct igb_adapter *adapter);
+extern void igb_set_ethtool_ops(struct net_device *);
+extern void igb_power_up_link(struct igb_adapter *);
+
+static inline s32 igb_reset_phy(struct e1000_hw *hw)
+{
+       if (hw->phy.ops.reset)
+               return hw->phy.ops.reset(hw);
+
+       return 0;
+}
+
+static inline 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 0;
+}
+
+static inline 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 0;
+}
+
+static inline s32 igb_get_phy_info(struct e1000_hw *hw)
+{
+       if (hw->phy.ops.get_phy_info)
+               return hw->phy.ops.get_phy_info(hw);
+
+       return 0;
+}
+
+#endif /* _IGB_H_ */
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
new file mode 100644 (file)
index 0000000..414b022
--- /dev/null
@@ -0,0 +1,2201 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+/* ethtool support for igb */
+
+#include <linux/vmalloc.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/if_ether.h>
+#include <linux/ethtool.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+
+#include "igb.h"
+
+struct igb_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int sizeof_stat;
+       int stat_offset;
+};
+
+#define IGB_STAT(_name, _stat) { \
+       .stat_string = _name, \
+       .sizeof_stat = FIELD_SIZEOF(struct igb_adapter, _stat), \
+       .stat_offset = offsetof(struct igb_adapter, _stat) \
+}
+static const struct igb_stats igb_gstrings_stats[] = {
+       IGB_STAT("rx_packets", stats.gprc),
+       IGB_STAT("tx_packets", stats.gptc),
+       IGB_STAT("rx_bytes", stats.gorc),
+       IGB_STAT("tx_bytes", stats.gotc),
+       IGB_STAT("rx_broadcast", stats.bprc),
+       IGB_STAT("tx_broadcast", stats.bptc),
+       IGB_STAT("rx_multicast", stats.mprc),
+       IGB_STAT("tx_multicast", stats.mptc),
+       IGB_STAT("multicast", stats.mprc),
+       IGB_STAT("collisions", stats.colc),
+       IGB_STAT("rx_crc_errors", stats.crcerrs),
+       IGB_STAT("rx_no_buffer_count", stats.rnbc),
+       IGB_STAT("rx_missed_errors", stats.mpc),
+       IGB_STAT("tx_aborted_errors", stats.ecol),
+       IGB_STAT("tx_carrier_errors", stats.tncrs),
+       IGB_STAT("tx_window_errors", stats.latecol),
+       IGB_STAT("tx_abort_late_coll", stats.latecol),
+       IGB_STAT("tx_deferred_ok", stats.dc),
+       IGB_STAT("tx_single_coll_ok", stats.scc),
+       IGB_STAT("tx_multi_coll_ok", stats.mcc),
+       IGB_STAT("tx_timeout_count", tx_timeout_count),
+       IGB_STAT("rx_long_length_errors", stats.roc),
+       IGB_STAT("rx_short_length_errors", stats.ruc),
+       IGB_STAT("rx_align_errors", stats.algnerrc),
+       IGB_STAT("tx_tcp_seg_good", stats.tsctc),
+       IGB_STAT("tx_tcp_seg_failed", stats.tsctfc),
+       IGB_STAT("rx_flow_control_xon", stats.xonrxc),
+       IGB_STAT("rx_flow_control_xoff", stats.xoffrxc),
+       IGB_STAT("tx_flow_control_xon", stats.xontxc),
+       IGB_STAT("tx_flow_control_xoff", stats.xofftxc),
+       IGB_STAT("rx_long_byte_count", stats.gorc),
+       IGB_STAT("tx_dma_out_of_sync", stats.doosync),
+       IGB_STAT("tx_smbus", stats.mgptc),
+       IGB_STAT("rx_smbus", stats.mgprc),
+       IGB_STAT("dropped_smbus", stats.mgpdc),
+       IGB_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),
+       IGB_STAT("os2bmc_tx_by_bmc", stats.b2ospc),
+       IGB_STAT("os2bmc_tx_by_host", stats.o2bspc),
+       IGB_STAT("os2bmc_rx_by_host", stats.b2ogprc),
+};
+
+#define IGB_NETDEV_STAT(_net_stat) { \
+       .stat_string = __stringify(_net_stat), \
+       .sizeof_stat = FIELD_SIZEOF(struct rtnl_link_stats64, _net_stat), \
+       .stat_offset = offsetof(struct rtnl_link_stats64, _net_stat) \
+}
+static const struct igb_stats igb_gstrings_net_stats[] = {
+       IGB_NETDEV_STAT(rx_errors),
+       IGB_NETDEV_STAT(tx_errors),
+       IGB_NETDEV_STAT(tx_dropped),
+       IGB_NETDEV_STAT(rx_length_errors),
+       IGB_NETDEV_STAT(rx_over_errors),
+       IGB_NETDEV_STAT(rx_frame_errors),
+       IGB_NETDEV_STAT(rx_fifo_errors),
+       IGB_NETDEV_STAT(tx_fifo_errors),
+       IGB_NETDEV_STAT(tx_heartbeat_errors)
+};
+
+#define IGB_GLOBAL_STATS_LEN   \
+       (sizeof(igb_gstrings_stats) / sizeof(struct igb_stats))
+#define IGB_NETDEV_STATS_LEN   \
+       (sizeof(igb_gstrings_net_stats) / sizeof(struct igb_stats))
+#define IGB_RX_QUEUE_STATS_LEN \
+       (sizeof(struct igb_rx_queue_stats) / sizeof(u64))
+
+#define IGB_TX_QUEUE_STATS_LEN 3 /* packets, bytes, restart_queue */
+
+#define IGB_QUEUE_STATS_LEN \
+       ((((struct igb_adapter *)netdev_priv(netdev))->num_rx_queues * \
+         IGB_RX_QUEUE_STATS_LEN) + \
+        (((struct igb_adapter *)netdev_priv(netdev))->num_tx_queues * \
+         IGB_TX_QUEUE_STATS_LEN))
+#define IGB_STATS_LEN \
+       (IGB_GLOBAL_STATS_LEN + IGB_NETDEV_STATS_LEN + IGB_QUEUE_STATS_LEN)
+
+static const char igb_gstrings_test[][ETH_GSTRING_LEN] = {
+       "Register test  (offline)", "Eeprom test    (offline)",
+       "Interrupt test (offline)", "Loopback test  (offline)",
+       "Link test   (on/offline)"
+};
+#define IGB_TEST_LEN (sizeof(igb_gstrings_test) / ETH_GSTRING_LEN)
+
+static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 status;
+
+       if (hw->phy.media_type == e1000_media_type_copper) {
+
+               ecmd->supported = (SUPPORTED_10baseT_Half |
+                                  SUPPORTED_10baseT_Full |
+                                  SUPPORTED_100baseT_Half |
+                                  SUPPORTED_100baseT_Full |
+                                  SUPPORTED_1000baseT_Full|
+                                  SUPPORTED_Autoneg |
+                                  SUPPORTED_TP);
+               ecmd->advertising = ADVERTISED_TP;
+
+               if (hw->mac.autoneg == 1) {
+                       ecmd->advertising |= ADVERTISED_Autoneg;
+                       /* the e1000 autoneg seems to match ethtool nicely */
+                       ecmd->advertising |= hw->phy.autoneg_advertised;
+               }
+
+               ecmd->port = PORT_TP;
+               ecmd->phy_address = hw->phy.addr;
+       } else {
+               ecmd->supported   = (SUPPORTED_1000baseT_Full |
+                                    SUPPORTED_FIBRE |
+                                    SUPPORTED_Autoneg);
+
+               ecmd->advertising = (ADVERTISED_1000baseT_Full |
+                                    ADVERTISED_FIBRE |
+                                    ADVERTISED_Autoneg);
+
+               ecmd->port = PORT_FIBRE;
+       }
+
+       ecmd->transceiver = XCVR_INTERNAL;
+
+       status = rd32(E1000_STATUS);
+
+       if (status & E1000_STATUS_LU) {
+
+               if ((status & E1000_STATUS_SPEED_1000) ||
+                   hw->phy.media_type != e1000_media_type_copper)
+                       ethtool_cmd_speed_set(ecmd, SPEED_1000);
+               else if (status & E1000_STATUS_SPEED_100)
+                       ethtool_cmd_speed_set(ecmd, SPEED_100);
+               else
+                       ethtool_cmd_speed_set(ecmd, SPEED_10);
+
+               if ((status & E1000_STATUS_FD) ||
+                   hw->phy.media_type != e1000_media_type_copper)
+                       ecmd->duplex = DUPLEX_FULL;
+               else
+                       ecmd->duplex = DUPLEX_HALF;
+       } else {
+               ethtool_cmd_speed_set(ecmd, -1);
+               ecmd->duplex = -1;
+       }
+
+       ecmd->autoneg = hw->mac.autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+       return 0;
+}
+
+static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* When SoL/IDER sessions are active, autoneg/speed/duplex
+        * cannot be changed */
+       if (igb_check_reset_block(hw)) {
+               dev_err(&adapter->pdev->dev, "Cannot change link "
+                       "characteristics when SoL/IDER is active.\n");
+               return -EINVAL;
+       }
+
+       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
+               msleep(1);
+
+       if (ecmd->autoneg == AUTONEG_ENABLE) {
+               hw->mac.autoneg = 1;
+               hw->phy.autoneg_advertised = ecmd->advertising |
+                                            ADVERTISED_TP |
+                                            ADVERTISED_Autoneg;
+               ecmd->advertising = hw->phy.autoneg_advertised;
+               if (adapter->fc_autoneg)
+                       hw->fc.requested_mode = e1000_fc_default;
+       } else {
+               u32 speed = ethtool_cmd_speed(ecmd);
+               if (igb_set_spd_dplx(adapter, speed, ecmd->duplex)) {
+                       clear_bit(__IGB_RESETTING, &adapter->state);
+                       return -EINVAL;
+               }
+       }
+
+       /* reset the link */
+       if (netif_running(adapter->netdev)) {
+               igb_down(adapter);
+               igb_up(adapter);
+       } else
+               igb_reset(adapter);
+
+       clear_bit(__IGB_RESETTING, &adapter->state);
+       return 0;
+}
+
+static u32 igb_get_link(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_mac_info *mac = &adapter->hw.mac;
+
+       /*
+        * If the link is not reported up to netdev, interrupts are disabled,
+        * and so the physical link state may have changed since we last
+        * looked. Set get_link_status to make sure that the true link
+        * state is interrogated, rather than pulling a cached and possibly
+        * stale link state from the driver.
+        */
+       if (!netif_carrier_ok(netdev))
+               mac->get_link_status = 1;
+
+       return igb_has_link(adapter);
+}
+
+static void igb_get_pauseparam(struct net_device *netdev,
+                              struct ethtool_pauseparam *pause)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       pause->autoneg =
+               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
+
+       if (hw->fc.current_mode == e1000_fc_rx_pause)
+               pause->rx_pause = 1;
+       else if (hw->fc.current_mode == e1000_fc_tx_pause)
+               pause->tx_pause = 1;
+       else if (hw->fc.current_mode == e1000_fc_full) {
+               pause->rx_pause = 1;
+               pause->tx_pause = 1;
+       }
+}
+
+static int igb_set_pauseparam(struct net_device *netdev,
+                             struct ethtool_pauseparam *pause)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int retval = 0;
+
+       adapter->fc_autoneg = pause->autoneg;
+
+       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
+               msleep(1);
+
+       if (adapter->fc_autoneg == AUTONEG_ENABLE) {
+               hw->fc.requested_mode = e1000_fc_default;
+               if (netif_running(adapter->netdev)) {
+                       igb_down(adapter);
+                       igb_up(adapter);
+               } else {
+                       igb_reset(adapter);
+               }
+       } else {
+               if (pause->rx_pause && pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_full;
+               else if (pause->rx_pause && !pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_rx_pause;
+               else if (!pause->rx_pause && pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_tx_pause;
+               else if (!pause->rx_pause && !pause->tx_pause)
+                       hw->fc.requested_mode = e1000_fc_none;
+
+               hw->fc.current_mode = hw->fc.requested_mode;
+
+               retval = ((hw->phy.media_type == e1000_media_type_copper) ?
+                         igb_force_mac_fc(hw) : igb_setup_link(hw));
+       }
+
+       clear_bit(__IGB_RESETTING, &adapter->state);
+       return retval;
+}
+
+static u32 igb_get_msglevel(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       return adapter->msg_enable;
+}
+
+static void igb_set_msglevel(struct net_device *netdev, u32 data)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       adapter->msg_enable = data;
+}
+
+static int igb_get_regs_len(struct net_device *netdev)
+{
+#define IGB_REGS_LEN 551
+       return IGB_REGS_LEN * sizeof(u32);
+}
+
+static void igb_get_regs(struct net_device *netdev,
+                        struct ethtool_regs *regs, void *p)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 *regs_buff = p;
+       u8 i;
+
+       memset(p, 0, IGB_REGS_LEN * sizeof(u32));
+
+       regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;
+
+       /* General Registers */
+       regs_buff[0] = rd32(E1000_CTRL);
+       regs_buff[1] = rd32(E1000_STATUS);
+       regs_buff[2] = rd32(E1000_CTRL_EXT);
+       regs_buff[3] = rd32(E1000_MDIC);
+       regs_buff[4] = rd32(E1000_SCTL);
+       regs_buff[5] = rd32(E1000_CONNSW);
+       regs_buff[6] = rd32(E1000_VET);
+       regs_buff[7] = rd32(E1000_LEDCTL);
+       regs_buff[8] = rd32(E1000_PBA);
+       regs_buff[9] = rd32(E1000_PBS);
+       regs_buff[10] = rd32(E1000_FRTIMER);
+       regs_buff[11] = rd32(E1000_TCPTIMER);
+
+       /* NVM Register */
+       regs_buff[12] = rd32(E1000_EECD);
+
+       /* Interrupt */
+       /* Reading EICS for EICR because they read the
+        * same but EICS does not clear on read */
+       regs_buff[13] = rd32(E1000_EICS);
+       regs_buff[14] = rd32(E1000_EICS);
+       regs_buff[15] = rd32(E1000_EIMS);
+       regs_buff[16] = rd32(E1000_EIMC);
+       regs_buff[17] = rd32(E1000_EIAC);
+       regs_buff[18] = rd32(E1000_EIAM);
+       /* Reading ICS for ICR because they read the
+        * same but ICS does not clear on read */
+       regs_buff[19] = rd32(E1000_ICS);
+       regs_buff[20] = rd32(E1000_ICS);
+       regs_buff[21] = rd32(E1000_IMS);
+       regs_buff[22] = rd32(E1000_IMC);
+       regs_buff[23] = rd32(E1000_IAC);
+       regs_buff[24] = rd32(E1000_IAM);
+       regs_buff[25] = rd32(E1000_IMIRVP);
+
+       /* Flow Control */
+       regs_buff[26] = rd32(E1000_FCAL);
+       regs_buff[27] = rd32(E1000_FCAH);
+       regs_buff[28] = rd32(E1000_FCTTV);
+       regs_buff[29] = rd32(E1000_FCRTL);
+       regs_buff[30] = rd32(E1000_FCRTH);
+       regs_buff[31] = rd32(E1000_FCRTV);
+
+       /* Receive */
+       regs_buff[32] = rd32(E1000_RCTL);
+       regs_buff[33] = rd32(E1000_RXCSUM);
+       regs_buff[34] = rd32(E1000_RLPML);
+       regs_buff[35] = rd32(E1000_RFCTL);
+       regs_buff[36] = rd32(E1000_MRQC);
+       regs_buff[37] = rd32(E1000_VT_CTL);
+
+       /* Transmit */
+       regs_buff[38] = rd32(E1000_TCTL);
+       regs_buff[39] = rd32(E1000_TCTL_EXT);
+       regs_buff[40] = rd32(E1000_TIPG);
+       regs_buff[41] = rd32(E1000_DTXCTL);
+
+       /* Wake Up */
+       regs_buff[42] = rd32(E1000_WUC);
+       regs_buff[43] = rd32(E1000_WUFC);
+       regs_buff[44] = rd32(E1000_WUS);
+       regs_buff[45] = rd32(E1000_IPAV);
+       regs_buff[46] = rd32(E1000_WUPL);
+
+       /* MAC */
+       regs_buff[47] = rd32(E1000_PCS_CFG0);
+       regs_buff[48] = rd32(E1000_PCS_LCTL);
+       regs_buff[49] = rd32(E1000_PCS_LSTAT);
+       regs_buff[50] = rd32(E1000_PCS_ANADV);
+       regs_buff[51] = rd32(E1000_PCS_LPAB);
+       regs_buff[52] = rd32(E1000_PCS_NPTX);
+       regs_buff[53] = rd32(E1000_PCS_LPABNP);
+
+       /* Statistics */
+       regs_buff[54] = adapter->stats.crcerrs;
+       regs_buff[55] = adapter->stats.algnerrc;
+       regs_buff[56] = adapter->stats.symerrs;
+       regs_buff[57] = adapter->stats.rxerrc;
+       regs_buff[58] = adapter->stats.mpc;
+       regs_buff[59] = adapter->stats.scc;
+       regs_buff[60] = adapter->stats.ecol;
+       regs_buff[61] = adapter->stats.mcc;
+       regs_buff[62] = adapter->stats.latecol;
+       regs_buff[63] = adapter->stats.colc;
+       regs_buff[64] = adapter->stats.dc;
+       regs_buff[65] = adapter->stats.tncrs;
+       regs_buff[66] = adapter->stats.sec;
+       regs_buff[67] = adapter->stats.htdpmc;
+       regs_buff[68] = adapter->stats.rlec;
+       regs_buff[69] = adapter->stats.xonrxc;
+       regs_buff[70] = adapter->stats.xontxc;
+       regs_buff[71] = adapter->stats.xoffrxc;
+       regs_buff[72] = adapter->stats.xofftxc;
+       regs_buff[73] = adapter->stats.fcruc;
+       regs_buff[74] = adapter->stats.prc64;
+       regs_buff[75] = adapter->stats.prc127;
+       regs_buff[76] = adapter->stats.prc255;
+       regs_buff[77] = adapter->stats.prc511;
+       regs_buff[78] = adapter->stats.prc1023;
+       regs_buff[79] = adapter->stats.prc1522;
+       regs_buff[80] = adapter->stats.gprc;
+       regs_buff[81] = adapter->stats.bprc;
+       regs_buff[82] = adapter->stats.mprc;
+       regs_buff[83] = adapter->stats.gptc;
+       regs_buff[84] = adapter->stats.gorc;
+       regs_buff[86] = adapter->stats.gotc;
+       regs_buff[88] = adapter->stats.rnbc;
+       regs_buff[89] = adapter->stats.ruc;
+       regs_buff[90] = adapter->stats.rfc;
+       regs_buff[91] = adapter->stats.roc;
+       regs_buff[92] = adapter->stats.rjc;
+       regs_buff[93] = adapter->stats.mgprc;
+       regs_buff[94] = adapter->stats.mgpdc;
+       regs_buff[95] = adapter->stats.mgptc;
+       regs_buff[96] = adapter->stats.tor;
+       regs_buff[98] = adapter->stats.tot;
+       regs_buff[100] = adapter->stats.tpr;
+       regs_buff[101] = adapter->stats.tpt;
+       regs_buff[102] = adapter->stats.ptc64;
+       regs_buff[103] = adapter->stats.ptc127;
+       regs_buff[104] = adapter->stats.ptc255;
+       regs_buff[105] = adapter->stats.ptc511;
+       regs_buff[106] = adapter->stats.ptc1023;
+       regs_buff[107] = adapter->stats.ptc1522;
+       regs_buff[108] = adapter->stats.mptc;
+       regs_buff[109] = adapter->stats.bptc;
+       regs_buff[110] = adapter->stats.tsctc;
+       regs_buff[111] = adapter->stats.iac;
+       regs_buff[112] = adapter->stats.rpthc;
+       regs_buff[113] = adapter->stats.hgptc;
+       regs_buff[114] = adapter->stats.hgorc;
+       regs_buff[116] = adapter->stats.hgotc;
+       regs_buff[118] = adapter->stats.lenerrs;
+       regs_buff[119] = adapter->stats.scvpc;
+       regs_buff[120] = adapter->stats.hrmpc;
+
+       for (i = 0; i < 4; i++)
+               regs_buff[121 + i] = rd32(E1000_SRRCTL(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[125 + i] = rd32(E1000_PSRTYPE(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[129 + i] = rd32(E1000_RDBAL(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[133 + i] = rd32(E1000_RDBAH(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[137 + i] = rd32(E1000_RDLEN(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[141 + i] = rd32(E1000_RDH(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[145 + i] = rd32(E1000_RDT(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[149 + i] = rd32(E1000_RXDCTL(i));
+
+       for (i = 0; i < 10; i++)
+               regs_buff[153 + i] = rd32(E1000_EITR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[163 + i] = rd32(E1000_IMIR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[171 + i] = rd32(E1000_IMIREXT(i));
+       for (i = 0; i < 16; i++)
+               regs_buff[179 + i] = rd32(E1000_RAL(i));
+       for (i = 0; i < 16; i++)
+               regs_buff[195 + i] = rd32(E1000_RAH(i));
+
+       for (i = 0; i < 4; i++)
+               regs_buff[211 + i] = rd32(E1000_TDBAL(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[215 + i] = rd32(E1000_TDBAH(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[219 + i] = rd32(E1000_TDLEN(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[223 + i] = rd32(E1000_TDH(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[227 + i] = rd32(E1000_TDT(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[231 + i] = rd32(E1000_TXDCTL(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[235 + i] = rd32(E1000_TDWBAL(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[239 + i] = rd32(E1000_TDWBAH(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[243 + i] = rd32(E1000_DCA_TXCTRL(i));
+
+       for (i = 0; i < 4; i++)
+               regs_buff[247 + i] = rd32(E1000_IP4AT_REG(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[251 + i] = rd32(E1000_IP6AT_REG(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[255 + i] = rd32(E1000_WUPM_REG(i));
+       for (i = 0; i < 128; i++)
+               regs_buff[287 + i] = rd32(E1000_FFMT_REG(i));
+       for (i = 0; i < 128; i++)
+               regs_buff[415 + i] = rd32(E1000_FFVT_REG(i));
+       for (i = 0; i < 4; i++)
+               regs_buff[543 + i] = rd32(E1000_FFLT_REG(i));
+
+       regs_buff[547] = rd32(E1000_TDFH);
+       regs_buff[548] = rd32(E1000_TDFT);
+       regs_buff[549] = rd32(E1000_TDFHS);
+       regs_buff[550] = rd32(E1000_TDFPC);
+       regs_buff[551] = adapter->stats.o2bgptc;
+       regs_buff[552] = adapter->stats.b2ospc;
+       regs_buff[553] = adapter->stats.o2bspc;
+       regs_buff[554] = adapter->stats.b2ogprc;
+}
+
+static int igb_get_eeprom_len(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       return adapter->hw.nvm.word_size * 2;
+}
+
+static int igb_get_eeprom(struct net_device *netdev,
+                         struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       int first_word, last_word;
+       int ret_val = 0;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EINVAL;
+
+       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+
+       eeprom_buff = kmalloc(sizeof(u16) *
+                       (last_word - first_word + 1), GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       if (hw->nvm.type == e1000_nvm_eeprom_spi)
+               ret_val = hw->nvm.ops.read(hw, first_word,
+                                           last_word - first_word + 1,
+                                           eeprom_buff);
+       else {
+               for (i = 0; i < last_word - first_word + 1; i++) {
+                       ret_val = hw->nvm.ops.read(hw, first_word + i, 1,
+                                                   &eeprom_buff[i]);
+                       if (ret_val)
+                               break;
+               }
+       }
+
+       /* Device's eeprom is always little-endian, word addressable */
+       for (i = 0; i < last_word - first_word + 1; i++)
+               le16_to_cpus(&eeprom_buff[i]);
+
+       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
+                       eeprom->len);
+       kfree(eeprom_buff);
+
+       return ret_val;
+}
+
+static int igb_set_eeprom(struct net_device *netdev,
+                         struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       void *ptr;
+       int max_len, first_word, last_word, ret_val = 0;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EOPNOTSUPP;
+
+       if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
+               return -EFAULT;
+
+       max_len = hw->nvm.word_size * 2;
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       ptr = (void *)eeprom_buff;
+
+       if (eeprom->offset & 1) {
+               /* need read/modify/write of first changed EEPROM word */
+               /* only the second byte of the word is being modified */
+               ret_val = hw->nvm.ops.read(hw, first_word, 1,
+                                           &eeprom_buff[0]);
+               ptr++;
+       }
+       if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) {
+               /* need read/modify/write of last changed EEPROM word */
+               /* only the first byte of the word is being modified */
+               ret_val = hw->nvm.ops.read(hw, last_word, 1,
+                                  &eeprom_buff[last_word - first_word]);
+       }
+
+       /* Device's eeprom is always little-endian, word addressable */
+       for (i = 0; i < last_word - first_word + 1; i++)
+               le16_to_cpus(&eeprom_buff[i]);
+
+       memcpy(ptr, bytes, eeprom->len);
+
+       for (i = 0; i < last_word - first_word + 1; i++)
+               eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
+
+       ret_val = hw->nvm.ops.write(hw, first_word,
+                                    last_word - first_word + 1, eeprom_buff);
+
+       /* Update the checksum over the first part of the EEPROM if needed
+        * and flush shadow RAM for 82573 controllers */
+       if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG)))
+               hw->nvm.ops.update(hw);
+
+       kfree(eeprom_buff);
+       return ret_val;
+}
+
+static void igb_get_drvinfo(struct net_device *netdev,
+                           struct ethtool_drvinfo *drvinfo)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       char firmware_version[32];
+       u16 eeprom_data;
+
+       strncpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver) - 1);
+       strncpy(drvinfo->version, igb_driver_version,
+               sizeof(drvinfo->version) - 1);
+
+       /* EEPROM image version # is reported as firmware version # for
+        * 82575 controllers */
+       adapter->hw.nvm.ops.read(&adapter->hw, 5, 1, &eeprom_data);
+       sprintf(firmware_version, "%d.%d-%d",
+               (eeprom_data & 0xF000) >> 12,
+               (eeprom_data & 0x0FF0) >> 4,
+               eeprom_data & 0x000F);
+
+       strncpy(drvinfo->fw_version, firmware_version,
+               sizeof(drvinfo->fw_version) - 1);
+       strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
+               sizeof(drvinfo->bus_info) - 1);
+       drvinfo->n_stats = IGB_STATS_LEN;
+       drvinfo->testinfo_len = IGB_TEST_LEN;
+       drvinfo->regdump_len = igb_get_regs_len(netdev);
+       drvinfo->eedump_len = igb_get_eeprom_len(netdev);
+}
+
+static void igb_get_ringparam(struct net_device *netdev,
+                             struct ethtool_ringparam *ring)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       ring->rx_max_pending = IGB_MAX_RXD;
+       ring->tx_max_pending = IGB_MAX_TXD;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = adapter->rx_ring_count;
+       ring->tx_pending = adapter->tx_ring_count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int igb_set_ringparam(struct net_device *netdev,
+                            struct ethtool_ringparam *ring)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct igb_ring *temp_ring;
+       int i, err = 0;
+       u16 new_rx_count, new_tx_count;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       new_rx_count = min_t(u32, ring->rx_pending, IGB_MAX_RXD);
+       new_rx_count = max_t(u16, new_rx_count, IGB_MIN_RXD);
+       new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
+
+       new_tx_count = min_t(u32, ring->tx_pending, IGB_MAX_TXD);
+       new_tx_count = max_t(u16, new_tx_count, IGB_MIN_TXD);
+       new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
+
+       if ((new_tx_count == adapter->tx_ring_count) &&
+           (new_rx_count == adapter->rx_ring_count)) {
+               /* nothing to do */
+               return 0;
+       }
+
+       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
+               msleep(1);
+
+       if (!netif_running(adapter->netdev)) {
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       adapter->tx_ring[i]->count = new_tx_count;
+               for (i = 0; i < adapter->num_rx_queues; i++)
+                       adapter->rx_ring[i]->count = new_rx_count;
+               adapter->tx_ring_count = new_tx_count;
+               adapter->rx_ring_count = new_rx_count;
+               goto clear_reset;
+       }
+
+       if (adapter->num_tx_queues > adapter->num_rx_queues)
+               temp_ring = vmalloc(adapter->num_tx_queues * sizeof(struct igb_ring));
+       else
+               temp_ring = vmalloc(adapter->num_rx_queues * sizeof(struct igb_ring));
+
+       if (!temp_ring) {
+               err = -ENOMEM;
+               goto clear_reset;
+       }
+
+       igb_down(adapter);
+
+       /*
+        * We can't just free everything and then setup again,
+        * because the ISRs in MSI-X mode get passed pointers
+        * to the tx and rx ring structs.
+        */
+       if (new_tx_count != adapter->tx_ring_count) {
+               for (i = 0; i < adapter->num_tx_queues; i++) {
+                       memcpy(&temp_ring[i], adapter->tx_ring[i],
+                              sizeof(struct igb_ring));
+
+                       temp_ring[i].count = new_tx_count;
+                       err = igb_setup_tx_resources(&temp_ring[i]);
+                       if (err) {
+                               while (i) {
+                                       i--;
+                                       igb_free_tx_resources(&temp_ring[i]);
+                               }
+                               goto err_setup;
+                       }
+               }
+
+               for (i = 0; i < adapter->num_tx_queues; i++) {
+                       igb_free_tx_resources(adapter->tx_ring[i]);
+
+                       memcpy(adapter->tx_ring[i], &temp_ring[i],
+                              sizeof(struct igb_ring));
+               }
+
+               adapter->tx_ring_count = new_tx_count;
+       }
+
+       if (new_rx_count != adapter->rx_ring_count) {
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       memcpy(&temp_ring[i], adapter->rx_ring[i],
+                              sizeof(struct igb_ring));
+
+                       temp_ring[i].count = new_rx_count;
+                       err = igb_setup_rx_resources(&temp_ring[i]);
+                       if (err) {
+                               while (i) {
+                                       i--;
+                                       igb_free_rx_resources(&temp_ring[i]);
+                               }
+                               goto err_setup;
+                       }
+
+               }
+
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       igb_free_rx_resources(adapter->rx_ring[i]);
+
+                       memcpy(adapter->rx_ring[i], &temp_ring[i],
+                              sizeof(struct igb_ring));
+               }
+
+               adapter->rx_ring_count = new_rx_count;
+       }
+err_setup:
+       igb_up(adapter);
+       vfree(temp_ring);
+clear_reset:
+       clear_bit(__IGB_RESETTING, &adapter->state);
+       return err;
+}
+
+/* ethtool register test data */
+struct igb_reg_test {
+       u16 reg;
+       u16 reg_offset;
+       u16 array_len;
+       u16 test_type;
+       u32 mask;
+       u32 write;
+};
+
+/* In the hardware, registers are laid out either singly, in arrays
+ * spaced 0x100 bytes apart, or in contiguous tables.  We assume
+ * most tests take place on arrays or single registers (handled
+ * as a single-element array) and special-case the tables.
+ * Table tests are always pattern tests.
+ *
+ * We also make provision for some required setup steps by specifying
+ * registers to be written without any read-back testing.
+ */
+
+#define PATTERN_TEST   1
+#define SET_READ_TEST  2
+#define WRITE_NO_TEST  3
+#define TABLE32_TEST   4
+#define TABLE64_TEST_LO        5
+#define TABLE64_TEST_HI        6
+
+/* i350 reg test */
+static struct igb_reg_test reg_test_i350[] = {
+       { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_FCAH,      0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_FCT,       0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_VET,       0x100, 1,  PATTERN_TEST, 0xFFFF0000, 0xFFFF0000 },
+       { E1000_RDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_RDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       { E1000_RDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_RDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       /* RDH is read-only for i350, only test RDT. */
+       { E1000_RDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_RDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_FCRTH,     0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
+       { E1000_FCTTV,     0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_TIPG,      0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
+       { E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       { E1000_TDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_TDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_TDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       { E1000_TDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_TDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },
+       { E1000_TCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_RA,        0, 16, TABLE64_TEST_LO,
+                                               0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RA,        0, 16, TABLE64_TEST_HI,
+                                               0xC3FFFFFF, 0xFFFFFFFF },
+       { E1000_RA2,       0, 16, TABLE64_TEST_LO,
+                                               0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RA2,       0, 16, TABLE64_TEST_HI,
+                                               0xC3FFFFFF, 0xFFFFFFFF },
+       { E1000_MTA,       0, 128, TABLE32_TEST,
+                                               0xFFFFFFFF, 0xFFFFFFFF },
+       { 0, 0, 0, 0 }
+};
+
+/* 82580 reg test */
+static struct igb_reg_test reg_test_82580[] = {
+       { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_FCAH,      0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_FCT,       0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_VET,       0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_RDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       { E1000_RDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_RDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       /* RDH is read-only for 82580, only test RDT. */
+       { E1000_RDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_RDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_FCRTH,     0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
+       { E1000_FCTTV,     0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_TIPG,      0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
+       { E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       { E1000_TDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_TDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_TDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       { E1000_TDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_TDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },
+       { E1000_TCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_RA,        0, 16, TABLE64_TEST_LO,
+                                               0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RA,        0, 16, TABLE64_TEST_HI,
+                                               0x83FFFFFF, 0xFFFFFFFF },
+       { E1000_RA2,       0, 8, TABLE64_TEST_LO,
+                                               0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RA2,       0, 8, TABLE64_TEST_HI,
+                                               0x83FFFFFF, 0xFFFFFFFF },
+       { E1000_MTA,       0, 128, TABLE32_TEST,
+                                               0xFFFFFFFF, 0xFFFFFFFF },
+       { 0, 0, 0, 0 }
+};
+
+/* 82576 reg test */
+static struct igb_reg_test reg_test_82576[] = {
+       { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_FCAH,      0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_FCT,       0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_VET,       0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDBAL(0),  0x100, 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_RDBAH(0),  0x100, 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDLEN(0),  0x100, 4, PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       { E1000_RDBAL(4),  0x40, 12, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_RDBAH(4),  0x40, 12, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDLEN(4),  0x40, 12, PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       /* Enable all RX queues before testing. */
+       { E1000_RXDCTL(0), 0x100, 4,  WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
+       { E1000_RXDCTL(4), 0x40, 12,  WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
+       /* RDH is read-only for 82576, only test RDT. */
+       { E1000_RDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_RDT(4),    0x40, 12,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_RXDCTL(0), 0x100, 4,  WRITE_NO_TEST, 0, 0 },
+       { E1000_RXDCTL(4), 0x40, 12,  WRITE_NO_TEST, 0, 0 },
+       { E1000_FCRTH,     0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
+       { E1000_FCTTV,     0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_TIPG,      0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
+       { E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       { E1000_TDBAL(4),  0x40, 12,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_TDBAH(4),  0x40, 12,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_TDLEN(4),  0x40, 12,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },
+       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },
+       { E1000_TCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_RA,        0, 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RA,        0, 16, TABLE64_TEST_HI, 0x83FFFFFF, 0xFFFFFFFF },
+       { E1000_RA2,       0, 8, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RA2,       0, 8, TABLE64_TEST_HI, 0x83FFFFFF, 0xFFFFFFFF },
+       { E1000_MTA,       0, 128,TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { 0, 0, 0, 0 }
+};
+
+/* 82575 register test */
+static struct igb_reg_test reg_test_82575[] = {
+       { E1000_FCAL,      0x100, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_FCAH,      0x100, 1, PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_FCT,       0x100, 1, PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
+       { E1000_VET,       0x100, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDBAL(0),  0x100, 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_RDBAH(0),  0x100, 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RDLEN(0),  0x100, 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       /* Enable all four RX queues before testing. */
+       { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
+       /* RDH is read-only for 82575, only test RDT. */
+       { E1000_RDT(0),    0x100, 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0, 0 },
+       { E1000_FCRTH,     0x100, 1, PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
+       { E1000_FCTTV,     0x100, 1, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { E1000_TIPG,      0x100, 1, PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
+       { E1000_TDBAL(0),  0x100, 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { E1000_TDBAH(0),  0x100, 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_TDLEN(0),  0x100, 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       { E1000_RCTL,      0x100, 1, SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_RCTL,      0x100, 1, SET_READ_TEST, 0x04CFB3FE, 0x003FFFFB },
+       { E1000_RCTL,      0x100, 1, SET_READ_TEST, 0x04CFB3FE, 0xFFFFFFFF },
+       { E1000_TCTL,      0x100, 1, SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
+       { E1000_TXCW,      0x100, 1, PATTERN_TEST, 0xC000FFFF, 0x0000FFFF },
+       { E1000_RA,        0, 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
+       { E1000_RA,        0, 16, TABLE64_TEST_HI, 0x800FFFFF, 0xFFFFFFFF },
+       { E1000_MTA,       0, 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { 0, 0, 0, 0 }
+};
+
+static bool reg_pattern_test(struct igb_adapter *adapter, u64 *data,
+                            int reg, u32 mask, u32 write)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 pat, val;
+       static const u32 _test[] =
+               {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
+       for (pat = 0; pat < ARRAY_SIZE(_test); pat++) {
+               wr32(reg, (_test[pat] & write));
+               val = rd32(reg) & mask;
+               if (val != (_test[pat] & write & mask)) {
+                       dev_err(&adapter->pdev->dev, "pattern test reg %04X "
+                               "failed: got 0x%08X expected 0x%08X\n",
+                               reg, val, (_test[pat] & write & mask));
+                       *data = reg;
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+static bool reg_set_and_check(struct igb_adapter *adapter, u64 *data,
+                             int reg, u32 mask, u32 write)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 val;
+       wr32(reg, write & mask);
+       val = rd32(reg);
+       if ((write & mask) != (val & mask)) {
+               dev_err(&adapter->pdev->dev, "set/check reg %04X test failed:"
+                       " got 0x%08X expected 0x%08X\n", reg,
+                       (val & mask), (write & mask));
+               *data = reg;
+               return 1;
+       }
+
+       return 0;
+}
+
+#define REG_PATTERN_TEST(reg, mask, write) \
+       do { \
+               if (reg_pattern_test(adapter, data, reg, mask, write)) \
+                       return 1; \
+       } while (0)
+
+#define REG_SET_AND_CHECK(reg, mask, write) \
+       do { \
+               if (reg_set_and_check(adapter, data, reg, mask, write)) \
+                       return 1; \
+       } while (0)
+
+static int igb_reg_test(struct igb_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct igb_reg_test *test;
+       u32 value, before, after;
+       u32 i, toggle;
+
+       switch (adapter->hw.mac.type) {
+       case e1000_i350:
+               test = reg_test_i350;
+               toggle = 0x7FEFF3FF;
+               break;
+       case e1000_82580:
+               test = reg_test_82580;
+               toggle = 0x7FEFF3FF;
+               break;
+       case e1000_82576:
+               test = reg_test_82576;
+               toggle = 0x7FFFF3FF;
+               break;
+       default:
+               test = reg_test_82575;
+               toggle = 0x7FFFF3FF;
+               break;
+       }
+
+       /* Because the status register is such a special case,
+        * we handle it separately from the rest of the register
+        * tests.  Some bits are read-only, some toggle, and some
+        * are writable on newer MACs.
+        */
+       before = rd32(E1000_STATUS);
+       value = (rd32(E1000_STATUS) & toggle);
+       wr32(E1000_STATUS, toggle);
+       after = rd32(E1000_STATUS) & toggle;
+       if (value != after) {
+               dev_err(&adapter->pdev->dev, "failed STATUS register test "
+                       "got: 0x%08X expected: 0x%08X\n", after, value);
+               *data = 1;
+               return 1;
+       }
+       /* restore previous status */
+       wr32(E1000_STATUS, before);
+
+       /* Perform the remainder of the register test, looping through
+        * the test table until we either fail or reach the null entry.
+        */
+       while (test->reg) {
+               for (i = 0; i < test->array_len; i++) {
+                       switch (test->test_type) {
+                       case PATTERN_TEST:
+                               REG_PATTERN_TEST(test->reg +
+                                               (i * test->reg_offset),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case SET_READ_TEST:
+                               REG_SET_AND_CHECK(test->reg +
+                                               (i * test->reg_offset),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case WRITE_NO_TEST:
+                               writel(test->write,
+                                   (adapter->hw.hw_addr + test->reg)
+                                       + (i * test->reg_offset));
+                               break;
+                       case TABLE32_TEST:
+                               REG_PATTERN_TEST(test->reg + (i * 4),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case TABLE64_TEST_LO:
+                               REG_PATTERN_TEST(test->reg + (i * 8),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case TABLE64_TEST_HI:
+                               REG_PATTERN_TEST((test->reg + 4) + (i * 8),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       }
+               }
+               test++;
+       }
+
+       *data = 0;
+       return 0;
+}
+
+static int igb_eeprom_test(struct igb_adapter *adapter, u64 *data)
+{
+       u16 temp;
+       u16 checksum = 0;
+       u16 i;
+
+       *data = 0;
+       /* Read and add up the contents of the EEPROM */
+       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
+               if ((adapter->hw.nvm.ops.read(&adapter->hw, i, 1, &temp)) < 0) {
+                       *data = 1;
+                       break;
+               }
+               checksum += temp;
+       }
+
+       /* If Checksum is not Correct return error else test passed */
+       if ((checksum != (u16) NVM_SUM) && !(*data))
+               *data = 2;
+
+       return *data;
+}
+
+static irqreturn_t igb_test_intr(int irq, void *data)
+{
+       struct igb_adapter *adapter = (struct igb_adapter *) data;
+       struct e1000_hw *hw = &adapter->hw;
+
+       adapter->test_icr |= rd32(E1000_ICR);
+
+       return IRQ_HANDLED;
+}
+
+static int igb_intr_test(struct igb_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u32 mask, ics_mask, i = 0, shared_int = true;
+       u32 irq = adapter->pdev->irq;
+
+       *data = 0;
+
+       /* Hook up test interrupt handler just for this test */
+       if (adapter->msix_entries) {
+               if (request_irq(adapter->msix_entries[0].vector,
+                               igb_test_intr, 0, netdev->name, adapter)) {
+                       *data = 1;
+                       return -1;
+               }
+       } else if (adapter->flags & IGB_FLAG_HAS_MSI) {
+               shared_int = false;
+               if (request_irq(irq,
+                               igb_test_intr, 0, netdev->name, adapter)) {
+                       *data = 1;
+                       return -1;
+               }
+       } else if (!request_irq(irq, igb_test_intr, IRQF_PROBE_SHARED,
+                               netdev->name, adapter)) {
+               shared_int = false;
+       } else if (request_irq(irq, igb_test_intr, IRQF_SHARED,
+                netdev->name, adapter)) {
+               *data = 1;
+               return -1;
+       }
+       dev_info(&adapter->pdev->dev, "testing %s interrupt\n",
+               (shared_int ? "shared" : "unshared"));
+
+       /* Disable all the interrupts */
+       wr32(E1000_IMC, ~0);
+       wrfl();
+       msleep(10);
+
+       /* Define all writable bits for ICS */
+       switch (hw->mac.type) {
+       case e1000_82575:
+               ics_mask = 0x37F47EDD;
+               break;
+       case e1000_82576:
+               ics_mask = 0x77D4FBFD;
+               break;
+       case e1000_82580:
+               ics_mask = 0x77DCFED5;
+               break;
+       case e1000_i350:
+               ics_mask = 0x77DCFED5;
+               break;
+       default:
+               ics_mask = 0x7FFFFFFF;
+               break;
+       }
+
+       /* Test each interrupt */
+       for (; i < 31; i++) {
+               /* Interrupt to test */
+               mask = 1 << i;
+
+               if (!(mask & ics_mask))
+                       continue;
+
+               if (!shared_int) {
+                       /* Disable the interrupt to be reported in
+                        * the cause register and then force the same
+                        * interrupt and see if one gets posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+
+                       /* Flush any pending interrupts */
+                       wr32(E1000_ICR, ~0);
+
+                       wr32(E1000_IMC, mask);
+                       wr32(E1000_ICS, mask);
+                       wrfl();
+                       msleep(10);
+
+                       if (adapter->test_icr & mask) {
+                               *data = 3;
+                               break;
+                       }
+               }
+
+               /* Enable the interrupt to be reported in
+                * the cause register and then force the same
+                * interrupt and see if one gets posted.  If
+                * an interrupt was not posted to the bus, the
+                * test failed.
+                */
+               adapter->test_icr = 0;
+
+               /* Flush any pending interrupts */
+               wr32(E1000_ICR, ~0);
+
+               wr32(E1000_IMS, mask);
+               wr32(E1000_ICS, mask);
+               wrfl();
+               msleep(10);
+
+               if (!(adapter->test_icr & mask)) {
+                       *data = 4;
+                       break;
+               }
+
+               if (!shared_int) {
+                       /* Disable the other interrupts to be reported in
+                        * the cause register and then force the other
+                        * interrupts and see if any get posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+
+                       /* Flush any pending interrupts */
+                       wr32(E1000_ICR, ~0);
+
+                       wr32(E1000_IMC, ~mask);
+                       wr32(E1000_ICS, ~mask);
+                       wrfl();
+                       msleep(10);
+
+                       if (adapter->test_icr & mask) {
+                               *data = 5;
+                               break;
+                       }
+               }
+       }
+
+       /* Disable all the interrupts */
+       wr32(E1000_IMC, ~0);
+       wrfl();
+       msleep(10);
+
+       /* Unhook test interrupt handler */
+       if (adapter->msix_entries)
+               free_irq(adapter->msix_entries[0].vector, adapter);
+       else
+               free_irq(irq, adapter);
+
+       return *data;
+}
+
+static void igb_free_desc_rings(struct igb_adapter *adapter)
+{
+       igb_free_tx_resources(&adapter->test_tx_ring);
+       igb_free_rx_resources(&adapter->test_rx_ring);
+}
+
+static int igb_setup_desc_rings(struct igb_adapter *adapter)
+{
+       struct igb_ring *tx_ring = &adapter->test_tx_ring;
+       struct igb_ring *rx_ring = &adapter->test_rx_ring;
+       struct e1000_hw *hw = &adapter->hw;
+       int ret_val;
+
+       /* Setup Tx descriptor ring and Tx buffers */
+       tx_ring->count = IGB_DEFAULT_TXD;
+       tx_ring->dev = &adapter->pdev->dev;
+       tx_ring->netdev = adapter->netdev;
+       tx_ring->reg_idx = adapter->vfs_allocated_count;
+
+       if (igb_setup_tx_resources(tx_ring)) {
+               ret_val = 1;
+               goto err_nomem;
+       }
+
+       igb_setup_tctl(adapter);
+       igb_configure_tx_ring(adapter, tx_ring);
+
+       /* Setup Rx descriptor ring and Rx buffers */
+       rx_ring->count = IGB_DEFAULT_RXD;
+       rx_ring->dev = &adapter->pdev->dev;
+       rx_ring->netdev = adapter->netdev;
+       rx_ring->rx_buffer_len = IGB_RXBUFFER_2048;
+       rx_ring->reg_idx = adapter->vfs_allocated_count;
+
+       if (igb_setup_rx_resources(rx_ring)) {
+               ret_val = 3;
+               goto err_nomem;
+       }
+
+       /* set the default queue to queue 0 of PF */
+       wr32(E1000_MRQC, adapter->vfs_allocated_count << 3);
+
+       /* enable receive ring */
+       igb_setup_rctl(adapter);
+       igb_configure_rx_ring(adapter, rx_ring);
+
+       igb_alloc_rx_buffers_adv(rx_ring, igb_desc_unused(rx_ring));
+
+       return 0;
+
+err_nomem:
+       igb_free_desc_rings(adapter);
+       return ret_val;
+}
+
+static void igb_phy_disable_receiver(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
+       igb_write_phy_reg(hw, 29, 0x001F);
+       igb_write_phy_reg(hw, 30, 0x8FFC);
+       igb_write_phy_reg(hw, 29, 0x001A);
+       igb_write_phy_reg(hw, 30, 0x8FF0);
+}
+
+static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl_reg = 0;
+
+       hw->mac.autoneg = false;
+
+       if (hw->phy.type == e1000_phy_m88) {
+               /* Auto-MDI/MDIX Off */
+               igb_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
+               /* reset to update Auto-MDI/MDIX */
+               igb_write_phy_reg(hw, PHY_CONTROL, 0x9140);
+               /* autoneg off */
+               igb_write_phy_reg(hw, PHY_CONTROL, 0x8140);
+       } else if (hw->phy.type == e1000_phy_82580) {
+               /* enable MII loopback */
+               igb_write_phy_reg(hw, I82580_PHY_LBK_CTRL, 0x8041);
+       }
+
+       ctrl_reg = rd32(E1000_CTRL);
+
+       /* force 1000, set loopback */
+       igb_write_phy_reg(hw, PHY_CONTROL, 0x4140);
+
+       /* Now set up the MAC to the same speed/duplex as the PHY. */
+       ctrl_reg = rd32(E1000_CTRL);
+       ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
+       ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
+                    E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
+                    E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
+                    E1000_CTRL_FD |     /* Force Duplex to FULL */
+                    E1000_CTRL_SLU);    /* Set link up enable bit */
+
+       if (hw->phy.type == e1000_phy_m88)
+               ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
+
+       wr32(E1000_CTRL, ctrl_reg);
+
+       /* Disable the receiver on the PHY so when a cable is plugged in, the
+        * PHY does not begin to autoneg when a cable is reconnected to the NIC.
+        */
+       if (hw->phy.type == e1000_phy_m88)
+               igb_phy_disable_receiver(adapter);
+
+       udelay(500);
+
+       return 0;
+}
+
+static int igb_set_phy_loopback(struct igb_adapter *adapter)
+{
+       return igb_integrated_phy_loopback(adapter);
+}
+
+static int igb_setup_loopback_test(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 reg;
+
+       reg = rd32(E1000_CTRL_EXT);
+
+       /* use CTRL_EXT to identify link type as SGMII can appear as copper */
+       if (reg & E1000_CTRL_EXT_LINK_MODE_MASK) {
+               if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||
+               (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||
+               (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||
+               (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) {
+
+                       /* Enable DH89xxCC MPHY for near end loopback */
+                       reg = rd32(E1000_MPHY_ADDR_CTL);
+                       reg = (reg & E1000_MPHY_ADDR_CTL_OFFSET_MASK) |
+                       E1000_MPHY_PCS_CLK_REG_OFFSET;
+                       wr32(E1000_MPHY_ADDR_CTL, reg);
+
+                       reg = rd32(E1000_MPHY_DATA);
+                       reg |= E1000_MPHY_PCS_CLK_REG_DIGINELBEN;
+                       wr32(E1000_MPHY_DATA, reg);
+               }
+
+               reg = rd32(E1000_RCTL);
+               reg |= E1000_RCTL_LBM_TCVR;
+               wr32(E1000_RCTL, reg);
+
+               wr32(E1000_SCTL, E1000_ENABLE_SERDES_LOOPBACK);
+
+               reg = rd32(E1000_CTRL);
+               reg &= ~(E1000_CTRL_RFCE |
+                        E1000_CTRL_TFCE |
+                        E1000_CTRL_LRST);
+               reg |= E1000_CTRL_SLU |
+                      E1000_CTRL_FD;
+               wr32(E1000_CTRL, reg);
+
+               /* Unset switch control to serdes energy detect */
+               reg = rd32(E1000_CONNSW);
+               reg &= ~E1000_CONNSW_ENRGSRC;
+               wr32(E1000_CONNSW, reg);
+
+               /* Set PCS register for forced speed */
+               reg = rd32(E1000_PCS_LCTL);
+               reg &= ~E1000_PCS_LCTL_AN_ENABLE;     /* Disable Autoneg*/
+               reg |= E1000_PCS_LCTL_FLV_LINK_UP |   /* Force link up */
+                      E1000_PCS_LCTL_FSV_1000 |      /* Force 1000    */
+                      E1000_PCS_LCTL_FDV_FULL |      /* SerDes Full duplex */
+                      E1000_PCS_LCTL_FSD |           /* Force Speed */
+                      E1000_PCS_LCTL_FORCE_LINK;     /* Force Link */
+               wr32(E1000_PCS_LCTL, reg);
+
+               return 0;
+       }
+
+       return igb_set_phy_loopback(adapter);
+}
+
+static void igb_loopback_cleanup(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+       u16 phy_reg;
+
+       if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||
+       (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||
+       (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||
+       (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) {
+               u32 reg;
+
+               /* Disable near end loopback on DH89xxCC */
+               reg = rd32(E1000_MPHY_ADDR_CTL);
+               reg = (reg & E1000_MPHY_ADDR_CTL_OFFSET_MASK) |
+               E1000_MPHY_PCS_CLK_REG_OFFSET;
+               wr32(E1000_MPHY_ADDR_CTL, reg);
+
+               reg = rd32(E1000_MPHY_DATA);
+               reg &= ~E1000_MPHY_PCS_CLK_REG_DIGINELBEN;
+               wr32(E1000_MPHY_DATA, reg);
+       }
+
+       rctl = rd32(E1000_RCTL);
+       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
+       wr32(E1000_RCTL, rctl);
+
+       hw->mac.autoneg = true;
+       igb_read_phy_reg(hw, PHY_CONTROL, &phy_reg);
+       if (phy_reg & MII_CR_LOOPBACK) {
+               phy_reg &= ~MII_CR_LOOPBACK;
+               igb_write_phy_reg(hw, PHY_CONTROL, phy_reg);
+               igb_phy_sw_reset(hw);
+       }
+}
+
+static void igb_create_lbtest_frame(struct sk_buff *skb,
+                                   unsigned int frame_size)
+{
+       memset(skb->data, 0xFF, frame_size);
+       frame_size /= 2;
+       memset(&skb->data[frame_size], 0xAA, frame_size - 1);
+       memset(&skb->data[frame_size + 10], 0xBE, 1);
+       memset(&skb->data[frame_size + 12], 0xAF, 1);
+}
+
+static int igb_check_lbtest_frame(struct sk_buff *skb, unsigned int frame_size)
+{
+       frame_size /= 2;
+       if (*(skb->data + 3) == 0xFF) {
+               if ((*(skb->data + frame_size + 10) == 0xBE) &&
+                  (*(skb->data + frame_size + 12) == 0xAF)) {
+                       return 0;
+               }
+       }
+       return 13;
+}
+
+static int igb_clean_test_rings(struct igb_ring *rx_ring,
+                                struct igb_ring *tx_ring,
+                                unsigned int size)
+{
+       union e1000_adv_rx_desc *rx_desc;
+       struct igb_buffer *buffer_info;
+       int rx_ntc, tx_ntc, count = 0;
+       u32 staterr;
+
+       /* initialize next to clean and descriptor values */
+       rx_ntc = rx_ring->next_to_clean;
+       tx_ntc = tx_ring->next_to_clean;
+       rx_desc = E1000_RX_DESC_ADV(*rx_ring, rx_ntc);
+       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+
+       while (staterr & E1000_RXD_STAT_DD) {
+               /* check rx buffer */
+               buffer_info = &rx_ring->buffer_info[rx_ntc];
+
+               /* unmap rx buffer, will be remapped by alloc_rx_buffers */
+               dma_unmap_single(rx_ring->dev,
+                                buffer_info->dma,
+                                rx_ring->rx_buffer_len,
+                                DMA_FROM_DEVICE);
+               buffer_info->dma = 0;
+
+               /* verify contents of skb */
+               if (!igb_check_lbtest_frame(buffer_info->skb, size))
+                       count++;
+
+               /* unmap buffer on tx side */
+               buffer_info = &tx_ring->buffer_info[tx_ntc];
+               igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
+
+               /* increment rx/tx next to clean counters */
+               rx_ntc++;
+               if (rx_ntc == rx_ring->count)
+                       rx_ntc = 0;
+               tx_ntc++;
+               if (tx_ntc == tx_ring->count)
+                       tx_ntc = 0;
+
+               /* fetch next descriptor */
+               rx_desc = E1000_RX_DESC_ADV(*rx_ring, rx_ntc);
+               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+       }
+
+       /* re-map buffers to ring, store next to clean values */
+       igb_alloc_rx_buffers_adv(rx_ring, count);
+       rx_ring->next_to_clean = rx_ntc;
+       tx_ring->next_to_clean = tx_ntc;
+
+       return count;
+}
+
+static int igb_run_loopback_test(struct igb_adapter *adapter)
+{
+       struct igb_ring *tx_ring = &adapter->test_tx_ring;
+       struct igb_ring *rx_ring = &adapter->test_rx_ring;
+       int i, j, lc, good_cnt, ret_val = 0;
+       unsigned int size = 1024;
+       netdev_tx_t tx_ret_val;
+       struct sk_buff *skb;
+
+       /* allocate test skb */
+       skb = alloc_skb(size, GFP_KERNEL);
+       if (!skb)
+               return 11;
+
+       /* place data into test skb */
+       igb_create_lbtest_frame(skb, size);
+       skb_put(skb, size);
+
+       /*
+        * Calculate the loop count based on the largest descriptor ring
+        * The idea is to wrap the largest ring a number of times using 64
+        * send/receive pairs during each loop
+        */
+
+       if (rx_ring->count <= tx_ring->count)
+               lc = ((tx_ring->count / 64) * 2) + 1;
+       else
+               lc = ((rx_ring->count / 64) * 2) + 1;
+
+       for (j = 0; j <= lc; j++) { /* loop count loop */
+               /* reset count of good packets */
+               good_cnt = 0;
+
+               /* place 64 packets on the transmit queue*/
+               for (i = 0; i < 64; i++) {
+                       skb_get(skb);
+                       tx_ret_val = igb_xmit_frame_ring_adv(skb, tx_ring);
+                       if (tx_ret_val == NETDEV_TX_OK)
+                               good_cnt++;
+               }
+
+               if (good_cnt != 64) {
+                       ret_val = 12;
+                       break;
+               }
+
+               /* allow 200 milliseconds for packets to go from tx to rx */
+               msleep(200);
+
+               good_cnt = igb_clean_test_rings(rx_ring, tx_ring, size);
+               if (good_cnt != 64) {
+                       ret_val = 13;
+                       break;
+               }
+       } /* end loop count loop */
+
+       /* free the original skb */
+       kfree_skb(skb);
+
+       return ret_val;
+}
+
+static int igb_loopback_test(struct igb_adapter *adapter, u64 *data)
+{
+       /* PHY loopback cannot be performed if SoL/IDER
+        * sessions are active */
+       if (igb_check_reset_block(&adapter->hw)) {
+               dev_err(&adapter->pdev->dev,
+                       "Cannot do PHY loopback test "
+                       "when SoL/IDER is active.\n");
+               *data = 0;
+               goto out;
+       }
+       *data = igb_setup_desc_rings(adapter);
+       if (*data)
+               goto out;
+       *data = igb_setup_loopback_test(adapter);
+       if (*data)
+               goto err_loopback;
+       *data = igb_run_loopback_test(adapter);
+       igb_loopback_cleanup(adapter);
+
+err_loopback:
+       igb_free_desc_rings(adapter);
+out:
+       return *data;
+}
+
+static int igb_link_test(struct igb_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       *data = 0;
+       if (hw->phy.media_type == e1000_media_type_internal_serdes) {
+               int i = 0;
+               hw->mac.serdes_has_link = false;
+
+               /* On some blade server designs, link establishment
+                * could take as long as 2-3 minutes */
+               do {
+                       hw->mac.ops.check_for_link(&adapter->hw);
+                       if (hw->mac.serdes_has_link)
+                               return *data;
+                       msleep(20);
+               } while (i++ < 3750);
+
+               *data = 1;
+       } else {
+               hw->mac.ops.check_for_link(&adapter->hw);
+               if (hw->mac.autoneg)
+                       msleep(4000);
+
+               if (!(rd32(E1000_STATUS) & E1000_STATUS_LU))
+                       *data = 1;
+       }
+       return *data;
+}
+
+static void igb_diag_test(struct net_device *netdev,
+                         struct ethtool_test *eth_test, u64 *data)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       u16 autoneg_advertised;
+       u8 forced_speed_duplex, autoneg;
+       bool if_running = netif_running(netdev);
+
+       set_bit(__IGB_TESTING, &adapter->state);
+       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
+               /* Offline tests */
+
+               /* save speed, duplex, autoneg settings */
+               autoneg_advertised = adapter->hw.phy.autoneg_advertised;
+               forced_speed_duplex = adapter->hw.mac.forced_speed_duplex;
+               autoneg = adapter->hw.mac.autoneg;
+
+               dev_info(&adapter->pdev->dev, "offline testing starting\n");
+
+               /* power up link for link test */
+               igb_power_up_link(adapter);
+
+               /* Link test performed before hardware reset so autoneg doesn't
+                * interfere with test result */
+               if (igb_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               if (if_running)
+                       /* indicate we're in test mode */
+                       dev_close(netdev);
+               else
+                       igb_reset(adapter);
+
+               if (igb_reg_test(adapter, &data[0]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               igb_reset(adapter);
+               if (igb_eeprom_test(adapter, &data[1]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               igb_reset(adapter);
+               if (igb_intr_test(adapter, &data[2]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               igb_reset(adapter);
+               /* power up link for loopback test */
+               igb_power_up_link(adapter);
+               if (igb_loopback_test(adapter, &data[3]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* restore speed, duplex, autoneg settings */
+               adapter->hw.phy.autoneg_advertised = autoneg_advertised;
+               adapter->hw.mac.forced_speed_duplex = forced_speed_duplex;
+               adapter->hw.mac.autoneg = autoneg;
+
+               /* force this routine to wait until autoneg complete/timeout */
+               adapter->hw.phy.autoneg_wait_to_complete = true;
+               igb_reset(adapter);
+               adapter->hw.phy.autoneg_wait_to_complete = false;
+
+               clear_bit(__IGB_TESTING, &adapter->state);
+               if (if_running)
+                       dev_open(netdev);
+       } else {
+               dev_info(&adapter->pdev->dev, "online testing starting\n");
+
+               /* PHY is powered down when interface is down */
+               if (if_running && igb_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+               else
+                       data[4] = 0;
+
+               /* Online tests aren't run; pass by default */
+               data[0] = 0;
+               data[1] = 0;
+               data[2] = 0;
+               data[3] = 0;
+
+               clear_bit(__IGB_TESTING, &adapter->state);
+       }
+       msleep_interruptible(4 * 1000);
+}
+
+static int igb_wol_exclusion(struct igb_adapter *adapter,
+                            struct ethtool_wolinfo *wol)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       int retval = 1; /* fail by default */
+
+       switch (hw->device_id) {
+       case E1000_DEV_ID_82575GB_QUAD_COPPER:
+               /* WoL not supported */
+               wol->supported = 0;
+               break;
+       case E1000_DEV_ID_82575EB_FIBER_SERDES:
+       case E1000_DEV_ID_82576_FIBER:
+       case E1000_DEV_ID_82576_SERDES:
+               /* Wake events not supported on port B */
+               if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1) {
+                       wol->supported = 0;
+                       break;
+               }
+               /* return success for non excluded adapter ports */
+               retval = 0;
+               break;
+       case E1000_DEV_ID_82576_QUAD_COPPER:
+       case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
+               /* quad port adapters only support WoL on port A */
+               if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {
+                       wol->supported = 0;
+                       break;
+               }
+               /* return success for non excluded adapter ports */
+               retval = 0;
+               break;
+       default:
+               /* dual port cards only support WoL on port A from now on
+                * unless it was enabled in the eeprom for port B
+                * so exclude FUNC_1 ports from having WoL enabled */
+               if ((rd32(E1000_STATUS) & E1000_STATUS_FUNC_MASK) &&
+                   !adapter->eeprom_wol) {
+                       wol->supported = 0;
+                       break;
+               }
+
+               retval = 0;
+       }
+
+       return retval;
+}
+
+static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       wol->supported = WAKE_UCAST | WAKE_MCAST |
+                        WAKE_BCAST | WAKE_MAGIC |
+                        WAKE_PHY;
+       wol->wolopts = 0;
+
+       /* this function will set ->supported = 0 and return 1 if wol is not
+        * supported by this hardware */
+       if (igb_wol_exclusion(adapter, wol) ||
+           !device_can_wakeup(&adapter->pdev->dev))
+               return;
+
+       /* apply any specific unsupported masks here */
+       switch (adapter->hw.device_id) {
+       default:
+               break;
+       }
+
+       if (adapter->wol & E1000_WUFC_EX)
+               wol->wolopts |= WAKE_UCAST;
+       if (adapter->wol & E1000_WUFC_MC)
+               wol->wolopts |= WAKE_MCAST;
+       if (adapter->wol & E1000_WUFC_BC)
+               wol->wolopts |= WAKE_BCAST;
+       if (adapter->wol & E1000_WUFC_MAG)
+               wol->wolopts |= WAKE_MAGIC;
+       if (adapter->wol & E1000_WUFC_LNKC)
+               wol->wolopts |= WAKE_PHY;
+}
+
+static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE))
+               return -EOPNOTSUPP;
+
+       if (igb_wol_exclusion(adapter, wol) ||
+           !device_can_wakeup(&adapter->pdev->dev))
+               return wol->wolopts ? -EOPNOTSUPP : 0;
+
+       /* these settings will always override what we currently have */
+       adapter->wol = 0;
+
+       if (wol->wolopts & WAKE_UCAST)
+               adapter->wol |= E1000_WUFC_EX;
+       if (wol->wolopts & WAKE_MCAST)
+               adapter->wol |= E1000_WUFC_MC;
+       if (wol->wolopts & WAKE_BCAST)
+               adapter->wol |= E1000_WUFC_BC;
+       if (wol->wolopts & WAKE_MAGIC)
+               adapter->wol |= E1000_WUFC_MAG;
+       if (wol->wolopts & WAKE_PHY)
+               adapter->wol |= E1000_WUFC_LNKC;
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       return 0;
+}
+
+/* bit defines for adapter->led_status */
+#define IGB_LED_ON             0
+
+static int igb_set_phys_id(struct net_device *netdev,
+                          enum ethtool_phys_id_state state)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       switch (state) {
+       case ETHTOOL_ID_ACTIVE:
+               igb_blink_led(hw);
+               return 2;
+       case ETHTOOL_ID_ON:
+               igb_blink_led(hw);
+               break;
+       case ETHTOOL_ID_OFF:
+               igb_led_off(hw);
+               break;
+       case ETHTOOL_ID_INACTIVE:
+               igb_led_off(hw);
+               clear_bit(IGB_LED_ON, &adapter->led_status);
+               igb_cleanup_led(hw);
+               break;
+       }
+
+       return 0;
+}
+
+static int igb_set_coalesce(struct net_device *netdev,
+                           struct ethtool_coalesce *ec)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       int i;
+
+       if ((ec->rx_coalesce_usecs > IGB_MAX_ITR_USECS) ||
+           ((ec->rx_coalesce_usecs > 3) &&
+            (ec->rx_coalesce_usecs < IGB_MIN_ITR_USECS)) ||
+           (ec->rx_coalesce_usecs == 2))
+               return -EINVAL;
+
+       if ((ec->tx_coalesce_usecs > IGB_MAX_ITR_USECS) ||
+           ((ec->tx_coalesce_usecs > 3) &&
+            (ec->tx_coalesce_usecs < IGB_MIN_ITR_USECS)) ||
+           (ec->tx_coalesce_usecs == 2))
+               return -EINVAL;
+
+       if ((adapter->flags & IGB_FLAG_QUEUE_PAIRS) && ec->tx_coalesce_usecs)
+               return -EINVAL;
+
+       /* If ITR is disabled, disable DMAC */
+       if (ec->rx_coalesce_usecs == 0) {
+               if (adapter->flags & IGB_FLAG_DMAC)
+                       adapter->flags &= ~IGB_FLAG_DMAC;
+       }
+
+       /* convert to rate of irq's per second */
+       if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3)
+               adapter->rx_itr_setting = ec->rx_coalesce_usecs;
+       else
+               adapter->rx_itr_setting = ec->rx_coalesce_usecs << 2;
+
+       /* convert to rate of irq's per second */
+       if (adapter->flags & IGB_FLAG_QUEUE_PAIRS)
+               adapter->tx_itr_setting = adapter->rx_itr_setting;
+       else if (ec->tx_coalesce_usecs && ec->tx_coalesce_usecs <= 3)
+               adapter->tx_itr_setting = ec->tx_coalesce_usecs;
+       else
+               adapter->tx_itr_setting = ec->tx_coalesce_usecs << 2;
+
+       for (i = 0; i < adapter->num_q_vectors; i++) {
+               struct igb_q_vector *q_vector = adapter->q_vector[i];
+               if (q_vector->rx_ring)
+                       q_vector->itr_val = adapter->rx_itr_setting;
+               else
+                       q_vector->itr_val = adapter->tx_itr_setting;
+               if (q_vector->itr_val && q_vector->itr_val <= 3)
+                       q_vector->itr_val = IGB_START_ITR;
+               q_vector->set_itr = 1;
+       }
+
+       return 0;
+}
+
+static int igb_get_coalesce(struct net_device *netdev,
+                           struct ethtool_coalesce *ec)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       if (adapter->rx_itr_setting <= 3)
+               ec->rx_coalesce_usecs = adapter->rx_itr_setting;
+       else
+               ec->rx_coalesce_usecs = adapter->rx_itr_setting >> 2;
+
+       if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS)) {
+               if (adapter->tx_itr_setting <= 3)
+                       ec->tx_coalesce_usecs = adapter->tx_itr_setting;
+               else
+                       ec->tx_coalesce_usecs = adapter->tx_itr_setting >> 2;
+       }
+
+       return 0;
+}
+
+static int igb_nway_reset(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       if (netif_running(netdev))
+               igb_reinit_locked(adapter);
+       return 0;
+}
+
+static int igb_get_sset_count(struct net_device *netdev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_STATS:
+               return IGB_STATS_LEN;
+       case ETH_SS_TEST:
+               return IGB_TEST_LEN;
+       default:
+               return -ENOTSUPP;
+       }
+}
+
+static void igb_get_ethtool_stats(struct net_device *netdev,
+                                 struct ethtool_stats *stats, u64 *data)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct rtnl_link_stats64 *net_stats = &adapter->stats64;
+       unsigned int start;
+       struct igb_ring *ring;
+       int i, j;
+       char *p;
+
+       spin_lock(&adapter->stats64_lock);
+       igb_update_stats(adapter, net_stats);
+
+       for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) {
+               p = (char *)adapter + igb_gstrings_stats[i].stat_offset;
+               data[i] = (igb_gstrings_stats[i].sizeof_stat ==
+                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+       }
+       for (j = 0; j < IGB_NETDEV_STATS_LEN; j++, i++) {
+               p = (char *)net_stats + igb_gstrings_net_stats[j].stat_offset;
+               data[i] = (igb_gstrings_net_stats[j].sizeof_stat ==
+                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+       }
+       for (j = 0; j < adapter->num_tx_queues; j++) {
+               u64     restart2;
+
+               ring = adapter->tx_ring[j];
+               do {
+                       start = u64_stats_fetch_begin_bh(&ring->tx_syncp);
+                       data[i]   = ring->tx_stats.packets;
+                       data[i+1] = ring->tx_stats.bytes;
+                       data[i+2] = ring->tx_stats.restart_queue;
+               } while (u64_stats_fetch_retry_bh(&ring->tx_syncp, start));
+               do {
+                       start = u64_stats_fetch_begin_bh(&ring->tx_syncp2);
+                       restart2  = ring->tx_stats.restart_queue2;
+               } while (u64_stats_fetch_retry_bh(&ring->tx_syncp2, start));
+               data[i+2] += restart2;
+
+               i += IGB_TX_QUEUE_STATS_LEN;
+       }
+       for (j = 0; j < adapter->num_rx_queues; j++) {
+               ring = adapter->rx_ring[j];
+               do {
+                       start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
+                       data[i]   = ring->rx_stats.packets;
+                       data[i+1] = ring->rx_stats.bytes;
+                       data[i+2] = ring->rx_stats.drops;
+                       data[i+3] = ring->rx_stats.csum_err;
+                       data[i+4] = ring->rx_stats.alloc_failed;
+               } while (u64_stats_fetch_retry_bh(&ring->rx_syncp, start));
+               i += IGB_RX_QUEUE_STATS_LEN;
+       }
+       spin_unlock(&adapter->stats64_lock);
+}
+
+static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       u8 *p = data;
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_TEST:
+               memcpy(data, *igb_gstrings_test,
+                       IGB_TEST_LEN*ETH_GSTRING_LEN);
+               break;
+       case ETH_SS_STATS:
+               for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) {
+                       memcpy(p, igb_gstrings_stats[i].stat_string,
+                              ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < IGB_NETDEV_STATS_LEN; i++) {
+                       memcpy(p, igb_gstrings_net_stats[i].stat_string,
+                              ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < adapter->num_tx_queues; i++) {
+                       sprintf(p, "tx_queue_%u_packets", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "tx_queue_%u_bytes", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "tx_queue_%u_restart", i);
+                       p += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       sprintf(p, "rx_queue_%u_packets", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "rx_queue_%u_bytes", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "rx_queue_%u_drops", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "rx_queue_%u_csum_err", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "rx_queue_%u_alloc_failed", i);
+                       p += ETH_GSTRING_LEN;
+               }
+/*             BUG_ON(p - data != IGB_STATS_LEN * ETH_GSTRING_LEN); */
+               break;
+       }
+}
+
+static const struct ethtool_ops igb_ethtool_ops = {
+       .get_settings           = igb_get_settings,
+       .set_settings           = igb_set_settings,
+       .get_drvinfo            = igb_get_drvinfo,
+       .get_regs_len           = igb_get_regs_len,
+       .get_regs               = igb_get_regs,
+       .get_wol                = igb_get_wol,
+       .set_wol                = igb_set_wol,
+       .get_msglevel           = igb_get_msglevel,
+       .set_msglevel           = igb_set_msglevel,
+       .nway_reset             = igb_nway_reset,
+       .get_link               = igb_get_link,
+       .get_eeprom_len         = igb_get_eeprom_len,
+       .get_eeprom             = igb_get_eeprom,
+       .set_eeprom             = igb_set_eeprom,
+       .get_ringparam          = igb_get_ringparam,
+       .set_ringparam          = igb_set_ringparam,
+       .get_pauseparam         = igb_get_pauseparam,
+       .set_pauseparam         = igb_set_pauseparam,
+       .self_test              = igb_diag_test,
+       .get_strings            = igb_get_strings,
+       .set_phys_id            = igb_set_phys_id,
+       .get_sset_count         = igb_get_sset_count,
+       .get_ethtool_stats      = igb_get_ethtool_stats,
+       .get_coalesce           = igb_get_coalesce,
+       .set_coalesce           = igb_set_coalesce,
+};
+
+void igb_set_ethtool_ops(struct net_device *netdev)
+{
+       SET_ETHTOOL_OPS(netdev, &igb_ethtool_ops);
+}
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
new file mode 100644 (file)
index 0000000..40d4c40
--- /dev/null
@@ -0,0 +1,6890 @@
+/*******************************************************************************
+
+  Intel(R) Gigabit Ethernet Linux driver
+  Copyright(c) 2007-2011 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
+
+*******************************************************************************/
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/vmalloc.h>
+#include <linux/pagemap.h>
+#include <linux/netdevice.h>
+#include <linux/ipv6.h>
+#include <linux/slab.h>
+#include <net/checksum.h>
+#include <net/ip6_checksum.h>
+#include <linux/net_tstamp.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+#include <linux/pci.h>
+#include <linux/pci-aspm.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/if_ether.h>
+#include <linux/aer.h>
+#include <linux/prefetch.h>
+#ifdef CONFIG_IGB_DCA
+#include <linux/dca.h>
+#endif
+#include "igb.h"
+
+#define MAJ 3
+#define MIN 0
+#define BUILD 6
+#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
+__stringify(BUILD) "-k"
+char igb_driver_name[] = "igb";
+char igb_driver_version[] = DRV_VERSION;
+static const char igb_driver_string[] =
+                               "Intel(R) Gigabit Ethernet Network Driver";
+static const char igb_copyright[] = "Copyright (c) 2007-2011 Intel Corporation.";
+
+static const struct e1000_info *igb_info_tbl[] = {
+       [board_82575] = &e1000_82575_info,
+};
+
+static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_COPPER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_FIBER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SERDES), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SGMII), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_FIBER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_QUAD_FIBER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SERDES), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SGMII), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_BACKPLANE), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SFP), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER_ET2), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 },
+       /* required last entry */
+       {0, }
+};
+
+MODULE_DEVICE_TABLE(pci, igb_pci_tbl);
+
+void igb_reset(struct igb_adapter *);
+static int igb_setup_all_tx_resources(struct igb_adapter *);
+static int igb_setup_all_rx_resources(struct igb_adapter *);
+static void igb_free_all_tx_resources(struct igb_adapter *);
+static void igb_free_all_rx_resources(struct igb_adapter *);
+static void igb_setup_mrqc(struct igb_adapter *);
+static int igb_probe(struct pci_dev *, const struct pci_device_id *);
+static void __devexit igb_remove(struct pci_dev *pdev);
+static void igb_init_hw_timer(struct igb_adapter *adapter);
+static int igb_sw_init(struct igb_adapter *);
+static int igb_open(struct net_device *);
+static int igb_close(struct net_device *);
+static void igb_configure_tx(struct igb_adapter *);
+static void igb_configure_rx(struct igb_adapter *);
+static void igb_clean_all_tx_rings(struct igb_adapter *);
+static void igb_clean_all_rx_rings(struct igb_adapter *);
+static void igb_clean_tx_ring(struct igb_ring *);
+static void igb_clean_rx_ring(struct igb_ring *);
+static void igb_set_rx_mode(struct net_device *);
+static void igb_update_phy_info(unsigned long);
+static void igb_watchdog(unsigned long);
+static void igb_watchdog_task(struct work_struct *);
+static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb, struct net_device *);
+static struct rtnl_link_stats64 *igb_get_stats64(struct net_device *dev,
+                                                struct rtnl_link_stats64 *stats);
+static int igb_change_mtu(struct net_device *, int);
+static int igb_set_mac(struct net_device *, void *);
+static void igb_set_uta(struct igb_adapter *adapter);
+static irqreturn_t igb_intr(int irq, void *);
+static irqreturn_t igb_intr_msi(int irq, void *);
+static irqreturn_t igb_msix_other(int irq, void *);
+static irqreturn_t igb_msix_ring(int irq, void *);
+#ifdef CONFIG_IGB_DCA
+static void igb_update_dca(struct igb_q_vector *);
+static void igb_setup_dca(struct igb_adapter *);
+#endif /* CONFIG_IGB_DCA */
+static bool igb_clean_tx_irq(struct igb_q_vector *);
+static int igb_poll(struct napi_struct *, int);
+static bool igb_clean_rx_irq_adv(struct igb_q_vector *, int *, int);
+static int igb_ioctl(struct net_device *, struct ifreq *, int cmd);
+static void igb_tx_timeout(struct net_device *);
+static void igb_reset_task(struct work_struct *);
+static void igb_vlan_mode(struct net_device *netdev, u32 features);
+static void igb_vlan_rx_add_vid(struct net_device *, u16);
+static void igb_vlan_rx_kill_vid(struct net_device *, u16);
+static void igb_restore_vlan(struct igb_adapter *);
+static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
+static void igb_ping_all_vfs(struct igb_adapter *);
+static void igb_msg_task(struct igb_adapter *);
+static void igb_vmm_control(struct igb_adapter *);
+static int igb_set_vf_mac(struct igb_adapter *, int, unsigned char *);
+static void igb_restore_vf_multicasts(struct igb_adapter *adapter);
+static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
+static int igb_ndo_set_vf_vlan(struct net_device *netdev,
+                              int vf, u16 vlan, u8 qos);
+static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
+static int igb_ndo_get_vf_config(struct net_device *netdev, int vf,
+                                struct ifla_vf_info *ivi);
+static void igb_check_vf_rate_limit(struct igb_adapter *);
+
+#ifdef CONFIG_PM
+static int igb_suspend(struct pci_dev *, pm_message_t);
+static int igb_resume(struct pci_dev *);
+#endif
+static void igb_shutdown(struct pci_dev *);
+#ifdef CONFIG_IGB_DCA
+static int igb_notify_dca(struct notifier_block *, unsigned long, void *);
+static struct notifier_block dca_notifier = {
+       .notifier_call  = igb_notify_dca,
+       .next           = NULL,
+       .priority       = 0
+};
+#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/* for netdump / net console */
+static void igb_netpoll(struct net_device *);
+#endif
+#ifdef CONFIG_PCI_IOV
+static unsigned int max_vfs = 0;
+module_param(max_vfs, uint, 0);
+MODULE_PARM_DESC(max_vfs, "Maximum number of virtual functions to allocate "
+                 "per physical function");
+#endif /* CONFIG_PCI_IOV */
+
+static pci_ers_result_t igb_io_error_detected(struct pci_dev *,
+                    pci_channel_state_t);
+static pci_ers_result_t igb_io_slot_reset(struct pci_dev *);
+static void igb_io_resume(struct pci_dev *);
+
+static struct pci_error_handlers igb_err_handler = {
+       .error_detected = igb_io_error_detected,
+       .slot_reset = igb_io_slot_reset,
+       .resume = igb_io_resume,
+};
+
+
+static struct pci_driver igb_driver = {
+       .name     = igb_driver_name,
+       .id_table = igb_pci_tbl,
+       .probe    = igb_probe,
+       .remove   = __devexit_p(igb_remove),
+#ifdef CONFIG_PM
+       /* Power Management Hooks */
+       .suspend  = igb_suspend,
+       .resume   = igb_resume,
+#endif
+       .shutdown = igb_shutdown,
+       .err_handler = &igb_err_handler
+};
+
+MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
+MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+struct igb_reg_info {
+       u32 ofs;
+       char *name;
+};
+
+static const struct igb_reg_info igb_reg_info_tbl[] = {
+
+       /* General Registers */
+       {E1000_CTRL, "CTRL"},
+       {E1000_STATUS, "STATUS"},
+       {E1000_CTRL_EXT, "CTRL_EXT"},
+
+       /* Interrupt Registers */
+       {E1000_ICR, "ICR"},
+
+       /* RX Registers */
+       {E1000_RCTL, "RCTL"},
+       {E1000_RDLEN(0), "RDLEN"},
+       {E1000_RDH(0), "RDH"},
+       {E1000_RDT(0), "RDT"},
+       {E1000_RXDCTL(0), "RXDCTL"},
+       {E1000_RDBAL(0), "RDBAL"},
+       {E1000_RDBAH(0), "RDBAH"},
+
+       /* TX Registers */
+       {E1000_TCTL, "TCTL"},
+       {E1000_TDBAL(0), "TDBAL"},
+       {E1000_TDBAH(0), "TDBAH"},
+       {E1000_TDLEN(0), "TDLEN"},
+       {E1000_TDH(0), "TDH"},
+       {E1000_TDT(0), "TDT"},
+       {E1000_TXDCTL(0), "TXDCTL"},
+       {E1000_TDFH, "TDFH"},
+       {E1000_TDFT, "TDFT"},
+       {E1000_TDFHS, "TDFHS"},
+       {E1000_TDFPC, "TDFPC"},
+
+       /* List Terminator */
+       {}
+};
+
+/*
+ * igb_regdump - register printout routine
+ */
+static void igb_regdump(struct e1000_hw *hw, struct igb_reg_info *reginfo)
+{
+       int n = 0;
+       char rname[16];
+       u32 regs[8];
+
+       switch (reginfo->ofs) {
+       case E1000_RDLEN(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_RDLEN(n));
+               break;
+       case E1000_RDH(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_RDH(n));
+               break;
+       case E1000_RDT(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_RDT(n));
+               break;
+       case E1000_RXDCTL(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_RXDCTL(n));
+               break;
+       case E1000_RDBAL(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_RDBAL(n));
+               break;
+       case E1000_RDBAH(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_RDBAH(n));
+               break;
+       case E1000_TDBAL(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_RDBAL(n));
+               break;
+       case E1000_TDBAH(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_TDBAH(n));
+               break;
+       case E1000_TDLEN(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_TDLEN(n));
+               break;
+       case E1000_TDH(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_TDH(n));
+               break;
+       case E1000_TDT(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_TDT(n));
+               break;
+       case E1000_TXDCTL(0):
+               for (n = 0; n < 4; n++)
+                       regs[n] = rd32(E1000_TXDCTL(n));
+               break;
+       default:
+               printk(KERN_INFO "%-15s %08x\n",
+                       reginfo->name, rd32(reginfo->ofs));
+               return;
+       }
+
+       snprintf(rname, 16, "%s%s", reginfo->name, "[0-3]");
+       printk(KERN_INFO "%-15s ", rname);
+       for (n = 0; n < 4; n++)
+               printk(KERN_CONT "%08x ", regs[n]);
+       printk(KERN_CONT "\n");
+}
+
+/*
+ * igb_dump - Print registers, tx-rings and rx-rings
+ */
+static void igb_dump(struct igb_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct igb_reg_info *reginfo;
+       int n = 0;
+       struct igb_ring *tx_ring;
+       union e1000_adv_tx_desc *tx_desc;
+       struct my_u0 { u64 a; u64 b; } *u0;
+       struct igb_buffer *buffer_info;
+       struct igb_ring *rx_ring;
+       union e1000_adv_rx_desc *rx_desc;
+       u32 staterr;
+       int i = 0;
+
+       if (!netif_msg_hw(adapter))
+               return;
+
+       /* Print netdevice Info */
+       if (netdev) {
+               dev_info(&adapter->pdev->dev, "Net device Info\n");
+               printk(KERN_INFO "Device Name     state            "
+                       "trans_start      last_rx\n");
+               printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",
+               netdev->name,
+               netdev->state,
+               netdev->trans_start,
+               netdev->last_rx);
+       }
+
+       /* Print Registers */
+       dev_info(&adapter->pdev->dev, "Register Dump\n");
+       printk(KERN_INFO " Register Name   Value\n");
+       for (reginfo = (struct igb_reg_info *)igb_reg_info_tbl;
+            reginfo->name; reginfo++) {
+               igb_regdump(hw, reginfo);
+       }
+
+       /* Print TX Ring Summary */
+       if (!netdev || !netif_running(netdev))
+               goto exit;
+
+       dev_info(&adapter->pdev->dev, "TX Rings Summary\n");
+       printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma  ]"
+               " leng ntw timestamp\n");
+       for (n = 0; n < adapter->num_tx_queues; n++) {
+               tx_ring = adapter->tx_ring[n];
+               buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
+               printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",
+                          n, tx_ring->next_to_use, tx_ring->next_to_clean,
+                          (u64)buffer_info->dma,
+                          buffer_info->length,
+                          buffer_info->next_to_watch,
+                          (u64)buffer_info->time_stamp);
+       }
+
+       /* Print TX Rings */
+       if (!netif_msg_tx_done(adapter))
+               goto rx_ring_summary;
+
+       dev_info(&adapter->pdev->dev, "TX Rings Dump\n");
+
+       /* Transmit Descriptor Formats
+        *
+        * Advanced Transmit Descriptor
+        *   +--------------------------------------------------------------+
+        * 0 |         Buffer Address [63:0]                                |
+        *   +--------------------------------------------------------------+
+        * 8 | PAYLEN  | PORTS  |CC|IDX | STA | DCMD  |DTYP|MAC|RSV| DTALEN |
+        *   +--------------------------------------------------------------+
+        *   63      46 45    40 39 38 36 35 32 31   24             15       0
+        */
+
+       for (n = 0; n < adapter->num_tx_queues; n++) {
+               tx_ring = adapter->tx_ring[n];
+               printk(KERN_INFO "------------------------------------\n");
+               printk(KERN_INFO "TX QUEUE INDEX = %d\n", tx_ring->queue_index);
+               printk(KERN_INFO "------------------------------------\n");
+               printk(KERN_INFO "T [desc]     [address 63:0  ] "
+                       "[PlPOCIStDDM Ln] [bi->dma       ] "
+                       "leng  ntw timestamp        bi->skb\n");
+
+               for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
+                       tx_desc = E1000_TX_DESC_ADV(*tx_ring, i);
+                       buffer_info = &tx_ring->buffer_info[i];
+                       u0 = (struct my_u0 *)tx_desc;
+                       printk(KERN_INFO "T [0x%03X]    %016llX %016llX %016llX"
+                               " %04X  %3X %016llX %p", i,
+                               le64_to_cpu(u0->a),
+                               le64_to_cpu(u0->b),
+                               (u64)buffer_info->dma,
+                               buffer_info->length,
+                               buffer_info->next_to_watch,
+                               (u64)buffer_info->time_stamp,
+                               buffer_info->skb);
+                       if (i == tx_ring->next_to_use &&
+                               i == tx_ring->next_to_clean)
+                               printk(KERN_CONT " NTC/U\n");
+                       else if (i == tx_ring->next_to_use)
+                               printk(KERN_CONT " NTU\n");
+                       else if (i == tx_ring->next_to_clean)
+                               printk(KERN_CONT " NTC\n");
+                       else
+                               printk(KERN_CONT "\n");
+
+                       if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
+                               print_hex_dump(KERN_INFO, "",
+                                       DUMP_PREFIX_ADDRESS,
+                                       16, 1, phys_to_virt(buffer_info->dma),
+                                       buffer_info->length, true);
+               }
+       }
+
+       /* Print RX Rings Summary */
+rx_ring_summary:
+       dev_info(&adapter->pdev->dev, "RX Rings Summary\n");
+       printk(KERN_INFO "Queue [NTU] [NTC]\n");
+       for (n = 0; n < adapter->num_rx_queues; n++) {
+               rx_ring = adapter->rx_ring[n];
+               printk(KERN_INFO " %5d %5X %5X\n", n,
+                          rx_ring->next_to_use, rx_ring->next_to_clean);
+       }
+
+       /* Print RX Rings */
+       if (!netif_msg_rx_status(adapter))
+               goto exit;
+
+       dev_info(&adapter->pdev->dev, "RX Rings Dump\n");
+
+       /* Advanced Receive Descriptor (Read) Format
+        *    63                                           1        0
+        *    +-----------------------------------------------------+
+        *  0 |       Packet Buffer Address [63:1]           |A0/NSE|
+        *    +----------------------------------------------+------+
+        *  8 |       Header Buffer Address [63:1]           |  DD  |
+        *    +-----------------------------------------------------+
+        *
+        *
+        * Advanced Receive Descriptor (Write-Back) Format
+        *
+        *   63       48 47    32 31  30      21 20 17 16   4 3     0
+        *   +------------------------------------------------------+
+        * 0 | Packet     IP     |SPH| HDR_LEN   | RSV|Packet|  RSS |
+        *   | Checksum   Ident  |   |           |    | Type | Type |
+        *   +------------------------------------------------------+
+        * 8 | VLAN Tag | Length | Extended Error | Extended Status |
+        *   +------------------------------------------------------+
+        *   63       48 47    32 31            20 19               0
+        */
+
+       for (n = 0; n < adapter->num_rx_queues; n++) {
+               rx_ring = adapter->rx_ring[n];
+               printk(KERN_INFO "------------------------------------\n");
+               printk(KERN_INFO "RX QUEUE INDEX = %d\n", rx_ring->queue_index);
+               printk(KERN_INFO "------------------------------------\n");
+               printk(KERN_INFO "R  [desc]      [ PktBuf     A0] "
+                       "[  HeadBuf   DD] [bi->dma       ] [bi->skb] "
+                       "<-- Adv Rx Read format\n");
+               printk(KERN_INFO "RWB[desc]      [PcsmIpSHl PtRs] "
+                       "[vl er S cks ln] ---------------- [bi->skb] "
+                       "<-- Adv Rx Write-Back format\n");
+
+               for (i = 0; i < rx_ring->count; i++) {
+                       buffer_info = &rx_ring->buffer_info[i];
+                       rx_desc = E1000_RX_DESC_ADV(*rx_ring, i);
+                       u0 = (struct my_u0 *)rx_desc;
+                       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+                       if (staterr & E1000_RXD_STAT_DD) {
+                               /* Descriptor Done */
+                               printk(KERN_INFO "RWB[0x%03X]     %016llX "
+                                       "%016llX ---------------- %p", i,
+                                       le64_to_cpu(u0->a),
+                                       le64_to_cpu(u0->b),
+                                       buffer_info->skb);
+                       } else {
+                               printk(KERN_INFO "R  [0x%03X]     %016llX "
+                                       "%016llX %016llX %p", i,
+                                       le64_to_cpu(u0->a),
+                                       le64_to_cpu(u0->b),
+                                       (u64)buffer_info->dma,
+                                       buffer_info->skb);
+
+                               if (netif_msg_pktdata(adapter)) {
+                                       print_hex_dump(KERN_INFO, "",
+                                               DUMP_PREFIX_ADDRESS,
+                                               16, 1,
+                                               phys_to_virt(buffer_info->dma),
+                                               rx_ring->rx_buffer_len, true);
+                                       if (rx_ring->rx_buffer_len
+                                               < IGB_RXBUFFER_1024)
+                                               print_hex_dump(KERN_INFO, "",
+                                                 DUMP_PREFIX_ADDRESS,
+                                                 16, 1,
+                                                 phys_to_virt(
+                                                   buffer_info->page_dma +
+                                                   buffer_info->page_offset),
+                                                 PAGE_SIZE/2, true);
+                               }
+                       }
+
+                       if (i == rx_ring->next_to_use)
+                               printk(KERN_CONT " NTU\n");
+                       else if (i == rx_ring->next_to_clean)
+                               printk(KERN_CONT " NTC\n");
+                       else
+                               printk(KERN_CONT "\n");
+
+               }
+       }
+
+exit:
+       return;
+}
+
+
+/**
+ * igb_read_clock - read raw cycle counter (to be used by time counter)
+ */
+static cycle_t igb_read_clock(const struct cyclecounter *tc)
+{
+       struct igb_adapter *adapter =
+               container_of(tc, struct igb_adapter, cycles);
+       struct e1000_hw *hw = &adapter->hw;
+       u64 stamp = 0;
+       int shift = 0;
+
+       /*
+        * The timestamp latches on lowest register read. For the 82580
+        * the lowest register is SYSTIMR instead of SYSTIML.  However we never
+        * adjusted TIMINCA so SYSTIMR will just read as all 0s so ignore it.
+        */
+       if (hw->mac.type == e1000_82580) {
+               stamp = rd32(E1000_SYSTIMR) >> 8;
+               shift = IGB_82580_TSYNC_SHIFT;
+       }
+
+       stamp |= (u64)rd32(E1000_SYSTIML) << shift;
+       stamp |= (u64)rd32(E1000_SYSTIMH) << (shift + 32);
+       return stamp;
+}
+
+/**
+ * igb_get_hw_dev - return device
+ * used by hardware layer to print debugging information
+ **/
+struct net_device *igb_get_hw_dev(struct e1000_hw *hw)
+{
+       struct igb_adapter *adapter = hw->back;
+       return adapter->netdev;
+}
+
+/**
+ * igb_init_module - Driver Registration Routine
+ *
+ * igb_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init igb_init_module(void)
+{
+       int ret;
+       printk(KERN_INFO "%s - version %s\n",
+              igb_driver_string, igb_driver_version);
+
+       printk(KERN_INFO "%s\n", igb_copyright);
+
+#ifdef CONFIG_IGB_DCA
+       dca_register_notify(&dca_notifier);
+#endif
+       ret = pci_register_driver(&igb_driver);
+       return ret;
+}
+
+module_init(igb_init_module);
+
+/**
+ * igb_exit_module - Driver Exit Cleanup Routine
+ *
+ * igb_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+static void __exit igb_exit_module(void)
+{
+#ifdef CONFIG_IGB_DCA
+       dca_unregister_notify(&dca_notifier);
+#endif
+       pci_unregister_driver(&igb_driver);
+}
+
+module_exit(igb_exit_module);
+
+#define Q_IDX_82576(i) (((i & 0x1) << 3) + (i >> 1))
+/**
+ * igb_cache_ring_register - Descriptor ring to register mapping
+ * @adapter: board private structure to initialize
+ *
+ * Once we know the feature-set enabled for the device, we'll cache
+ * the register offset the descriptor ring is assigned to.
+ **/
+static void igb_cache_ring_register(struct igb_adapter *adapter)
+{
+       int i = 0, j = 0;
+       u32 rbase_offset = adapter->vfs_allocated_count;
+
+       switch (adapter->hw.mac.type) {
+       case e1000_82576:
+               /* The queues are allocated for virtualization such that VF 0
+                * is allocated queues 0 and 8, VF 1 queues 1 and 9, etc.
+                * In order to avoid collision we start at the first free queue
+                * and continue consuming queues in the same sequence
+                */
+               if (adapter->vfs_allocated_count) {
+                       for (; i < adapter->rss_queues; i++)
+                               adapter->rx_ring[i]->reg_idx = rbase_offset +
+                                                              Q_IDX_82576(i);
+               }
+       case e1000_82575:
+       case e1000_82580:
+       case e1000_i350:
+       default:
+               for (; i < adapter->num_rx_queues; i++)
+                       adapter->rx_ring[i]->reg_idx = rbase_offset + i;
+               for (; j < adapter->num_tx_queues; j++)
+                       adapter->tx_ring[j]->reg_idx = rbase_offset + j;
+               break;
+       }
+}
+
+static void igb_free_queues(struct igb_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               kfree(adapter->tx_ring[i]);
+               adapter->tx_ring[i] = NULL;
+       }
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               kfree(adapter->rx_ring[i]);
+               adapter->rx_ring[i] = NULL;
+       }
+       adapter->num_rx_queues = 0;
+       adapter->num_tx_queues = 0;
+}
+
+/**
+ * igb_alloc_queues - Allocate memory for all rings
+ * @adapter: board private structure to initialize
+ *
+ * We allocate one ring per queue at run-time since we don't know the
+ * number of queues at compile-time.
+ **/
+static int igb_alloc_queues(struct igb_adapter *adapter)
+{
+       struct igb_ring *ring;
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               ring = kzalloc(sizeof(struct igb_ring), GFP_KERNEL);
+               if (!ring)
+                       goto err;
+               ring->count = adapter->tx_ring_count;
+               ring->queue_index = i;
+               ring->dev = &adapter->pdev->dev;
+               ring->netdev = adapter->netdev;
+               /* For 82575, context index must be unique per ring. */
+               if (adapter->hw.mac.type == e1000_82575)
+                       ring->flags = IGB_RING_FLAG_TX_CTX_IDX;
+               adapter->tx_ring[i] = ring;
+       }
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               ring = kzalloc(sizeof(struct igb_ring), GFP_KERNEL);
+               if (!ring)
+                       goto err;
+               ring->count = adapter->rx_ring_count;
+               ring->queue_index = i;
+               ring->dev = &adapter->pdev->dev;
+               ring->netdev = adapter->netdev;
+               ring->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+               ring->flags = IGB_RING_FLAG_RX_CSUM; /* enable rx checksum */
+               /* set flag indicating ring supports SCTP checksum offload */
+               if (adapter->hw.mac.type >= e1000_82576)
+                       ring->flags |= IGB_RING_FLAG_RX_SCTP_CSUM;
+               adapter->rx_ring[i] = ring;
+       }
+
+       igb_cache_ring_register(adapter);
+
+       return 0;
+
+err:
+       igb_free_queues(adapter);
+
+       return -ENOMEM;
+}
+
+#define IGB_N0_QUEUE -1
+static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)
+{
+       u32 msixbm = 0;
+       struct igb_adapter *adapter = q_vector->adapter;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ivar, index;
+       int rx_queue = IGB_N0_QUEUE;
+       int tx_queue = IGB_N0_QUEUE;
+
+       if (q_vector->rx_ring)
+               rx_queue = q_vector->rx_ring->reg_idx;
+       if (q_vector->tx_ring)
+               tx_queue = q_vector->tx_ring->reg_idx;
+
+       switch (hw->mac.type) {
+       case e1000_82575:
+               /* The 82575 assigns vectors using a bitmask, which matches the
+                  bitmask for the EICR/EIMS/EIMC registers.  To assign one
+                  or more queues to a vector, we write the appropriate bits
+                  into the MSIXBM register for that vector. */
+               if (rx_queue > IGB_N0_QUEUE)
+                       msixbm = E1000_EICR_RX_QUEUE0 << rx_queue;
+               if (tx_queue > IGB_N0_QUEUE)
+                       msixbm |= E1000_EICR_TX_QUEUE0 << tx_queue;
+               if (!adapter->msix_entries && msix_vector == 0)
+                       msixbm |= E1000_EIMS_OTHER;
+               array_wr32(E1000_MSIXBM(0), msix_vector, msixbm);
+               q_vector->eims_value = msixbm;
+               break;
+       case e1000_82576:
+               /* 82576 uses a table-based method for assigning vectors.
+                  Each queue has a single entry in the table to which we write
+                  a vector number along with a "valid" bit.  Sadly, the layout
+                  of the table is somewhat counterintuitive. */
+               if (rx_queue > IGB_N0_QUEUE) {
+                       index = (rx_queue & 0x7);
+                       ivar = array_rd32(E1000_IVAR0, index);
+                       if (rx_queue < 8) {
+                               /* vector goes into low byte of register */
+                               ivar = ivar & 0xFFFFFF00;
+                               ivar |= msix_vector | E1000_IVAR_VALID;
+                       } else {
+                               /* vector goes into third byte of register */
+                               ivar = ivar & 0xFF00FFFF;
+                               ivar |= (msix_vector | E1000_IVAR_VALID) << 16;
+                       }
+                       array_wr32(E1000_IVAR0, index, ivar);
+               }
+               if (tx_queue > IGB_N0_QUEUE) {
+                       index = (tx_queue & 0x7);
+                       ivar = array_rd32(E1000_IVAR0, index);
+                       if (tx_queue < 8) {
+                               /* vector goes into second byte of register */
+                               ivar = ivar & 0xFFFF00FF;
+                               ivar |= (msix_vector | E1000_IVAR_VALID) << 8;
+                       } else {
+                               /* vector goes into high byte of register */
+                               ivar = ivar & 0x00FFFFFF;
+                               ivar |= (msix_vector | E1000_IVAR_VALID) << 24;
+                       }
+                       array_wr32(E1000_IVAR0, index, ivar);
+               }
+               q_vector->eims_value = 1 << msix_vector;
+               break;
+       case e1000_82580:
+       case e1000_i350:
+               /* 82580 uses the same table-based approach as 82576 but has fewer
+                  entries as a result we carry over for queues greater than 4. */
+               if (rx_queue > IGB_N0_QUEUE) {
+                       index = (rx_queue >> 1);
+                       ivar = array_rd32(E1000_IVAR0, index);
+                       if (rx_queue & 0x1) {
+                               /* vector goes into third byte of register */
+                               ivar = ivar & 0xFF00FFFF;
+                               ivar |= (msix_vector | E1000_IVAR_VALID) << 16;
+                       } else {
+                               /* vector goes into low byte of register */
+                               ivar = ivar & 0xFFFFFF00;
+                               ivar |= msix_vector | E1000_IVAR_VALID;
+                       }
+                       array_wr32(E1000_IVAR0, index, ivar);
+               }
+               if (tx_queue > IGB_N0_QUEUE) {
+                       index = (tx_queue >> 1);
+                       ivar = array_rd32(E1000_IVAR0, index);
+                       if (tx_queue & 0x1) {
+                               /* vector goes into high byte of register */
+                               ivar = ivar & 0x00FFFFFF;
+                               ivar |= (msix_vector | E1000_IVAR_VALID) << 24;
+                       } else {
+                               /* vector goes into second byte of register */
+                               ivar = ivar & 0xFFFF00FF;
+                               ivar |= (msix_vector | E1000_IVAR_VALID) << 8;
+                       }
+                       array_wr32(E1000_IVAR0, index, ivar);
+               }
+               q_vector->eims_value = 1 << msix_vector;
+               break;
+       default:
+               BUG();
+               break;
+       }
+
+       /* add q_vector eims value to global eims_enable_mask */
+       adapter->eims_enable_mask |= q_vector->eims_value;
+
+       /* configure q_vector to set itr on first interrupt */
+       q_vector->set_itr = 1;
+}
+
+/**
+ * igb_configure_msix - Configure MSI-X hardware
+ *
+ * igb_configure_msix sets up the hardware to properly
+ * generate MSI-X interrupts.
+ **/
+static void igb_configure_msix(struct igb_adapter *adapter)
+{
+       u32 tmp;
+       int i, vector = 0;
+       struct e1000_hw *hw = &adapter->hw;
+
+       adapter->eims_enable_mask = 0;
+
+       /* set vector for other causes, i.e. link changes */
+       switch (hw->mac.type) {
+       case e1000_82575:
+               tmp = rd32(E1000_CTRL_EXT);
+               /* enable MSI-X PBA support*/
+               tmp |= E1000_CTRL_EXT_PBA_CLR;
+
+               /* Auto-Mask interrupts upon ICR read. */
+               tmp |= E1000_CTRL_EXT_EIAME;
+               tmp |= E1000_CTRL_EXT_IRCA;
+
+               wr32(E1000_CTRL_EXT, tmp);
+
+               /* enable msix_other interrupt */
+               array_wr32(E1000_MSIXBM(0), vector++,
+                                     E1000_EIMS_OTHER);
+               adapter->eims_other = E1000_EIMS_OTHER;
+
+               break;
+
+       case e1000_82576:
+       case e1000_82580:
+       case e1000_i350:
+               /* Turn on MSI-X capability first, or our settings
+                * won't stick.  And it will take days to debug. */
+               wr32(E1000_GPIE, E1000_GPIE_MSIX_MODE |
+                               E1000_GPIE_PBA | E1000_GPIE_EIAME |
+                               E1000_GPIE_NSICR);
+
+               /* enable msix_other interrupt */
+               adapter->eims_other = 1 << vector;
+               tmp = (vector++ | E1000_IVAR_VALID) << 8;
+
+               wr32(E1000_IVAR_MISC, tmp);
+               break;
+       default:
+               /* do nothing, since nothing else supports MSI-X */
+               break;
+       } /* switch (hw->mac.type) */
+
+       adapter->eims_enable_mask |= adapter->eims_other;
+
+       for (i = 0; i < adapter->num_q_vectors; i++)
+               igb_assign_vector(adapter->q_vector[i], vector++);
+
+       wrfl();
+}
+
+/**
+ * igb_request_msix - Initialize MSI-X interrupts
+ *
+ * igb_request_msix allocates MSI-X vectors and requests interrupts from the
+ * kernel.
+ **/
+static int igb_request_msix(struct igb_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       int i, err = 0, vector = 0;
+
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         igb_msix_other, 0, netdev->name, adapter);
+       if (err)
+               goto out;
+       vector++;
+
+       for (i = 0; i < adapter->num_q_vectors; i++) {
+               struct igb_q_vector *q_vector = adapter->q_vector[i];
+
+               q_vector->itr_register = hw->hw_addr + E1000_EITR(vector);
+
+               if (q_vector->rx_ring && q_vector->tx_ring)
+                       sprintf(q_vector->name, "%s-TxRx-%u", netdev->name,
+                               q_vector->rx_ring->queue_index);
+               else if (q_vector->tx_ring)
+                       sprintf(q_vector->name, "%s-tx-%u", netdev->name,
+                               q_vector->tx_ring->queue_index);
+               else if (q_vector->rx_ring)
+                       sprintf(q_vector->name, "%s-rx-%u", netdev->name,
+                               q_vector->rx_ring->queue_index);
+               else
+                       sprintf(q_vector->name, "%s-unused", netdev->name);
+
+               err = request_irq(adapter->msix_entries[vector].vector,
+                                 igb_msix_ring, 0, q_vector->name,
+                                 q_vector);
+               if (err)
+                       goto out;
+               vector++;
+       }
+
+       igb_configure_msix(adapter);
+       return 0;
+out:
+       return err;
+}
+
+static void igb_reset_interrupt_capability(struct igb_adapter *adapter)
+{
+       if (adapter->msix_entries) {
+               pci_disable_msix(adapter->pdev);
+               kfree(adapter->msix_entries);
+               adapter->msix_entries = NULL;
+       } else if (adapter->flags & IGB_FLAG_HAS_MSI) {
+               pci_disable_msi(adapter->pdev);
+       }
+}
+
+/**
+ * igb_free_q_vectors - Free memory allocated for interrupt vectors
+ * @adapter: board private structure to initialize
+ *
+ * This function frees the memory allocated to the q_vectors.  In addition if
+ * NAPI is enabled it will delete any references to the NAPI struct prior
+ * to freeing the q_vector.
+ **/
+static void igb_free_q_vectors(struct igb_adapter *adapter)
+{
+       int v_idx;
+
+       for (v_idx = 0; v_idx < adapter->num_q_vectors; v_idx++) {
+               struct igb_q_vector *q_vector = adapter->q_vector[v_idx];
+               adapter->q_vector[v_idx] = NULL;
+               if (!q_vector)
+                       continue;
+               netif_napi_del(&q_vector->napi);
+               kfree(q_vector);
+       }
+       adapter->num_q_vectors = 0;
+}
+
+/**
+ * igb_clear_interrupt_scheme - reset the device to a state of no interrupts
+ *
+ * This function resets the device so that it has 0 rx queues, tx queues, and
+ * MSI-X interrupts allocated.
+ */
+static void igb_clear_interrupt_scheme(struct igb_adapter *adapter)
+{
+       igb_free_queues(adapter);
+       igb_free_q_vectors(adapter);
+       igb_reset_interrupt_capability(adapter);
+}
+
+/**
+ * igb_set_interrupt_capability - set MSI or MSI-X if supported
+ *
+ * Attempt to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+static int igb_set_interrupt_capability(struct igb_adapter *adapter)
+{
+       int err;
+       int numvecs, i;
+
+       /* Number of supported queues. */
+       adapter->num_rx_queues = adapter->rss_queues;
+       if (adapter->vfs_allocated_count)
+               adapter->num_tx_queues = 1;
+       else
+               adapter->num_tx_queues = adapter->rss_queues;
+
+       /* start with one vector for every rx queue */
+       numvecs = adapter->num_rx_queues;
+
+       /* if tx handler is separate add 1 for every tx queue */
+       if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS))
+               numvecs += adapter->num_tx_queues;
+
+       /* store the number of vectors reserved for queues */
+       adapter->num_q_vectors = numvecs;
+
+       /* add 1 vector for link status interrupts */
+       numvecs++;
+       adapter->msix_entries = kcalloc(numvecs, sizeof(struct msix_entry),
+                                       GFP_KERNEL);
+       if (!adapter->msix_entries)
+               goto msi_only;
+
+       for (i = 0; i < numvecs; i++)
+               adapter->msix_entries[i].entry = i;
+
+       err = pci_enable_msix(adapter->pdev,
+                             adapter->msix_entries,
+                             numvecs);
+       if (err == 0)
+               goto out;
+
+       igb_reset_interrupt_capability(adapter);
+
+       /* If we can't do MSI-X, try MSI */
+msi_only:
+#ifdef CONFIG_PCI_IOV
+       /* disable SR-IOV for non MSI-X configurations */
+       if (adapter->vf_data) {
+               struct e1000_hw *hw = &adapter->hw;
+               /* disable iov and allow time for transactions to clear */
+               pci_disable_sriov(adapter->pdev);
+               msleep(500);
+
+               kfree(adapter->vf_data);
+               adapter->vf_data = NULL;
+               wr32(E1000_IOVCTL, E1000_IOVCTL_REUSE_VFQ);
+               wrfl();
+               msleep(100);
+               dev_info(&adapter->pdev->dev, "IOV Disabled\n");
+       }
+#endif
+       adapter->vfs_allocated_count = 0;
+       adapter->rss_queues = 1;
+       adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
+       adapter->num_rx_queues = 1;
+       adapter->num_tx_queues = 1;
+       adapter->num_q_vectors = 1;
+       if (!pci_enable_msi(adapter->pdev))
+               adapter->flags |= IGB_FLAG_HAS_MSI;
+out:
+       /* Notify the stack of the (possibly) reduced queue counts. */
+       netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
+       return netif_set_real_num_rx_queues(adapter->netdev,
+                                           adapter->num_rx_queues);
+}
+
+/**
+ * igb_alloc_q_vectors - Allocate memory for interrupt vectors
+ * @adapter: board private structure to initialize
+ *
+ * We allocate one q_vector per queue interrupt.  If allocation fails we
+ * return -ENOMEM.
+ **/
+static int igb_alloc_q_vectors(struct igb_adapter *adapter)
+{
+       struct igb_q_vector *q_vector;
+       struct e1000_hw *hw = &adapter->hw;
+       int v_idx;
+
+       for (v_idx = 0; v_idx < adapter->num_q_vectors; v_idx++) {
+               q_vector = kzalloc(sizeof(struct igb_q_vector), GFP_KERNEL);
+               if (!q_vector)
+                       goto err_out;
+               q_vector->adapter = adapter;
+               q_vector->itr_register = hw->hw_addr + E1000_EITR(0);
+               q_vector->itr_val = IGB_START_ITR;
+               netif_napi_add(adapter->netdev, &q_vector->napi, igb_poll, 64);
+               adapter->q_vector[v_idx] = q_vector;
+       }
+       return 0;
+
+err_out:
+       igb_free_q_vectors(adapter);
+       return -ENOMEM;
+}
+
+static void igb_map_rx_ring_to_vector(struct igb_adapter *adapter,
+                                      int ring_idx, int v_idx)
+{
+       struct igb_q_vector *q_vector = adapter->q_vector[v_idx];
+
+       q_vector->rx_ring = adapter->rx_ring[ring_idx];
+       q_vector->rx_ring->q_vector = q_vector;
+       q_vector->itr_val = adapter->rx_itr_setting;
+       if (q_vector->itr_val && q_vector->itr_val <= 3)
+               q_vector->itr_val = IGB_START_ITR;
+}
+
+static void igb_map_tx_ring_to_vector(struct igb_adapter *adapter,
+                                      int ring_idx, int v_idx)
+{
+       struct igb_q_vector *q_vector = adapter->q_vector[v_idx];
+
+       q_vector->tx_ring = adapter->tx_ring[ring_idx];
+       q_vector->tx_ring->q_vector = q_vector;
+       q_vector->itr_val = adapter->tx_itr_setting;
+       if (q_vector->itr_val && q_vector->itr_val <= 3)
+               q_vector->itr_val = IGB_START_ITR;
+}
+
+/**
+ * igb_map_ring_to_vector - maps allocated queues to vectors
+ *
+ * This function maps the recently allocated queues to vectors.
+ **/
+static int igb_map_ring_to_vector(struct igb_adapter *adapter)
+{
+       int i;
+       int v_idx = 0;
+
+       if ((adapter->num_q_vectors < adapter->num_rx_queues) ||
+           (adapter->num_q_vectors < adapter->num_tx_queues))
+               return -ENOMEM;
+
+       if (adapter->num_q_vectors >=
+           (adapter->num_rx_queues + adapter->num_tx_queues)) {
+               for (i = 0; i < adapter->num_rx_queues; i++)
+                       igb_map_rx_ring_to_vector(adapter, i, v_idx++);
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       igb_map_tx_ring_to_vector(adapter, i, v_idx++);
+       } else {
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       if (i < adapter->num_tx_queues)
+                               igb_map_tx_ring_to_vector(adapter, i, v_idx);
+                       igb_map_rx_ring_to_vector(adapter, i, v_idx++);
+               }
+               for (; i < adapter->num_tx_queues; i++)
+                       igb_map_tx_ring_to_vector(adapter, i, v_idx++);
+       }
+       return 0;
+}
+
+/**
+ * igb_init_interrupt_scheme - initialize interrupts, allocate queues/vectors
+ *
+ * This function initializes the interrupts and allocates all of the queues.
+ **/
+static int igb_init_interrupt_scheme(struct igb_adapter *adapter)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int err;
+
+       err = igb_set_interrupt_capability(adapter);
+       if (err)
+               return err;
+
+       err = igb_alloc_q_vectors(adapter);
+       if (err) {
+               dev_err(&pdev->dev, "Unable to allocate memory for vectors\n");
+               goto err_alloc_q_vectors;
+       }
+
+       err = igb_alloc_queues(adapter);
+       if (err) {
+               dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
+               goto err_alloc_queues;
+       }
+
+       err = igb_map_ring_to_vector(adapter);
+       if (err) {
+               dev_err(&pdev->dev, "Invalid q_vector to ring mapping\n");
+               goto err_map_queues;
+       }
+
+
+       return 0;
+err_map_queues:
+       igb_free_queues(adapter);
+err_alloc_queues:
+       igb_free_q_vectors(adapter);
+err_alloc_q_vectors:
+       igb_reset_interrupt_capability(adapter);
+       return err;
+}
+
+/**
+ * igb_request_irq - initialize interrupts
+ *
+ * Attempts to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+static int igb_request_irq(struct igb_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       int err = 0;
+
+       if (adapter->msix_entries) {
+               err = igb_request_msix(adapter);
+               if (!err)
+                       goto request_done;
+               /* fall back to MSI */
+               igb_clear_interrupt_scheme(adapter);
+               if (!pci_enable_msi(adapter->pdev))
+                       adapter->flags |= IGB_FLAG_HAS_MSI;
+               igb_free_all_tx_resources(adapter);
+               igb_free_all_rx_resources(adapter);
+               adapter->num_tx_queues = 1;
+               adapter->num_rx_queues = 1;
+               adapter->num_q_vectors = 1;
+               err = igb_alloc_q_vectors(adapter);
+               if (err) {
+                       dev_err(&pdev->dev,
+                               "Unable to allocate memory for vectors\n");
+                       goto request_done;
+               }
+               err = igb_alloc_queues(adapter);
+               if (err) {
+                       dev_err(&pdev->dev,
+                               "Unable to allocate memory for queues\n");
+                       igb_free_q_vectors(adapter);
+                       goto request_done;
+               }
+               igb_setup_all_tx_resources(adapter);
+               igb_setup_all_rx_resources(adapter);
+       } else {
+               igb_assign_vector(adapter->q_vector[0], 0);
+       }
+
+       if (adapter->flags & IGB_FLAG_HAS_MSI) {
+               err = request_irq(adapter->pdev->irq, igb_intr_msi, 0,
+                                 netdev->name, adapter);
+               if (!err)
+                       goto request_done;
+
+               /* fall back to legacy interrupts */
+               igb_reset_interrupt_capability(adapter);
+               adapter->flags &= ~IGB_FLAG_HAS_MSI;
+       }
+
+       err = request_irq(adapter->pdev->irq, igb_intr, IRQF_SHARED,
+                         netdev->name, adapter);
+
+       if (err)
+               dev_err(&adapter->pdev->dev, "Error %d getting interrupt\n",
+                       err);
+
+request_done:
+       return err;
+}
+
+static void igb_free_irq(struct igb_adapter *adapter)
+{
+       if (adapter->msix_entries) {
+               int vector = 0, i;
+
+               free_irq(adapter->msix_entries[vector++].vector, adapter);
+
+               for (i = 0; i < adapter->num_q_vectors; i++) {
+                       struct igb_q_vector *q_vector = adapter->q_vector[i];
+                       free_irq(adapter->msix_entries[vector++].vector,
+                                q_vector);
+               }
+       } else {
+               free_irq(adapter->pdev->irq, adapter);
+       }
+}
+
+/**
+ * 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;
+
+       /*
+        * we need to be careful when disabling interrupts.  The VFs are also
+        * mapped into these registers and so clearing the bits can cause
+        * issues on the VF drivers so we only need to clear what we set
+        */
+       if (adapter->msix_entries) {
+               u32 regval = rd32(E1000_EIAM);
+               wr32(E1000_EIAM, regval & ~adapter->eims_enable_mask);
+               wr32(E1000_EIMC, adapter->eims_enable_mask);
+               regval = rd32(E1000_EIAC);
+               wr32(E1000_EIAC, regval & ~adapter->eims_enable_mask);
+       }
+
+       wr32(E1000_IAM, 0);
+       wr32(E1000_IMC, ~0);
+       wrfl();
+       if (adapter->msix_entries) {
+               int i;
+               for (i = 0; i < adapter->num_q_vectors; i++)
+                       synchronize_irq(adapter->msix_entries[i].vector);
+       } else {
+               synchronize_irq(adapter->pdev->irq);
+       }
+}
+
+/**
+ * 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;
+
+       if (adapter->msix_entries) {
+               u32 ims = E1000_IMS_LSC | E1000_IMS_DOUTSYNC;
+               u32 regval = rd32(E1000_EIAC);
+               wr32(E1000_EIAC, regval | adapter->eims_enable_mask);
+               regval = rd32(E1000_EIAM);
+               wr32(E1000_EIAM, regval | adapter->eims_enable_mask);
+               wr32(E1000_EIMS, adapter->eims_enable_mask);
+               if (adapter->vfs_allocated_count) {
+                       wr32(E1000_MBVFIMR, 0xFF);
+                       ims |= E1000_IMS_VMMB;
+               }
+               if (adapter->hw.mac.type == e1000_82580)
+                       ims |= E1000_IMS_DRSTA;
+
+               wr32(E1000_IMS, ims);
+       } else {
+               wr32(E1000_IMS, IMS_ENABLE_MASK |
+                               E1000_IMS_DRSTA);
+               wr32(E1000_IAM, IMS_ENABLE_MASK |
+                               E1000_IMS_DRSTA);
+       }
+}
+
+static void igb_update_mng_vlan(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 vid = adapter->hw.mng_cookie.vlan_id;
+       u16 old_vid = adapter->mng_vlan_id;
+
+       if (hw->mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN) {
+               /* add VID to filter table */
+               igb_vfta_set(hw, vid, true);
+               adapter->mng_vlan_id = vid;
+       } else {
+               adapter->mng_vlan_id = IGB_MNG_VLAN_NONE;
+       }
+
+       if ((old_vid != (u16)IGB_MNG_VLAN_NONE) &&
+           (vid != old_vid) &&
+           !test_bit(old_vid, adapter->active_vlans)) {
+               /* remove VID from filter table */
+               igb_vfta_set(hw, old_vid, false);
+       }
+}
+
+/**
+ * igb_release_hw_control - release control of the h/w to f/w
+ * @adapter: address of board private structure
+ *
+ * igb_release_hw_control resets CTRL_EXT:DRV_LOAD bit.
+ * For ASF and Pass Through versions of f/w this means that the
+ * driver is no longer loaded.
+ *
+ **/
+static void igb_release_hw_control(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl_ext;
+
+       /* Let firmware take over control of h/w */
+       ctrl_ext = rd32(E1000_CTRL_EXT);
+       wr32(E1000_CTRL_EXT,
+                       ctrl_ext & ~E1000_CTRL_EXT_DRV_LOAD);
+}
+
+/**
+ * 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.
+ *
+ **/
+static 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 = rd32(E1000_CTRL_EXT);
+       wr32(E1000_CTRL_EXT,
+                       ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
+}
+
+/**
+ * igb_configure - configure the hardware for RX and TX
+ * @adapter: private board structure
+ **/
+static void igb_configure(struct igb_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int i;
+
+       igb_get_hw_control(adapter);
+       igb_set_rx_mode(netdev);
+
+       igb_restore_vlan(adapter);
+
+       igb_setup_tctl(adapter);
+       igb_setup_mrqc(adapter);
+       igb_setup_rctl(adapter);
+
+       igb_configure_tx(adapter);
+       igb_configure_rx(adapter);
+
+       igb_rx_fifo_flush_82575(&adapter->hw);
+
+       /* call igb_desc_unused which always leaves
+        * at least 1 descriptor unused to make sure
+        * next_to_use != next_to_clean */
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               struct igb_ring *ring = adapter->rx_ring[i];
+               igb_alloc_rx_buffers_adv(ring, igb_desc_unused(ring));
+       }
+}
+
+/**
+ * igb_power_up_link - Power up the phy/serdes link
+ * @adapter: address of board private structure
+ **/
+void igb_power_up_link(struct igb_adapter *adapter)
+{
+       if (adapter->hw.phy.media_type == e1000_media_type_copper)
+               igb_power_up_phy_copper(&adapter->hw);
+       else
+               igb_power_up_serdes_link_82575(&adapter->hw);
+}
+
+/**
+ * igb_power_down_link - Power down the phy/serdes link
+ * @adapter: address of board private structure
+ */
+static void igb_power_down_link(struct igb_adapter *adapter)
+{
+       if (adapter->hw.phy.media_type == e1000_media_type_copper)
+               igb_power_down_phy_copper_82575(&adapter->hw);
+       else
+               igb_shutdown_serdes_link_82575(&adapter->hw);
+}
+
+/**
+ * igb_up - Open the interface and prepare it to handle traffic
+ * @adapter: board private structure
+ **/
+int igb_up(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       int i;
+
+       /* hardware has been reset, we need to reload some things */
+       igb_configure(adapter);
+
+       clear_bit(__IGB_DOWN, &adapter->state);
+
+       for (i = 0; i < adapter->num_q_vectors; i++) {
+               struct igb_q_vector *q_vector = adapter->q_vector[i];
+               napi_enable(&q_vector->napi);
+       }
+       if (adapter->msix_entries)
+               igb_configure_msix(adapter);
+       else
+               igb_assign_vector(adapter->q_vector[0], 0);
+
+       /* Clear any pending interrupts. */
+       rd32(E1000_ICR);
+       igb_irq_enable(adapter);
+
+       /* notify VFs that reset has been completed */
+       if (adapter->vfs_allocated_count) {
+               u32 reg_data = rd32(E1000_CTRL_EXT);
+               reg_data |= E1000_CTRL_EXT_PFRSTD;
+               wr32(E1000_CTRL_EXT, reg_data);
+       }
+
+       netif_tx_start_all_queues(adapter->netdev);
+
+       /* start the watchdog. */
+       hw->mac.get_link_status = 1;
+       schedule_work(&adapter->watchdog_task);
+
+       return 0;
+}
+
+void igb_down(struct igb_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 tctl, rctl;
+       int i;
+
+       /* signal that we're down so the interrupt handler does not
+        * reschedule our watchdog timer */
+       set_bit(__IGB_DOWN, &adapter->state);
+
+       /* disable receives in the hardware */
+       rctl = rd32(E1000_RCTL);
+       wr32(E1000_RCTL, rctl & ~E1000_RCTL_EN);
+       /* flush and sleep below */
+
+       netif_tx_stop_all_queues(netdev);
+
+       /* disable transmits in the hardware */
+       tctl = rd32(E1000_TCTL);
+       tctl &= ~E1000_TCTL_EN;
+       wr32(E1000_TCTL, tctl);
+       /* flush both disables and wait for them to finish */
+       wrfl();
+       msleep(10);
+
+       for (i = 0; i < adapter->num_q_vectors; i++) {
+               struct igb_q_vector *q_vector = adapter->q_vector[i];
+               napi_disable(&q_vector->napi);
+       }
+
+       igb_irq_disable(adapter);
+
+       del_timer_sync(&adapter->watchdog_timer);
+       del_timer_sync(&adapter->phy_info_timer);
+
+       netif_carrier_off(netdev);
+
+       /* record the stats before reset*/
+       spin_lock(&adapter->stats64_lock);
+       igb_update_stats(adapter, &adapter->stats64);
+       spin_unlock(&adapter->stats64_lock);
+
+       adapter->link_speed = 0;
+       adapter->link_duplex = 0;
+
+       if (!pci_channel_offline(adapter->pdev))
+               igb_reset(adapter);
+       igb_clean_all_tx_rings(adapter);
+       igb_clean_all_rx_rings(adapter);
+#ifdef CONFIG_IGB_DCA
+
+       /* since we reset the hardware DCA settings were cleared */
+       igb_setup_dca(adapter);
+#endif
+}
+
+void igb_reinit_locked(struct igb_adapter *adapter)
+{
+       WARN_ON(in_interrupt());
+       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
+               msleep(1);
+       igb_down(adapter);
+       igb_up(adapter);
+       clear_bit(__IGB_RESETTING, &adapter->state);
+}
+
+void igb_reset(struct igb_adapter *adapter)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct e1000_mac_info *mac = &hw->mac;
+       struct e1000_fc_info *fc = &hw->fc;
+       u32 pba = 0, tx_space, min_tx_space, min_rx_space;
+       u16 hwm;
+
+       /* Repartition Pba for greater than 9k mtu
+        * To take effect CTRL.RST is required.
+        */
+       switch (mac->type) {
+       case e1000_i350:
+       case e1000_82580:
+               pba = rd32(E1000_RXPBS);
+               pba = igb_rxpbs_adjust_82580(pba);
+               break;
+       case e1000_82576:
+               pba = rd32(E1000_RXPBS);
+               pba &= E1000_RXPBS_SIZE_MASK_82576;
+               break;
+       case e1000_82575:
+       default:
+               pba = E1000_PBA_34K;
+               break;
+       }
+
+       if ((adapter->max_frame_size > ETH_FRAME_LEN + ETH_FCS_LEN) &&
+           (mac->type < e1000_82576)) {
+               /* adjust PBA for jumbo frames */
+               wr32(E1000_PBA, pba);
+
+               /* To maintain wire speed transmits, the Tx FIFO should be
+                * large enough to accommodate two full transmit packets,
+                * rounded up to the next 1KB and expressed in KB.  Likewise,
+                * the Rx FIFO should be large enough to accommodate at least
+                * one full receive packet and is similarly rounded up and
+                * expressed in KB. */
+               pba = rd32(E1000_PBA);
+               /* upper 16 bits has Tx packet buffer allocation size in KB */
+               tx_space = pba >> 16;
+               /* lower 16 bits has Rx packet buffer allocation size in KB */
+               pba &= 0xffff;
+               /* the tx fifo also stores 16 bytes of information about the tx
+                * but don't include ethernet FCS because hardware appends it */
+               min_tx_space = (adapter->max_frame_size +
+                               sizeof(union e1000_adv_tx_desc) -
+                               ETH_FCS_LEN) * 2;
+               min_tx_space = ALIGN(min_tx_space, 1024);
+               min_tx_space >>= 10;
+               /* software strips receive CRC, so leave room for it */
+               min_rx_space = adapter->max_frame_size;
+               min_rx_space = ALIGN(min_rx_space, 1024);
+               min_rx_space >>= 10;
+
+               /* If current Tx allocation is less than the min Tx FIFO size,
+                * and the min Tx FIFO size is less than the current Rx FIFO
+                * allocation, take space away from current Rx allocation */
+               if (tx_space < min_tx_space &&
+                   ((min_tx_space - tx_space) < pba)) {
+                       pba = pba - (min_tx_space - tx_space);
+
+                       /* if short on rx space, rx wins and must trump tx
+                        * adjustment */
+                       if (pba < min_rx_space)
+                               pba = min_rx_space;
+               }
+               wr32(E1000_PBA, pba);
+       }
+
+       /* 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 */
+       hwm = min(((pba << 10) * 9 / 10),
+                       ((pba << 10) - 2 * adapter->max_frame_size));
+
+       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;
+
+       /* disable receive for all VFs and wait one second */
+       if (adapter->vfs_allocated_count) {
+               int i;
+               for (i = 0 ; i < adapter->vfs_allocated_count; i++)
+                       adapter->vf_data[i].flags &= IGB_VF_FLAG_PF_SET_MAC;
+
+               /* ping all the active vfs to let them know we are going down */
+               igb_ping_all_vfs(adapter);
+
+               /* disable transmits and receives */
+               wr32(E1000_VFRE, 0);
+               wr32(E1000_VFTE, 0);
+       }
+
+       /* Allow time for pending master requests to run */
+       hw->mac.ops.reset_hw(hw);
+       wr32(E1000_WUC, 0);
+
+       if (hw->mac.ops.init_hw(hw))
+               dev_err(&pdev->dev, "Hardware Error\n");
+       if (hw->mac.type > e1000_82580) {
+               if (adapter->flags & IGB_FLAG_DMAC) {
+                       u32 reg;
+
+                       /*
+                        * DMA Coalescing high water mark needs to be higher
+                        * than * the * Rx threshold.  The Rx threshold is
+                        * currently * pba - 6, so we * should use a high water
+                        * mark of pba * - 4. */
+                       hwm = (pba - 4) << 10;
+
+                       reg = (((pba-6) << E1000_DMACR_DMACTHR_SHIFT)
+                              & E1000_DMACR_DMACTHR_MASK);
+
+                       /* transition to L0x or L1 if available..*/
+                       reg |= (E1000_DMACR_DMAC_EN | E1000_DMACR_DMAC_LX_MASK);
+
+                       /* watchdog timer= +-1000 usec in 32usec intervals */
+                       reg |= (1000 >> 5);
+                       wr32(E1000_DMACR, reg);
+
+                       /* no lower threshold to disable coalescing(smart fifb)
+                        * -UTRESH=0*/
+                       wr32(E1000_DMCRTRH, 0);
+
+                       /* set hwm to PBA -  2 * max frame size */
+                       wr32(E1000_FCRTC, hwm);
+
+                       /*
+                        * This sets the time to wait before requesting tran-
+                        * sition to * low power state to number of usecs needed
+                        * to receive 1 512 * byte frame at gigabit line rate
+                        */
+                       reg = rd32(E1000_DMCTLX);
+                       reg |= IGB_DMCTLX_DCFLUSH_DIS;
+
+                       /* Delay 255 usec before entering Lx state. */
+                       reg |= 0xFF;
+                       wr32(E1000_DMCTLX, reg);
+
+                       /* free space in Tx packet buffer to wake from DMAC */
+                       wr32(E1000_DMCTXTH,
+                            (IGB_MIN_TXPBSIZE -
+                            (IGB_TX_BUF_4096 + adapter->max_frame_size))
+                            >> 6);
+
+                       /* make low power state decision controlled by DMAC */
+                       reg = rd32(E1000_PCIEMISC);
+                       reg |= E1000_PCIEMISC_LX_DECISION;
+                       wr32(E1000_PCIEMISC, reg);
+               } /* end if IGB_FLAG_DMAC set */
+       }
+       if (hw->mac.type == e1000_82580) {
+               u32 reg = rd32(E1000_PCIEMISC);
+               wr32(E1000_PCIEMISC,
+                               reg & ~E1000_PCIEMISC_LX_DECISION);
+       }
+       if (!netif_running(adapter->netdev))
+               igb_power_down_link(adapter);
+
+       igb_update_mng_vlan(adapter);
+
+       /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
+       wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE);
+
+       igb_get_phy_info(hw);
+}
+
+static u32 igb_fix_features(struct net_device *netdev, u32 features)
+{
+       /*
+        * Since there is no support for separate rx/tx vlan accel
+        * enable/disable make sure tx flag is always in same state as rx.
+        */
+       if (features & NETIF_F_HW_VLAN_RX)
+               features |= NETIF_F_HW_VLAN_TX;
+       else
+               features &= ~NETIF_F_HW_VLAN_TX;
+
+       return features;
+}
+
+static int igb_set_features(struct net_device *netdev, u32 features)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       int i;
+       u32 changed = netdev->features ^ features;
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               if (features & NETIF_F_RXCSUM)
+                       adapter->rx_ring[i]->flags |= IGB_RING_FLAG_RX_CSUM;
+               else
+                       adapter->rx_ring[i]->flags &= ~IGB_RING_FLAG_RX_CSUM;
+       }
+
+       if (changed & NETIF_F_HW_VLAN_RX)
+               igb_vlan_mode(netdev, features);
+
+       return 0;
+}
+
+static const struct net_device_ops igb_netdev_ops = {
+       .ndo_open               = igb_open,
+       .ndo_stop               = igb_close,
+       .ndo_start_xmit         = igb_xmit_frame_adv,
+       .ndo_get_stats64        = igb_get_stats64,
+       .ndo_set_rx_mode        = igb_set_rx_mode,
+       .ndo_set_multicast_list = igb_set_rx_mode,
+       .ndo_set_mac_address    = igb_set_mac,
+       .ndo_change_mtu         = igb_change_mtu,
+       .ndo_do_ioctl           = igb_ioctl,
+       .ndo_tx_timeout         = igb_tx_timeout,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_vlan_rx_add_vid    = igb_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = igb_vlan_rx_kill_vid,
+       .ndo_set_vf_mac         = igb_ndo_set_vf_mac,
+       .ndo_set_vf_vlan        = igb_ndo_set_vf_vlan,
+       .ndo_set_vf_tx_rate     = igb_ndo_set_vf_bw,
+       .ndo_get_vf_config      = igb_ndo_get_vf_config,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = igb_netpoll,
+#endif
+       .ndo_fix_features       = igb_fix_features,
+       .ndo_set_features       = igb_set_features,
+};
+
+/**
+ * igb_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in igb_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * igb_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+static int __devinit igb_probe(struct pci_dev *pdev,
+                              const struct pci_device_id *ent)
+{
+       struct net_device *netdev;
+       struct igb_adapter *adapter;
+       struct e1000_hw *hw;
+       u16 eeprom_data = 0;
+       s32 ret_val;
+       static int global_quad_port_a; /* global quad port a indication */
+       const struct e1000_info *ei = igb_info_tbl[ent->driver_data];
+       unsigned long mmio_start, mmio_len;
+       int err, pci_using_dac;
+       u16 eeprom_apme_mask = IGB_EEPROM_APME;
+       u8 part_str[E1000_PBANUM_LENGTH];
+
+       /* Catch broken hardware that put the wrong VF device ID in
+        * the PCIe SR-IOV capability.
+        */
+       if (pdev->is_virtfn) {
+               WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
+                    pci_name(pdev), pdev->vendor, pdev->device);
+               return -EINVAL;
+       }
+
+       err = pci_enable_device_mem(pdev);
+       if (err)
+               return err;
+
+       pci_using_dac = 0;
+       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+       if (!err) {
+               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+               if (!err)
+                       pci_using_dac = 1;
+       } else {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               if (err) {
+                       err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+                       if (err) {
+                               dev_err(&pdev->dev, "No usable DMA "
+                                       "configuration, aborting\n");
+                               goto err_dma;
+                       }
+               }
+       }
+
+       err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
+                                          IORESOURCE_MEM),
+                                          igb_driver_name);
+       if (err)
+               goto err_pci_reg;
+
+       pci_enable_pcie_error_reporting(pdev);
+
+       pci_set_master(pdev);
+       pci_save_state(pdev);
+
+       err = -ENOMEM;
+       netdev = alloc_etherdev_mq(sizeof(struct igb_adapter),
+                                  IGB_ABS_MAX_TX_QUEUES);
+       if (!netdev)
+               goto err_alloc_etherdev;
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       pci_set_drvdata(pdev, netdev);
+       adapter = netdev_priv(netdev);
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+       hw = &adapter->hw;
+       hw->back = adapter;
+       adapter->msg_enable = NETIF_MSG_DRV | NETIF_MSG_PROBE;
+
+       mmio_start = pci_resource_start(pdev, 0);
+       mmio_len = pci_resource_len(pdev, 0);
+
+       err = -EIO;
+       hw->hw_addr = ioremap(mmio_start, mmio_len);
+       if (!hw->hw_addr)
+               goto err_ioremap;
+
+       netdev->netdev_ops = &igb_netdev_ops;
+       igb_set_ethtool_ops(netdev);
+       netdev->watchdog_timeo = 5 * HZ;
+
+       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+
+       netdev->mem_start = mmio_start;
+       netdev->mem_end = mmio_start + mmio_len;
+
+       /* PCI config space info */
+       hw->vendor_id = pdev->vendor;
+       hw->device_id = pdev->device;
+       hw->revision_id = pdev->revision;
+       hw->subsystem_vendor_id = pdev->subsystem_vendor;
+       hw->subsystem_device_id = pdev->subsystem_device;
+
+       /* Copy the default MAC, PHY and NVM function pointers */
+       memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
+       memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
+       memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
+       /* Initialize skew-specific constants */
+       err = ei->get_invariants(hw);
+       if (err)
+               goto err_sw_init;
+
+       /* setup the private structure */
+       err = igb_sw_init(adapter);
+       if (err)
+               goto err_sw_init;
+
+       igb_get_bus_info_pcie(hw);
+
+       hw->phy.autoneg_wait_to_complete = false;
+
+       /* Copper options */
+       if (hw->phy.media_type == e1000_media_type_copper) {
+               hw->phy.mdix = AUTO_ALL_MODES;
+               hw->phy.disable_polarity_correction = false;
+               hw->phy.ms_type = e1000_ms_hw_default;
+       }
+
+       if (igb_check_reset_block(hw))
+               dev_info(&pdev->dev,
+                       "PHY reset is blocked due to SOL/IDER session.\n");
+
+       netdev->hw_features = NETIF_F_SG |
+                          NETIF_F_IP_CSUM |
+                          NETIF_F_IPV6_CSUM |
+                          NETIF_F_TSO |
+                          NETIF_F_TSO6 |
+                          NETIF_F_RXCSUM |
+                          NETIF_F_HW_VLAN_RX;
+
+       netdev->features = netdev->hw_features |
+                          NETIF_F_HW_VLAN_TX |
+                          NETIF_F_HW_VLAN_FILTER;
+
+       netdev->vlan_features |= NETIF_F_TSO;
+       netdev->vlan_features |= NETIF_F_TSO6;
+       netdev->vlan_features |= NETIF_F_IP_CSUM;
+       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
+       netdev->vlan_features |= NETIF_F_SG;
+
+       if (pci_using_dac) {
+               netdev->features |= NETIF_F_HIGHDMA;
+               netdev->vlan_features |= NETIF_F_HIGHDMA;
+       }
+
+       if (hw->mac.type >= e1000_82576) {
+               netdev->hw_features |= NETIF_F_SCTP_CSUM;
+               netdev->features |= NETIF_F_SCTP_CSUM;
+       }
+
+       adapter->en_mng_pt = igb_enable_mng_pass_thru(hw);
+
+       /* before reading the NVM, reset the controller to put the device in a
+        * known good starting state */
+       hw->mac.ops.reset_hw(hw);
+
+       /* make sure the NVM is good */
+       if (hw->nvm.ops.validate(hw) < 0) {
+               dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
+               err = -EIO;
+               goto err_eeprom;
+       }
+
+       /* copy the MAC address out of the NVM */
+       if (hw->mac.ops.read_mac_addr(hw))
+               dev_err(&pdev->dev, "NVM Read Error\n");
+
+       memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);
+       memcpy(netdev->perm_addr, hw->mac.addr, netdev->addr_len);
+
+       if (!is_valid_ether_addr(netdev->perm_addr)) {
+               dev_err(&pdev->dev, "Invalid MAC Address\n");
+               err = -EIO;
+               goto err_eeprom;
+       }
+
+       setup_timer(&adapter->watchdog_timer, igb_watchdog,
+                   (unsigned long) adapter);
+       setup_timer(&adapter->phy_info_timer, igb_update_phy_info,
+                   (unsigned long) adapter);
+
+       INIT_WORK(&adapter->reset_task, igb_reset_task);
+       INIT_WORK(&adapter->watchdog_task, igb_watchdog_task);
+
+       /* Initialize link properties that are user-changeable */
+       adapter->fc_autoneg = true;
+       hw->mac.autoneg = true;
+       hw->phy.autoneg_advertised = 0x2f;
+
+       hw->fc.requested_mode = e1000_fc_default;
+       hw->fc.current_mode = e1000_fc_default;
+
+       igb_validate_mdi_setting(hw);
+
+       /* Initial Wake on LAN setting If APM wake is enabled in the EEPROM,
+        * enable the ACPI Magic Packet filter
+        */
+
+       if (hw->bus.func == 0)
+               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
+       else if (hw->mac.type >= e1000_82580)
+               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
+                                NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
+                                &eeprom_data);
+       else if (hw->bus.func == 1)
+               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
+
+       if (eeprom_data & eeprom_apme_mask)
+               adapter->eeprom_wol |= E1000_WUFC_MAG;
+
+       /* now that we have the eeprom settings, apply the special cases where
+        * the eeprom may be wrong or the board simply won't support wake on
+        * lan on a particular port */
+       switch (pdev->device) {
+       case E1000_DEV_ID_82575GB_QUAD_COPPER:
+               adapter->eeprom_wol = 0;
+               break;
+       case E1000_DEV_ID_82575EB_FIBER_SERDES:
+       case E1000_DEV_ID_82576_FIBER:
+       case E1000_DEV_ID_82576_SERDES:
+               /* Wake events only supported on port A for dual fiber
+                * regardless of eeprom setting */
+               if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1)
+                       adapter->eeprom_wol = 0;
+               break;
+       case E1000_DEV_ID_82576_QUAD_COPPER:
+       case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
+               /* if quad port adapter, disable WoL on all but port A */
+               if (global_quad_port_a != 0)
+                       adapter->eeprom_wol = 0;
+               else
+                       adapter->flags |= IGB_FLAG_QUAD_PORT_A;
+               /* Reset for multiple quad port adapters */
+               if (++global_quad_port_a == 4)
+                       global_quad_port_a = 0;
+               break;
+       }
+
+       /* initialize the wol settings based on the eeprom settings */
+       adapter->wol = adapter->eeprom_wol;
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       /* 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);
+
+       strcpy(netdev->name, "eth%d");
+       err = register_netdev(netdev);
+       if (err)
+               goto err_register;
+
+       igb_vlan_mode(netdev, netdev->features);
+
+       /* carrier off reporting is important to ethtool even BEFORE open */
+       netif_carrier_off(netdev);
+
+#ifdef CONFIG_IGB_DCA
+       if (dca_add_requester(&pdev->dev) == 0) {
+               adapter->flags |= IGB_FLAG_DCA_ENABLED;
+               dev_info(&pdev->dev, "DCA enabled\n");
+               igb_setup_dca(adapter);
+       }
+
+#endif
+       /* do hw tstamp init after resetting */
+       igb_init_hw_timer(adapter);
+
+       dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
+       /* print bus type/speed/width info */
+       dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
+                netdev->name,
+                ((hw->bus.speed == e1000_bus_speed_2500) ? "2.5Gb/s" :
+                 (hw->bus.speed == e1000_bus_speed_5000) ? "5.0Gb/s" :
+                                                           "unknown"),
+                ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
+                 (hw->bus.width == e1000_bus_width_pcie_x2) ? "Width x2" :
+                 (hw->bus.width == e1000_bus_width_pcie_x1) ? "Width x1" :
+                  "unknown"),
+                netdev->dev_addr);
+
+       ret_val = igb_read_part_string(hw, part_str, E1000_PBANUM_LENGTH);
+       if (ret_val)
+               strcpy(part_str, "Unknown");
+       dev_info(&pdev->dev, "%s: PBA No: %s\n", netdev->name, part_str);
+       dev_info(&pdev->dev,
+               "Using %s interrupts. %d rx queue(s), %d tx queue(s)\n",
+               adapter->msix_entries ? "MSI-X" :
+               (adapter->flags & IGB_FLAG_HAS_MSI) ? "MSI" : "legacy",
+               adapter->num_rx_queues, adapter->num_tx_queues);
+       switch (hw->mac.type) {
+       case e1000_i350:
+               igb_set_eee_i350(hw);
+               break;
+       default:
+               break;
+       }
+       return 0;
+
+err_register:
+       igb_release_hw_control(adapter);
+err_eeprom:
+       if (!igb_check_reset_block(hw))
+               igb_reset_phy(hw);
+
+       if (hw->flash_address)
+               iounmap(hw->flash_address);
+err_sw_init:
+       igb_clear_interrupt_scheme(adapter);
+       iounmap(hw->hw_addr);
+err_ioremap:
+       free_netdev(netdev);
+err_alloc_etherdev:
+       pci_release_selected_regions(pdev,
+                                    pci_select_bars(pdev, IORESOURCE_MEM));
+err_pci_reg:
+err_dma:
+       pci_disable_device(pdev);
+       return err;
+}
+
+/**
+ * igb_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * igb_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+static void __devexit igb_remove(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       /*
+        * The watchdog timer may be rescheduled, so explicitly
+        * disable watchdog from being rescheduled.
+        */
+       set_bit(__IGB_DOWN, &adapter->state);
+       del_timer_sync(&adapter->watchdog_timer);
+       del_timer_sync(&adapter->phy_info_timer);
+
+       cancel_work_sync(&adapter->reset_task);
+       cancel_work_sync(&adapter->watchdog_task);
+
+#ifdef CONFIG_IGB_DCA
+       if (adapter->flags & IGB_FLAG_DCA_ENABLED) {
+               dev_info(&pdev->dev, "DCA disabled\n");
+               dca_remove_requester(&pdev->dev);
+               adapter->flags &= ~IGB_FLAG_DCA_ENABLED;
+               wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_DISABLE);
+       }
+#endif
+
+       /* Release control of h/w to f/w.  If f/w is AMT enabled, this
+        * would have already happened in close and is redundant. */
+       igb_release_hw_control(adapter);
+
+       unregister_netdev(netdev);
+
+       igb_clear_interrupt_scheme(adapter);
+
+#ifdef CONFIG_PCI_IOV
+       /* reclaim resources allocated to VFs */
+       if (adapter->vf_data) {
+               /* disable iov and allow time for transactions to clear */
+               pci_disable_sriov(pdev);
+               msleep(500);
+
+               kfree(adapter->vf_data);
+               adapter->vf_data = NULL;
+               wr32(E1000_IOVCTL, E1000_IOVCTL_REUSE_VFQ);
+               wrfl();
+               msleep(100);
+               dev_info(&pdev->dev, "IOV Disabled\n");
+       }
+#endif
+
+       iounmap(hw->hw_addr);
+       if (hw->flash_address)
+               iounmap(hw->flash_address);
+       pci_release_selected_regions(pdev,
+                                    pci_select_bars(pdev, IORESOURCE_MEM));
+
+       free_netdev(netdev);
+
+       pci_disable_pcie_error_reporting(pdev);
+
+       pci_disable_device(pdev);
+}
+
+/**
+ * igb_probe_vfs - Initialize vf data storage and add VFs to pci config space
+ * @adapter: board private structure to initialize
+ *
+ * This function initializes the vf specific data storage and then attempts to
+ * allocate the VFs.  The reason for ordering it this way is because it is much
+ * mor expensive time wise to disable SR-IOV than it is to allocate and free
+ * the memory for the VFs.
+ **/
+static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
+{
+#ifdef CONFIG_PCI_IOV
+       struct pci_dev *pdev = adapter->pdev;
+
+       if (adapter->vfs_allocated_count) {
+               adapter->vf_data = kcalloc(adapter->vfs_allocated_count,
+                                          sizeof(struct vf_data_storage),
+                                          GFP_KERNEL);
+               /* if allocation failed then we do not support SR-IOV */
+               if (!adapter->vf_data) {
+                       adapter->vfs_allocated_count = 0;
+                       dev_err(&pdev->dev, "Unable to allocate memory for VF "
+                               "Data Storage\n");
+               }
+       }
+
+       if (pci_enable_sriov(pdev, adapter->vfs_allocated_count)) {
+               kfree(adapter->vf_data);
+               adapter->vf_data = NULL;
+#endif /* CONFIG_PCI_IOV */
+               adapter->vfs_allocated_count = 0;
+#ifdef CONFIG_PCI_IOV
+       } else {
+               unsigned char mac_addr[ETH_ALEN];
+               int i;
+               dev_info(&pdev->dev, "%d vfs allocated\n",
+                        adapter->vfs_allocated_count);
+               for (i = 0; i < adapter->vfs_allocated_count; i++) {
+                       random_ether_addr(mac_addr);
+                       igb_set_vf_mac(adapter, i, mac_addr);
+               }
+               /* DMA Coalescing is not supported in IOV mode. */
+               if (adapter->flags & IGB_FLAG_DMAC)
+                       adapter->flags &= ~IGB_FLAG_DMAC;
+       }
+#endif /* CONFIG_PCI_IOV */
+}
+
+
+/**
+ * igb_init_hw_timer - Initialize hardware timer used with IEEE 1588 timestamp
+ * @adapter: board private structure to initialize
+ *
+ * igb_init_hw_timer initializes the function pointer and values for the hw
+ * timer found in hardware.
+ **/
+static void igb_init_hw_timer(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       switch (hw->mac.type) {
+       case e1000_i350:
+       case e1000_82580:
+               memset(&adapter->cycles, 0, sizeof(adapter->cycles));
+               adapter->cycles.read = igb_read_clock;
+               adapter->cycles.mask = CLOCKSOURCE_MASK(64);
+               adapter->cycles.mult = 1;
+               /*
+                * The 82580 timesync updates the system timer every 8ns by 8ns
+                * and the value cannot be shifted.  Instead we need to shift
+                * the registers to generate a 64bit timer value.  As a result
+                * SYSTIMR/L/H, TXSTMPL/H, RXSTMPL/H all have to be shifted by
+                * 24 in order to generate a larger value for synchronization.
+                */
+               adapter->cycles.shift = IGB_82580_TSYNC_SHIFT;
+               /* disable system timer temporarily by setting bit 31 */
+               wr32(E1000_TSAUXC, 0x80000000);
+               wrfl();
+
+               /* Set registers so that rollover occurs soon to test this. */
+               wr32(E1000_SYSTIMR, 0x00000000);
+               wr32(E1000_SYSTIML, 0x80000000);
+               wr32(E1000_SYSTIMH, 0x000000FF);
+               wrfl();
+
+               /* enable system timer by clearing bit 31 */
+               wr32(E1000_TSAUXC, 0x0);
+               wrfl();
+
+               timecounter_init(&adapter->clock,
+                                &adapter->cycles,
+                                ktime_to_ns(ktime_get_real()));
+               /*
+                * Synchronize our NIC clock against system wall clock. NIC
+                * time stamp reading requires ~3us per sample, each sample
+                * was pretty stable even under load => only require 10
+                * samples for each offset comparison.
+                */
+               memset(&adapter->compare, 0, sizeof(adapter->compare));
+               adapter->compare.source = &adapter->clock;
+               adapter->compare.target = ktime_get_real;
+               adapter->compare.num_samples = 10;
+               timecompare_update(&adapter->compare, 0);
+               break;
+       case e1000_82576:
+               /*
+                * Initialize hardware timer: we keep it running just in case
+                * that some program needs it later on.
+                */
+               memset(&adapter->cycles, 0, sizeof(adapter->cycles));
+               adapter->cycles.read = igb_read_clock;
+               adapter->cycles.mask = CLOCKSOURCE_MASK(64);
+               adapter->cycles.mult = 1;
+               /**
+                * Scale the NIC clock cycle by a large factor so that
+                * relatively small clock corrections can be added or
+                * subtracted at each clock tick. The drawbacks of a large
+                * factor are a) that the clock register overflows more quickly
+                * (not such a big deal) and b) that the increment per tick has
+                * to fit into 24 bits.  As a result we need to use a shift of
+                * 19 so we can fit a value of 16 into the TIMINCA register.
+                */
+               adapter->cycles.shift = IGB_82576_TSYNC_SHIFT;
+               wr32(E1000_TIMINCA,
+                               (1 << E1000_TIMINCA_16NS_SHIFT) |
+                               (16 << IGB_82576_TSYNC_SHIFT));
+
+               /* Set registers so that rollover occurs soon to test this. */
+               wr32(E1000_SYSTIML, 0x00000000);
+               wr32(E1000_SYSTIMH, 0xFF800000);
+               wrfl();
+
+               timecounter_init(&adapter->clock,
+                                &adapter->cycles,
+                                ktime_to_ns(ktime_get_real()));
+               /*
+                * Synchronize our NIC clock against system wall clock. NIC
+                * time stamp reading requires ~3us per sample, each sample
+                * was pretty stable even under load => only require 10
+                * samples for each offset comparison.
+                */
+               memset(&adapter->compare, 0, sizeof(adapter->compare));
+               adapter->compare.source = &adapter->clock;
+               adapter->compare.target = ktime_get_real;
+               adapter->compare.num_samples = 10;
+               timecompare_update(&adapter->compare, 0);
+               break;
+       case e1000_82575:
+               /* 82575 does not support timesync */
+       default:
+               break;
+       }
+
+}
+
+/**
+ * igb_sw_init - Initialize general software structures (struct igb_adapter)
+ * @adapter: board private structure to initialize
+ *
+ * igb_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 __devinit igb_sw_init(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+
+       pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);
+
+       adapter->tx_ring_count = IGB_DEFAULT_TXD;
+       adapter->rx_ring_count = IGB_DEFAULT_RXD;
+       adapter->rx_itr_setting = IGB_DEFAULT_ITR;
+       adapter->tx_itr_setting = IGB_DEFAULT_ITR;
+
+       adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
+
+       spin_lock_init(&adapter->stats64_lock);
+#ifdef CONFIG_PCI_IOV
+       switch (hw->mac.type) {
+       case e1000_82576:
+       case e1000_i350:
+               if (max_vfs > 7) {
+                       dev_warn(&pdev->dev,
+                                "Maximum of 7 VFs per PF, using max\n");
+                       adapter->vfs_allocated_count = 7;
+               } else
+                       adapter->vfs_allocated_count = max_vfs;
+               break;
+       default:
+               break;
+       }
+#endif /* CONFIG_PCI_IOV */
+       adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
+       /* i350 cannot do RSS and SR-IOV at the same time */
+       if (hw->mac.type == e1000_i350 && adapter->vfs_allocated_count)
+               adapter->rss_queues = 1;
+
+       /*
+        * if rss_queues > 4 or vfs are going to be allocated with rss_queues
+        * then we should combine the queues into a queue pair in order to
+        * conserve interrupts due to limited supply
+        */
+       if ((adapter->rss_queues > 4) ||
+           ((adapter->rss_queues > 1) && (adapter->vfs_allocated_count > 6)))
+               adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
+
+       /* This call may decrease the number of queues */
+       if (igb_init_interrupt_scheme(adapter)) {
+               dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
+               return -ENOMEM;
+       }
+
+       igb_probe_vfs(adapter);
+
+       /* Explicitly disable IRQ since the NIC can be in any state. */
+       igb_irq_disable(adapter);
+
+       if (hw->mac.type == e1000_i350)
+               adapter->flags &= ~IGB_FLAG_DMAC;
+
+       set_bit(__IGB_DOWN, &adapter->state);
+       return 0;
+}
+
+/**
+ * igb_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+static int igb_open(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int err;
+       int i;
+
+       /* disallow open during test */
+       if (test_bit(__IGB_TESTING, &adapter->state))
+               return -EBUSY;
+
+       netif_carrier_off(netdev);
+
+       /* allocate transmit descriptors */
+       err = igb_setup_all_tx_resources(adapter);
+       if (err)
+               goto err_setup_tx;
+
+       /* allocate receive descriptors */
+       err = igb_setup_all_rx_resources(adapter);
+       if (err)
+               goto err_setup_rx;
+
+       igb_power_up_link(adapter);
+
+       /* before we allocate an interrupt, we must be ready to handle it.
+        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
+        * as soon as we call pci_request_irq, so we have to setup our
+        * clean_rx handler before we do so.  */
+       igb_configure(adapter);
+
+       err = igb_request_irq(adapter);
+       if (err)
+               goto err_req_irq;
+
+       /* From here on the code is the same as igb_up() */
+       clear_bit(__IGB_DOWN, &adapter->state);
+
+       for (i = 0; i < adapter->num_q_vectors; i++) {
+               struct igb_q_vector *q_vector = adapter->q_vector[i];
+               napi_enable(&q_vector->napi);
+       }
+
+       /* Clear any pending interrupts. */
+       rd32(E1000_ICR);
+
+       igb_irq_enable(adapter);
+
+       /* notify VFs that reset has been completed */
+       if (adapter->vfs_allocated_count) {
+               u32 reg_data = rd32(E1000_CTRL_EXT);
+               reg_data |= E1000_CTRL_EXT_PFRSTD;
+               wr32(E1000_CTRL_EXT, reg_data);
+       }
+
+       netif_tx_start_all_queues(netdev);
+
+       /* start the watchdog. */
+       hw->mac.get_link_status = 1;
+       schedule_work(&adapter->watchdog_task);
+
+       return 0;
+
+err_req_irq:
+       igb_release_hw_control(adapter);
+       igb_power_down_link(adapter);
+       igb_free_all_rx_resources(adapter);
+err_setup_rx:
+       igb_free_all_tx_resources(adapter);
+err_setup_tx:
+       igb_reset(adapter);
+
+       return err;
+}
+
+/**
+ * igb_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the driver's control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+static int igb_close(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       WARN_ON(test_bit(__IGB_RESETTING, &adapter->state));
+       igb_down(adapter);
+
+       igb_free_irq(adapter);
+
+       igb_free_all_tx_resources(adapter);
+       igb_free_all_rx_resources(adapter);
+
+       return 0;
+}
+
+/**
+ * igb_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @tx_ring: tx descriptor ring (for a specific queue) to setup
+ *
+ * Return 0 on success, negative on failure
+ **/
+int igb_setup_tx_resources(struct igb_ring *tx_ring)
+{
+       struct device *dev = tx_ring->dev;
+       int size;
+
+       size = sizeof(struct igb_buffer) * tx_ring->count;
+       tx_ring->buffer_info = vzalloc(size);
+       if (!tx_ring->buffer_info)
+               goto err;
+
+       /* round up to nearest 4K */
+       tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc);
+       tx_ring->size = ALIGN(tx_ring->size, 4096);
+
+       tx_ring->desc = dma_alloc_coherent(dev,
+                                          tx_ring->size,
+                                          &tx_ring->dma,
+                                          GFP_KERNEL);
+
+       if (!tx_ring->desc)
+               goto err;
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+       return 0;
+
+err:
+       vfree(tx_ring->buffer_info);
+       dev_err(dev,
+               "Unable to allocate memory for the transmit descriptor ring\n");
+       return -ENOMEM;
+}
+
+/**
+ * igb_setup_all_tx_resources - wrapper to allocate Tx resources
+ *                               (Descriptors) for all queues
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+static int igb_setup_all_tx_resources(struct igb_adapter *adapter)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               err = igb_setup_tx_resources(adapter->tx_ring[i]);
+               if (err) {
+                       dev_err(&pdev->dev,
+                               "Allocation for Tx Queue %u failed\n", i);
+                       for (i--; i >= 0; i--)
+                               igb_free_tx_resources(adapter->tx_ring[i]);
+                       break;
+               }
+       }
+
+       for (i = 0; i < IGB_ABS_MAX_TX_QUEUES; i++) {
+               int r_idx = i % adapter->num_tx_queues;
+               adapter->multi_tx_table[i] = adapter->tx_ring[r_idx];
+       }
+       return err;
+}
+
+/**
+ * igb_setup_tctl - configure the transmit control registers
+ * @adapter: Board private structure
+ **/
+void igb_setup_tctl(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 tctl;
+
+       /* disable queue 0 which is enabled by default on 82575 and 82576 */
+       wr32(E1000_TXDCTL(0), 0);
+
+       /* Program the Transmit Control Register */
+       tctl = rd32(E1000_TCTL);
+       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;
+
+       wr32(E1000_TCTL, tctl);
+}
+
+/**
+ * igb_configure_tx_ring - Configure transmit ring after Reset
+ * @adapter: board private structure
+ * @ring: tx ring to configure
+ *
+ * Configure a transmit ring after a reset.
+ **/
+void igb_configure_tx_ring(struct igb_adapter *adapter,
+                           struct igb_ring *ring)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 txdctl;
+       u64 tdba = ring->dma;
+       int reg_idx = ring->reg_idx;
+
+       /* disable the queue */
+       txdctl = rd32(E1000_TXDCTL(reg_idx));
+       wr32(E1000_TXDCTL(reg_idx),
+                       txdctl & ~E1000_TXDCTL_QUEUE_ENABLE);
+       wrfl();
+       mdelay(10);
+
+       wr32(E1000_TDLEN(reg_idx),
+                       ring->count * sizeof(union e1000_adv_tx_desc));
+       wr32(E1000_TDBAL(reg_idx),
+                       tdba & 0x00000000ffffffffULL);
+       wr32(E1000_TDBAH(reg_idx), tdba >> 32);
+
+       ring->head = hw->hw_addr + E1000_TDH(reg_idx);
+       ring->tail = hw->hw_addr + E1000_TDT(reg_idx);
+       writel(0, ring->head);
+       writel(0, ring->tail);
+
+       txdctl |= IGB_TX_PTHRESH;
+       txdctl |= IGB_TX_HTHRESH << 8;
+       txdctl |= IGB_TX_WTHRESH << 16;
+
+       txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
+       wr32(E1000_TXDCTL(reg_idx), txdctl);
+}
+
+/**
+ * igb_configure_tx - Configure 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)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               igb_configure_tx_ring(adapter, adapter->tx_ring[i]);
+}
+
+/**
+ * igb_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @rx_ring:    rx descriptor ring (for a specific queue) to setup
+ *
+ * Returns 0 on success, negative on failure
+ **/
+int igb_setup_rx_resources(struct igb_ring *rx_ring)
+{
+       struct device *dev = rx_ring->dev;
+       int size, desc_len;
+
+       size = sizeof(struct igb_buffer) * rx_ring->count;
+       rx_ring->buffer_info = vzalloc(size);
+       if (!rx_ring->buffer_info)
+               goto err;
+
+       desc_len = sizeof(union e1000_adv_rx_desc);
+
+       /* Round up to nearest 4K */
+       rx_ring->size = rx_ring->count * desc_len;
+       rx_ring->size = ALIGN(rx_ring->size, 4096);
+
+       rx_ring->desc = dma_alloc_coherent(dev,
+                                          rx_ring->size,
+                                          &rx_ring->dma,
+                                          GFP_KERNEL);
+
+       if (!rx_ring->desc)
+               goto err;
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       return 0;
+
+err:
+       vfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+       dev_err(dev, "Unable to allocate memory for the receive descriptor"
+               " ring\n");
+       return -ENOMEM;
+}
+
+/**
+ * igb_setup_all_rx_resources - wrapper to allocate Rx resources
+ *                               (Descriptors) for all queues
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+static int igb_setup_all_rx_resources(struct igb_adapter *adapter)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               err = igb_setup_rx_resources(adapter->rx_ring[i]);
+               if (err) {
+                       dev_err(&pdev->dev,
+                               "Allocation for Rx Queue %u failed\n", i);
+                       for (i--; i >= 0; i--)
+                               igb_free_rx_resources(adapter->rx_ring[i]);
+                       break;
+               }
+       }
+
+       return err;
+}
+
+/**
+ * igb_setup_mrqc - configure the multiple receive queue control registers
+ * @adapter: Board private structure
+ **/
+static void igb_setup_mrqc(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 mrqc, rxcsum;
+       u32 j, num_rx_queues, shift = 0, shift2 = 0;
+       union e1000_reta {
+               u32 dword;
+               u8  bytes[4];
+       } reta;
+       static const u8 rsshash[40] = {
+               0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, 0x41, 0x67,
+               0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, 0xd0, 0xca, 0x2b, 0xcb,
+               0xae, 0x7b, 0x30, 0xb4, 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30,
+               0xf2, 0x0c, 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa };
+
+       /* Fill out hash function seeds */
+       for (j = 0; j < 10; j++) {
+               u32 rsskey = rsshash[(j * 4)];
+               rsskey |= rsshash[(j * 4) + 1] << 8;
+               rsskey |= rsshash[(j * 4) + 2] << 16;
+               rsskey |= rsshash[(j * 4) + 3] << 24;
+               array_wr32(E1000_RSSRK(0), j, rsskey);
+       }
+
+       num_rx_queues = adapter->rss_queues;
+
+       if (adapter->vfs_allocated_count) {
+               /* 82575 and 82576 supports 2 RSS queues for VMDq */
+               switch (hw->mac.type) {
+               case e1000_i350:
+               case e1000_82580:
+                       num_rx_queues = 1;
+                       shift = 0;
+                       break;
+               case e1000_82576:
+                       shift = 3;
+                       num_rx_queues = 2;
+                       break;
+               case e1000_82575:
+                       shift = 2;
+                       shift2 = 6;
+               default:
+                       break;
+               }
+       } else {
+               if (hw->mac.type == e1000_82575)
+                       shift = 6;
+       }
+
+       for (j = 0; j < (32 * 4); j++) {
+               reta.bytes[j & 3] = (j % num_rx_queues) << shift;
+               if (shift2)
+                       reta.bytes[j & 3] |= num_rx_queues << shift2;
+               if ((j & 3) == 3)
+                       wr32(E1000_RETA(j >> 2), reta.dword);
+       }
+
+       /*
+        * Disable raw packet checksumming so that RSS hash is placed in
+        * descriptor on writeback.  No need to enable TCP/UDP/IP checksum
+        * offloads as they are enabled by default
+        */
+       rxcsum = rd32(E1000_RXCSUM);
+       rxcsum |= E1000_RXCSUM_PCSD;
+
+       if (adapter->hw.mac.type >= e1000_82576)
+               /* Enable Receive Checksum Offload for SCTP */
+               rxcsum |= E1000_RXCSUM_CRCOFL;
+
+       /* Don't need to set TUOFL or IPOFL, they default to 1 */
+       wr32(E1000_RXCSUM, rxcsum);
+
+       /* If VMDq is enabled then we set the appropriate mode for that, else
+        * we default to RSS so that an RSS hash is calculated per packet even
+        * if we are only using one queue */
+       if (adapter->vfs_allocated_count) {
+               if (hw->mac.type > e1000_82575) {
+                       /* Set the default pool for the PF's first queue */
+                       u32 vtctl = rd32(E1000_VT_CTL);
+                       vtctl &= ~(E1000_VT_CTL_DEFAULT_POOL_MASK |
+                                  E1000_VT_CTL_DISABLE_DEF_POOL);
+                       vtctl |= adapter->vfs_allocated_count <<
+                               E1000_VT_CTL_DEFAULT_POOL_SHIFT;
+                       wr32(E1000_VT_CTL, vtctl);
+               }
+               if (adapter->rss_queues > 1)
+                       mrqc = E1000_MRQC_ENABLE_VMDQ_RSS_2Q;
+               else
+                       mrqc = E1000_MRQC_ENABLE_VMDQ;
+       } else {
+               mrqc = E1000_MRQC_ENABLE_RSS_4Q;
+       }
+       igb_vmm_control(adapter);
+
+       /*
+        * Generate RSS hash based on TCP port numbers and/or
+        * IPv4/v6 src and dst addresses since UDP cannot be
+        * hashed reliably due to IP fragmentation
+        */
+       mrqc |= E1000_MRQC_RSS_FIELD_IPV4 |
+               E1000_MRQC_RSS_FIELD_IPV4_TCP |
+               E1000_MRQC_RSS_FIELD_IPV6 |
+               E1000_MRQC_RSS_FIELD_IPV6_TCP |
+               E1000_MRQC_RSS_FIELD_IPV6_TCP_EX;
+
+       wr32(E1000_MRQC, mrqc);
+}
+
+/**
+ * igb_setup_rctl - configure the receive control registers
+ * @adapter: Board private structure
+ **/
+void igb_setup_rctl(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rctl;
+
+       rctl = rd32(E1000_RCTL);
+
+       rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
+       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
+
+       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_RDMTS_HALF |
+               (hw->mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
+
+       /*
+        * enable stripping of CRC. It's unlikely this will break BMC
+        * redirection as it did with e1000. Newer features require
+        * that the HW strips the CRC.
+        */
+       rctl |= E1000_RCTL_SECRC;
+
+       /* disable store bad packets and clear size bits. */
+       rctl &= ~(E1000_RCTL_SBP | E1000_RCTL_SZ_256);
+
+       /* enable LPE to prevent packets larger than max_frame_size */
+       rctl |= E1000_RCTL_LPE;
+
+       /* disable queue 0 to prevent tail write w/o re-config */
+       wr32(E1000_RXDCTL(0), 0);
+
+       /* Attention!!!  For SR-IOV PF driver operations you must enable
+        * queue drop for all VF and PF queues to prevent head of line blocking
+        * if an un-trusted VF does not provide descriptors to hardware.
+        */
+       if (adapter->vfs_allocated_count) {
+               /* set all queue drop enable bits */
+               wr32(E1000_QDE, ALL_QUEUES);
+       }
+
+       wr32(E1000_RCTL, rctl);
+}
+
+static inline int igb_set_vf_rlpml(struct igb_adapter *adapter, int size,
+                                   int vfn)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vmolr;
+
+       /* if it isn't the PF check to see if VFs are enabled and
+        * increase the size to support vlan tags */
+       if (vfn < adapter->vfs_allocated_count &&
+           adapter->vf_data[vfn].vlans_enabled)
+               size += VLAN_TAG_SIZE;
+
+       vmolr = rd32(E1000_VMOLR(vfn));
+       vmolr &= ~E1000_VMOLR_RLPML_MASK;
+       vmolr |= size | E1000_VMOLR_LPE;
+       wr32(E1000_VMOLR(vfn), vmolr);
+
+       return 0;
+}
+
+/**
+ * igb_rlpml_set - set maximum receive packet size
+ * @adapter: board private structure
+ *
+ * Configure maximum receivable packet size.
+ **/
+static void igb_rlpml_set(struct igb_adapter *adapter)
+{
+       u32 max_frame_size;
+       struct e1000_hw *hw = &adapter->hw;
+       u16 pf_id = adapter->vfs_allocated_count;
+
+       max_frame_size = adapter->max_frame_size + VLAN_TAG_SIZE;
+
+       /* if vfs are enabled we set RLPML to the largest possible request
+        * size and set the VMOLR RLPML to the size we need */
+       if (pf_id) {
+               igb_set_vf_rlpml(adapter, max_frame_size, pf_id);
+               max_frame_size = MAX_JUMBO_FRAME_SIZE;
+       }
+
+       wr32(E1000_RLPML, max_frame_size);
+}
+
+static inline void igb_set_vmolr(struct igb_adapter *adapter,
+                                int vfn, bool aupe)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vmolr;
+
+       /*
+        * This register exists only on 82576 and newer so if we are older then
+        * we should exit and do nothing
+        */
+       if (hw->mac.type < e1000_82576)
+               return;
+
+       vmolr = rd32(E1000_VMOLR(vfn));
+       vmolr |= E1000_VMOLR_STRVLAN;      /* Strip vlan tags */
+       if (aupe)
+               vmolr |= E1000_VMOLR_AUPE;        /* Accept untagged packets */
+       else
+               vmolr &= ~(E1000_VMOLR_AUPE); /* Tagged packets ONLY */
+
+       /* clear all bits that might not be set */
+       vmolr &= ~(E1000_VMOLR_BAM | E1000_VMOLR_RSSE);
+
+       if (adapter->rss_queues > 1 && vfn == adapter->vfs_allocated_count)
+               vmolr |= E1000_VMOLR_RSSE; /* enable RSS */
+       /*
+        * for VMDq only allow the VFs and pool 0 to accept broadcast and
+        * multicast packets
+        */
+       if (vfn <= adapter->vfs_allocated_count)
+               vmolr |= E1000_VMOLR_BAM;          /* Accept broadcast */
+
+       wr32(E1000_VMOLR(vfn), vmolr);
+}
+
+/**
+ * igb_configure_rx_ring - Configure a receive ring after Reset
+ * @adapter: board private structure
+ * @ring: receive ring to be configured
+ *
+ * Configure the Rx unit of the MAC after a reset.
+ **/
+void igb_configure_rx_ring(struct igb_adapter *adapter,
+                           struct igb_ring *ring)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u64 rdba = ring->dma;
+       int reg_idx = ring->reg_idx;
+       u32 srrctl, rxdctl;
+
+       /* disable the queue */
+       rxdctl = rd32(E1000_RXDCTL(reg_idx));
+       wr32(E1000_RXDCTL(reg_idx),
+                       rxdctl & ~E1000_RXDCTL_QUEUE_ENABLE);
+
+       /* Set DMA base address registers */
+       wr32(E1000_RDBAL(reg_idx),
+            rdba & 0x00000000ffffffffULL);
+       wr32(E1000_RDBAH(reg_idx), rdba >> 32);
+       wr32(E1000_RDLEN(reg_idx),
+                      ring->count * sizeof(union e1000_adv_rx_desc));
+
+       /* initialize head and tail */
+       ring->head = hw->hw_addr + E1000_RDH(reg_idx);
+       ring->tail = hw->hw_addr + E1000_RDT(reg_idx);
+       writel(0, ring->head);
+       writel(0, ring->tail);
+
+       /* set descriptor configuration */
+       if (ring->rx_buffer_len < IGB_RXBUFFER_1024) {
+               srrctl = ALIGN(ring->rx_buffer_len, 64) <<
+                        E1000_SRRCTL_BSIZEHDRSIZE_SHIFT;
+#if (PAGE_SIZE / 2) > IGB_RXBUFFER_16384
+               srrctl |= IGB_RXBUFFER_16384 >>
+                         E1000_SRRCTL_BSIZEPKT_SHIFT;
+#else
+               srrctl |= (PAGE_SIZE / 2) >>
+                         E1000_SRRCTL_BSIZEPKT_SHIFT;
+#endif
+               srrctl |= E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
+       } else {
+               srrctl = ALIGN(ring->rx_buffer_len, 1024) >>
+                        E1000_SRRCTL_BSIZEPKT_SHIFT;
+               srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF;
+       }
+       if (hw->mac.type == e1000_82580)
+               srrctl |= E1000_SRRCTL_TIMESTAMP;
+       /* Only set Drop Enable if we are supporting multiple queues */
+       if (adapter->vfs_allocated_count || adapter->num_rx_queues > 1)
+               srrctl |= E1000_SRRCTL_DROP_EN;
+
+       wr32(E1000_SRRCTL(reg_idx), srrctl);
+
+       /* set filtering for VMDQ pools */
+       igb_set_vmolr(adapter, reg_idx & 0x7, true);
+
+       /* enable receive descriptor fetching */
+       rxdctl = rd32(E1000_RXDCTL(reg_idx));
+       rxdctl |= E1000_RXDCTL_QUEUE_ENABLE;
+       rxdctl &= 0xFFF00000;
+       rxdctl |= IGB_RX_PTHRESH;
+       rxdctl |= IGB_RX_HTHRESH << 8;
+       rxdctl |= IGB_RX_WTHRESH << 16;
+       wr32(E1000_RXDCTL(reg_idx), rxdctl);
+}
+
+/**
+ * igb_configure_rx - Configure 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)
+{
+       int i;
+
+       /* set UTA to appropriate mode */
+       igb_set_uta(adapter);
+
+       /* set the correct pool for the PF default MAC address in entry 0 */
+       igb_rar_set_qsel(adapter, adapter->hw.mac.addr, 0,
+                        adapter->vfs_allocated_count);
+
+       /* Setup the HW Rx Head and Tail Descriptor Pointers and
+        * the Base and Length of the Rx Descriptor Ring */
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               igb_configure_rx_ring(adapter, adapter->rx_ring[i]);
+}
+
+/**
+ * igb_free_tx_resources - Free Tx Resources per Queue
+ * @tx_ring: Tx descriptor ring for a specific queue
+ *
+ * Free all transmit software resources
+ **/
+void igb_free_tx_resources(struct igb_ring *tx_ring)
+{
+       igb_clean_tx_ring(tx_ring);
+
+       vfree(tx_ring->buffer_info);
+       tx_ring->buffer_info = NULL;
+
+       /* if not set, then don't free */
+       if (!tx_ring->desc)
+               return;
+
+       dma_free_coherent(tx_ring->dev, tx_ring->size,
+                         tx_ring->desc, tx_ring->dma);
+
+       tx_ring->desc = NULL;
+}
+
+/**
+ * igb_free_all_tx_resources - Free Tx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all transmit software resources
+ **/
+static void igb_free_all_tx_resources(struct igb_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               igb_free_tx_resources(adapter->tx_ring[i]);
+}
+
+void igb_unmap_and_free_tx_resource(struct igb_ring *tx_ring,
+                                   struct igb_buffer *buffer_info)
+{
+       if (buffer_info->dma) {
+               if (buffer_info->mapped_as_page)
+                       dma_unmap_page(tx_ring->dev,
+                                       buffer_info->dma,
+                                       buffer_info->length,
+                                       DMA_TO_DEVICE);
+               else
+                       dma_unmap_single(tx_ring->dev,
+                                       buffer_info->dma,
+                                       buffer_info->length,
+                                       DMA_TO_DEVICE);
+               buffer_info->dma = 0;
+       }
+       if (buffer_info->skb) {
+               dev_kfree_skb_any(buffer_info->skb);
+               buffer_info->skb = NULL;
+       }
+       buffer_info->time_stamp = 0;
+       buffer_info->length = 0;
+       buffer_info->next_to_watch = 0;
+       buffer_info->mapped_as_page = false;
+}
+
+/**
+ * igb_clean_tx_ring - Free Tx Buffers
+ * @tx_ring: ring to be cleaned
+ **/
+static void igb_clean_tx_ring(struct igb_ring *tx_ring)
+{
+       struct igb_buffer *buffer_info;
+       unsigned long size;
+       unsigned int i;
+
+       if (!tx_ring->buffer_info)
+               return;
+       /* Free all the Tx ring sk_buffs */
+
+       for (i = 0; i < tx_ring->count; i++) {
+               buffer_info = &tx_ring->buffer_info[i];
+               igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
+       }
+
+       size = sizeof(struct igb_buffer) * tx_ring->count;
+       memset(tx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(tx_ring->desc, 0, tx_ring->size);
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+}
+
+/**
+ * igb_clean_all_tx_rings - Free Tx Buffers for all queues
+ * @adapter: board private structure
+ **/
+static void igb_clean_all_tx_rings(struct igb_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               igb_clean_tx_ring(adapter->tx_ring[i]);
+}
+
+/**
+ * igb_free_rx_resources - Free Rx Resources
+ * @rx_ring: ring to clean the resources from
+ *
+ * Free all receive software resources
+ **/
+void igb_free_rx_resources(struct igb_ring *rx_ring)
+{
+       igb_clean_rx_ring(rx_ring);
+
+       vfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+
+       /* if not set, then don't free */
+       if (!rx_ring->desc)
+               return;
+
+       dma_free_coherent(rx_ring->dev, rx_ring->size,
+                         rx_ring->desc, rx_ring->dma);
+
+       rx_ring->desc = NULL;
+}
+
+/**
+ * igb_free_all_rx_resources - Free Rx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all receive software resources
+ **/
+static void igb_free_all_rx_resources(struct igb_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               igb_free_rx_resources(adapter->rx_ring[i]);
+}
+
+/**
+ * igb_clean_rx_ring - Free Rx Buffers per Queue
+ * @rx_ring: ring to free buffers from
+ **/
+static void igb_clean_rx_ring(struct igb_ring *rx_ring)
+{
+       struct igb_buffer *buffer_info;
+       unsigned long size;
+       unsigned int i;
+
+       if (!rx_ring->buffer_info)
+               return;
+
+       /* Free all the Rx ring sk_buffs */
+       for (i = 0; i < rx_ring->count; i++) {
+               buffer_info = &rx_ring->buffer_info[i];
+               if (buffer_info->dma) {
+                       dma_unmap_single(rx_ring->dev,
+                                        buffer_info->dma,
+                                        rx_ring->rx_buffer_len,
+                                        DMA_FROM_DEVICE);
+                       buffer_info->dma = 0;
+               }
+
+               if (buffer_info->skb) {
+                       dev_kfree_skb(buffer_info->skb);
+                       buffer_info->skb = NULL;
+               }
+               if (buffer_info->page_dma) {
+                       dma_unmap_page(rx_ring->dev,
+                                      buffer_info->page_dma,
+                                      PAGE_SIZE / 2,
+                                      DMA_FROM_DEVICE);
+                       buffer_info->page_dma = 0;
+               }
+               if (buffer_info->page) {
+                       put_page(buffer_info->page);
+                       buffer_info->page = NULL;
+                       buffer_info->page_offset = 0;
+               }
+       }
+
+       size = sizeof(struct igb_buffer) * rx_ring->count;
+       memset(rx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(rx_ring->desc, 0, rx_ring->size);
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+}
+
+/**
+ * igb_clean_all_rx_rings - Free Rx Buffers for all queues
+ * @adapter: board private structure
+ **/
+static void igb_clean_all_rx_rings(struct igb_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               igb_clean_rx_ring(adapter->rx_ring[i]);
+}
+
+/**
+ * igb_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int igb_set_mac(struct net_device *netdev, void *p)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
+
+       /* set the correct pool for the new PF MAC address in entry 0 */
+       igb_rar_set_qsel(adapter, hw->mac.addr, 0,
+                        adapter->vfs_allocated_count);
+
+       return 0;
+}
+
+/**
+ * igb_write_mc_addr_list - write multicast addresses to MTA
+ * @netdev: network interface device structure
+ *
+ * Writes multicast address list to the MTA hash table.
+ * Returns: -ENOMEM on failure
+ *                0 on no addresses written
+ *                X on writing X addresses to MTA
+ **/
+static int igb_write_mc_addr_list(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct netdev_hw_addr *ha;
+       u8  *mta_list;
+       int i;
+
+       if (netdev_mc_empty(netdev)) {
+               /* nothing to program, so clear mc list */
+               igb_update_mc_addr_list(hw, NULL, 0);
+               igb_restore_vf_multicasts(adapter);
+               return 0;
+       }
+
+       mta_list = kzalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
+       if (!mta_list)
+               return -ENOMEM;
+
+       /* The shared function expects a packed array of only addresses. */
+       i = 0;
+       netdev_for_each_mc_addr(ha, netdev)
+               memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
+
+       igb_update_mc_addr_list(hw, mta_list, i);
+       kfree(mta_list);
+
+       return netdev_mc_count(netdev);
+}
+
+/**
+ * igb_write_uc_addr_list - write unicast addresses to RAR table
+ * @netdev: network interface device structure
+ *
+ * Writes unicast address list to the RAR table.
+ * Returns: -ENOMEM on failure/insufficient address space
+ *                0 on no addresses written
+ *                X on writing X addresses to the RAR table
+ **/
+static int igb_write_uc_addr_list(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       unsigned int vfn = adapter->vfs_allocated_count;
+       unsigned int rar_entries = hw->mac.rar_entry_count - (vfn + 1);
+       int count = 0;
+
+       /* return ENOMEM indicating insufficient memory for addresses */
+       if (netdev_uc_count(netdev) > rar_entries)
+               return -ENOMEM;
+
+       if (!netdev_uc_empty(netdev) && rar_entries) {
+               struct netdev_hw_addr *ha;
+
+               netdev_for_each_uc_addr(ha, netdev) {
+                       if (!rar_entries)
+                               break;
+                       igb_rar_set_qsel(adapter, ha->addr,
+                                        rar_entries--,
+                                        vfn);
+                       count++;
+               }
+       }
+       /* write the addresses in reverse order to avoid write combining */
+       for (; rar_entries > 0 ; rar_entries--) {
+               wr32(E1000_RAH(rar_entries), 0);
+               wr32(E1000_RAL(rar_entries), 0);
+       }
+       wrfl();
+
+       return count;
+}
+
+/**
+ * igb_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_rx_mode entry point is called whenever the unicast or multicast
+ * address lists or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper unicast, multicast,
+ * promiscuous mode, and all-multi behavior.
+ **/
+static void igb_set_rx_mode(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       unsigned int vfn = adapter->vfs_allocated_count;
+       u32 rctl, vmolr = 0;
+       int count;
+
+       /* Check for Promiscuous and All Multicast modes */
+       rctl = rd32(E1000_RCTL);
+
+       /* clear the effected bits */
+       rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_VFE);
+
+       if (netdev->flags & IFF_PROMISC) {
+               rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
+               vmolr |= (E1000_VMOLR_ROPE | E1000_VMOLR_MPME);
+       } else {
+               if (netdev->flags & IFF_ALLMULTI) {
+                       rctl |= E1000_RCTL_MPE;
+                       vmolr |= E1000_VMOLR_MPME;
+               } else {
+                       /*
+                        * Write addresses to the MTA, if the attempt fails
+                        * then we should just turn on promiscuous mode so
+                        * that we can at least receive multicast traffic
+                        */
+                       count = igb_write_mc_addr_list(netdev);
+                       if (count < 0) {
+                               rctl |= E1000_RCTL_MPE;
+                               vmolr |= E1000_VMOLR_MPME;
+                       } else if (count) {
+                               vmolr |= E1000_VMOLR_ROMPE;
+                       }
+               }
+               /*
+                * Write addresses to available RAR registers, if there is not
+                * sufficient space to store all the addresses then enable
+                * unicast promiscuous mode
+                */
+               count = igb_write_uc_addr_list(netdev);
+               if (count < 0) {
+                       rctl |= E1000_RCTL_UPE;
+                       vmolr |= E1000_VMOLR_ROPE;
+               }
+               rctl |= E1000_RCTL_VFE;
+       }
+       wr32(E1000_RCTL, rctl);
+
+       /*
+        * In order to support SR-IOV and eventually VMDq it is necessary to set
+        * the VMOLR to enable the appropriate modes.  Without this workaround
+        * we will have issues with VLAN tag stripping not being done for frames
+        * that are only arriving because we are the default pool
+        */
+       if (hw->mac.type < e1000_82576)
+               return;
+
+       vmolr |= rd32(E1000_VMOLR(vfn)) &
+                ~(E1000_VMOLR_ROPE | E1000_VMOLR_MPME | E1000_VMOLR_ROMPE);
+       wr32(E1000_VMOLR(vfn), vmolr);
+       igb_restore_vf_multicasts(adapter);
+}
+
+static void igb_check_wvbr(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 wvbr = 0;
+
+       switch (hw->mac.type) {
+       case e1000_82576:
+       case e1000_i350:
+               if (!(wvbr = rd32(E1000_WVBR)))
+                       return;
+               break;
+       default:
+               break;
+       }
+
+       adapter->wvbr |= wvbr;
+}
+
+#define IGB_STAGGERED_QUEUE_OFFSET 8
+
+static void igb_spoof_check(struct igb_adapter *adapter)
+{
+       int j;
+
+       if (!adapter->wvbr)
+               return;
+
+       for(j = 0; j < adapter->vfs_allocated_count; j++) {
+               if (adapter->wvbr & (1 << j) ||
+                   adapter->wvbr & (1 << (j + IGB_STAGGERED_QUEUE_OFFSET))) {
+                       dev_warn(&adapter->pdev->dev,
+                               "Spoof event(s) detected on VF %d\n", j);
+                       adapter->wvbr &=
+                               ~((1 << j) |
+                                 (1 << (j + IGB_STAGGERED_QUEUE_OFFSET)));
+               }
+       }
+}
+
+/* Need to wait a few seconds after link up to get diagnostic information from
+ * the phy */
+static void igb_update_phy_info(unsigned long data)
+{
+       struct igb_adapter *adapter = (struct igb_adapter *) data;
+       igb_get_phy_info(&adapter->hw);
+}
+
+/**
+ * igb_has_link - check shared code for link and determine up/down
+ * @adapter: pointer to driver private info
+ **/
+bool igb_has_link(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       bool link_active = false;
+       s32 ret_val = 0;
+
+       /* get_link_status is set on LSC (link status) interrupt or
+        * rx sequence error interrupt.  get_link_status will stay
+        * false until the e1000_check_for_link establishes link
+        * for copper adapters ONLY
+        */
+       switch (hw->phy.media_type) {
+       case e1000_media_type_copper:
+               if (hw->mac.get_link_status) {
+                       ret_val = hw->mac.ops.check_for_link(hw);
+                       link_active = !hw->mac.get_link_status;
+               } else {
+                       link_active = true;
+               }
+               break;
+       case e1000_media_type_internal_serdes:
+               ret_val = hw->mac.ops.check_for_link(hw);
+               link_active = hw->mac.serdes_has_link;
+               break;
+       default:
+       case e1000_media_type_unknown:
+               break;
+       }
+
+       return link_active;
+}
+
+static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)
+{
+       bool ret = false;
+       u32 ctrl_ext, thstat;
+
+       /* check for thermal sensor event on i350, copper only */
+       if (hw->mac.type == e1000_i350) {
+               thstat = rd32(E1000_THSTAT);
+               ctrl_ext = rd32(E1000_CTRL_EXT);
+
+               if ((hw->phy.media_type == e1000_media_type_copper) &&
+                   !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII)) {
+                       ret = !!(thstat & event);
+               }
+       }
+
+       return ret;
+}
+
+/**
+ * igb_watchdog - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+static void igb_watchdog(unsigned long data)
+{
+       struct igb_adapter *adapter = (struct igb_adapter *)data;
+       /* Do the rest outside of interrupt context */
+       schedule_work(&adapter->watchdog_task);
+}
+
+static void igb_watchdog_task(struct work_struct *work)
+{
+       struct igb_adapter *adapter = container_of(work,
+                                                  struct igb_adapter,
+                                                   watchdog_task);
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       u32 link;
+       int i;
+
+       link = igb_has_link(adapter);
+       if (link) {
+               if (!netif_carrier_ok(netdev)) {
+                       u32 ctrl;
+                       hw->mac.ops.get_speed_and_duplex(hw,
+                                                        &adapter->link_speed,
+                                                        &adapter->link_duplex);
+
+                       ctrl = rd32(E1000_CTRL);
+                       /* Links status message must follow this format */
+                       printk(KERN_INFO "igb: %s NIC Link is Up %d Mbps %s, "
+                                "Flow Control: %s\n",
+                              netdev->name,
+                              adapter->link_speed,
+                              adapter->link_duplex == FULL_DUPLEX ?
+                                "Full Duplex" : "Half Duplex",
+                              ((ctrl & E1000_CTRL_TFCE) &&
+                               (ctrl & E1000_CTRL_RFCE)) ? "RX/TX" :
+                              ((ctrl & E1000_CTRL_RFCE) ?  "RX" :
+                              ((ctrl & E1000_CTRL_TFCE) ?  "TX" : "None")));
+
+                       /* check for thermal sensor event */
+                       if (igb_thermal_sensor_event(hw, E1000_THSTAT_LINK_THROTTLE)) {
+                               printk(KERN_INFO "igb: %s The network adapter "
+                                                "link speed was downshifted "
+                                                "because it overheated.\n",
+                                                netdev->name);
+                       }
+
+                       /* adjust timeout factor according to speed/duplex */
+                       adapter->tx_timeout_factor = 1;
+                       switch (adapter->link_speed) {
+                       case SPEED_10:
+                               adapter->tx_timeout_factor = 14;
+                               break;
+                       case SPEED_100:
+                               /* maybe add some timeout factor ? */
+                               break;
+                       }
+
+                       netif_carrier_on(netdev);
+
+                       igb_ping_all_vfs(adapter);
+                       igb_check_vf_rate_limit(adapter);
+
+                       /* link state has changed, schedule phy info update */
+                       if (!test_bit(__IGB_DOWN, &adapter->state))
+                               mod_timer(&adapter->phy_info_timer,
+                                         round_jiffies(jiffies + 2 * HZ));
+               }
+       } else {
+               if (netif_carrier_ok(netdev)) {
+                       adapter->link_speed = 0;
+                       adapter->link_duplex = 0;
+
+                       /* check for thermal sensor event */
+                       if (igb_thermal_sensor_event(hw, E1000_THSTAT_PWR_DOWN)) {
+                               printk(KERN_ERR "igb: %s The network adapter "
+                                               "was stopped because it "
+                                               "overheated.\n",
+                                               netdev->name);
+                       }
+
+                       /* Links status message must follow this format */
+                       printk(KERN_INFO "igb: %s NIC Link is Down\n",
+                              netdev->name);
+                       netif_carrier_off(netdev);
+
+                       igb_ping_all_vfs(adapter);
+
+                       /* link state has changed, schedule phy info update */
+                       if (!test_bit(__IGB_DOWN, &adapter->state))
+                               mod_timer(&adapter->phy_info_timer,
+                                         round_jiffies(jiffies + 2 * HZ));
+               }
+       }
+
+       spin_lock(&adapter->stats64_lock);
+       igb_update_stats(adapter, &adapter->stats64);
+       spin_unlock(&adapter->stats64_lock);
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               struct igb_ring *tx_ring = adapter->tx_ring[i];
+               if (!netif_carrier_ok(netdev)) {
+                       /* We've lost link, so the controller stops DMA,
+                        * but we've got queued Tx work that's never going
+                        * to get done, so reset controller to flush Tx.
+                        * (Do the reset outside of interrupt context). */
+                       if (igb_desc_unused(tx_ring) + 1 < tx_ring->count) {
+                               adapter->tx_timeout_count++;
+                               schedule_work(&adapter->reset_task);
+                               /* return immediately since reset is imminent */
+                               return;
+                       }
+               }
+
+               /* Force detection of hung controller every watchdog period */
+               tx_ring->detect_tx_hung = true;
+       }
+
+       /* Cause software interrupt to ensure rx ring is cleaned */
+       if (adapter->msix_entries) {
+               u32 eics = 0;
+               for (i = 0; i < adapter->num_q_vectors; i++) {
+                       struct igb_q_vector *q_vector = adapter->q_vector[i];
+                       eics |= q_vector->eims_value;
+               }
+               wr32(E1000_EICS, eics);
+       } else {
+               wr32(E1000_ICS, E1000_ICS_RXDMT0);
+       }
+
+       igb_spoof_check(adapter);
+
+       /* Reset the timer */
+       if (!test_bit(__IGB_DOWN, &adapter->state))
+               mod_timer(&adapter->watchdog_timer,
+                         round_jiffies(jiffies + 2 * HZ));
+}
+
+enum latency_range {
+       lowest_latency = 0,
+       low_latency = 1,
+       bulk_latency = 2,
+       latency_invalid = 255
+};
+
+/**
+ * igb_update_ring_itr - update the dynamic ITR value based on packet size
+ *
+ *      Stores a new ITR value based on strictly on packet size.  This
+ *      algorithm is less sophisticated than that used in igb_update_itr,
+ *      due to the difficulty of synchronizing statistics across multiple
+ *      receive rings.  The divisors and thresholds used by this function
+ *      were determined based on theoretical maximum wire speed and testing
+ *      data, in order to minimize response time while increasing bulk
+ *      throughput.
+ *      This functionality is controlled by the InterruptThrottleRate module
+ *      parameter (see igb_param.c)
+ *      NOTE:  This function is called only when operating in a multiqueue
+ *             receive environment.
+ * @q_vector: pointer to q_vector
+ **/
+static void igb_update_ring_itr(struct igb_q_vector *q_vector)
+{
+       int new_val = q_vector->itr_val;
+       int avg_wire_size = 0;
+       struct igb_adapter *adapter = q_vector->adapter;
+       struct igb_ring *ring;
+       unsigned int packets;
+
+       /* For non-gigabit speeds, just fix the interrupt rate at 4000
+        * ints/sec - ITR timer value of 120 ticks.
+        */
+       if (adapter->link_speed != SPEED_1000) {
+               new_val = 976;
+               goto set_itr_val;
+       }
+
+       ring = q_vector->rx_ring;
+       if (ring) {
+               packets = ACCESS_ONCE(ring->total_packets);
+
+               if (packets)
+                       avg_wire_size = ring->total_bytes / packets;
+       }
+
+       ring = q_vector->tx_ring;
+       if (ring) {
+               packets = ACCESS_ONCE(ring->total_packets);
+
+               if (packets)
+                       avg_wire_size = max_t(u32, avg_wire_size,
+                                             ring->total_bytes / packets);
+       }
+
+       /* if avg_wire_size isn't set no work was done */
+       if (!avg_wire_size)
+               goto clear_counts;
+
+       /* Add 24 bytes to size to account for CRC, preamble, and gap */
+       avg_wire_size += 24;
+
+       /* Don't starve jumbo frames */
+       avg_wire_size = min(avg_wire_size, 3000);
+
+       /* Give a little boost to mid-size frames */
+       if ((avg_wire_size > 300) && (avg_wire_size < 1200))
+               new_val = avg_wire_size / 3;
+       else
+               new_val = avg_wire_size / 2;
+
+       /* when in itr mode 3 do not exceed 20K ints/sec */
+       if (adapter->rx_itr_setting == 3 && new_val < 196)
+               new_val = 196;
+
+set_itr_val:
+       if (new_val != q_vector->itr_val) {
+               q_vector->itr_val = new_val;
+               q_vector->set_itr = 1;
+       }
+clear_counts:
+       if (q_vector->rx_ring) {
+               q_vector->rx_ring->total_bytes = 0;
+               q_vector->rx_ring->total_packets = 0;
+       }
+       if (q_vector->tx_ring) {
+               q_vector->tx_ring->total_bytes = 0;
+               q_vector->tx_ring->total_packets = 0;
+       }
+}
+
+/**
+ * igb_update_itr - update the dynamic ITR value based on statistics
+ *      Stores a new ITR value based on packets and byte
+ *      counts during the last interrupt.  The advantage of per interrupt
+ *      computation is faster updates and more accurate ITR for the current
+ *      traffic pattern.  Constants in this function were computed
+ *      based on theoretical maximum wire speed and thresholds were set based
+ *      on testing data as well as attempting to minimize response time
+ *      while increasing bulk throughput.
+ *      this functionality is controlled by the InterruptThrottleRate module
+ *      parameter (see igb_param.c)
+ *      NOTE:  These calculations are only valid when operating in a single-
+ *             queue environment.
+ * @adapter: pointer to adapter
+ * @itr_setting: current q_vector->itr_val
+ * @packets: the number of packets during this measurement interval
+ * @bytes: the number of bytes during this measurement interval
+ **/
+static unsigned int igb_update_itr(struct igb_adapter *adapter, u16 itr_setting,
+                                  int packets, int bytes)
+{
+       unsigned int retval = itr_setting;
+
+       if (packets == 0)
+               goto update_itr_done;
+
+       switch (itr_setting) {
+       case lowest_latency:
+               /* handle TSO and jumbo frames */
+               if (bytes/packets > 8000)
+                       retval = bulk_latency;
+               else if ((packets < 5) && (bytes > 512))
+                       retval = low_latency;
+               break;
+       case low_latency:  /* 50 usec aka 20000 ints/s */
+               if (bytes > 10000) {
+                       /* this if handles the TSO accounting */
+                       if (bytes/packets > 8000) {
+                               retval = bulk_latency;
+                       } else if ((packets < 10) || ((bytes/packets) > 1200)) {
+                               retval = bulk_latency;
+                       } else if ((packets > 35)) {
+                               retval = lowest_latency;
+                       }
+               } else if (bytes/packets > 2000) {
+                       retval = bulk_latency;
+               } else if (packets <= 2 && bytes < 512) {
+                       retval = lowest_latency;
+               }
+               break;
+       case bulk_latency: /* 250 usec aka 4000 ints/s */
+               if (bytes > 25000) {
+                       if (packets > 35)
+                               retval = low_latency;
+               } else if (bytes < 1500) {
+                       retval = low_latency;
+               }
+               break;
+       }
+
+update_itr_done:
+       return retval;
+}
+
+static void igb_set_itr(struct igb_adapter *adapter)
+{
+       struct igb_q_vector *q_vector = adapter->q_vector[0];
+       u16 current_itr;
+       u32 new_itr = q_vector->itr_val;
+
+       /* for non-gigabit speeds, just fix the interrupt rate at 4000 */
+       if (adapter->link_speed != SPEED_1000) {
+               current_itr = 0;
+               new_itr = 4000;
+               goto set_itr_now;
+       }
+
+       adapter->rx_itr = igb_update_itr(adapter,
+                                   adapter->rx_itr,
+                                   q_vector->rx_ring->total_packets,
+                                   q_vector->rx_ring->total_bytes);
+
+       adapter->tx_itr = igb_update_itr(adapter,
+                                   adapter->tx_itr,
+                                   q_vector->tx_ring->total_packets,
+                                   q_vector->tx_ring->total_bytes);
+       current_itr = max(adapter->rx_itr, adapter->tx_itr);
+
+       /* conservative mode (itr 3) eliminates the lowest_latency setting */
+       if (adapter->rx_itr_setting == 3 && current_itr == lowest_latency)
+               current_itr = low_latency;
+
+       switch (current_itr) {
+       /* counts and packets in update_itr are dependent on these numbers */
+       case lowest_latency:
+               new_itr = 56;  /* aka 70,000 ints/sec */
+               break;
+       case low_latency:
+               new_itr = 196; /* aka 20,000 ints/sec */
+               break;
+       case bulk_latency:
+               new_itr = 980; /* aka 4,000 ints/sec */
+               break;
+       default:
+               break;
+       }
+
+set_itr_now:
+       q_vector->rx_ring->total_bytes = 0;
+       q_vector->rx_ring->total_packets = 0;
+       q_vector->tx_ring->total_bytes = 0;
+       q_vector->tx_ring->total_packets = 0;
+
+       if (new_itr != q_vector->itr_val) {
+               /* this attempts to bias the interrupt rate towards Bulk
+                * by adding intermediate steps when interrupt rate is
+                * increasing */
+               new_itr = new_itr > q_vector->itr_val ?
+                            max((new_itr * q_vector->itr_val) /
+                                (new_itr + (q_vector->itr_val >> 2)),
+                                new_itr) :
+                            new_itr;
+               /* Don't write the value here; it resets the adapter's
+                * internal timer, and causes us to delay far longer than
+                * we should between interrupts.  Instead, we write the ITR
+                * value at the beginning of the next interrupt so the timing
+                * ends up being correct.
+                */
+               q_vector->itr_val = new_itr;
+               q_vector->set_itr = 1;
+       }
+}
+
+#define IGB_TX_FLAGS_CSUM              0x00000001
+#define IGB_TX_FLAGS_VLAN              0x00000002
+#define IGB_TX_FLAGS_TSO               0x00000004
+#define IGB_TX_FLAGS_IPV4              0x00000008
+#define IGB_TX_FLAGS_TSTAMP            0x00000010
+#define IGB_TX_FLAGS_VLAN_MASK         0xffff0000
+#define IGB_TX_FLAGS_VLAN_SHIFT                        16
+
+static inline int igb_tso_adv(struct igb_ring *tx_ring,
+                             struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
+{
+       struct e1000_adv_tx_context_desc *context_desc;
+       unsigned int i;
+       int err;
+       struct igb_buffer *buffer_info;
+       u32 info = 0, tu_cmd = 0;
+       u32 mss_l4len_idx;
+       u8 l4len;
+
+       if (skb_header_cloned(skb)) {
+               err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+               if (err)
+                       return err;
+       }
+
+       l4len = tcp_hdrlen(skb);
+       *hdr_len += l4len;
+
+       if (skb->protocol == htons(ETH_P_IP)) {
+               struct iphdr *iph = ip_hdr(skb);
+               iph->tot_len = 0;
+               iph->check = 0;
+               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                        iph->daddr, 0,
+                                                        IPPROTO_TCP,
+                                                        0);
+       } else if (skb_is_gso_v6(skb)) {
+               ipv6_hdr(skb)->payload_len = 0;
+               tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                                      &ipv6_hdr(skb)->daddr,
+                                                      0, IPPROTO_TCP, 0);
+       }
+
+       i = tx_ring->next_to_use;
+
+       buffer_info = &tx_ring->buffer_info[i];
+       context_desc = E1000_TX_CTXTDESC_ADV(*tx_ring, i);
+       /* VLAN MACLEN IPLEN */
+       if (tx_flags & IGB_TX_FLAGS_VLAN)
+               info |= (tx_flags & IGB_TX_FLAGS_VLAN_MASK);
+       info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
+       *hdr_len += skb_network_offset(skb);
+       info |= skb_network_header_len(skb);
+       *hdr_len += skb_network_header_len(skb);
+       context_desc->vlan_macip_lens = cpu_to_le32(info);
+
+       /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
+       tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
+
+       if (skb->protocol == htons(ETH_P_IP))
+               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
+       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+
+       context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
+
+       /* MSS L4LEN IDX */
+       mss_l4len_idx = (skb_shinfo(skb)->gso_size << E1000_ADVTXD_MSS_SHIFT);
+       mss_l4len_idx |= (l4len << E1000_ADVTXD_L4LEN_SHIFT);
+
+       /* For 82575, context index must be unique per ring. */
+       if (tx_ring->flags & IGB_RING_FLAG_TX_CTX_IDX)
+               mss_l4len_idx |= tx_ring->reg_idx << 4;
+
+       context_desc->mss_l4len_idx = cpu_to_le32(mss_l4len_idx);
+       context_desc->seqnum_seed = 0;
+
+       buffer_info->time_stamp = jiffies;
+       buffer_info->next_to_watch = i;
+       buffer_info->dma = 0;
+       i++;
+       if (i == tx_ring->count)
+               i = 0;
+
+       tx_ring->next_to_use = i;
+
+       return true;
+}
+
+static inline bool igb_tx_csum_adv(struct igb_ring *tx_ring,
+                                  struct sk_buff *skb, u32 tx_flags)
+{
+       struct e1000_adv_tx_context_desc *context_desc;
+       struct device *dev = tx_ring->dev;
+       struct igb_buffer *buffer_info;
+       u32 info = 0, tu_cmd = 0;
+       unsigned int i;
+
+       if ((skb->ip_summed == CHECKSUM_PARTIAL) ||
+           (tx_flags & IGB_TX_FLAGS_VLAN)) {
+               i = tx_ring->next_to_use;
+               buffer_info = &tx_ring->buffer_info[i];
+               context_desc = E1000_TX_CTXTDESC_ADV(*tx_ring, i);
+
+               if (tx_flags & IGB_TX_FLAGS_VLAN)
+                       info |= (tx_flags & IGB_TX_FLAGS_VLAN_MASK);
+
+               info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
+               if (skb->ip_summed == CHECKSUM_PARTIAL)
+                       info |= skb_network_header_len(skb);
+
+               context_desc->vlan_macip_lens = cpu_to_le32(info);
+
+               tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
+
+               if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                       __be16 protocol;
+
+                       if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {
+                               const struct vlan_ethhdr *vhdr =
+                                         (const struct vlan_ethhdr*)skb->data;
+
+                               protocol = vhdr->h_vlan_encapsulated_proto;
+                       } else {
+                               protocol = skb->protocol;
+                       }
+
+                       switch (protocol) {
+                       case cpu_to_be16(ETH_P_IP):
+                               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
+                               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+                               else if (ip_hdr(skb)->protocol == IPPROTO_SCTP)
+                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_SCTP;
+                               break;
+                       case cpu_to_be16(ETH_P_IPV6):
+                               /* XXX what about other V6 headers?? */
+                               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+                               else if (ipv6_hdr(skb)->nexthdr == IPPROTO_SCTP)
+                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_SCTP;
+                               break;
+                       default:
+                               if (unlikely(net_ratelimit()))
+                                       dev_warn(dev,
+                                           "partial checksum but proto=%x!\n",
+                                           skb->protocol);
+                               break;
+                       }
+               }
+
+               context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
+               context_desc->seqnum_seed = 0;
+               if (tx_ring->flags & IGB_RING_FLAG_TX_CTX_IDX)
+                       context_desc->mss_l4len_idx =
+                               cpu_to_le32(tx_ring->reg_idx << 4);
+
+               buffer_info->time_stamp = jiffies;
+               buffer_info->next_to_watch = i;
+               buffer_info->dma = 0;
+
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+               tx_ring->next_to_use = i;
+
+               return true;
+       }
+       return false;
+}
+
+#define IGB_MAX_TXD_PWR        16
+#define IGB_MAX_DATA_PER_TXD   (1<<IGB_MAX_TXD_PWR)
+
+static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
+                                unsigned int first)
+{
+       struct igb_buffer *buffer_info;
+       struct device *dev = tx_ring->dev;
+       unsigned int hlen = skb_headlen(skb);
+       unsigned int count = 0, i;
+       unsigned int f;
+       u16 gso_segs = skb_shinfo(skb)->gso_segs ?: 1;
+
+       i = tx_ring->next_to_use;
+
+       buffer_info = &tx_ring->buffer_info[i];
+       BUG_ON(hlen >= IGB_MAX_DATA_PER_TXD);
+       buffer_info->length = hlen;
+       /* set time_stamp *before* dma to help avoid a possible race */
+       buffer_info->time_stamp = jiffies;
+       buffer_info->next_to_watch = i;
+       buffer_info->dma = dma_map_single(dev, skb->data, hlen,
+                                         DMA_TO_DEVICE);
+       if (dma_mapping_error(dev, buffer_info->dma))
+               goto dma_error;
+
+       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
+               struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[f];
+               unsigned int len = frag->size;
+
+               count++;
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+
+               buffer_info = &tx_ring->buffer_info[i];
+               BUG_ON(len >= IGB_MAX_DATA_PER_TXD);
+               buffer_info->length = len;
+               buffer_info->time_stamp = jiffies;
+               buffer_info->next_to_watch = i;
+               buffer_info->mapped_as_page = true;
+               buffer_info->dma = dma_map_page(dev,
+                                               frag->page,
+                                               frag->page_offset,
+                                               len,
+                                               DMA_TO_DEVICE);
+               if (dma_mapping_error(dev, buffer_info->dma))
+                       goto dma_error;
+
+       }
+
+       tx_ring->buffer_info[i].skb = skb;
+       tx_ring->buffer_info[i].tx_flags = skb_shinfo(skb)->tx_flags;
+       /* multiply data chunks by size of headers */
+       tx_ring->buffer_info[i].bytecount = ((gso_segs - 1) * hlen) + skb->len;
+       tx_ring->buffer_info[i].gso_segs = gso_segs;
+       tx_ring->buffer_info[first].next_to_watch = i;
+
+       return ++count;
+
+dma_error:
+       dev_err(dev, "TX DMA map failed\n");
+
+       /* clear timestamp and dma mappings for failed buffer_info mapping */
+       buffer_info->dma = 0;
+       buffer_info->time_stamp = 0;
+       buffer_info->length = 0;
+       buffer_info->next_to_watch = 0;
+       buffer_info->mapped_as_page = false;
+
+       /* clear timestamp and dma mappings for remaining portion of packet */
+       while (count--) {
+               if (i == 0)
+                       i = tx_ring->count;
+               i--;
+               buffer_info = &tx_ring->buffer_info[i];
+               igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
+       }
+
+       return 0;
+}
+
+static inline void igb_tx_queue_adv(struct igb_ring *tx_ring,
+                                   u32 tx_flags, int count, u32 paylen,
+                                   u8 hdr_len)
+{
+       union e1000_adv_tx_desc *tx_desc;
+       struct igb_buffer *buffer_info;
+       u32 olinfo_status = 0, cmd_type_len;
+       unsigned int i = tx_ring->next_to_use;
+
+       cmd_type_len = (E1000_ADVTXD_DTYP_DATA | E1000_ADVTXD_DCMD_IFCS |
+                       E1000_ADVTXD_DCMD_DEXT);
+
+       if (tx_flags & IGB_TX_FLAGS_VLAN)
+               cmd_type_len |= E1000_ADVTXD_DCMD_VLE;
+
+       if (tx_flags & IGB_TX_FLAGS_TSTAMP)
+               cmd_type_len |= E1000_ADVTXD_MAC_TSTAMP;
+
+       if (tx_flags & IGB_TX_FLAGS_TSO) {
+               cmd_type_len |= E1000_ADVTXD_DCMD_TSE;
+
+               /* insert tcp checksum */
+               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+
+               /* insert ip checksum */
+               if (tx_flags & IGB_TX_FLAGS_IPV4)
+                       olinfo_status |= E1000_TXD_POPTS_IXSM << 8;
+
+       } else if (tx_flags & IGB_TX_FLAGS_CSUM) {
+               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+       }
+
+       if ((tx_ring->flags & IGB_RING_FLAG_TX_CTX_IDX) &&
+           (tx_flags & (IGB_TX_FLAGS_CSUM |
+                        IGB_TX_FLAGS_TSO |
+                        IGB_TX_FLAGS_VLAN)))
+               olinfo_status |= tx_ring->reg_idx << 4;
+
+       olinfo_status |= ((paylen - hdr_len) << E1000_ADVTXD_PAYLEN_SHIFT);
+
+       do {
+               buffer_info = &tx_ring->buffer_info[i];
+               tx_desc = E1000_TX_DESC_ADV(*tx_ring, i);
+               tx_desc->read.buffer_addr = cpu_to_le64(buffer_info->dma);
+               tx_desc->read.cmd_type_len =
+                       cpu_to_le32(cmd_type_len | buffer_info->length);
+               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
+               count--;
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+       } while (count > 0);
+
+       tx_desc->read.cmd_type_len |= cpu_to_le32(IGB_ADVTXD_DCMD);
+       /* Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64). */
+       wmb();
+
+       tx_ring->next_to_use = i;
+       writel(i, tx_ring->tail);
+       /* we need this if more than one processor can write to our tail
+        * at a time, it syncronizes IO on IA64/Altix systems */
+       mmiowb();
+}
+
+static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
+{
+       struct net_device *netdev = tx_ring->netdev;
+
+       netif_stop_subqueue(netdev, tx_ring->queue_index);
+
+       /* Herbert's original patch had:
+        *  smp_mb__after_netif_stop_queue();
+        * but since that doesn't exist yet, just open code it. */
+       smp_mb();
+
+       /* We need to check again in a case another CPU has just
+        * made room available. */
+       if (igb_desc_unused(tx_ring) < size)
+               return -EBUSY;
+
+       /* A reprieve! */
+       netif_wake_subqueue(netdev, tx_ring->queue_index);
+
+       u64_stats_update_begin(&tx_ring->tx_syncp2);
+       tx_ring->tx_stats.restart_queue2++;
+       u64_stats_update_end(&tx_ring->tx_syncp2);
+
+       return 0;
+}
+
+static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
+{
+       if (igb_desc_unused(tx_ring) >= size)
+               return 0;
+       return __igb_maybe_stop_tx(tx_ring, size);
+}
+
+netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
+                                   struct igb_ring *tx_ring)
+{
+       int tso = 0, count;
+       u32 tx_flags = 0;
+       u16 first;
+       u8 hdr_len = 0;
+
+       /* need: 1 descriptor per page,
+        *       + 2 desc gap to keep tail from touching head,
+        *       + 1 desc for skb->data,
+        *       + 1 desc for context descriptor,
+        * otherwise try next time */
+       if (igb_maybe_stop_tx(tx_ring, skb_shinfo(skb)->nr_frags + 4)) {
+               /* this is a hard error */
+               return NETDEV_TX_BUSY;
+       }
+
+       if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
+               skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
+               tx_flags |= IGB_TX_FLAGS_TSTAMP;
+       }
+
+       if (vlan_tx_tag_present(skb)) {
+               tx_flags |= IGB_TX_FLAGS_VLAN;
+               tx_flags |= (vlan_tx_tag_get(skb) << IGB_TX_FLAGS_VLAN_SHIFT);
+       }
+
+       if (skb->protocol == htons(ETH_P_IP))
+               tx_flags |= IGB_TX_FLAGS_IPV4;
+
+       first = tx_ring->next_to_use;
+       if (skb_is_gso(skb)) {
+               tso = igb_tso_adv(tx_ring, skb, tx_flags, &hdr_len);
+
+               if (tso < 0) {
+                       dev_kfree_skb_any(skb);
+                       return NETDEV_TX_OK;
+               }
+       }
+
+       if (tso)
+               tx_flags |= IGB_TX_FLAGS_TSO;
+       else if (igb_tx_csum_adv(tx_ring, skb, tx_flags) &&
+                (skb->ip_summed == CHECKSUM_PARTIAL))
+               tx_flags |= IGB_TX_FLAGS_CSUM;
+
+       /*
+        * count reflects descriptors mapped, if 0 or less then mapping error
+        * has occurred and we need to rewind the descriptor queue
+        */
+       count = igb_tx_map_adv(tx_ring, skb, first);
+       if (!count) {
+               dev_kfree_skb_any(skb);
+               tx_ring->buffer_info[first].time_stamp = 0;
+               tx_ring->next_to_use = first;
+               return NETDEV_TX_OK;
+       }
+
+       igb_tx_queue_adv(tx_ring, tx_flags, count, skb->len, hdr_len);
+
+       /* Make sure there is space in the ring for the next send. */
+       igb_maybe_stop_tx(tx_ring, MAX_SKB_FRAGS + 4);
+
+       return NETDEV_TX_OK;
+}
+
+static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb,
+                                     struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct igb_ring *tx_ring;
+       int r_idx = 0;
+
+       if (test_bit(__IGB_DOWN, &adapter->state)) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (skb->len <= 0) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       r_idx = skb->queue_mapping & (IGB_ABS_MAX_TX_QUEUES - 1);
+       tx_ring = adapter->multi_tx_table[r_idx];
+
+       /* This goes back to the question of how to logically map a tx queue
+        * to a flow.  Right now, performance is impacted slightly negatively
+        * if using multiple tx queues.  If the stack breaks away from a
+        * single qdisc implementation, we can look at this again. */
+       return igb_xmit_frame_ring_adv(skb, tx_ring);
+}
+
+/**
+ * igb_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+static void igb_tx_timeout(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* Do the reset outside of interrupt context */
+       adapter->tx_timeout_count++;
+
+       if (hw->mac.type == e1000_82580)
+               hw->dev_spec._82575.global_device_reset = true;
+
+       schedule_work(&adapter->reset_task);
+       wr32(E1000_EICS,
+            (adapter->eims_enable_mask & ~adapter->eims_other));
+}
+
+static void igb_reset_task(struct work_struct *work)
+{
+       struct igb_adapter *adapter;
+       adapter = container_of(work, struct igb_adapter, reset_task);
+
+       igb_dump(adapter);
+       netdev_err(adapter->netdev, "Reset adapter\n");
+       igb_reinit_locked(adapter);
+}
+
+/**
+ * igb_get_stats64 - Get System Network Statistics
+ * @netdev: network interface device structure
+ * @stats: rtnl_link_stats64 pointer
+ *
+ **/
+static struct rtnl_link_stats64 *igb_get_stats64(struct net_device *netdev,
+                                                struct rtnl_link_stats64 *stats)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       spin_lock(&adapter->stats64_lock);
+       igb_update_stats(adapter, &adapter->stats64);
+       memcpy(stats, &adapter->stats64, sizeof(*stats));
+       spin_unlock(&adapter->stats64_lock);
+
+       return stats;
+}
+
+/**
+ * igb_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int igb_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct pci_dev *pdev = adapter->pdev;
+       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+       u32 rx_buffer_len, i;
+
+       if ((new_mtu < 68) || (max_frame > MAX_JUMBO_FRAME_SIZE)) {
+               dev_err(&pdev->dev, "Invalid MTU setting\n");
+               return -EINVAL;
+       }
+
+       if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
+               dev_err(&pdev->dev, "MTU > 9216 not supported.\n");
+               return -EINVAL;
+       }
+
+       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
+               msleep(1);
+
+       /* igb_down has a dependency on max_frame_size */
+       adapter->max_frame_size = max_frame;
+
+       /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
+        * means we reserve 2 more, this pushes us to allocate from the next
+        * larger slab size.
+        * i.e. RXBUFFER_2048 --> size-4096 slab
+        */
+
+       if (adapter->hw.mac.type == e1000_82580)
+               max_frame += IGB_TS_HDR_LEN;
+
+       if (max_frame <= IGB_RXBUFFER_1024)
+               rx_buffer_len = IGB_RXBUFFER_1024;
+       else if (max_frame <= MAXIMUM_ETHERNET_VLAN_SIZE)
+               rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+       else
+               rx_buffer_len = IGB_RXBUFFER_128;
+
+       if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN + IGB_TS_HDR_LEN) ||
+            (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE + IGB_TS_HDR_LEN))
+               rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE + IGB_TS_HDR_LEN;
+
+       if ((adapter->hw.mac.type == e1000_82580) &&
+           (rx_buffer_len == IGB_RXBUFFER_128))
+               rx_buffer_len += IGB_RXBUFFER_64;
+
+       if (netif_running(netdev))
+               igb_down(adapter);
+
+       dev_info(&pdev->dev, "changing MTU from %d to %d\n",
+                netdev->mtu, new_mtu);
+       netdev->mtu = new_mtu;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               adapter->rx_ring[i]->rx_buffer_len = rx_buffer_len;
+
+       if (netif_running(netdev))
+               igb_up(adapter);
+       else
+               igb_reset(adapter);
+
+       clear_bit(__IGB_RESETTING, &adapter->state);
+
+       return 0;
+}
+
+/**
+ * igb_update_stats - Update the board statistics counters
+ * @adapter: board private structure
+ **/
+
+void igb_update_stats(struct igb_adapter *adapter,
+                     struct rtnl_link_stats64 *net_stats)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+       u32 reg, mpc;
+       u16 phy_tmp;
+       int i;
+       u64 bytes, packets;
+       unsigned int start;
+       u64 _bytes, _packets;
+
+#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
+
+       /*
+        * Prevent stats update while adapter is being reset, or if the pci
+        * connection is down.
+        */
+       if (adapter->link_speed == 0)
+               return;
+       if (pci_channel_offline(pdev))
+               return;
+
+       bytes = 0;
+       packets = 0;
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               u32 rqdpc_tmp = rd32(E1000_RQDPC(i)) & 0x0FFF;
+               struct igb_ring *ring = adapter->rx_ring[i];
+
+               ring->rx_stats.drops += rqdpc_tmp;
+               net_stats->rx_fifo_errors += rqdpc_tmp;
+
+               do {
+                       start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
+                       _bytes = ring->rx_stats.bytes;
+                       _packets = ring->rx_stats.packets;
+               } while (u64_stats_fetch_retry_bh(&ring->rx_syncp, start));
+               bytes += _bytes;
+               packets += _packets;
+       }
+
+       net_stats->rx_bytes = bytes;
+       net_stats->rx_packets = packets;
+
+       bytes = 0;
+       packets = 0;
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               struct igb_ring *ring = adapter->tx_ring[i];
+               do {
+                       start = u64_stats_fetch_begin_bh(&ring->tx_syncp);
+                       _bytes = ring->tx_stats.bytes;
+                       _packets = ring->tx_stats.packets;
+               } while (u64_stats_fetch_retry_bh(&ring->tx_syncp, start));
+               bytes += _bytes;
+               packets += _packets;
+       }
+       net_stats->tx_bytes = bytes;
+       net_stats->tx_packets = packets;
+
+       /* read stats registers */
+       adapter->stats.crcerrs += rd32(E1000_CRCERRS);
+       adapter->stats.gprc += rd32(E1000_GPRC);
+       adapter->stats.gorc += rd32(E1000_GORCL);
+       rd32(E1000_GORCH); /* clear GORCL */
+       adapter->stats.bprc += rd32(E1000_BPRC);
+       adapter->stats.mprc += rd32(E1000_MPRC);
+       adapter->stats.roc += rd32(E1000_ROC);
+
+       adapter->stats.prc64 += rd32(E1000_PRC64);
+       adapter->stats.prc127 += rd32(E1000_PRC127);
+       adapter->stats.prc255 += rd32(E1000_PRC255);
+       adapter->stats.prc511 += rd32(E1000_PRC511);
+       adapter->stats.prc1023 += rd32(E1000_PRC1023);
+       adapter->stats.prc1522 += rd32(E1000_PRC1522);
+       adapter->stats.symerrs += rd32(E1000_SYMERRS);
+       adapter->stats.sec += rd32(E1000_SEC);
+
+       mpc = rd32(E1000_MPC);
+       adapter->stats.mpc += mpc;
+       net_stats->rx_fifo_errors += mpc;
+       adapter->stats.scc += rd32(E1000_SCC);
+       adapter->stats.ecol += rd32(E1000_ECOL);
+       adapter->stats.mcc += rd32(E1000_MCC);
+       adapter->stats.latecol += rd32(E1000_LATECOL);
+       adapter->stats.dc += rd32(E1000_DC);
+       adapter->stats.rlec += rd32(E1000_RLEC);
+       adapter->stats.xonrxc += rd32(E1000_XONRXC);
+       adapter->stats.xontxc += rd32(E1000_XONTXC);
+       adapter->stats.xoffrxc += rd32(E1000_XOFFRXC);
+       adapter->stats.xofftxc += rd32(E1000_XOFFTXC);
+       adapter->stats.fcruc += rd32(E1000_FCRUC);
+       adapter->stats.gptc += rd32(E1000_GPTC);
+       adapter->stats.gotc += rd32(E1000_GOTCL);
+       rd32(E1000_GOTCH); /* clear GOTCL */
+       adapter->stats.rnbc += rd32(E1000_RNBC);
+       adapter->stats.ruc += rd32(E1000_RUC);
+       adapter->stats.rfc += rd32(E1000_RFC);
+       adapter->stats.rjc += rd32(E1000_RJC);
+       adapter->stats.tor += rd32(E1000_TORH);
+       adapter->stats.tot += rd32(E1000_TOTH);
+       adapter->stats.tpr += rd32(E1000_TPR);
+
+       adapter->stats.ptc64 += rd32(E1000_PTC64);
+       adapter->stats.ptc127 += rd32(E1000_PTC127);
+       adapter->stats.ptc255 += rd32(E1000_PTC255);
+       adapter->stats.ptc511 += rd32(E1000_PTC511);
+       adapter->stats.ptc1023 += rd32(E1000_PTC1023);
+       adapter->stats.ptc1522 += rd32(E1000_PTC1522);
+
+       adapter->stats.mptc += rd32(E1000_MPTC);
+       adapter->stats.bptc += rd32(E1000_BPTC);
+
+       adapter->stats.tpt += rd32(E1000_TPT);
+       adapter->stats.colc += rd32(E1000_COLC);
+
+       adapter->stats.algnerrc += rd32(E1000_ALGNERRC);
+       /* read internal phy specific stats */
+       reg = rd32(E1000_CTRL_EXT);
+       if (!(reg & E1000_CTRL_EXT_LINK_MODE_MASK)) {
+               adapter->stats.rxerrc += rd32(E1000_RXERRC);
+               adapter->stats.tncrs += rd32(E1000_TNCRS);
+       }
+
+       adapter->stats.tsctc += rd32(E1000_TSCTC);
+       adapter->stats.tsctfc += rd32(E1000_TSCTFC);
+
+       adapter->stats.iac += rd32(E1000_IAC);
+       adapter->stats.icrxoc += rd32(E1000_ICRXOC);
+       adapter->stats.icrxptc += rd32(E1000_ICRXPTC);
+       adapter->stats.icrxatc += rd32(E1000_ICRXATC);
+       adapter->stats.ictxptc += rd32(E1000_ICTXPTC);
+       adapter->stats.ictxatc += rd32(E1000_ICTXATC);
+       adapter->stats.ictxqec += rd32(E1000_ICTXQEC);
+       adapter->stats.ictxqmtc += rd32(E1000_ICTXQMTC);
+       adapter->stats.icrxdmtc += rd32(E1000_ICRXDMTC);
+
+       /* Fill out the OS statistics structure */
+       net_stats->multicast = adapter->stats.mprc;
+       net_stats->collisions = adapter->stats.colc;
+
+       /* Rx Errors */
+
+       /* RLEC on some newer hardware can be incorrect so build
+        * our own version based on RUC and ROC */
+       net_stats->rx_errors = adapter->stats.rxerrc +
+               adapter->stats.crcerrs + adapter->stats.algnerrc +
+               adapter->stats.ruc + adapter->stats.roc +
+               adapter->stats.cexterr;
+       net_stats->rx_length_errors = adapter->stats.ruc +
+                                     adapter->stats.roc;
+       net_stats->rx_crc_errors = adapter->stats.crcerrs;
+       net_stats->rx_frame_errors = adapter->stats.algnerrc;
+       net_stats->rx_missed_errors = adapter->stats.mpc;
+
+       /* Tx Errors */
+       net_stats->tx_errors = adapter->stats.ecol +
+                              adapter->stats.latecol;
+       net_stats->tx_aborted_errors = adapter->stats.ecol;
+       net_stats->tx_window_errors = adapter->stats.latecol;
+       net_stats->tx_carrier_errors = adapter->stats.tncrs;
+
+       /* Tx Dropped needs to be maintained elsewhere */
+
+       /* Phy Stats */
+       if (hw->phy.media_type == e1000_media_type_copper) {
+               if ((adapter->link_speed == SPEED_1000) &&
+                  (!igb_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
+                       phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
+                       adapter->phy_stats.idle_errors += phy_tmp;
+               }
+       }
+
+       /* Management Stats */
+       adapter->stats.mgptc += rd32(E1000_MGTPTC);
+       adapter->stats.mgprc += rd32(E1000_MGTPRC);
+       adapter->stats.mgpdc += rd32(E1000_MGTPDC);
+
+       /* OS2BMC Stats */
+       reg = rd32(E1000_MANC);
+       if (reg & E1000_MANC_EN_BMC2OS) {
+               adapter->stats.o2bgptc += rd32(E1000_O2BGPTC);
+               adapter->stats.o2bspc += rd32(E1000_O2BSPC);
+               adapter->stats.b2ospc += rd32(E1000_B2OSPC);
+               adapter->stats.b2ogprc += rd32(E1000_B2OGPRC);
+       }
+}
+
+static irqreturn_t igb_msix_other(int irq, void *data)
+{
+       struct igb_adapter *adapter = data;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 icr = rd32(E1000_ICR);
+       /* reading ICR causes bit 31 of EICR to be cleared */
+
+       if (icr & E1000_ICR_DRSTA)
+               schedule_work(&adapter->reset_task);
+
+       if (icr & E1000_ICR_DOUTSYNC) {
+               /* HW is reporting DMA is out of sync */
+               adapter->stats.doosync++;
+               /* The DMA Out of Sync is also indication of a spoof event
+                * in IOV mode. Check the Wrong VM Behavior register to
+                * see if it is really a spoof event. */
+               igb_check_wvbr(adapter);
+       }
+
+       /* Check for a mailbox event */
+       if (icr & E1000_ICR_VMMB)
+               igb_msg_task(adapter);
+
+       if (icr & E1000_ICR_LSC) {
+               hw->mac.get_link_status = 1;
+               /* guard against interrupt when we're going down */
+               if (!test_bit(__IGB_DOWN, &adapter->state))
+                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+       }
+
+       if (adapter->vfs_allocated_count)
+               wr32(E1000_IMS, E1000_IMS_LSC |
+                               E1000_IMS_VMMB |
+                               E1000_IMS_DOUTSYNC);
+       else
+               wr32(E1000_IMS, E1000_IMS_LSC | E1000_IMS_DOUTSYNC);
+       wr32(E1000_EIMS, adapter->eims_other);
+
+       return IRQ_HANDLED;
+}
+
+static void igb_write_itr(struct igb_q_vector *q_vector)
+{
+       struct igb_adapter *adapter = q_vector->adapter;
+       u32 itr_val = q_vector->itr_val & 0x7FFC;
+
+       if (!q_vector->set_itr)
+               return;
+
+       if (!itr_val)
+               itr_val = 0x4;
+
+       if (adapter->hw.mac.type == e1000_82575)
+               itr_val |= itr_val << 16;
+       else
+               itr_val |= 0x8000000;
+
+       writel(itr_val, q_vector->itr_register);
+       q_vector->set_itr = 0;
+}
+
+static irqreturn_t igb_msix_ring(int irq, void *data)
+{
+       struct igb_q_vector *q_vector = data;
+
+       /* Write the ITR value calculated from the previous interrupt. */
+       igb_write_itr(q_vector);
+
+       napi_schedule(&q_vector->napi);
+
+       return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_IGB_DCA
+static void igb_update_dca(struct igb_q_vector *q_vector)
+{
+       struct igb_adapter *adapter = q_vector->adapter;
+       struct e1000_hw *hw = &adapter->hw;
+       int cpu = get_cpu();
+
+       if (q_vector->cpu == cpu)
+               goto out_no_update;
+
+       if (q_vector->tx_ring) {
+               int q = q_vector->tx_ring->reg_idx;
+               u32 dca_txctrl = rd32(E1000_DCA_TXCTRL(q));
+               if (hw->mac.type == e1000_82575) {
+                       dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK;
+                       dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
+               } else {
+                       dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK_82576;
+                       dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) <<
+                                     E1000_DCA_TXCTRL_CPUID_SHIFT;
+               }
+               dca_txctrl |= E1000_DCA_TXCTRL_DESC_DCA_EN;
+               wr32(E1000_DCA_TXCTRL(q), dca_txctrl);
+       }
+       if (q_vector->rx_ring) {
+               int q = q_vector->rx_ring->reg_idx;
+               u32 dca_rxctrl = rd32(E1000_DCA_RXCTRL(q));
+               if (hw->mac.type == e1000_82575) {
+                       dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK;
+                       dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
+               } else {
+                       dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK_82576;
+                       dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) <<
+                                     E1000_DCA_RXCTRL_CPUID_SHIFT;
+               }
+               dca_rxctrl |= E1000_DCA_RXCTRL_DESC_DCA_EN;
+               dca_rxctrl |= E1000_DCA_RXCTRL_HEAD_DCA_EN;
+               dca_rxctrl |= E1000_DCA_RXCTRL_DATA_DCA_EN;
+               wr32(E1000_DCA_RXCTRL(q), dca_rxctrl);
+       }
+       q_vector->cpu = cpu;
+out_no_update:
+       put_cpu();
+}
+
+static void igb_setup_dca(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       int i;
+
+       if (!(adapter->flags & IGB_FLAG_DCA_ENABLED))
+               return;
+
+       /* Always use CB2 mode, difference is masked in the CB driver. */
+       wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_CB2);
+
+       for (i = 0; i < adapter->num_q_vectors; i++) {
+               adapter->q_vector[i]->cpu = -1;
+               igb_update_dca(adapter->q_vector[i]);
+       }
+}
+
+static int __igb_notify_dca(struct device *dev, void *data)
+{
+       struct net_device *netdev = dev_get_drvdata(dev);
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_hw *hw = &adapter->hw;
+       unsigned long event = *(unsigned long *)data;
+
+       switch (event) {
+       case DCA_PROVIDER_ADD:
+               /* if already enabled, don't do it again */
+               if (adapter->flags & IGB_FLAG_DCA_ENABLED)
+                       break;
+               if (dca_add_requester(dev) == 0) {
+                       adapter->flags |= IGB_FLAG_DCA_ENABLED;
+                       dev_info(&pdev->dev, "DCA enabled\n");
+                       igb_setup_dca(adapter);
+                       break;
+               }
+               /* Fall Through since DCA is disabled. */
+       case DCA_PROVIDER_REMOVE:
+               if (adapter->flags & IGB_FLAG_DCA_ENABLED) {
+                       /* without this a class_device is left
+                        * hanging around in the sysfs model */
+                       dca_remove_requester(dev);
+                       dev_info(&pdev->dev, "DCA disabled\n");
+                       adapter->flags &= ~IGB_FLAG_DCA_ENABLED;
+                       wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_DISABLE);
+               }
+               break;
+       }
+
+       return 0;
+}
+
+static int igb_notify_dca(struct notifier_block *nb, unsigned long event,
+                          void *p)
+{
+       int ret_val;
+
+       ret_val = driver_for_each_device(&igb_driver.driver, NULL, &event,
+                                        __igb_notify_dca);
+
+       return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
+}
+#endif /* CONFIG_IGB_DCA */
+
+static void igb_ping_all_vfs(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ping;
+       int i;
+
+       for (i = 0 ; i < adapter->vfs_allocated_count; i++) {
+               ping = E1000_PF_CONTROL_MSG;
+               if (adapter->vf_data[i].flags & IGB_VF_FLAG_CTS)
+                       ping |= E1000_VT_MSGTYPE_CTS;
+               igb_write_mbx(hw, &ping, 1, i);
+       }
+}
+
+static int igb_set_vf_promisc(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vmolr = rd32(E1000_VMOLR(vf));
+       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
+
+       vf_data->flags &= ~(IGB_VF_FLAG_UNI_PROMISC |
+                           IGB_VF_FLAG_MULTI_PROMISC);
+       vmolr &= ~(E1000_VMOLR_ROPE | E1000_VMOLR_ROMPE | E1000_VMOLR_MPME);
+
+       if (*msgbuf & E1000_VF_SET_PROMISC_MULTICAST) {
+               vmolr |= E1000_VMOLR_MPME;
+               vf_data->flags |= IGB_VF_FLAG_MULTI_PROMISC;
+               *msgbuf &= ~E1000_VF_SET_PROMISC_MULTICAST;
+       } else {
+               /*
+                * if we have hashes and we are clearing a multicast promisc
+                * flag we need to write the hashes to the MTA as this step
+                * was previously skipped
+                */
+               if (vf_data->num_vf_mc_hashes > 30) {
+                       vmolr |= E1000_VMOLR_MPME;
+               } else if (vf_data->num_vf_mc_hashes) {
+                       int j;
+                       vmolr |= E1000_VMOLR_ROMPE;
+                       for (j = 0; j < vf_data->num_vf_mc_hashes; j++)
+                               igb_mta_set(hw, vf_data->vf_mc_hashes[j]);
+               }
+       }
+
+       wr32(E1000_VMOLR(vf), vmolr);
+
+       /* there are flags left unprocessed, likely not supported */
+       if (*msgbuf & E1000_VT_MSGINFO_MASK)
+               return -EINVAL;
+
+       return 0;
+
+}
+
+static int igb_set_vf_multicasts(struct igb_adapter *adapter,
+                                 u32 *msgbuf, u32 vf)
+{
+       int n = (msgbuf[0] & E1000_VT_MSGINFO_MASK) >> E1000_VT_MSGINFO_SHIFT;
+       u16 *hash_list = (u16 *)&msgbuf[1];
+       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
+       int i;
+
+       /* salt away the number of multicast addresses assigned
+        * to this VF for later use to restore when the PF multi cast
+        * list changes
+        */
+       vf_data->num_vf_mc_hashes = n;
+
+       /* only up to 30 hash values supported */
+       if (n > 30)
+               n = 30;
+
+       /* store the hashes for later use */
+       for (i = 0; i < n; i++)
+               vf_data->vf_mc_hashes[i] = hash_list[i];
+
+       /* Flush and reset the mta with the new values */
+       igb_set_rx_mode(adapter->netdev);
+
+       return 0;
+}
+
+static void igb_restore_vf_multicasts(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct vf_data_storage *vf_data;
+       int i, j;
+
+       for (i = 0; i < adapter->vfs_allocated_count; i++) {
+               u32 vmolr = rd32(E1000_VMOLR(i));
+               vmolr &= ~(E1000_VMOLR_ROMPE | E1000_VMOLR_MPME);
+
+               vf_data = &adapter->vf_data[i];
+
+               if ((vf_data->num_vf_mc_hashes > 30) ||
+                   (vf_data->flags & IGB_VF_FLAG_MULTI_PROMISC)) {
+                       vmolr |= E1000_VMOLR_MPME;
+               } else if (vf_data->num_vf_mc_hashes) {
+                       vmolr |= E1000_VMOLR_ROMPE;
+                       for (j = 0; j < vf_data->num_vf_mc_hashes; j++)
+                               igb_mta_set(hw, vf_data->vf_mc_hashes[j]);
+               }
+               wr32(E1000_VMOLR(i), vmolr);
+       }
+}
+
+static void igb_clear_vf_vfta(struct igb_adapter *adapter, u32 vf)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 pool_mask, reg, vid;
+       int i;
+
+       pool_mask = 1 << (E1000_VLVF_POOLSEL_SHIFT + vf);
+
+       /* Find the vlan filter for this id */
+       for (i = 0; i < E1000_VLVF_ARRAY_SIZE; i++) {
+               reg = rd32(E1000_VLVF(i));
+
+               /* remove the vf from the pool */
+               reg &= ~pool_mask;
+
+               /* if pool is empty then remove entry from vfta */
+               if (!(reg & E1000_VLVF_POOLSEL_MASK) &&
+                   (reg & E1000_VLVF_VLANID_ENABLE)) {
+                       reg = 0;
+                       vid = reg & E1000_VLVF_VLANID_MASK;
+                       igb_vfta_set(hw, vid, false);
+               }
+
+               wr32(E1000_VLVF(i), reg);
+       }
+
+       adapter->vf_data[vf].vlans_enabled = 0;
+}
+
+static s32 igb_vlvf_set(struct igb_adapter *adapter, u32 vid, bool add, u32 vf)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 reg, i;
+
+       /* The vlvf table only exists on 82576 hardware and newer */
+       if (hw->mac.type < e1000_82576)
+               return -1;
+
+       /* we only need to do this if VMDq is enabled */
+       if (!adapter->vfs_allocated_count)
+               return -1;
+
+       /* Find the vlan filter for this id */
+       for (i = 0; i < E1000_VLVF_ARRAY_SIZE; i++) {
+               reg = rd32(E1000_VLVF(i));
+               if ((reg & E1000_VLVF_VLANID_ENABLE) &&
+                   vid == (reg & E1000_VLVF_VLANID_MASK))
+                       break;
+       }
+
+       if (add) {
+               if (i == E1000_VLVF_ARRAY_SIZE) {
+                       /* Did not find a matching VLAN ID entry that was
+                        * enabled.  Search for a free filter entry, i.e.
+                        * one without the enable bit set
+                        */
+                       for (i = 0; i < E1000_VLVF_ARRAY_SIZE; i++) {
+                               reg = rd32(E1000_VLVF(i));
+                               if (!(reg & E1000_VLVF_VLANID_ENABLE))
+                                       break;
+                       }
+               }
+               if (i < E1000_VLVF_ARRAY_SIZE) {
+                       /* Found an enabled/available entry */
+                       reg |= 1 << (E1000_VLVF_POOLSEL_SHIFT + vf);
+
+                       /* if !enabled we need to set this up in vfta */
+                       if (!(reg & E1000_VLVF_VLANID_ENABLE)) {
+                               /* add VID to filter table */
+                               igb_vfta_set(hw, vid, true);
+                               reg |= E1000_VLVF_VLANID_ENABLE;
+                       }
+                       reg &= ~E1000_VLVF_VLANID_MASK;
+                       reg |= vid;
+                       wr32(E1000_VLVF(i), reg);
+
+                       /* do not modify RLPML for PF devices */
+                       if (vf >= adapter->vfs_allocated_count)
+                               return 0;
+
+                       if (!adapter->vf_data[vf].vlans_enabled) {
+                               u32 size;
+                               reg = rd32(E1000_VMOLR(vf));
+                               size = reg & E1000_VMOLR_RLPML_MASK;
+                               size += 4;
+                               reg &= ~E1000_VMOLR_RLPML_MASK;
+                               reg |= size;
+                               wr32(E1000_VMOLR(vf), reg);
+                       }
+
+                       adapter->vf_data[vf].vlans_enabled++;
+                       return 0;
+               }
+       } else {
+               if (i < E1000_VLVF_ARRAY_SIZE) {
+                       /* remove vf from the pool */
+                       reg &= ~(1 << (E1000_VLVF_POOLSEL_SHIFT + vf));
+                       /* if pool is empty then remove entry from vfta */
+                       if (!(reg & E1000_VLVF_POOLSEL_MASK)) {
+                               reg = 0;
+                               igb_vfta_set(hw, vid, false);
+                       }
+                       wr32(E1000_VLVF(i), reg);
+
+                       /* do not modify RLPML for PF devices */
+                       if (vf >= adapter->vfs_allocated_count)
+                               return 0;
+
+                       adapter->vf_data[vf].vlans_enabled--;
+                       if (!adapter->vf_data[vf].vlans_enabled) {
+                               u32 size;
+                               reg = rd32(E1000_VMOLR(vf));
+                               size = reg & E1000_VMOLR_RLPML_MASK;
+                               size -= 4;
+                               reg &= ~E1000_VMOLR_RLPML_MASK;
+                               reg |= size;
+                               wr32(E1000_VMOLR(vf), reg);
+                       }
+               }
+       }
+       return 0;
+}
+
+static void igb_set_vmvir(struct igb_adapter *adapter, u32 vid, u32 vf)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (vid)
+               wr32(E1000_VMVIR(vf), (vid | E1000_VMVIR_VLANA_DEFAULT));
+       else
+               wr32(E1000_VMVIR(vf), 0);
+}
+
+static int igb_ndo_set_vf_vlan(struct net_device *netdev,
+                              int vf, u16 vlan, u8 qos)
+{
+       int err = 0;
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       if ((vf >= adapter->vfs_allocated_count) || (vlan > 4095) || (qos > 7))
+               return -EINVAL;
+       if (vlan || qos) {
+               err = igb_vlvf_set(adapter, vlan, !!vlan, vf);
+               if (err)
+                       goto out;
+               igb_set_vmvir(adapter, vlan | (qos << VLAN_PRIO_SHIFT), vf);
+               igb_set_vmolr(adapter, vf, !vlan);
+               adapter->vf_data[vf].pf_vlan = vlan;
+               adapter->vf_data[vf].pf_qos = qos;
+               dev_info(&adapter->pdev->dev,
+                        "Setting VLAN %d, QOS 0x%x on VF %d\n", vlan, qos, vf);
+               if (test_bit(__IGB_DOWN, &adapter->state)) {
+                       dev_warn(&adapter->pdev->dev,
+                                "The VF VLAN has been set,"
+                                " but the PF device is not up.\n");
+                       dev_warn(&adapter->pdev->dev,
+                                "Bring the PF device up before"
+                                " attempting to use the VF device.\n");
+               }
+       } else {
+               igb_vlvf_set(adapter, adapter->vf_data[vf].pf_vlan,
+                                  false, vf);
+               igb_set_vmvir(adapter, vlan, vf);
+               igb_set_vmolr(adapter, vf, true);
+               adapter->vf_data[vf].pf_vlan = 0;
+               adapter->vf_data[vf].pf_qos = 0;
+       }
+out:
+       return err;
+}
+
+static int igb_set_vf_vlan(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
+{
+       int add = (msgbuf[0] & E1000_VT_MSGINFO_MASK) >> E1000_VT_MSGINFO_SHIFT;
+       int vid = (msgbuf[1] & E1000_VLVF_VLANID_MASK);
+
+       return igb_vlvf_set(adapter, vid, add, vf);
+}
+
+static inline void igb_vf_reset(struct igb_adapter *adapter, u32 vf)
+{
+       /* clear flags - except flag that indicates PF has set the MAC */
+       adapter->vf_data[vf].flags &= IGB_VF_FLAG_PF_SET_MAC;
+       adapter->vf_data[vf].last_nack = jiffies;
+
+       /* reset offloads to defaults */
+       igb_set_vmolr(adapter, vf, true);
+
+       /* reset vlans for device */
+       igb_clear_vf_vfta(adapter, vf);
+       if (adapter->vf_data[vf].pf_vlan)
+               igb_ndo_set_vf_vlan(adapter->netdev, vf,
+                                   adapter->vf_data[vf].pf_vlan,
+                                   adapter->vf_data[vf].pf_qos);
+       else
+               igb_clear_vf_vfta(adapter, vf);
+
+       /* reset multicast table array for vf */
+       adapter->vf_data[vf].num_vf_mc_hashes = 0;
+
+       /* Flush and reset the mta with the new values */
+       igb_set_rx_mode(adapter->netdev);
+}
+
+static void igb_vf_reset_event(struct igb_adapter *adapter, u32 vf)
+{
+       unsigned char *vf_mac = adapter->vf_data[vf].vf_mac_addresses;
+
+       /* generate a new mac address as we were hotplug removed/added */
+       if (!(adapter->vf_data[vf].flags & IGB_VF_FLAG_PF_SET_MAC))
+               random_ether_addr(vf_mac);
+
+       /* process remaining reset events */
+       igb_vf_reset(adapter, vf);
+}
+
+static void igb_vf_reset_msg(struct igb_adapter *adapter, u32 vf)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       unsigned char *vf_mac = adapter->vf_data[vf].vf_mac_addresses;
+       int rar_entry = hw->mac.rar_entry_count - (vf + 1);
+       u32 reg, msgbuf[3];
+       u8 *addr = (u8 *)(&msgbuf[1]);
+
+       /* process all the same items cleared in a function level reset */
+       igb_vf_reset(adapter, vf);
+
+       /* set vf mac address */
+       igb_rar_set_qsel(adapter, vf_mac, rar_entry, vf);
+
+       /* enable transmit and receive for vf */
+       reg = rd32(E1000_VFTE);
+       wr32(E1000_VFTE, reg | (1 << vf));
+       reg = rd32(E1000_VFRE);
+       wr32(E1000_VFRE, reg | (1 << vf));
+
+       adapter->vf_data[vf].flags |= IGB_VF_FLAG_CTS;
+
+       /* reply to reset with ack and vf mac address */
+       msgbuf[0] = E1000_VF_RESET | E1000_VT_MSGTYPE_ACK;
+       memcpy(addr, vf_mac, 6);
+       igb_write_mbx(hw, msgbuf, 3, vf);
+}
+
+static int igb_set_vf_mac_addr(struct igb_adapter *adapter, u32 *msg, int vf)
+{
+       /*
+        * The VF MAC Address is stored in a packed array of bytes
+        * starting at the second 32 bit word of the msg array
+        */
+       unsigned char *addr = (char *)&msg[1];
+       int err = -1;
+
+       if (is_valid_ether_addr(addr))
+               err = igb_set_vf_mac(adapter, vf, addr);
+
+       return err;
+}
+
+static void igb_rcv_ack_from_vf(struct igb_adapter *adapter, u32 vf)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
+       u32 msg = E1000_VT_MSGTYPE_NACK;
+
+       /* if device isn't clear to send it shouldn't be reading either */
+       if (!(vf_data->flags & IGB_VF_FLAG_CTS) &&
+           time_after(jiffies, vf_data->last_nack + (2 * HZ))) {
+               igb_write_mbx(hw, &msg, 1, vf);
+               vf_data->last_nack = jiffies;
+       }
+}
+
+static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       u32 msgbuf[E1000_VFMAILBOX_SIZE];
+       struct e1000_hw *hw = &adapter->hw;
+       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
+       s32 retval;
+
+       retval = igb_read_mbx(hw, msgbuf, E1000_VFMAILBOX_SIZE, vf);
+
+       if (retval) {
+               /* if receive failed revoke VF CTS stats and restart init */
+               dev_err(&pdev->dev, "Error receiving message from VF\n");
+               vf_data->flags &= ~IGB_VF_FLAG_CTS;
+               if (!time_after(jiffies, vf_data->last_nack + (2 * HZ)))
+                       return;
+               goto out;
+       }
+
+       /* this is a message we already processed, do nothing */
+       if (msgbuf[0] & (E1000_VT_MSGTYPE_ACK | E1000_VT_MSGTYPE_NACK))
+               return;
+
+       /*
+        * until the vf completes a reset it should not be
+        * allowed to start any configuration.
+        */
+
+       if (msgbuf[0] == E1000_VF_RESET) {
+               igb_vf_reset_msg(adapter, vf);
+               return;
+       }
+
+       if (!(vf_data->flags & IGB_VF_FLAG_CTS)) {
+               if (!time_after(jiffies, vf_data->last_nack + (2 * HZ)))
+                       return;
+               retval = -1;
+               goto out;
+       }
+
+       switch ((msgbuf[0] & 0xFFFF)) {
+       case E1000_VF_SET_MAC_ADDR:
+               retval = -EINVAL;
+               if (!(vf_data->flags & IGB_VF_FLAG_PF_SET_MAC))
+                       retval = igb_set_vf_mac_addr(adapter, msgbuf, vf);
+               else
+                       dev_warn(&pdev->dev,
+                                "VF %d attempted to override administratively "
+                                "set MAC address\nReload the VF driver to "
+                                "resume operations\n", vf);
+               break;
+       case E1000_VF_SET_PROMISC:
+               retval = igb_set_vf_promisc(adapter, msgbuf, vf);
+               break;
+       case E1000_VF_SET_MULTICAST:
+               retval = igb_set_vf_multicasts(adapter, msgbuf, vf);
+               break;
+       case E1000_VF_SET_LPE:
+               retval = igb_set_vf_rlpml(adapter, msgbuf[1], vf);
+               break;
+       case E1000_VF_SET_VLAN:
+               retval = -1;
+               if (vf_data->pf_vlan)
+                       dev_warn(&pdev->dev,
+                                "VF %d attempted to override administratively "
+                                "set VLAN tag\nReload the VF driver to "
+                                "resume operations\n", vf);
+               else
+                       retval = igb_set_vf_vlan(adapter, msgbuf, vf);
+               break;
+       default:
+               dev_err(&pdev->dev, "Unhandled Msg %08x\n", msgbuf[0]);
+               retval = -1;
+               break;
+       }
+
+       msgbuf[0] |= E1000_VT_MSGTYPE_CTS;
+out:
+       /* notify the VF of the results of what it sent us */
+       if (retval)
+               msgbuf[0] |= E1000_VT_MSGTYPE_NACK;
+       else
+               msgbuf[0] |= E1000_VT_MSGTYPE_ACK;
+
+       igb_write_mbx(hw, msgbuf, 1, vf);
+}
+
+static void igb_msg_task(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 vf;
+
+       for (vf = 0; vf < adapter->vfs_allocated_count; vf++) {
+               /* process any reset requests */
+               if (!igb_check_for_rst(hw, vf))
+                       igb_vf_reset_event(adapter, vf);
+
+               /* process any messages pending */
+               if (!igb_check_for_msg(hw, vf))
+                       igb_rcv_msg_from_vf(adapter, vf);
+
+               /* process any acks */
+               if (!igb_check_for_ack(hw, vf))
+                       igb_rcv_ack_from_vf(adapter, vf);
+       }
+}
+
+/**
+ *  igb_set_uta - Set unicast filter table address
+ *  @adapter: board private structure
+ *
+ *  The unicast table address is a register array of 32-bit registers.
+ *  The table is meant to be used in a way similar to how the MTA is used
+ *  however due to certain limitations in the hardware it is necessary to
+ *  set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscuous
+ *  enable bit to allow vlan tag stripping when promiscuous mode is enabled
+ **/
+static void igb_set_uta(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       int i;
+
+       /* The UTA table only exists on 82576 hardware and newer */
+       if (hw->mac.type < e1000_82576)
+               return;
+
+       /* we only need to do this if VMDq is enabled */
+       if (!adapter->vfs_allocated_count)
+               return;
+
+       for (i = 0; i < hw->mac.uta_reg_count; i++)
+               array_wr32(E1000_UTA, i, ~0);
+}
+
+/**
+ * igb_intr_msi - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+static irqreturn_t igb_intr_msi(int irq, void *data)
+{
+       struct igb_adapter *adapter = data;
+       struct igb_q_vector *q_vector = adapter->q_vector[0];
+       struct e1000_hw *hw = &adapter->hw;
+       /* read ICR disables interrupts using IAM */
+       u32 icr = rd32(E1000_ICR);
+
+       igb_write_itr(q_vector);
+
+       if (icr & E1000_ICR_DRSTA)
+               schedule_work(&adapter->reset_task);
+
+       if (icr & E1000_ICR_DOUTSYNC) {
+               /* HW is reporting DMA is out of sync */
+               adapter->stats.doosync++;
+       }
+
+       if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+               hw->mac.get_link_status = 1;
+               if (!test_bit(__IGB_DOWN, &adapter->state))
+                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+       }
+
+       napi_schedule(&q_vector->napi);
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * igb_intr - Legacy Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+static irqreturn_t igb_intr(int irq, void *data)
+{
+       struct igb_adapter *adapter = data;
+       struct igb_q_vector *q_vector = adapter->q_vector[0];
+       struct e1000_hw *hw = &adapter->hw;
+       /* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No
+        * need for the IMC write */
+       u32 icr = rd32(E1000_ICR);
+       if (!icr)
+               return IRQ_NONE;  /* Not our interrupt */
+
+       igb_write_itr(q_vector);
+
+       /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is
+        * not set, then the adapter didn't send an interrupt */
+       if (!(icr & E1000_ICR_INT_ASSERTED))
+               return IRQ_NONE;
+
+       if (icr & E1000_ICR_DRSTA)
+               schedule_work(&adapter->reset_task);
+
+       if (icr & E1000_ICR_DOUTSYNC) {
+               /* HW is reporting DMA is out of sync */
+               adapter->stats.doosync++;
+       }
+
+       if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+               hw->mac.get_link_status = 1;
+               /* guard against interrupt when we're going down */
+               if (!test_bit(__IGB_DOWN, &adapter->state))
+                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+       }
+
+       napi_schedule(&q_vector->napi);
+
+       return IRQ_HANDLED;
+}
+
+static inline void igb_ring_irq_enable(struct igb_q_vector *q_vector)
+{
+       struct igb_adapter *adapter = q_vector->adapter;
+       struct e1000_hw *hw = &adapter->hw;
+
+       if ((q_vector->rx_ring && (adapter->rx_itr_setting & 3)) ||
+           (!q_vector->rx_ring && (adapter->tx_itr_setting & 3))) {
+               if (!adapter->msix_entries)
+                       igb_set_itr(adapter);
+               else
+                       igb_update_ring_itr(q_vector);
+       }
+
+       if (!test_bit(__IGB_DOWN, &adapter->state)) {
+               if (adapter->msix_entries)
+                       wr32(E1000_EIMS, q_vector->eims_value);
+               else
+                       igb_irq_enable(adapter);
+       }
+}
+
+/**
+ * igb_poll - NAPI Rx polling callback
+ * @napi: napi polling structure
+ * @budget: count of how many packets we should handle
+ **/
+static int igb_poll(struct napi_struct *napi, int budget)
+{
+       struct igb_q_vector *q_vector = container_of(napi,
+                                                    struct igb_q_vector,
+                                                    napi);
+       int tx_clean_complete = 1, work_done = 0;
+
+#ifdef CONFIG_IGB_DCA
+       if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
+               igb_update_dca(q_vector);
+#endif
+       if (q_vector->tx_ring)
+               tx_clean_complete = igb_clean_tx_irq(q_vector);
+
+       if (q_vector->rx_ring)
+               igb_clean_rx_irq_adv(q_vector, &work_done, budget);
+
+       if (!tx_clean_complete)
+               work_done = budget;
+
+       /* If not enough Rx work done, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               igb_ring_irq_enable(q_vector);
+       }
+
+       return work_done;
+}
+
+/**
+ * igb_systim_to_hwtstamp - convert system time value to hw timestamp
+ * @adapter: board private structure
+ * @shhwtstamps: timestamp structure to update
+ * @regval: unsigned 64bit system time value.
+ *
+ * We need to convert the system time value stored in the RX/TXSTMP registers
+ * into a hwtstamp which can be used by the upper level timestamping functions
+ */
+static void igb_systim_to_hwtstamp(struct igb_adapter *adapter,
+                                   struct skb_shared_hwtstamps *shhwtstamps,
+                                   u64 regval)
+{
+       u64 ns;
+
+       /*
+        * The 82580 starts with 1ns at bit 0 in RX/TXSTMPL, shift this up to
+        * 24 to match clock shift we setup earlier.
+        */
+       if (adapter->hw.mac.type == e1000_82580)
+               regval <<= IGB_82580_TSYNC_SHIFT;
+
+       ns = timecounter_cyc2time(&adapter->clock, regval);
+       timecompare_update(&adapter->compare, ns);
+       memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps));
+       shhwtstamps->hwtstamp = ns_to_ktime(ns);
+       shhwtstamps->syststamp = timecompare_transform(&adapter->compare, ns);
+}
+
+/**
+ * igb_tx_hwtstamp - utility function which checks for TX time stamp
+ * @q_vector: pointer to q_vector containing needed info
+ * @buffer: pointer to igb_buffer structure
+ *
+ * If we were asked to do hardware stamping and such a time stamp is
+ * available, then it must have been for this skb here because we only
+ * allow only one such packet into the queue.
+ */
+static void igb_tx_hwtstamp(struct igb_q_vector *q_vector, struct igb_buffer *buffer_info)
+{
+       struct igb_adapter *adapter = q_vector->adapter;
+       struct e1000_hw *hw = &adapter->hw;
+       struct skb_shared_hwtstamps shhwtstamps;
+       u64 regval;
+
+       /* if skb does not support hw timestamp or TX stamp not valid exit */
+       if (likely(!(buffer_info->tx_flags & SKBTX_HW_TSTAMP)) ||
+           !(rd32(E1000_TSYNCTXCTL) & E1000_TSYNCTXCTL_VALID))
+               return;
+
+       regval = rd32(E1000_TXSTMPL);
+       regval |= (u64)rd32(E1000_TXSTMPH) << 32;
+
+       igb_systim_to_hwtstamp(adapter, &shhwtstamps, regval);
+       skb_tstamp_tx(buffer_info->skb, &shhwtstamps);
+}
+
+/**
+ * igb_clean_tx_irq - Reclaim resources after transmit completes
+ * @q_vector: pointer to q_vector containing needed info
+ * returns true if ring is completely cleaned
+ **/
+static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
+{
+       struct igb_adapter *adapter = q_vector->adapter;
+       struct igb_ring *tx_ring = q_vector->tx_ring;
+       struct net_device *netdev = tx_ring->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       struct igb_buffer *buffer_info;
+       union e1000_adv_tx_desc *tx_desc, *eop_desc;
+       unsigned int total_bytes = 0, total_packets = 0;
+       unsigned int i, eop, count = 0;
+       bool cleaned = false;
+
+       i = tx_ring->next_to_clean;
+       eop = tx_ring->buffer_info[i].next_to_watch;
+       eop_desc = E1000_TX_DESC_ADV(*tx_ring, eop);
+
+       while ((eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)) &&
+              (count < tx_ring->count)) {
+               rmb();  /* read buffer_info after eop_desc status */
+               for (cleaned = false; !cleaned; count++) {
+                       tx_desc = E1000_TX_DESC_ADV(*tx_ring, i);
+                       buffer_info = &tx_ring->buffer_info[i];
+                       cleaned = (i == eop);
+
+                       if (buffer_info->skb) {
+                               total_bytes += buffer_info->bytecount;
+                               /* gso_segs is currently only valid for tcp */
+                               total_packets += buffer_info->gso_segs;
+                               igb_tx_hwtstamp(q_vector, buffer_info);
+                       }
+
+                       igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
+                       tx_desc->wb.status = 0;
+
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+               eop = tx_ring->buffer_info[i].next_to_watch;
+               eop_desc = E1000_TX_DESC_ADV(*tx_ring, eop);
+       }
+
+       tx_ring->next_to_clean = i;
+
+       if (unlikely(count &&
+                    netif_carrier_ok(netdev) &&
+                    igb_desc_unused(tx_ring) >= IGB_TX_QUEUE_WAKE)) {
+               /* Make sure that anybody stopping the queue after this
+                * sees the new next_to_clean.
+                */
+               smp_mb();
+               if (__netif_subqueue_stopped(netdev, tx_ring->queue_index) &&
+                   !(test_bit(__IGB_DOWN, &adapter->state))) {
+                       netif_wake_subqueue(netdev, tx_ring->queue_index);
+
+                       u64_stats_update_begin(&tx_ring->tx_syncp);
+                       tx_ring->tx_stats.restart_queue++;
+                       u64_stats_update_end(&tx_ring->tx_syncp);
+               }
+       }
+
+       if (tx_ring->detect_tx_hung) {
+               /* Detect a transmit hang in hardware, this serializes the
+                * check with the clearing of time_stamp and movement of i */
+               tx_ring->detect_tx_hung = false;
+               if (tx_ring->buffer_info[i].time_stamp &&
+                   time_after(jiffies, tx_ring->buffer_info[i].time_stamp +
+                              (adapter->tx_timeout_factor * HZ)) &&
+                   !(rd32(E1000_STATUS) & E1000_STATUS_TXOFF)) {
+
+                       /* detected Tx unit hang */
+                       dev_err(tx_ring->dev,
+                               "Detected Tx Unit Hang\n"
+                               "  Tx Queue             <%d>\n"
+                               "  TDH                  <%x>\n"
+                               "  TDT                  <%x>\n"
+                               "  next_to_use          <%x>\n"
+                               "  next_to_clean        <%x>\n"
+                               "buffer_info[next_to_clean]\n"
+                               "  time_stamp           <%lx>\n"
+                               "  next_to_watch        <%x>\n"
+                               "  jiffies              <%lx>\n"
+                               "  desc.status          <%x>\n",
+                               tx_ring->queue_index,
+                               readl(tx_ring->head),
+                               readl(tx_ring->tail),
+                               tx_ring->next_to_use,
+                               tx_ring->next_to_clean,
+                               tx_ring->buffer_info[eop].time_stamp,
+                               eop,
+                               jiffies,
+                               eop_desc->wb.status);
+                       netif_stop_subqueue(netdev, tx_ring->queue_index);
+               }
+       }
+       tx_ring->total_bytes += total_bytes;
+       tx_ring->total_packets += total_packets;
+       u64_stats_update_begin(&tx_ring->tx_syncp);
+       tx_ring->tx_stats.bytes += total_bytes;
+       tx_ring->tx_stats.packets += total_packets;
+       u64_stats_update_end(&tx_ring->tx_syncp);
+       return count < tx_ring->count;
+}
+
+static inline void igb_rx_checksum_adv(struct igb_ring *ring,
+                                      u32 status_err, struct sk_buff *skb)
+{
+       skb_checksum_none_assert(skb);
+
+       /* Ignore Checksum bit is set or checksum is disabled through ethtool */
+       if (!(ring->flags & IGB_RING_FLAG_RX_CSUM) ||
+            (status_err & E1000_RXD_STAT_IXSM))
+               return;
+
+       /* TCP/UDP checksum error bit is set */
+       if (status_err &
+           (E1000_RXDEXT_STATERR_TCPE | E1000_RXDEXT_STATERR_IPE)) {
+               /*
+                * work around errata with sctp packets where the TCPE aka
+                * L4E bit is set incorrectly on 64 byte (60 byte w/o crc)
+                * packets, (aka let the stack check the crc32c)
+                */
+               if ((skb->len == 60) &&
+                   (ring->flags & IGB_RING_FLAG_RX_SCTP_CSUM)) {
+                       u64_stats_update_begin(&ring->rx_syncp);
+                       ring->rx_stats.csum_err++;
+                       u64_stats_update_end(&ring->rx_syncp);
+               }
+               /* let the stack verify checksum errors */
+               return;
+       }
+       /* It must be a TCP or UDP packet with a valid checksum */
+       if (status_err & (E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_UDPCS))
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+       dev_dbg(ring->dev, "cksum success: bits %08X\n", status_err);
+}
+
+static void igb_rx_hwtstamp(struct igb_q_vector *q_vector, u32 staterr,
+                                   struct sk_buff *skb)
+{
+       struct igb_adapter *adapter = q_vector->adapter;
+       struct e1000_hw *hw = &adapter->hw;
+       u64 regval;
+
+       /*
+        * If this bit is set, then the RX registers contain the time stamp. No
+        * other packet will be time stamped until we read these registers, so
+        * read the registers to make them available again. Because only one
+        * packet can be time stamped at a time, we know that the register
+        * values must belong to this one here and therefore we don't need to
+        * compare any of the additional attributes stored for it.
+        *
+        * If nothing went wrong, then it should have a shared tx_flags that we
+        * can turn into a skb_shared_hwtstamps.
+        */
+       if (staterr & E1000_RXDADV_STAT_TSIP) {
+               u32 *stamp = (u32 *)skb->data;
+               regval = le32_to_cpu(*(stamp + 2));
+               regval |= (u64)le32_to_cpu(*(stamp + 3)) << 32;
+               skb_pull(skb, IGB_TS_HDR_LEN);
+       } else {
+               if(!(rd32(E1000_TSYNCRXCTL) & E1000_TSYNCRXCTL_VALID))
+                       return;
+
+               regval = rd32(E1000_RXSTMPL);
+               regval |= (u64)rd32(E1000_RXSTMPH) << 32;
+       }
+
+       igb_systim_to_hwtstamp(adapter, skb_hwtstamps(skb), regval);
+}
+static inline u16 igb_get_hlen(struct igb_ring *rx_ring,
+                               union e1000_adv_rx_desc *rx_desc)
+{
+       /* HW will not DMA in data larger than the given buffer, even if it
+        * parses the (NFS, of course) header to be larger.  In that case, it
+        * fills the header buffer and spills the rest into the page.
+        */
+       u16 hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hdr_info) &
+                  E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT;
+       if (hlen > rx_ring->rx_buffer_len)
+               hlen = rx_ring->rx_buffer_len;
+       return hlen;
+}
+
+static bool igb_clean_rx_irq_adv(struct igb_q_vector *q_vector,
+                                 int *work_done, int budget)
+{
+       struct igb_ring *rx_ring = q_vector->rx_ring;
+       struct net_device *netdev = rx_ring->netdev;
+       struct device *dev = rx_ring->dev;
+       union e1000_adv_rx_desc *rx_desc , *next_rxd;
+       struct igb_buffer *buffer_info , *next_buffer;
+       struct sk_buff *skb;
+       bool cleaned = false;
+       int cleaned_count = 0;
+       int current_node = numa_node_id();
+       unsigned int total_bytes = 0, total_packets = 0;
+       unsigned int i;
+       u32 staterr;
+       u16 length;
+
+       i = rx_ring->next_to_clean;
+       buffer_info = &rx_ring->buffer_info[i];
+       rx_desc = E1000_RX_DESC_ADV(*rx_ring, i);
+       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+
+       while (staterr & E1000_RXD_STAT_DD) {
+               if (*work_done >= budget)
+                       break;
+               (*work_done)++;
+               rmb(); /* read descriptor and rx_buffer_info after status DD */
+
+               skb = buffer_info->skb;
+               prefetch(skb->data - NET_IP_ALIGN);
+               buffer_info->skb = NULL;
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+
+               next_rxd = E1000_RX_DESC_ADV(*rx_ring, i);
+               prefetch(next_rxd);
+               next_buffer = &rx_ring->buffer_info[i];
+
+               length = le16_to_cpu(rx_desc->wb.upper.length);
+               cleaned = true;
+               cleaned_count++;
+
+               if (buffer_info->dma) {
+                       dma_unmap_single(dev, buffer_info->dma,
+                                        rx_ring->rx_buffer_len,
+                                        DMA_FROM_DEVICE);
+                       buffer_info->dma = 0;
+                       if (rx_ring->rx_buffer_len >= IGB_RXBUFFER_1024) {
+                               skb_put(skb, length);
+                               goto send_up;
+                       }
+                       skb_put(skb, igb_get_hlen(rx_ring, rx_desc));
+               }
+
+               if (length) {
+                       dma_unmap_page(dev, buffer_info->page_dma,
+                                      PAGE_SIZE / 2, DMA_FROM_DEVICE);
+                       buffer_info->page_dma = 0;
+
+                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
+                                               buffer_info->page,
+                                               buffer_info->page_offset,
+                                               length);
+
+                       if ((page_count(buffer_info->page) != 1) ||
+                           (page_to_nid(buffer_info->page) != current_node))
+                               buffer_info->page = NULL;
+                       else
+                               get_page(buffer_info->page);
+
+                       skb->len += length;
+                       skb->data_len += length;
+                       skb->truesize += length;
+               }
+
+               if (!(staterr & E1000_RXD_STAT_EOP)) {
+                       buffer_info->skb = next_buffer->skb;
+                       buffer_info->dma = next_buffer->dma;
+                       next_buffer->skb = skb;
+                       next_buffer->dma = 0;
+                       goto next_desc;
+               }
+send_up:
+               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
+                       dev_kfree_skb_irq(skb);
+                       goto next_desc;
+               }
+
+               if (staterr & (E1000_RXDADV_STAT_TSIP | E1000_RXDADV_STAT_TS))
+                       igb_rx_hwtstamp(q_vector, staterr, skb);
+               total_bytes += skb->len;
+               total_packets++;
+
+               igb_rx_checksum_adv(rx_ring, staterr, skb);
+
+               skb->protocol = eth_type_trans(skb, netdev);
+               skb_record_rx_queue(skb, rx_ring->queue_index);
+
+               if (staterr & E1000_RXD_STAT_VP) {
+                       u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
+
+                       __vlan_hwaccel_put_tag(skb, vid);
+               }
+               napi_gro_receive(&q_vector->napi, skb);
+
+next_desc:
+               rx_desc->wb.upper.status_error = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (cleaned_count >= IGB_RX_BUFFER_WRITE) {
+                       igb_alloc_rx_buffers_adv(rx_ring, cleaned_count);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+       }
+
+       rx_ring->next_to_clean = i;
+       cleaned_count = igb_desc_unused(rx_ring);
+
+       if (cleaned_count)
+               igb_alloc_rx_buffers_adv(rx_ring, cleaned_count);
+
+       rx_ring->total_packets += total_packets;
+       rx_ring->total_bytes += total_bytes;
+       u64_stats_update_begin(&rx_ring->rx_syncp);
+       rx_ring->rx_stats.packets += total_packets;
+       rx_ring->rx_stats.bytes += total_bytes;
+       u64_stats_update_end(&rx_ring->rx_syncp);
+       return cleaned;
+}
+
+/**
+ * igb_alloc_rx_buffers_adv - Replace used receive buffers; packet split
+ * @adapter: address of board private structure
+ **/
+void igb_alloc_rx_buffers_adv(struct igb_ring *rx_ring, int cleaned_count)
+{
+       struct net_device *netdev = rx_ring->netdev;
+       union e1000_adv_rx_desc *rx_desc;
+       struct igb_buffer *buffer_info;
+       struct sk_buff *skb;
+       unsigned int i;
+       int bufsz;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+
+       bufsz = rx_ring->rx_buffer_len;
+
+       while (cleaned_count--) {
+               rx_desc = E1000_RX_DESC_ADV(*rx_ring, i);
+
+               if ((bufsz < IGB_RXBUFFER_1024) && !buffer_info->page_dma) {
+                       if (!buffer_info->page) {
+                               buffer_info->page = netdev_alloc_page(netdev);
+                               if (unlikely(!buffer_info->page)) {
+                                       u64_stats_update_begin(&rx_ring->rx_syncp);
+                                       rx_ring->rx_stats.alloc_failed++;
+                                       u64_stats_update_end(&rx_ring->rx_syncp);
+                                       goto no_buffers;
+                               }
+                               buffer_info->page_offset = 0;
+                       } else {
+                               buffer_info->page_offset ^= PAGE_SIZE / 2;
+                       }
+                       buffer_info->page_dma =
+                               dma_map_page(rx_ring->dev, buffer_info->page,
+                                            buffer_info->page_offset,
+                                            PAGE_SIZE / 2,
+                                            DMA_FROM_DEVICE);
+                       if (dma_mapping_error(rx_ring->dev,
+                                             buffer_info->page_dma)) {
+                               buffer_info->page_dma = 0;
+                               u64_stats_update_begin(&rx_ring->rx_syncp);
+                               rx_ring->rx_stats.alloc_failed++;
+                               u64_stats_update_end(&rx_ring->rx_syncp);
+                               goto no_buffers;
+                       }
+               }
+
+               skb = buffer_info->skb;
+               if (!skb) {
+                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
+                       if (unlikely(!skb)) {
+                               u64_stats_update_begin(&rx_ring->rx_syncp);
+                               rx_ring->rx_stats.alloc_failed++;
+                               u64_stats_update_end(&rx_ring->rx_syncp);
+                               goto no_buffers;
+                       }
+
+                       buffer_info->skb = skb;
+               }
+               if (!buffer_info->dma) {
+                       buffer_info->dma = dma_map_single(rx_ring->dev,
+                                                         skb->data,
+                                                         bufsz,
+                                                         DMA_FROM_DEVICE);
+                       if (dma_mapping_error(rx_ring->dev,
+                                             buffer_info->dma)) {
+                               buffer_info->dma = 0;
+                               u64_stats_update_begin(&rx_ring->rx_syncp);
+                               rx_ring->rx_stats.alloc_failed++;
+                               u64_stats_update_end(&rx_ring->rx_syncp);
+                               goto no_buffers;
+                       }
+               }
+               /* Refresh the desc even if buffer_addrs didn't change because
+                * each write-back erases this info. */
+               if (bufsz < IGB_RXBUFFER_1024) {
+                       rx_desc->read.pkt_addr =
+                            cpu_to_le64(buffer_info->page_dma);
+                       rx_desc->read.hdr_addr = cpu_to_le64(buffer_info->dma);
+               } else {
+                       rx_desc->read.pkt_addr = cpu_to_le64(buffer_info->dma);
+                       rx_desc->read.hdr_addr = 0;
+               }
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+no_buffers:
+       if (rx_ring->next_to_use != i) {
+               rx_ring->next_to_use = i;
+               if (i == 0)
+                       i = (rx_ring->count - 1);
+               else
+                       i--;
+
+               /* Force memory writes to complete before letting h/w
+                * know there are new descriptors to fetch.  (Only
+                * applicable for weak-ordered memory model archs,
+                * such as IA-64). */
+               wmb();
+               writel(i, rx_ring->tail);
+       }
+}
+
+/**
+ * igb_mii_ioctl -
+ * @netdev:
+ * @ifreq:
+ * @cmd:
+ **/
+static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct mii_ioctl_data *data = if_mii(ifr);
+
+       if (adapter->hw.phy.media_type != e1000_media_type_copper)
+               return -EOPNOTSUPP;
+
+       switch (cmd) {
+       case SIOCGMIIPHY:
+               data->phy_id = adapter->hw.phy.addr;
+               break;
+       case SIOCGMIIREG:
+               if (igb_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
+                                    &data->val_out))
+                       return -EIO;
+               break;
+       case SIOCSMIIREG:
+       default:
+               return -EOPNOTSUPP;
+       }
+       return 0;
+}
+
+/**
+ * igb_hwtstamp_ioctl - control hardware time stamping
+ * @netdev:
+ * @ifreq:
+ * @cmd:
+ *
+ * Outgoing time stamping can be enabled and disabled. Play nice and
+ * disable it when requested, although it shouldn't case any overhead
+ * when no packet needs it. At most one packet in the queue may be
+ * marked for time stamping, otherwise it would be impossible to tell
+ * for sure to which packet the hardware time stamp belongs.
+ *
+ * Incoming time stamping has to be configured via the hardware
+ * filters. Not all combinations are supported, in particular event
+ * type has to be specified. Matching the kind of event packet is
+ * not supported, with the exception of "all V2 events regardless of
+ * level 2 or 4".
+ *
+ **/
+static int igb_hwtstamp_ioctl(struct net_device *netdev,
+                             struct ifreq *ifr, int cmd)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct hwtstamp_config config;
+       u32 tsync_tx_ctl = E1000_TSYNCTXCTL_ENABLED;
+       u32 tsync_rx_ctl = E1000_TSYNCRXCTL_ENABLED;
+       u32 tsync_rx_cfg = 0;
+       bool is_l4 = false;
+       bool is_l2 = false;
+       u32 regval;
+
+       if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
+               return -EFAULT;
+
+       /* reserved for future extensions */
+       if (config.flags)
+               return -EINVAL;
+
+       switch (config.tx_type) {
+       case HWTSTAMP_TX_OFF:
+               tsync_tx_ctl = 0;
+       case HWTSTAMP_TX_ON:
+               break;
+       default:
+               return -ERANGE;
+       }
+
+       switch (config.rx_filter) {
+       case HWTSTAMP_FILTER_NONE:
+               tsync_rx_ctl = 0;
+               break;
+       case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
+       case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+       case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
+       case HWTSTAMP_FILTER_ALL:
+               /*
+                * register TSYNCRXCFG must be set, therefore it is not
+                * possible to time stamp both Sync and Delay_Req messages
+                * => fall back to time stamping all packets
+                */
+               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_ALL;
+               config.rx_filter = HWTSTAMP_FILTER_ALL;
+               break;
+       case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
+               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L4_V1;
+               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V1_SYNC_MESSAGE;
+               is_l4 = true;
+               break;
+       case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
+               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L4_V1;
+               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V1_DELAY_REQ_MESSAGE;
+               is_l4 = true;
+               break;
+       case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
+       case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
+               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L2_L4_V2;
+               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V2_SYNC_MESSAGE;
+               is_l2 = true;
+               is_l4 = true;
+               config.rx_filter = HWTSTAMP_FILTER_SOME;
+               break;
+       case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
+       case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
+               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L2_L4_V2;
+               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V2_DELAY_REQ_MESSAGE;
+               is_l2 = true;
+               is_l4 = true;
+               config.rx_filter = HWTSTAMP_FILTER_SOME;
+               break;
+       case HWTSTAMP_FILTER_PTP_V2_EVENT:
+       case HWTSTAMP_FILTER_PTP_V2_SYNC:
+       case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
+               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_EVENT_V2;
+               config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
+               is_l2 = true;
+               break;
+       default:
+               return -ERANGE;
+       }
+
+       if (hw->mac.type == e1000_82575) {
+               if (tsync_rx_ctl | tsync_tx_ctl)
+                       return -EINVAL;
+               return 0;
+       }
+
+       /*
+        * Per-packet timestamping only works if all packets are
+        * timestamped, so enable timestamping in all packets as
+        * long as one rx filter was configured.
+        */
+       if ((hw->mac.type == e1000_82580) && tsync_rx_ctl) {
+               tsync_rx_ctl = E1000_TSYNCRXCTL_ENABLED;
+               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_ALL;
+       }
+
+       /* enable/disable TX */
+       regval = rd32(E1000_TSYNCTXCTL);
+       regval &= ~E1000_TSYNCTXCTL_ENABLED;
+       regval |= tsync_tx_ctl;
+       wr32(E1000_TSYNCTXCTL, regval);
+
+       /* enable/disable RX */
+       regval = rd32(E1000_TSYNCRXCTL);
+       regval &= ~(E1000_TSYNCRXCTL_ENABLED | E1000_TSYNCRXCTL_TYPE_MASK);
+       regval |= tsync_rx_ctl;
+       wr32(E1000_TSYNCRXCTL, regval);
+
+       /* define which PTP packets are time stamped */
+       wr32(E1000_TSYNCRXCFG, tsync_rx_cfg);
+
+       /* define ethertype filter for timestamped packets */
+       if (is_l2)
+               wr32(E1000_ETQF(3),
+                               (E1000_ETQF_FILTER_ENABLE | /* enable filter */
+                                E1000_ETQF_1588 | /* enable timestamping */
+                                ETH_P_1588));     /* 1588 eth protocol type */
+       else
+               wr32(E1000_ETQF(3), 0);
+
+#define PTP_PORT 319
+       /* L4 Queue Filter[3]: filter by destination port and protocol */
+       if (is_l4) {
+               u32 ftqf = (IPPROTO_UDP /* UDP */
+                       | E1000_FTQF_VF_BP /* VF not compared */
+                       | E1000_FTQF_1588_TIME_STAMP /* Enable Timestamping */
+                       | E1000_FTQF_MASK); /* mask all inputs */
+               ftqf &= ~E1000_FTQF_MASK_PROTO_BP; /* enable protocol check */
+
+               wr32(E1000_IMIR(3), htons(PTP_PORT));
+               wr32(E1000_IMIREXT(3),
+                    (E1000_IMIREXT_SIZE_BP | E1000_IMIREXT_CTRL_BP));
+               if (hw->mac.type == e1000_82576) {
+                       /* enable source port check */
+                       wr32(E1000_SPQF(3), htons(PTP_PORT));
+                       ftqf &= ~E1000_FTQF_MASK_SOURCE_PORT_BP;
+               }
+               wr32(E1000_FTQF(3), ftqf);
+       } else {
+               wr32(E1000_FTQF(3), E1000_FTQF_MASK);
+       }
+       wrfl();
+
+       adapter->hwtstamp_config = config;
+
+       /* clear TX/RX time stamp registers, just to be sure */
+       regval = rd32(E1000_TXSTMPH);
+       regval = rd32(E1000_RXSTMPH);
+
+       return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
+               -EFAULT : 0;
+}
+
+/**
+ * igb_ioctl -
+ * @netdev:
+ * @ifreq:
+ * @cmd:
+ **/
+static int igb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+       switch (cmd) {
+       case SIOCGMIIPHY:
+       case SIOCGMIIREG:
+       case SIOCSMIIREG:
+               return igb_mii_ioctl(netdev, ifr, cmd);
+       case SIOCSHWTSTAMP:
+               return igb_hwtstamp_ioctl(netdev, ifr, cmd);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
+{
+       struct igb_adapter *adapter = hw->back;
+       u16 cap_offset;
+
+       cap_offset = adapter->pdev->pcie_cap;
+       if (!cap_offset)
+               return -E1000_ERR_CONFIG;
+
+       pci_read_config_word(adapter->pdev, cap_offset + reg, value);
+
+       return 0;
+}
+
+s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
+{
+       struct igb_adapter *adapter = hw->back;
+       u16 cap_offset;
+
+       cap_offset = adapter->pdev->pcie_cap;
+       if (!cap_offset)
+               return -E1000_ERR_CONFIG;
+
+       pci_write_config_word(adapter->pdev, cap_offset + reg, *value);
+
+       return 0;
+}
+
+static void igb_vlan_mode(struct net_device *netdev, u32 features)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl, rctl;
+
+       igb_irq_disable(adapter);
+
+       if (features & NETIF_F_HW_VLAN_RX) {
+               /* enable VLAN tag insert/strip */
+               ctrl = rd32(E1000_CTRL);
+               ctrl |= E1000_CTRL_VME;
+               wr32(E1000_CTRL, ctrl);
+
+               /* Disable CFI check */
+               rctl = rd32(E1000_RCTL);
+               rctl &= ~E1000_RCTL_CFIEN;
+               wr32(E1000_RCTL, rctl);
+       } else {
+               /* disable VLAN tag insert/strip */
+               ctrl = rd32(E1000_CTRL);
+               ctrl &= ~E1000_CTRL_VME;
+               wr32(E1000_CTRL, ctrl);
+       }
+
+       igb_rlpml_set(adapter);
+
+       if (!test_bit(__IGB_DOWN, &adapter->state))
+               igb_irq_enable(adapter);
+}
+
+static void igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int pf_id = adapter->vfs_allocated_count;
+
+       /* attempt to add filter to vlvf array */
+       igb_vlvf_set(adapter, vid, true, pf_id);
+
+       /* add the filter since PF can receive vlans w/o entry in vlvf */
+       igb_vfta_set(hw, vid, true);
+
+       set_bit(vid, adapter->active_vlans);
+}
+
+static void igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int pf_id = adapter->vfs_allocated_count;
+       s32 err;
+
+       igb_irq_disable(adapter);
+
+       if (!test_bit(__IGB_DOWN, &adapter->state))
+               igb_irq_enable(adapter);
+
+       /* remove vlan from VLVF table array */
+       err = igb_vlvf_set(adapter, vid, false, pf_id);
+
+       /* if vid was not present in VLVF just remove it from table */
+       if (err)
+               igb_vfta_set(hw, vid, false);
+
+       clear_bit(vid, adapter->active_vlans);
+}
+
+static void igb_restore_vlan(struct igb_adapter *adapter)
+{
+       u16 vid;
+
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               igb_vlan_rx_add_vid(adapter->netdev, vid);
+}
+
+int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       struct e1000_mac_info *mac = &adapter->hw.mac;
+
+       mac->autoneg = 0;
+
+       /* Make sure dplx is at most 1 bit and lsb of speed is not set
+        * for the switch() below to work */
+       if ((spd & 1) || (dplx & ~1))
+               goto err_inval;
+
+       /* Fiber NIC's only allow 1000 Gbps Full duplex */
+       if ((adapter->hw.phy.media_type == e1000_media_type_internal_serdes) &&
+           spd != SPEED_1000 &&
+           dplx != DUPLEX_FULL)
+               goto err_inval;
+
+       switch (spd + dplx) {
+       case SPEED_10 + DUPLEX_HALF:
+               mac->forced_speed_duplex = ADVERTISE_10_HALF;
+               break;
+       case SPEED_10 + DUPLEX_FULL:
+               mac->forced_speed_duplex = ADVERTISE_10_FULL;
+               break;
+       case SPEED_100 + DUPLEX_HALF:
+               mac->forced_speed_duplex = ADVERTISE_100_HALF;
+               break;
+       case SPEED_100 + DUPLEX_FULL:
+               mac->forced_speed_duplex = ADVERTISE_100_FULL;
+               break;
+       case SPEED_1000 + DUPLEX_FULL:
+               mac->autoneg = 1;
+               adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;
+               break;
+       case SPEED_1000 + DUPLEX_HALF: /* not supported */
+       default:
+               goto err_inval;
+       }
+       return 0;
+
+err_inval:
+       dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n");
+       return -EINVAL;
+}
+
+static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ctrl, rctl, status;
+       u32 wufc = adapter->wol;
+#ifdef CONFIG_PM
+       int retval = 0;
+#endif
+
+       netif_device_detach(netdev);
+
+       if (netif_running(netdev))
+               igb_close(netdev);
+
+       igb_clear_interrupt_scheme(adapter);
+
+#ifdef CONFIG_PM
+       retval = pci_save_state(pdev);
+       if (retval)
+               return retval;
+#endif
+
+       status = rd32(E1000_STATUS);
+       if (status & E1000_STATUS_LU)
+               wufc &= ~E1000_WUFC_LNKC;
+
+       if (wufc) {
+               igb_setup_rctl(adapter);
+               igb_set_rx_mode(netdev);
+
+               /* turn on all-multi mode if wake on multicast is enabled */
+               if (wufc & E1000_WUFC_MC) {
+                       rctl = rd32(E1000_RCTL);
+                       rctl |= E1000_RCTL_MPE;
+                       wr32(E1000_RCTL, rctl);
+               }
+
+               ctrl = rd32(E1000_CTRL);
+               /* advertise wake from D3Cold */
+               #define E1000_CTRL_ADVD3WUC 0x00100000
+               /* phy power management enable */
+               #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
+               ctrl |= E1000_CTRL_ADVD3WUC;
+               wr32(E1000_CTRL, ctrl);
+
+               /* Allow time for pending master requests to run */
+               igb_disable_pcie_master(hw);
+
+               wr32(E1000_WUC, E1000_WUC_PME_EN);
+               wr32(E1000_WUFC, wufc);
+       } else {
+               wr32(E1000_WUC, 0);
+               wr32(E1000_WUFC, 0);
+       }
+
+       *enable_wake = wufc || adapter->en_mng_pt;
+       if (!*enable_wake)
+               igb_power_down_link(adapter);
+       else
+               igb_power_up_link(adapter);
+
+       /* Release control of h/w to f/w.  If f/w is AMT enabled, this
+        * would have already happened in close and is redundant. */
+       igb_release_hw_control(adapter);
+
+       pci_disable_device(pdev);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int igb_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       int retval;
+       bool wake;
+
+       retval = __igb_shutdown(pdev, &wake);
+       if (retval)
+               return retval;
+
+       if (wake) {
+               pci_prepare_to_sleep(pdev);
+       } else {
+               pci_wake_from_d3(pdev, false);
+               pci_set_power_state(pdev, PCI_D3hot);
+       }
+
+       return 0;
+}
+
+static int igb_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 err;
+
+       pci_set_power_state(pdev, PCI_D0);
+       pci_restore_state(pdev);
+       pci_save_state(pdev);
+
+       err = pci_enable_device_mem(pdev);
+       if (err) {
+               dev_err(&pdev->dev,
+                       "igb: Cannot enable PCI device from suspend\n");
+               return err;
+       }
+       pci_set_master(pdev);
+
+       pci_enable_wake(pdev, PCI_D3hot, 0);
+       pci_enable_wake(pdev, PCI_D3cold, 0);
+
+       if (igb_init_interrupt_scheme(adapter)) {
+               dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
+               return -ENOMEM;
+       }
+
+       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);
+
+       wr32(E1000_WUS, ~0);
+
+       if (netif_running(netdev)) {
+               err = igb_open(netdev);
+               if (err)
+                       return err;
+       }
+
+       netif_device_attach(netdev);
+
+       return 0;
+}
+#endif
+
+static void igb_shutdown(struct pci_dev *pdev)
+{
+       bool wake;
+
+       __igb_shutdown(pdev, &wake);
+
+       if (system_state == SYSTEM_POWER_OFF) {
+               pci_wake_from_d3(pdev, wake);
+               pci_set_power_state(pdev, PCI_D3hot);
+       }
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void igb_netpoll(struct net_device *netdev)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int i;
+
+       if (!adapter->msix_entries) {
+               struct igb_q_vector *q_vector = adapter->q_vector[0];
+               igb_irq_disable(adapter);
+               napi_schedule(&q_vector->napi);
+               return;
+       }
+
+       for (i = 0; i < adapter->num_q_vectors; i++) {
+               struct igb_q_vector *q_vector = adapter->q_vector[i];
+               wr32(E1000_EIMC, q_vector->eims_value);
+               napi_schedule(&q_vector->napi);
+       }
+}
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+
+/**
+ * igb_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci connection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev,
+                                             pci_channel_state_t state)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       netif_device_detach(netdev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       if (netif_running(netdev))
+               igb_down(adapter);
+       pci_disable_device(pdev);
+
+       /* Request a slot slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * igb_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot. Implementation
+ * resembles the first-half of the igb_resume routine.
+ */
+static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       pci_ers_result_t result;
+       int err;
+
+       if (pci_enable_device_mem(pdev)) {
+               dev_err(&pdev->dev,
+                       "Cannot re-enable PCI device after reset.\n");
+               result = PCI_ERS_RESULT_DISCONNECT;
+       } else {
+               pci_set_master(pdev);
+               pci_restore_state(pdev);
+               pci_save_state(pdev);
+
+               pci_enable_wake(pdev, PCI_D3hot, 0);
+               pci_enable_wake(pdev, PCI_D3cold, 0);
+
+               igb_reset(adapter);
+               wr32(E1000_WUS, ~0);
+               result = PCI_ERS_RESULT_RECOVERED;
+       }
+
+       err = pci_cleanup_aer_uncorrect_error_status(pdev);
+       if (err) {
+               dev_err(&pdev->dev, "pci_cleanup_aer_uncorrect_error_status "
+                       "failed 0x%0x\n", err);
+               /* non-fatal, continue */
+       }
+
+       return result;
+}
+
+/**
+ * igb_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation. Implementation resembles the
+ * second-half of the igb_resume routine.
+ */
+static void igb_io_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igb_adapter *adapter = netdev_priv(netdev);
+
+       if (netif_running(netdev)) {
+               if (igb_up(adapter)) {
+                       dev_err(&pdev->dev, "igb_up failed after reset\n");
+                       return;
+               }
+       }
+
+       netif_device_attach(netdev);
+
+       /* let the f/w know that the h/w is now under the control of the
+        * driver. */
+       igb_get_hw_control(adapter);
+}
+
+static void igb_rar_set_qsel(struct igb_adapter *adapter, u8 *addr, u32 index,
+                             u8 qsel)
+{
+       u32 rar_low, rar_high;
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* 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));
+
+       /* Indicate to hardware the Address is Valid. */
+       rar_high |= E1000_RAH_AV;
+
+       if (hw->mac.type == e1000_82575)
+               rar_high |= E1000_RAH_POOL_1 * qsel;
+       else
+               rar_high |= E1000_RAH_POOL_1 << qsel;
+
+       wr32(E1000_RAL(index), rar_low);
+       wrfl();
+       wr32(E1000_RAH(index), rar_high);
+       wrfl();
+}
+
+static int igb_set_vf_mac(struct igb_adapter *adapter,
+                          int vf, unsigned char *mac_addr)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       /* VF MAC addresses start at end of receive addresses and moves
+        * torwards the first, as a result a collision should not be possible */
+       int rar_entry = hw->mac.rar_entry_count - (vf + 1);
+
+       memcpy(adapter->vf_data[vf].vf_mac_addresses, mac_addr, ETH_ALEN);
+
+       igb_rar_set_qsel(adapter, mac_addr, rar_entry, vf);
+
+       return 0;
+}
+
+static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       if (!is_valid_ether_addr(mac) || (vf >= adapter->vfs_allocated_count))
+               return -EINVAL;
+       adapter->vf_data[vf].flags |= IGB_VF_FLAG_PF_SET_MAC;
+       dev_info(&adapter->pdev->dev, "setting MAC %pM on VF %d\n", mac, vf);
+       dev_info(&adapter->pdev->dev, "Reload the VF driver to make this"
+                                     " change effective.");
+       if (test_bit(__IGB_DOWN, &adapter->state)) {
+               dev_warn(&adapter->pdev->dev, "The VF MAC address has been set,"
+                        " but the PF device is not up.\n");
+               dev_warn(&adapter->pdev->dev, "Bring the PF device up before"
+                        " attempting to use the VF device.\n");
+       }
+       return igb_set_vf_mac(adapter, vf, mac);
+}
+
+static int igb_link_mbps(int internal_link_speed)
+{
+       switch (internal_link_speed) {
+       case SPEED_100:
+               return 100;
+       case SPEED_1000:
+               return 1000;
+       default:
+               return 0;
+       }
+}
+
+static void igb_set_vf_rate_limit(struct e1000_hw *hw, int vf, int tx_rate,
+                                 int link_speed)
+{
+       int rf_dec, rf_int;
+       u32 bcnrc_val;
+
+       if (tx_rate != 0) {
+               /* Calculate the rate factor values to set */
+               rf_int = link_speed / tx_rate;
+               rf_dec = (link_speed - (rf_int * tx_rate));
+               rf_dec = (rf_dec * (1<<E1000_RTTBCNRC_RF_INT_SHIFT)) / tx_rate;
+
+               bcnrc_val = E1000_RTTBCNRC_RS_ENA;
+               bcnrc_val |= ((rf_int<<E1000_RTTBCNRC_RF_INT_SHIFT) &
+                              E1000_RTTBCNRC_RF_INT_MASK);
+               bcnrc_val |= (rf_dec & E1000_RTTBCNRC_RF_DEC_MASK);
+       } else {
+               bcnrc_val = 0;
+       }
+
+       wr32(E1000_RTTDQSEL, vf); /* vf X uses queue X */
+       wr32(E1000_RTTBCNRC, bcnrc_val);
+}
+
+static void igb_check_vf_rate_limit(struct igb_adapter *adapter)
+{
+       int actual_link_speed, i;
+       bool reset_rate = false;
+
+       /* VF TX rate limit was not set or not supported */
+       if ((adapter->vf_rate_link_speed == 0) ||
+           (adapter->hw.mac.type != e1000_82576))
+               return;
+
+       actual_link_speed = igb_link_mbps(adapter->link_speed);
+       if (actual_link_speed != adapter->vf_rate_link_speed) {
+               reset_rate = true;
+               adapter->vf_rate_link_speed = 0;
+               dev_info(&adapter->pdev->dev,
+                        "Link speed has been changed. VF Transmit "
+                        "rate is disabled\n");
+       }
+
+       for (i = 0; i < adapter->vfs_allocated_count; i++) {
+               if (reset_rate)
+                       adapter->vf_data[i].tx_rate = 0;
+
+               igb_set_vf_rate_limit(&adapter->hw, i,
+                                     adapter->vf_data[i].tx_rate,
+                                     actual_link_speed);
+       }
+}
+
+static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int actual_link_speed;
+
+       if (hw->mac.type != e1000_82576)
+               return -EOPNOTSUPP;
+
+       actual_link_speed = igb_link_mbps(adapter->link_speed);
+       if ((vf >= adapter->vfs_allocated_count) ||
+           (!(rd32(E1000_STATUS) & E1000_STATUS_LU)) ||
+           (tx_rate < 0) || (tx_rate > actual_link_speed))
+               return -EINVAL;
+
+       adapter->vf_rate_link_speed = actual_link_speed;
+       adapter->vf_data[vf].tx_rate = (u16)tx_rate;
+       igb_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
+
+       return 0;
+}
+
+static int igb_ndo_get_vf_config(struct net_device *netdev,
+                                int vf, struct ifla_vf_info *ivi)
+{
+       struct igb_adapter *adapter = netdev_priv(netdev);
+       if (vf >= adapter->vfs_allocated_count)
+               return -EINVAL;
+       ivi->vf = vf;
+       memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);
+       ivi->tx_rate = adapter->vf_data[vf].tx_rate;
+       ivi->vlan = adapter->vf_data[vf].pf_vlan;
+       ivi->qos = adapter->vf_data[vf].pf_qos;
+       return 0;
+}
+
+static void igb_vmm_control(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 reg;
+
+       switch (hw->mac.type) {
+       case e1000_82575:
+       default:
+               /* replication is not supported for 82575 */
+               return;
+       case e1000_82576:
+               /* notify HW that the MAC is adding vlan tags */
+               reg = rd32(E1000_DTXCTL);
+               reg |= E1000_DTXCTL_VLAN_ADDED;
+               wr32(E1000_DTXCTL, reg);
+       case e1000_82580:
+               /* enable replication vlan tag stripping */
+               reg = rd32(E1000_RPLOLR);
+               reg |= E1000_RPLOLR_STRVLAN;
+               wr32(E1000_RPLOLR, reg);
+       case e1000_i350:
+               /* none of the above registers are supported by i350 */
+               break;
+       }
+
+       if (adapter->vfs_allocated_count) {
+               igb_vmdq_set_loopback_pf(hw, true);
+               igb_vmdq_set_replication_pf(hw, true);
+               igb_vmdq_set_anti_spoofing_pf(hw, true,
+                                               adapter->vfs_allocated_count);
+       } else {
+               igb_vmdq_set_loopback_pf(hw, false);
+               igb_vmdq_set_replication_pf(hw, false);
+       }
+}
+
+/* igb_main.c */
diff --git a/drivers/net/ethernet/intel/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile
new file mode 100644 (file)
index 0000000..0fa3db3
--- /dev/null
@@ -0,0 +1,38 @@
+################################################################################
+#
+# Intel(R) 82576 Virtual Function Linux driver
+# Copyright(c) 2009 - 2010 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
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) 82576 VF ethernet driver
+#
+
+obj-$(CONFIG_IGBVF) += igbvf.o
+
+igbvf-objs := vf.o \
+              mbx.o \
+              ethtool.o \
+              netdev.o
+
diff --git a/drivers/net/ethernet/intel/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h
new file mode 100644 (file)
index 0000000..79f2604
--- /dev/null
@@ -0,0 +1,125 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#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
+
+/* IVAR valid bit */
+#define E1000_IVAR_VALID        0x80
+
+/* 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_ERR_SE        0x02    /* Symbol Error */
+#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
+
+#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
+
+
+/* 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)
+
+/* Device Control */
+#define E1000_CTRL_RST      0x04000000  /* Global reset */
+
+/* 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_TXOFF      0x00000010      /* transmission paused */
+#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 SPEED_10    10
+#define SPEED_100   100
+#define SPEED_1000  1000
+#define HALF_DUPLEX 1
+#define FULL_DUPLEX 2
+
+/* Transmit Descriptor bit definitions */
+#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
+#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
+#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
+#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
+
+#define MAX_JUMBO_FRAME_SIZE    0x3F00
+
+/* 802.1q VLAN Packet Size */
+#define VLAN_TAG_SIZE              4    /* 802.3ac tag (not DMA'd) */
+
+/* Error Codes */
+#define E1000_SUCCESS      0
+#define E1000_ERR_CONFIG   3
+#define E1000_ERR_MAC_INIT 5
+#define E1000_ERR_MBX      15
+
+#ifndef ETH_ADDR_LEN
+#define ETH_ADDR_LEN                 6
+#endif
+
+/* 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_ADV_ONEBUF                0x02000000
+#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS          0x0A000000
+#define E1000_SRRCTL_DESCTYPE_MASK                      0x0E000000
+#define E1000_SRRCTL_DROP_EN                            0x80000000
+
+#define E1000_SRRCTL_BSIZEPKT_MASK      0x0000007F
+#define E1000_SRRCTL_BSIZEHDR_MASK      0x00003F00
+
+/* Additional Descriptor Control definitions */
+#define E1000_TXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Tx Queue */
+#define E1000_RXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Rx Queue */
+
+/* Direct Cache Access (DCA) definitions */
+#define E1000_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
+
+#define E1000_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
+
+#endif /* _E1000_DEFINES_H_ */
diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
new file mode 100644 (file)
index 0000000..b0b14d6
--- /dev/null
@@ -0,0 +1,534 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 2009 - 2010 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
+
+*******************************************************************************/
+
+/* ethtool support for igbvf */
+
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+
+#include "igbvf.h"
+#include <linux/if_vlan.h>
+
+
+struct igbvf_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int sizeof_stat;
+       int stat_offset;
+       int base_stat_offset;
+};
+
+#define IGBVF_STAT(current, base) \
+               sizeof(((struct igbvf_adapter *)0)->current), \
+               offsetof(struct igbvf_adapter, current), \
+               offsetof(struct igbvf_adapter, base)
+
+static const struct igbvf_stats igbvf_gstrings_stats[] = {
+       { "rx_packets", IGBVF_STAT(stats.gprc, stats.base_gprc) },
+       { "tx_packets", IGBVF_STAT(stats.gptc, stats.base_gptc) },
+       { "rx_bytes", IGBVF_STAT(stats.gorc, stats.base_gorc) },
+       { "tx_bytes", IGBVF_STAT(stats.gotc, stats.base_gotc) },
+       { "multicast", IGBVF_STAT(stats.mprc, stats.base_mprc) },
+       { "lbrx_bytes", IGBVF_STAT(stats.gorlbc, stats.base_gorlbc) },
+       { "lbrx_packets", IGBVF_STAT(stats.gprlbc, stats.base_gprlbc) },
+       { "tx_restart_queue", IGBVF_STAT(restart_queue, zero_base) },
+       { "rx_long_byte_count", IGBVF_STAT(stats.gorc, stats.base_gorc) },
+       { "rx_csum_offload_good", IGBVF_STAT(hw_csum_good, zero_base) },
+       { "rx_csum_offload_errors", IGBVF_STAT(hw_csum_err, zero_base) },
+       { "rx_header_split", IGBVF_STAT(rx_hdr_split, zero_base) },
+       { "alloc_rx_buff_failed", IGBVF_STAT(alloc_rx_buff_failed, zero_base) },
+};
+
+#define IGBVF_GLOBAL_STATS_LEN ARRAY_SIZE(igbvf_gstrings_stats)
+
+static const char igbvf_gstrings_test[][ETH_GSTRING_LEN] = {
+       "Link test   (on/offline)"
+};
+
+#define IGBVF_TEST_LEN ARRAY_SIZE(igbvf_gstrings_test)
+
+static int igbvf_get_settings(struct net_device *netdev,
+                              struct ethtool_cmd *ecmd)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 status;
+
+       ecmd->supported   = SUPPORTED_1000baseT_Full;
+
+       ecmd->advertising = ADVERTISED_1000baseT_Full;
+
+       ecmd->port = -1;
+       ecmd->transceiver = XCVR_DUMMY1;
+
+       status = er32(STATUS);
+       if (status & E1000_STATUS_LU) {
+               if (status & E1000_STATUS_SPEED_1000)
+                       ethtool_cmd_speed_set(ecmd, SPEED_1000);
+               else if (status & E1000_STATUS_SPEED_100)
+                       ethtool_cmd_speed_set(ecmd, SPEED_100);
+               else
+                       ethtool_cmd_speed_set(ecmd, SPEED_10);
+
+               if (status & E1000_STATUS_FD)
+                       ecmd->duplex = DUPLEX_FULL;
+               else
+                       ecmd->duplex = DUPLEX_HALF;
+       } else {
+               ethtool_cmd_speed_set(ecmd, -1);
+               ecmd->duplex = -1;
+       }
+
+       ecmd->autoneg = AUTONEG_DISABLE;
+
+       return 0;
+}
+
+static int igbvf_set_settings(struct net_device *netdev,
+                              struct ethtool_cmd *ecmd)
+{
+       return -EOPNOTSUPP;
+}
+
+static void igbvf_get_pauseparam(struct net_device *netdev,
+                                 struct ethtool_pauseparam *pause)
+{
+       return;
+}
+
+static int igbvf_set_pauseparam(struct net_device *netdev,
+                                struct ethtool_pauseparam *pause)
+{
+       return -EOPNOTSUPP;
+}
+
+static u32 igbvf_get_rx_csum(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       return !(adapter->flags & IGBVF_FLAG_RX_CSUM_DISABLED);
+}
+
+static int igbvf_set_rx_csum(struct net_device *netdev, u32 data)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       if (data)
+               adapter->flags &= ~IGBVF_FLAG_RX_CSUM_DISABLED;
+       else
+               adapter->flags |= IGBVF_FLAG_RX_CSUM_DISABLED;
+
+       return 0;
+}
+
+static u32 igbvf_get_tx_csum(struct net_device *netdev)
+{
+       return (netdev->features & NETIF_F_IP_CSUM) != 0;
+}
+
+static int igbvf_set_tx_csum(struct net_device *netdev, u32 data)
+{
+       if (data)
+               netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
+       else
+               netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
+       return 0;
+}
+
+static int igbvf_set_tso(struct net_device *netdev, u32 data)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       if (data) {
+               netdev->features |= NETIF_F_TSO;
+               netdev->features |= NETIF_F_TSO6;
+       } else {
+               netdev->features &= ~NETIF_F_TSO;
+               netdev->features &= ~NETIF_F_TSO6;
+       }
+
+       dev_info(&adapter->pdev->dev, "TSO is %s\n",
+                data ? "Enabled" : "Disabled");
+       return 0;
+}
+
+static u32 igbvf_get_msglevel(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       return adapter->msg_enable;
+}
+
+static void igbvf_set_msglevel(struct net_device *netdev, u32 data)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       adapter->msg_enable = data;
+}
+
+static int igbvf_get_regs_len(struct net_device *netdev)
+{
+#define IGBVF_REGS_LEN 8
+       return IGBVF_REGS_LEN * sizeof(u32);
+}
+
+static void igbvf_get_regs(struct net_device *netdev,
+                           struct ethtool_regs *regs, void *p)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       u32 *regs_buff = p;
+
+       memset(p, 0, IGBVF_REGS_LEN * sizeof(u32));
+
+       regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
+                       adapter->pdev->device;
+
+       regs_buff[0] = er32(CTRL);
+       regs_buff[1] = er32(STATUS);
+
+       regs_buff[2] = er32(RDLEN(0));
+       regs_buff[3] = er32(RDH(0));
+       regs_buff[4] = er32(RDT(0));
+
+       regs_buff[5] = er32(TDLEN(0));
+       regs_buff[6] = er32(TDH(0));
+       regs_buff[7] = er32(TDT(0));
+}
+
+static int igbvf_get_eeprom_len(struct net_device *netdev)
+{
+       return 0;
+}
+
+static int igbvf_get_eeprom(struct net_device *netdev,
+                            struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       return -EOPNOTSUPP;
+}
+
+static int igbvf_set_eeprom(struct net_device *netdev,
+                            struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       return -EOPNOTSUPP;
+}
+
+static void igbvf_get_drvinfo(struct net_device *netdev,
+                              struct ethtool_drvinfo *drvinfo)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       char firmware_version[32] = "N/A";
+
+       strncpy(drvinfo->driver,  igbvf_driver_name, 32);
+       strncpy(drvinfo->version, igbvf_driver_version, 32);
+       strncpy(drvinfo->fw_version, firmware_version, 32);
+       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
+       drvinfo->regdump_len = igbvf_get_regs_len(netdev);
+       drvinfo->eedump_len = igbvf_get_eeprom_len(netdev);
+}
+
+static void igbvf_get_ringparam(struct net_device *netdev,
+                                struct ethtool_ringparam *ring)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct igbvf_ring *tx_ring = adapter->tx_ring;
+       struct igbvf_ring *rx_ring = adapter->rx_ring;
+
+       ring->rx_max_pending = IGBVF_MAX_RXD;
+       ring->tx_max_pending = IGBVF_MAX_TXD;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = rx_ring->count;
+       ring->tx_pending = tx_ring->count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int igbvf_set_ringparam(struct net_device *netdev,
+                               struct ethtool_ringparam *ring)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct igbvf_ring *temp_ring;
+       int err = 0;
+       u32 new_rx_count, new_tx_count;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       new_rx_count = max(ring->rx_pending, (u32)IGBVF_MIN_RXD);
+       new_rx_count = min(new_rx_count, (u32)IGBVF_MAX_RXD);
+       new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
+
+       new_tx_count = max(ring->tx_pending, (u32)IGBVF_MIN_TXD);
+       new_tx_count = min(new_tx_count, (u32)IGBVF_MAX_TXD);
+       new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
+
+       if ((new_tx_count == adapter->tx_ring->count) &&
+           (new_rx_count == adapter->rx_ring->count)) {
+               /* nothing to do */
+               return 0;
+       }
+
+       while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
+               msleep(1);
+
+       if (!netif_running(adapter->netdev)) {
+               adapter->tx_ring->count = new_tx_count;
+               adapter->rx_ring->count = new_rx_count;
+               goto clear_reset;
+       }
+
+       temp_ring = vmalloc(sizeof(struct igbvf_ring));
+       if (!temp_ring) {
+               err = -ENOMEM;
+               goto clear_reset;
+       }
+
+       igbvf_down(adapter);
+
+       /*
+        * We can't just free everything and then setup again,
+        * because the ISRs in MSI-X mode get passed pointers
+        * to the tx and rx ring structs.
+        */
+       if (new_tx_count != adapter->tx_ring->count) {
+               memcpy(temp_ring, adapter->tx_ring, sizeof(struct igbvf_ring));
+
+               temp_ring->count = new_tx_count;
+               err = igbvf_setup_tx_resources(adapter, temp_ring);
+               if (err)
+                       goto err_setup;
+
+               igbvf_free_tx_resources(adapter->tx_ring);
+
+               memcpy(adapter->tx_ring, temp_ring, sizeof(struct igbvf_ring));
+       }
+
+       if (new_rx_count != adapter->rx_ring->count) {
+               memcpy(temp_ring, adapter->rx_ring, sizeof(struct igbvf_ring));
+
+               temp_ring->count = new_rx_count;
+               err = igbvf_setup_rx_resources(adapter, temp_ring);
+               if (err)
+                       goto err_setup;
+
+               igbvf_free_rx_resources(adapter->rx_ring);
+
+               memcpy(adapter->rx_ring, temp_ring,sizeof(struct igbvf_ring));
+       }
+err_setup:
+       igbvf_up(adapter);
+       vfree(temp_ring);
+clear_reset:
+       clear_bit(__IGBVF_RESETTING, &adapter->state);
+       return err;
+}
+
+static int igbvf_link_test(struct igbvf_adapter *adapter, u64 *data)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       *data = 0;
+
+       hw->mac.ops.check_for_link(hw);
+
+       if (!(er32(STATUS) & E1000_STATUS_LU))
+               *data = 1;
+
+       return *data;
+}
+
+static void igbvf_diag_test(struct net_device *netdev,
+                            struct ethtool_test *eth_test, u64 *data)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       set_bit(__IGBVF_TESTING, &adapter->state);
+
+       /*
+        * Link test performed before hardware reset so autoneg doesn't
+        * interfere with test result
+        */
+       if (igbvf_link_test(adapter, &data[0]))
+               eth_test->flags |= ETH_TEST_FL_FAILED;
+
+       clear_bit(__IGBVF_TESTING, &adapter->state);
+       msleep_interruptible(4 * 1000);
+}
+
+static void igbvf_get_wol(struct net_device *netdev,
+                          struct ethtool_wolinfo *wol)
+{
+       wol->supported = 0;
+       wol->wolopts = 0;
+}
+
+static int igbvf_set_wol(struct net_device *netdev,
+                         struct ethtool_wolinfo *wol)
+{
+       return -EOPNOTSUPP;
+}
+
+static int igbvf_get_coalesce(struct net_device *netdev,
+                              struct ethtool_coalesce *ec)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       if (adapter->itr_setting <= 3)
+               ec->rx_coalesce_usecs = adapter->itr_setting;
+       else
+               ec->rx_coalesce_usecs = adapter->itr_setting >> 2;
+
+       return 0;
+}
+
+static int igbvf_set_coalesce(struct net_device *netdev,
+                              struct ethtool_coalesce *ec)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       if ((ec->rx_coalesce_usecs > IGBVF_MAX_ITR_USECS) ||
+           ((ec->rx_coalesce_usecs > 3) &&
+            (ec->rx_coalesce_usecs < IGBVF_MIN_ITR_USECS)) ||
+           (ec->rx_coalesce_usecs == 2))
+               return -EINVAL;
+
+       /* convert to rate of irq's per second */
+       if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3) {
+               adapter->itr = IGBVF_START_ITR;
+               adapter->itr_setting = ec->rx_coalesce_usecs;
+       } else {
+               adapter->itr = ec->rx_coalesce_usecs << 2;
+               adapter->itr_setting = adapter->itr;
+       }
+
+       writel(adapter->itr,
+              hw->hw_addr + adapter->rx_ring[0].itr_register);
+
+       return 0;
+}
+
+static int igbvf_nway_reset(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       if (netif_running(netdev))
+               igbvf_reinit_locked(adapter);
+       return 0;
+}
+
+
+static void igbvf_get_ethtool_stats(struct net_device *netdev,
+                                    struct ethtool_stats *stats,
+                                    u64 *data)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       int i;
+
+       igbvf_update_stats(adapter);
+       for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) {
+               char *p = (char *)adapter +
+                         igbvf_gstrings_stats[i].stat_offset;
+               char *b = (char *)adapter +
+                         igbvf_gstrings_stats[i].base_stat_offset;
+               data[i] = ((igbvf_gstrings_stats[i].sizeof_stat ==
+                           sizeof(u64)) ? (*(u64 *)p - *(u64 *)b) :
+                           (*(u32 *)p - *(u32 *)b));
+       }
+
+}
+
+static int igbvf_get_sset_count(struct net_device *dev, int stringset)
+{
+       switch(stringset) {
+       case ETH_SS_TEST:
+               return IGBVF_TEST_LEN;
+       case ETH_SS_STATS:
+               return IGBVF_GLOBAL_STATS_LEN;
+       default:
+               return -EINVAL;
+       }
+}
+
+static void igbvf_get_strings(struct net_device *netdev, u32 stringset,
+                              u8 *data)
+{
+       u8 *p = data;
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_TEST:
+               memcpy(data, *igbvf_gstrings_test, sizeof(igbvf_gstrings_test));
+               break;
+       case ETH_SS_STATS:
+               for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) {
+                       memcpy(p, igbvf_gstrings_stats[i].stat_string,
+                              ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+               break;
+       }
+}
+
+static const struct ethtool_ops igbvf_ethtool_ops = {
+       .get_settings           = igbvf_get_settings,
+       .set_settings           = igbvf_set_settings,
+       .get_drvinfo            = igbvf_get_drvinfo,
+       .get_regs_len           = igbvf_get_regs_len,
+       .get_regs               = igbvf_get_regs,
+       .get_wol                = igbvf_get_wol,
+       .set_wol                = igbvf_set_wol,
+       .get_msglevel           = igbvf_get_msglevel,
+       .set_msglevel           = igbvf_set_msglevel,
+       .nway_reset             = igbvf_nway_reset,
+       .get_link               = ethtool_op_get_link,
+       .get_eeprom_len         = igbvf_get_eeprom_len,
+       .get_eeprom             = igbvf_get_eeprom,
+       .set_eeprom             = igbvf_set_eeprom,
+       .get_ringparam          = igbvf_get_ringparam,
+       .set_ringparam          = igbvf_set_ringparam,
+       .get_pauseparam         = igbvf_get_pauseparam,
+       .set_pauseparam         = igbvf_set_pauseparam,
+       .get_rx_csum            = igbvf_get_rx_csum,
+       .set_rx_csum            = igbvf_set_rx_csum,
+       .get_tx_csum            = igbvf_get_tx_csum,
+       .set_tx_csum            = igbvf_set_tx_csum,
+       .get_sg                 = ethtool_op_get_sg,
+       .set_sg                 = ethtool_op_set_sg,
+       .get_tso                = ethtool_op_get_tso,
+       .set_tso                = igbvf_set_tso,
+       .self_test              = igbvf_diag_test,
+       .get_sset_count         = igbvf_get_sset_count,
+       .get_strings            = igbvf_get_strings,
+       .get_ethtool_stats      = igbvf_get_ethtool_stats,
+       .get_coalesce           = igbvf_get_coalesce,
+       .set_coalesce           = igbvf_set_coalesce,
+};
+
+void igbvf_set_ethtool_ops(struct net_device *netdev)
+{
+       /* have to "undeclare" const on this struct to remove warnings */
+       SET_ETHTOOL_OPS(netdev, (struct ethtool_ops *)&igbvf_ethtool_ops);
+}
diff --git a/drivers/net/ethernet/intel/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
new file mode 100644 (file)
index 0000000..fd4a7b7
--- /dev/null
@@ -0,0 +1,326 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 2009 - 2010 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
+
+*******************************************************************************/
+
+/* Linux PRO/1000 Ethernet Driver main header file */
+
+#ifndef _IGBVF_H_
+#define _IGBVF_H_
+
+#include <linux/types.h>
+#include <linux/timer.h>
+#include <linux/io.h>
+#include <linux/netdevice.h>
+#include <linux/if_vlan.h>
+
+#include "vf.h"
+
+/* Forward declarations */
+struct igbvf_info;
+struct igbvf_adapter;
+
+/* Interrupt defines */
+#define IGBVF_START_ITR                 648 /* ~6000 ints/sec */
+
+/* Interrupt modes, as used by the IntMode parameter */
+#define IGBVF_INT_MODE_LEGACY           0
+#define IGBVF_INT_MODE_MSI              1
+#define IGBVF_INT_MODE_MSIX             2
+
+/* Tx/Rx descriptor defines */
+#define IGBVF_DEFAULT_TXD               256
+#define IGBVF_MAX_TXD                   4096
+#define IGBVF_MIN_TXD                   80
+
+#define IGBVF_DEFAULT_RXD               256
+#define IGBVF_MAX_RXD                   4096
+#define IGBVF_MIN_RXD                   80
+
+#define IGBVF_MIN_ITR_USECS             10 /* 100000 irq/sec */
+#define IGBVF_MAX_ITR_USECS             10000 /* 100    irq/sec */
+
+/* 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 IGBVF_RX_PTHRESH                16
+#define IGBVF_RX_HTHRESH                8
+#define IGBVF_RX_WTHRESH                1
+
+/* this is the size past which hardware will drop packets when setting LPE=0 */
+#define MAXIMUM_ETHERNET_VLAN_SIZE      1522
+
+#define IGBVF_FC_PAUSE_TIME             0x0680 /* 858 usec */
+
+/* How many Tx Descriptors do we need to call netif_wake_queue ? */
+#define IGBVF_TX_QUEUE_WAKE             32
+/* How many Rx Buffers do we bundle into one write to the hardware ? */
+#define IGBVF_RX_BUFFER_WRITE           16 /* Must be power of 2 */
+
+#define AUTO_ALL_MODES                  0
+#define IGBVF_EEPROM_APME               0x0400
+
+#define IGBVF_MNG_VLAN_NONE             (-1)
+
+/* Number of packet split data buffers (not including the header buffer) */
+#define PS_PAGE_BUFFERS                 (MAX_PS_BUFFERS - 1)
+
+enum igbvf_boards {
+       board_vf,
+       board_i350_vf,
+};
+
+struct igbvf_queue_stats {
+       u64 packets;
+       u64 bytes;
+};
+
+/*
+ * wrappers around a pointer to a socket buffer,
+ * so a DMA handle can be stored along with the buffer
+ */
+struct igbvf_buffer {
+       dma_addr_t dma;
+       struct sk_buff *skb;
+       union {
+               /* Tx */
+               struct {
+                       unsigned long time_stamp;
+                       u16 length;
+                       u16 next_to_watch;
+                       u16 mapped_as_page;
+               };
+               /* Rx */
+               struct {
+                       struct page *page;
+                       u64 page_dma;
+                       unsigned int page_offset;
+               };
+       };
+};
+
+union igbvf_desc {
+       union e1000_adv_rx_desc rx_desc;
+       union e1000_adv_tx_desc tx_desc;
+       struct e1000_adv_tx_context_desc tx_context_desc;
+};
+
+struct igbvf_ring {
+       struct igbvf_adapter *adapter;  /* backlink */
+       union igbvf_desc *desc;         /* pointer to ring memory  */
+       dma_addr_t dma;                 /* phys address of ring    */
+       unsigned int size;              /* length of ring in bytes */
+       unsigned int count;             /* number of desc. in ring */
+
+       u16 next_to_use;
+       u16 next_to_clean;
+
+       u16 head;
+       u16 tail;
+
+       /* array of buffer information structs */
+       struct igbvf_buffer *buffer_info;
+       struct napi_struct napi;
+
+       char name[IFNAMSIZ + 5];
+       u32 eims_value;
+       u32 itr_val;
+       u16 itr_register;
+       int set_itr;
+
+       struct sk_buff *rx_skb_top;
+
+       struct igbvf_queue_stats stats;
+};
+
+/* board specific private data structure */
+struct igbvf_adapter {
+       struct timer_list watchdog_timer;
+       struct timer_list blink_timer;
+
+       struct work_struct reset_task;
+       struct work_struct watchdog_task;
+
+       const struct igbvf_info *ei;
+
+       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       u32 bd_number;
+       u32 rx_buffer_len;
+       u32 polling_interval;
+       u16 mng_vlan_id;
+       u16 link_speed;
+       u16 link_duplex;
+
+       spinlock_t tx_queue_lock; /* prevent concurrent tail updates */
+
+       /* track device up/down/testing state */
+       unsigned long state;
+
+       /* Interrupt Throttle Rate */
+       u32 itr;
+       u32 itr_setting;
+       u16 tx_itr;
+       u16 rx_itr;
+
+       /*
+        * Tx
+        */
+       struct igbvf_ring *tx_ring /* One per active queue */
+       ____cacheline_aligned_in_smp;
+
+       unsigned int restart_queue;
+       u32 txd_cmd;
+
+       u32 tx_int_delay;
+       u32 tx_abs_int_delay;
+
+       unsigned int total_tx_bytes;
+       unsigned int total_tx_packets;
+       unsigned int total_rx_bytes;
+       unsigned int total_rx_packets;
+
+       /* Tx stats */
+       u32 tx_timeout_count;
+       u32 tx_fifo_head;
+       u32 tx_head_addr;
+       u32 tx_fifo_size;
+       u32 tx_dma_failed;
+
+       /*
+        * Rx
+        */
+       struct igbvf_ring *rx_ring;
+
+       u32 rx_int_delay;
+       u32 rx_abs_int_delay;
+
+       /* Rx stats */
+       u64 hw_csum_err;
+       u64 hw_csum_good;
+       u64 rx_hdr_split;
+       u32 alloc_rx_buff_failed;
+       u32 rx_dma_failed;
+
+       unsigned int rx_ps_hdr_size;
+       u32 max_frame_size;
+       u32 min_frame_size;
+
+       /* OS defined structs */
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+       struct net_device_stats net_stats;
+       spinlock_t stats_lock;      /* prevent concurrent stats updates */
+
+       /* structs defined in e1000_hw.h */
+       struct e1000_hw hw;
+
+       /* The VF counters don't clear on read so we have to get a base
+        * count on driver start up and always subtract that base on
+        * on the first update, thus the flag..
+        */
+       struct e1000_vf_stats stats;
+       u64 zero_base;
+
+       struct igbvf_ring test_tx_ring;
+       struct igbvf_ring test_rx_ring;
+       u32 test_icr;
+
+       u32 msg_enable;
+       struct msix_entry *msix_entries;
+       int int_mode;
+       u32 eims_enable_mask;
+       u32 eims_other;
+       u32 int_counter0;
+       u32 int_counter1;
+
+       u32 eeprom_wol;
+       u32 wol;
+       u32 pba;
+
+       bool fc_autoneg;
+
+       unsigned long led_status;
+
+       unsigned int flags;
+       unsigned long last_reset;
+};
+
+struct igbvf_info {
+       enum e1000_mac_type     mac;
+       unsigned int            flags;
+       u32                     pba;
+       void                    (*init_ops)(struct e1000_hw *);
+       s32                     (*get_variants)(struct igbvf_adapter *);
+};
+
+/* hardware capability, feature, and workaround flags */
+#define IGBVF_FLAG_RX_CSUM_DISABLED             (1 << 0)
+
+#define IGBVF_RX_DESC_ADV(R, i)     \
+       (&((((R).desc))[i].rx_desc))
+#define IGBVF_TX_DESC_ADV(R, i)     \
+       (&((((R).desc))[i].tx_desc))
+#define IGBVF_TX_CTXTDESC_ADV(R, i) \
+       (&((((R).desc))[i].tx_context_desc))
+
+enum igbvf_state_t {
+       __IGBVF_TESTING,
+       __IGBVF_RESETTING,
+       __IGBVF_DOWN
+};
+
+enum latency_range {
+       lowest_latency = 0,
+       low_latency = 1,
+       bulk_latency = 2,
+       latency_invalid = 255
+};
+
+extern char igbvf_driver_name[];
+extern const char igbvf_driver_version[];
+
+extern void igbvf_check_options(struct igbvf_adapter *);
+extern void igbvf_set_ethtool_ops(struct net_device *);
+
+extern int igbvf_up(struct igbvf_adapter *);
+extern void igbvf_down(struct igbvf_adapter *);
+extern void igbvf_reinit_locked(struct igbvf_adapter *);
+extern int igbvf_setup_rx_resources(struct igbvf_adapter *, struct igbvf_ring *);
+extern int igbvf_setup_tx_resources(struct igbvf_adapter *, struct igbvf_ring *);
+extern void igbvf_free_rx_resources(struct igbvf_ring *);
+extern void igbvf_free_tx_resources(struct igbvf_ring *);
+extern void igbvf_update_stats(struct igbvf_adapter *);
+
+extern unsigned int copybreak;
+
+#endif /* _IGBVF_H_ */
diff --git a/drivers/net/ethernet/intel/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c
new file mode 100644 (file)
index 0000000..3d6f4cc
--- /dev/null
@@ -0,0 +1,350 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 2009 - 2010 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
+
+*******************************************************************************/
+
+#include "mbx.h"
+
+/**
+ *  e1000_poll_for_msg - Wait for message notification
+ *  @hw: pointer to the HW structure
+ *
+ *  returns SUCCESS if it successfully received a message notification
+ **/
+static s32 e1000_poll_for_msg(struct e1000_hw *hw)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       if (!mbx->ops.check_for_msg)
+               goto out;
+
+       while (countdown && mbx->ops.check_for_msg(hw)) {
+               countdown--;
+               udelay(mbx->usec_delay);
+       }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
+out:
+       return countdown ? E1000_SUCCESS : -E1000_ERR_MBX;
+}
+
+/**
+ *  e1000_poll_for_ack - Wait for message acknowledgement
+ *  @hw: pointer to the HW structure
+ *
+ *  returns SUCCESS if it successfully received a message acknowledgement
+ **/
+static s32 e1000_poll_for_ack(struct e1000_hw *hw)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       if (!mbx->ops.check_for_ack)
+               goto out;
+
+       while (countdown && mbx->ops.check_for_ack(hw)) {
+               countdown--;
+               udelay(mbx->usec_delay);
+       }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
+out:
+       return countdown ? E1000_SUCCESS : -E1000_ERR_MBX;
+}
+
+/**
+ *  e1000_read_posted_mbx - Wait for message notification and receive message
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns SUCCESS if it successfully received a message notification and
+ *  copied it into the receive buffer.
+ **/
+static s32 e1000_read_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (!mbx->ops.read)
+               goto out;
+
+       ret_val = e1000_poll_for_msg(hw);
+
+       /* if ack received read message, otherwise we timed out */
+       if (!ret_val)
+               ret_val = mbx->ops.read(hw, msg, size);
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_write_posted_mbx - Write a message to the mailbox, wait for ack
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer and
+ *  received an ack to that message within delay * timeout period
+ **/
+static s32 e1000_write_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = -E1000_ERR_MBX;
+
+       /* exit if we either can't write or there isn't a defined timeout */
+       if (!mbx->ops.write || !mbx->timeout)
+               goto out;
+
+       /* send msg*/
+       ret_val = mbx->ops.write(hw, msg, size);
+
+       /* if msg sent wait until we receive an ack */
+       if (!ret_val)
+               ret_val = e1000_poll_for_ack(hw);
+out:
+       return ret_val;
+}
+
+/**
+ *  e1000_read_v2p_mailbox - read v2p mailbox
+ *  @hw: pointer to the HW structure
+ *
+ *  This function is used to read the v2p mailbox without losing the read to
+ *  clear status bits.
+ **/
+static u32 e1000_read_v2p_mailbox(struct e1000_hw *hw)
+{
+       u32 v2p_mailbox = er32(V2PMAILBOX(0));
+
+       v2p_mailbox |= hw->dev_spec.vf.v2p_mailbox;
+       hw->dev_spec.vf.v2p_mailbox |= v2p_mailbox & E1000_V2PMAILBOX_R2C_BITS;
+
+       return v2p_mailbox;
+}
+
+/**
+ *  e1000_check_for_bit_vf - Determine if a status bit was set
+ *  @hw: pointer to the HW structure
+ *  @mask: bitmask for bits to be tested and cleared
+ *
+ *  This function is used to check for the read to clear bits within
+ *  the V2P mailbox.
+ **/
+static s32 e1000_check_for_bit_vf(struct e1000_hw *hw, u32 mask)
+{
+       u32 v2p_mailbox = e1000_read_v2p_mailbox(hw);
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (v2p_mailbox & mask)
+               ret_val = E1000_SUCCESS;
+
+       hw->dev_spec.vf.v2p_mailbox &= ~mask;
+
+       return ret_val;
+}
+
+/**
+ *  e1000_check_for_msg_vf - checks to see if the PF has sent mail
+ *  @hw: pointer to the HW structure
+ *
+ *  returns SUCCESS if the PF has set the Status bit or else ERR_MBX
+ **/
+static s32 e1000_check_for_msg_vf(struct e1000_hw *hw)
+{
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (!e1000_check_for_bit_vf(hw, E1000_V2PMAILBOX_PFSTS)) {
+               ret_val = E1000_SUCCESS;
+               hw->mbx.stats.reqs++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_check_for_ack_vf - checks to see if the PF has ACK'd
+ *  @hw: pointer to the HW structure
+ *
+ *  returns SUCCESS if the PF has set the ACK bit or else ERR_MBX
+ **/
+static s32 e1000_check_for_ack_vf(struct e1000_hw *hw)
+{
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (!e1000_check_for_bit_vf(hw, E1000_V2PMAILBOX_PFACK)) {
+               ret_val = E1000_SUCCESS;
+               hw->mbx.stats.acks++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_check_for_rst_vf - checks to see if the PF has reset
+ *  @hw: pointer to the HW structure
+ *
+ *  returns true if the PF has set the reset done bit or else false
+ **/
+static s32 e1000_check_for_rst_vf(struct e1000_hw *hw)
+{
+       s32 ret_val = -E1000_ERR_MBX;
+
+       if (!e1000_check_for_bit_vf(hw, (E1000_V2PMAILBOX_RSTD |
+                                        E1000_V2PMAILBOX_RSTI))) {
+               ret_val = E1000_SUCCESS;
+               hw->mbx.stats.rsts++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_obtain_mbx_lock_vf - obtain mailbox lock
+ *  @hw: pointer to the HW structure
+ *
+ *  return SUCCESS if we obtained the mailbox lock
+ **/
+static s32 e1000_obtain_mbx_lock_vf(struct e1000_hw *hw)
+{
+       s32 ret_val = -E1000_ERR_MBX;
+
+       /* Take ownership of the buffer */
+       ew32(V2PMAILBOX(0), E1000_V2PMAILBOX_VFU);
+
+       /* reserve mailbox for vf use */
+       if (e1000_read_v2p_mailbox(hw) & E1000_V2PMAILBOX_VFU)
+               ret_val = E1000_SUCCESS;
+
+       return ret_val;
+}
+
+/**
+ *  e1000_write_mbx_vf - Write a message to the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer
+ **/
+static s32 e1000_write_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size)
+{
+       s32 err;
+       u16 i;
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       err = e1000_obtain_mbx_lock_vf(hw);
+       if (err)
+               goto out_no_write;
+
+       /* flush any ack or msg as we are going to overwrite mailbox */
+       e1000_check_for_ack_vf(hw);
+       e1000_check_for_msg_vf(hw);
+
+       /* copy the caller specified message to the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               array_ew32(VMBMEM(0), i, msg[i]);
+
+       /* update stats */
+       hw->mbx.stats.msgs_tx++;
+
+       /* Drop VFU and interrupt the PF to tell it a message has been sent */
+       ew32(V2PMAILBOX(0), E1000_V2PMAILBOX_REQ);
+
+out_no_write:
+       return err;
+}
+
+/**
+ *  e1000_read_mbx_vf - Reads a message from the inbox intended for vf
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns SUCCESS if it successfuly read message from buffer
+ **/
+static s32 e1000_read_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size)
+{
+       s32 err;
+       u16 i;
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       err = e1000_obtain_mbx_lock_vf(hw);
+       if (err)
+               goto out_no_read;
+
+       /* copy the message from the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               msg[i] = array_er32(VMBMEM(0), i);
+
+       /* Acknowledge receipt and release mailbox, then we're done */
+       ew32(V2PMAILBOX(0), E1000_V2PMAILBOX_ACK);
+
+       /* update stats */
+       hw->mbx.stats.msgs_rx++;
+
+out_no_read:
+       return err;
+}
+
+/**
+ *  e1000_init_mbx_params_vf - set initial values for vf mailbox
+ *  @hw: pointer to the HW structure
+ *
+ *  Initializes the hw->mbx struct to correct values for vf mailbox
+ */
+s32 e1000_init_mbx_params_vf(struct e1000_hw *hw)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+
+       /* start mailbox as timed out and let the reset_hw call set the timeout
+        * value to being communications */
+       mbx->timeout = 0;
+       mbx->usec_delay = E1000_VF_MBX_INIT_DELAY;
+
+       mbx->size = E1000_VFMAILBOX_SIZE;
+
+       mbx->ops.read = e1000_read_mbx_vf;
+       mbx->ops.write = e1000_write_mbx_vf;
+       mbx->ops.read_posted = e1000_read_posted_mbx;
+       mbx->ops.write_posted = e1000_write_posted_mbx;
+       mbx->ops.check_for_msg = e1000_check_for_msg_vf;
+       mbx->ops.check_for_ack = e1000_check_for_ack_vf;
+       mbx->ops.check_for_rst = e1000_check_for_rst_vf;
+
+       mbx->stats.msgs_tx = 0;
+       mbx->stats.msgs_rx = 0;
+       mbx->stats.reqs = 0;
+       mbx->stats.acks = 0;
+       mbx->stats.rsts = 0;
+
+       return E1000_SUCCESS;
+}
+
diff --git a/drivers/net/ethernet/intel/igbvf/mbx.h b/drivers/net/ethernet/intel/igbvf/mbx.h
new file mode 100644 (file)
index 0000000..c2883c4
--- /dev/null
@@ -0,0 +1,75 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#ifndef _E1000_MBX_H_
+#define _E1000_MBX_H_
+
+#include "vf.h"
+
+#define E1000_V2PMAILBOX_REQ   0x00000001 /* Request for PF Ready bit */
+#define E1000_V2PMAILBOX_ACK   0x00000002 /* Ack PF message received */
+#define E1000_V2PMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
+#define E1000_V2PMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
+#define E1000_V2PMAILBOX_PFSTS 0x00000010 /* PF wrote a message in the MB */
+#define E1000_V2PMAILBOX_PFACK 0x00000020 /* PF ack the previous VF msg */
+#define E1000_V2PMAILBOX_RSTI  0x00000040 /* PF has reset indication */
+#define E1000_V2PMAILBOX_RSTD  0x00000080 /* PF has indicated reset done */
+#define E1000_V2PMAILBOX_R2C_BITS 0x000000B0 /* All read to clear bits */
+
+#define E1000_VFMAILBOX_SIZE   16 /* 16 32 bit words - 64 bytes */
+
+/* If it's a E1000_VF_* msg then it originates in the VF and is sent to the
+ * PF.  The reverse is true if it is E1000_PF_*.
+ * Message ACK's are the value or'd with 0xF0000000
+ */
+#define E1000_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
+                                               * this are the ACK */
+#define E1000_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
+                                               * this are the NACK */
+#define E1000_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
+                                                 clear to send requests */
+
+/* We have a total wait time of 1s for vf mailbox posted messages */
+#define E1000_VF_MBX_INIT_TIMEOUT 2000 /* retry count for mailbox timeout */
+#define E1000_VF_MBX_INIT_DELAY   500  /* usec delay between retries */
+
+#define E1000_VT_MSGINFO_SHIFT    16
+/* bits 23:16 are used for exra info for certain messages */
+#define E1000_VT_MSGINFO_MASK     (0xFF << E1000_VT_MSGINFO_SHIFT)
+
+#define E1000_VF_RESET            0x01 /* VF requests reset */
+#define E1000_VF_SET_MAC_ADDR     0x02 /* VF requests PF to set MAC addr */
+#define E1000_VF_SET_MULTICAST    0x03 /* VF requests PF to set MC addr */
+#define E1000_VF_SET_VLAN         0x04 /* VF requests PF to set VLAN */
+#define E1000_VF_SET_LPE          0x05 /* VF requests PF to set VMOLR.LPE */
+
+#define E1000_PF_CONTROL_MSG      0x0100 /* PF control message */
+
+void e1000_init_mbx_ops_generic(struct e1000_hw *hw);
+s32 e1000_init_mbx_params_vf(struct e1000_hw *);
+
+#endif /* _E1000_MBX_H_ */
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
new file mode 100644 (file)
index 0000000..40ed066
--- /dev/null
@@ -0,0 +1,2859 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 2009 - 2010 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
+
+*******************************************************************************/
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/vmalloc.h>
+#include <linux/pagemap.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/tcp.h>
+#include <linux/ipv6.h>
+#include <linux/slab.h>
+#include <net/checksum.h>
+#include <net/ip6_checksum.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+#include <linux/prefetch.h>
+
+#include "igbvf.h"
+
+#define DRV_VERSION "2.0.0-k"
+char igbvf_driver_name[] = "igbvf";
+const char igbvf_driver_version[] = DRV_VERSION;
+static const char igbvf_driver_string[] =
+                               "Intel(R) Virtual Function Network Driver";
+static const char igbvf_copyright[] =
+                               "Copyright (c) 2009 - 2010 Intel Corporation.";
+
+static int igbvf_poll(struct napi_struct *napi, int budget);
+static void igbvf_reset(struct igbvf_adapter *);
+static void igbvf_set_interrupt_capability(struct igbvf_adapter *);
+static void igbvf_reset_interrupt_capability(struct igbvf_adapter *);
+
+static struct igbvf_info igbvf_vf_info = {
+       .mac                    = e1000_vfadapt,
+       .flags                  = 0,
+       .pba                    = 10,
+       .init_ops               = e1000_init_function_pointers_vf,
+};
+
+static struct igbvf_info igbvf_i350_vf_info = {
+       .mac                    = e1000_vfadapt_i350,
+       .flags                  = 0,
+       .pba                    = 10,
+       .init_ops               = e1000_init_function_pointers_vf,
+};
+
+static const struct igbvf_info *igbvf_info_tbl[] = {
+       [board_vf]              = &igbvf_vf_info,
+       [board_i350_vf]         = &igbvf_i350_vf_info,
+};
+
+/**
+ * igbvf_desc_unused - calculate if we have unused descriptors
+ **/
+static int igbvf_desc_unused(struct igbvf_ring *ring)
+{
+       if (ring->next_to_clean > ring->next_to_use)
+               return ring->next_to_clean - ring->next_to_use - 1;
+
+       return ring->count + ring->next_to_clean - ring->next_to_use - 1;
+}
+
+/**
+ * igbvf_receive_skb - helper function to handle Rx indications
+ * @adapter: board private structure
+ * @status: descriptor status field as written by hardware
+ * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
+ * @skb: pointer to sk_buff to be indicated to stack
+ **/
+static void igbvf_receive_skb(struct igbvf_adapter *adapter,
+                              struct net_device *netdev,
+                              struct sk_buff *skb,
+                              u32 status, u16 vlan)
+{
+       if (status & E1000_RXD_STAT_VP) {
+               u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
+
+               __vlan_hwaccel_put_tag(skb, vid);
+       }
+       netif_receive_skb(skb);
+}
+
+static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
+                                         u32 status_err, struct sk_buff *skb)
+{
+       skb_checksum_none_assert(skb);
+
+       /* Ignore Checksum bit is set or checksum is disabled through ethtool */
+       if ((status_err & E1000_RXD_STAT_IXSM) ||
+           (adapter->flags & IGBVF_FLAG_RX_CSUM_DISABLED))
+               return;
+
+       /* TCP/UDP checksum error bit is set */
+       if (status_err &
+           (E1000_RXDEXT_STATERR_TCPE | E1000_RXDEXT_STATERR_IPE)) {
+               /* let the stack verify checksum errors */
+               adapter->hw_csum_err++;
+               return;
+       }
+
+       /* It must be a TCP or UDP packet with a valid checksum */
+       if (status_err & (E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_UDPCS))
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+       adapter->hw_csum_good++;
+}
+
+/**
+ * igbvf_alloc_rx_buffers - Replace used receive buffers; packet split
+ * @rx_ring: address of ring structure to repopulate
+ * @cleaned_count: number of buffers to repopulate
+ **/
+static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring,
+                                   int cleaned_count)
+{
+       struct igbvf_adapter *adapter = rx_ring->adapter;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       union e1000_adv_rx_desc *rx_desc;
+       struct igbvf_buffer *buffer_info;
+       struct sk_buff *skb;
+       unsigned int i;
+       int bufsz;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+
+       if (adapter->rx_ps_hdr_size)
+               bufsz = adapter->rx_ps_hdr_size;
+       else
+               bufsz = adapter->rx_buffer_len;
+
+       while (cleaned_count--) {
+               rx_desc = IGBVF_RX_DESC_ADV(*rx_ring, i);
+
+               if (adapter->rx_ps_hdr_size && !buffer_info->page_dma) {
+                       if (!buffer_info->page) {
+                               buffer_info->page = alloc_page(GFP_ATOMIC);
+                               if (!buffer_info->page) {
+                                       adapter->alloc_rx_buff_failed++;
+                                       goto no_buffers;
+                               }
+                               buffer_info->page_offset = 0;
+                       } else {
+                               buffer_info->page_offset ^= PAGE_SIZE / 2;
+                       }
+                       buffer_info->page_dma =
+                               dma_map_page(&pdev->dev, buffer_info->page,
+                                            buffer_info->page_offset,
+                                            PAGE_SIZE / 2,
+                                            DMA_FROM_DEVICE);
+               }
+
+               if (!buffer_info->skb) {
+                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
+                       if (!skb) {
+                               adapter->alloc_rx_buff_failed++;
+                               goto no_buffers;
+                       }
+
+                       buffer_info->skb = skb;
+                       buffer_info->dma = dma_map_single(&pdev->dev, skb->data,
+                                                         bufsz,
+                                                         DMA_FROM_DEVICE);
+               }
+               /* Refresh the desc even if buffer_addrs didn't change because
+                * each write-back erases this info. */
+               if (adapter->rx_ps_hdr_size) {
+                       rx_desc->read.pkt_addr =
+                            cpu_to_le64(buffer_info->page_dma);
+                       rx_desc->read.hdr_addr = cpu_to_le64(buffer_info->dma);
+               } else {
+                       rx_desc->read.pkt_addr =
+                            cpu_to_le64(buffer_info->dma);
+                       rx_desc->read.hdr_addr = 0;
+               }
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+no_buffers:
+       if (rx_ring->next_to_use != i) {
+               rx_ring->next_to_use = i;
+               if (i == 0)
+                       i = (rx_ring->count - 1);
+               else
+                       i--;
+
+               /* Force memory writes to complete before letting h/w
+                * know there are new descriptors to fetch.  (Only
+                * applicable for weak-ordered memory model archs,
+                * such as IA-64). */
+               wmb();
+               writel(i, adapter->hw.hw_addr + rx_ring->tail);
+       }
+}
+
+/**
+ * igbvf_clean_rx_irq - Send received data up the network stack; legacy
+ * @adapter: board private structure
+ *
+ * the return value indicates whether actual cleaning was done, there
+ * is no guarantee that everything was cleaned
+ **/
+static bool igbvf_clean_rx_irq(struct igbvf_adapter *adapter,
+                               int *work_done, int work_to_do)
+{
+       struct igbvf_ring *rx_ring = adapter->rx_ring;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       union e1000_adv_rx_desc *rx_desc, *next_rxd;
+       struct igbvf_buffer *buffer_info, *next_buffer;
+       struct sk_buff *skb;
+       bool cleaned = false;
+       int cleaned_count = 0;
+       unsigned int total_bytes = 0, total_packets = 0;
+       unsigned int i;
+       u32 length, hlen, staterr;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = IGBVF_RX_DESC_ADV(*rx_ring, i);
+       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+
+       while (staterr & E1000_RXD_STAT_DD) {
+               if (*work_done >= work_to_do)
+                       break;
+               (*work_done)++;
+               rmb(); /* read descriptor and rx_buffer_info after status DD */
+
+               buffer_info = &rx_ring->buffer_info[i];
+
+               /* HW will not DMA in data larger than the given buffer, even
+                * if it parses the (NFS, of course) header to be larger.  In
+                * that case, it fills the header buffer and spills the rest
+                * into the page.
+                */
+               hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hs_rss.hdr_info) &
+                 E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT;
+               if (hlen > adapter->rx_ps_hdr_size)
+                       hlen = adapter->rx_ps_hdr_size;
+
+               length = le16_to_cpu(rx_desc->wb.upper.length);
+               cleaned = true;
+               cleaned_count++;
+
+               skb = buffer_info->skb;
+               prefetch(skb->data - NET_IP_ALIGN);
+               buffer_info->skb = NULL;
+               if (!adapter->rx_ps_hdr_size) {
+                       dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                        adapter->rx_buffer_len,
+                                        DMA_FROM_DEVICE);
+                       buffer_info->dma = 0;
+                       skb_put(skb, length);
+                       goto send_up;
+               }
+
+               if (!skb_shinfo(skb)->nr_frags) {
+                       dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                        adapter->rx_ps_hdr_size,
+                                        DMA_FROM_DEVICE);
+                       skb_put(skb, hlen);
+               }
+
+               if (length) {
+                       dma_unmap_page(&pdev->dev, buffer_info->page_dma,
+                                      PAGE_SIZE / 2,
+                                      DMA_FROM_DEVICE);
+                       buffer_info->page_dma = 0;
+
+                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
+                                          buffer_info->page,
+                                          buffer_info->page_offset,
+                                          length);
+
+                       if ((adapter->rx_buffer_len > (PAGE_SIZE / 2)) ||
+                           (page_count(buffer_info->page) != 1))
+                               buffer_info->page = NULL;
+                       else
+                               get_page(buffer_info->page);
+
+                       skb->len += length;
+                       skb->data_len += length;
+                       skb->truesize += length;
+               }
+send_up:
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               next_rxd = IGBVF_RX_DESC_ADV(*rx_ring, i);
+               prefetch(next_rxd);
+               next_buffer = &rx_ring->buffer_info[i];
+
+               if (!(staterr & E1000_RXD_STAT_EOP)) {
+                       buffer_info->skb = next_buffer->skb;
+                       buffer_info->dma = next_buffer->dma;
+                       next_buffer->skb = skb;
+                       next_buffer->dma = 0;
+                       goto next_desc;
+               }
+
+               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
+                       dev_kfree_skb_irq(skb);
+                       goto next_desc;
+               }
+
+               total_bytes += skb->len;
+               total_packets++;
+
+               igbvf_rx_checksum_adv(adapter, staterr, skb);
+
+               skb->protocol = eth_type_trans(skb, netdev);
+
+               igbvf_receive_skb(adapter, netdev, skb, staterr,
+                                 rx_desc->wb.upper.vlan);
+
+next_desc:
+               rx_desc->wb.upper.status_error = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (cleaned_count >= IGBVF_RX_BUFFER_WRITE) {
+                       igbvf_alloc_rx_buffers(rx_ring, cleaned_count);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+
+               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+       }
+
+       rx_ring->next_to_clean = i;
+       cleaned_count = igbvf_desc_unused(rx_ring);
+
+       if (cleaned_count)
+               igbvf_alloc_rx_buffers(rx_ring, cleaned_count);
+
+       adapter->total_rx_packets += total_packets;
+       adapter->total_rx_bytes += total_bytes;
+       adapter->net_stats.rx_bytes += total_bytes;
+       adapter->net_stats.rx_packets += total_packets;
+       return cleaned;
+}
+
+static void igbvf_put_txbuf(struct igbvf_adapter *adapter,
+                            struct igbvf_buffer *buffer_info)
+{
+       if (buffer_info->dma) {
+               if (buffer_info->mapped_as_page)
+                       dma_unmap_page(&adapter->pdev->dev,
+                                      buffer_info->dma,
+                                      buffer_info->length,
+                                      DMA_TO_DEVICE);
+               else
+                       dma_unmap_single(&adapter->pdev->dev,
+                                        buffer_info->dma,
+                                        buffer_info->length,
+                                        DMA_TO_DEVICE);
+               buffer_info->dma = 0;
+       }
+       if (buffer_info->skb) {
+               dev_kfree_skb_any(buffer_info->skb);
+               buffer_info->skb = NULL;
+       }
+       buffer_info->time_stamp = 0;
+}
+
+/**
+ * igbvf_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+int igbvf_setup_tx_resources(struct igbvf_adapter *adapter,
+                             struct igbvf_ring *tx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int size;
+
+       size = sizeof(struct igbvf_buffer) * tx_ring->count;
+       tx_ring->buffer_info = vzalloc(size);
+       if (!tx_ring->buffer_info)
+               goto err;
+
+       /* round up to nearest 4K */
+       tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc);
+       tx_ring->size = ALIGN(tx_ring->size, 4096);
+
+       tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
+                                          &tx_ring->dma, GFP_KERNEL);
+
+       if (!tx_ring->desc)
+               goto err;
+
+       tx_ring->adapter = adapter;
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+
+       return 0;
+err:
+       vfree(tx_ring->buffer_info);
+       dev_err(&adapter->pdev->dev,
+               "Unable to allocate memory for the transmit descriptor ring\n");
+       return -ENOMEM;
+}
+
+/**
+ * igbvf_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+int igbvf_setup_rx_resources(struct igbvf_adapter *adapter,
+                            struct igbvf_ring *rx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int size, desc_len;
+
+       size = sizeof(struct igbvf_buffer) * rx_ring->count;
+       rx_ring->buffer_info = vzalloc(size);
+       if (!rx_ring->buffer_info)
+               goto err;
+
+       desc_len = sizeof(union e1000_adv_rx_desc);
+
+       /* Round up to nearest 4K */
+       rx_ring->size = rx_ring->count * desc_len;
+       rx_ring->size = ALIGN(rx_ring->size, 4096);
+
+       rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
+                                          &rx_ring->dma, GFP_KERNEL);
+
+       if (!rx_ring->desc)
+               goto err;
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       rx_ring->adapter = adapter;
+
+       return 0;
+
+err:
+       vfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+       dev_err(&adapter->pdev->dev,
+               "Unable to allocate memory for the receive descriptor ring\n");
+       return -ENOMEM;
+}
+
+/**
+ * igbvf_clean_tx_ring - Free Tx Buffers
+ * @tx_ring: ring to be cleaned
+ **/
+static void igbvf_clean_tx_ring(struct igbvf_ring *tx_ring)
+{
+       struct igbvf_adapter *adapter = tx_ring->adapter;
+       struct igbvf_buffer *buffer_info;
+       unsigned long size;
+       unsigned int i;
+
+       if (!tx_ring->buffer_info)
+               return;
+
+       /* Free all the Tx ring sk_buffs */
+       for (i = 0; i < tx_ring->count; i++) {
+               buffer_info = &tx_ring->buffer_info[i];
+               igbvf_put_txbuf(adapter, buffer_info);
+       }
+
+       size = sizeof(struct igbvf_buffer) * tx_ring->count;
+       memset(tx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(tx_ring->desc, 0, tx_ring->size);
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+
+       writel(0, adapter->hw.hw_addr + tx_ring->head);
+       writel(0, adapter->hw.hw_addr + tx_ring->tail);
+}
+
+/**
+ * igbvf_free_tx_resources - Free Tx Resources per Queue
+ * @tx_ring: ring to free resources from
+ *
+ * Free all transmit software resources
+ **/
+void igbvf_free_tx_resources(struct igbvf_ring *tx_ring)
+{
+       struct pci_dev *pdev = tx_ring->adapter->pdev;
+
+       igbvf_clean_tx_ring(tx_ring);
+
+       vfree(tx_ring->buffer_info);
+       tx_ring->buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
+                         tx_ring->dma);
+
+       tx_ring->desc = NULL;
+}
+
+/**
+ * igbvf_clean_rx_ring - Free Rx Buffers per Queue
+ * @adapter: board private structure
+ **/
+static void igbvf_clean_rx_ring(struct igbvf_ring *rx_ring)
+{
+       struct igbvf_adapter *adapter = rx_ring->adapter;
+       struct igbvf_buffer *buffer_info;
+       struct pci_dev *pdev = adapter->pdev;
+       unsigned long size;
+       unsigned int i;
+
+       if (!rx_ring->buffer_info)
+               return;
+
+       /* Free all the Rx ring sk_buffs */
+       for (i = 0; i < rx_ring->count; i++) {
+               buffer_info = &rx_ring->buffer_info[i];
+               if (buffer_info->dma) {
+                       if (adapter->rx_ps_hdr_size){
+                               dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                                adapter->rx_ps_hdr_size,
+                                                DMA_FROM_DEVICE);
+                       } else {
+                               dma_unmap_single(&pdev->dev, buffer_info->dma,
+                                                adapter->rx_buffer_len,
+                                                DMA_FROM_DEVICE);
+                       }
+                       buffer_info->dma = 0;
+               }
+
+               if (buffer_info->skb) {
+                       dev_kfree_skb(buffer_info->skb);
+                       buffer_info->skb = NULL;
+               }
+
+               if (buffer_info->page) {
+                       if (buffer_info->page_dma)
+                               dma_unmap_page(&pdev->dev,
+                                              buffer_info->page_dma,
+                                              PAGE_SIZE / 2,
+                                              DMA_FROM_DEVICE);
+                       put_page(buffer_info->page);
+                       buffer_info->page = NULL;
+                       buffer_info->page_dma = 0;
+                       buffer_info->page_offset = 0;
+               }
+       }
+
+       size = sizeof(struct igbvf_buffer) * rx_ring->count;
+       memset(rx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(rx_ring->desc, 0, rx_ring->size);
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       writel(0, adapter->hw.hw_addr + rx_ring->head);
+       writel(0, adapter->hw.hw_addr + rx_ring->tail);
+}
+
+/**
+ * igbvf_free_rx_resources - Free Rx Resources
+ * @rx_ring: ring to clean the resources from
+ *
+ * Free all receive software resources
+ **/
+
+void igbvf_free_rx_resources(struct igbvf_ring *rx_ring)
+{
+       struct pci_dev *pdev = rx_ring->adapter->pdev;
+
+       igbvf_clean_rx_ring(rx_ring);
+
+       vfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
+                         rx_ring->dma);
+       rx_ring->desc = NULL;
+}
+
+/**
+ * igbvf_update_itr - update the dynamic ITR value based on statistics
+ * @adapter: pointer to adapter
+ * @itr_setting: current adapter->itr
+ * @packets: the number of packets during this measurement interval
+ * @bytes: the number of bytes during this measurement interval
+ *
+ *      Stores a new ITR value based on packets and byte
+ *      counts during the last interrupt.  The advantage of per interrupt
+ *      computation is faster updates and more accurate ITR for the current
+ *      traffic pattern.  Constants in this function were computed
+ *      based on theoretical maximum wire speed and thresholds were set based
+ *      on testing data as well as attempting to minimize response time
+ *      while increasing bulk throughput.  This functionality is controlled
+ *      by the InterruptThrottleRate module parameter.
+ **/
+static unsigned int igbvf_update_itr(struct igbvf_adapter *adapter,
+                                     u16 itr_setting, int packets,
+                                     int bytes)
+{
+       unsigned int retval = itr_setting;
+
+       if (packets == 0)
+               goto update_itr_done;
+
+       switch (itr_setting) {
+       case lowest_latency:
+               /* handle TSO and jumbo frames */
+               if (bytes/packets > 8000)
+                       retval = bulk_latency;
+               else if ((packets < 5) && (bytes > 512))
+                       retval = low_latency;
+               break;
+       case low_latency:  /* 50 usec aka 20000 ints/s */
+               if (bytes > 10000) {
+                       /* this if handles the TSO accounting */
+                       if (bytes/packets > 8000)
+                               retval = bulk_latency;
+                       else if ((packets < 10) || ((bytes/packets) > 1200))
+                               retval = bulk_latency;
+                       else if ((packets > 35))
+                               retval = lowest_latency;
+               } else if (bytes/packets > 2000) {
+                       retval = bulk_latency;
+               } else if (packets <= 2 && bytes < 512) {
+                       retval = lowest_latency;
+               }
+               break;
+       case bulk_latency: /* 250 usec aka 4000 ints/s */
+               if (bytes > 25000) {
+                       if (packets > 35)
+                               retval = low_latency;
+               } else if (bytes < 6000) {
+                       retval = low_latency;
+               }
+               break;
+       }
+
+update_itr_done:
+       return retval;
+}
+
+static void igbvf_set_itr(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u16 current_itr;
+       u32 new_itr = adapter->itr;
+
+       adapter->tx_itr = igbvf_update_itr(adapter, adapter->tx_itr,
+                                          adapter->total_tx_packets,
+                                          adapter->total_tx_bytes);
+       /* conservative mode (itr 3) eliminates the lowest_latency setting */
+       if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
+               adapter->tx_itr = low_latency;
+
+       adapter->rx_itr = igbvf_update_itr(adapter, adapter->rx_itr,
+                                          adapter->total_rx_packets,
+                                          adapter->total_rx_bytes);
+       /* conservative mode (itr 3) eliminates the lowest_latency setting */
+       if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
+               adapter->rx_itr = low_latency;
+
+       current_itr = max(adapter->rx_itr, adapter->tx_itr);
+
+       switch (current_itr) {
+       /* counts and packets in update_itr are dependent on these numbers */
+       case lowest_latency:
+               new_itr = 70000;
+               break;
+       case low_latency:
+               new_itr = 20000; /* aka hwitr = ~200 */
+               break;
+       case bulk_latency:
+               new_itr = 4000;
+               break;
+       default:
+               break;
+       }
+
+       if (new_itr != adapter->itr) {
+               /*
+                * this attempts to bias the interrupt rate towards Bulk
+                * by adding intermediate steps when interrupt rate is
+                * increasing
+                */
+               new_itr = new_itr > adapter->itr ?
+                            min(adapter->itr + (new_itr >> 2), new_itr) :
+                            new_itr;
+               adapter->itr = new_itr;
+               adapter->rx_ring->itr_val = 1952;
+
+               if (adapter->msix_entries)
+                       adapter->rx_ring->set_itr = 1;
+               else
+                       ew32(ITR, 1952);
+       }
+}
+
+/**
+ * igbvf_clean_tx_irq - Reclaim resources after transmit completes
+ * @adapter: board private structure
+ * returns true if ring is completely cleaned
+ **/
+static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
+{
+       struct igbvf_adapter *adapter = tx_ring->adapter;
+       struct net_device *netdev = adapter->netdev;
+       struct igbvf_buffer *buffer_info;
+       struct sk_buff *skb;
+       union e1000_adv_tx_desc *tx_desc, *eop_desc;
+       unsigned int total_bytes = 0, total_packets = 0;
+       unsigned int i, eop, count = 0;
+       bool cleaned = false;
+
+       i = tx_ring->next_to_clean;
+       eop = tx_ring->buffer_info[i].next_to_watch;
+       eop_desc = IGBVF_TX_DESC_ADV(*tx_ring, eop);
+
+       while ((eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)) &&
+              (count < tx_ring->count)) {
+               rmb();  /* read buffer_info after eop_desc status */
+               for (cleaned = false; !cleaned; count++) {
+                       tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
+                       buffer_info = &tx_ring->buffer_info[i];
+                       cleaned = (i == eop);
+                       skb = buffer_info->skb;
+
+                       if (skb) {
+                               unsigned int segs, bytecount;
+
+                               /* gso_segs is currently only valid for tcp */
+                               segs = skb_shinfo(skb)->gso_segs ?: 1;
+                               /* multiply data chunks by size of headers */
+                               bytecount = ((segs - 1) * skb_headlen(skb)) +
+                                           skb->len;
+                               total_packets += segs;
+                               total_bytes += bytecount;
+                       }
+
+                       igbvf_put_txbuf(adapter, buffer_info);
+                       tx_desc->wb.status = 0;
+
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+               eop = tx_ring->buffer_info[i].next_to_watch;
+               eop_desc = IGBVF_TX_DESC_ADV(*tx_ring, eop);
+       }
+
+       tx_ring->next_to_clean = i;
+
+       if (unlikely(count &&
+                    netif_carrier_ok(netdev) &&
+                    igbvf_desc_unused(tx_ring) >= IGBVF_TX_QUEUE_WAKE)) {
+               /* Make sure that anybody stopping the queue after this
+                * sees the new next_to_clean.
+                */
+               smp_mb();
+               if (netif_queue_stopped(netdev) &&
+                   !(test_bit(__IGBVF_DOWN, &adapter->state))) {
+                       netif_wake_queue(netdev);
+                       ++adapter->restart_queue;
+               }
+       }
+
+       adapter->net_stats.tx_bytes += total_bytes;
+       adapter->net_stats.tx_packets += total_packets;
+       return count < tx_ring->count;
+}
+
+static irqreturn_t igbvf_msix_other(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       adapter->int_counter1++;
+
+       netif_carrier_off(netdev);
+       hw->mac.get_link_status = 1;
+       if (!test_bit(__IGBVF_DOWN, &adapter->state))
+               mod_timer(&adapter->watchdog_timer, jiffies + 1);
+
+       ew32(EIMS, adapter->eims_other);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t igbvf_intr_msix_tx(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct igbvf_ring *tx_ring = adapter->tx_ring;
+
+
+       adapter->total_tx_bytes = 0;
+       adapter->total_tx_packets = 0;
+
+       /* auto mask will automatically reenable the interrupt when we write
+        * EICS */
+       if (!igbvf_clean_tx_irq(tx_ring))
+               /* Ring was not completely cleaned, so fire another interrupt */
+               ew32(EICS, tx_ring->eims_value);
+       else
+               ew32(EIMS, tx_ring->eims_value);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t igbvf_intr_msix_rx(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       adapter->int_counter0++;
+
+       /* Write the ITR value calculated at the end of the
+        * previous interrupt.
+        */
+       if (adapter->rx_ring->set_itr) {
+               writel(adapter->rx_ring->itr_val,
+                      adapter->hw.hw_addr + adapter->rx_ring->itr_register);
+               adapter->rx_ring->set_itr = 0;
+       }
+
+       if (napi_schedule_prep(&adapter->rx_ring->napi)) {
+               adapter->total_rx_bytes = 0;
+               adapter->total_rx_packets = 0;
+               __napi_schedule(&adapter->rx_ring->napi);
+       }
+
+       return IRQ_HANDLED;
+}
+
+#define IGBVF_NO_QUEUE -1
+
+static void igbvf_assign_vector(struct igbvf_adapter *adapter, int rx_queue,
+                                int tx_queue, int msix_vector)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 ivar, index;
+
+       /* 82576 uses a table-based method for assigning vectors.
+          Each queue has a single entry in the table to which we write
+          a vector number along with a "valid" bit.  Sadly, the layout
+          of the table is somewhat counterintuitive. */
+       if (rx_queue > IGBVF_NO_QUEUE) {
+               index = (rx_queue >> 1);
+               ivar = array_er32(IVAR0, index);
+               if (rx_queue & 0x1) {
+                       /* vector goes into third byte of register */
+                       ivar = ivar & 0xFF00FFFF;
+                       ivar |= (msix_vector | E1000_IVAR_VALID) << 16;
+               } else {
+                       /* vector goes into low byte of register */
+                       ivar = ivar & 0xFFFFFF00;
+                       ivar |= msix_vector | E1000_IVAR_VALID;
+               }
+               adapter->rx_ring[rx_queue].eims_value = 1 << msix_vector;
+               array_ew32(IVAR0, index, ivar);
+       }
+       if (tx_queue > IGBVF_NO_QUEUE) {
+               index = (tx_queue >> 1);
+               ivar = array_er32(IVAR0, index);
+               if (tx_queue & 0x1) {
+                       /* vector goes into high byte of register */
+                       ivar = ivar & 0x00FFFFFF;
+                       ivar |= (msix_vector | E1000_IVAR_VALID) << 24;
+               } else {
+                       /* vector goes into second byte of register */
+                       ivar = ivar & 0xFFFF00FF;
+                       ivar |= (msix_vector | E1000_IVAR_VALID) << 8;
+               }
+               adapter->tx_ring[tx_queue].eims_value = 1 << msix_vector;
+               array_ew32(IVAR0, index, ivar);
+       }
+}
+
+/**
+ * igbvf_configure_msix - Configure MSI-X hardware
+ *
+ * igbvf_configure_msix sets up the hardware to properly
+ * generate MSI-X interrupts.
+ **/
+static void igbvf_configure_msix(struct igbvf_adapter *adapter)
+{
+       u32 tmp;
+       struct e1000_hw *hw = &adapter->hw;
+       struct igbvf_ring *tx_ring = adapter->tx_ring;
+       struct igbvf_ring *rx_ring = adapter->rx_ring;
+       int vector = 0;
+
+       adapter->eims_enable_mask = 0;
+
+       igbvf_assign_vector(adapter, IGBVF_NO_QUEUE, 0, vector++);
+       adapter->eims_enable_mask |= tx_ring->eims_value;
+       if (tx_ring->itr_val)
+               writel(tx_ring->itr_val,
+                      hw->hw_addr + tx_ring->itr_register);
+       else
+               writel(1952, hw->hw_addr + tx_ring->itr_register);
+
+       igbvf_assign_vector(adapter, 0, IGBVF_NO_QUEUE, vector++);
+       adapter->eims_enable_mask |= rx_ring->eims_value;
+       if (rx_ring->itr_val)
+               writel(rx_ring->itr_val,
+                      hw->hw_addr + rx_ring->itr_register);
+       else
+               writel(1952, hw->hw_addr + rx_ring->itr_register);
+
+       /* set vector for other causes, i.e. link changes */
+
+       tmp = (vector++ | E1000_IVAR_VALID);
+
+       ew32(IVAR_MISC, tmp);
+
+       adapter->eims_enable_mask = (1 << (vector)) - 1;
+       adapter->eims_other = 1 << (vector - 1);
+       e1e_flush();
+}
+
+static void igbvf_reset_interrupt_capability(struct igbvf_adapter *adapter)
+{
+       if (adapter->msix_entries) {
+               pci_disable_msix(adapter->pdev);
+               kfree(adapter->msix_entries);
+               adapter->msix_entries = NULL;
+       }
+}
+
+/**
+ * igbvf_set_interrupt_capability - set MSI or MSI-X if supported
+ *
+ * Attempt to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+static void igbvf_set_interrupt_capability(struct igbvf_adapter *adapter)
+{
+       int err = -ENOMEM;
+       int i;
+
+       /* we allocate 3 vectors, 1 for tx, 1 for rx, one for pf messages */
+       adapter->msix_entries = kcalloc(3, sizeof(struct msix_entry),
+                                       GFP_KERNEL);
+       if (adapter->msix_entries) {
+               for (i = 0; i < 3; i++)
+                       adapter->msix_entries[i].entry = i;
+
+               err = pci_enable_msix(adapter->pdev,
+                                     adapter->msix_entries, 3);
+       }
+
+       if (err) {
+               /* MSI-X failed */
+               dev_err(&adapter->pdev->dev,
+                       "Failed to initialize MSI-X interrupts.\n");
+               igbvf_reset_interrupt_capability(adapter);
+       }
+}
+
+/**
+ * igbvf_request_msix - Initialize MSI-X interrupts
+ *
+ * igbvf_request_msix allocates MSI-X vectors and requests interrupts from the
+ * kernel.
+ **/
+static int igbvf_request_msix(struct igbvf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int err = 0, vector = 0;
+
+       if (strlen(netdev->name) < (IFNAMSIZ - 5)) {
+               sprintf(adapter->tx_ring->name, "%s-tx-0", netdev->name);
+               sprintf(adapter->rx_ring->name, "%s-rx-0", netdev->name);
+       } else {
+               memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
+               memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
+       }
+
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         igbvf_intr_msix_tx, 0, adapter->tx_ring->name,
+                         netdev);
+       if (err)
+               goto out;
+
+       adapter->tx_ring->itr_register = E1000_EITR(vector);
+       adapter->tx_ring->itr_val = 1952;
+       vector++;
+
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
+                         netdev);
+       if (err)
+               goto out;
+
+       adapter->rx_ring->itr_register = E1000_EITR(vector);
+       adapter->rx_ring->itr_val = 1952;
+       vector++;
+
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         igbvf_msix_other, 0, netdev->name, netdev);
+       if (err)
+               goto out;
+
+       igbvf_configure_msix(adapter);
+       return 0;
+out:
+       return err;
+}
+
+/**
+ * igbvf_alloc_queues - Allocate memory for all rings
+ * @adapter: board private structure to initialize
+ **/
+static int __devinit igbvf_alloc_queues(struct igbvf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+
+       adapter->tx_ring = kzalloc(sizeof(struct igbvf_ring), GFP_KERNEL);
+       if (!adapter->tx_ring)
+               return -ENOMEM;
+
+       adapter->rx_ring = kzalloc(sizeof(struct igbvf_ring), GFP_KERNEL);
+       if (!adapter->rx_ring) {
+               kfree(adapter->tx_ring);
+               return -ENOMEM;
+       }
+
+       netif_napi_add(netdev, &adapter->rx_ring->napi, igbvf_poll, 64);
+
+       return 0;
+}
+
+/**
+ * igbvf_request_irq - initialize interrupts
+ *
+ * Attempts to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+static int igbvf_request_irq(struct igbvf_adapter *adapter)
+{
+       int err = -1;
+
+       /* igbvf supports msi-x only */
+       if (adapter->msix_entries)
+               err = igbvf_request_msix(adapter);
+
+       if (!err)
+               return err;
+
+       dev_err(&adapter->pdev->dev,
+               "Unable to allocate interrupt, Error: %d\n", err);
+
+       return err;
+}
+
+static void igbvf_free_irq(struct igbvf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int vector;
+
+       if (adapter->msix_entries) {
+               for (vector = 0; vector < 3; vector++)
+                       free_irq(adapter->msix_entries[vector].vector, netdev);
+       }
+}
+
+/**
+ * igbvf_irq_disable - Mask off interrupt generation on the NIC
+ **/
+static void igbvf_irq_disable(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       ew32(EIMC, ~0);
+
+       if (adapter->msix_entries)
+               ew32(EIAC, 0);
+}
+
+/**
+ * igbvf_irq_enable - Enable default interrupt generation settings
+ **/
+static void igbvf_irq_enable(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       ew32(EIAC, adapter->eims_enable_mask);
+       ew32(EIAM, adapter->eims_enable_mask);
+       ew32(EIMS, adapter->eims_enable_mask);
+}
+
+/**
+ * igbvf_poll - NAPI Rx polling callback
+ * @napi: struct associated with this polling callback
+ * @budget: amount of packets driver is allowed to process this poll
+ **/
+static int igbvf_poll(struct napi_struct *napi, int budget)
+{
+       struct igbvf_ring *rx_ring = container_of(napi, struct igbvf_ring, napi);
+       struct igbvf_adapter *adapter = rx_ring->adapter;
+       struct e1000_hw *hw = &adapter->hw;
+       int work_done = 0;
+
+       igbvf_clean_rx_irq(adapter, &work_done, budget);
+
+       /* If not enough Rx work done, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+
+               if (adapter->itr_setting & 3)
+                       igbvf_set_itr(adapter);
+
+               if (!test_bit(__IGBVF_DOWN, &adapter->state))
+                       ew32(EIMS, adapter->rx_ring->eims_value);
+       }
+
+       return work_done;
+}
+
+/**
+ * igbvf_set_rlpml - set receive large packet maximum length
+ * @adapter: board private structure
+ *
+ * Configure the maximum size of packets that will be received
+ */
+static void igbvf_set_rlpml(struct igbvf_adapter *adapter)
+{
+       int max_frame_size;
+       struct e1000_hw *hw = &adapter->hw;
+
+       max_frame_size = adapter->max_frame_size + VLAN_TAG_SIZE;
+       e1000_rlpml_set_vf(hw, max_frame_size);
+}
+
+static void igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       if (hw->mac.ops.set_vfta(hw, vid, true))
+               dev_err(&adapter->pdev->dev, "Failed to add vlan id %d\n", vid);
+       else
+               set_bit(vid, adapter->active_vlans);
+}
+
+static void igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       igbvf_irq_disable(adapter);
+
+       if (!test_bit(__IGBVF_DOWN, &adapter->state))
+               igbvf_irq_enable(adapter);
+
+       if (hw->mac.ops.set_vfta(hw, vid, false))
+               dev_err(&adapter->pdev->dev,
+                       "Failed to remove vlan id %d\n", vid);
+       else
+               clear_bit(vid, adapter->active_vlans);
+}
+
+static void igbvf_restore_vlan(struct igbvf_adapter *adapter)
+{
+       u16 vid;
+
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               igbvf_vlan_rx_add_vid(adapter->netdev, vid);
+}
+
+/**
+ * igbvf_configure_tx - Configure Transmit Unit after Reset
+ * @adapter: board private structure
+ *
+ * Configure the Tx unit of the MAC after a reset.
+ **/
+static void igbvf_configure_tx(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct igbvf_ring *tx_ring = adapter->tx_ring;
+       u64 tdba;
+       u32 txdctl, dca_txctrl;
+
+       /* disable transmits */
+       txdctl = er32(TXDCTL(0));
+       ew32(TXDCTL(0), txdctl & ~E1000_TXDCTL_QUEUE_ENABLE);
+       e1e_flush();
+       msleep(10);
+
+       /* Setup the HW Tx Head and Tail descriptor pointers */
+       ew32(TDLEN(0), tx_ring->count * sizeof(union e1000_adv_tx_desc));
+       tdba = tx_ring->dma;
+       ew32(TDBAL(0), (tdba & DMA_BIT_MASK(32)));
+       ew32(TDBAH(0), (tdba >> 32));
+       ew32(TDH(0), 0);
+       ew32(TDT(0), 0);
+       tx_ring->head = E1000_TDH(0);
+       tx_ring->tail = E1000_TDT(0);
+
+       /* Turn off Relaxed Ordering on head write-backs.  The writebacks
+        * MUST be delivered in order or it will completely screw up
+        * our bookeeping.
+        */
+       dca_txctrl = er32(DCA_TXCTRL(0));
+       dca_txctrl &= ~E1000_DCA_TXCTRL_TX_WB_RO_EN;
+       ew32(DCA_TXCTRL(0), dca_txctrl);
+
+       /* enable transmits */
+       txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
+       ew32(TXDCTL(0), txdctl);
+
+       /* Setup Transmit Descriptor Settings for eop descriptor */
+       adapter->txd_cmd = E1000_ADVTXD_DCMD_EOP | E1000_ADVTXD_DCMD_IFCS;
+
+       /* enable Report Status bit */
+       adapter->txd_cmd |= E1000_ADVTXD_DCMD_RS;
+}
+
+/**
+ * igbvf_setup_srrctl - configure the receive control registers
+ * @adapter: Board private structure
+ **/
+static void igbvf_setup_srrctl(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 srrctl = 0;
+
+       srrctl &= ~(E1000_SRRCTL_DESCTYPE_MASK |
+                   E1000_SRRCTL_BSIZEHDR_MASK |
+                   E1000_SRRCTL_BSIZEPKT_MASK);
+
+       /* Enable queue drop to avoid head of line blocking */
+       srrctl |= E1000_SRRCTL_DROP_EN;
+
+       /* Setup buffer sizes */
+       srrctl |= ALIGN(adapter->rx_buffer_len, 1024) >>
+                 E1000_SRRCTL_BSIZEPKT_SHIFT;
+
+       if (adapter->rx_buffer_len < 2048) {
+               adapter->rx_ps_hdr_size = 0;
+               srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF;
+       } else {
+               adapter->rx_ps_hdr_size = 128;
+               srrctl |= adapter->rx_ps_hdr_size <<
+                         E1000_SRRCTL_BSIZEHDRSIZE_SHIFT;
+               srrctl |= E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
+       }
+
+       ew32(SRRCTL(0), srrctl);
+}
+
+/**
+ * igbvf_configure_rx - Configure Receive Unit after Reset
+ * @adapter: board private structure
+ *
+ * Configure the Rx unit of the MAC after a reset.
+ **/
+static void igbvf_configure_rx(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct igbvf_ring *rx_ring = adapter->rx_ring;
+       u64 rdba;
+       u32 rdlen, rxdctl;
+
+       /* disable receives */
+       rxdctl = er32(RXDCTL(0));
+       ew32(RXDCTL(0), rxdctl & ~E1000_RXDCTL_QUEUE_ENABLE);
+       e1e_flush();
+       msleep(10);
+
+       rdlen = rx_ring->count * sizeof(union e1000_adv_rx_desc);
+
+       /*
+        * Setup the HW Rx Head and Tail Descriptor Pointers and
+        * the Base and Length of the Rx Descriptor Ring
+        */
+       rdba = rx_ring->dma;
+       ew32(RDBAL(0), (rdba & DMA_BIT_MASK(32)));
+       ew32(RDBAH(0), (rdba >> 32));
+       ew32(RDLEN(0), rx_ring->count * sizeof(union e1000_adv_rx_desc));
+       rx_ring->head = E1000_RDH(0);
+       rx_ring->tail = E1000_RDT(0);
+       ew32(RDH(0), 0);
+       ew32(RDT(0), 0);
+
+       rxdctl |= E1000_RXDCTL_QUEUE_ENABLE;
+       rxdctl &= 0xFFF00000;
+       rxdctl |= IGBVF_RX_PTHRESH;
+       rxdctl |= IGBVF_RX_HTHRESH << 8;
+       rxdctl |= IGBVF_RX_WTHRESH << 16;
+
+       igbvf_set_rlpml(adapter);
+
+       /* enable receives */
+       ew32(RXDCTL(0), rxdctl);
+}
+
+/**
+ * igbvf_set_multi - Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_multi entry point is called whenever the multicast address
+ * list or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper multicast,
+ * promiscuous mode, and all-multi behavior.
+ **/
+static void igbvf_set_multi(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct netdev_hw_addr *ha;
+       u8  *mta_list = NULL;
+       int i;
+
+       if (!netdev_mc_empty(netdev)) {
+               mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
+               if (!mta_list) {
+                       dev_err(&adapter->pdev->dev,
+                               "failed to allocate multicast filter list\n");
+                       return;
+               }
+       }
+
+       /* prepare a packed array of only addresses. */
+       i = 0;
+       netdev_for_each_mc_addr(ha, netdev)
+               memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
+
+       hw->mac.ops.update_mc_addr_list(hw, mta_list, i, 0, 0);
+       kfree(mta_list);
+}
+
+/**
+ * igbvf_configure - configure the hardware for Rx and Tx
+ * @adapter: private board structure
+ **/
+static void igbvf_configure(struct igbvf_adapter *adapter)
+{
+       igbvf_set_multi(adapter->netdev);
+
+       igbvf_restore_vlan(adapter);
+
+       igbvf_configure_tx(adapter);
+       igbvf_setup_srrctl(adapter);
+       igbvf_configure_rx(adapter);
+       igbvf_alloc_rx_buffers(adapter->rx_ring,
+                              igbvf_desc_unused(adapter->rx_ring));
+}
+
+/* igbvf_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.
+ */
+static void igbvf_reset(struct igbvf_adapter *adapter)
+{
+       struct e1000_mac_info *mac = &adapter->hw.mac;
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* Allow time for pending master requests to run */
+       if (mac->ops.reset_hw(hw))
+               dev_err(&adapter->pdev->dev, "PF still resetting\n");
+
+       mac->ops.init_hw(hw);
+
+       if (is_valid_ether_addr(adapter->hw.mac.addr)) {
+               memcpy(netdev->dev_addr, adapter->hw.mac.addr,
+                      netdev->addr_len);
+               memcpy(netdev->perm_addr, adapter->hw.mac.addr,
+                      netdev->addr_len);
+       }
+
+       adapter->last_reset = jiffies;
+}
+
+int igbvf_up(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       /* hardware has been reset, we need to reload some things */
+       igbvf_configure(adapter);
+
+       clear_bit(__IGBVF_DOWN, &adapter->state);
+
+       napi_enable(&adapter->rx_ring->napi);
+       if (adapter->msix_entries)
+               igbvf_configure_msix(adapter);
+
+       /* Clear any pending interrupts. */
+       er32(EICR);
+       igbvf_irq_enable(adapter);
+
+       /* start the watchdog */
+       hw->mac.get_link_status = 1;
+       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+
+
+       return 0;
+}
+
+void igbvf_down(struct igbvf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 rxdctl, txdctl;
+
+       /*
+        * signal that we're down so the interrupt handler does not
+        * reschedule our watchdog timer
+        */
+       set_bit(__IGBVF_DOWN, &adapter->state);
+
+       /* disable receives in the hardware */
+       rxdctl = er32(RXDCTL(0));
+       ew32(RXDCTL(0), rxdctl & ~E1000_RXDCTL_QUEUE_ENABLE);
+
+       netif_stop_queue(netdev);
+
+       /* disable transmits in the hardware */
+       txdctl = er32(TXDCTL(0));
+       ew32(TXDCTL(0), txdctl & ~E1000_TXDCTL_QUEUE_ENABLE);
+
+       /* flush both disables and wait for them to finish */
+       e1e_flush();
+       msleep(10);
+
+       napi_disable(&adapter->rx_ring->napi);
+
+       igbvf_irq_disable(adapter);
+
+       del_timer_sync(&adapter->watchdog_timer);
+
+       netif_carrier_off(netdev);
+
+       /* record the stats before reset*/
+       igbvf_update_stats(adapter);
+
+       adapter->link_speed = 0;
+       adapter->link_duplex = 0;
+
+       igbvf_reset(adapter);
+       igbvf_clean_tx_ring(adapter->tx_ring);
+       igbvf_clean_rx_ring(adapter->rx_ring);
+}
+
+void igbvf_reinit_locked(struct igbvf_adapter *adapter)
+{
+       might_sleep();
+       while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
+               msleep(1);
+       igbvf_down(adapter);
+       igbvf_up(adapter);
+       clear_bit(__IGBVF_RESETTING, &adapter->state);
+}
+
+/**
+ * igbvf_sw_init - Initialize general software structures (struct igbvf_adapter)
+ * @adapter: board private structure to initialize
+ *
+ * igbvf_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 __devinit igbvf_sw_init(struct igbvf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       s32 rc;
+
+       adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN;
+       adapter->rx_ps_hdr_size = 0;
+       adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
+
+       adapter->tx_int_delay = 8;
+       adapter->tx_abs_int_delay = 32;
+       adapter->rx_int_delay = 0;
+       adapter->rx_abs_int_delay = 8;
+       adapter->itr_setting = 3;
+       adapter->itr = 20000;
+
+       /* 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.mbx.ops.init_params(&adapter->hw);
+       if (rc)
+               return rc;
+
+       igbvf_set_interrupt_capability(adapter);
+
+       if (igbvf_alloc_queues(adapter))
+               return -ENOMEM;
+
+       spin_lock_init(&adapter->tx_queue_lock);
+
+       /* Explicitly disable IRQ since the NIC can be in any state. */
+       igbvf_irq_disable(adapter);
+
+       spin_lock_init(&adapter->stats_lock);
+
+       set_bit(__IGBVF_DOWN, &adapter->state);
+       return 0;
+}
+
+static void igbvf_initialize_last_counter_stats(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+
+       adapter->stats.last_gprc = er32(VFGPRC);
+       adapter->stats.last_gorc = er32(VFGORC);
+       adapter->stats.last_gptc = er32(VFGPTC);
+       adapter->stats.last_gotc = er32(VFGOTC);
+       adapter->stats.last_mprc = er32(VFMPRC);
+       adapter->stats.last_gotlbc = er32(VFGOTLBC);
+       adapter->stats.last_gptlbc = er32(VFGPTLBC);
+       adapter->stats.last_gorlbc = er32(VFGORLBC);
+       adapter->stats.last_gprlbc = er32(VFGPRLBC);
+
+       adapter->stats.base_gprc = er32(VFGPRC);
+       adapter->stats.base_gorc = er32(VFGORC);
+       adapter->stats.base_gptc = er32(VFGPTC);
+       adapter->stats.base_gotc = er32(VFGOTC);
+       adapter->stats.base_mprc = er32(VFMPRC);
+       adapter->stats.base_gotlbc = er32(VFGOTLBC);
+       adapter->stats.base_gptlbc = er32(VFGPTLBC);
+       adapter->stats.base_gorlbc = er32(VFGORLBC);
+       adapter->stats.base_gprlbc = er32(VFGPRLBC);
+}
+
+/**
+ * igbvf_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+static int igbvf_open(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       int err;
+
+       /* disallow open during test */
+       if (test_bit(__IGBVF_TESTING, &adapter->state))
+               return -EBUSY;
+
+       /* allocate transmit descriptors */
+       err = igbvf_setup_tx_resources(adapter, adapter->tx_ring);
+       if (err)
+               goto err_setup_tx;
+
+       /* allocate receive descriptors */
+       err = igbvf_setup_rx_resources(adapter, adapter->rx_ring);
+       if (err)
+               goto err_setup_rx;
+
+       /*
+        * before we allocate an interrupt, we must be ready to handle it.
+        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
+        * as soon as we call pci_request_irq, so we have to setup our
+        * clean_rx handler before we do so.
+        */
+       igbvf_configure(adapter);
+
+       err = igbvf_request_irq(adapter);
+       if (err)
+               goto err_req_irq;
+
+       /* From here on the code is the same as igbvf_up() */
+       clear_bit(__IGBVF_DOWN, &adapter->state);
+
+       napi_enable(&adapter->rx_ring->napi);
+
+       /* clear any pending interrupts */
+       er32(EICR);
+
+       igbvf_irq_enable(adapter);
+
+       /* start the watchdog */
+       hw->mac.get_link_status = 1;
+       mod_timer(&adapter->watchdog_timer, jiffies + 1);
+
+       return 0;
+
+err_req_irq:
+       igbvf_free_rx_resources(adapter->rx_ring);
+err_setup_rx:
+       igbvf_free_tx_resources(adapter->tx_ring);
+err_setup_tx:
+       igbvf_reset(adapter);
+
+       return err;
+}
+
+/**
+ * igbvf_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+static int igbvf_close(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       WARN_ON(test_bit(__IGBVF_RESETTING, &adapter->state));
+       igbvf_down(adapter);
+
+       igbvf_free_irq(adapter);
+
+       igbvf_free_tx_resources(adapter->tx_ring);
+       igbvf_free_rx_resources(adapter->rx_ring);
+
+       return 0;
+}
+/**
+ * igbvf_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int igbvf_set_mac(struct net_device *netdev, void *p)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
+
+       hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
+
+       if (memcmp(addr->sa_data, hw->mac.addr, 6))
+               return -EADDRNOTAVAIL;
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+
+       return 0;
+}
+
+#define UPDATE_VF_COUNTER(reg, name)                                    \
+       {                                                               \
+               u32 current_counter = er32(reg);                        \
+               if (current_counter < adapter->stats.last_##name)       \
+                       adapter->stats.name += 0x100000000LL;           \
+               adapter->stats.last_##name = current_counter;           \
+               adapter->stats.name &= 0xFFFFFFFF00000000LL;            \
+               adapter->stats.name |= current_counter;                 \
+       }
+
+/**
+ * igbvf_update_stats - Update the board statistics counters
+ * @adapter: board private structure
+**/
+void igbvf_update_stats(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+
+       /*
+        * Prevent stats update while adapter is being reset, link is down
+        * or if the pci connection is down.
+        */
+       if (adapter->link_speed == 0)
+               return;
+
+       if (test_bit(__IGBVF_RESETTING, &adapter->state))
+               return;
+
+       if (pci_channel_offline(pdev))
+               return;
+
+       UPDATE_VF_COUNTER(VFGPRC, gprc);
+       UPDATE_VF_COUNTER(VFGORC, gorc);
+       UPDATE_VF_COUNTER(VFGPTC, gptc);
+       UPDATE_VF_COUNTER(VFGOTC, gotc);
+       UPDATE_VF_COUNTER(VFMPRC, mprc);
+       UPDATE_VF_COUNTER(VFGOTLBC, gotlbc);
+       UPDATE_VF_COUNTER(VFGPTLBC, gptlbc);
+       UPDATE_VF_COUNTER(VFGORLBC, gorlbc);
+       UPDATE_VF_COUNTER(VFGPRLBC, gprlbc);
+
+       /* Fill out the OS statistics structure */
+       adapter->net_stats.multicast = adapter->stats.mprc;
+}
+
+static void igbvf_print_link_info(struct igbvf_adapter *adapter)
+{
+       dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s\n",
+                adapter->link_speed,
+                ((adapter->link_duplex == FULL_DUPLEX) ?
+                 "Full Duplex" : "Half Duplex"));
+}
+
+static bool igbvf_has_link(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       s32 ret_val = E1000_SUCCESS;
+       bool link_active;
+
+       /* If interface is down, stay link down */
+       if (test_bit(__IGBVF_DOWN, &adapter->state))
+               return false;
+
+       ret_val = hw->mac.ops.check_for_link(hw);
+       link_active = !hw->mac.get_link_status;
+
+       /* if check for link returns error we will need to reset */
+       if (ret_val && time_after(jiffies, adapter->last_reset + (10 * HZ)))
+               schedule_work(&adapter->reset_task);
+
+       return link_active;
+}
+
+/**
+ * igbvf_watchdog - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+static void igbvf_watchdog(unsigned long data)
+{
+       struct igbvf_adapter *adapter = (struct igbvf_adapter *) data;
+
+       /* Do the rest outside of interrupt context */
+       schedule_work(&adapter->watchdog_task);
+}
+
+static void igbvf_watchdog_task(struct work_struct *work)
+{
+       struct igbvf_adapter *adapter = container_of(work,
+                                                    struct igbvf_adapter,
+                                                    watchdog_task);
+       struct net_device *netdev = adapter->netdev;
+       struct e1000_mac_info *mac = &adapter->hw.mac;
+       struct igbvf_ring *tx_ring = adapter->tx_ring;
+       struct e1000_hw *hw = &adapter->hw;
+       u32 link;
+       int tx_pending = 0;
+
+       link = igbvf_has_link(adapter);
+
+       if (link) {
+               if (!netif_carrier_ok(netdev)) {
+                       mac->ops.get_link_up_info(&adapter->hw,
+                                                 &adapter->link_speed,
+                                                 &adapter->link_duplex);
+                       igbvf_print_link_info(adapter);
+
+                       netif_carrier_on(netdev);
+                       netif_wake_queue(netdev);
+               }
+       } else {
+               if (netif_carrier_ok(netdev)) {
+                       adapter->link_speed = 0;
+                       adapter->link_duplex = 0;
+                       dev_info(&adapter->pdev->dev, "Link is Down\n");
+                       netif_carrier_off(netdev);
+                       netif_stop_queue(netdev);
+               }
+       }
+
+       if (netif_carrier_ok(netdev)) {
+               igbvf_update_stats(adapter);
+       } else {
+               tx_pending = (igbvf_desc_unused(tx_ring) + 1 <
+                             tx_ring->count);
+               if (tx_pending) {
+                       /*
+                        * We've lost link, so the controller stops DMA,
+                        * but we've got queued Tx work that's never going
+                        * to get done, so reset controller to flush Tx.
+                        * (Do the reset outside of interrupt context).
+                        */
+                       adapter->tx_timeout_count++;
+                       schedule_work(&adapter->reset_task);
+               }
+       }
+
+       /* Cause software interrupt to ensure Rx ring is cleaned */
+       ew32(EICS, adapter->rx_ring->eims_value);
+
+       /* Reset the timer */
+       if (!test_bit(__IGBVF_DOWN, &adapter->state))
+               mod_timer(&adapter->watchdog_timer,
+                         round_jiffies(jiffies + (2 * HZ)));
+}
+
+#define IGBVF_TX_FLAGS_CSUM             0x00000001
+#define IGBVF_TX_FLAGS_VLAN             0x00000002
+#define IGBVF_TX_FLAGS_TSO              0x00000004
+#define IGBVF_TX_FLAGS_IPV4             0x00000008
+#define IGBVF_TX_FLAGS_VLAN_MASK        0xffff0000
+#define IGBVF_TX_FLAGS_VLAN_SHIFT       16
+
+static int igbvf_tso(struct igbvf_adapter *adapter,
+                     struct igbvf_ring *tx_ring,
+                     struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
+{
+       struct e1000_adv_tx_context_desc *context_desc;
+       unsigned int i;
+       int err;
+       struct igbvf_buffer *buffer_info;
+       u32 info = 0, tu_cmd = 0;
+       u32 mss_l4len_idx, l4len;
+       *hdr_len = 0;
+
+       if (skb_header_cloned(skb)) {
+               err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+               if (err) {
+                       dev_err(&adapter->pdev->dev,
+                               "igbvf_tso returning an error\n");
+                       return err;
+               }
+       }
+
+       l4len = tcp_hdrlen(skb);
+       *hdr_len += l4len;
+
+       if (skb->protocol == htons(ETH_P_IP)) {
+               struct iphdr *iph = ip_hdr(skb);
+               iph->tot_len = 0;
+               iph->check = 0;
+               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                        iph->daddr, 0,
+                                                        IPPROTO_TCP,
+                                                        0);
+       } else if (skb_is_gso_v6(skb)) {
+               ipv6_hdr(skb)->payload_len = 0;
+               tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                                      &ipv6_hdr(skb)->daddr,
+                                                      0, IPPROTO_TCP, 0);
+       }
+
+       i = tx_ring->next_to_use;
+
+       buffer_info = &tx_ring->buffer_info[i];
+       context_desc = IGBVF_TX_CTXTDESC_ADV(*tx_ring, i);
+       /* VLAN MACLEN IPLEN */
+       if (tx_flags & IGBVF_TX_FLAGS_VLAN)
+               info |= (tx_flags & IGBVF_TX_FLAGS_VLAN_MASK);
+       info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
+       *hdr_len += skb_network_offset(skb);
+       info |= (skb_transport_header(skb) - skb_network_header(skb));
+       *hdr_len += (skb_transport_header(skb) - skb_network_header(skb));
+       context_desc->vlan_macip_lens = cpu_to_le32(info);
+
+       /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
+       tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
+
+       if (skb->protocol == htons(ETH_P_IP))
+               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
+       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+
+       context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
+
+       /* MSS L4LEN IDX */
+       mss_l4len_idx = (skb_shinfo(skb)->gso_size << E1000_ADVTXD_MSS_SHIFT);
+       mss_l4len_idx |= (l4len << E1000_ADVTXD_L4LEN_SHIFT);
+
+       context_desc->mss_l4len_idx = cpu_to_le32(mss_l4len_idx);
+       context_desc->seqnum_seed = 0;
+
+       buffer_info->time_stamp = jiffies;
+       buffer_info->next_to_watch = i;
+       buffer_info->dma = 0;
+       i++;
+       if (i == tx_ring->count)
+               i = 0;
+
+       tx_ring->next_to_use = i;
+
+       return true;
+}
+
+static inline bool igbvf_tx_csum(struct igbvf_adapter *adapter,
+                                 struct igbvf_ring *tx_ring,
+                                 struct sk_buff *skb, u32 tx_flags)
+{
+       struct e1000_adv_tx_context_desc *context_desc;
+       unsigned int i;
+       struct igbvf_buffer *buffer_info;
+       u32 info = 0, tu_cmd = 0;
+
+       if ((skb->ip_summed == CHECKSUM_PARTIAL) ||
+           (tx_flags & IGBVF_TX_FLAGS_VLAN)) {
+               i = tx_ring->next_to_use;
+               buffer_info = &tx_ring->buffer_info[i];
+               context_desc = IGBVF_TX_CTXTDESC_ADV(*tx_ring, i);
+
+               if (tx_flags & IGBVF_TX_FLAGS_VLAN)
+                       info |= (tx_flags & IGBVF_TX_FLAGS_VLAN_MASK);
+
+               info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
+               if (skb->ip_summed == CHECKSUM_PARTIAL)
+                       info |= (skb_transport_header(skb) -
+                                skb_network_header(skb));
+
+
+               context_desc->vlan_macip_lens = cpu_to_le32(info);
+
+               tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
+
+               if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                       switch (skb->protocol) {
+                       case __constant_htons(ETH_P_IP):
+                               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
+                               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+                               break;
+                       case __constant_htons(ETH_P_IPV6):
+                               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
+                               break;
+                       default:
+                               break;
+                       }
+               }
+
+               context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
+               context_desc->seqnum_seed = 0;
+               context_desc->mss_l4len_idx = 0;
+
+               buffer_info->time_stamp = jiffies;
+               buffer_info->next_to_watch = i;
+               buffer_info->dma = 0;
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+               tx_ring->next_to_use = i;
+
+               return true;
+       }
+
+       return false;
+}
+
+static int igbvf_maybe_stop_tx(struct net_device *netdev, int size)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       /* there is enough descriptors then we don't need to worry  */
+       if (igbvf_desc_unused(adapter->tx_ring) >= size)
+               return 0;
+
+       netif_stop_queue(netdev);
+
+       smp_mb();
+
+       /* We need to check again just in case room has been made available */
+       if (igbvf_desc_unused(adapter->tx_ring) < size)
+               return -EBUSY;
+
+       netif_wake_queue(netdev);
+
+       ++adapter->restart_queue;
+       return 0;
+}
+
+#define IGBVF_MAX_TXD_PWR       16
+#define IGBVF_MAX_DATA_PER_TXD  (1 << IGBVF_MAX_TXD_PWR)
+
+static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
+                                   struct igbvf_ring *tx_ring,
+                                   struct sk_buff *skb,
+                                   unsigned int first)
+{
+       struct igbvf_buffer *buffer_info;
+       struct pci_dev *pdev = adapter->pdev;
+       unsigned int len = skb_headlen(skb);
+       unsigned int count = 0, i;
+       unsigned int f;
+
+       i = tx_ring->next_to_use;
+
+       buffer_info = &tx_ring->buffer_info[i];
+       BUG_ON(len >= IGBVF_MAX_DATA_PER_TXD);
+       buffer_info->length = len;
+       /* set time_stamp *before* dma to help avoid a possible race */
+       buffer_info->time_stamp = jiffies;
+       buffer_info->next_to_watch = i;
+       buffer_info->mapped_as_page = false;
+       buffer_info->dma = dma_map_single(&pdev->dev, skb->data, len,
+                                         DMA_TO_DEVICE);
+       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+               goto dma_error;
+
+
+       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
+               struct skb_frag_struct *frag;
+
+               count++;
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+
+               frag = &skb_shinfo(skb)->frags[f];
+               len = frag->size;
+
+               buffer_info = &tx_ring->buffer_info[i];
+               BUG_ON(len >= IGBVF_MAX_DATA_PER_TXD);
+               buffer_info->length = len;
+               buffer_info->time_stamp = jiffies;
+               buffer_info->next_to_watch = i;
+               buffer_info->mapped_as_page = true;
+               buffer_info->dma = dma_map_page(&pdev->dev,
+                                               frag->page,
+                                               frag->page_offset,
+                                               len,
+                                               DMA_TO_DEVICE);
+               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                       goto dma_error;
+       }
+
+       tx_ring->buffer_info[i].skb = skb;
+       tx_ring->buffer_info[first].next_to_watch = i;
+
+       return ++count;
+
+dma_error:
+       dev_err(&pdev->dev, "TX DMA map failed\n");
+
+       /* clear timestamp and dma mappings for failed buffer_info mapping */
+       buffer_info->dma = 0;
+       buffer_info->time_stamp = 0;
+       buffer_info->length = 0;
+       buffer_info->next_to_watch = 0;
+       buffer_info->mapped_as_page = false;
+       if (count)
+               count--;
+
+       /* clear timestamp and dma mappings for remaining portion of packet */
+       while (count--) {
+               if (i==0)
+                       i += tx_ring->count;
+               i--;
+               buffer_info = &tx_ring->buffer_info[i];
+               igbvf_put_txbuf(adapter, buffer_info);
+       }
+
+       return 0;
+}
+
+static inline void igbvf_tx_queue_adv(struct igbvf_adapter *adapter,
+                                      struct igbvf_ring *tx_ring,
+                                      int tx_flags, int count, u32 paylen,
+                                      u8 hdr_len)
+{
+       union e1000_adv_tx_desc *tx_desc = NULL;
+       struct igbvf_buffer *buffer_info;
+       u32 olinfo_status = 0, cmd_type_len;
+       unsigned int i;
+
+       cmd_type_len = (E1000_ADVTXD_DTYP_DATA | E1000_ADVTXD_DCMD_IFCS |
+                       E1000_ADVTXD_DCMD_DEXT);
+
+       if (tx_flags & IGBVF_TX_FLAGS_VLAN)
+               cmd_type_len |= E1000_ADVTXD_DCMD_VLE;
+
+       if (tx_flags & IGBVF_TX_FLAGS_TSO) {
+               cmd_type_len |= E1000_ADVTXD_DCMD_TSE;
+
+               /* insert tcp checksum */
+               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+
+               /* insert ip checksum */
+               if (tx_flags & IGBVF_TX_FLAGS_IPV4)
+                       olinfo_status |= E1000_TXD_POPTS_IXSM << 8;
+
+       } else if (tx_flags & IGBVF_TX_FLAGS_CSUM) {
+               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+       }
+
+       olinfo_status |= ((paylen - hdr_len) << E1000_ADVTXD_PAYLEN_SHIFT);
+
+       i = tx_ring->next_to_use;
+       while (count--) {
+               buffer_info = &tx_ring->buffer_info[i];
+               tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
+               tx_desc->read.buffer_addr = cpu_to_le64(buffer_info->dma);
+               tx_desc->read.cmd_type_len =
+                        cpu_to_le32(cmd_type_len | buffer_info->length);
+               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+       }
+
+       tx_desc->read.cmd_type_len |= cpu_to_le32(adapter->txd_cmd);
+       /* Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64). */
+       wmb();
+
+       tx_ring->next_to_use = i;
+       writel(i, adapter->hw.hw_addr + tx_ring->tail);
+       /* we need this if more than one processor can write to our tail
+        * at a time, it syncronizes IO on IA64/Altix systems */
+       mmiowb();
+}
+
+static netdev_tx_t igbvf_xmit_frame_ring_adv(struct sk_buff *skb,
+                                            struct net_device *netdev,
+                                            struct igbvf_ring *tx_ring)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       unsigned int first, tx_flags = 0;
+       u8 hdr_len = 0;
+       int count = 0;
+       int tso = 0;
+
+       if (test_bit(__IGBVF_DOWN, &adapter->state)) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (skb->len <= 0) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       /*
+        * need: count + 4 desc gap to keep tail from touching
+         *       + 2 desc gap to keep tail from touching head,
+         *       + 1 desc for skb->data,
+         *       + 1 desc for context descriptor,
+        * head, otherwise try next time
+        */
+       if (igbvf_maybe_stop_tx(netdev, skb_shinfo(skb)->nr_frags + 4)) {
+               /* this is a hard error */
+               return NETDEV_TX_BUSY;
+       }
+
+       if (vlan_tx_tag_present(skb)) {
+               tx_flags |= IGBVF_TX_FLAGS_VLAN;
+               tx_flags |= (vlan_tx_tag_get(skb) << IGBVF_TX_FLAGS_VLAN_SHIFT);
+       }
+
+       if (skb->protocol == htons(ETH_P_IP))
+               tx_flags |= IGBVF_TX_FLAGS_IPV4;
+
+       first = tx_ring->next_to_use;
+
+       tso = skb_is_gso(skb) ?
+               igbvf_tso(adapter, tx_ring, skb, tx_flags, &hdr_len) : 0;
+       if (unlikely(tso < 0)) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (tso)
+               tx_flags |= IGBVF_TX_FLAGS_TSO;
+       else if (igbvf_tx_csum(adapter, tx_ring, skb, tx_flags) &&
+                (skb->ip_summed == CHECKSUM_PARTIAL))
+               tx_flags |= IGBVF_TX_FLAGS_CSUM;
+
+       /*
+        * count reflects descriptors mapped, if 0 then mapping error
+        * has occurred and we need to rewind the descriptor queue
+        */
+       count = igbvf_tx_map_adv(adapter, tx_ring, skb, first);
+
+       if (count) {
+               igbvf_tx_queue_adv(adapter, tx_ring, tx_flags, count,
+                                  skb->len, hdr_len);
+               /* Make sure there is space in the ring for the next send. */
+               igbvf_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 4);
+       } else {
+               dev_kfree_skb_any(skb);
+               tx_ring->buffer_info[first].time_stamp = 0;
+               tx_ring->next_to_use = first;
+       }
+
+       return NETDEV_TX_OK;
+}
+
+static netdev_tx_t igbvf_xmit_frame(struct sk_buff *skb,
+                                   struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct igbvf_ring *tx_ring;
+
+       if (test_bit(__IGBVF_DOWN, &adapter->state)) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       tx_ring = &adapter->tx_ring[0];
+
+       return igbvf_xmit_frame_ring_adv(skb, netdev, tx_ring);
+}
+
+/**
+ * igbvf_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+static void igbvf_tx_timeout(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       /* Do the reset outside of interrupt context */
+       adapter->tx_timeout_count++;
+       schedule_work(&adapter->reset_task);
+}
+
+static void igbvf_reset_task(struct work_struct *work)
+{
+       struct igbvf_adapter *adapter;
+       adapter = container_of(work, struct igbvf_adapter, reset_task);
+
+       igbvf_reinit_locked(adapter);
+}
+
+/**
+ * igbvf_get_stats - Get System Network Statistics
+ * @netdev: network interface device structure
+ *
+ * Returns the address of the device statistics structure.
+ * The statistics are actually updated from the timer callback.
+ **/
+static struct net_device_stats *igbvf_get_stats(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       /* only return the current stats */
+       return &adapter->net_stats;
+}
+
+/**
+ * igbvf_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int igbvf_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+
+       if ((new_mtu < 68) || (max_frame > MAX_JUMBO_FRAME_SIZE)) {
+               dev_err(&adapter->pdev->dev, "Invalid MTU setting\n");
+               return -EINVAL;
+       }
+
+#define MAX_STD_JUMBO_FRAME_SIZE 9234
+       if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
+               dev_err(&adapter->pdev->dev, "MTU > 9216 not supported.\n");
+               return -EINVAL;
+       }
+
+       while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
+               msleep(1);
+       /* igbvf_down has a dependency on max_frame_size */
+       adapter->max_frame_size = max_frame;
+       if (netif_running(netdev))
+               igbvf_down(adapter);
+
+       /*
+        * NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
+        * means we reserve 2 more, this pushes us to allocate from the next
+        * larger slab size.
+        * i.e. RXBUFFER_2048 --> size-4096 slab
+        * However with the new *_jumbo_rx* routines, jumbo receives will use
+        * fragmented skbs
+        */
+
+       if (max_frame <= 1024)
+               adapter->rx_buffer_len = 1024;
+       else if (max_frame <= 2048)
+               adapter->rx_buffer_len = 2048;
+       else
+#if (PAGE_SIZE / 2) > 16384
+               adapter->rx_buffer_len = 16384;
+#else
+               adapter->rx_buffer_len = PAGE_SIZE / 2;
+#endif
+
+
+       /* adjust allocation if LPE protects us, and we aren't using SBP */
+       if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||
+            (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
+               adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN +
+                                        ETH_FCS_LEN;
+
+       dev_info(&adapter->pdev->dev, "changing MTU from %d to %d\n",
+                netdev->mtu, new_mtu);
+       netdev->mtu = new_mtu;
+
+       if (netif_running(netdev))
+               igbvf_up(adapter);
+       else
+               igbvf_reset(adapter);
+
+       clear_bit(__IGBVF_RESETTING, &adapter->state);
+
+       return 0;
+}
+
+static int igbvf_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+       switch (cmd) {
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static int igbvf_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+#ifdef CONFIG_PM
+       int retval = 0;
+#endif
+
+       netif_device_detach(netdev);
+
+       if (netif_running(netdev)) {
+               WARN_ON(test_bit(__IGBVF_RESETTING, &adapter->state));
+               igbvf_down(adapter);
+               igbvf_free_irq(adapter);
+       }
+
+#ifdef CONFIG_PM
+       retval = pci_save_state(pdev);
+       if (retval)
+               return retval;
+#endif
+
+       pci_disable_device(pdev);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int igbvf_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       u32 err;
+
+       pci_restore_state(pdev);
+       err = pci_enable_device_mem(pdev);
+       if (err) {
+               dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n");
+               return err;
+       }
+
+       pci_set_master(pdev);
+
+       if (netif_running(netdev)) {
+               err = igbvf_request_irq(adapter);
+               if (err)
+                       return err;
+       }
+
+       igbvf_reset(adapter);
+
+       if (netif_running(netdev))
+               igbvf_up(adapter);
+
+       netif_device_attach(netdev);
+
+       return 0;
+}
+#endif
+
+static void igbvf_shutdown(struct pci_dev *pdev)
+{
+       igbvf_suspend(pdev, PMSG_SUSPEND);
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void igbvf_netpoll(struct net_device *netdev)
+{
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       disable_irq(adapter->pdev->irq);
+
+       igbvf_clean_tx_irq(adapter->tx_ring);
+
+       enable_irq(adapter->pdev->irq);
+}
+#endif
+
+/**
+ * igbvf_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci connection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+static pci_ers_result_t igbvf_io_error_detected(struct pci_dev *pdev,
+                                                pci_channel_state_t state)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       netif_device_detach(netdev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       if (netif_running(netdev))
+               igbvf_down(adapter);
+       pci_disable_device(pdev);
+
+       /* Request a slot slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * igbvf_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot. Implementation
+ * resembles the first-half of the igbvf_resume routine.
+ */
+static pci_ers_result_t igbvf_io_slot_reset(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       if (pci_enable_device_mem(pdev)) {
+               dev_err(&pdev->dev,
+                       "Cannot re-enable PCI device after reset.\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+       pci_set_master(pdev);
+
+       igbvf_reset(adapter);
+
+       return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * igbvf_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation. Implementation resembles the
+ * second-half of the igbvf_resume routine.
+ */
+static void igbvf_io_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+
+       if (netif_running(netdev)) {
+               if (igbvf_up(adapter)) {
+                       dev_err(&pdev->dev,
+                               "can't bring device back up after reset\n");
+                       return;
+               }
+       }
+
+       netif_device_attach(netdev);
+}
+
+static void igbvf_print_device_info(struct igbvf_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+
+       dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n");
+       dev_info(&pdev->dev, "Address: %pM\n", netdev->dev_addr);
+       dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type);
+}
+
+static const struct net_device_ops igbvf_netdev_ops = {
+       .ndo_open                       = igbvf_open,
+       .ndo_stop                       = igbvf_close,
+       .ndo_start_xmit                 = igbvf_xmit_frame,
+       .ndo_get_stats                  = igbvf_get_stats,
+       .ndo_set_multicast_list         = igbvf_set_multi,
+       .ndo_set_mac_address            = igbvf_set_mac,
+       .ndo_change_mtu                 = igbvf_change_mtu,
+       .ndo_do_ioctl                   = igbvf_ioctl,
+       .ndo_tx_timeout                 = igbvf_tx_timeout,
+       .ndo_vlan_rx_add_vid            = igbvf_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid           = igbvf_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller            = igbvf_netpoll,
+#endif
+};
+
+/**
+ * igbvf_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in igbvf_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * igbvf_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+static int __devinit igbvf_probe(struct pci_dev *pdev,
+                                 const struct pci_device_id *ent)
+{
+       struct net_device *netdev;
+       struct igbvf_adapter *adapter;
+       struct e1000_hw *hw;
+       const struct igbvf_info *ei = igbvf_info_tbl[ent->driver_data];
+
+       static int cards_found;
+       int err, pci_using_dac;
+
+       err = pci_enable_device_mem(pdev);
+       if (err)
+               return err;
+
+       pci_using_dac = 0;
+       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+       if (!err) {
+               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+               if (!err)
+                       pci_using_dac = 1;
+       } else {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               if (err) {
+                       err = dma_set_coherent_mask(&pdev->dev,
+                                                   DMA_BIT_MASK(32));
+                       if (err) {
+                               dev_err(&pdev->dev, "No usable DMA "
+                                       "configuration, aborting\n");
+                               goto err_dma;
+                       }
+               }
+       }
+
+       err = pci_request_regions(pdev, igbvf_driver_name);
+       if (err)
+               goto err_pci_reg;
+
+       pci_set_master(pdev);
+
+       err = -ENOMEM;
+       netdev = alloc_etherdev(sizeof(struct igbvf_adapter));
+       if (!netdev)
+               goto err_alloc_etherdev;
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       pci_set_drvdata(pdev, netdev);
+       adapter = netdev_priv(netdev);
+       hw = &adapter->hw;
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+       adapter->ei = ei;
+       adapter->pba = ei->pba;
+       adapter->flags = ei->flags;
+       adapter->hw.back = adapter;
+       adapter->hw.mac.type = ei->mac;
+       adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
+
+       /* PCI config space info */
+
+       hw->vendor_id = pdev->vendor;
+       hw->device_id = pdev->device;
+       hw->subsystem_vendor_id = pdev->subsystem_vendor;
+       hw->subsystem_device_id = pdev->subsystem_device;
+       hw->revision_id = pdev->revision;
+
+       err = -EIO;
+       adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, 0),
+                                     pci_resource_len(pdev, 0));
+
+       if (!adapter->hw.hw_addr)
+               goto err_ioremap;
+
+       if (ei->get_variants) {
+               err = ei->get_variants(adapter);
+               if (err)
+                       goto err_ioremap;
+       }
+
+       /* setup adapter struct */
+       err = igbvf_sw_init(adapter);
+       if (err)
+               goto err_sw_init;
+
+       /* construct the net_device struct */
+       netdev->netdev_ops = &igbvf_netdev_ops;
+
+       igbvf_set_ethtool_ops(netdev);
+       netdev->watchdog_timeo = 5 * HZ;
+       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+
+       adapter->bd_number = cards_found++;
+
+       netdev->features = NETIF_F_SG |
+                          NETIF_F_IP_CSUM |
+                          NETIF_F_HW_VLAN_TX |
+                          NETIF_F_HW_VLAN_RX |
+                          NETIF_F_HW_VLAN_FILTER;
+
+       netdev->features |= NETIF_F_IPV6_CSUM;
+       netdev->features |= NETIF_F_TSO;
+       netdev->features |= NETIF_F_TSO6;
+
+       if (pci_using_dac)
+               netdev->features |= NETIF_F_HIGHDMA;
+
+       netdev->vlan_features |= NETIF_F_TSO;
+       netdev->vlan_features |= NETIF_F_TSO6;
+       netdev->vlan_features |= NETIF_F_IP_CSUM;
+       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
+       netdev->vlan_features |= NETIF_F_SG;
+
+       /*reset the controller to put the device in a known good state */
+       err = hw->mac.ops.reset_hw(hw);
+       if (err) {
+               dev_info(&pdev->dev,
+                        "PF still in reset state, assigning new address."
+                        " Is the PF interface up?\n");
+               dev_hw_addr_random(adapter->netdev, hw->mac.addr);
+       } else {
+               err = hw->mac.ops.read_mac_addr(hw);
+               if (err) {
+                       dev_err(&pdev->dev, "Error reading MAC address\n");
+                       goto err_hw_init;
+               }
+       }
+
+       memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
+       memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
+
+       if (!is_valid_ether_addr(netdev->perm_addr)) {
+               dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
+                       netdev->dev_addr);
+               err = -EIO;
+               goto err_hw_init;
+       }
+
+       setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,
+                   (unsigned long) adapter);
+
+       INIT_WORK(&adapter->reset_task, igbvf_reset_task);
+       INIT_WORK(&adapter->watchdog_task, igbvf_watchdog_task);
+
+       /* ring size defaults */
+       adapter->rx_ring->count = 1024;
+       adapter->tx_ring->count = 1024;
+
+       /* reset the hardware with the new settings */
+       igbvf_reset(adapter);
+
+       strcpy(netdev->name, "eth%d");
+       err = register_netdev(netdev);
+       if (err)
+               goto err_hw_init;
+
+       /* tell the stack to leave us alone until igbvf_open() is called */
+       netif_carrier_off(netdev);
+       netif_stop_queue(netdev);
+
+       igbvf_print_device_info(adapter);
+
+       igbvf_initialize_last_counter_stats(adapter);
+
+       return 0;
+
+err_hw_init:
+       kfree(adapter->tx_ring);
+       kfree(adapter->rx_ring);
+err_sw_init:
+       igbvf_reset_interrupt_capability(adapter);
+       iounmap(adapter->hw.hw_addr);
+err_ioremap:
+       free_netdev(netdev);
+err_alloc_etherdev:
+       pci_release_regions(pdev);
+err_pci_reg:
+err_dma:
+       pci_disable_device(pdev);
+       return err;
+}
+
+/**
+ * igbvf_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * igbvf_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+static void __devexit igbvf_remove(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct igbvf_adapter *adapter = netdev_priv(netdev);
+       struct e1000_hw *hw = &adapter->hw;
+
+       /*
+        * The watchdog timer may be rescheduled, so explicitly
+        * disable it from being rescheduled.
+        */
+       set_bit(__IGBVF_DOWN, &adapter->state);
+       del_timer_sync(&adapter->watchdog_timer);
+
+       cancel_work_sync(&adapter->reset_task);
+       cancel_work_sync(&adapter->watchdog_task);
+
+       unregister_netdev(netdev);
+
+       igbvf_reset_interrupt_capability(adapter);
+
+       /*
+        * it is important to delete the napi struct prior to freeing the
+        * rx ring so that you do not end up with null pointer refs
+        */
+       netif_napi_del(&adapter->rx_ring->napi);
+       kfree(adapter->tx_ring);
+       kfree(adapter->rx_ring);
+
+       iounmap(hw->hw_addr);
+       if (hw->flash_address)
+               iounmap(hw->flash_address);
+       pci_release_regions(pdev);
+
+       free_netdev(netdev);
+
+       pci_disable_device(pdev);
+}
+
+/* PCI Error Recovery (ERS) */
+static struct pci_error_handlers igbvf_err_handler = {
+       .error_detected = igbvf_io_error_detected,
+       .slot_reset = igbvf_io_slot_reset,
+       .resume = igbvf_io_resume,
+};
+
+static DEFINE_PCI_DEVICE_TABLE(igbvf_pci_tbl) = {
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf },
+       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_VF), board_i350_vf },
+       { } /* terminate list */
+};
+MODULE_DEVICE_TABLE(pci, igbvf_pci_tbl);
+
+/* PCI Device API Driver */
+static struct pci_driver igbvf_driver = {
+       .name     = igbvf_driver_name,
+       .id_table = igbvf_pci_tbl,
+       .probe    = igbvf_probe,
+       .remove   = __devexit_p(igbvf_remove),
+#ifdef CONFIG_PM
+       /* Power Management Hooks */
+       .suspend  = igbvf_suspend,
+       .resume   = igbvf_resume,
+#endif
+       .shutdown = igbvf_shutdown,
+       .err_handler = &igbvf_err_handler
+};
+
+/**
+ * igbvf_init_module - Driver Registration Routine
+ *
+ * igbvf_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init igbvf_init_module(void)
+{
+       int ret;
+       printk(KERN_INFO "%s - version %s\n",
+              igbvf_driver_string, igbvf_driver_version);
+       printk(KERN_INFO "%s\n", igbvf_copyright);
+
+       ret = pci_register_driver(&igbvf_driver);
+
+       return ret;
+}
+module_init(igbvf_init_module);
+
+/**
+ * igbvf_exit_module - Driver Exit Cleanup Routine
+ *
+ * igbvf_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+static void __exit igbvf_exit_module(void)
+{
+       pci_unregister_driver(&igbvf_driver);
+}
+module_exit(igbvf_exit_module);
+
+
+MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
+MODULE_DESCRIPTION("Intel(R) 82576 Virtual Function Network Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+/* netdev.c */
diff --git a/drivers/net/ethernet/intel/igbvf/regs.h b/drivers/net/ethernet/intel/igbvf/regs.h
new file mode 100644 (file)
index 0000000..77e18d3
--- /dev/null
@@ -0,0 +1,108 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 2009 - 2010 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
+
+*******************************************************************************/
+
+#ifndef _E1000_REGS_H_
+#define _E1000_REGS_H_
+
+#define E1000_CTRL      0x00000 /* Device Control - RW */
+#define E1000_STATUS    0x00008 /* Device Status - RO */
+#define E1000_ITR       0x000C4 /* Interrupt Throttling Rate - RW */
+#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_IVAR0     0x01700 /* Interrupt Vector Allocation (array) - RW */
+#define E1000_IVAR_MISC 0x01740 /* IVAR for "other" causes - 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_DCA_TXCTRL(_n) (0x03814 + (_n << 8))
+#define E1000_DCA_RXCTRL(_n) (0x02814 + (_n << 8))
+#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)))
+
+/* Statistics registers */
+#define E1000_VFGPRC    0x00F10
+#define E1000_VFGORC    0x00F18
+#define E1000_VFMPRC    0x00F3C
+#define E1000_VFGPTC    0x00F14
+#define E1000_VFGOTC    0x00F34
+#define E1000_VFGOTLBC  0x00F50
+#define E1000_VFGPTLBC  0x00F44
+#define E1000_VFGORLBC  0x00F48
+#define E1000_VFGPRLBC  0x00F40
+
+/* These act per VF so an array friendly macro is used */
+#define E1000_V2PMAILBOX(_n)   (0x00C40 + (4 * (_n)))
+#define E1000_VMBMEM(_n)       (0x00800 + (64 * (_n)))
+
+/* Define macros for handling registers */
+#define er32(reg) readl(hw->hw_addr + E1000_##reg)
+#define ew32(reg, val) writel((val), hw->hw_addr +  E1000_##reg)
+#define array_er32(reg, offset) \
+       readl(hw->hw_addr + E1000_##reg + (offset << 2))
+#define array_ew32(reg, offset, val) \
+       writel((val), hw->hw_addr +  E1000_##reg + (offset << 2))
+#define e1e_flush() er32(STATUS)
+
+#endif
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
new file mode 100644 (file)
index 0000000..af3822f
--- /dev/null
@@ -0,0 +1,402 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 2009 - 2010 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
+
+*******************************************************************************/
+
+
+#include "vf.h"
+
+static s32 e1000_check_for_link_vf(struct e1000_hw *hw);
+static s32 e1000_get_link_up_info_vf(struct e1000_hw *hw, u16 *speed,
+                                     u16 *duplex);
+static s32 e1000_init_hw_vf(struct e1000_hw *hw);
+static s32 e1000_reset_hw_vf(struct e1000_hw *hw);
+
+static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, u8 *,
+                                         u32, u32, u32);
+static void e1000_rar_set_vf(struct e1000_hw *, u8 *, u32);
+static s32 e1000_read_mac_addr_vf(struct e1000_hw *);
+static s32 e1000_set_vfta_vf(struct e1000_hw *, u16, bool);
+
+/**
+ *  e1000_init_mac_params_vf - Inits MAC params
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_init_mac_params_vf(struct e1000_hw *hw)
+{
+       struct e1000_mac_info *mac = &hw->mac;
+
+       /* VF's have no MTA Registers - PF feature only */
+       mac->mta_reg_count = 128;
+       /* VF's have no access to RAR entries  */
+       mac->rar_entry_count = 1;
+
+       /* Function pointers */
+       /* reset */
+       mac->ops.reset_hw = e1000_reset_hw_vf;
+       /* hw initialization */
+       mac->ops.init_hw = e1000_init_hw_vf;
+       /* check for link */
+       mac->ops.check_for_link = e1000_check_for_link_vf;
+       /* link info */
+       mac->ops.get_link_up_info = e1000_get_link_up_info_vf;
+       /* multicast address update */
+       mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_vf;
+       /* set mac address */
+       mac->ops.rar_set = e1000_rar_set_vf;
+       /* read mac address */
+       mac->ops.read_mac_addr = e1000_read_mac_addr_vf;
+       /* set vlan filter table array */
+       mac->ops.set_vfta = e1000_set_vfta_vf;
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_init_function_pointers_vf - Inits function pointers
+ *  @hw: pointer to the HW structure
+ **/
+void e1000_init_function_pointers_vf(struct e1000_hw *hw)
+{
+       hw->mac.ops.init_params = e1000_init_mac_params_vf;
+       hw->mbx.ops.init_params = e1000_init_mbx_params_vf;
+}
+
+/**
+ *  e1000_get_link_up_info_vf - Gets link info.
+ *  @hw: pointer to the HW structure
+ *  @speed: pointer to 16 bit value to store link speed.
+ *  @duplex: pointer to 16 bit value to store duplex.
+ *
+ *  Since we cannot read the PHY and get accurate link info, we must rely upon
+ *  the status register's data which is often stale and inaccurate.
+ **/
+static s32 e1000_get_link_up_info_vf(struct e1000_hw *hw, u16 *speed,
+                                     u16 *duplex)
+{
+       s32 status;
+
+       status = er32(STATUS);
+       if (status & E1000_STATUS_SPEED_1000)
+               *speed = SPEED_1000;
+       else if (status & E1000_STATUS_SPEED_100)
+               *speed = SPEED_100;
+       else
+               *speed = SPEED_10;
+
+       if (status & E1000_STATUS_FD)
+               *duplex = FULL_DUPLEX;
+       else
+               *duplex = HALF_DUPLEX;
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_reset_hw_vf - Resets the HW
+ *  @hw: pointer to the HW structure
+ *
+ *  VF's provide a function level reset. This is done using bit 26 of ctrl_reg.
+ *  This is all the reset we can perform on a VF.
+ **/
+static s32 e1000_reset_hw_vf(struct e1000_hw *hw)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       u32 timeout = E1000_VF_INIT_TIMEOUT;
+       u32 ret_val = -E1000_ERR_MAC_INIT;
+       u32 msgbuf[3];
+       u8 *addr = (u8 *)(&msgbuf[1]);
+       u32 ctrl;
+
+       /* assert vf queue/interrupt reset */
+       ctrl = er32(CTRL);
+       ew32(CTRL, ctrl | E1000_CTRL_RST);
+
+       /* we cannot initialize while the RSTI / RSTD bits are asserted */
+       while (!mbx->ops.check_for_rst(hw) && timeout) {
+               timeout--;
+               udelay(5);
+       }
+
+       if (timeout) {
+               /* mailbox timeout can now become active */
+               mbx->timeout = E1000_VF_MBX_INIT_TIMEOUT;
+
+               /* notify pf of vf reset completion */
+               msgbuf[0] = E1000_VF_RESET;
+               mbx->ops.write_posted(hw, msgbuf, 1);
+
+               msleep(10);
+
+               /* set our "perm_addr" based on info provided by PF */
+               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
+               if (!ret_val) {
+                       if (msgbuf[0] == (E1000_VF_RESET | E1000_VT_MSGTYPE_ACK))
+                               memcpy(hw->mac.perm_addr, addr, 6);
+                       else
+                               ret_val = -E1000_ERR_MAC_INIT;
+               }
+       }
+
+       return ret_val;
+}
+
+/**
+ *  e1000_init_hw_vf - Inits the HW
+ *  @hw: pointer to the HW structure
+ *
+ *  Not much to do here except clear the PF Reset indication if there is one.
+ **/
+static s32 e1000_init_hw_vf(struct e1000_hw *hw)
+{
+       /* attempt to set and restore our mac address */
+       e1000_rar_set_vf(hw, hw->mac.addr, 0);
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_hash_mc_addr_vf - 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()
+ **/
+static u32 e1000_hash_mc_addr_vf(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;
+
+       /*
+        * The 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++;
+
+       hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) |
+                                 (((u16) mc_addr[5]) << bit_shift)));
+
+       return hash_value;
+}
+
+/**
+ *  e1000_update_mc_addr_list_vf - 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
+ *  @rar_used_count: the first RAR register free to program
+ *  @rar_count: total number of supported Receive Address Registers
+ *
+ *  Updates the Receive Address Registers and Multicast Table Array.
+ *  The caller must have a packed mc_addr_list of multicast addresses.
+ *  The parameter rar_count will usually be hw->mac.rar_entry_count
+ *  unless there are workarounds that change this.
+ **/
+static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
+                                  u8 *mc_addr_list, u32 mc_addr_count,
+                                  u32 rar_used_count, u32 rar_count)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[E1000_VFMAILBOX_SIZE];
+       u16 *hash_list = (u16 *)&msgbuf[1];
+       u32 hash_value;
+       u32 cnt, i;
+
+       /* Each entry in the list uses 1 16 bit word.  We have 30
+        * 16 bit words available in our HW msg buffer (minus 1 for the
+        * msg type).  That's 30 hash values if we pack 'em right.  If
+        * there are more than 30 MC addresses to add then punt the
+        * extras for now and then add code to handle more than 30 later.
+        * It would be unusual for a server to request that many multi-cast
+        * addresses except for in large enterprise network environments.
+        */
+
+       cnt = (mc_addr_count > 30) ? 30 : mc_addr_count;
+       msgbuf[0] = E1000_VF_SET_MULTICAST;
+       msgbuf[0] |= cnt << E1000_VT_MSGINFO_SHIFT;
+
+       for (i = 0; i < cnt; i++) {
+               hash_value = e1000_hash_mc_addr_vf(hw, mc_addr_list);
+               hash_list[i] = hash_value & 0x0FFFF;
+               mc_addr_list += ETH_ADDR_LEN;
+       }
+
+       mbx->ops.write_posted(hw, msgbuf, E1000_VFMAILBOX_SIZE);
+}
+
+/**
+ *  e1000_set_vfta_vf - Set/Unset vlan filter table address
+ *  @hw: pointer to the HW structure
+ *  @vid: determines the vfta register and bit to set/unset
+ *  @set: if true then set bit, else clear bit
+ **/
+static s32 e1000_set_vfta_vf(struct e1000_hw *hw, u16 vid, bool set)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[2];
+       s32 err;
+
+       msgbuf[0] = E1000_VF_SET_VLAN;
+       msgbuf[1] = vid;
+       /* Setting the 8 bit field MSG INFO to true indicates "add" */
+       if (set)
+               msgbuf[0] |= 1 << E1000_VT_MSGINFO_SHIFT;
+
+       mbx->ops.write_posted(hw, msgbuf, 2);
+
+       err = mbx->ops.read_posted(hw, msgbuf, 2);
+
+       msgbuf[0] &= ~E1000_VT_MSGTYPE_CTS;
+
+       /* if nacked the vlan was rejected */
+       if (!err && (msgbuf[0] == (E1000_VF_SET_VLAN | E1000_VT_MSGTYPE_NACK)))
+               err = -E1000_ERR_MAC_INIT;
+
+       return err;
+}
+
+/** e1000_rlpml_set_vf - Set the maximum receive packet length
+ *  @hw: pointer to the HW structure
+ *  @max_size: value to assign to max frame size
+ **/
+void e1000_rlpml_set_vf(struct e1000_hw *hw, u16 max_size)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[2];
+
+       msgbuf[0] = E1000_VF_SET_LPE;
+       msgbuf[1] = max_size;
+
+       mbx->ops.write_posted(hw, msgbuf, 2);
+}
+
+/**
+ *  e1000_rar_set_vf - set device MAC address
+ *  @hw: pointer to the HW structure
+ *  @addr: pointer to the receive address
+ *  @index receive address array register
+ **/
+static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[3];
+       u8 *msg_addr = (u8 *)(&msgbuf[1]);
+       s32 ret_val;
+
+       memset(msgbuf, 0, 12);
+       msgbuf[0] = E1000_VF_SET_MAC_ADDR;
+       memcpy(msg_addr, addr, 6);
+       ret_val = mbx->ops.write_posted(hw, msgbuf, 3);
+
+       if (!ret_val)
+               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
+
+       msgbuf[0] &= ~E1000_VT_MSGTYPE_CTS;
+
+       /* if nacked the address was rejected, use "perm_addr" */
+       if (!ret_val &&
+           (msgbuf[0] == (E1000_VF_SET_MAC_ADDR | E1000_VT_MSGTYPE_NACK)))
+               e1000_read_mac_addr_vf(hw);
+}
+
+/**
+ *  e1000_read_mac_addr_vf - Read device MAC address
+ *  @hw: pointer to the HW structure
+ **/
+static s32 e1000_read_mac_addr_vf(struct e1000_hw *hw)
+{
+       int i;
+
+       for (i = 0; i < ETH_ADDR_LEN; i++)
+               hw->mac.addr[i] = hw->mac.perm_addr[i];
+
+       return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_check_for_link_vf - Check for link for a virtual interface
+ *  @hw: pointer to the HW structure
+ *
+ *  Checks to see if the underlying PF is still talking to the VF and
+ *  if it is then it reports the link state to the hardware, otherwise
+ *  it reports link down and returns an error.
+ **/
+static s32 e1000_check_for_link_vf(struct e1000_hw *hw)
+{
+       struct e1000_mbx_info *mbx = &hw->mbx;
+       struct e1000_mac_info *mac = &hw->mac;
+       s32 ret_val = E1000_SUCCESS;
+       u32 in_msg = 0;
+
+       /*
+        * We only want to run this if there has been a rst asserted.
+        * in this case that could mean a link change, device reset,
+        * or a virtual function reset
+        */
+
+       /* If we were hit with a reset or timeout drop the link */
+       if (!mbx->ops.check_for_rst(hw) || !mbx->timeout)
+               mac->get_link_status = true;
+
+       if (!mac->get_link_status)
+               goto out;
+
+       /* if link status is down no point in checking to see if pf is up */
+       if (!(er32(STATUS) & E1000_STATUS_LU))
+               goto out;
+
+       /* if the read failed it could just be a mailbox collision, best wait
+        * until we are called again and don't report an error */
+       if (mbx->ops.read(hw, &in_msg, 1))
+               goto out;
+
+       /* if incoming message isn't clear to send we are waiting on response */
+       if (!(in_msg & E1000_VT_MSGTYPE_CTS)) {
+               /* message is not CTS and is NACK we must have lost CTS status */
+               if (in_msg & E1000_VT_MSGTYPE_NACK)
+                       ret_val = -E1000_ERR_MAC_INIT;
+               goto out;
+       }
+
+       /* the pf is talking, if we timed out in the past we reinit */
+       if (!mbx->timeout) {
+               ret_val = -E1000_ERR_MAC_INIT;
+               goto out;
+       }
+
+       /* if we passed all the tests above then the link is up and we no
+        * longer need to check for link */
+       mac->get_link_status = false;
+
+out:
+       return ret_val;
+}
+
diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
new file mode 100644 (file)
index 0000000..d7ed58f
--- /dev/null
@@ -0,0 +1,266 @@
+/*******************************************************************************
+
+  Intel(R) 82576 Virtual Function Linux driver
+  Copyright(c) 2009 - 2010 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
+
+*******************************************************************************/
+
+#ifndef _E1000_VF_H_
+#define _E1000_VF_H_
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/if_ether.h>
+
+#include "regs.h"
+#include "defines.h"
+
+struct e1000_hw;
+
+#define E1000_DEV_ID_82576_VF                 0x10CA
+#define E1000_DEV_ID_I350_VF                  0x1520
+#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
+
+/*
+ * 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.
+ */
+#define E1000_RAR_ENTRIES_VF      1
+
+/* Receive Descriptor - Advanced */
+union e1000_adv_rx_desc {
+       struct {
+               u64 pkt_addr;             /* Packet buffer address */
+               u64 hdr_addr;             /* Header buffer address */
+       } read;
+       struct {
+               struct {
+                       union {
+                               u32 data;
+                               struct {
+                                       u16 pkt_info; /* RSS/Packet type */
+                                       u16 hdr_info; /* Split Header,
+                                                      * hdr buffer length */
+                               } hs_rss;
+                       } lo_dword;
+                       union {
+                               u32 rss;          /* RSS Hash */
+                               struct {
+                                       u16 ip_id;    /* IP id */
+                                       u16 csum;     /* Packet Checksum */
+                               } csum_ip;
+                       } hi_dword;
+               } lower;
+               struct {
+                       u32 status_error;     /* ext status/error */
+                       u16 length;           /* Packet length */
+                       u16 vlan;             /* VLAN tag */
+               } upper;
+       } wb;  /* writeback */
+};
+
+#define E1000_RXDADV_HDRBUFLEN_MASK      0x7FE0
+#define E1000_RXDADV_HDRBUFLEN_SHIFT     5
+
+/* Transmit Descriptor - Advanced */
+union e1000_adv_tx_desc {
+       struct {
+               u64 buffer_addr;    /* Address of descriptor's data buf */
+               u32 cmd_type_len;
+               u32 olinfo_status;
+       } read;
+       struct {
+               u64 rsvd;       /* Reserved */
+               u32 nxtseq_seed;
+               u32 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_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_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
+
+/* Context descriptors */
+struct e1000_adv_tx_context_desc {
+       u32 vlan_macip_lens;
+       u32 seqnum_seed;
+       u32 type_tucmd_mlhl;
+       u32 mss_l4len_idx;
+};
+
+#define E1000_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
+#define E1000_ADVTXD_TUCMD_IPV4    0x00000400  /* IP Packet Type: 1=IPv4 */
+#define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800  /* L4 Packet TYPE of TCP */
+#define E1000_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
+#define E1000_ADVTXD_MSS_SHIFT      16  /* Adv ctxt MSS shift */
+
+enum e1000_mac_type {
+       e1000_undefined = 0,
+       e1000_vfadapt,
+       e1000_vfadapt_i350,
+       e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
+};
+
+struct e1000_vf_stats {
+       u64 base_gprc;
+       u64 base_gptc;
+       u64 base_gorc;
+       u64 base_gotc;
+       u64 base_mprc;
+       u64 base_gotlbc;
+       u64 base_gptlbc;
+       u64 base_gorlbc;
+       u64 base_gprlbc;
+
+       u32 last_gprc;
+       u32 last_gptc;
+       u32 last_gorc;
+       u32 last_gotc;
+       u32 last_mprc;
+       u32 last_gotlbc;
+       u32 last_gptlbc;
+       u32 last_gorlbc;
+       u32 last_gprlbc;
+
+       u64 gprc;
+       u64 gptc;
+       u64 gorc;
+       u64 gotc;
+       u64 mprc;
+       u64 gotlbc;
+       u64 gptlbc;
+       u64 gorlbc;
+       u64 gprlbc;
+};
+
+#include "mbx.h"
+
+struct e1000_mac_operations {
+       /* Function pointers for the MAC. */
+       s32  (*init_params)(struct e1000_hw *);
+       s32  (*check_for_link)(struct e1000_hw *);
+       void (*clear_vfta)(struct e1000_hw *);
+       s32  (*get_bus_info)(struct e1000_hw *);
+       s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
+       void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32, u32, u32);
+       s32  (*reset_hw)(struct e1000_hw *);
+       s32  (*init_hw)(struct e1000_hw *);
+       s32  (*setup_link)(struct e1000_hw *);
+       void (*write_vfta)(struct e1000_hw *, u32, u32);
+       void (*mta_set)(struct e1000_hw *, u32);
+       void (*rar_set)(struct e1000_hw *, u8*, u32);
+       s32  (*read_mac_addr)(struct e1000_hw *);
+       s32  (*set_vfta)(struct e1000_hw *, u16, bool);
+};
+
+struct e1000_mac_info {
+       struct e1000_mac_operations ops;
+       u8 addr[6];
+       u8 perm_addr[6];
+
+       enum e1000_mac_type type;
+
+       u16 mta_reg_count;
+       u16 rar_entry_count;
+
+       bool get_link_status;
+};
+
+struct e1000_mbx_operations {
+       s32 (*init_params)(struct e1000_hw *hw);
+       s32 (*read)(struct e1000_hw *, u32 *, u16);
+       s32 (*write)(struct e1000_hw *, u32 *, u16);
+       s32 (*read_posted)(struct e1000_hw *, u32 *, u16);
+       s32 (*write_posted)(struct e1000_hw *, u32 *, u16);
+       s32 (*check_for_msg)(struct e1000_hw *);
+       s32 (*check_for_ack)(struct e1000_hw *);
+       s32 (*check_for_rst)(struct e1000_hw *);
+};
+
+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_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_mbx_info mbx;
+
+       union {
+               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;
+};
+
+/* These functions must be implemented by drivers */
+void e1000_rlpml_set_vf(struct e1000_hw *, u16);
+void e1000_init_function_pointers_vf(struct e1000_hw *hw);
+
+
+#endif /* _E1000_VF_H_ */
diff --git a/drivers/net/ethernet/intel/ixgb/Makefile b/drivers/net/ethernet/intel/ixgb/Makefile
new file mode 100644 (file)
index 0000000..0b20c5e
--- /dev/null
@@ -0,0 +1,35 @@
+################################################################################
+#
+# Intel PRO/10GbE 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
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) PRO/10GbE ethernet driver
+#
+
+obj-$(CONFIG_IXGB) += ixgb.o
+
+ixgb-objs := ixgb_main.o ixgb_hw.o ixgb_ee.o ixgb_ethtool.o ixgb_param.o
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h
new file mode 100644 (file)
index 0000000..49e8408
--- /dev/null
@@ -0,0 +1,217 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+#ifndef _IXGB_H_
+#define _IXGB_H_
+
+#include <linux/stddef.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <asm/byteorder.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/pagemap.h>
+#include <linux/dma-mapping.h>
+#include <linux/bitops.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <linux/capability.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <net/pkt_sched.h>
+#include <linux/list.h>
+#include <linux/reboot.h>
+#include <net/checksum.h>
+
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+
+#define BAR_0          0
+#define BAR_1          1
+#define BAR_5          5
+
+struct ixgb_adapter;
+#include "ixgb_hw.h"
+#include "ixgb_ee.h"
+#include "ixgb_ids.h"
+
+#define PFX "ixgb: "
+
+#ifdef _DEBUG_DRIVER_
+#define IXGB_DBG(fmt, args...) printk(KERN_DEBUG PFX fmt, ##args)
+#else
+#define IXGB_DBG(fmt, args...)                         \
+do {                                                   \
+       if (0)                                          \
+               printk(KERN_DEBUG PFX fmt, ##args);     \
+} while (0)
+#endif
+
+/* TX/RX descriptor defines */
+#define DEFAULT_TXD      256
+#define MAX_TXD         4096
+#define MIN_TXD           64
+
+/* hardware cannot reliably support more than 512 descriptors owned by
+ * hardware descriptor cache otherwise an unreliable ring under heavy
+ * receive load may result */
+#define DEFAULT_RXD      512
+#define MAX_RXD          512
+#define MIN_RXD           64
+
+/* Supported Rx Buffer Sizes */
+#define IXGB_RXBUFFER_2048  2048
+#define IXGB_RXBUFFER_4096  4096
+#define IXGB_RXBUFFER_8192  8192
+#define IXGB_RXBUFFER_16384 16384
+
+/* How many Rx Buffers do we bundle into one write to the hardware ? */
+#define IXGB_RX_BUFFER_WRITE   8       /* Must be power of 2 */
+
+/* wrapper around a pointer to a socket buffer,
+ * so a DMA handle can be stored along with the buffer */
+struct ixgb_buffer {
+       struct sk_buff *skb;
+       dma_addr_t dma;
+       unsigned long time_stamp;
+       u16 length;
+       u16 next_to_watch;
+       u16 mapped_as_page;
+};
+
+struct ixgb_desc_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 ixgb_buffer *buffer_info;
+};
+
+#define IXGB_DESC_UNUSED(R) \
+       ((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
+       (R)->next_to_clean - (R)->next_to_use - 1)
+
+#define IXGB_GET_DESC(R, i, type)      (&(((struct type *)((R).desc))[i]))
+#define IXGB_RX_DESC(R, i)             IXGB_GET_DESC(R, i, ixgb_rx_desc)
+#define IXGB_TX_DESC(R, i)             IXGB_GET_DESC(R, i, ixgb_tx_desc)
+#define IXGB_CONTEXT_DESC(R, i)        IXGB_GET_DESC(R, i, ixgb_context_desc)
+
+/* board specific private data structure */
+
+struct ixgb_adapter {
+       struct timer_list watchdog_timer;
+       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       u32 bd_number;
+       u32 rx_buffer_len;
+       u32 part_num;
+       u16 link_speed;
+       u16 link_duplex;
+       struct work_struct tx_timeout_task;
+
+       /* TX */
+       struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp;
+       unsigned int restart_queue;
+       unsigned long timeo_start;
+       u32 tx_cmd_type;
+       u64 hw_csum_tx_good;
+       u64 hw_csum_tx_error;
+       u32 tx_int_delay;
+       u32 tx_timeout_count;
+       bool tx_int_delay_enable;
+       bool detect_tx_hung;
+
+       /* RX */
+       struct ixgb_desc_ring rx_ring;
+       u64 hw_csum_rx_error;
+       u64 hw_csum_rx_good;
+       u32 rx_int_delay;
+       bool rx_csum;
+
+       /* OS defined structs */
+       struct napi_struct napi;
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+
+       /* structs defined in ixgb_hw.h */
+       struct ixgb_hw hw;
+       u16 msg_enable;
+       struct ixgb_hw_stats stats;
+       u32 alloc_rx_buff_failed;
+       bool have_msi;
+       unsigned long flags;
+};
+
+enum ixgb_state_t {
+       /* TBD
+       __IXGB_TESTING,
+       __IXGB_RESETTING,
+       */
+       __IXGB_DOWN
+};
+
+/* Exported from other modules */
+extern void ixgb_check_options(struct ixgb_adapter *adapter);
+extern void ixgb_set_ethtool_ops(struct net_device *netdev);
+extern char ixgb_driver_name[];
+extern const char ixgb_driver_version[];
+
+extern int ixgb_up(struct ixgb_adapter *adapter);
+extern void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);
+extern void ixgb_reset(struct ixgb_adapter *adapter);
+extern int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
+extern int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
+extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);
+extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);
+extern void ixgb_update_stats(struct ixgb_adapter *adapter);
+
+
+#endif /* _IXGB_H_ */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ee.c b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c
new file mode 100644 (file)
index 0000000..38b362b
--- /dev/null
@@ -0,0 +1,607 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include "ixgb_hw.h"
+#include "ixgb_ee.h"
+/* Local prototypes */
+static u16 ixgb_shift_in_bits(struct ixgb_hw *hw);
+
+static void ixgb_shift_out_bits(struct ixgb_hw *hw,
+                               u16 data,
+                               u16 count);
+static void ixgb_standby_eeprom(struct ixgb_hw *hw);
+
+static bool ixgb_wait_eeprom_command(struct ixgb_hw *hw);
+
+static void ixgb_cleanup_eeprom(struct ixgb_hw *hw);
+
+/******************************************************************************
+ * Raises the EEPROM's clock input.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * eecd_reg - EECD's current value
+ *****************************************************************************/
+static void
+ixgb_raise_clock(struct ixgb_hw *hw,
+                 u32 *eecd_reg)
+{
+       /* Raise the clock input to the EEPROM (by setting the SK bit), and then
+        *  wait 50 microseconds.
+        */
+       *eecd_reg = *eecd_reg | IXGB_EECD_SK;
+       IXGB_WRITE_REG(hw, EECD, *eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+}
+
+/******************************************************************************
+ * Lowers the EEPROM's clock input.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * eecd_reg - EECD's current value
+ *****************************************************************************/
+static void
+ixgb_lower_clock(struct ixgb_hw *hw,
+                 u32 *eecd_reg)
+{
+       /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
+        * wait 50 microseconds.
+        */
+       *eecd_reg = *eecd_reg & ~IXGB_EECD_SK;
+       IXGB_WRITE_REG(hw, EECD, *eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+}
+
+/******************************************************************************
+ * Shift data bits out to the EEPROM.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * data - data to send to the EEPROM
+ * count - number of bits to shift out
+ *****************************************************************************/
+static void
+ixgb_shift_out_bits(struct ixgb_hw *hw,
+                                        u16 data,
+                                        u16 count)
+{
+       u32 eecd_reg;
+       u32 mask;
+
+       /* We need to shift "count" bits out to the EEPROM. So, 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.
+        */
+       mask = 0x01 << (count - 1);
+       eecd_reg = IXGB_READ_REG(hw, EECD);
+       eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI);
+       do {
+               /* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
+                * and then raising and then lowering the clock (the SK bit controls
+                * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
+                * by setting "DI" to "0" and then raising and then lowering the clock.
+                */
+               eecd_reg &= ~IXGB_EECD_DI;
+
+               if (data & mask)
+                       eecd_reg |= IXGB_EECD_DI;
+
+               IXGB_WRITE_REG(hw, EECD, eecd_reg);
+               IXGB_WRITE_FLUSH(hw);
+
+               udelay(50);
+
+               ixgb_raise_clock(hw, &eecd_reg);
+               ixgb_lower_clock(hw, &eecd_reg);
+
+               mask = mask >> 1;
+
+       } while (mask);
+
+       /* We leave the "DI" bit set to "0" when we leave this routine. */
+       eecd_reg &= ~IXGB_EECD_DI;
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+}
+
+/******************************************************************************
+ * Shift data bits in from the EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static u16
+ixgb_shift_in_bits(struct ixgb_hw *hw)
+{
+       u32 eecd_reg;
+       u32 i;
+       u16 data;
+
+       /* In order to read a register from the EEPROM, we need to shift 16 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 "DO"
+        * bit.  During this "shifting in" process the "DI" bit should always be
+        * clear..
+        */
+
+       eecd_reg = IXGB_READ_REG(hw, EECD);
+
+       eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI);
+       data = 0;
+
+       for (i = 0; i < 16; i++) {
+               data = data << 1;
+               ixgb_raise_clock(hw, &eecd_reg);
+
+               eecd_reg = IXGB_READ_REG(hw, EECD);
+
+               eecd_reg &= ~(IXGB_EECD_DI);
+               if (eecd_reg & IXGB_EECD_DO)
+                       data |= 1;
+
+               ixgb_lower_clock(hw, &eecd_reg);
+       }
+
+       return data;
+}
+
+/******************************************************************************
+ * Prepares EEPROM for access
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This
+ * function should be called before issuing a command to the EEPROM.
+ *****************************************************************************/
+static void
+ixgb_setup_eeprom(struct ixgb_hw *hw)
+{
+       u32 eecd_reg;
+
+       eecd_reg = IXGB_READ_REG(hw, EECD);
+
+       /*  Clear SK and DI  */
+       eecd_reg &= ~(IXGB_EECD_SK | IXGB_EECD_DI);
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+
+       /*  Set CS  */
+       eecd_reg |= IXGB_EECD_CS;
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+}
+
+/******************************************************************************
+ * Returns EEPROM to a "standby" state
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_standby_eeprom(struct ixgb_hw *hw)
+{
+       u32 eecd_reg;
+
+       eecd_reg = IXGB_READ_REG(hw, EECD);
+
+       /*  Deselect EEPROM  */
+       eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_SK);
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+
+       /*  Clock high  */
+       eecd_reg |= IXGB_EECD_SK;
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+
+       /*  Select EEPROM  */
+       eecd_reg |= IXGB_EECD_CS;
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+
+       /*  Clock low  */
+       eecd_reg &= ~IXGB_EECD_SK;
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+}
+
+/******************************************************************************
+ * Raises then lowers the EEPROM's clock pin
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_clock_eeprom(struct ixgb_hw *hw)
+{
+       u32 eecd_reg;
+
+       eecd_reg = IXGB_READ_REG(hw, EECD);
+
+       /*  Rising edge of clock  */
+       eecd_reg |= IXGB_EECD_SK;
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+
+       /*  Falling edge of clock  */
+       eecd_reg &= ~IXGB_EECD_SK;
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+       IXGB_WRITE_FLUSH(hw);
+       udelay(50);
+}
+
+/******************************************************************************
+ * Terminates a command by lowering the EEPROM's chip select pin
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_cleanup_eeprom(struct ixgb_hw *hw)
+{
+       u32 eecd_reg;
+
+       eecd_reg = IXGB_READ_REG(hw, EECD);
+
+       eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_DI);
+
+       IXGB_WRITE_REG(hw, EECD, eecd_reg);
+
+       ixgb_clock_eeprom(hw);
+}
+
+/******************************************************************************
+ * Waits for the EEPROM to finish the current command.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * The command is done when the EEPROM's data out pin goes high.
+ *
+ * Returns:
+ *      true: EEPROM data pin is high before timeout.
+ *      false:  Time expired.
+ *****************************************************************************/
+static bool
+ixgb_wait_eeprom_command(struct ixgb_hw *hw)
+{
+       u32 eecd_reg;
+       u32 i;
+
+       /* Toggle the CS line.  This in effect tells to EEPROM to actually execute
+        * the command in question.
+        */
+       ixgb_standby_eeprom(hw);
+
+       /* Now read DO repeatedly until is high (equal to '1').  The EEPROM will
+        * signal that the command has been completed by raising the DO signal.
+        * If DO does not go high in 10 milliseconds, then error out.
+        */
+       for (i = 0; i < 200; i++) {
+               eecd_reg = IXGB_READ_REG(hw, EECD);
+
+               if (eecd_reg & IXGB_EECD_DO)
+                       return true;
+
+               udelay(50);
+       }
+       ASSERT(0);
+       return false;
+}
+
+/******************************************************************************
+ * Verifies that the EEPROM has a valid checksum
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Reads the first 64 16 bit words of the EEPROM and sums the values read.
+ * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
+ * valid.
+ *
+ * Returns:
+ *  true: Checksum is valid
+ *  false: Checksum is not valid.
+ *****************************************************************************/
+bool
+ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
+{
+       u16 checksum = 0;
+       u16 i;
+
+       for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++)
+               checksum += ixgb_read_eeprom(hw, i);
+
+       if (checksum == (u16) EEPROM_SUM)
+               return true;
+       else
+               return false;
+}
+
+/******************************************************************************
+ * Calculates the EEPROM checksum and writes it to the EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Sums the first 63 16 bit words of the EEPROM. Subtracts the sum from 0xBABA.
+ * Writes the difference to word offset 63 of the EEPROM.
+ *****************************************************************************/
+void
+ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
+{
+       u16 checksum = 0;
+       u16 i;
+
+       for (i = 0; i < EEPROM_CHECKSUM_REG; i++)
+               checksum += ixgb_read_eeprom(hw, i);
+
+       checksum = (u16) EEPROM_SUM - checksum;
+
+       ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum);
+}
+
+/******************************************************************************
+ * Writes a 16 bit word to a given offset in the EEPROM.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * reg - offset within the EEPROM to be written to
+ * data - 16 bit word to be written to the EEPROM
+ *
+ * If ixgb_update_eeprom_checksum is not called after this function, the
+ * EEPROM will most likely contain an invalid checksum.
+ *
+ *****************************************************************************/
+void
+ixgb_write_eeprom(struct ixgb_hw *hw, u16 offset, u16 data)
+{
+       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
+
+       /* Prepare the EEPROM for writing */
+       ixgb_setup_eeprom(hw);
+
+       /*  Send the 9-bit EWEN (write enable) command to the EEPROM (5-bit opcode
+        *  plus 4-bit dummy).  This puts the EEPROM into write/erase mode.
+        */
+       ixgb_shift_out_bits(hw, EEPROM_EWEN_OPCODE, 5);
+       ixgb_shift_out_bits(hw, 0, 4);
+
+       /*  Prepare the EEPROM  */
+       ixgb_standby_eeprom(hw);
+
+       /*  Send the Write command (3-bit opcode + 6-bit addr)  */
+       ixgb_shift_out_bits(hw, EEPROM_WRITE_OPCODE, 3);
+       ixgb_shift_out_bits(hw, offset, 6);
+
+       /*  Send the data  */
+       ixgb_shift_out_bits(hw, data, 16);
+
+       ixgb_wait_eeprom_command(hw);
+
+       /*  Recover from write  */
+       ixgb_standby_eeprom(hw);
+
+       /* Send the 9-bit EWDS (write disable) command to the EEPROM (5-bit
+        * opcode plus 4-bit dummy).  This takes the EEPROM out of write/erase
+        * mode.
+        */
+       ixgb_shift_out_bits(hw, EEPROM_EWDS_OPCODE, 5);
+       ixgb_shift_out_bits(hw, 0, 4);
+
+       /*  Done with writing  */
+       ixgb_cleanup_eeprom(hw);
+
+       /* clear the init_ctrl_reg_1 to signify that the cache is invalidated */
+       ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
+}
+
+/******************************************************************************
+ * Reads a 16 bit word from the EEPROM.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * offset - offset of 16 bit word in the EEPROM to read
+ *
+ * Returns:
+ *  The 16-bit value read from the eeprom
+ *****************************************************************************/
+u16
+ixgb_read_eeprom(struct ixgb_hw *hw,
+                 u16 offset)
+{
+       u16 data;
+
+       /*  Prepare the EEPROM for reading  */
+       ixgb_setup_eeprom(hw);
+
+       /*  Send the READ command (opcode + addr)  */
+       ixgb_shift_out_bits(hw, EEPROM_READ_OPCODE, 3);
+       /*
+        * We have a 64 word EEPROM, there are 6 address bits
+        */
+       ixgb_shift_out_bits(hw, offset, 6);
+
+       /*  Read the data  */
+       data = ixgb_shift_in_bits(hw);
+
+       /*  End this read operation  */
+       ixgb_standby_eeprom(hw);
+
+       return data;
+}
+
+/******************************************************************************
+ * Reads eeprom and stores data in shared structure.
+ * Validates eeprom checksum and eeprom signature.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *      true: if eeprom read is successful
+ *      false: otherwise.
+ *****************************************************************************/
+bool
+ixgb_get_eeprom_data(struct ixgb_hw *hw)
+{
+       u16 i;
+       u16 checksum = 0;
+       struct ixgb_ee_map_type *ee_map;
+
+       ENTER();
+
+       ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
+
+       pr_debug("Reading eeprom data\n");
+       for (i = 0; i < IXGB_EEPROM_SIZE ; i++) {
+               u16 ee_data;
+               ee_data = ixgb_read_eeprom(hw, i);
+               checksum += ee_data;
+               hw->eeprom[i] = cpu_to_le16(ee_data);
+       }
+
+       if (checksum != (u16) EEPROM_SUM) {
+               pr_debug("Checksum invalid\n");
+               /* clear the init_ctrl_reg_1 to signify that the cache is
+                * invalidated */
+               ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
+               return false;
+       }
+
+       if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
+                != cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
+               pr_debug("Signature invalid\n");
+               return false;
+       }
+
+       return true;
+}
+
+/******************************************************************************
+ * Local function to check if the eeprom signature is good
+ * If the eeprom signature is good, calls ixgb)get_eeprom_data.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *      true: eeprom signature was good and the eeprom read was successful
+ *      false: otherwise.
+ ******************************************************************************/
+static bool
+ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw)
+{
+       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
+
+       if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
+           == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
+               return true;
+       } else {
+               return ixgb_get_eeprom_data(hw);
+       }
+}
+
+/******************************************************************************
+ * return a word from the eeprom
+ *
+ * hw - Struct containing variables accessed by shared code
+ * index - Offset of eeprom word
+ *
+ * Returns:
+ *          Word at indexed offset in eeprom, if valid, 0 otherwise.
+ ******************************************************************************/
+__le16
+ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index)
+{
+
+       if ((index < IXGB_EEPROM_SIZE) &&
+               (ixgb_check_and_get_eeprom_data(hw) == true)) {
+          return hw->eeprom[index];
+       }
+
+       return 0;
+}
+
+/******************************************************************************
+ * return the mac address from EEPROM
+ *
+ * hw       - Struct containing variables accessed by shared code
+ * mac_addr - Ethernet Address if EEPROM contents are valid, 0 otherwise
+ *
+ * Returns: None.
+ ******************************************************************************/
+void
+ixgb_get_ee_mac_addr(struct ixgb_hw *hw,
+                       u8 *mac_addr)
+{
+       int i;
+       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
+
+       ENTER();
+
+       if (ixgb_check_and_get_eeprom_data(hw) == true) {
+               for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) {
+                       mac_addr[i] = ee_map->mac_addr[i];
+               }
+               pr_debug("eeprom mac address = %pM\n", mac_addr);
+       }
+}
+
+
+/******************************************************************************
+ * return the Printed Board Assembly number from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          PBA number if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+u32
+ixgb_get_ee_pba_number(struct ixgb_hw *hw)
+{
+       if (ixgb_check_and_get_eeprom_data(hw) == true)
+               return le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG])
+                       | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16);
+
+       return 0;
+}
+
+
+/******************************************************************************
+ * return the Device Id from EEPROM
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Returns:
+ *          Device Id if EEPROM contents are valid, 0 otherwise
+ ******************************************************************************/
+u16
+ixgb_get_ee_device_id(struct ixgb_hw *hw)
+{
+       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
+
+       if (ixgb_check_and_get_eeprom_data(hw) == true)
+               return le16_to_cpu(ee_map->device_id);
+
+       return 0;
+}
+
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ee.h b/drivers/net/ethernet/intel/ixgb/ixgb_ee.h
new file mode 100644 (file)
index 0000000..7ea1265
--- /dev/null
@@ -0,0 +1,106 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+#ifndef _IXGB_EE_H_
+#define _IXGB_EE_H_
+
+#define IXGB_EEPROM_SIZE    64 /* Size in words */
+
+#define IXGB_ETH_LENGTH_OF_ADDRESS   6
+
+/* EEPROM Commands */
+#define EEPROM_READ_OPCODE  0x6        /* EEPROM read opcode */
+#define EEPROM_WRITE_OPCODE 0x5        /* EEPROM write opcode */
+#define EEPROM_ERASE_OPCODE 0x7        /* EEPROM erase opcode */
+#define EEPROM_EWEN_OPCODE  0x13       /* EEPROM erase/write enable */
+#define EEPROM_EWDS_OPCODE  0x10       /* EEPROM erase/write disable */
+
+/* EEPROM MAP (Word Offsets) */
+#define EEPROM_IA_1_2_REG        0x0000
+#define EEPROM_IA_3_4_REG        0x0001
+#define EEPROM_IA_5_6_REG        0x0002
+#define EEPROM_COMPATIBILITY_REG 0x0003
+#define EEPROM_PBA_1_2_REG       0x0008
+#define EEPROM_PBA_3_4_REG       0x0009
+#define EEPROM_INIT_CONTROL1_REG 0x000A
+#define EEPROM_SUBSYS_ID_REG     0x000B
+#define EEPROM_SUBVEND_ID_REG    0x000C
+#define EEPROM_DEVICE_ID_REG     0x000D
+#define EEPROM_VENDOR_ID_REG     0x000E
+#define EEPROM_INIT_CONTROL2_REG 0x000F
+#define EEPROM_SWDPINS_REG       0x0020
+#define EEPROM_CIRCUIT_CTRL_REG  0x0021
+#define EEPROM_D0_D3_POWER_REG   0x0022
+#define EEPROM_FLASH_VERSION     0x0032
+#define EEPROM_CHECKSUM_REG      0x003F
+
+/* Mask bits for fields in Word 0x0a of the EEPROM */
+
+#define EEPROM_ICW1_SIGNATURE_MASK  0xC000
+#define EEPROM_ICW1_SIGNATURE_VALID 0x4000
+#define EEPROM_ICW1_SIGNATURE_CLEAR 0x0000
+
+/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
+#define EEPROM_SUM 0xBABA
+
+/* EEPROM Map Sizes (Byte Counts) */
+#define PBA_SIZE 4
+
+/* EEPROM Map defines (WORD OFFSETS)*/
+
+/* EEPROM structure */
+struct ixgb_ee_map_type {
+       u8 mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];
+       __le16 compatibility;
+       __le16 reserved1[4];
+       __le32 pba_number;
+       __le16 init_ctrl_reg_1;
+       __le16 subsystem_id;
+       __le16 subvendor_id;
+       __le16 device_id;
+       __le16 vendor_id;
+       __le16 init_ctrl_reg_2;
+       __le16 oem_reserved[16];
+       __le16 swdpins_reg;
+       __le16 circuit_ctrl_reg;
+       u8 d3_power;
+       u8 d0_power;
+       __le16 reserved2[28];
+       __le16 checksum;
+};
+
+/* EEPROM Functions */
+u16 ixgb_read_eeprom(struct ixgb_hw *hw, u16 reg);
+
+bool ixgb_validate_eeprom_checksum(struct ixgb_hw *hw);
+
+void ixgb_update_eeprom_checksum(struct ixgb_hw *hw);
+
+void ixgb_write_eeprom(struct ixgb_hw *hw, u16 reg, u16 data);
+
+#endif                         /* IXGB_EE_H */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
new file mode 100644 (file)
index 0000000..6da890b
--- /dev/null
@@ -0,0 +1,758 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+/* ethtool support for ixgb */
+
+#include "ixgb.h"
+
+#include <asm/uaccess.h>
+
+#define IXGB_ALL_RAR_ENTRIES 16
+
+enum {NETDEV_STATS, IXGB_STATS};
+
+struct ixgb_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int type;
+       int sizeof_stat;
+       int stat_offset;
+};
+
+#define IXGB_STAT(m)           IXGB_STATS, \
+                               FIELD_SIZEOF(struct ixgb_adapter, m), \
+                               offsetof(struct ixgb_adapter, m)
+#define IXGB_NETDEV_STAT(m)    NETDEV_STATS, \
+                               FIELD_SIZEOF(struct net_device, m), \
+                               offsetof(struct net_device, m)
+
+static struct ixgb_stats ixgb_gstrings_stats[] = {
+       {"rx_packets", IXGB_NETDEV_STAT(stats.rx_packets)},
+       {"tx_packets", IXGB_NETDEV_STAT(stats.tx_packets)},
+       {"rx_bytes", IXGB_NETDEV_STAT(stats.rx_bytes)},
+       {"tx_bytes", IXGB_NETDEV_STAT(stats.tx_bytes)},
+       {"rx_errors", IXGB_NETDEV_STAT(stats.rx_errors)},
+       {"tx_errors", IXGB_NETDEV_STAT(stats.tx_errors)},
+       {"rx_dropped", IXGB_NETDEV_STAT(stats.rx_dropped)},
+       {"tx_dropped", IXGB_NETDEV_STAT(stats.tx_dropped)},
+       {"multicast", IXGB_NETDEV_STAT(stats.multicast)},
+       {"collisions", IXGB_NETDEV_STAT(stats.collisions)},
+
+/*     { "rx_length_errors", IXGB_NETDEV_STAT(stats.rx_length_errors) },       */
+       {"rx_over_errors", IXGB_NETDEV_STAT(stats.rx_over_errors)},
+       {"rx_crc_errors", IXGB_NETDEV_STAT(stats.rx_crc_errors)},
+       {"rx_frame_errors", IXGB_NETDEV_STAT(stats.rx_frame_errors)},
+       {"rx_no_buffer_count", IXGB_STAT(stats.rnbc)},
+       {"rx_fifo_errors", IXGB_NETDEV_STAT(stats.rx_fifo_errors)},
+       {"rx_missed_errors", IXGB_NETDEV_STAT(stats.rx_missed_errors)},
+       {"tx_aborted_errors", IXGB_NETDEV_STAT(stats.tx_aborted_errors)},
+       {"tx_carrier_errors", IXGB_NETDEV_STAT(stats.tx_carrier_errors)},
+       {"tx_fifo_errors", IXGB_NETDEV_STAT(stats.tx_fifo_errors)},
+       {"tx_heartbeat_errors", IXGB_NETDEV_STAT(stats.tx_heartbeat_errors)},
+       {"tx_window_errors", IXGB_NETDEV_STAT(stats.tx_window_errors)},
+       {"tx_deferred_ok", IXGB_STAT(stats.dc)},
+       {"tx_timeout_count", IXGB_STAT(tx_timeout_count) },
+       {"tx_restart_queue", IXGB_STAT(restart_queue) },
+       {"rx_long_length_errors", IXGB_STAT(stats.roc)},
+       {"rx_short_length_errors", IXGB_STAT(stats.ruc)},
+       {"tx_tcp_seg_good", IXGB_STAT(stats.tsctc)},
+       {"tx_tcp_seg_failed", IXGB_STAT(stats.tsctfc)},
+       {"rx_flow_control_xon", IXGB_STAT(stats.xonrxc)},
+       {"rx_flow_control_xoff", IXGB_STAT(stats.xoffrxc)},
+       {"tx_flow_control_xon", IXGB_STAT(stats.xontxc)},
+       {"tx_flow_control_xoff", IXGB_STAT(stats.xofftxc)},
+       {"rx_csum_offload_good", IXGB_STAT(hw_csum_rx_good)},
+       {"rx_csum_offload_errors", IXGB_STAT(hw_csum_rx_error)},
+       {"tx_csum_offload_good", IXGB_STAT(hw_csum_tx_good)},
+       {"tx_csum_offload_errors", IXGB_STAT(hw_csum_tx_error)}
+};
+
+#define IXGB_STATS_LEN ARRAY_SIZE(ixgb_gstrings_stats)
+
+static int
+ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
+       ecmd->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE);
+       ecmd->port = PORT_FIBRE;
+       ecmd->transceiver = XCVR_EXTERNAL;
+
+       if (netif_carrier_ok(adapter->netdev)) {
+               ethtool_cmd_speed_set(ecmd, SPEED_10000);
+               ecmd->duplex = DUPLEX_FULL;
+       } else {
+               ethtool_cmd_speed_set(ecmd, -1);
+               ecmd->duplex = -1;
+       }
+
+       ecmd->autoneg = AUTONEG_DISABLE;
+       return 0;
+}
+
+static void ixgb_set_speed_duplex(struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       /* be optimistic about our link, since we were up before */
+       adapter->link_speed = 10000;
+       adapter->link_duplex = FULL_DUPLEX;
+       netif_carrier_on(netdev);
+       netif_wake_queue(netdev);
+}
+
+static int
+ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       u32 speed = ethtool_cmd_speed(ecmd);
+
+       if (ecmd->autoneg == AUTONEG_ENABLE ||
+           (speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL))
+               return -EINVAL;
+
+       if (netif_running(adapter->netdev)) {
+               ixgb_down(adapter, true);
+               ixgb_reset(adapter);
+               ixgb_up(adapter);
+               ixgb_set_speed_duplex(netdev);
+       } else
+               ixgb_reset(adapter);
+
+       return 0;
+}
+
+static void
+ixgb_get_pauseparam(struct net_device *netdev,
+                        struct ethtool_pauseparam *pause)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_hw *hw = &adapter->hw;
+
+       pause->autoneg = AUTONEG_DISABLE;
+
+       if (hw->fc.type == ixgb_fc_rx_pause)
+               pause->rx_pause = 1;
+       else if (hw->fc.type == ixgb_fc_tx_pause)
+               pause->tx_pause = 1;
+       else if (hw->fc.type == ixgb_fc_full) {
+               pause->rx_pause = 1;
+               pause->tx_pause = 1;
+       }
+}
+
+static int
+ixgb_set_pauseparam(struct net_device *netdev,
+                        struct ethtool_pauseparam *pause)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_hw *hw = &adapter->hw;
+
+       if (pause->autoneg == AUTONEG_ENABLE)
+               return -EINVAL;
+
+       if (pause->rx_pause && pause->tx_pause)
+               hw->fc.type = ixgb_fc_full;
+       else if (pause->rx_pause && !pause->tx_pause)
+               hw->fc.type = ixgb_fc_rx_pause;
+       else if (!pause->rx_pause && pause->tx_pause)
+               hw->fc.type = ixgb_fc_tx_pause;
+       else if (!pause->rx_pause && !pause->tx_pause)
+               hw->fc.type = ixgb_fc_none;
+
+       if (netif_running(adapter->netdev)) {
+               ixgb_down(adapter, true);
+               ixgb_up(adapter);
+               ixgb_set_speed_duplex(netdev);
+       } else
+               ixgb_reset(adapter);
+
+       return 0;
+}
+
+static u32
+ixgb_get_rx_csum(struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       return adapter->rx_csum;
+}
+
+static int
+ixgb_set_rx_csum(struct net_device *netdev, u32 data)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       adapter->rx_csum = data;
+
+       if (netif_running(netdev)) {
+               ixgb_down(adapter, true);
+               ixgb_up(adapter);
+               ixgb_set_speed_duplex(netdev);
+       } else
+               ixgb_reset(adapter);
+       return 0;
+}
+
+static u32
+ixgb_get_tx_csum(struct net_device *netdev)
+{
+       return (netdev->features & NETIF_F_HW_CSUM) != 0;
+}
+
+static int
+ixgb_set_tx_csum(struct net_device *netdev, u32 data)
+{
+       if (data)
+               netdev->features |= NETIF_F_HW_CSUM;
+       else
+               netdev->features &= ~NETIF_F_HW_CSUM;
+
+       return 0;
+}
+
+static int
+ixgb_set_tso(struct net_device *netdev, u32 data)
+{
+       if (data)
+               netdev->features |= NETIF_F_TSO;
+       else
+               netdev->features &= ~NETIF_F_TSO;
+       return 0;
+}
+
+static u32
+ixgb_get_msglevel(struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       return adapter->msg_enable;
+}
+
+static void
+ixgb_set_msglevel(struct net_device *netdev, u32 data)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       adapter->msg_enable = data;
+}
+#define IXGB_GET_STAT(_A_, _R_) _A_->stats._R_
+
+static int
+ixgb_get_regs_len(struct net_device *netdev)
+{
+#define IXGB_REG_DUMP_LEN  136*sizeof(u32)
+       return IXGB_REG_DUMP_LEN;
+}
+
+static void
+ixgb_get_regs(struct net_device *netdev,
+                  struct ethtool_regs *regs, void *p)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_hw *hw = &adapter->hw;
+       u32 *reg = p;
+       u32 *reg_start = reg;
+       u8 i;
+
+       /* the 1 (one) below indicates an attempt at versioning, if the
+        * interface in ethtool or the driver changes, this 1 should be
+        * incremented */
+       regs->version = (1<<24) | hw->revision_id << 16 | hw->device_id;
+
+       /* General Registers */
+       *reg++ = IXGB_READ_REG(hw, CTRL0);      /*   0 */
+       *reg++ = IXGB_READ_REG(hw, CTRL1);      /*   1 */
+       *reg++ = IXGB_READ_REG(hw, STATUS);     /*   2 */
+       *reg++ = IXGB_READ_REG(hw, EECD);       /*   3 */
+       *reg++ = IXGB_READ_REG(hw, MFS);        /*   4 */
+
+       /* Interrupt */
+       *reg++ = IXGB_READ_REG(hw, ICR);        /*   5 */
+       *reg++ = IXGB_READ_REG(hw, ICS);        /*   6 */
+       *reg++ = IXGB_READ_REG(hw, IMS);        /*   7 */
+       *reg++ = IXGB_READ_REG(hw, IMC);        /*   8 */
+
+       /* Receive */
+       *reg++ = IXGB_READ_REG(hw, RCTL);       /*   9 */
+       *reg++ = IXGB_READ_REG(hw, FCRTL);      /*  10 */
+       *reg++ = IXGB_READ_REG(hw, FCRTH);      /*  11 */
+       *reg++ = IXGB_READ_REG(hw, RDBAL);      /*  12 */
+       *reg++ = IXGB_READ_REG(hw, RDBAH);      /*  13 */
+       *reg++ = IXGB_READ_REG(hw, RDLEN);      /*  14 */
+       *reg++ = IXGB_READ_REG(hw, RDH);        /*  15 */
+       *reg++ = IXGB_READ_REG(hw, RDT);        /*  16 */
+       *reg++ = IXGB_READ_REG(hw, RDTR);       /*  17 */
+       *reg++ = IXGB_READ_REG(hw, RXDCTL);     /*  18 */
+       *reg++ = IXGB_READ_REG(hw, RAIDC);      /*  19 */
+       *reg++ = IXGB_READ_REG(hw, RXCSUM);     /*  20 */
+
+       /* there are 16 RAR entries in hardware, we only use 3 */
+       for (i = 0; i < IXGB_ALL_RAR_ENTRIES; i++) {
+               *reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i << 1)); /*21,...,51 */
+               *reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i << 1)); /*22,...,52 */
+       }
+
+       /* Transmit */
+       *reg++ = IXGB_READ_REG(hw, TCTL);       /*  53 */
+       *reg++ = IXGB_READ_REG(hw, TDBAL);      /*  54 */
+       *reg++ = IXGB_READ_REG(hw, TDBAH);      /*  55 */
+       *reg++ = IXGB_READ_REG(hw, TDLEN);      /*  56 */
+       *reg++ = IXGB_READ_REG(hw, TDH);        /*  57 */
+       *reg++ = IXGB_READ_REG(hw, TDT);        /*  58 */
+       *reg++ = IXGB_READ_REG(hw, TIDV);       /*  59 */
+       *reg++ = IXGB_READ_REG(hw, TXDCTL);     /*  60 */
+       *reg++ = IXGB_READ_REG(hw, TSPMT);      /*  61 */
+       *reg++ = IXGB_READ_REG(hw, PAP);        /*  62 */
+
+       /* Physical */
+       *reg++ = IXGB_READ_REG(hw, PCSC1);      /*  63 */
+       *reg++ = IXGB_READ_REG(hw, PCSC2);      /*  64 */
+       *reg++ = IXGB_READ_REG(hw, PCSS1);      /*  65 */
+       *reg++ = IXGB_READ_REG(hw, PCSS2);      /*  66 */
+       *reg++ = IXGB_READ_REG(hw, XPCSS);      /*  67 */
+       *reg++ = IXGB_READ_REG(hw, UCCR);       /*  68 */
+       *reg++ = IXGB_READ_REG(hw, XPCSTC);     /*  69 */
+       *reg++ = IXGB_READ_REG(hw, MACA);       /*  70 */
+       *reg++ = IXGB_READ_REG(hw, APAE);       /*  71 */
+       *reg++ = IXGB_READ_REG(hw, ARD);        /*  72 */
+       *reg++ = IXGB_READ_REG(hw, AIS);        /*  73 */
+       *reg++ = IXGB_READ_REG(hw, MSCA);       /*  74 */
+       *reg++ = IXGB_READ_REG(hw, MSRWD);      /*  75 */
+
+       /* Statistics */
+       *reg++ = IXGB_GET_STAT(adapter, tprl);  /*  76 */
+       *reg++ = IXGB_GET_STAT(adapter, tprh);  /*  77 */
+       *reg++ = IXGB_GET_STAT(adapter, gprcl); /*  78 */
+       *reg++ = IXGB_GET_STAT(adapter, gprch); /*  79 */
+       *reg++ = IXGB_GET_STAT(adapter, bprcl); /*  80 */
+       *reg++ = IXGB_GET_STAT(adapter, bprch); /*  81 */
+       *reg++ = IXGB_GET_STAT(adapter, mprcl); /*  82 */
+       *reg++ = IXGB_GET_STAT(adapter, mprch); /*  83 */
+       *reg++ = IXGB_GET_STAT(adapter, uprcl); /*  84 */
+       *reg++ = IXGB_GET_STAT(adapter, uprch); /*  85 */
+       *reg++ = IXGB_GET_STAT(adapter, vprcl); /*  86 */
+       *reg++ = IXGB_GET_STAT(adapter, vprch); /*  87 */
+       *reg++ = IXGB_GET_STAT(adapter, jprcl); /*  88 */
+       *reg++ = IXGB_GET_STAT(adapter, jprch); /*  89 */
+       *reg++ = IXGB_GET_STAT(adapter, gorcl); /*  90 */
+       *reg++ = IXGB_GET_STAT(adapter, gorch); /*  91 */
+       *reg++ = IXGB_GET_STAT(adapter, torl);  /*  92 */
+       *reg++ = IXGB_GET_STAT(adapter, torh);  /*  93 */
+       *reg++ = IXGB_GET_STAT(adapter, rnbc);  /*  94 */
+       *reg++ = IXGB_GET_STAT(adapter, ruc);   /*  95 */
+       *reg++ = IXGB_GET_STAT(adapter, roc);   /*  96 */
+       *reg++ = IXGB_GET_STAT(adapter, rlec);  /*  97 */
+       *reg++ = IXGB_GET_STAT(adapter, crcerrs);       /*  98 */
+       *reg++ = IXGB_GET_STAT(adapter, icbc);  /*  99 */
+       *reg++ = IXGB_GET_STAT(adapter, ecbc);  /* 100 */
+       *reg++ = IXGB_GET_STAT(adapter, mpc);   /* 101 */
+       *reg++ = IXGB_GET_STAT(adapter, tptl);  /* 102 */
+       *reg++ = IXGB_GET_STAT(adapter, tpth);  /* 103 */
+       *reg++ = IXGB_GET_STAT(adapter, gptcl); /* 104 */
+       *reg++ = IXGB_GET_STAT(adapter, gptch); /* 105 */
+       *reg++ = IXGB_GET_STAT(adapter, bptcl); /* 106 */
+       *reg++ = IXGB_GET_STAT(adapter, bptch); /* 107 */
+       *reg++ = IXGB_GET_STAT(adapter, mptcl); /* 108 */
+       *reg++ = IXGB_GET_STAT(adapter, mptch); /* 109 */
+       *reg++ = IXGB_GET_STAT(adapter, uptcl); /* 110 */
+       *reg++ = IXGB_GET_STAT(adapter, uptch); /* 111 */
+       *reg++ = IXGB_GET_STAT(adapter, vptcl); /* 112 */
+       *reg++ = IXGB_GET_STAT(adapter, vptch); /* 113 */
+       *reg++ = IXGB_GET_STAT(adapter, jptcl); /* 114 */
+       *reg++ = IXGB_GET_STAT(adapter, jptch); /* 115 */
+       *reg++ = IXGB_GET_STAT(adapter, gotcl); /* 116 */
+       *reg++ = IXGB_GET_STAT(adapter, gotch); /* 117 */
+       *reg++ = IXGB_GET_STAT(adapter, totl);  /* 118 */
+       *reg++ = IXGB_GET_STAT(adapter, toth);  /* 119 */
+       *reg++ = IXGB_GET_STAT(adapter, dc);    /* 120 */
+       *reg++ = IXGB_GET_STAT(adapter, plt64c);        /* 121 */
+       *reg++ = IXGB_GET_STAT(adapter, tsctc); /* 122 */
+       *reg++ = IXGB_GET_STAT(adapter, tsctfc);        /* 123 */
+       *reg++ = IXGB_GET_STAT(adapter, ibic);  /* 124 */
+       *reg++ = IXGB_GET_STAT(adapter, rfc);   /* 125 */
+       *reg++ = IXGB_GET_STAT(adapter, lfc);   /* 126 */
+       *reg++ = IXGB_GET_STAT(adapter, pfrc);  /* 127 */
+       *reg++ = IXGB_GET_STAT(adapter, pftc);  /* 128 */
+       *reg++ = IXGB_GET_STAT(adapter, mcfrc); /* 129 */
+       *reg++ = IXGB_GET_STAT(adapter, mcftc); /* 130 */
+       *reg++ = IXGB_GET_STAT(adapter, xonrxc);        /* 131 */
+       *reg++ = IXGB_GET_STAT(adapter, xontxc);        /* 132 */
+       *reg++ = IXGB_GET_STAT(adapter, xoffrxc);       /* 133 */
+       *reg++ = IXGB_GET_STAT(adapter, xofftxc);       /* 134 */
+       *reg++ = IXGB_GET_STAT(adapter, rjc);   /* 135 */
+
+       regs->len = (reg - reg_start) * sizeof(u32);
+}
+
+static int
+ixgb_get_eeprom_len(struct net_device *netdev)
+{
+       /* return size in bytes */
+       return IXGB_EEPROM_SIZE << 1;
+}
+
+static int
+ixgb_get_eeprom(struct net_device *netdev,
+                 struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_hw *hw = &adapter->hw;
+       __le16 *eeprom_buff;
+       int i, max_len, first_word, last_word;
+       int ret_val = 0;
+
+       if (eeprom->len == 0) {
+               ret_val = -EINVAL;
+               goto geeprom_error;
+       }
+
+       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+       max_len = ixgb_get_eeprom_len(netdev);
+
+       if (eeprom->offset > eeprom->offset + eeprom->len) {
+               ret_val = -EINVAL;
+               goto geeprom_error;
+       }
+
+       if ((eeprom->offset + eeprom->len) > max_len)
+               eeprom->len = (max_len - eeprom->offset);
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+
+       eeprom_buff = kmalloc(sizeof(__le16) *
+                       (last_word - first_word + 1), GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       /* note the eeprom was good because the driver loaded */
+       for (i = 0; i <= (last_word - first_word); i++)
+               eeprom_buff[i] = ixgb_get_eeprom_word(hw, (first_word + i));
+
+       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
+       kfree(eeprom_buff);
+
+geeprom_error:
+       return ret_val;
+}
+
+static int
+ixgb_set_eeprom(struct net_device *netdev,
+                 struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       void *ptr;
+       int max_len, first_word, last_word;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EINVAL;
+
+       if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
+               return -EFAULT;
+
+       max_len = ixgb_get_eeprom_len(netdev);
+
+       if (eeprom->offset > eeprom->offset + eeprom->len)
+               return -EINVAL;
+
+       if ((eeprom->offset + eeprom->len) > max_len)
+               eeprom->len = (max_len - eeprom->offset);
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       ptr = (void *)eeprom_buff;
+
+       if (eeprom->offset & 1) {
+               /* need read/modify/write of first changed EEPROM word */
+               /* only the second byte of the word is being modified */
+               eeprom_buff[0] = ixgb_read_eeprom(hw, first_word);
+               ptr++;
+       }
+       if ((eeprom->offset + eeprom->len) & 1) {
+               /* need read/modify/write of last changed EEPROM word */
+               /* only the first byte of the word is being modified */
+               eeprom_buff[last_word - first_word]
+                       = ixgb_read_eeprom(hw, last_word);
+       }
+
+       memcpy(ptr, bytes, eeprom->len);
+       for (i = 0; i <= (last_word - first_word); i++)
+               ixgb_write_eeprom(hw, first_word + i, eeprom_buff[i]);
+
+       /* Update the checksum over the first part of the EEPROM if needed */
+       if (first_word <= EEPROM_CHECKSUM_REG)
+               ixgb_update_eeprom_checksum(hw);
+
+       kfree(eeprom_buff);
+       return 0;
+}
+
+static void
+ixgb_get_drvinfo(struct net_device *netdev,
+                  struct ethtool_drvinfo *drvinfo)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       strncpy(drvinfo->driver,  ixgb_driver_name, 32);
+       strncpy(drvinfo->version, ixgb_driver_version, 32);
+       strncpy(drvinfo->fw_version, "N/A", 32);
+       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
+       drvinfo->n_stats = IXGB_STATS_LEN;
+       drvinfo->regdump_len = ixgb_get_regs_len(netdev);
+       drvinfo->eedump_len = ixgb_get_eeprom_len(netdev);
+}
+
+static void
+ixgb_get_ringparam(struct net_device *netdev,
+               struct ethtool_ringparam *ring)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
+       struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
+
+       ring->rx_max_pending = MAX_RXD;
+       ring->tx_max_pending = MAX_TXD;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = rxdr->count;
+       ring->tx_pending = txdr->count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int
+ixgb_set_ringparam(struct net_device *netdev,
+               struct ethtool_ringparam *ring)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
+       struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
+       struct ixgb_desc_ring tx_old, tx_new, rx_old, rx_new;
+       int err;
+
+       tx_old = adapter->tx_ring;
+       rx_old = adapter->rx_ring;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       if (netif_running(adapter->netdev))
+               ixgb_down(adapter, true);
+
+       rxdr->count = max(ring->rx_pending,(u32)MIN_RXD);
+       rxdr->count = min(rxdr->count,(u32)MAX_RXD);
+       rxdr->count = ALIGN(rxdr->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
+
+       txdr->count = max(ring->tx_pending,(u32)MIN_TXD);
+       txdr->count = min(txdr->count,(u32)MAX_TXD);
+       txdr->count = ALIGN(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
+
+       if (netif_running(adapter->netdev)) {
+               /* Try to get new resources before deleting old */
+               if ((err = ixgb_setup_rx_resources(adapter)))
+                       goto err_setup_rx;
+               if ((err = ixgb_setup_tx_resources(adapter)))
+                       goto err_setup_tx;
+
+               /* save the new, restore the old in order to free it,
+                * then restore the new back again */
+
+               rx_new = adapter->rx_ring;
+               tx_new = adapter->tx_ring;
+               adapter->rx_ring = rx_old;
+               adapter->tx_ring = tx_old;
+               ixgb_free_rx_resources(adapter);
+               ixgb_free_tx_resources(adapter);
+               adapter->rx_ring = rx_new;
+               adapter->tx_ring = tx_new;
+               if ((err = ixgb_up(adapter)))
+                       return err;
+               ixgb_set_speed_duplex(netdev);
+       }
+
+       return 0;
+err_setup_tx:
+       ixgb_free_rx_resources(adapter);
+err_setup_rx:
+       adapter->rx_ring = rx_old;
+       adapter->tx_ring = tx_old;
+       ixgb_up(adapter);
+       return err;
+}
+
+static int
+ixgb_set_phys_id(struct net_device *netdev, enum ethtool_phys_id_state state)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       switch (state) {
+       case ETHTOOL_ID_ACTIVE:
+               return 2;
+
+       case ETHTOOL_ID_ON:
+               ixgb_led_on(&adapter->hw);
+               break;
+
+       case ETHTOOL_ID_OFF:
+       case ETHTOOL_ID_INACTIVE:
+               ixgb_led_off(&adapter->hw);
+       }
+
+       return 0;
+}
+
+static int
+ixgb_get_sset_count(struct net_device *netdev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_STATS:
+               return IXGB_STATS_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static void
+ixgb_get_ethtool_stats(struct net_device *netdev,
+               struct ethtool_stats *stats, u64 *data)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       int i;
+       char *p = NULL;
+
+       ixgb_update_stats(adapter);
+       for (i = 0; i < IXGB_STATS_LEN; i++) {
+               switch (ixgb_gstrings_stats[i].type) {
+               case NETDEV_STATS:
+                       p = (char *) netdev +
+                                       ixgb_gstrings_stats[i].stat_offset;
+                       break;
+               case IXGB_STATS:
+                       p = (char *) adapter +
+                                       ixgb_gstrings_stats[i].stat_offset;
+                       break;
+               }
+
+               data[i] = (ixgb_gstrings_stats[i].sizeof_stat ==
+                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+       }
+}
+
+static void
+ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
+{
+       int i;
+
+       switch(stringset) {
+       case ETH_SS_STATS:
+               for (i = 0; i < IXGB_STATS_LEN; i++) {
+                       memcpy(data + i * ETH_GSTRING_LEN,
+                       ixgb_gstrings_stats[i].stat_string,
+                       ETH_GSTRING_LEN);
+               }
+               break;
+       }
+}
+
+static int ixgb_set_flags(struct net_device *netdev, u32 data)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       bool need_reset;
+       int rc;
+
+       /*
+        * Tx VLAN insertion does not work per HW design when Rx stripping is
+        * disabled.  Disable txvlan when rxvlan is turned off, and enable
+        * rxvlan when txvlan is turned on.
+        */
+       if (!(data & ETH_FLAG_RXVLAN) &&
+           (netdev->features & NETIF_F_HW_VLAN_TX))
+               data &= ~ETH_FLAG_TXVLAN;
+       else if (data & ETH_FLAG_TXVLAN)
+               data |= ETH_FLAG_RXVLAN;
+
+       need_reset = (data & ETH_FLAG_RXVLAN) !=
+                    (netdev->features & NETIF_F_HW_VLAN_RX);
+
+       rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
+                                               ETH_FLAG_TXVLAN);
+       if (rc)
+               return rc;
+
+       if (need_reset) {
+               if (netif_running(netdev)) {
+                       ixgb_down(adapter, true);
+                       ixgb_up(adapter);
+                       ixgb_set_speed_duplex(netdev);
+               } else
+                       ixgb_reset(adapter);
+       }
+
+       return 0;
+}
+
+static const struct ethtool_ops ixgb_ethtool_ops = {
+       .get_settings = ixgb_get_settings,
+       .set_settings = ixgb_set_settings,
+       .get_drvinfo = ixgb_get_drvinfo,
+       .get_regs_len = ixgb_get_regs_len,
+       .get_regs = ixgb_get_regs,
+       .get_link = ethtool_op_get_link,
+       .get_eeprom_len = ixgb_get_eeprom_len,
+       .get_eeprom = ixgb_get_eeprom,
+       .set_eeprom = ixgb_set_eeprom,
+       .get_ringparam = ixgb_get_ringparam,
+       .set_ringparam = ixgb_set_ringparam,
+       .get_pauseparam = ixgb_get_pauseparam,
+       .set_pauseparam = ixgb_set_pauseparam,
+       .get_rx_csum = ixgb_get_rx_csum,
+       .set_rx_csum = ixgb_set_rx_csum,
+       .get_tx_csum = ixgb_get_tx_csum,
+       .set_tx_csum = ixgb_set_tx_csum,
+       .set_sg = ethtool_op_set_sg,
+       .get_msglevel = ixgb_get_msglevel,
+       .set_msglevel = ixgb_set_msglevel,
+       .set_tso = ixgb_set_tso,
+       .get_strings = ixgb_get_strings,
+       .set_phys_id = ixgb_set_phys_id,
+       .get_sset_count = ixgb_get_sset_count,
+       .get_ethtool_stats = ixgb_get_ethtool_stats,
+       .get_flags = ethtool_op_get_flags,
+       .set_flags = ixgb_set_flags,
+};
+
+void ixgb_set_ethtool_ops(struct net_device *netdev)
+{
+       SET_ETHTOOL_OPS(netdev, &ixgb_ethtool_ops);
+}
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
new file mode 100644 (file)
index 0000000..3d61a9e
--- /dev/null
@@ -0,0 +1,1262 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+/* ixgb_hw.c
+ * Shared functions for accessing and configuring the adapter
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include "ixgb_hw.h"
+#include "ixgb_ids.h"
+
+#include <linux/etherdevice.h>
+
+/*  Local function prototypes */
+
+static u32 ixgb_hash_mc_addr(struct ixgb_hw *hw, u8 * mc_addr);
+
+static void ixgb_mta_set(struct ixgb_hw *hw, u32 hash_value);
+
+static void ixgb_get_bus_info(struct ixgb_hw *hw);
+
+static bool ixgb_link_reset(struct ixgb_hw *hw);
+
+static void ixgb_optics_reset(struct ixgb_hw *hw);
+
+static void ixgb_optics_reset_bcm(struct ixgb_hw *hw);
+
+static ixgb_phy_type ixgb_identify_phy(struct ixgb_hw *hw);
+
+static void ixgb_clear_hw_cntrs(struct ixgb_hw *hw);
+
+static void ixgb_clear_vfta(struct ixgb_hw *hw);
+
+static void ixgb_init_rx_addrs(struct ixgb_hw *hw);
+
+static u16 ixgb_read_phy_reg(struct ixgb_hw *hw,
+                                 u32 reg_address,
+                                 u32 phy_address,
+                                 u32 device_type);
+
+static bool ixgb_setup_fc(struct ixgb_hw *hw);
+
+static bool mac_addr_valid(u8 *mac_addr);
+
+static u32 ixgb_mac_reset(struct ixgb_hw *hw)
+{
+       u32 ctrl_reg;
+
+       ctrl_reg =  IXGB_CTRL0_RST |
+                               IXGB_CTRL0_SDP3_DIR |   /* All pins are Output=1 */
+                               IXGB_CTRL0_SDP2_DIR |
+                               IXGB_CTRL0_SDP1_DIR |
+                               IXGB_CTRL0_SDP0_DIR |
+                               IXGB_CTRL0_SDP3  |   /* Initial value 1101   */
+                               IXGB_CTRL0_SDP2  |
+                               IXGB_CTRL0_SDP0;
+
+#ifdef HP_ZX1
+       /* Workaround for 82597EX reset errata */
+       IXGB_WRITE_REG_IO(hw, CTRL0, ctrl_reg);
+#else
+       IXGB_WRITE_REG(hw, CTRL0, ctrl_reg);
+#endif
+
+       /* Delay a few ms just to allow the reset to complete */
+       msleep(IXGB_DELAY_AFTER_RESET);
+       ctrl_reg = IXGB_READ_REG(hw, CTRL0);
+#ifdef DBG
+       /* Make sure the self-clearing global reset bit did self clear */
+       ASSERT(!(ctrl_reg & IXGB_CTRL0_RST));
+#endif
+
+       if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) {
+               ctrl_reg =  /* Enable interrupt from XFP and SerDes */
+                          IXGB_CTRL1_GPI0_EN |
+                          IXGB_CTRL1_SDP6_DIR |
+                          IXGB_CTRL1_SDP7_DIR |
+                          IXGB_CTRL1_SDP6 |
+                          IXGB_CTRL1_SDP7;
+               IXGB_WRITE_REG(hw, CTRL1, ctrl_reg);
+               ixgb_optics_reset_bcm(hw);
+       }
+
+       if (hw->phy_type == ixgb_phy_type_txn17401)
+               ixgb_optics_reset(hw);
+
+       return ctrl_reg;
+}
+
+/******************************************************************************
+ * Reset the transmit and receive units; mask and clear all interrupts.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+bool
+ixgb_adapter_stop(struct ixgb_hw *hw)
+{
+       u32 ctrl_reg;
+       u32 icr_reg;
+
+       ENTER();
+
+       /* If we are stopped or resetting exit gracefully and wait to be
+        * started again before accessing the hardware.
+        */
+       if (hw->adapter_stopped) {
+               pr_debug("Exiting because the adapter is already stopped!!!\n");
+               return false;
+       }
+
+       /* Set the Adapter Stopped flag so other driver functions stop
+        * touching the Hardware.
+        */
+       hw->adapter_stopped = true;
+
+       /* Clear interrupt mask to stop board from generating interrupts */
+       pr_debug("Masking off all interrupts\n");
+       IXGB_WRITE_REG(hw, 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.
+        */
+       IXGB_WRITE_REG(hw, RCTL, IXGB_READ_REG(hw, RCTL) & ~IXGB_RCTL_RXEN);
+       IXGB_WRITE_REG(hw, TCTL, IXGB_READ_REG(hw, TCTL) & ~IXGB_TCTL_TXEN);
+       IXGB_WRITE_FLUSH(hw);
+       msleep(IXGB_DELAY_BEFORE_RESET);
+
+       /* Issue a global reset to the MAC.  This will reset the chip's
+        * transmit, receive, DMA, and link units.  It will not effect
+        * the current PCI configuration.  The global reset bit is self-
+        * clearing, and should clear within a microsecond.
+        */
+       pr_debug("Issuing a global reset to MAC\n");
+
+       ctrl_reg = ixgb_mac_reset(hw);
+
+       /* Clear interrupt mask to stop board from generating interrupts */
+       pr_debug("Masking off all interrupts\n");
+       IXGB_WRITE_REG(hw, IMC, 0xffffffff);
+
+       /* Clear any pending interrupt events. */
+       icr_reg = IXGB_READ_REG(hw, ICR);
+
+       return ctrl_reg & IXGB_CTRL0_RST;
+}
+
+
+/******************************************************************************
+ * Identifies the vendor of the optics module on the adapter.  The SR adapters
+ * support two different types of XPAK optics, so it is necessary to determine
+ * which optics are present before applying any optics-specific workarounds.
+ *
+ * hw - Struct containing variables accessed by shared code.
+ *
+ * Returns: the vendor of the XPAK optics module.
+ *****************************************************************************/
+static ixgb_xpak_vendor
+ixgb_identify_xpak_vendor(struct ixgb_hw *hw)
+{
+       u32 i;
+       u16 vendor_name[5];
+       ixgb_xpak_vendor xpak_vendor;
+
+       ENTER();
+
+       /* Read the first few bytes of the vendor string from the XPAK NVR
+        * registers.  These are standard XENPAK/XPAK registers, so all XPAK
+        * devices should implement them. */
+       for (i = 0; i < 5; i++) {
+               vendor_name[i] = ixgb_read_phy_reg(hw,
+                                                  MDIO_PMA_PMD_XPAK_VENDOR_NAME
+                                                  + i, IXGB_PHY_ADDRESS,
+                                                  MDIO_MMD_PMAPMD);
+       }
+
+       /* Determine the actual vendor */
+       if (vendor_name[0] == 'I' &&
+           vendor_name[1] == 'N' &&
+           vendor_name[2] == 'T' &&
+           vendor_name[3] == 'E' && vendor_name[4] == 'L') {
+               xpak_vendor = ixgb_xpak_vendor_intel;
+       } else {
+               xpak_vendor = ixgb_xpak_vendor_infineon;
+       }
+
+       return xpak_vendor;
+}
+
+/******************************************************************************
+ * Determine the physical layer module on the adapter.
+ *
+ * hw - Struct containing variables accessed by shared code.  The device_id
+ *      field must be (correctly) populated before calling this routine.
+ *
+ * Returns: the phy type of the adapter.
+ *****************************************************************************/
+static ixgb_phy_type
+ixgb_identify_phy(struct ixgb_hw *hw)
+{
+       ixgb_phy_type phy_type;
+       ixgb_xpak_vendor xpak_vendor;
+
+       ENTER();
+
+       /* Infer the transceiver/phy type from the device id */
+       switch (hw->device_id) {
+       case IXGB_DEVICE_ID_82597EX:
+               pr_debug("Identified TXN17401 optics\n");
+               phy_type = ixgb_phy_type_txn17401;
+               break;
+
+       case IXGB_DEVICE_ID_82597EX_SR:
+               /* The SR adapters carry two different types of XPAK optics
+                * modules; read the vendor identifier to determine the exact
+                * type of optics. */
+               xpak_vendor = ixgb_identify_xpak_vendor(hw);
+               if (xpak_vendor == ixgb_xpak_vendor_intel) {
+                       pr_debug("Identified TXN17201 optics\n");
+                       phy_type = ixgb_phy_type_txn17201;
+               } else {
+                       pr_debug("Identified G6005 optics\n");
+                       phy_type = ixgb_phy_type_g6005;
+               }
+               break;
+       case IXGB_DEVICE_ID_82597EX_LR:
+               pr_debug("Identified G6104 optics\n");
+               phy_type = ixgb_phy_type_g6104;
+               break;
+       case IXGB_DEVICE_ID_82597EX_CX4:
+               pr_debug("Identified CX4\n");
+               xpak_vendor = ixgb_identify_xpak_vendor(hw);
+               if (xpak_vendor == ixgb_xpak_vendor_intel) {
+                       pr_debug("Identified TXN17201 optics\n");
+                       phy_type = ixgb_phy_type_txn17201;
+               } else {
+                       pr_debug("Identified G6005 optics\n");
+                       phy_type = ixgb_phy_type_g6005;
+               }
+               break;
+       default:
+               pr_debug("Unknown physical layer module\n");
+               phy_type = ixgb_phy_type_unknown;
+               break;
+       }
+
+       /* update phy type for sun specific board */
+       if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID)
+               phy_type = ixgb_phy_type_bcm;
+
+       return phy_type;
+}
+
+/******************************************************************************
+ * Performs basic configuration of the adapter.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Resets the controller.
+ * Reads and validates the EEPROM.
+ * Initializes the receive address registers.
+ * Initializes the multicast table.
+ * Clears all on-chip counters.
+ * Calls routine to setup flow control settings.
+ * Leaves the transmit and receive units disabled and uninitialized.
+ *
+ * Returns:
+ *      true if successful,
+ *      false if unrecoverable problems were encountered.
+ *****************************************************************************/
+bool
+ixgb_init_hw(struct ixgb_hw *hw)
+{
+       u32 i;
+       u32 ctrl_reg;
+       bool status;
+
+       ENTER();
+
+       /* Issue a global reset to the MAC.  This will reset the chip's
+        * transmit, receive, DMA, and link units.  It will not effect
+        * the current PCI configuration.  The global reset bit is self-
+        * clearing, and should clear within a microsecond.
+        */
+       pr_debug("Issuing a global reset to MAC\n");
+
+       ctrl_reg = ixgb_mac_reset(hw);
+
+       pr_debug("Issuing an EE reset to MAC\n");
+#ifdef HP_ZX1
+       /* Workaround for 82597EX reset errata */
+       IXGB_WRITE_REG_IO(hw, CTRL1, IXGB_CTRL1_EE_RST);
+#else
+       IXGB_WRITE_REG(hw, CTRL1, IXGB_CTRL1_EE_RST);
+#endif
+
+       /* Delay a few ms just to allow the reset to complete */
+       msleep(IXGB_DELAY_AFTER_EE_RESET);
+
+       if (!ixgb_get_eeprom_data(hw))
+               return false;
+
+       /* Use the device id to determine the type of phy/transceiver. */
+       hw->device_id = ixgb_get_ee_device_id(hw);
+       hw->phy_type = ixgb_identify_phy(hw);
+
+       /* Setup the receive addresses.
+        * Receive Address Registers (RARs 0 - 15).
+        */
+       ixgb_init_rx_addrs(hw);
+
+       /*
+        * Check that a valid MAC address has been set.
+        * If it is not valid, we fail hardware init.
+        */
+       if (!mac_addr_valid(hw->curr_mac_addr)) {
+               pr_debug("MAC address invalid after ixgb_init_rx_addrs\n");
+               return(false);
+       }
+
+       /* tell the routines in this file they can access hardware again */
+       hw->adapter_stopped = false;
+
+       /* Fill in the bus_info structure */
+       ixgb_get_bus_info(hw);
+
+       /* Zero out the Multicast HASH table */
+       pr_debug("Zeroing the MTA\n");
+       for (i = 0; i < IXGB_MC_TBL_SIZE; i++)
+               IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0);
+
+       /* Zero out the VLAN Filter Table Array */
+       ixgb_clear_vfta(hw);
+
+       /* Zero all of the hardware counters */
+       ixgb_clear_hw_cntrs(hw);
+
+       /* Call a subroutine to setup flow control. */
+       status = ixgb_setup_fc(hw);
+
+       /* 82597EX errata: Call check-for-link in case lane deskew is locked */
+       ixgb_check_for_link(hw);
+
+       return status;
+}
+
+/******************************************************************************
+ * Initializes receive address filters.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *
+ * Places the MAC address in receive address register 0 and clears the rest
+ * of the receive address registers. Clears the multicast table. Assumes
+ * the receiver is in reset when the routine is called.
+ *****************************************************************************/
+static void
+ixgb_init_rx_addrs(struct ixgb_hw *hw)
+{
+       u32 i;
+
+       ENTER();
+
+       /*
+        * If the current mac address is valid, assume it is a software override
+        * to the permanent address.
+        * Otherwise, use the permanent address from the eeprom.
+        */
+       if (!mac_addr_valid(hw->curr_mac_addr)) {
+
+               /* Get the MAC address from the eeprom for later reference */
+               ixgb_get_ee_mac_addr(hw, hw->curr_mac_addr);
+
+               pr_debug("Keeping Permanent MAC Addr = %pM\n",
+                        hw->curr_mac_addr);
+       } else {
+
+               /* Setup the receive address. */
+               pr_debug("Overriding MAC Address in RAR[0]\n");
+               pr_debug("New MAC Addr = %pM\n", hw->curr_mac_addr);
+
+               ixgb_rar_set(hw, hw->curr_mac_addr, 0);
+       }
+
+       /* Zero out the other 15 receive addresses. */
+       pr_debug("Clearing RAR[1-15]\n");
+       for (i = 1; i < IXGB_RAR_ENTRIES; i++) {
+               /* Write high reg first to disable the AV bit first */
+               IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
+               IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
+       }
+}
+
+/******************************************************************************
+ * Updates the MAC's list of multicast addresses.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * mc_addr_list - the list of new multicast addresses
+ * mc_addr_count - number of addresses
+ * pad - number of bytes between addresses in the list
+ *
+ * The given list replaces any existing list. Clears the last 15 receive
+ * address registers and the multicast table. Uses receive address registers
+ * for the first 15 multicast addresses, and hashes the rest into the
+ * multicast table.
+ *****************************************************************************/
+void
+ixgb_mc_addr_list_update(struct ixgb_hw *hw,
+                         u8 *mc_addr_list,
+                         u32 mc_addr_count,
+                         u32 pad)
+{
+       u32 hash_value;
+       u32 i;
+       u32 rar_used_count = 1;         /* RAR[0] is used for our MAC address */
+       u8 *mca;
+
+       ENTER();
+
+       /* Set the new number of MC addresses that we are being requested to use. */
+       hw->num_mc_addrs = mc_addr_count;
+
+       /* Clear RAR[1-15] */
+       pr_debug("Clearing RAR[1-15]\n");
+       for (i = rar_used_count; i < IXGB_RAR_ENTRIES; i++) {
+               IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
+               IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
+       }
+
+       /* Clear the MTA */
+       pr_debug("Clearing MTA\n");
+       for (i = 0; i < IXGB_MC_TBL_SIZE; i++)
+               IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0);
+
+       /* Add the new addresses */
+       mca = mc_addr_list;
+       for (i = 0; i < mc_addr_count; i++) {
+               pr_debug("Adding the multicast addresses:\n");
+               pr_debug("MC Addr #%d = %pM\n", i, mca);
+
+               /* Place this multicast address in the RAR if there is room, *
+                * else put it in the MTA
+                */
+               if (rar_used_count < IXGB_RAR_ENTRIES) {
+                       ixgb_rar_set(hw, mca, rar_used_count);
+                       pr_debug("Added a multicast address to RAR[%d]\n", i);
+                       rar_used_count++;
+               } else {
+                       hash_value = ixgb_hash_mc_addr(hw, mca);
+
+                       pr_debug("Hash value = 0x%03X\n", hash_value);
+
+                       ixgb_mta_set(hw, hash_value);
+               }
+
+               mca += IXGB_ETH_LENGTH_OF_ADDRESS + pad;
+       }
+
+       pr_debug("MC Update Complete\n");
+}
+
+/******************************************************************************
+ * Hashes an address to determine its location in the multicast table
+ *
+ * hw - Struct containing variables accessed by shared code
+ * mc_addr - the multicast address to hash
+ *
+ * Returns:
+ *      The hash value
+ *****************************************************************************/
+static u32
+ixgb_hash_mc_addr(struct ixgb_hw *hw,
+                  u8 *mc_addr)
+{
+       u32 hash_value = 0;
+
+       ENTER();
+
+       /* The portion of the address that is used for the hash table is
+        * determined by the mc_filter_type setting.
+        */
+       switch (hw->mc_filter_type) {
+               /* [0] [1] [2] [3] [4] [5]
+                * 01  AA  00  12  34  56
+                * LSB                 MSB - According to H/W docs */
+       case 0:
+               /* [47:36] i.e. 0x563 for above example address */
+               hash_value =
+                   ((mc_addr[4] >> 4) | (((u16) mc_addr[5]) << 4));
+               break;
+       case 1:         /* [46:35] i.e. 0xAC6 for above example address */
+               hash_value =
+                   ((mc_addr[4] >> 3) | (((u16) mc_addr[5]) << 5));
+               break;
+       case 2:         /* [45:34] i.e. 0x5D8 for above example address */
+               hash_value =
+                   ((mc_addr[4] >> 2) | (((u16) mc_addr[5]) << 6));
+               break;
+       case 3:         /* [43:32] i.e. 0x634 for above example address */
+               hash_value = ((mc_addr[4]) | (((u16) mc_addr[5]) << 8));
+               break;
+       default:
+               /* Invalid mc_filter_type, what should we do? */
+               pr_debug("MC filter type param set incorrectly\n");
+               ASSERT(0);
+               break;
+       }
+
+       hash_value &= 0xFFF;
+       return hash_value;
+}
+
+/******************************************************************************
+ * Sets the bit in the multicast table corresponding to the hash value.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * hash_value - Multicast address hash value
+ *****************************************************************************/
+static void
+ixgb_mta_set(struct ixgb_hw *hw,
+                 u32 hash_value)
+{
+       u32 hash_bit, hash_reg;
+       u32 mta_reg;
+
+       /* The MTA is a register array of 128 32-bit registers.
+        * It is treated like an array of 4096 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 register is determined by the
+        * upper 7 bits of the hash value and the bit within that
+        * register are determined by the lower 5 bits of the value.
+        */
+       hash_reg = (hash_value >> 5) & 0x7F;
+       hash_bit = hash_value & 0x1F;
+
+       mta_reg = IXGB_READ_REG_ARRAY(hw, MTA, hash_reg);
+
+       mta_reg |= (1 << hash_bit);
+
+       IXGB_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta_reg);
+}
+
+/******************************************************************************
+ * Puts an ethernet address into a receive address register.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * addr - Address to put into receive address register
+ * index - Receive address register to write
+ *****************************************************************************/
+void
+ixgb_rar_set(struct ixgb_hw *hw,
+                 u8 *addr,
+                 u32 index)
+{
+       u32 rar_low, rar_high;
+
+       ENTER();
+
+       /* 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) |
+                       IXGB_RAH_AV);
+
+       IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
+       IXGB_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
+}
+
+/******************************************************************************
+ * Writes a value to the specified offset in the VLAN filter table.
+ *
+ * hw - Struct containing variables accessed by shared code
+ * offset - Offset in VLAN filer table to write
+ * value - Value to write into VLAN filter table
+ *****************************************************************************/
+void
+ixgb_write_vfta(struct ixgb_hw *hw,
+                u32 offset,
+                u32 value)
+{
+       IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value);
+}
+
+/******************************************************************************
+ * Clears the VLAN filer table
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_clear_vfta(struct ixgb_hw *hw)
+{
+       u32 offset;
+
+       for (offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++)
+               IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
+}
+
+/******************************************************************************
+ * Configures the flow control settings based on SW configuration.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+
+static bool
+ixgb_setup_fc(struct ixgb_hw *hw)
+{
+       u32 ctrl_reg;
+       u32 pap_reg = 0;   /* by default, assume no pause time */
+       bool status = true;
+
+       ENTER();
+
+       /* Get the current control reg 0 settings */
+       ctrl_reg = IXGB_READ_REG(hw, CTRL0);
+
+       /* Clear the Receive Pause Enable and Transmit Pause Enable bits */
+       ctrl_reg &= ~(IXGB_CTRL0_RPE | IXGB_CTRL0_TPE);
+
+       /* The possible values of the "flow_control" 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:  Invalid.
+        */
+       switch (hw->fc.type) {
+       case ixgb_fc_none:      /* 0 */
+               /* Set CMDC bit to disable Rx Flow control */
+               ctrl_reg |= (IXGB_CTRL0_CMDC);
+               break;
+       case ixgb_fc_rx_pause:  /* 1 */
+               /* RX Flow control is enabled, and TX Flow control is
+                * disabled.
+                */
+               ctrl_reg |= (IXGB_CTRL0_RPE);
+               break;
+       case ixgb_fc_tx_pause:  /* 2 */
+               /* TX Flow control is enabled, and RX Flow control is
+                * disabled, by a software over-ride.
+                */
+               ctrl_reg |= (IXGB_CTRL0_TPE);
+               pap_reg = hw->fc.pause_time;
+               break;
+       case ixgb_fc_full:      /* 3 */
+               /* Flow control (both RX and TX) is enabled by a software
+                * over-ride.
+                */
+               ctrl_reg |= (IXGB_CTRL0_RPE | IXGB_CTRL0_TPE);
+               pap_reg = hw->fc.pause_time;
+               break;
+       default:
+               /* We should never get here.  The value should be 0-3. */
+               pr_debug("Flow control param set incorrectly\n");
+               ASSERT(0);
+               break;
+       }
+
+       /* Write the new settings */
+       IXGB_WRITE_REG(hw, CTRL0, ctrl_reg);
+
+       if (pap_reg != 0)
+               IXGB_WRITE_REG(hw, PAP, pap_reg);
+
+       /* 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 in not enabled, then these
+        * registers will be set to 0.
+        */
+       if (!(hw->fc.type & ixgb_fc_tx_pause)) {
+               IXGB_WRITE_REG(hw, FCRTL, 0);
+               IXGB_WRITE_REG(hw, FCRTH, 0);
+       } else {
+          /* We need to set up the Receive Threshold high and low water
+           * marks as well as (optionally) enabling the transmission of XON
+           * frames. */
+               if (hw->fc.send_xon) {
+                       IXGB_WRITE_REG(hw, FCRTL,
+                               (hw->fc.low_water | IXGB_FCRTL_XONE));
+               } else {
+                       IXGB_WRITE_REG(hw, FCRTL, hw->fc.low_water);
+               }
+               IXGB_WRITE_REG(hw, FCRTH, hw->fc.high_water);
+       }
+       return status;
+}
+
+/******************************************************************************
+ * Reads a word from a device over the Management Data Interface (MDI) bus.
+ * This interface is used to manage Physical layer devices.
+ *
+ * hw          - Struct containing variables accessed by hw code
+ * reg_address - Offset of device register being read.
+ * phy_address - Address of device on MDI.
+ *
+ * Returns:  Data word (16 bits) from MDI device.
+ *
+ * The 82597EX has support for several MDI access methods.  This routine
+ * uses the new protocol MDI Single Command and Address Operation.
+ * This requires that first an address cycle command is sent, followed by a
+ * read command.
+ *****************************************************************************/
+static u16
+ixgb_read_phy_reg(struct ixgb_hw *hw,
+               u32 reg_address,
+               u32 phy_address,
+               u32 device_type)
+{
+       u32 i;
+       u32 data;
+       u32 command = 0;
+
+       ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
+       ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
+       ASSERT(device_type <= IXGB_MAX_PHY_DEV_TYPE);
+
+       /* Setup and write the address cycle command */
+       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT) |
+                  (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+                  (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+                  (IXGB_MSCA_ADDR_CYCLE | IXGB_MSCA_MDI_COMMAND));
+
+       IXGB_WRITE_REG(hw, MSCA, command);
+
+    /**************************************************************
+    ** Check every 10 usec to see if the address cycle completed
+    ** The COMMAND bit will clear when the operation is complete.
+    ** This may take as long as 64 usecs (we'll wait 100 usecs max)
+    ** from the CPU Write to the Ready bit assertion.
+    **************************************************************/
+
+       for (i = 0; i < 10; i++)
+       {
+               udelay(10);
+
+               command = IXGB_READ_REG(hw, MSCA);
+
+               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+                       break;
+       }
+
+       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+       /* Address cycle complete, setup and write the read command */
+       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT) |
+                  (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+                  (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+                  (IXGB_MSCA_READ | IXGB_MSCA_MDI_COMMAND));
+
+       IXGB_WRITE_REG(hw, MSCA, command);
+
+    /**************************************************************
+    ** Check every 10 usec to see if the read command completed
+    ** The COMMAND bit will clear when the operation is complete.
+    ** The read may take as long as 64 usecs (we'll wait 100 usecs max)
+    ** from the CPU Write to the Ready bit assertion.
+    **************************************************************/
+
+       for (i = 0; i < 10; i++)
+       {
+               udelay(10);
+
+               command = IXGB_READ_REG(hw, MSCA);
+
+               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+                       break;
+       }
+
+       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+       /* Operation is complete, get the data from the MDIO Read/Write Data
+        * register and return.
+        */
+       data = IXGB_READ_REG(hw, MSRWD);
+       data >>= IXGB_MSRWD_READ_DATA_SHIFT;
+       return((u16) data);
+}
+
+/******************************************************************************
+ * Writes a word to a device over the Management Data Interface (MDI) bus.
+ * This interface is used to manage Physical layer devices.
+ *
+ * hw          - Struct containing variables accessed by hw code
+ * reg_address - Offset of device register being read.
+ * phy_address - Address of device on MDI.
+ * device_type - Also known as the Device ID or DID.
+ * data        - 16-bit value to be written
+ *
+ * Returns:  void.
+ *
+ * The 82597EX has support for several MDI access methods.  This routine
+ * uses the new protocol MDI Single Command and Address Operation.
+ * This requires that first an address cycle command is sent, followed by a
+ * write command.
+ *****************************************************************************/
+static void
+ixgb_write_phy_reg(struct ixgb_hw *hw,
+                       u32 reg_address,
+                       u32 phy_address,
+                       u32 device_type,
+                       u16 data)
+{
+       u32 i;
+       u32 command = 0;
+
+       ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
+       ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
+       ASSERT(device_type <= IXGB_MAX_PHY_DEV_TYPE);
+
+       /* Put the data in the MDIO Read/Write Data register */
+       IXGB_WRITE_REG(hw, MSRWD, (u32)data);
+
+       /* Setup and write the address cycle command */
+       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
+                          (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+                          (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+                          (IXGB_MSCA_ADDR_CYCLE | IXGB_MSCA_MDI_COMMAND));
+
+       IXGB_WRITE_REG(hw, MSCA, command);
+
+       /**************************************************************
+       ** Check every 10 usec to see if the address cycle completed
+       ** The COMMAND bit will clear when the operation is complete.
+       ** This may take as long as 64 usecs (we'll wait 100 usecs max)
+       ** from the CPU Write to the Ready bit assertion.
+       **************************************************************/
+
+       for (i = 0; i < 10; i++)
+       {
+               udelay(10);
+
+               command = IXGB_READ_REG(hw, MSCA);
+
+               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+                       break;
+       }
+
+       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+       /* Address cycle complete, setup and write the write command */
+       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
+                          (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
+                          (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
+                          (IXGB_MSCA_WRITE | IXGB_MSCA_MDI_COMMAND));
+
+       IXGB_WRITE_REG(hw, MSCA, command);
+
+       /**************************************************************
+       ** Check every 10 usec to see if the read command completed
+       ** The COMMAND bit will clear when the operation is complete.
+       ** The write may take as long as 64 usecs (we'll wait 100 usecs max)
+       ** from the CPU Write to the Ready bit assertion.
+       **************************************************************/
+
+       for (i = 0; i < 10; i++)
+       {
+               udelay(10);
+
+               command = IXGB_READ_REG(hw, MSCA);
+
+               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
+                       break;
+       }
+
+       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
+
+       /* Operation is complete, return. */
+}
+
+/******************************************************************************
+ * Checks to see if the link status of the hardware has changed.
+ *
+ * hw - Struct containing variables accessed by hw code
+ *
+ * Called by any function that needs to check the link status of the adapter.
+ *****************************************************************************/
+void
+ixgb_check_for_link(struct ixgb_hw *hw)
+{
+       u32 status_reg;
+       u32 xpcss_reg;
+
+       ENTER();
+
+       xpcss_reg = IXGB_READ_REG(hw, XPCSS);
+       status_reg = IXGB_READ_REG(hw, STATUS);
+
+       if ((xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
+           (status_reg & IXGB_STATUS_LU)) {
+               hw->link_up = true;
+       } else if (!(xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
+                  (status_reg & IXGB_STATUS_LU)) {
+               pr_debug("XPCSS Not Aligned while Status:LU is set\n");
+               hw->link_up = ixgb_link_reset(hw);
+       } else {
+               /*
+                * 82597EX errata.  Since the lane deskew problem may prevent
+                * link, reset the link before reporting link down.
+                */
+               hw->link_up = ixgb_link_reset(hw);
+       }
+       /*  Anything else for 10 Gig?? */
+}
+
+/******************************************************************************
+ * Check for a bad link condition that may have occurred.
+ * The indication is that the RFC / LFC registers may be incrementing
+ * continually.  A full adapter reset is required to recover.
+ *
+ * hw - Struct containing variables accessed by hw code
+ *
+ * Called by any function that needs to check the link status of the adapter.
+ *****************************************************************************/
+bool ixgb_check_for_bad_link(struct ixgb_hw *hw)
+{
+       u32 newLFC, newRFC;
+       bool bad_link_returncode = false;
+
+       if (hw->phy_type == ixgb_phy_type_txn17401) {
+               newLFC = IXGB_READ_REG(hw, LFC);
+               newRFC = IXGB_READ_REG(hw, RFC);
+               if ((hw->lastLFC + 250 < newLFC)
+                   || (hw->lastRFC + 250 < newRFC)) {
+                       pr_debug("BAD LINK! too many LFC/RFC since last check\n");
+                       bad_link_returncode = true;
+               }
+               hw->lastLFC = newLFC;
+               hw->lastRFC = newRFC;
+       }
+
+       return bad_link_returncode;
+}
+
+/******************************************************************************
+ * Clears all hardware statistics counters.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
+{
+       volatile u32 temp_reg;
+
+       ENTER();
+
+       /* if we are stopped or resetting exit gracefully */
+       if (hw->adapter_stopped) {
+               pr_debug("Exiting because the adapter is stopped!!!\n");
+               return;
+       }
+
+       temp_reg = IXGB_READ_REG(hw, TPRL);
+       temp_reg = IXGB_READ_REG(hw, TPRH);
+       temp_reg = IXGB_READ_REG(hw, GPRCL);
+       temp_reg = IXGB_READ_REG(hw, GPRCH);
+       temp_reg = IXGB_READ_REG(hw, BPRCL);
+       temp_reg = IXGB_READ_REG(hw, BPRCH);
+       temp_reg = IXGB_READ_REG(hw, MPRCL);
+       temp_reg = IXGB_READ_REG(hw, MPRCH);
+       temp_reg = IXGB_READ_REG(hw, UPRCL);
+       temp_reg = IXGB_READ_REG(hw, UPRCH);
+       temp_reg = IXGB_READ_REG(hw, VPRCL);
+       temp_reg = IXGB_READ_REG(hw, VPRCH);
+       temp_reg = IXGB_READ_REG(hw, JPRCL);
+       temp_reg = IXGB_READ_REG(hw, JPRCH);
+       temp_reg = IXGB_READ_REG(hw, GORCL);
+       temp_reg = IXGB_READ_REG(hw, GORCH);
+       temp_reg = IXGB_READ_REG(hw, TORL);
+       temp_reg = IXGB_READ_REG(hw, TORH);
+       temp_reg = IXGB_READ_REG(hw, RNBC);
+       temp_reg = IXGB_READ_REG(hw, RUC);
+       temp_reg = IXGB_READ_REG(hw, ROC);
+       temp_reg = IXGB_READ_REG(hw, RLEC);
+       temp_reg = IXGB_READ_REG(hw, CRCERRS);
+       temp_reg = IXGB_READ_REG(hw, ICBC);
+       temp_reg = IXGB_READ_REG(hw, ECBC);
+       temp_reg = IXGB_READ_REG(hw, MPC);
+       temp_reg = IXGB_READ_REG(hw, TPTL);
+       temp_reg = IXGB_READ_REG(hw, TPTH);
+       temp_reg = IXGB_READ_REG(hw, GPTCL);
+       temp_reg = IXGB_READ_REG(hw, GPTCH);
+       temp_reg = IXGB_READ_REG(hw, BPTCL);
+       temp_reg = IXGB_READ_REG(hw, BPTCH);
+       temp_reg = IXGB_READ_REG(hw, MPTCL);
+       temp_reg = IXGB_READ_REG(hw, MPTCH);
+       temp_reg = IXGB_READ_REG(hw, UPTCL);
+       temp_reg = IXGB_READ_REG(hw, UPTCH);
+       temp_reg = IXGB_READ_REG(hw, VPTCL);
+       temp_reg = IXGB_READ_REG(hw, VPTCH);
+       temp_reg = IXGB_READ_REG(hw, JPTCL);
+       temp_reg = IXGB_READ_REG(hw, JPTCH);
+       temp_reg = IXGB_READ_REG(hw, GOTCL);
+       temp_reg = IXGB_READ_REG(hw, GOTCH);
+       temp_reg = IXGB_READ_REG(hw, TOTL);
+       temp_reg = IXGB_READ_REG(hw, TOTH);
+       temp_reg = IXGB_READ_REG(hw, DC);
+       temp_reg = IXGB_READ_REG(hw, PLT64C);
+       temp_reg = IXGB_READ_REG(hw, TSCTC);
+       temp_reg = IXGB_READ_REG(hw, TSCTFC);
+       temp_reg = IXGB_READ_REG(hw, IBIC);
+       temp_reg = IXGB_READ_REG(hw, RFC);
+       temp_reg = IXGB_READ_REG(hw, LFC);
+       temp_reg = IXGB_READ_REG(hw, PFRC);
+       temp_reg = IXGB_READ_REG(hw, PFTC);
+       temp_reg = IXGB_READ_REG(hw, MCFRC);
+       temp_reg = IXGB_READ_REG(hw, MCFTC);
+       temp_reg = IXGB_READ_REG(hw, XONRXC);
+       temp_reg = IXGB_READ_REG(hw, XONTXC);
+       temp_reg = IXGB_READ_REG(hw, XOFFRXC);
+       temp_reg = IXGB_READ_REG(hw, XOFFTXC);
+       temp_reg = IXGB_READ_REG(hw, RJC);
+}
+
+/******************************************************************************
+ * Turns on the software controllable LED
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+void
+ixgb_led_on(struct ixgb_hw *hw)
+{
+       u32 ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
+
+       /* To turn on the LED, clear software-definable pin 0 (SDP0). */
+       ctrl0_reg &= ~IXGB_CTRL0_SDP0;
+       IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
+}
+
+/******************************************************************************
+ * Turns off the software controllable LED
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+void
+ixgb_led_off(struct ixgb_hw *hw)
+{
+       u32 ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
+
+       /* To turn off the LED, set software-definable pin 0 (SDP0). */
+       ctrl0_reg |= IXGB_CTRL0_SDP0;
+       IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
+}
+
+/******************************************************************************
+ * Gets the current PCI bus type, speed, and width of the hardware
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_get_bus_info(struct ixgb_hw *hw)
+{
+       u32 status_reg;
+
+       status_reg = IXGB_READ_REG(hw, STATUS);
+
+       hw->bus.type = (status_reg & IXGB_STATUS_PCIX_MODE) ?
+               ixgb_bus_type_pcix : ixgb_bus_type_pci;
+
+       if (hw->bus.type == ixgb_bus_type_pci) {
+               hw->bus.speed = (status_reg & IXGB_STATUS_PCI_SPD) ?
+                       ixgb_bus_speed_66 : ixgb_bus_speed_33;
+       } else {
+               switch (status_reg & IXGB_STATUS_PCIX_SPD_MASK) {
+               case IXGB_STATUS_PCIX_SPD_66:
+                       hw->bus.speed = ixgb_bus_speed_66;
+                       break;
+               case IXGB_STATUS_PCIX_SPD_100:
+                       hw->bus.speed = ixgb_bus_speed_100;
+                       break;
+               case IXGB_STATUS_PCIX_SPD_133:
+                       hw->bus.speed = ixgb_bus_speed_133;
+                       break;
+               default:
+                       hw->bus.speed = ixgb_bus_speed_reserved;
+                       break;
+               }
+       }
+
+       hw->bus.width = (status_reg & IXGB_STATUS_BUS64) ?
+               ixgb_bus_width_64 : ixgb_bus_width_32;
+}
+
+/******************************************************************************
+ * Tests a MAC address to ensure it is a valid Individual Address
+ *
+ * mac_addr - pointer to MAC address.
+ *
+ *****************************************************************************/
+static bool
+mac_addr_valid(u8 *mac_addr)
+{
+       bool is_valid = true;
+       ENTER();
+
+       /* Make sure it is not a multicast address */
+       if (is_multicast_ether_addr(mac_addr)) {
+               pr_debug("MAC address is multicast\n");
+               is_valid = false;
+       }
+       /* Not a broadcast address */
+       else if (is_broadcast_ether_addr(mac_addr)) {
+               pr_debug("MAC address is broadcast\n");
+               is_valid = false;
+       }
+       /* Reject the zero address */
+       else if (is_zero_ether_addr(mac_addr)) {
+               pr_debug("MAC address is all zeros\n");
+               is_valid = false;
+       }
+       return is_valid;
+}
+
+/******************************************************************************
+ * Resets the 10GbE link.  Waits the settle time and returns the state of
+ * the link.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static bool
+ixgb_link_reset(struct ixgb_hw *hw)
+{
+       bool link_status = false;
+       u8 wait_retries = MAX_RESET_ITERATIONS;
+       u8 lrst_retries = MAX_RESET_ITERATIONS;
+
+       do {
+               /* Reset the link */
+               IXGB_WRITE_REG(hw, CTRL0,
+                              IXGB_READ_REG(hw, CTRL0) | IXGB_CTRL0_LRST);
+
+               /* Wait for link-up and lane re-alignment */
+               do {
+                       udelay(IXGB_DELAY_USECS_AFTER_LINK_RESET);
+                       link_status =
+                           ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU)
+                            && (IXGB_READ_REG(hw, XPCSS) &
+                                IXGB_XPCSS_ALIGN_STATUS)) ? true : false;
+               } while (!link_status && --wait_retries);
+
+       } while (!link_status && --lrst_retries);
+
+       return link_status;
+}
+
+/******************************************************************************
+ * Resets the 10GbE optics module.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+static void
+ixgb_optics_reset(struct ixgb_hw *hw)
+{
+       if (hw->phy_type == ixgb_phy_type_txn17401) {
+               u16 mdio_reg;
+
+               ixgb_write_phy_reg(hw,
+                                  MDIO_CTRL1,
+                                  IXGB_PHY_ADDRESS,
+                                  MDIO_MMD_PMAPMD,
+                                  MDIO_CTRL1_RESET);
+
+               mdio_reg = ixgb_read_phy_reg(hw,
+                                            MDIO_CTRL1,
+                                            IXGB_PHY_ADDRESS,
+                                            MDIO_MMD_PMAPMD);
+       }
+}
+
+/******************************************************************************
+ * Resets the 10GbE optics module for Sun variant NIC.
+ *
+ * hw - Struct containing variables accessed by shared code
+ *****************************************************************************/
+
+#define   IXGB_BCM8704_USER_PMD_TX_CTRL_REG         0xC803
+#define   IXGB_BCM8704_USER_PMD_TX_CTRL_REG_VAL     0x0164
+#define   IXGB_BCM8704_USER_CTRL_REG                0xC800
+#define   IXGB_BCM8704_USER_CTRL_REG_VAL            0x7FBF
+#define   IXGB_BCM8704_USER_DEV3_ADDR               0x0003
+#define   IXGB_SUN_PHY_ADDRESS                      0x0000
+#define   IXGB_SUN_PHY_RESET_DELAY                     305
+
+static void
+ixgb_optics_reset_bcm(struct ixgb_hw *hw)
+{
+       u32 ctrl = IXGB_READ_REG(hw, CTRL0);
+       ctrl &= ~IXGB_CTRL0_SDP2;
+       ctrl |= IXGB_CTRL0_SDP3;
+       IXGB_WRITE_REG(hw, CTRL0, ctrl);
+       IXGB_WRITE_FLUSH(hw);
+
+       /* SerDes needs extra delay */
+       msleep(IXGB_SUN_PHY_RESET_DELAY);
+
+       /* Broadcom 7408L configuration */
+       /* Reference clock config */
+       ixgb_write_phy_reg(hw,
+                          IXGB_BCM8704_USER_PMD_TX_CTRL_REG,
+                          IXGB_SUN_PHY_ADDRESS,
+                          IXGB_BCM8704_USER_DEV3_ADDR,
+                          IXGB_BCM8704_USER_PMD_TX_CTRL_REG_VAL);
+       /*  we must read the registers twice */
+       ixgb_read_phy_reg(hw,
+                         IXGB_BCM8704_USER_PMD_TX_CTRL_REG,
+                         IXGB_SUN_PHY_ADDRESS,
+                         IXGB_BCM8704_USER_DEV3_ADDR);
+       ixgb_read_phy_reg(hw,
+                         IXGB_BCM8704_USER_PMD_TX_CTRL_REG,
+                         IXGB_SUN_PHY_ADDRESS,
+                         IXGB_BCM8704_USER_DEV3_ADDR);
+
+       ixgb_write_phy_reg(hw,
+                          IXGB_BCM8704_USER_CTRL_REG,
+                          IXGB_SUN_PHY_ADDRESS,
+                          IXGB_BCM8704_USER_DEV3_ADDR,
+                          IXGB_BCM8704_USER_CTRL_REG_VAL);
+       ixgb_read_phy_reg(hw,
+                         IXGB_BCM8704_USER_CTRL_REG,
+                         IXGB_SUN_PHY_ADDRESS,
+                         IXGB_BCM8704_USER_DEV3_ADDR);
+       ixgb_read_phy_reg(hw,
+                         IXGB_BCM8704_USER_CTRL_REG,
+                         IXGB_SUN_PHY_ADDRESS,
+                         IXGB_BCM8704_USER_DEV3_ADDR);
+
+       /* SerDes needs extra delay */
+       msleep(IXGB_SUN_PHY_RESET_DELAY);
+}
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.h b/drivers/net/ethernet/intel/ixgb/ixgb_hw.h
new file mode 100644 (file)
index 0000000..873d32b
--- /dev/null
@@ -0,0 +1,801 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+#ifndef _IXGB_HW_H_
+#define _IXGB_HW_H_
+
+#include <linux/mdio.h>
+
+#include "ixgb_osdep.h"
+
+/* Enums */
+typedef enum {
+       ixgb_mac_unknown = 0,
+       ixgb_82597,
+       ixgb_num_macs
+} ixgb_mac_type;
+
+/* Types of physical layer modules */
+typedef enum {
+       ixgb_phy_type_unknown = 0,
+       ixgb_phy_type_g6005,    /* 850nm, MM fiber, XPAK transceiver */
+       ixgb_phy_type_g6104,    /* 1310nm, SM fiber, XPAK transceiver */
+       ixgb_phy_type_txn17201, /* 850nm, MM fiber, XPAK transceiver */
+       ixgb_phy_type_txn17401, /* 1310nm, SM fiber, XENPAK transceiver */
+       ixgb_phy_type_bcm       /* SUN specific board */
+} ixgb_phy_type;
+
+/* XPAK transceiver vendors, for the SR adapters */
+typedef enum {
+       ixgb_xpak_vendor_intel,
+       ixgb_xpak_vendor_infineon
+} ixgb_xpak_vendor;
+
+/* Media Types */
+typedef enum {
+       ixgb_media_type_unknown = 0,
+       ixgb_media_type_fiber = 1,
+       ixgb_media_type_copper = 2,
+       ixgb_num_media_types
+} ixgb_media_type;
+
+/* Flow Control Settings */
+typedef enum {
+       ixgb_fc_none = 0,
+       ixgb_fc_rx_pause = 1,
+       ixgb_fc_tx_pause = 2,
+       ixgb_fc_full = 3,
+       ixgb_fc_default = 0xFF
+} ixgb_fc_type;
+
+/* PCI bus types */
+typedef enum {
+       ixgb_bus_type_unknown = 0,
+       ixgb_bus_type_pci,
+       ixgb_bus_type_pcix
+} ixgb_bus_type;
+
+/* PCI bus speeds */
+typedef enum {
+       ixgb_bus_speed_unknown = 0,
+       ixgb_bus_speed_33,
+       ixgb_bus_speed_66,
+       ixgb_bus_speed_100,
+       ixgb_bus_speed_133,
+       ixgb_bus_speed_reserved
+} ixgb_bus_speed;
+
+/* PCI bus widths */
+typedef enum {
+       ixgb_bus_width_unknown = 0,
+       ixgb_bus_width_32,
+       ixgb_bus_width_64
+} ixgb_bus_width;
+
+#define IXGB_ETH_LENGTH_OF_ADDRESS   6
+
+#define IXGB_EEPROM_SIZE    64 /* Size in words */
+
+#define SPEED_10000  10000
+#define FULL_DUPLEX  2
+
+#define MIN_NUMBER_OF_DESCRIPTORS       8
+#define MAX_NUMBER_OF_DESCRIPTORS  0xFFF8      /* 13 bits in RDLEN/TDLEN, 128B aligned     */
+
+#define IXGB_DELAY_BEFORE_RESET        10      /* allow 10ms after idling rx/tx units      */
+#define IXGB_DELAY_AFTER_RESET          1      /* allow 1ms after the reset                */
+#define IXGB_DELAY_AFTER_EE_RESET      10      /* allow 10ms after the EEPROM reset        */
+
+#define IXGB_DELAY_USECS_AFTER_LINK_RESET    13        /* allow 13 microseconds after the reset    */
+                                          /* NOTE: this is MICROSECONDS               */
+#define MAX_RESET_ITERATIONS            8      /* number of iterations to get things right */
+
+/* General Registers */
+#define IXGB_CTRL0   0x00000   /* Device Control Register 0 - RW */
+#define IXGB_CTRL1   0x00008   /* Device Control Register 1 - RW */
+#define IXGB_STATUS  0x00010   /* Device Status Register - RO */
+#define IXGB_EECD    0x00018   /* EEPROM/Flash Control/Data Register - RW */
+#define IXGB_MFS     0x00020   /* Maximum Frame Size - RW */
+
+/* Interrupt */
+#define IXGB_ICR     0x00080   /* Interrupt Cause Read - R/clr */
+#define IXGB_ICS     0x00088   /* Interrupt Cause Set - RW */
+#define IXGB_IMS     0x00090   /* Interrupt Mask Set/Read - RW */
+#define IXGB_IMC     0x00098   /* Interrupt Mask Clear - WO */
+
+/* Receive */
+#define IXGB_RCTL    0x00100   /* RX Control - RW */
+#define IXGB_FCRTL   0x00108   /* Flow Control Receive Threshold Low - RW */
+#define IXGB_FCRTH   0x00110   /* Flow Control Receive Threshold High - RW */
+#define IXGB_RDBAL   0x00118   /* RX Descriptor Base Low - RW */
+#define IXGB_RDBAH   0x0011C   /* RX Descriptor Base High - RW */
+#define IXGB_RDLEN   0x00120   /* RX Descriptor Length - RW */
+#define IXGB_RDH     0x00128   /* RX Descriptor Head - RW */
+#define IXGB_RDT     0x00130   /* RX Descriptor Tail - RW */
+#define IXGB_RDTR    0x00138   /* RX Delay Timer Ring - RW */
+#define IXGB_RXDCTL  0x00140   /* Receive Descriptor Control - RW */
+#define IXGB_RAIDC   0x00148   /* Receive Adaptive Interrupt Delay Control - RW */
+#define IXGB_RXCSUM  0x00158   /* Receive Checksum Control - RW */
+#define IXGB_RA      0x00180   /* Receive Address Array Base - RW */
+#define IXGB_RAL     0x00180   /* Receive Address Low [0:15] - RW */
+#define IXGB_RAH     0x00184   /* Receive Address High [0:15] - RW */
+#define IXGB_MTA     0x00200   /* Multicast Table Array [0:127] - RW */
+#define IXGB_VFTA    0x00400   /* VLAN Filter Table Array [0:127] - RW */
+#define IXGB_REQ_RX_DESCRIPTOR_MULTIPLE 8
+
+/* Transmit */
+#define IXGB_TCTL    0x00600   /* TX Control - RW */
+#define IXGB_TDBAL   0x00608   /* TX Descriptor Base Low - RW */
+#define IXGB_TDBAH   0x0060C   /* TX Descriptor Base High - RW */
+#define IXGB_TDLEN   0x00610   /* TX Descriptor Length - RW */
+#define IXGB_TDH     0x00618   /* TX Descriptor Head - RW */
+#define IXGB_TDT     0x00620   /* TX Descriptor Tail - RW */
+#define IXGB_TIDV    0x00628   /* TX Interrupt Delay Value - RW */
+#define IXGB_TXDCTL  0x00630   /* Transmit Descriptor Control - RW */
+#define IXGB_TSPMT   0x00638   /* TCP Segmentation PAD & Min Threshold - RW */
+#define IXGB_PAP     0x00640   /* Pause and Pace - RW */
+#define IXGB_REQ_TX_DESCRIPTOR_MULTIPLE 8
+
+/* Physical */
+#define IXGB_PCSC1   0x00700   /* PCS Control 1 - RW */
+#define IXGB_PCSC2   0x00708   /* PCS Control 2 - RW */
+#define IXGB_PCSS1   0x00710   /* PCS Status 1 - RO */
+#define IXGB_PCSS2   0x00718   /* PCS Status 2 - RO */
+#define IXGB_XPCSS   0x00720   /* 10GBASE-X PCS Status (or XGXS Lane Status) - RO */
+#define IXGB_UCCR    0x00728   /* Unilink Circuit Control Register */
+#define IXGB_XPCSTC  0x00730   /* 10GBASE-X PCS Test Control */
+#define IXGB_MACA    0x00738   /* MDI Autoscan Command and Address - RW */
+#define IXGB_APAE    0x00740   /* Autoscan PHY Address Enable - RW */
+#define IXGB_ARD     0x00748   /* Autoscan Read Data - RO */
+#define IXGB_AIS     0x00750   /* Autoscan Interrupt Status - RO */
+#define IXGB_MSCA    0x00758   /* MDI Single Command and Address - RW */
+#define IXGB_MSRWD   0x00760   /* MDI Single Read and Write Data - RW, RO */
+
+/* Wake-up */
+#define IXGB_WUFC    0x00808   /* Wake Up Filter Control - RW */
+#define IXGB_WUS     0x00810   /* Wake Up Status - RO */
+#define IXGB_FFLT    0x01000   /* Flexible Filter Length Table - RW */
+#define IXGB_FFMT    0x01020   /* Flexible Filter Mask Table - RW */
+#define IXGB_FTVT    0x01420   /* Flexible Filter Value Table - RW */
+
+/* Statistics */
+#define IXGB_TPRL    0x02000   /* Total Packets Received (Low) */
+#define IXGB_TPRH    0x02004   /* Total Packets Received (High) */
+#define IXGB_GPRCL   0x02008   /* Good Packets Received Count (Low) */
+#define IXGB_GPRCH   0x0200C   /* Good Packets Received Count (High) */
+#define IXGB_BPRCL   0x02010   /* Broadcast Packets Received Count (Low) */
+#define IXGB_BPRCH   0x02014   /* Broadcast Packets Received Count (High) */
+#define IXGB_MPRCL   0x02018   /* Multicast Packets Received Count (Low) */
+#define IXGB_MPRCH   0x0201C   /* Multicast Packets Received Count (High) */
+#define IXGB_UPRCL   0x02020   /* Unicast Packets Received Count (Low) */
+#define IXGB_UPRCH   0x02024   /* Unicast Packets Received Count (High) */
+#define IXGB_VPRCL   0x02028   /* VLAN Packets Received Count (Low) */
+#define IXGB_VPRCH   0x0202C   /* VLAN Packets Received Count (High) */
+#define IXGB_JPRCL   0x02030   /* Jumbo Packets Received Count (Low) */
+#define IXGB_JPRCH   0x02034   /* Jumbo Packets Received Count (High) */
+#define IXGB_GORCL   0x02038   /* Good Octets Received Count (Low) */
+#define IXGB_GORCH   0x0203C   /* Good Octets Received Count (High) */
+#define IXGB_TORL    0x02040   /* Total Octets Received (Low) */
+#define IXGB_TORH    0x02044   /* Total Octets Received (High) */
+#define IXGB_RNBC    0x02048   /* Receive No Buffers Count */
+#define IXGB_RUC     0x02050   /* Receive Undersize Count */
+#define IXGB_ROC     0x02058   /* Receive Oversize Count */
+#define IXGB_RLEC    0x02060   /* Receive Length Error Count */
+#define IXGB_CRCERRS 0x02068   /* CRC Error Count */
+#define IXGB_ICBC    0x02070   /* Illegal control byte in mid-packet Count */
+#define IXGB_ECBC    0x02078   /* Error Control byte in mid-packet Count */
+#define IXGB_MPC     0x02080   /* Missed Packets Count */
+#define IXGB_TPTL    0x02100   /* Total Packets Transmitted (Low) */
+#define IXGB_TPTH    0x02104   /* Total Packets Transmitted (High) */
+#define IXGB_GPTCL   0x02108   /* Good Packets Transmitted Count (Low) */
+#define IXGB_GPTCH   0x0210C   /* Good Packets Transmitted Count (High) */
+#define IXGB_BPTCL   0x02110   /* Broadcast Packets Transmitted Count (Low) */
+#define IXGB_BPTCH   0x02114   /* Broadcast Packets Transmitted Count (High) */
+#define IXGB_MPTCL   0x02118   /* Multicast Packets Transmitted Count (Low) */
+#define IXGB_MPTCH   0x0211C   /* Multicast Packets Transmitted Count (High) */
+#define IXGB_UPTCL   0x02120   /* Unicast Packets Transmitted Count (Low) */
+#define IXGB_UPTCH   0x02124   /* Unicast Packets Transmitted Count (High) */
+#define IXGB_VPTCL   0x02128   /* VLAN Packets Transmitted Count (Low) */
+#define IXGB_VPTCH   0x0212C   /* VLAN Packets Transmitted Count (High) */
+#define IXGB_JPTCL   0x02130   /* Jumbo Packets Transmitted Count (Low) */
+#define IXGB_JPTCH   0x02134   /* Jumbo Packets Transmitted Count (High) */
+#define IXGB_GOTCL   0x02138   /* Good Octets Transmitted Count (Low) */
+#define IXGB_GOTCH   0x0213C   /* Good Octets Transmitted Count (High) */
+#define IXGB_TOTL    0x02140   /* Total Octets Transmitted Count (Low) */
+#define IXGB_TOTH    0x02144   /* Total Octets Transmitted Count (High) */
+#define IXGB_DC      0x02148   /* Defer Count */
+#define IXGB_PLT64C  0x02150   /* Packet Transmitted was less than 64 bytes Count */
+#define IXGB_TSCTC   0x02170   /* TCP Segmentation Context Transmitted Count */
+#define IXGB_TSCTFC  0x02178   /* TCP Segmentation Context Tx Fail Count */
+#define IXGB_IBIC    0x02180   /* Illegal byte during Idle stream count */
+#define IXGB_RFC     0x02188   /* Remote Fault Count */
+#define IXGB_LFC     0x02190   /* Local Fault Count */
+#define IXGB_PFRC    0x02198   /* Pause Frame Receive Count */
+#define IXGB_PFTC    0x021A0   /* Pause Frame Transmit Count */
+#define IXGB_MCFRC   0x021A8   /* MAC Control Frames (non-Pause) Received Count */
+#define IXGB_MCFTC   0x021B0   /* MAC Control Frames (non-Pause) Transmitted Count */
+#define IXGB_XONRXC  0x021B8   /* XON Received Count */
+#define IXGB_XONTXC  0x021C0   /* XON Transmitted Count */
+#define IXGB_XOFFRXC 0x021C8   /* XOFF Received Count */
+#define IXGB_XOFFTXC 0x021D0   /* XOFF Transmitted Count */
+#define IXGB_RJC     0x021D8   /* Receive Jabber Count */
+
+/* CTRL0 Bit Masks */
+#define IXGB_CTRL0_LRST     0x00000008
+#define IXGB_CTRL0_JFE      0x00000010
+#define IXGB_CTRL0_XLE      0x00000020
+#define IXGB_CTRL0_MDCS     0x00000040
+#define IXGB_CTRL0_CMDC     0x00000080
+#define IXGB_CTRL0_SDP0     0x00040000
+#define IXGB_CTRL0_SDP1     0x00080000
+#define IXGB_CTRL0_SDP2     0x00100000
+#define IXGB_CTRL0_SDP3     0x00200000
+#define IXGB_CTRL0_SDP0_DIR 0x00400000
+#define IXGB_CTRL0_SDP1_DIR 0x00800000
+#define IXGB_CTRL0_SDP2_DIR 0x01000000
+#define IXGB_CTRL0_SDP3_DIR 0x02000000
+#define IXGB_CTRL0_RST      0x04000000
+#define IXGB_CTRL0_RPE      0x08000000
+#define IXGB_CTRL0_TPE      0x10000000
+#define IXGB_CTRL0_VME      0x40000000
+
+/* CTRL1 Bit Masks */
+#define IXGB_CTRL1_GPI0_EN     0x00000001
+#define IXGB_CTRL1_GPI1_EN     0x00000002
+#define IXGB_CTRL1_GPI2_EN     0x00000004
+#define IXGB_CTRL1_GPI3_EN     0x00000008
+#define IXGB_CTRL1_SDP4        0x00000010
+#define IXGB_CTRL1_SDP5        0x00000020
+#define IXGB_CTRL1_SDP6        0x00000040
+#define IXGB_CTRL1_SDP7        0x00000080
+#define IXGB_CTRL1_SDP4_DIR    0x00000100
+#define IXGB_CTRL1_SDP5_DIR    0x00000200
+#define IXGB_CTRL1_SDP6_DIR    0x00000400
+#define IXGB_CTRL1_SDP7_DIR    0x00000800
+#define IXGB_CTRL1_EE_RST      0x00002000
+#define IXGB_CTRL1_RO_DIS      0x00020000
+#define IXGB_CTRL1_PCIXHM_MASK 0x00C00000
+#define IXGB_CTRL1_PCIXHM_1_2  0x00000000
+#define IXGB_CTRL1_PCIXHM_5_8  0x00400000
+#define IXGB_CTRL1_PCIXHM_3_4  0x00800000
+#define IXGB_CTRL1_PCIXHM_7_8  0x00C00000
+
+/* STATUS Bit Masks */
+#define IXGB_STATUS_LU            0x00000002
+#define IXGB_STATUS_AIP           0x00000004
+#define IXGB_STATUS_TXOFF         0x00000010
+#define IXGB_STATUS_XAUIME        0x00000020
+#define IXGB_STATUS_RES           0x00000040
+#define IXGB_STATUS_RIS           0x00000080
+#define IXGB_STATUS_RIE           0x00000100
+#define IXGB_STATUS_RLF           0x00000200
+#define IXGB_STATUS_RRF           0x00000400
+#define IXGB_STATUS_PCI_SPD       0x00000800
+#define IXGB_STATUS_BUS64         0x00001000
+#define IXGB_STATUS_PCIX_MODE     0x00002000
+#define IXGB_STATUS_PCIX_SPD_MASK 0x0000C000
+#define IXGB_STATUS_PCIX_SPD_66   0x00000000
+#define IXGB_STATUS_PCIX_SPD_100  0x00004000
+#define IXGB_STATUS_PCIX_SPD_133  0x00008000
+#define IXGB_STATUS_REV_ID_MASK   0x000F0000
+#define IXGB_STATUS_REV_ID_SHIFT  16
+
+/* EECD Bit Masks */
+#define IXGB_EECD_SK       0x00000001
+#define IXGB_EECD_CS       0x00000002
+#define IXGB_EECD_DI       0x00000004
+#define IXGB_EECD_DO       0x00000008
+#define IXGB_EECD_FWE_MASK 0x00000030
+#define IXGB_EECD_FWE_DIS  0x00000010
+#define IXGB_EECD_FWE_EN   0x00000020
+
+/* MFS */
+#define IXGB_MFS_SHIFT 16
+
+/* Interrupt Register Bit Masks (used for ICR, ICS, IMS, and IMC) */
+#define IXGB_INT_TXDW     0x00000001
+#define IXGB_INT_TXQE     0x00000002
+#define IXGB_INT_LSC      0x00000004
+#define IXGB_INT_RXSEQ    0x00000008
+#define IXGB_INT_RXDMT0   0x00000010
+#define IXGB_INT_RXO      0x00000040
+#define IXGB_INT_RXT0     0x00000080
+#define IXGB_INT_AUTOSCAN 0x00000200
+#define IXGB_INT_GPI0     0x00000800
+#define IXGB_INT_GPI1     0x00001000
+#define IXGB_INT_GPI2     0x00002000
+#define IXGB_INT_GPI3     0x00004000
+
+/* RCTL Bit Masks */
+#define IXGB_RCTL_RXEN        0x00000002
+#define IXGB_RCTL_SBP         0x00000004
+#define IXGB_RCTL_UPE         0x00000008
+#define IXGB_RCTL_MPE         0x00000010
+#define IXGB_RCTL_RDMTS_MASK  0x00000300
+#define IXGB_RCTL_RDMTS_1_2   0x00000000
+#define IXGB_RCTL_RDMTS_1_4   0x00000100
+#define IXGB_RCTL_RDMTS_1_8   0x00000200
+#define IXGB_RCTL_MO_MASK     0x00003000
+#define IXGB_RCTL_MO_47_36    0x00000000
+#define IXGB_RCTL_MO_46_35    0x00001000
+#define IXGB_RCTL_MO_45_34    0x00002000
+#define IXGB_RCTL_MO_43_32    0x00003000
+#define IXGB_RCTL_MO_SHIFT    12
+#define IXGB_RCTL_BAM         0x00008000
+#define IXGB_RCTL_BSIZE_MASK  0x00030000
+#define IXGB_RCTL_BSIZE_2048  0x00000000
+#define IXGB_RCTL_BSIZE_4096  0x00010000
+#define IXGB_RCTL_BSIZE_8192  0x00020000
+#define IXGB_RCTL_BSIZE_16384 0x00030000
+#define IXGB_RCTL_VFE         0x00040000
+#define IXGB_RCTL_CFIEN       0x00080000
+#define IXGB_RCTL_CFI         0x00100000
+#define IXGB_RCTL_RPDA_MASK   0x00600000
+#define IXGB_RCTL_RPDA_MC_MAC 0x00000000
+#define IXGB_RCTL_MC_ONLY     0x00400000
+#define IXGB_RCTL_CFF         0x00800000
+#define IXGB_RCTL_SECRC       0x04000000
+#define IXGB_RDT_FPDB         0x80000000
+
+#define IXGB_RCTL_IDLE_RX_UNIT 0
+
+/* FCRTL Bit Masks */
+#define IXGB_FCRTL_XONE       0x80000000
+
+/* RXDCTL Bit Masks */
+#define IXGB_RXDCTL_PTHRESH_MASK  0x000001FF
+#define IXGB_RXDCTL_PTHRESH_SHIFT 0
+#define IXGB_RXDCTL_HTHRESH_MASK  0x0003FE00
+#define IXGB_RXDCTL_HTHRESH_SHIFT 9
+#define IXGB_RXDCTL_WTHRESH_MASK  0x07FC0000
+#define IXGB_RXDCTL_WTHRESH_SHIFT 18
+
+/* RAIDC Bit Masks */
+#define IXGB_RAIDC_HIGHTHRS_MASK 0x0000003F
+#define IXGB_RAIDC_DELAY_MASK    0x000FF800
+#define IXGB_RAIDC_DELAY_SHIFT   11
+#define IXGB_RAIDC_POLL_MASK     0x1FF00000
+#define IXGB_RAIDC_POLL_SHIFT    20
+#define IXGB_RAIDC_RXT_GATE      0x40000000
+#define IXGB_RAIDC_EN            0x80000000
+
+#define IXGB_RAIDC_POLL_1000_INTERRUPTS_PER_SECOND      1220
+#define IXGB_RAIDC_POLL_5000_INTERRUPTS_PER_SECOND      244
+#define IXGB_RAIDC_POLL_10000_INTERRUPTS_PER_SECOND     122
+#define IXGB_RAIDC_POLL_20000_INTERRUPTS_PER_SECOND     61
+
+/* RXCSUM Bit Masks */
+#define IXGB_RXCSUM_IPOFL 0x00000100
+#define IXGB_RXCSUM_TUOFL 0x00000200
+
+/* RAH Bit Masks */
+#define IXGB_RAH_ASEL_MASK 0x00030000
+#define IXGB_RAH_ASEL_DEST 0x00000000
+#define IXGB_RAH_ASEL_SRC  0x00010000
+#define IXGB_RAH_AV        0x80000000
+
+/* TCTL Bit Masks */
+#define IXGB_TCTL_TCE  0x00000001
+#define IXGB_TCTL_TXEN 0x00000002
+#define IXGB_TCTL_TPDE 0x00000004
+
+#define IXGB_TCTL_IDLE_TX_UNIT  0
+
+/* TXDCTL Bit Masks */
+#define IXGB_TXDCTL_PTHRESH_MASK  0x0000007F
+#define IXGB_TXDCTL_HTHRESH_MASK  0x00007F00
+#define IXGB_TXDCTL_HTHRESH_SHIFT 8
+#define IXGB_TXDCTL_WTHRESH_MASK  0x007F0000
+#define IXGB_TXDCTL_WTHRESH_SHIFT 16
+
+/* TSPMT Bit Masks */
+#define IXGB_TSPMT_TSMT_MASK   0x0000FFFF
+#define IXGB_TSPMT_TSPBP_MASK  0xFFFF0000
+#define IXGB_TSPMT_TSPBP_SHIFT 16
+
+/* PAP Bit Masks */
+#define IXGB_PAP_TXPC_MASK 0x0000FFFF
+#define IXGB_PAP_TXPV_MASK 0x000F0000
+#define IXGB_PAP_TXPV_10G  0x00000000
+#define IXGB_PAP_TXPV_1G   0x00010000
+#define IXGB_PAP_TXPV_2G   0x00020000
+#define IXGB_PAP_TXPV_3G   0x00030000
+#define IXGB_PAP_TXPV_4G   0x00040000
+#define IXGB_PAP_TXPV_5G   0x00050000
+#define IXGB_PAP_TXPV_6G   0x00060000
+#define IXGB_PAP_TXPV_7G   0x00070000
+#define IXGB_PAP_TXPV_8G   0x00080000
+#define IXGB_PAP_TXPV_9G   0x00090000
+#define IXGB_PAP_TXPV_WAN  0x000F0000
+
+/* PCSC1 Bit Masks */
+#define IXGB_PCSC1_LOOPBACK 0x00004000
+
+/* PCSC2 Bit Masks */
+#define IXGB_PCSC2_PCS_TYPE_MASK  0x00000003
+#define IXGB_PCSC2_PCS_TYPE_10GBX 0x00000001
+
+/* PCSS1 Bit Masks */
+#define IXGB_PCSS1_LOCAL_FAULT    0x00000080
+#define IXGB_PCSS1_RX_LINK_STATUS 0x00000004
+
+/* PCSS2 Bit Masks */
+#define IXGB_PCSS2_DEV_PRES_MASK 0x0000C000
+#define IXGB_PCSS2_DEV_PRES      0x00004000
+#define IXGB_PCSS2_TX_LF         0x00000800
+#define IXGB_PCSS2_RX_LF         0x00000400
+#define IXGB_PCSS2_10GBW         0x00000004
+#define IXGB_PCSS2_10GBX         0x00000002
+#define IXGB_PCSS2_10GBR         0x00000001
+
+/* XPCSS Bit Masks */
+#define IXGB_XPCSS_ALIGN_STATUS 0x00001000
+#define IXGB_XPCSS_PATTERN_TEST 0x00000800
+#define IXGB_XPCSS_LANE_3_SYNC  0x00000008
+#define IXGB_XPCSS_LANE_2_SYNC  0x00000004
+#define IXGB_XPCSS_LANE_1_SYNC  0x00000002
+#define IXGB_XPCSS_LANE_0_SYNC  0x00000001
+
+/* XPCSTC Bit Masks */
+#define IXGB_XPCSTC_BERT_TRIG       0x00200000
+#define IXGB_XPCSTC_BERT_SST        0x00100000
+#define IXGB_XPCSTC_BERT_PSZ_MASK   0x000C0000
+#define IXGB_XPCSTC_BERT_PSZ_SHIFT  17
+#define IXGB_XPCSTC_BERT_PSZ_INF    0x00000003
+#define IXGB_XPCSTC_BERT_PSZ_68     0x00000001
+#define IXGB_XPCSTC_BERT_PSZ_1028   0x00000000
+
+/* MSCA bit Masks */
+/* New Protocol Address */
+#define IXGB_MSCA_NP_ADDR_MASK      0x0000FFFF
+#define IXGB_MSCA_NP_ADDR_SHIFT     0
+/* Either Device Type or Register Address,depending on ST_CODE */
+#define IXGB_MSCA_DEV_TYPE_MASK     0x001F0000
+#define IXGB_MSCA_DEV_TYPE_SHIFT    16
+#define IXGB_MSCA_PHY_ADDR_MASK     0x03E00000
+#define IXGB_MSCA_PHY_ADDR_SHIFT    21
+#define IXGB_MSCA_OP_CODE_MASK      0x0C000000
+/* OP_CODE == 00, Address cycle, New Protocol           */
+/* OP_CODE == 01, Write operation                       */
+/* OP_CODE == 10, Read operation                        */
+/* OP_CODE == 11, Read, auto increment, New Protocol    */
+#define IXGB_MSCA_ADDR_CYCLE        0x00000000
+#define IXGB_MSCA_WRITE             0x04000000
+#define IXGB_MSCA_READ              0x08000000
+#define IXGB_MSCA_READ_AUTOINC      0x0C000000
+#define IXGB_MSCA_OP_CODE_SHIFT     26
+#define IXGB_MSCA_ST_CODE_MASK      0x30000000
+/* ST_CODE == 00, New Protocol  */
+/* ST_CODE == 01, Old Protocol  */
+#define IXGB_MSCA_NEW_PROTOCOL      0x00000000
+#define IXGB_MSCA_OLD_PROTOCOL      0x10000000
+#define IXGB_MSCA_ST_CODE_SHIFT     28
+/* Initiate command, self-clearing when command completes */
+#define IXGB_MSCA_MDI_COMMAND       0x40000000
+/*MDI In Progress Enable. */
+#define IXGB_MSCA_MDI_IN_PROG_EN    0x80000000
+
+/* MSRWD bit masks */
+#define IXGB_MSRWD_WRITE_DATA_MASK  0x0000FFFF
+#define IXGB_MSRWD_WRITE_DATA_SHIFT 0
+#define IXGB_MSRWD_READ_DATA_MASK   0xFFFF0000
+#define IXGB_MSRWD_READ_DATA_SHIFT  16
+
+/* Definitions for the optics devices on the MDIO bus. */
+#define IXGB_PHY_ADDRESS             0x0       /* Single PHY, multiple "Devices" */
+
+#define MDIO_PMA_PMD_XPAK_VENDOR_NAME       0x803A     /* XPAK/XENPAK devices only */
+
+/* Vendor-specific MDIO registers */
+#define G6XXX_PMA_PMD_VS1                   0xC001     /* Vendor-specific register */
+#define G6XXX_XGXS_XAUI_VS2                 0x18       /* Vendor-specific register */
+
+#define G6XXX_PMA_PMD_VS1_PLL_RESET         0x80
+#define G6XXX_PMA_PMD_VS1_REMOVE_PLL_RESET  0x00
+#define G6XXX_XGXS_XAUI_VS2_INPUT_MASK      0x0F       /* XAUI lanes synchronized */
+
+/* Layout of a single receive descriptor.  The controller assumes that this
+ * structure is packed into 16 bytes, which is a safe assumption with most
+ * compilers.  However, some compilers may insert padding between the fields,
+ * in which case the structure must be packed in some compiler-specific
+ * manner. */
+struct ixgb_rx_desc {
+       __le64 buff_addr;
+       __le16 length;
+       __le16 reserved;
+       u8 status;
+       u8 errors;
+       __le16 special;
+};
+
+#define IXGB_RX_DESC_STATUS_DD    0x01
+#define IXGB_RX_DESC_STATUS_EOP   0x02
+#define IXGB_RX_DESC_STATUS_IXSM  0x04
+#define IXGB_RX_DESC_STATUS_VP    0x08
+#define IXGB_RX_DESC_STATUS_TCPCS 0x20
+#define IXGB_RX_DESC_STATUS_IPCS  0x40
+#define IXGB_RX_DESC_STATUS_PIF   0x80
+
+#define IXGB_RX_DESC_ERRORS_CE   0x01
+#define IXGB_RX_DESC_ERRORS_SE   0x02
+#define IXGB_RX_DESC_ERRORS_P    0x08
+#define IXGB_RX_DESC_ERRORS_TCPE 0x20
+#define IXGB_RX_DESC_ERRORS_IPE  0x40
+#define IXGB_RX_DESC_ERRORS_RXE  0x80
+
+#define IXGB_RX_DESC_SPECIAL_VLAN_MASK  0x0FFF /* VLAN ID is in lower 12 bits */
+#define IXGB_RX_DESC_SPECIAL_PRI_MASK   0xE000 /* Priority is in upper 3 bits */
+#define IXGB_RX_DESC_SPECIAL_PRI_SHIFT  0x000D /* Priority is in upper 3 of 16 */
+
+/* Layout of a single transmit descriptor.  The controller assumes that this
+ * structure is packed into 16 bytes, which is a safe assumption with most
+ * compilers.  However, some compilers may insert padding between the fields,
+ * in which case the structure must be packed in some compiler-specific
+ * manner. */
+struct ixgb_tx_desc {
+       __le64 buff_addr;
+       __le32 cmd_type_len;
+       u8 status;
+       u8 popts;
+       __le16 vlan;
+};
+
+#define IXGB_TX_DESC_LENGTH_MASK    0x000FFFFF
+#define IXGB_TX_DESC_TYPE_MASK      0x00F00000
+#define IXGB_TX_DESC_TYPE_SHIFT     20
+#define IXGB_TX_DESC_CMD_MASK       0xFF000000
+#define IXGB_TX_DESC_CMD_SHIFT      24
+#define IXGB_TX_DESC_CMD_EOP        0x01000000
+#define IXGB_TX_DESC_CMD_TSE        0x04000000
+#define IXGB_TX_DESC_CMD_RS         0x08000000
+#define IXGB_TX_DESC_CMD_VLE        0x40000000
+#define IXGB_TX_DESC_CMD_IDE        0x80000000
+
+#define IXGB_TX_DESC_TYPE           0x00100000
+
+#define IXGB_TX_DESC_STATUS_DD  0x01
+
+#define IXGB_TX_DESC_POPTS_IXSM 0x01
+#define IXGB_TX_DESC_POPTS_TXSM 0x02
+#define IXGB_TX_DESC_SPECIAL_PRI_SHIFT  IXGB_RX_DESC_SPECIAL_PRI_SHIFT /* Priority is in upper 3 of 16 */
+
+struct ixgb_context_desc {
+       u8 ipcss;
+       u8 ipcso;
+       __le16 ipcse;
+       u8 tucss;
+       u8 tucso;
+       __le16 tucse;
+       __le32 cmd_type_len;
+       u8 status;
+       u8 hdr_len;
+       __le16 mss;
+};
+
+#define IXGB_CONTEXT_DESC_CMD_TCP 0x01000000
+#define IXGB_CONTEXT_DESC_CMD_IP  0x02000000
+#define IXGB_CONTEXT_DESC_CMD_TSE 0x04000000
+#define IXGB_CONTEXT_DESC_CMD_RS  0x08000000
+#define IXGB_CONTEXT_DESC_CMD_IDE 0x80000000
+
+#define IXGB_CONTEXT_DESC_TYPE 0x00000000
+
+#define IXGB_CONTEXT_DESC_STATUS_DD 0x01
+
+/* Filters */
+#define IXGB_MC_TBL_SIZE          128  /* Multicast Filter Table (4096 bits) */
+#define IXGB_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
+#define IXGB_RAR_ENTRIES                 3     /* Number of entries in Rx Address array */
+
+#define IXGB_MEMORY_REGISTER_BASE_ADDRESS   0
+#define ENET_HEADER_SIZE                       14
+#define ENET_FCS_LENGTH                         4
+#define IXGB_MAX_NUM_MULTICAST_ADDRESSES       128
+#define IXGB_MIN_ENET_FRAME_SIZE_WITHOUT_FCS   60
+#define IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS   1514
+#define IXGB_MAX_JUMBO_FRAME_SIZE              0x3F00
+
+/* Phy Addresses */
+#define IXGB_OPTICAL_PHY_ADDR 0x0      /* Optical Module phy address */
+#define IXGB_XAUII_PHY_ADDR   0x1      /* Xauii transceiver phy address */
+#define IXGB_DIAG_PHY_ADDR    0x1F     /* Diagnostic Device phy address */
+
+/* This structure takes a 64k flash and maps it for identification commands */
+struct ixgb_flash_buffer {
+       u8 manufacturer_id;
+       u8 device_id;
+       u8 filler1[0x2AA8];
+       u8 cmd2;
+       u8 filler2[0x2AAA];
+       u8 cmd1;
+       u8 filler3[0xAAAA];
+};
+
+/* Flow control parameters */
+struct ixgb_fc {
+       u32 high_water; /* Flow Control High-water          */
+       u32 low_water;  /* Flow Control Low-water           */
+       u16 pause_time; /* Flow Control Pause timer         */
+       bool send_xon;          /* Flow control send XON            */
+       ixgb_fc_type type;      /* Type of flow control             */
+};
+
+/* The historical defaults for the flow control values are given below. */
+#define FC_DEFAULT_HI_THRESH        (0x8000)   /* 32KB */
+#define FC_DEFAULT_LO_THRESH        (0x4000)   /* 16KB */
+#define FC_DEFAULT_TX_TIMER         (0x100)    /* ~130 us */
+
+/* Phy definitions */
+#define IXGB_MAX_PHY_REG_ADDRESS    0xFFFF
+#define IXGB_MAX_PHY_ADDRESS        31
+#define IXGB_MAX_PHY_DEV_TYPE       31
+
+/* Bus parameters */
+struct ixgb_bus {
+       ixgb_bus_speed speed;
+       ixgb_bus_width width;
+       ixgb_bus_type type;
+};
+
+struct ixgb_hw {
+       u8 __iomem *hw_addr;/* Base Address of the hardware     */
+       void *back;             /* Pointer to OS-dependent struct   */
+       struct ixgb_fc fc;      /* Flow control parameters          */
+       struct ixgb_bus bus;    /* Bus parameters                   */
+       u32 phy_id;     /* Phy Identifier                   */
+       u32 phy_addr;   /* XGMII address of Phy             */
+       ixgb_mac_type mac_type; /* Identifier for MAC controller    */
+       ixgb_phy_type phy_type; /* Transceiver/phy identifier       */
+       u32 max_frame_size;     /* Maximum frame size supported     */
+       u32 mc_filter_type;     /* Multicast filter hash type       */
+       u32 num_mc_addrs;       /* Number of current Multicast addrs */
+       u8 curr_mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];   /* Individual address currently programmed in MAC */
+       u32 num_tx_desc;        /* Number of Transmit descriptors   */
+       u32 num_rx_desc;        /* Number of Receive descriptors    */
+       u32 rx_buffer_size;     /* Size of Receive buffer           */
+       bool link_up;           /* true if link is valid            */
+       bool adapter_stopped;   /* State of adapter                 */
+       u16 device_id;  /* device id from PCI configuration space */
+       u16 vendor_id;  /* vendor id from PCI configuration space */
+       u8 revision_id; /* revision id from PCI configuration space */
+       u16 subsystem_vendor_id;        /* subsystem vendor id from PCI configuration space */
+       u16 subsystem_id;       /* subsystem id from PCI configuration space */
+       u32 bar0;               /* Base Address registers           */
+       u32 bar1;
+       u32 bar2;
+       u32 bar3;
+       u16 pci_cmd_word;       /* PCI command register id from PCI configuration space */
+       __le16 eeprom[IXGB_EEPROM_SIZE];        /* EEPROM contents read at init time  */
+       unsigned long io_base;  /* Our I/O mapped location */
+       u32 lastLFC;
+       u32 lastRFC;
+};
+
+/* Statistics reported by the hardware */
+struct ixgb_hw_stats {
+       u64 tprl;
+       u64 tprh;
+       u64 gprcl;
+       u64 gprch;
+       u64 bprcl;
+       u64 bprch;
+       u64 mprcl;
+       u64 mprch;
+       u64 uprcl;
+       u64 uprch;
+       u64 vprcl;
+       u64 vprch;
+       u64 jprcl;
+       u64 jprch;
+       u64 gorcl;
+       u64 gorch;
+       u64 torl;
+       u64 torh;
+       u64 rnbc;
+       u64 ruc;
+       u64 roc;
+       u64 rlec;
+       u64 crcerrs;
+       u64 icbc;
+       u64 ecbc;
+       u64 mpc;
+       u64 tptl;
+       u64 tpth;
+       u64 gptcl;
+       u64 gptch;
+       u64 bptcl;
+       u64 bptch;
+       u64 mptcl;
+       u64 mptch;
+       u64 uptcl;
+       u64 uptch;
+       u64 vptcl;
+       u64 vptch;
+       u64 jptcl;
+       u64 jptch;
+       u64 gotcl;
+       u64 gotch;
+       u64 totl;
+       u64 toth;
+       u64 dc;
+       u64 plt64c;
+       u64 tsctc;
+       u64 tsctfc;
+       u64 ibic;
+       u64 rfc;
+       u64 lfc;
+       u64 pfrc;
+       u64 pftc;
+       u64 mcfrc;
+       u64 mcftc;
+       u64 xonrxc;
+       u64 xontxc;
+       u64 xoffrxc;
+       u64 xofftxc;
+       u64 rjc;
+};
+
+/* Function Prototypes */
+extern bool ixgb_adapter_stop(struct ixgb_hw *hw);
+extern bool ixgb_init_hw(struct ixgb_hw *hw);
+extern bool ixgb_adapter_start(struct ixgb_hw *hw);
+extern void ixgb_check_for_link(struct ixgb_hw *hw);
+extern bool ixgb_check_for_bad_link(struct ixgb_hw *hw);
+
+extern void ixgb_rar_set(struct ixgb_hw *hw,
+                               u8 *addr,
+                               u32 index);
+
+
+/* Filters (multicast, vlan, receive) */
+extern void ixgb_mc_addr_list_update(struct ixgb_hw *hw,
+                                  u8 *mc_addr_list,
+                                  u32 mc_addr_count,
+                                  u32 pad);
+
+/* Vfta functions */
+extern void ixgb_write_vfta(struct ixgb_hw *hw,
+                                u32 offset,
+                                u32 value);
+
+/* Access functions to eeprom data */
+void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, u8 *mac_addr);
+u32 ixgb_get_ee_pba_number(struct ixgb_hw *hw);
+u16 ixgb_get_ee_device_id(struct ixgb_hw *hw);
+bool ixgb_get_eeprom_data(struct ixgb_hw *hw);
+__le16 ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index);
+
+/* Everything else */
+void ixgb_led_on(struct ixgb_hw *hw);
+void ixgb_led_off(struct ixgb_hw *hw);
+void ixgb_write_pci_cfg(struct ixgb_hw *hw,
+                        u32 reg,
+                        u16 * value);
+
+
+#endif /* _IXGB_HW_H_ */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
new file mode 100644 (file)
index 0000000..2a58847
--- /dev/null
@@ -0,0 +1,53 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+#ifndef _IXGB_IDS_H_
+#define _IXGB_IDS_H_
+
+/**********************************************************************
+** The Device and Vendor IDs for 10 Gigabit MACs
+**********************************************************************/
+
+#define INTEL_VENDOR_ID             0x8086
+#define INTEL_SUBVENDOR_ID          0x8086
+#define SUN_VENDOR_ID               0x108E
+#define SUN_SUBVENDOR_ID            0x108E
+
+#define IXGB_DEVICE_ID_82597EX      0x1048
+#define IXGB_DEVICE_ID_82597EX_SR   0x1A48
+#define IXGB_DEVICE_ID_82597EX_LR   0x1B48
+#define IXGB_SUBDEVICE_ID_A11F      0xA11F
+#define IXGB_SUBDEVICE_ID_A01F      0xA01F
+
+#define IXGB_DEVICE_ID_82597EX_CX4   0x109E
+#define IXGB_SUBDEVICE_ID_A00C  0xA00C
+#define IXGB_SUBDEVICE_ID_A01C  0xA01C
+#define IXGB_SUBDEVICE_ID_7036  0x7036
+
+#endif /* #ifndef _IXGB_IDS_H_ */
+/* End of File */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
new file mode 100644 (file)
index 0000000..6a130eb
--- /dev/null
@@ -0,0 +1,2332 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/prefetch.h>
+#include "ixgb.h"
+
+char ixgb_driver_name[] = "ixgb";
+static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
+
+#define DRIVERNAPI "-NAPI"
+#define DRV_VERSION "1.0.135-k2" DRIVERNAPI
+const char ixgb_driver_version[] = DRV_VERSION;
+static const char ixgb_copyright[] = "Copyright (c) 1999-2008 Intel Corporation.";
+
+#define IXGB_CB_LENGTH 256
+static unsigned int copybreak __read_mostly = IXGB_CB_LENGTH;
+module_param(copybreak, uint, 0644);
+MODULE_PARM_DESC(copybreak,
+       "Maximum size of packet that is copied to a new buffer on receive");
+
+/* ixgb_pci_tbl - PCI Device ID Table
+ *
+ * Wildcard entries (PCI_ANY_ID) should come last
+ * Last entry must be all 0s
+ *
+ * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
+ *   Class, Class Mask, private data (not used) }
+ */
+static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = {
+       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+
+       /* required last entry */
+       {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl);
+
+/* Local Function Prototypes */
+static int ixgb_init_module(void);
+static void ixgb_exit_module(void);
+static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+static void __devexit ixgb_remove(struct pci_dev *pdev);
+static int ixgb_sw_init(struct ixgb_adapter *adapter);
+static int ixgb_open(struct net_device *netdev);
+static int ixgb_close(struct net_device *netdev);
+static void ixgb_configure_tx(struct ixgb_adapter *adapter);
+static void ixgb_configure_rx(struct ixgb_adapter *adapter);
+static void ixgb_setup_rctl(struct ixgb_adapter *adapter);
+static void ixgb_clean_tx_ring(struct ixgb_adapter *adapter);
+static void ixgb_clean_rx_ring(struct ixgb_adapter *adapter);
+static void ixgb_set_multi(struct net_device *netdev);
+static void ixgb_watchdog(unsigned long data);
+static netdev_tx_t ixgb_xmit_frame(struct sk_buff *skb,
+                                  struct net_device *netdev);
+static struct net_device_stats *ixgb_get_stats(struct net_device *netdev);
+static int ixgb_change_mtu(struct net_device *netdev, int new_mtu);
+static int ixgb_set_mac(struct net_device *netdev, void *p);
+static irqreturn_t ixgb_intr(int irq, void *data);
+static bool ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
+
+static int ixgb_clean(struct napi_struct *, int);
+static bool ixgb_clean_rx_irq(struct ixgb_adapter *, int *, int);
+static void ixgb_alloc_rx_buffers(struct ixgb_adapter *, int);
+
+static void ixgb_tx_timeout(struct net_device *dev);
+static void ixgb_tx_timeout_task(struct work_struct *work);
+
+static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter);
+static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter);
+static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/* for netdump / net console */
+static void ixgb_netpoll(struct net_device *dev);
+#endif
+
+static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
+                             enum pci_channel_state state);
+static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev);
+static void ixgb_io_resume (struct pci_dev *pdev);
+
+static struct pci_error_handlers ixgb_err_handler = {
+       .error_detected = ixgb_io_error_detected,
+       .slot_reset = ixgb_io_slot_reset,
+       .resume = ixgb_io_resume,
+};
+
+static struct pci_driver ixgb_driver = {
+       .name     = ixgb_driver_name,
+       .id_table = ixgb_pci_tbl,
+       .probe    = ixgb_probe,
+       .remove   = __devexit_p(ixgb_remove),
+       .err_handler = &ixgb_err_handler
+};
+
+MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
+MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+#define DEFAULT_DEBUG_LEVEL_SHIFT 3
+static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
+/**
+ * ixgb_init_module - Driver Registration Routine
+ *
+ * ixgb_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+
+static int __init
+ixgb_init_module(void)
+{
+       pr_info("%s - version %s\n", ixgb_driver_string, ixgb_driver_version);
+       pr_info("%s\n", ixgb_copyright);
+
+       return pci_register_driver(&ixgb_driver);
+}
+
+module_init(ixgb_init_module);
+
+/**
+ * ixgb_exit_module - Driver Exit Cleanup Routine
+ *
+ * ixgb_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+
+static void __exit
+ixgb_exit_module(void)
+{
+       pci_unregister_driver(&ixgb_driver);
+}
+
+module_exit(ixgb_exit_module);
+
+/**
+ * ixgb_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ **/
+
+static void
+ixgb_irq_disable(struct ixgb_adapter *adapter)
+{
+       IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
+       IXGB_WRITE_FLUSH(&adapter->hw);
+       synchronize_irq(adapter->pdev->irq);
+}
+
+/**
+ * ixgb_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ **/
+
+static void
+ixgb_irq_enable(struct ixgb_adapter *adapter)
+{
+       u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |
+                 IXGB_INT_TXDW | IXGB_INT_LSC;
+       if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)
+               val |= IXGB_INT_GPI0;
+       IXGB_WRITE_REG(&adapter->hw, IMS, val);
+       IXGB_WRITE_FLUSH(&adapter->hw);
+}
+
+int
+ixgb_up(struct ixgb_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int err, irq_flags = IRQF_SHARED;
+       int max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+       struct ixgb_hw *hw = &adapter->hw;
+
+       /* hardware has been reset, we need to reload some things */
+
+       ixgb_rar_set(hw, netdev->dev_addr, 0);
+       ixgb_set_multi(netdev);
+
+       ixgb_restore_vlan(adapter);
+
+       ixgb_configure_tx(adapter);
+       ixgb_setup_rctl(adapter);
+       ixgb_configure_rx(adapter);
+       ixgb_alloc_rx_buffers(adapter, IXGB_DESC_UNUSED(&adapter->rx_ring));
+
+       /* disable interrupts and get the hardware into a known state */
+       IXGB_WRITE_REG(&adapter->hw, IMC, 0xffffffff);
+
+       /* only enable MSI if bus is in PCI-X mode */
+       if (IXGB_READ_REG(&adapter->hw, STATUS) & IXGB_STATUS_PCIX_MODE) {
+               err = pci_enable_msi(adapter->pdev);
+               if (!err) {
+                       adapter->have_msi = 1;
+                       irq_flags = 0;
+               }
+               /* proceed to try to request regular interrupt */
+       }
+
+       err = request_irq(adapter->pdev->irq, ixgb_intr, irq_flags,
+                         netdev->name, netdev);
+       if (err) {
+               if (adapter->have_msi)
+                       pci_disable_msi(adapter->pdev);
+               netif_err(adapter, probe, adapter->netdev,
+                         "Unable to allocate interrupt Error: %d\n", err);
+               return err;
+       }
+
+       if ((hw->max_frame_size != max_frame) ||
+               (hw->max_frame_size !=
+               (IXGB_READ_REG(hw, MFS) >> IXGB_MFS_SHIFT))) {
+
+               hw->max_frame_size = max_frame;
+
+               IXGB_WRITE_REG(hw, MFS, hw->max_frame_size << IXGB_MFS_SHIFT);
+
+               if (hw->max_frame_size >
+                  IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) {
+                       u32 ctrl0 = IXGB_READ_REG(hw, CTRL0);
+
+                       if (!(ctrl0 & IXGB_CTRL0_JFE)) {
+                               ctrl0 |= IXGB_CTRL0_JFE;
+                               IXGB_WRITE_REG(hw, CTRL0, ctrl0);
+                       }
+               }
+       }
+
+       clear_bit(__IXGB_DOWN, &adapter->flags);
+
+       napi_enable(&adapter->napi);
+       ixgb_irq_enable(adapter);
+
+       netif_wake_queue(netdev);
+
+       mod_timer(&adapter->watchdog_timer, jiffies);
+
+       return 0;
+}
+
+void
+ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog)
+{
+       struct net_device *netdev = adapter->netdev;
+
+       /* prevent the interrupt handler from restarting watchdog */
+       set_bit(__IXGB_DOWN, &adapter->flags);
+
+       napi_disable(&adapter->napi);
+       /* waiting for NAPI to complete can re-enable interrupts */
+       ixgb_irq_disable(adapter);
+       free_irq(adapter->pdev->irq, netdev);
+
+       if (adapter->have_msi)
+               pci_disable_msi(adapter->pdev);
+
+       if (kill_watchdog)
+               del_timer_sync(&adapter->watchdog_timer);
+
+       adapter->link_speed = 0;
+       adapter->link_duplex = 0;
+       netif_carrier_off(netdev);
+       netif_stop_queue(netdev);
+
+       ixgb_reset(adapter);
+       ixgb_clean_tx_ring(adapter);
+       ixgb_clean_rx_ring(adapter);
+}
+
+void
+ixgb_reset(struct ixgb_adapter *adapter)
+{
+       struct ixgb_hw *hw = &adapter->hw;
+
+       ixgb_adapter_stop(hw);
+       if (!ixgb_init_hw(hw))
+               netif_err(adapter, probe, adapter->netdev, "ixgb_init_hw failed\n");
+
+       /* restore frame size information */
+       IXGB_WRITE_REG(hw, MFS, hw->max_frame_size << IXGB_MFS_SHIFT);
+       if (hw->max_frame_size >
+           IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) {
+               u32 ctrl0 = IXGB_READ_REG(hw, CTRL0);
+               if (!(ctrl0 & IXGB_CTRL0_JFE)) {
+                       ctrl0 |= IXGB_CTRL0_JFE;
+                       IXGB_WRITE_REG(hw, CTRL0, ctrl0);
+               }
+       }
+}
+
+static const struct net_device_ops ixgb_netdev_ops = {
+       .ndo_open               = ixgb_open,
+       .ndo_stop               = ixgb_close,
+       .ndo_start_xmit         = ixgb_xmit_frame,
+       .ndo_get_stats          = ixgb_get_stats,
+       .ndo_set_multicast_list = ixgb_set_multi,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = ixgb_set_mac,
+       .ndo_change_mtu         = ixgb_change_mtu,
+       .ndo_tx_timeout         = ixgb_tx_timeout,
+       .ndo_vlan_rx_add_vid    = ixgb_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = ixgb_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ixgb_netpoll,
+#endif
+};
+
+/**
+ * ixgb_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in ixgb_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * ixgb_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+
+static int __devinit
+ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+       struct net_device *netdev = NULL;
+       struct ixgb_adapter *adapter;
+       static int cards_found = 0;
+       int pci_using_dac;
+       int i;
+       int err;
+
+       err = pci_enable_device(pdev);
+       if (err)
+               return err;
+
+       pci_using_dac = 0;
+       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+       if (!err) {
+               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+               if (!err)
+                       pci_using_dac = 1;
+       } else {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               if (err) {
+                       err = dma_set_coherent_mask(&pdev->dev,
+                                                   DMA_BIT_MASK(32));
+                       if (err) {
+                               pr_err("No usable DMA configuration, aborting\n");
+                               goto err_dma_mask;
+                       }
+               }
+       }
+
+       err = pci_request_regions(pdev, ixgb_driver_name);
+       if (err)
+               goto err_request_regions;
+
+       pci_set_master(pdev);
+
+       netdev = alloc_etherdev(sizeof(struct ixgb_adapter));
+       if (!netdev) {
+               err = -ENOMEM;
+               goto err_alloc_etherdev;
+       }
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       pci_set_drvdata(pdev, netdev);
+       adapter = netdev_priv(netdev);
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+       adapter->hw.back = adapter;
+       adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
+
+       adapter->hw.hw_addr = pci_ioremap_bar(pdev, BAR_0);
+       if (!adapter->hw.hw_addr) {
+               err = -EIO;
+               goto err_ioremap;
+       }
+
+       for (i = BAR_1; i <= BAR_5; i++) {
+               if (pci_resource_len(pdev, i) == 0)
+                       continue;
+               if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
+                       adapter->hw.io_base = pci_resource_start(pdev, i);
+                       break;
+               }
+       }
+
+       netdev->netdev_ops = &ixgb_netdev_ops;
+       ixgb_set_ethtool_ops(netdev);
+       netdev->watchdog_timeo = 5 * HZ;
+       netif_napi_add(netdev, &adapter->napi, ixgb_clean, 64);
+
+       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+
+       adapter->bd_number = cards_found;
+       adapter->link_speed = 0;
+       adapter->link_duplex = 0;
+
+       /* setup the private structure */
+
+       err = ixgb_sw_init(adapter);
+       if (err)
+               goto err_sw_init;
+
+       netdev->features = NETIF_F_SG |
+                          NETIF_F_HW_CSUM |
+                          NETIF_F_HW_VLAN_TX |
+                          NETIF_F_HW_VLAN_RX |
+                          NETIF_F_HW_VLAN_FILTER;
+       netdev->features |= NETIF_F_TSO;
+
+       if (pci_using_dac) {
+               netdev->features |= NETIF_F_HIGHDMA;
+               netdev->vlan_features |= NETIF_F_HIGHDMA;
+       }
+
+       /* make sure the EEPROM is good */
+
+       if (!ixgb_validate_eeprom_checksum(&adapter->hw)) {
+               netif_err(adapter, probe, adapter->netdev,
+                         "The EEPROM Checksum Is Not Valid\n");
+               err = -EIO;
+               goto err_eeprom;
+       }
+
+       ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);
+       memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
+
+       if (!is_valid_ether_addr(netdev->perm_addr)) {
+               netif_err(adapter, probe, adapter->netdev, "Invalid MAC Address\n");
+               err = -EIO;
+               goto err_eeprom;
+       }
+
+       adapter->part_num = ixgb_get_ee_pba_number(&adapter->hw);
+
+       init_timer(&adapter->watchdog_timer);
+       adapter->watchdog_timer.function = ixgb_watchdog;
+       adapter->watchdog_timer.data = (unsigned long)adapter;
+
+       INIT_WORK(&adapter->tx_timeout_task, ixgb_tx_timeout_task);
+
+       strcpy(netdev->name, "eth%d");
+       err = register_netdev(netdev);
+       if (err)
+               goto err_register;
+
+       /* carrier off reporting is important to ethtool even BEFORE open */
+       netif_carrier_off(netdev);
+
+       netif_info(adapter, probe, adapter->netdev,
+                  "Intel(R) PRO/10GbE Network Connection\n");
+       ixgb_check_options(adapter);
+       /* reset the hardware with the new settings */
+
+       ixgb_reset(adapter);
+
+       cards_found++;
+       return 0;
+
+err_register:
+err_sw_init:
+err_eeprom:
+       iounmap(adapter->hw.hw_addr);
+err_ioremap:
+       free_netdev(netdev);
+err_alloc_etherdev:
+       pci_release_regions(pdev);
+err_request_regions:
+err_dma_mask:
+       pci_disable_device(pdev);
+       return err;
+}
+
+/**
+ * ixgb_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * ixgb_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+
+static void __devexit
+ixgb_remove(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       cancel_work_sync(&adapter->tx_timeout_task);
+
+       unregister_netdev(netdev);
+
+       iounmap(adapter->hw.hw_addr);
+       pci_release_regions(pdev);
+
+       free_netdev(netdev);
+       pci_disable_device(pdev);
+}
+
+/**
+ * ixgb_sw_init - Initialize general software structures (struct ixgb_adapter)
+ * @adapter: board private structure to initialize
+ *
+ * ixgb_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 __devinit
+ixgb_sw_init(struct ixgb_adapter *adapter)
+{
+       struct ixgb_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+
+       /* PCI config space info */
+
+       hw->vendor_id = pdev->vendor;
+       hw->device_id = pdev->device;
+       hw->subsystem_vendor_id = pdev->subsystem_vendor;
+       hw->subsystem_id = pdev->subsystem_device;
+
+       hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+       adapter->rx_buffer_len = hw->max_frame_size + 8; /* + 8 for errata */
+
+       if ((hw->device_id == IXGB_DEVICE_ID_82597EX) ||
+           (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4) ||
+           (hw->device_id == IXGB_DEVICE_ID_82597EX_LR) ||
+           (hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
+               hw->mac_type = ixgb_82597;
+       else {
+               /* should never have loaded on this device */
+               netif_err(adapter, probe, adapter->netdev, "unsupported device id\n");
+       }
+
+       /* enable flow control to be programmed */
+       hw->fc.send_xon = 1;
+
+       set_bit(__IXGB_DOWN, &adapter->flags);
+       return 0;
+}
+
+/**
+ * ixgb_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+
+static int
+ixgb_open(struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       int err;
+
+       /* allocate transmit descriptors */
+       err = ixgb_setup_tx_resources(adapter);
+       if (err)
+               goto err_setup_tx;
+
+       netif_carrier_off(netdev);
+
+       /* allocate receive descriptors */
+
+       err = ixgb_setup_rx_resources(adapter);
+       if (err)
+               goto err_setup_rx;
+
+       err = ixgb_up(adapter);
+       if (err)
+               goto err_up;
+
+       netif_start_queue(netdev);
+
+       return 0;
+
+err_up:
+       ixgb_free_rx_resources(adapter);
+err_setup_rx:
+       ixgb_free_tx_resources(adapter);
+err_setup_tx:
+       ixgb_reset(adapter);
+
+       return err;
+}
+
+/**
+ * ixgb_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+
+static int
+ixgb_close(struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       ixgb_down(adapter, true);
+
+       ixgb_free_tx_resources(adapter);
+       ixgb_free_rx_resources(adapter);
+
+       return 0;
+}
+
+/**
+ * ixgb_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Return 0 on success, negative on failure
+ **/
+
+int
+ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
+{
+       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       int size;
+
+       size = sizeof(struct ixgb_buffer) * txdr->count;
+       txdr->buffer_info = vzalloc(size);
+       if (!txdr->buffer_info) {
+               netif_err(adapter, probe, adapter->netdev,
+                         "Unable to allocate transmit descriptor ring memory\n");
+               return -ENOMEM;
+       }
+
+       /* round up to nearest 4K */
+
+       txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);
+       txdr->size = ALIGN(txdr->size, 4096);
+
+       txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
+                                       GFP_KERNEL);
+       if (!txdr->desc) {
+               vfree(txdr->buffer_info);
+               netif_err(adapter, probe, adapter->netdev,
+                         "Unable to allocate transmit descriptor memory\n");
+               return -ENOMEM;
+       }
+       memset(txdr->desc, 0, txdr->size);
+
+       txdr->next_to_use = 0;
+       txdr->next_to_clean = 0;
+
+       return 0;
+}
+
+/**
+ * ixgb_configure_tx - Configure 82597 Transmit Unit after Reset.
+ * @adapter: board private structure
+ *
+ * Configure the Tx unit of the MAC after a reset.
+ **/
+
+static void
+ixgb_configure_tx(struct ixgb_adapter *adapter)
+{
+       u64 tdba = adapter->tx_ring.dma;
+       u32 tdlen = adapter->tx_ring.count * sizeof(struct ixgb_tx_desc);
+       u32 tctl;
+       struct ixgb_hw *hw = &adapter->hw;
+
+       /* Setup the Base and Length of the Tx Descriptor Ring
+        * tx_ring.dma can be either a 32 or 64 bit value
+        */
+
+       IXGB_WRITE_REG(hw, TDBAL, (tdba & 0x00000000ffffffffULL));
+       IXGB_WRITE_REG(hw, TDBAH, (tdba >> 32));
+
+       IXGB_WRITE_REG(hw, TDLEN, tdlen);
+
+       /* Setup the HW Tx Head and Tail descriptor pointers */
+
+       IXGB_WRITE_REG(hw, TDH, 0);
+       IXGB_WRITE_REG(hw, TDT, 0);
+
+       /* don't set up txdctl, it induces performance problems if configured
+        * incorrectly */
+       /* Set the Tx Interrupt Delay register */
+
+       IXGB_WRITE_REG(hw, TIDV, adapter->tx_int_delay);
+
+       /* Program the Transmit Control Register */
+
+       tctl = IXGB_TCTL_TCE | IXGB_TCTL_TXEN | IXGB_TCTL_TPDE;
+       IXGB_WRITE_REG(hw, TCTL, tctl);
+
+       /* Setup Transmit Descriptor Settings for this adapter */
+       adapter->tx_cmd_type =
+               IXGB_TX_DESC_TYPE |
+               (adapter->tx_int_delay_enable ? IXGB_TX_DESC_CMD_IDE : 0);
+}
+
+/**
+ * ixgb_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @adapter: board private structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+int
+ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
+{
+       struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       int size;
+
+       size = sizeof(struct ixgb_buffer) * rxdr->count;
+       rxdr->buffer_info = vzalloc(size);
+       if (!rxdr->buffer_info) {
+               netif_err(adapter, probe, adapter->netdev,
+                         "Unable to allocate receive descriptor ring\n");
+               return -ENOMEM;
+       }
+
+       /* Round up to nearest 4K */
+
+       rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc);
+       rxdr->size = ALIGN(rxdr->size, 4096);
+
+       rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
+                                       GFP_KERNEL);
+
+       if (!rxdr->desc) {
+               vfree(rxdr->buffer_info);
+               netif_err(adapter, probe, adapter->netdev,
+                         "Unable to allocate receive descriptors\n");
+               return -ENOMEM;
+       }
+       memset(rxdr->desc, 0, rxdr->size);
+
+       rxdr->next_to_clean = 0;
+       rxdr->next_to_use = 0;
+
+       return 0;
+}
+
+/**
+ * ixgb_setup_rctl - configure the receive control register
+ * @adapter: Board private structure
+ **/
+
+static void
+ixgb_setup_rctl(struct ixgb_adapter *adapter)
+{
+       u32 rctl;
+
+       rctl = IXGB_READ_REG(&adapter->hw, RCTL);
+
+       rctl &= ~(3 << IXGB_RCTL_MO_SHIFT);
+
+       rctl |=
+               IXGB_RCTL_BAM | IXGB_RCTL_RDMTS_1_2 |
+               IXGB_RCTL_RXEN | IXGB_RCTL_CFF |
+               (adapter->hw.mc_filter_type << IXGB_RCTL_MO_SHIFT);
+
+       rctl |= IXGB_RCTL_SECRC;
+
+       if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048)
+               rctl |= IXGB_RCTL_BSIZE_2048;
+       else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096)
+               rctl |= IXGB_RCTL_BSIZE_4096;
+       else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192)
+               rctl |= IXGB_RCTL_BSIZE_8192;
+       else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384)
+               rctl |= IXGB_RCTL_BSIZE_16384;
+
+       IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
+}
+
+/**
+ * ixgb_configure_rx - Configure 82597 Receive Unit after Reset.
+ * @adapter: board private structure
+ *
+ * Configure the Rx unit of the MAC after a reset.
+ **/
+
+static void
+ixgb_configure_rx(struct ixgb_adapter *adapter)
+{
+       u64 rdba = adapter->rx_ring.dma;
+       u32 rdlen = adapter->rx_ring.count * sizeof(struct ixgb_rx_desc);
+       struct ixgb_hw *hw = &adapter->hw;
+       u32 rctl;
+       u32 rxcsum;
+
+       /* make sure receives are disabled while setting up the descriptors */
+
+       rctl = IXGB_READ_REG(hw, RCTL);
+       IXGB_WRITE_REG(hw, RCTL, rctl & ~IXGB_RCTL_RXEN);
+
+       /* set the Receive Delay Timer Register */
+
+       IXGB_WRITE_REG(hw, RDTR, adapter->rx_int_delay);
+
+       /* Setup the Base and Length of the Rx Descriptor Ring */
+
+       IXGB_WRITE_REG(hw, RDBAL, (rdba & 0x00000000ffffffffULL));
+       IXGB_WRITE_REG(hw, RDBAH, (rdba >> 32));
+
+       IXGB_WRITE_REG(hw, RDLEN, rdlen);
+
+       /* Setup the HW Rx Head and Tail Descriptor Pointers */
+       IXGB_WRITE_REG(hw, RDH, 0);
+       IXGB_WRITE_REG(hw, RDT, 0);
+
+       /* due to the hardware errata with RXDCTL, we are unable to use any of
+        * the performance enhancing features of it without causing other
+        * subtle bugs, some of the bugs could include receive length
+        * corruption at high data rates (WTHRESH > 0) and/or receive
+        * descriptor ring irregularites (particularly in hardware cache) */
+       IXGB_WRITE_REG(hw, RXDCTL, 0);
+
+       /* Enable Receive Checksum Offload for TCP and UDP */
+       if (adapter->rx_csum) {
+               rxcsum = IXGB_READ_REG(hw, RXCSUM);
+               rxcsum |= IXGB_RXCSUM_TUOFL;
+               IXGB_WRITE_REG(hw, RXCSUM, rxcsum);
+       }
+
+       /* Enable Receives */
+
+       IXGB_WRITE_REG(hw, RCTL, rctl);
+}
+
+/**
+ * ixgb_free_tx_resources - Free Tx Resources
+ * @adapter: board private structure
+ *
+ * Free all transmit software resources
+ **/
+
+void
+ixgb_free_tx_resources(struct ixgb_adapter *adapter)
+{
+       struct pci_dev *pdev = adapter->pdev;
+
+       ixgb_clean_tx_ring(adapter);
+
+       vfree(adapter->tx_ring.buffer_info);
+       adapter->tx_ring.buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, adapter->tx_ring.size,
+                         adapter->tx_ring.desc, adapter->tx_ring.dma);
+
+       adapter->tx_ring.desc = NULL;
+}
+
+static void
+ixgb_unmap_and_free_tx_resource(struct ixgb_adapter *adapter,
+                                struct ixgb_buffer *buffer_info)
+{
+       if (buffer_info->dma) {
+               if (buffer_info->mapped_as_page)
+                       dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
+                                      buffer_info->length, DMA_TO_DEVICE);
+               else
+                       dma_unmap_single(&adapter->pdev->dev, buffer_info->dma,
+                                        buffer_info->length, DMA_TO_DEVICE);
+               buffer_info->dma = 0;
+       }
+
+       if (buffer_info->skb) {
+               dev_kfree_skb_any(buffer_info->skb);
+               buffer_info->skb = NULL;
+       }
+       buffer_info->time_stamp = 0;
+       /* these fields must always be initialized in tx
+        * buffer_info->length = 0;
+        * buffer_info->next_to_watch = 0; */
+}
+
+/**
+ * ixgb_clean_tx_ring - Free Tx Buffers
+ * @adapter: board private structure
+ **/
+
+static void
+ixgb_clean_tx_ring(struct ixgb_adapter *adapter)
+{
+       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+       struct ixgb_buffer *buffer_info;
+       unsigned long size;
+       unsigned int i;
+
+       /* Free all the Tx ring sk_buffs */
+
+       for (i = 0; i < tx_ring->count; i++) {
+               buffer_info = &tx_ring->buffer_info[i];
+               ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
+       }
+
+       size = sizeof(struct ixgb_buffer) * tx_ring->count;
+       memset(tx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+
+       memset(tx_ring->desc, 0, tx_ring->size);
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+
+       IXGB_WRITE_REG(&adapter->hw, TDH, 0);
+       IXGB_WRITE_REG(&adapter->hw, TDT, 0);
+}
+
+/**
+ * ixgb_free_rx_resources - Free Rx Resources
+ * @adapter: board private structure
+ *
+ * Free all receive software resources
+ **/
+
+void
+ixgb_free_rx_resources(struct ixgb_adapter *adapter)
+{
+       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+
+       ixgb_clean_rx_ring(adapter);
+
+       vfree(rx_ring->buffer_info);
+       rx_ring->buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
+                         rx_ring->dma);
+
+       rx_ring->desc = NULL;
+}
+
+/**
+ * ixgb_clean_rx_ring - Free Rx Buffers
+ * @adapter: board private structure
+ **/
+
+static void
+ixgb_clean_rx_ring(struct ixgb_adapter *adapter)
+{
+       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+       struct ixgb_buffer *buffer_info;
+       struct pci_dev *pdev = adapter->pdev;
+       unsigned long size;
+       unsigned int i;
+
+       /* Free all the Rx ring sk_buffs */
+
+       for (i = 0; i < rx_ring->count; i++) {
+               buffer_info = &rx_ring->buffer_info[i];
+               if (buffer_info->dma) {
+                       dma_unmap_single(&pdev->dev,
+                                        buffer_info->dma,
+                                        buffer_info->length,
+                                        DMA_FROM_DEVICE);
+                       buffer_info->dma = 0;
+                       buffer_info->length = 0;
+               }
+
+               if (buffer_info->skb) {
+                       dev_kfree_skb(buffer_info->skb);
+                       buffer_info->skb = NULL;
+               }
+       }
+
+       size = sizeof(struct ixgb_buffer) * rx_ring->count;
+       memset(rx_ring->buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+
+       memset(rx_ring->desc, 0, rx_ring->size);
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       IXGB_WRITE_REG(&adapter->hw, RDH, 0);
+       IXGB_WRITE_REG(&adapter->hw, RDT, 0);
+}
+
+/**
+ * ixgb_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int
+ixgb_set_mac(struct net_device *netdev, void *p)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+
+       ixgb_rar_set(&adapter->hw, addr->sa_data, 0);
+
+       return 0;
+}
+
+/**
+ * ixgb_set_multi - Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_multi entry point is called whenever the multicast address
+ * list or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper multicast,
+ * promiscuous mode, and all-multi behavior.
+ **/
+
+static void
+ixgb_set_multi(struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_hw *hw = &adapter->hw;
+       struct netdev_hw_addr *ha;
+       u32 rctl;
+       int i;
+
+       /* Check for Promiscuous and All Multicast modes */
+
+       rctl = IXGB_READ_REG(hw, RCTL);
+
+       if (netdev->flags & IFF_PROMISC) {
+               rctl |= (IXGB_RCTL_UPE | IXGB_RCTL_MPE);
+               /* disable VLAN filtering */
+               rctl &= ~IXGB_RCTL_CFIEN;
+               rctl &= ~IXGB_RCTL_VFE;
+       } else {
+               if (netdev->flags & IFF_ALLMULTI) {
+                       rctl |= IXGB_RCTL_MPE;
+                       rctl &= ~IXGB_RCTL_UPE;
+               } else {
+                       rctl &= ~(IXGB_RCTL_UPE | IXGB_RCTL_MPE);
+               }
+               /* enable VLAN filtering */
+               rctl |= IXGB_RCTL_VFE;
+               rctl &= ~IXGB_RCTL_CFIEN;
+       }
+
+       if (netdev_mc_count(netdev) > IXGB_MAX_NUM_MULTICAST_ADDRESSES) {
+               rctl |= IXGB_RCTL_MPE;
+               IXGB_WRITE_REG(hw, RCTL, rctl);
+       } else {
+               u8 mta[IXGB_MAX_NUM_MULTICAST_ADDRESSES *
+                           IXGB_ETH_LENGTH_OF_ADDRESS];
+
+               IXGB_WRITE_REG(hw, RCTL, rctl);
+
+               i = 0;
+               netdev_for_each_mc_addr(ha, netdev)
+                       memcpy(&mta[i++ * IXGB_ETH_LENGTH_OF_ADDRESS],
+                              ha->addr, IXGB_ETH_LENGTH_OF_ADDRESS);
+
+               ixgb_mc_addr_list_update(hw, mta, netdev_mc_count(netdev), 0);
+       }
+
+       if (netdev->features & NETIF_F_HW_VLAN_RX)
+               ixgb_vlan_strip_enable(adapter);
+       else
+               ixgb_vlan_strip_disable(adapter);
+
+}
+
+/**
+ * ixgb_watchdog - Timer Call-back
+ * @data: pointer to netdev cast into an unsigned long
+ **/
+
+static void
+ixgb_watchdog(unsigned long data)
+{
+       struct ixgb_adapter *adapter = (struct ixgb_adapter *)data;
+       struct net_device *netdev = adapter->netdev;
+       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
+
+       ixgb_check_for_link(&adapter->hw);
+
+       if (ixgb_check_for_bad_link(&adapter->hw)) {
+               /* force the reset path */
+               netif_stop_queue(netdev);
+       }
+
+       if (adapter->hw.link_up) {
+               if (!netif_carrier_ok(netdev)) {
+                       netdev_info(netdev,
+                                   "NIC Link is Up 10 Gbps Full Duplex, Flow Control: %s\n",
+                                   (adapter->hw.fc.type == ixgb_fc_full) ?
+                                   "RX/TX" :
+                                   (adapter->hw.fc.type == ixgb_fc_rx_pause) ?
+                                    "RX" :
+                                   (adapter->hw.fc.type == ixgb_fc_tx_pause) ?
+                                   "TX" : "None");
+                       adapter->link_speed = 10000;
+                       adapter->link_duplex = FULL_DUPLEX;
+                       netif_carrier_on(netdev);
+               }
+       } else {
+               if (netif_carrier_ok(netdev)) {
+                       adapter->link_speed = 0;
+                       adapter->link_duplex = 0;
+                       netdev_info(netdev, "NIC Link is Down\n");
+                       netif_carrier_off(netdev);
+               }
+       }
+
+       ixgb_update_stats(adapter);
+
+       if (!netif_carrier_ok(netdev)) {
+               if (IXGB_DESC_UNUSED(txdr) + 1 < txdr->count) {
+                       /* We've lost link, so the controller stops DMA,
+                        * but we've got queued Tx work that's never going
+                        * to get done, so reset controller to flush Tx.
+                        * (Do the reset outside of interrupt context). */
+                       schedule_work(&adapter->tx_timeout_task);
+                       /* return immediately since reset is imminent */
+                       return;
+               }
+       }
+
+       /* Force detection of hung controller every watchdog period */
+       adapter->detect_tx_hung = true;
+
+       /* generate an interrupt to force clean up of any stragglers */
+       IXGB_WRITE_REG(&adapter->hw, ICS, IXGB_INT_TXDW);
+
+       /* Reset the timer */
+       mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+}
+
+#define IXGB_TX_FLAGS_CSUM             0x00000001
+#define IXGB_TX_FLAGS_VLAN             0x00000002
+#define IXGB_TX_FLAGS_TSO              0x00000004
+
+static int
+ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
+{
+       struct ixgb_context_desc *context_desc;
+       unsigned int i;
+       u8 ipcss, ipcso, tucss, tucso, hdr_len;
+       u16 ipcse, tucse, mss;
+       int err;
+
+       if (likely(skb_is_gso(skb))) {
+               struct ixgb_buffer *buffer_info;
+               struct iphdr *iph;
+
+               if (skb_header_cloned(skb)) {
+                       err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+                       if (err)
+                               return err;
+               }
+
+               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+               mss = skb_shinfo(skb)->gso_size;
+               iph = ip_hdr(skb);
+               iph->tot_len = 0;
+               iph->check = 0;
+               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                        iph->daddr, 0,
+                                                        IPPROTO_TCP, 0);
+               ipcss = skb_network_offset(skb);
+               ipcso = (void *)&(iph->check) - (void *)skb->data;
+               ipcse = skb_transport_offset(skb) - 1;
+               tucss = skb_transport_offset(skb);
+               tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
+               tucse = 0;
+
+               i = adapter->tx_ring.next_to_use;
+               context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
+               buffer_info = &adapter->tx_ring.buffer_info[i];
+               WARN_ON(buffer_info->dma != 0);
+
+               context_desc->ipcss = ipcss;
+               context_desc->ipcso = ipcso;
+               context_desc->ipcse = cpu_to_le16(ipcse);
+               context_desc->tucss = tucss;
+               context_desc->tucso = tucso;
+               context_desc->tucse = cpu_to_le16(tucse);
+               context_desc->mss = cpu_to_le16(mss);
+               context_desc->hdr_len = hdr_len;
+               context_desc->status = 0;
+               context_desc->cmd_type_len = cpu_to_le32(
+                                                 IXGB_CONTEXT_DESC_TYPE
+                                               | IXGB_CONTEXT_DESC_CMD_TSE
+                                               | IXGB_CONTEXT_DESC_CMD_IP
+                                               | IXGB_CONTEXT_DESC_CMD_TCP
+                                               | IXGB_CONTEXT_DESC_CMD_IDE
+                                               | (skb->len - (hdr_len)));
+
+
+               if (++i == adapter->tx_ring.count) i = 0;
+               adapter->tx_ring.next_to_use = i;
+
+               return 1;
+       }
+
+       return 0;
+}
+
+static bool
+ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
+{
+       struct ixgb_context_desc *context_desc;
+       unsigned int i;
+       u8 css, cso;
+
+       if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
+               struct ixgb_buffer *buffer_info;
+               css = skb_checksum_start_offset(skb);
+               cso = css + skb->csum_offset;
+
+               i = adapter->tx_ring.next_to_use;
+               context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
+               buffer_info = &adapter->tx_ring.buffer_info[i];
+               WARN_ON(buffer_info->dma != 0);
+
+               context_desc->tucss = css;
+               context_desc->tucso = cso;
+               context_desc->tucse = 0;
+               /* zero out any previously existing data in one instruction */
+               *(u32 *)&(context_desc->ipcss) = 0;
+               context_desc->status = 0;
+               context_desc->hdr_len = 0;
+               context_desc->mss = 0;
+               context_desc->cmd_type_len =
+                       cpu_to_le32(IXGB_CONTEXT_DESC_TYPE
+                                   | IXGB_TX_DESC_CMD_IDE);
+
+               if (++i == adapter->tx_ring.count) i = 0;
+               adapter->tx_ring.next_to_use = i;
+
+               return true;
+       }
+
+       return false;
+}
+
+#define IXGB_MAX_TXD_PWR       14
+#define IXGB_MAX_DATA_PER_TXD  (1<<IXGB_MAX_TXD_PWR)
+
+static int
+ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
+           unsigned int first)
+{
+       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+       struct pci_dev *pdev = adapter->pdev;
+       struct ixgb_buffer *buffer_info;
+       int len = skb_headlen(skb);
+       unsigned int offset = 0, size, count = 0, i;
+       unsigned int mss = skb_shinfo(skb)->gso_size;
+       unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
+       unsigned int f;
+
+       i = tx_ring->next_to_use;
+
+       while (len) {
+               buffer_info = &tx_ring->buffer_info[i];
+               size = min(len, IXGB_MAX_DATA_PER_TXD);
+               /* Workaround for premature desc write-backs
+                * in TSO mode.  Append 4-byte sentinel desc */
+               if (unlikely(mss && !nr_frags && size == len && size > 8))
+                       size -= 4;
+
+               buffer_info->length = size;
+               WARN_ON(buffer_info->dma != 0);
+               buffer_info->time_stamp = jiffies;
+               buffer_info->mapped_as_page = false;
+               buffer_info->dma = dma_map_single(&pdev->dev,
+                                                 skb->data + offset,
+                                                 size, DMA_TO_DEVICE);
+               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                       goto dma_error;
+               buffer_info->next_to_watch = 0;
+
+               len -= size;
+               offset += size;
+               count++;
+               if (len) {
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+       }
+
+       for (f = 0; f < nr_frags; f++) {
+               struct skb_frag_struct *frag;
+
+               frag = &skb_shinfo(skb)->frags[f];
+               len = frag->size;
+               offset = frag->page_offset;
+
+               while (len) {
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+
+                       buffer_info = &tx_ring->buffer_info[i];
+                       size = min(len, IXGB_MAX_DATA_PER_TXD);
+
+                       /* Workaround for premature desc write-backs
+                        * in TSO mode.  Append 4-byte sentinel desc */
+                       if (unlikely(mss && (f == (nr_frags - 1))
+                                    && size == len && size > 8))
+                               size -= 4;
+
+                       buffer_info->length = size;
+                       buffer_info->time_stamp = jiffies;
+                       buffer_info->mapped_as_page = true;
+                       buffer_info->dma =
+                               dma_map_page(&pdev->dev, frag->page,
+                                            offset, size, DMA_TO_DEVICE);
+                       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
+                               goto dma_error;
+                       buffer_info->next_to_watch = 0;
+
+                       len -= size;
+                       offset += size;
+                       count++;
+               }
+       }
+       tx_ring->buffer_info[i].skb = skb;
+       tx_ring->buffer_info[first].next_to_watch = i;
+
+       return count;
+
+dma_error:
+       dev_err(&pdev->dev, "TX DMA map failed\n");
+       buffer_info->dma = 0;
+       if (count)
+               count--;
+
+       while (count--) {
+               if (i==0)
+                       i += tx_ring->count;
+               i--;
+               buffer_info = &tx_ring->buffer_info[i];
+               ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
+       }
+
+       return 0;
+}
+
+static void
+ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags)
+{
+       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+       struct ixgb_tx_desc *tx_desc = NULL;
+       struct ixgb_buffer *buffer_info;
+       u32 cmd_type_len = adapter->tx_cmd_type;
+       u8 status = 0;
+       u8 popts = 0;
+       unsigned int i;
+
+       if (tx_flags & IXGB_TX_FLAGS_TSO) {
+               cmd_type_len |= IXGB_TX_DESC_CMD_TSE;
+               popts |= (IXGB_TX_DESC_POPTS_IXSM | IXGB_TX_DESC_POPTS_TXSM);
+       }
+
+       if (tx_flags & IXGB_TX_FLAGS_CSUM)
+               popts |= IXGB_TX_DESC_POPTS_TXSM;
+
+       if (tx_flags & IXGB_TX_FLAGS_VLAN)
+               cmd_type_len |= IXGB_TX_DESC_CMD_VLE;
+
+       i = tx_ring->next_to_use;
+
+       while (count--) {
+               buffer_info = &tx_ring->buffer_info[i];
+               tx_desc = IXGB_TX_DESC(*tx_ring, i);
+               tx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
+               tx_desc->cmd_type_len =
+                       cpu_to_le32(cmd_type_len | buffer_info->length);
+               tx_desc->status = status;
+               tx_desc->popts = popts;
+               tx_desc->vlan = cpu_to_le16(vlan_id);
+
+               if (++i == tx_ring->count) i = 0;
+       }
+
+       tx_desc->cmd_type_len |=
+               cpu_to_le32(IXGB_TX_DESC_CMD_EOP | IXGB_TX_DESC_CMD_RS);
+
+       /* Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64). */
+       wmb();
+
+       tx_ring->next_to_use = i;
+       IXGB_WRITE_REG(&adapter->hw, TDT, i);
+}
+
+static int __ixgb_maybe_stop_tx(struct net_device *netdev, int size)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+
+       netif_stop_queue(netdev);
+       /* Herbert's original patch had:
+        *  smp_mb__after_netif_stop_queue();
+        * but since that doesn't exist yet, just open code it. */
+       smp_mb();
+
+       /* We need to check again in a case another CPU has just
+        * made room available. */
+       if (likely(IXGB_DESC_UNUSED(tx_ring) < size))
+               return -EBUSY;
+
+       /* A reprieve! */
+       netif_start_queue(netdev);
+       ++adapter->restart_queue;
+       return 0;
+}
+
+static int ixgb_maybe_stop_tx(struct net_device *netdev,
+                              struct ixgb_desc_ring *tx_ring, int size)
+{
+       if (likely(IXGB_DESC_UNUSED(tx_ring) >= size))
+               return 0;
+       return __ixgb_maybe_stop_tx(netdev, size);
+}
+
+
+/* Tx Descriptors needed, worst case */
+#define TXD_USE_COUNT(S) (((S) >> IXGB_MAX_TXD_PWR) + \
+                        (((S) & (IXGB_MAX_DATA_PER_TXD - 1)) ? 1 : 0))
+#define DESC_NEEDED TXD_USE_COUNT(IXGB_MAX_DATA_PER_TXD) /* skb->date */ + \
+       MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1 /* for context */ \
+       + 1 /* one more needed for sentinel TSO workaround */
+
+static netdev_tx_t
+ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       unsigned int first;
+       unsigned int tx_flags = 0;
+       int vlan_id = 0;
+       int count = 0;
+       int tso;
+
+       if (test_bit(__IXGB_DOWN, &adapter->flags)) {
+               dev_kfree_skb(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (skb->len <= 0) {
+               dev_kfree_skb(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (unlikely(ixgb_maybe_stop_tx(netdev, &adapter->tx_ring,
+                     DESC_NEEDED)))
+               return NETDEV_TX_BUSY;
+
+       if (vlan_tx_tag_present(skb)) {
+               tx_flags |= IXGB_TX_FLAGS_VLAN;
+               vlan_id = vlan_tx_tag_get(skb);
+       }
+
+       first = adapter->tx_ring.next_to_use;
+
+       tso = ixgb_tso(adapter, skb);
+       if (tso < 0) {
+               dev_kfree_skb(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (likely(tso))
+               tx_flags |= IXGB_TX_FLAGS_TSO;
+       else if (ixgb_tx_csum(adapter, skb))
+               tx_flags |= IXGB_TX_FLAGS_CSUM;
+
+       count = ixgb_tx_map(adapter, skb, first);
+
+       if (count) {
+               ixgb_tx_queue(adapter, count, vlan_id, tx_flags);
+               /* Make sure there is space in the ring for the next send. */
+               ixgb_maybe_stop_tx(netdev, &adapter->tx_ring, DESC_NEEDED);
+
+       } else {
+               dev_kfree_skb_any(skb);
+               adapter->tx_ring.buffer_info[first].time_stamp = 0;
+               adapter->tx_ring.next_to_use = first;
+       }
+
+       return NETDEV_TX_OK;
+}
+
+/**
+ * ixgb_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+
+static void
+ixgb_tx_timeout(struct net_device *netdev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       /* Do the reset outside of interrupt context */
+       schedule_work(&adapter->tx_timeout_task);
+}
+
+static void
+ixgb_tx_timeout_task(struct work_struct *work)
+{
+       struct ixgb_adapter *adapter =
+               container_of(work, struct ixgb_adapter, tx_timeout_task);
+
+       adapter->tx_timeout_count++;
+       ixgb_down(adapter, true);
+       ixgb_up(adapter);
+}
+
+/**
+ * ixgb_get_stats - Get System Network Statistics
+ * @netdev: network interface device structure
+ *
+ * Returns the address of the device statistics structure.
+ * The statistics are actually updated from the timer callback.
+ **/
+
+static struct net_device_stats *
+ixgb_get_stats(struct net_device *netdev)
+{
+       return &netdev->stats;
+}
+
+/**
+ * ixgb_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+
+static int
+ixgb_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       int max_frame = new_mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+       int old_max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+
+       /* MTU < 68 is an error for IPv4 traffic, just don't allow it */
+       if ((new_mtu < 68) ||
+           (max_frame > IXGB_MAX_JUMBO_FRAME_SIZE + ENET_FCS_LENGTH)) {
+               netif_err(adapter, probe, adapter->netdev,
+                         "Invalid MTU setting %d\n", new_mtu);
+               return -EINVAL;
+       }
+
+       if (old_max_frame == max_frame)
+               return 0;
+
+       if (netif_running(netdev))
+               ixgb_down(adapter, true);
+
+       adapter->rx_buffer_len = max_frame + 8; /* + 8 for errata */
+
+       netdev->mtu = new_mtu;
+
+       if (netif_running(netdev))
+               ixgb_up(adapter);
+
+       return 0;
+}
+
+/**
+ * ixgb_update_stats - Update the board statistics counters.
+ * @adapter: board private structure
+ **/
+
+void
+ixgb_update_stats(struct ixgb_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+
+       /* Prevent stats update while adapter is being reset */
+       if (pci_channel_offline(pdev))
+               return;
+
+       if ((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||
+          (netdev_mc_count(netdev) > IXGB_MAX_NUM_MULTICAST_ADDRESSES)) {
+               u64 multi = IXGB_READ_REG(&adapter->hw, MPRCL);
+               u32 bcast_l = IXGB_READ_REG(&adapter->hw, BPRCL);
+               u32 bcast_h = IXGB_READ_REG(&adapter->hw, BPRCH);
+               u64 bcast = ((u64)bcast_h << 32) | bcast_l;
+
+               multi |= ((u64)IXGB_READ_REG(&adapter->hw, MPRCH) << 32);
+               /* fix up multicast stats by removing broadcasts */
+               if (multi >= bcast)
+                       multi -= bcast;
+
+               adapter->stats.mprcl += (multi & 0xFFFFFFFF);
+               adapter->stats.mprch += (multi >> 32);
+               adapter->stats.bprcl += bcast_l;
+               adapter->stats.bprch += bcast_h;
+       } else {
+               adapter->stats.mprcl += IXGB_READ_REG(&adapter->hw, MPRCL);
+               adapter->stats.mprch += IXGB_READ_REG(&adapter->hw, MPRCH);
+               adapter->stats.bprcl += IXGB_READ_REG(&adapter->hw, BPRCL);
+               adapter->stats.bprch += IXGB_READ_REG(&adapter->hw, BPRCH);
+       }
+       adapter->stats.tprl += IXGB_READ_REG(&adapter->hw, TPRL);
+       adapter->stats.tprh += IXGB_READ_REG(&adapter->hw, TPRH);
+       adapter->stats.gprcl += IXGB_READ_REG(&adapter->hw, GPRCL);
+       adapter->stats.gprch += IXGB_READ_REG(&adapter->hw, GPRCH);
+       adapter->stats.uprcl += IXGB_READ_REG(&adapter->hw, UPRCL);
+       adapter->stats.uprch += IXGB_READ_REG(&adapter->hw, UPRCH);
+       adapter->stats.vprcl += IXGB_READ_REG(&adapter->hw, VPRCL);
+       adapter->stats.vprch += IXGB_READ_REG(&adapter->hw, VPRCH);
+       adapter->stats.jprcl += IXGB_READ_REG(&adapter->hw, JPRCL);
+       adapter->stats.jprch += IXGB_READ_REG(&adapter->hw, JPRCH);
+       adapter->stats.gorcl += IXGB_READ_REG(&adapter->hw, GORCL);
+       adapter->stats.gorch += IXGB_READ_REG(&adapter->hw, GORCH);
+       adapter->stats.torl += IXGB_READ_REG(&adapter->hw, TORL);
+       adapter->stats.torh += IXGB_READ_REG(&adapter->hw, TORH);
+       adapter->stats.rnbc += IXGB_READ_REG(&adapter->hw, RNBC);
+       adapter->stats.ruc += IXGB_READ_REG(&adapter->hw, RUC);
+       adapter->stats.roc += IXGB_READ_REG(&adapter->hw, ROC);
+       adapter->stats.rlec += IXGB_READ_REG(&adapter->hw, RLEC);
+       adapter->stats.crcerrs += IXGB_READ_REG(&adapter->hw, CRCERRS);
+       adapter->stats.icbc += IXGB_READ_REG(&adapter->hw, ICBC);
+       adapter->stats.ecbc += IXGB_READ_REG(&adapter->hw, ECBC);
+       adapter->stats.mpc += IXGB_READ_REG(&adapter->hw, MPC);
+       adapter->stats.tptl += IXGB_READ_REG(&adapter->hw, TPTL);
+       adapter->stats.tpth += IXGB_READ_REG(&adapter->hw, TPTH);
+       adapter->stats.gptcl += IXGB_READ_REG(&adapter->hw, GPTCL);
+       adapter->stats.gptch += IXGB_READ_REG(&adapter->hw, GPTCH);
+       adapter->stats.bptcl += IXGB_READ_REG(&adapter->hw, BPTCL);
+       adapter->stats.bptch += IXGB_READ_REG(&adapter->hw, BPTCH);
+       adapter->stats.mptcl += IXGB_READ_REG(&adapter->hw, MPTCL);
+       adapter->stats.mptch += IXGB_READ_REG(&adapter->hw, MPTCH);
+       adapter->stats.uptcl += IXGB_READ_REG(&adapter->hw, UPTCL);
+       adapter->stats.uptch += IXGB_READ_REG(&adapter->hw, UPTCH);
+       adapter->stats.vptcl += IXGB_READ_REG(&adapter->hw, VPTCL);
+       adapter->stats.vptch += IXGB_READ_REG(&adapter->hw, VPTCH);
+       adapter->stats.jptcl += IXGB_READ_REG(&adapter->hw, JPTCL);
+       adapter->stats.jptch += IXGB_READ_REG(&adapter->hw, JPTCH);
+       adapter->stats.gotcl += IXGB_READ_REG(&adapter->hw, GOTCL);
+       adapter->stats.gotch += IXGB_READ_REG(&adapter->hw, GOTCH);
+       adapter->stats.totl += IXGB_READ_REG(&adapter->hw, TOTL);
+       adapter->stats.toth += IXGB_READ_REG(&adapter->hw, TOTH);
+       adapter->stats.dc += IXGB_READ_REG(&adapter->hw, DC);
+       adapter->stats.plt64c += IXGB_READ_REG(&adapter->hw, PLT64C);
+       adapter->stats.tsctc += IXGB_READ_REG(&adapter->hw, TSCTC);
+       adapter->stats.tsctfc += IXGB_READ_REG(&adapter->hw, TSCTFC);
+       adapter->stats.ibic += IXGB_READ_REG(&adapter->hw, IBIC);
+       adapter->stats.rfc += IXGB_READ_REG(&adapter->hw, RFC);
+       adapter->stats.lfc += IXGB_READ_REG(&adapter->hw, LFC);
+       adapter->stats.pfrc += IXGB_READ_REG(&adapter->hw, PFRC);
+       adapter->stats.pftc += IXGB_READ_REG(&adapter->hw, PFTC);
+       adapter->stats.mcfrc += IXGB_READ_REG(&adapter->hw, MCFRC);
+       adapter->stats.mcftc += IXGB_READ_REG(&adapter->hw, MCFTC);
+       adapter->stats.xonrxc += IXGB_READ_REG(&adapter->hw, XONRXC);
+       adapter->stats.xontxc += IXGB_READ_REG(&adapter->hw, XONTXC);
+       adapter->stats.xoffrxc += IXGB_READ_REG(&adapter->hw, XOFFRXC);
+       adapter->stats.xofftxc += IXGB_READ_REG(&adapter->hw, XOFFTXC);
+       adapter->stats.rjc += IXGB_READ_REG(&adapter->hw, RJC);
+
+       /* Fill out the OS statistics structure */
+
+       netdev->stats.rx_packets = adapter->stats.gprcl;
+       netdev->stats.tx_packets = adapter->stats.gptcl;
+       netdev->stats.rx_bytes = adapter->stats.gorcl;
+       netdev->stats.tx_bytes = adapter->stats.gotcl;
+       netdev->stats.multicast = adapter->stats.mprcl;
+       netdev->stats.collisions = 0;
+
+       /* ignore RLEC as it reports errors for padded (<64bytes) frames
+        * with a length in the type/len field */
+       netdev->stats.rx_errors =
+           /* adapter->stats.rnbc + */ adapter->stats.crcerrs +
+           adapter->stats.ruc +
+           adapter->stats.roc /*+ adapter->stats.rlec */  +
+           adapter->stats.icbc +
+           adapter->stats.ecbc + adapter->stats.mpc;
+
+       /* see above
+        * netdev->stats.rx_length_errors = adapter->stats.rlec;
+        */
+
+       netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
+       netdev->stats.rx_fifo_errors = adapter->stats.mpc;
+       netdev->stats.rx_missed_errors = adapter->stats.mpc;
+       netdev->stats.rx_over_errors = adapter->stats.mpc;
+
+       netdev->stats.tx_errors = 0;
+       netdev->stats.rx_frame_errors = 0;
+       netdev->stats.tx_aborted_errors = 0;
+       netdev->stats.tx_carrier_errors = 0;
+       netdev->stats.tx_fifo_errors = 0;
+       netdev->stats.tx_heartbeat_errors = 0;
+       netdev->stats.tx_window_errors = 0;
+}
+
+#define IXGB_MAX_INTR 10
+/**
+ * ixgb_intr - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+
+static irqreturn_t
+ixgb_intr(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       struct ixgb_hw *hw = &adapter->hw;
+       u32 icr = IXGB_READ_REG(hw, ICR);
+
+       if (unlikely(!icr))
+               return IRQ_NONE;  /* Not our interrupt */
+
+       if (unlikely(icr & (IXGB_INT_RXSEQ | IXGB_INT_LSC)))
+               if (!test_bit(__IXGB_DOWN, &adapter->flags))
+                       mod_timer(&adapter->watchdog_timer, jiffies);
+
+       if (napi_schedule_prep(&adapter->napi)) {
+
+               /* Disable interrupts and register for poll. The flush
+                 of the posted write is intentionally left out.
+               */
+
+               IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
+               __napi_schedule(&adapter->napi);
+       }
+       return IRQ_HANDLED;
+}
+
+/**
+ * ixgb_clean - NAPI Rx polling callback
+ * @adapter: board private structure
+ **/
+
+static int
+ixgb_clean(struct napi_struct *napi, int budget)
+{
+       struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi);
+       int work_done = 0;
+
+       ixgb_clean_tx_irq(adapter);
+       ixgb_clean_rx_irq(adapter, &work_done, budget);
+
+       /* If budget not fully consumed, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               if (!test_bit(__IXGB_DOWN, &adapter->flags))
+                       ixgb_irq_enable(adapter);
+       }
+
+       return work_done;
+}
+
+/**
+ * ixgb_clean_tx_irq - Reclaim resources after transmit completes
+ * @adapter: board private structure
+ **/
+
+static bool
+ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
+{
+       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+       struct net_device *netdev = adapter->netdev;
+       struct ixgb_tx_desc *tx_desc, *eop_desc;
+       struct ixgb_buffer *buffer_info;
+       unsigned int i, eop;
+       bool cleaned = false;
+
+       i = tx_ring->next_to_clean;
+       eop = tx_ring->buffer_info[i].next_to_watch;
+       eop_desc = IXGB_TX_DESC(*tx_ring, eop);
+
+       while (eop_desc->status & IXGB_TX_DESC_STATUS_DD) {
+
+               rmb(); /* read buffer_info after eop_desc */
+               for (cleaned = false; !cleaned; ) {
+                       tx_desc = IXGB_TX_DESC(*tx_ring, i);
+                       buffer_info = &tx_ring->buffer_info[i];
+
+                       if (tx_desc->popts &
+                          (IXGB_TX_DESC_POPTS_TXSM |
+                           IXGB_TX_DESC_POPTS_IXSM))
+                               adapter->hw_csum_tx_good++;
+
+                       ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
+
+                       *(u32 *)&(tx_desc->status) = 0;
+
+                       cleaned = (i == eop);
+                       if (++i == tx_ring->count) i = 0;
+               }
+
+               eop = tx_ring->buffer_info[i].next_to_watch;
+               eop_desc = IXGB_TX_DESC(*tx_ring, eop);
+       }
+
+       tx_ring->next_to_clean = i;
+
+       if (unlikely(cleaned && netif_carrier_ok(netdev) &&
+                    IXGB_DESC_UNUSED(tx_ring) >= DESC_NEEDED)) {
+               /* Make sure that anybody stopping the queue after this
+                * sees the new next_to_clean. */
+               smp_mb();
+
+               if (netif_queue_stopped(netdev) &&
+                   !(test_bit(__IXGB_DOWN, &adapter->flags))) {
+                       netif_wake_queue(netdev);
+                       ++adapter->restart_queue;
+               }
+       }
+
+       if (adapter->detect_tx_hung) {
+               /* detect a transmit hang in hardware, this serializes the
+                * check with the clearing of time_stamp and movement of i */
+               adapter->detect_tx_hung = false;
+               if (tx_ring->buffer_info[eop].time_stamp &&
+                  time_after(jiffies, tx_ring->buffer_info[eop].time_stamp + HZ)
+                  && !(IXGB_READ_REG(&adapter->hw, STATUS) &
+                       IXGB_STATUS_TXOFF)) {
+                       /* detected Tx unit hang */
+                       netif_err(adapter, drv, adapter->netdev,
+                                 "Detected Tx Unit Hang\n"
+                                 "  TDH                  <%x>\n"
+                                 "  TDT                  <%x>\n"
+                                 "  next_to_use          <%x>\n"
+                                 "  next_to_clean        <%x>\n"
+                                 "buffer_info[next_to_clean]\n"
+                                 "  time_stamp           <%lx>\n"
+                                 "  next_to_watch        <%x>\n"
+                                 "  jiffies              <%lx>\n"
+                                 "  next_to_watch.status <%x>\n",
+                                 IXGB_READ_REG(&adapter->hw, TDH),
+                                 IXGB_READ_REG(&adapter->hw, TDT),
+                                 tx_ring->next_to_use,
+                                 tx_ring->next_to_clean,
+                                 tx_ring->buffer_info[eop].time_stamp,
+                                 eop,
+                                 jiffies,
+                                 eop_desc->status);
+                       netif_stop_queue(netdev);
+               }
+       }
+
+       return cleaned;
+}
+
+/**
+ * ixgb_rx_checksum - Receive Checksum Offload for 82597.
+ * @adapter: board private structure
+ * @rx_desc: receive descriptor
+ * @sk_buff: socket buffer with received data
+ **/
+
+static void
+ixgb_rx_checksum(struct ixgb_adapter *adapter,
+                 struct ixgb_rx_desc *rx_desc,
+                 struct sk_buff *skb)
+{
+       /* Ignore Checksum bit is set OR
+        * TCP Checksum has not been calculated
+        */
+       if ((rx_desc->status & IXGB_RX_DESC_STATUS_IXSM) ||
+          (!(rx_desc->status & IXGB_RX_DESC_STATUS_TCPCS))) {
+               skb_checksum_none_assert(skb);
+               return;
+       }
+
+       /* At this point we know the hardware did the TCP checksum */
+       /* now look at the TCP checksum error bit */
+       if (rx_desc->errors & IXGB_RX_DESC_ERRORS_TCPE) {
+               /* let the stack verify checksum errors */
+               skb_checksum_none_assert(skb);
+               adapter->hw_csum_rx_error++;
+       } else {
+               /* TCP checksum is good */
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+               adapter->hw_csum_rx_good++;
+       }
+}
+
+/*
+ * this should improve performance for small packets with large amounts
+ * of reassembly being done in the stack
+ */
+static void ixgb_check_copybreak(struct net_device *netdev,
+                                struct ixgb_buffer *buffer_info,
+                                u32 length, struct sk_buff **skb)
+{
+       struct sk_buff *new_skb;
+
+       if (length > copybreak)
+               return;
+
+       new_skb = netdev_alloc_skb_ip_align(netdev, length);
+       if (!new_skb)
+               return;
+
+       skb_copy_to_linear_data_offset(new_skb, -NET_IP_ALIGN,
+                                      (*skb)->data - NET_IP_ALIGN,
+                                      length + NET_IP_ALIGN);
+       /* save the skb in buffer_info as good */
+       buffer_info->skb = *skb;
+       *skb = new_skb;
+}
+
+/**
+ * ixgb_clean_rx_irq - Send received data up the network stack,
+ * @adapter: board private structure
+ **/
+
+static bool
+ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
+{
+       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct ixgb_rx_desc *rx_desc, *next_rxd;
+       struct ixgb_buffer *buffer_info, *next_buffer, *next2_buffer;
+       u32 length;
+       unsigned int i, j;
+       int cleaned_count = 0;
+       bool cleaned = false;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = IXGB_RX_DESC(*rx_ring, i);
+       buffer_info = &rx_ring->buffer_info[i];
+
+       while (rx_desc->status & IXGB_RX_DESC_STATUS_DD) {
+               struct sk_buff *skb;
+               u8 status;
+
+               if (*work_done >= work_to_do)
+                       break;
+
+               (*work_done)++;
+               rmb();  /* read descriptor and rx_buffer_info after status DD */
+               status = rx_desc->status;
+               skb = buffer_info->skb;
+               buffer_info->skb = NULL;
+
+               prefetch(skb->data - NET_IP_ALIGN);
+
+               if (++i == rx_ring->count)
+                       i = 0;
+               next_rxd = IXGB_RX_DESC(*rx_ring, i);
+               prefetch(next_rxd);
+
+               j = i + 1;
+               if (j == rx_ring->count)
+                       j = 0;
+               next2_buffer = &rx_ring->buffer_info[j];
+               prefetch(next2_buffer);
+
+               next_buffer = &rx_ring->buffer_info[i];
+
+               cleaned = true;
+               cleaned_count++;
+
+               dma_unmap_single(&pdev->dev,
+                                buffer_info->dma,
+                                buffer_info->length,
+                                DMA_FROM_DEVICE);
+               buffer_info->dma = 0;
+
+               length = le16_to_cpu(rx_desc->length);
+               rx_desc->length = 0;
+
+               if (unlikely(!(status & IXGB_RX_DESC_STATUS_EOP))) {
+
+                       /* All receives must fit into a single buffer */
+
+                       IXGB_DBG("Receive packet consumed multiple buffers "
+                                        "length<%x>\n", length);
+
+                       dev_kfree_skb_irq(skb);
+                       goto rxdesc_done;
+               }
+
+               if (unlikely(rx_desc->errors &
+                   (IXGB_RX_DESC_ERRORS_CE | IXGB_RX_DESC_ERRORS_SE |
+                    IXGB_RX_DESC_ERRORS_P | IXGB_RX_DESC_ERRORS_RXE))) {
+                       dev_kfree_skb_irq(skb);
+                       goto rxdesc_done;
+               }
+
+               ixgb_check_copybreak(netdev, buffer_info, length, &skb);
+
+               /* Good Receive */
+               skb_put(skb, length);
+
+               /* Receive Checksum Offload */
+               ixgb_rx_checksum(adapter, rx_desc, skb);
+
+               skb->protocol = eth_type_trans(skb, netdev);
+               if (status & IXGB_RX_DESC_STATUS_VP)
+                       __vlan_hwaccel_put_tag(skb,
+                                              le16_to_cpu(rx_desc->special));
+
+               netif_receive_skb(skb);
+
+rxdesc_done:
+               /* clean up descriptor, might be written over by hw */
+               rx_desc->status = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (unlikely(cleaned_count >= IXGB_RX_BUFFER_WRITE)) {
+                       ixgb_alloc_rx_buffers(adapter, cleaned_count);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               buffer_info = next_buffer;
+       }
+
+       rx_ring->next_to_clean = i;
+
+       cleaned_count = IXGB_DESC_UNUSED(rx_ring);
+       if (cleaned_count)
+               ixgb_alloc_rx_buffers(adapter, cleaned_count);
+
+       return cleaned;
+}
+
+/**
+ * ixgb_alloc_rx_buffers - Replace used receive buffers
+ * @adapter: address of board private structure
+ **/
+
+static void
+ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter, int cleaned_count)
+{
+       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+       struct net_device *netdev = adapter->netdev;
+       struct pci_dev *pdev = adapter->pdev;
+       struct ixgb_rx_desc *rx_desc;
+       struct ixgb_buffer *buffer_info;
+       struct sk_buff *skb;
+       unsigned int i;
+       long cleancount;
+
+       i = rx_ring->next_to_use;
+       buffer_info = &rx_ring->buffer_info[i];
+       cleancount = IXGB_DESC_UNUSED(rx_ring);
+
+
+       /* leave three descriptors unused */
+       while (--cleancount > 2 && cleaned_count--) {
+               /* recycle! its good for you */
+               skb = buffer_info->skb;
+               if (skb) {
+                       skb_trim(skb, 0);
+                       goto map_skb;
+               }
+
+               skb = netdev_alloc_skb_ip_align(netdev, adapter->rx_buffer_len);
+               if (unlikely(!skb)) {
+                       /* Better luck next round */
+                       adapter->alloc_rx_buff_failed++;
+                       break;
+               }
+
+               buffer_info->skb = skb;
+               buffer_info->length = adapter->rx_buffer_len;
+map_skb:
+               buffer_info->dma = dma_map_single(&pdev->dev,
+                                                 skb->data,
+                                                 adapter->rx_buffer_len,
+                                                 DMA_FROM_DEVICE);
+
+               rx_desc = IXGB_RX_DESC(*rx_ring, i);
+               rx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
+               /* guarantee DD bit not set now before h/w gets descriptor
+                * this is the rest of the workaround for h/w double
+                * writeback. */
+               rx_desc->status = 0;
+
+
+               if (++i == rx_ring->count) i = 0;
+               buffer_info = &rx_ring->buffer_info[i];
+       }
+
+       if (likely(rx_ring->next_to_use != i)) {
+               rx_ring->next_to_use = i;
+               if (unlikely(i-- == 0))
+                       i = (rx_ring->count - 1);
+
+               /* Force memory writes to complete before letting h/w
+                * know there are new descriptors to fetch.  (Only
+                * applicable for weak-ordered memory model archs, such
+                * as IA-64). */
+               wmb();
+               IXGB_WRITE_REG(&adapter->hw, RDT, i);
+       }
+}
+
+static void
+ixgb_vlan_strip_enable(struct ixgb_adapter *adapter)
+{
+       u32 ctrl;
+
+       /* enable VLAN tag insert/strip */
+       ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
+       ctrl |= IXGB_CTRL0_VME;
+       IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
+}
+
+static void
+ixgb_vlan_strip_disable(struct ixgb_adapter *adapter)
+{
+       u32 ctrl;
+
+       /* disable VLAN tag insert/strip */
+       ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
+       ctrl &= ~IXGB_CTRL0_VME;
+       IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
+}
+
+static void
+ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       u32 vfta, index;
+
+       /* add VID to filter table */
+
+       index = (vid >> 5) & 0x7F;
+       vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
+       vfta |= (1 << (vid & 0x1F));
+       ixgb_write_vfta(&adapter->hw, index, vfta);
+       set_bit(vid, adapter->active_vlans);
+}
+
+static void
+ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+       u32 vfta, index;
+
+       /* remove VID from filter table */
+
+       index = (vid >> 5) & 0x7F;
+       vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
+       vfta &= ~(1 << (vid & 0x1F));
+       ixgb_write_vfta(&adapter->hw, index, vfta);
+       clear_bit(vid, adapter->active_vlans);
+}
+
+static void
+ixgb_restore_vlan(struct ixgb_adapter *adapter)
+{
+       u16 vid;
+
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               ixgb_vlan_rx_add_vid(adapter->netdev, vid);
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+
+static void ixgb_netpoll(struct net_device *dev)
+{
+       struct ixgb_adapter *adapter = netdev_priv(dev);
+
+       disable_irq(adapter->pdev->irq);
+       ixgb_intr(adapter->pdev->irq, dev);
+       enable_irq(adapter->pdev->irq);
+}
+#endif
+
+/**
+ * ixgb_io_error_detected() - called when PCI error is detected
+ * @pdev    pointer to pci device with error
+ * @state   pci channel state after error
+ *
+ * This callback is called by the PCI subsystem whenever
+ * a PCI bus error is detected.
+ */
+static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev,
+                                               enum pci_channel_state state)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       netif_device_detach(netdev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       if (netif_running(netdev))
+               ixgb_down(adapter, true);
+
+       pci_disable_device(pdev);
+
+       /* Request a slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * ixgb_io_slot_reset - called after the pci bus has been reset.
+ * @pdev    pointer to pci device with error
+ *
+ * This callback is called after the PCI bus has been reset.
+ * Basically, this tries to restart the card from scratch.
+ * This is a shortened version of the device probe/discovery code,
+ * it resembles the first-half of the ixgb_probe() routine.
+ */
+static pci_ers_result_t ixgb_io_slot_reset(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       if (pci_enable_device(pdev)) {
+               netif_err(adapter, probe, adapter->netdev,
+                         "Cannot re-enable PCI device after reset\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+
+       /* Perform card reset only on one instance of the card */
+       if (0 != PCI_FUNC (pdev->devfn))
+               return PCI_ERS_RESULT_RECOVERED;
+
+       pci_set_master(pdev);
+
+       netif_carrier_off(netdev);
+       netif_stop_queue(netdev);
+       ixgb_reset(adapter);
+
+       /* Make sure the EEPROM is good */
+       if (!ixgb_validate_eeprom_checksum(&adapter->hw)) {
+               netif_err(adapter, probe, adapter->netdev,
+                         "After reset, the EEPROM checksum is not valid\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+       ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);
+       memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
+
+       if (!is_valid_ether_addr(netdev->perm_addr)) {
+               netif_err(adapter, probe, adapter->netdev,
+                         "After reset, invalid MAC address\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+
+       return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * ixgb_io_resume - called when its OK to resume normal operations
+ * @pdev    pointer to pci device with error
+ *
+ * The error recovery driver tells us that its OK to resume
+ * normal operation. Implementation resembles the second-half
+ * of the ixgb_probe() routine.
+ */
+static void ixgb_io_resume(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ixgb_adapter *adapter = netdev_priv(netdev);
+
+       pci_set_master(pdev);
+
+       if (netif_running(netdev)) {
+               if (ixgb_up(adapter)) {
+                       pr_err("can't bring device back up after reset\n");
+                       return;
+               }
+       }
+
+       netif_device_attach(netdev);
+       mod_timer(&adapter->watchdog_timer, jiffies);
+}
+
+/* ixgb_main.c */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h b/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h
new file mode 100644 (file)
index 0000000..e361185
--- /dev/null
@@ -0,0 +1,63 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+/* glue for the OS independent part of ixgb
+ * includes register access macros
+ */
+
+#ifndef _IXGB_OSDEP_H_
+#define _IXGB_OSDEP_H_
+
+#include <linux/types.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+
+#undef ASSERT
+#define ASSERT(x)      BUG_ON(!(x))
+
+#define ENTER() pr_debug("%s\n", __func__);
+
+#define IXGB_WRITE_REG(a, reg, value) ( \
+       writel((value), ((a)->hw_addr + IXGB_##reg)))
+
+#define IXGB_READ_REG(a, reg) ( \
+       readl((a)->hw_addr + IXGB_##reg))
+
+#define IXGB_WRITE_REG_ARRAY(a, reg, offset, value) ( \
+       writel((value), ((a)->hw_addr + IXGB_##reg + ((offset) << 2))))
+
+#define IXGB_READ_REG_ARRAY(a, reg, offset) ( \
+       readl((a)->hw_addr + IXGB_##reg + ((offset) << 2)))
+
+#define IXGB_WRITE_FLUSH(a) IXGB_READ_REG(a, STATUS)
+
+#define IXGB_MEMCPY memcpy
+
+#endif /* _IXGB_OSDEP_H_ */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_param.c b/drivers/net/ethernet/intel/ixgb/ixgb_param.c
new file mode 100644 (file)
index 0000000..dd7fbeb
--- /dev/null
@@ -0,0 +1,469 @@
+/*******************************************************************************
+
+  Intel PRO/10GbE 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
+
+*******************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include "ixgb.h"
+
+/* This is the only thing that needs to be changed to adjust the
+ * maximum number of ports that the driver can manage.
+ */
+
+#define IXGB_MAX_NIC 8
+
+#define OPTION_UNSET   -1
+#define OPTION_DISABLED 0
+#define OPTION_ENABLED  1
+
+/* All parameters are treated the same, as an integer array of values.
+ * This macro just reduces the need to repeat the same declaration code
+ * over and over (plus this helps to avoid typo bugs).
+ */
+
+#define IXGB_PARAM_INIT { [0 ... IXGB_MAX_NIC] = OPTION_UNSET }
+#define IXGB_PARAM(X, desc)                                    \
+       static int __devinitdata X[IXGB_MAX_NIC+1]              \
+               = IXGB_PARAM_INIT;                              \
+       static unsigned int num_##X = 0;                        \
+       module_param_array_named(X, X, int, &num_##X, 0);       \
+       MODULE_PARM_DESC(X, desc);
+
+/* Transmit Descriptor Count
+ *
+ * Valid Range: 64-4096
+ *
+ * Default Value: 256
+ */
+
+IXGB_PARAM(TxDescriptors, "Number of transmit descriptors");
+
+/* Receive Descriptor Count
+ *
+ * Valid Range: 64-4096
+ *
+ * Default Value: 1024
+ */
+
+IXGB_PARAM(RxDescriptors, "Number of receive descriptors");
+
+/* User Specified Flow Control Override
+ *
+ * Valid Range: 0-3
+ *  - 0 - No Flow Control
+ *  - 1 - Rx only, respond to PAUSE frames but do not generate them
+ *  - 2 - Tx only, generate PAUSE frames but ignore them on receive
+ *  - 3 - Full Flow Control Support
+ *
+ * Default Value: 2 - Tx only (silicon bug avoidance)
+ */
+
+IXGB_PARAM(FlowControl, "Flow Control setting");
+
+/* XsumRX - Receive Checksum Offload Enable/Disable
+ *
+ * Valid Range: 0, 1
+ *  - 0 - disables all checksum offload
+ *  - 1 - enables receive IP/TCP/UDP checksum offload
+ *        on 82597 based NICs
+ *
+ * Default Value: 1
+ */
+
+IXGB_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
+
+/* Transmit Interrupt Delay in units of 0.8192 microseconds
+ *
+ * Valid Range: 0-65535
+ *
+ * Default Value: 32
+ */
+
+IXGB_PARAM(TxIntDelay, "Transmit Interrupt Delay");
+
+/* Receive Interrupt Delay in units of 0.8192 microseconds
+ *
+ * Valid Range: 0-65535
+ *
+ * Default Value: 72
+ */
+
+IXGB_PARAM(RxIntDelay, "Receive Interrupt Delay");
+
+/* Receive Flow control high threshold (when we send a pause frame)
+ * (FCRTH)
+ *
+ * Valid Range: 1,536 - 262,136 (0x600 - 0x3FFF8, 8 byte granularity)
+ *
+ * Default Value: 196,608 (0x30000)
+ */
+
+IXGB_PARAM(RxFCHighThresh, "Receive Flow Control High Threshold");
+
+/* Receive Flow control low threshold (when we send a resume frame)
+ * (FCRTL)
+ *
+ * Valid Range: 64 - 262,136 (0x40 - 0x3FFF8, 8 byte granularity)
+ *              must be less than high threshold by at least 8 bytes
+ *
+ * Default Value:  163,840 (0x28000)
+ */
+
+IXGB_PARAM(RxFCLowThresh, "Receive Flow Control Low Threshold");
+
+/* Flow control request timeout (how long to pause the link partner's tx)
+ * (PAP 15:0)
+ *
+ * Valid Range: 1 - 65535
+ *
+ * Default Value:  65535 (0xffff) (we'll send an xon if we recover)
+ */
+
+IXGB_PARAM(FCReqTimeout, "Flow Control Request Timeout");
+
+/* Interrupt Delay Enable
+ *
+ * Valid Range: 0, 1
+ *
+ *  - 0 - disables transmit interrupt delay
+ *  - 1 - enables transmmit interrupt delay
+ *
+ * Default Value: 1
+ */
+
+IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");
+
+
+#define DEFAULT_TIDV                        32
+#define MAX_TIDV                        0xFFFF
+#define MIN_TIDV                             0
+
+#define DEFAULT_RDTR                        72
+#define MAX_RDTR                        0xFFFF
+#define MIN_RDTR                             0
+
+#define XSUMRX_DEFAULT          OPTION_ENABLED
+
+#define DEFAULT_FCRTL                  0x28000
+#define DEFAULT_FCRTH                  0x30000
+#define MIN_FCRTL                            0
+#define MAX_FCRTL                      0x3FFE8
+#define MIN_FCRTH                            8
+#define MAX_FCRTH                      0x3FFF0
+
+#define MIN_FCPAUSE                          1
+#define MAX_FCPAUSE                     0xffff
+#define DEFAULT_FCPAUSE                         0xFFFF /* this may be too long */
+
+struct ixgb_option {
+       enum { enable_option, range_option, list_option } type;
+       const char *name;
+       const char *err;
+       int def;
+       union {
+               struct {        /* range_option info */
+                       int min;
+                       int max;
+               } r;
+               struct {        /* list_option info */
+                       int nr;
+                       const struct ixgb_opt_list {
+                               int i;
+                               const char *str;
+                       } *p;
+               } l;
+       } arg;
+};
+
+static int __devinit
+ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt)
+{
+       if (*value == OPTION_UNSET) {
+               *value = opt->def;
+               return 0;
+       }
+
+       switch (opt->type) {
+       case enable_option:
+               switch (*value) {
+               case OPTION_ENABLED:
+                       pr_info("%s Enabled\n", opt->name);
+                       return 0;
+               case OPTION_DISABLED:
+                       pr_info("%s Disabled\n", opt->name);
+                       return 0;
+               }
+               break;
+       case range_option:
+               if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
+                       pr_info("%s set to %i\n", opt->name, *value);
+                       return 0;
+               }
+               break;
+       case list_option: {
+               int i;
+               const struct ixgb_opt_list *ent;
+
+               for (i = 0; i < opt->arg.l.nr; i++) {
+                       ent = &opt->arg.l.p[i];
+                       if (*value == ent->i) {
+                               if (ent->str[0] != '\0')
+                                       pr_info("%s\n", ent->str);
+                               return 0;
+                       }
+               }
+       }
+               break;
+       default:
+               BUG();
+       }
+
+       pr_info("Invalid %s specified (%i) %s\n", opt->name, *value, opt->err);
+       *value = opt->def;
+       return -1;
+}
+
+/**
+ * ixgb_check_options - Range Checking for Command Line Parameters
+ * @adapter: board private structure
+ *
+ * This routine checks all command line parameters for valid user
+ * input.  If an invalid value is given, or if no user specified
+ * value exists, a default value is used.  The final value is stored
+ * in a variable in the adapter structure.
+ **/
+
+void __devinit
+ixgb_check_options(struct ixgb_adapter *adapter)
+{
+       int bd = adapter->bd_number;
+       if (bd >= IXGB_MAX_NIC) {
+               pr_notice("Warning: no configuration for board #%i\n", bd);
+               pr_notice("Using defaults for all values\n");
+       }
+
+       { /* Transmit Descriptor Count */
+               const struct ixgb_option opt = {
+                       .type = range_option,
+                       .name = "Transmit Descriptors",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_TXD),
+                       .def  = DEFAULT_TXD,
+                       .arg  = { .r = { .min = MIN_TXD,
+                                        .max = MAX_TXD}}
+               };
+               struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
+
+               if (num_TxDescriptors > bd) {
+                       tx_ring->count = TxDescriptors[bd];
+                       ixgb_validate_option(&tx_ring->count, &opt);
+               } else {
+                       tx_ring->count = opt.def;
+               }
+               tx_ring->count = ALIGN(tx_ring->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
+       }
+       { /* Receive Descriptor Count */
+               const struct ixgb_option opt = {
+                       .type = range_option,
+                       .name = "Receive Descriptors",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_RXD),
+                       .def  = DEFAULT_RXD,
+                       .arg  = { .r = { .min = MIN_RXD,
+                                        .max = MAX_RXD}}
+               };
+               struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
+
+               if (num_RxDescriptors > bd) {
+                       rx_ring->count = RxDescriptors[bd];
+                       ixgb_validate_option(&rx_ring->count, &opt);
+               } else {
+                       rx_ring->count = opt.def;
+               }
+               rx_ring->count = ALIGN(rx_ring->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
+       }
+       { /* Receive Checksum Offload Enable */
+               const struct ixgb_option opt = {
+                       .type = enable_option,
+                       .name = "Receive Checksum Offload",
+                       .err  = "defaulting to Enabled",
+                       .def  = OPTION_ENABLED
+               };
+
+               if (num_XsumRX > bd) {
+                       unsigned int rx_csum = XsumRX[bd];
+                       ixgb_validate_option(&rx_csum, &opt);
+                       adapter->rx_csum = rx_csum;
+               } else {
+                       adapter->rx_csum = opt.def;
+               }
+       }
+       { /* Flow Control */
+
+               static const struct ixgb_opt_list fc_list[] = {
+                      { ixgb_fc_none, "Flow Control Disabled" },
+                      { ixgb_fc_rx_pause, "Flow Control Receive Only" },
+                      { ixgb_fc_tx_pause, "Flow Control Transmit Only" },
+                      { ixgb_fc_full, "Flow Control Enabled" },
+                      { ixgb_fc_default, "Flow Control Hardware Default" }
+               };
+
+               static const struct ixgb_option opt = {
+                       .type = list_option,
+                       .name = "Flow Control",
+                       .err  = "reading default settings from EEPROM",
+                       .def  = ixgb_fc_tx_pause,
+                       .arg  = { .l = { .nr = ARRAY_SIZE(fc_list),
+                                        .p = fc_list }}
+               };
+
+               if (num_FlowControl > bd) {
+                       unsigned int fc = FlowControl[bd];
+                       ixgb_validate_option(&fc, &opt);
+                       adapter->hw.fc.type = fc;
+               } else {
+                       adapter->hw.fc.type = opt.def;
+               }
+       }
+       { /* Receive Flow Control High Threshold */
+               const struct ixgb_option opt = {
+                       .type = range_option,
+                       .name = "Rx Flow Control High Threshold",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_FCRTH),
+                       .def  = DEFAULT_FCRTH,
+                       .arg  = { .r = { .min = MIN_FCRTH,
+                                        .max = MAX_FCRTH}}
+               };
+
+               if (num_RxFCHighThresh > bd) {
+                       adapter->hw.fc.high_water = RxFCHighThresh[bd];
+                       ixgb_validate_option(&adapter->hw.fc.high_water, &opt);
+               } else {
+                       adapter->hw.fc.high_water = opt.def;
+               }
+               if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
+                       pr_info("Ignoring RxFCHighThresh when no RxFC\n");
+       }
+       { /* Receive Flow Control Low Threshold */
+               const struct ixgb_option opt = {
+                       .type = range_option,
+                       .name = "Rx Flow Control Low Threshold",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_FCRTL),
+                       .def  = DEFAULT_FCRTL,
+                       .arg  = { .r = { .min = MIN_FCRTL,
+                                        .max = MAX_FCRTL}}
+               };
+
+               if (num_RxFCLowThresh > bd) {
+                       adapter->hw.fc.low_water = RxFCLowThresh[bd];
+                       ixgb_validate_option(&adapter->hw.fc.low_water, &opt);
+               } else {
+                       adapter->hw.fc.low_water = opt.def;
+               }
+               if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
+                       pr_info("Ignoring RxFCLowThresh when no RxFC\n");
+       }
+       { /* Flow Control Pause Time Request*/
+               const struct ixgb_option opt = {
+                       .type = range_option,
+                       .name = "Flow Control Pause Time Request",
+                       .err  = "using default of "__MODULE_STRING(DEFAULT_FCPAUSE),
+                       .def  = DEFAULT_FCPAUSE,
+                       .arg = { .r = { .min = MIN_FCPAUSE,
+                                       .max = MAX_FCPAUSE}}
+               };
+
+               if (num_FCReqTimeout > bd) {
+                       unsigned int pause_time = FCReqTimeout[bd];
+                       ixgb_validate_option(&pause_time, &opt);
+                       adapter->hw.fc.pause_time = pause_time;
+               } else {
+                       adapter->hw.fc.pause_time = opt.def;
+               }
+               if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
+                       pr_info("Ignoring FCReqTimeout when no RxFC\n");
+       }
+       /* high low and spacing check for rx flow control thresholds */
+       if (adapter->hw.fc.type & ixgb_fc_tx_pause) {
+               /* high must be greater than low */
+               if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) {
+                       /* set defaults */
+                       pr_info("RxFCHighThresh must be >= (RxFCLowThresh + 8), Using Defaults\n");
+                       adapter->hw.fc.high_water = DEFAULT_FCRTH;
+                       adapter->hw.fc.low_water  = DEFAULT_FCRTL;
+               }
+       }
+       { /* Receive Interrupt Delay */
+               const struct ixgb_option opt = {
+                       .type = range_option,
+                       .name = "Receive Interrupt Delay",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
+                       .def  = DEFAULT_RDTR,
+                       .arg  = { .r = { .min = MIN_RDTR,
+                                        .max = MAX_RDTR}}
+               };
+
+               if (num_RxIntDelay > bd) {
+                       adapter->rx_int_delay = RxIntDelay[bd];
+                       ixgb_validate_option(&adapter->rx_int_delay, &opt);
+               } else {
+                       adapter->rx_int_delay = opt.def;
+               }
+       }
+       { /* Transmit Interrupt Delay */
+               const struct ixgb_option opt = {
+                       .type = range_option,
+                       .name = "Transmit Interrupt Delay",
+                       .err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
+                       .def  = DEFAULT_TIDV,
+                       .arg  = { .r = { .min = MIN_TIDV,
+                                        .max = MAX_TIDV}}
+               };
+
+               if (num_TxIntDelay > bd) {
+                       adapter->tx_int_delay = TxIntDelay[bd];
+                       ixgb_validate_option(&adapter->tx_int_delay, &opt);
+               } else {
+                       adapter->tx_int_delay = opt.def;
+               }
+       }
+
+       { /* Transmit Interrupt Delay Enable */
+               const struct ixgb_option opt = {
+                       .type = enable_option,
+                       .name = "Tx Interrupt Delay Enable",
+                       .err  = "defaulting to Enabled",
+                       .def  = OPTION_ENABLED
+               };
+
+               if (num_IntDelayEnable > bd) {
+                       unsigned int ide = IntDelayEnable[bd];
+                       ixgb_validate_option(&ide, &opt);
+                       adapter->tx_int_delay_enable = ide;
+               } else {
+                       adapter->tx_int_delay_enable = opt.def;
+               }
+       }
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
new file mode 100644 (file)
index 0000000..7d7387f
--- /dev/null
@@ -0,0 +1,42 @@
+################################################################################
+#
+# Intel 10 Gigabit PCI Express Linux driver
+# Copyright(c) 1999 - 2010 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
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) 10GbE PCI Express ethernet driver
+#
+
+obj-$(CONFIG_IXGBE) += ixgbe.o
+
+ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
+              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
+              ixgbe_mbx.o ixgbe_x540.o
+
+ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
+                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o
+
+ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
new file mode 100644 (file)
index 0000000..e04a8e4
--- /dev/null
@@ -0,0 +1,617 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_H_
+#define _IXGBE_H_
+
+#include <linux/bitops.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/cpumask.h>
+#include <linux/aer.h>
+#include <linux/if_vlan.h>
+
+#include "ixgbe_type.h"
+#include "ixgbe_common.h"
+#include "ixgbe_dcb.h"
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#define IXGBE_FCOE
+#include "ixgbe_fcoe.h"
+#endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */
+#ifdef CONFIG_IXGBE_DCA
+#include <linux/dca.h>
+#endif
+
+/* common prefix used by pr_<> macros */
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+/* TX/RX descriptor defines */
+#define IXGBE_DEFAULT_TXD                  512
+#define IXGBE_MAX_TXD                     4096
+#define IXGBE_MIN_TXD                       64
+
+#define IXGBE_DEFAULT_RXD                  512
+#define IXGBE_MAX_RXD                     4096
+#define IXGBE_MIN_RXD                       64
+
+/* flow control */
+#define IXGBE_MIN_FCRTL                           0x40
+#define IXGBE_MAX_FCRTL                        0x7FF80
+#define IXGBE_MIN_FCRTH                          0x600
+#define IXGBE_MAX_FCRTH                        0x7FFF0
+#define IXGBE_DEFAULT_FCPAUSE           0xFFFF
+#define IXGBE_MIN_FCPAUSE                    0
+#define IXGBE_MAX_FCPAUSE               0xFFFF
+
+/* Supported Rx Buffer Sizes */
+#define IXGBE_RXBUFFER_512   512    /* Used for packet split */
+#define IXGBE_RXBUFFER_2048  2048
+#define IXGBE_RXBUFFER_4096  4096
+#define IXGBE_RXBUFFER_8192  8192
+#define IXGBE_MAX_RXBUFFER   16384  /* largest size for a single descriptor */
+
+/*
+ * NOTE: netdev_alloc_skb reserves up to 64 bytes, NET_IP_ALIGN mans we
+ * reserve 2 more, and skb_shared_info adds an additional 384 bytes more,
+ * this adds up to 512 bytes of extra data meaning the smallest allocation
+ * we could have is 1K.
+ * i.e. RXBUFFER_512 --> size-1024 slab
+ */
+#define IXGBE_RX_HDR_SIZE IXGBE_RXBUFFER_512
+
+#define MAXIMUM_ETHERNET_VLAN_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
+
+/* How many Rx Buffers do we bundle into one write to the hardware ? */
+#define IXGBE_RX_BUFFER_WRITE  16      /* Must be power of 2 */
+
+#define IXGBE_TX_FLAGS_CSUM            (u32)(1)
+#define IXGBE_TX_FLAGS_VLAN            (u32)(1 << 1)
+#define IXGBE_TX_FLAGS_TSO             (u32)(1 << 2)
+#define IXGBE_TX_FLAGS_IPV4            (u32)(1 << 3)
+#define IXGBE_TX_FLAGS_FCOE            (u32)(1 << 4)
+#define IXGBE_TX_FLAGS_FSO             (u32)(1 << 5)
+#define IXGBE_TX_FLAGS_VLAN_MASK       0xffff0000
+#define IXGBE_TX_FLAGS_VLAN_PRIO_MASK   0x0000e000
+#define IXGBE_TX_FLAGS_VLAN_SHIFT      16
+
+#define IXGBE_MAX_RSC_INT_RATE          162760
+
+#define IXGBE_MAX_VF_MC_ENTRIES         30
+#define IXGBE_MAX_VF_FUNCTIONS          64
+#define IXGBE_MAX_VFTA_ENTRIES          128
+#define MAX_EMULATION_MAC_ADDRS         16
+#define IXGBE_MAX_PF_MACVLANS           15
+#define VMDQ_P(p)   ((p) + adapter->num_vfs)
+
+struct vf_data_storage {
+       unsigned char vf_mac_addresses[ETH_ALEN];
+       u16 vf_mc_hashes[IXGBE_MAX_VF_MC_ENTRIES];
+       u16 num_vf_mc_hashes;
+       u16 default_vf_vlan_id;
+       u16 vlans_enabled;
+       bool clear_to_send;
+       bool pf_set_mac;
+       u16 pf_vlan; /* When set, guest VLAN config not allowed. */
+       u16 pf_qos;
+       u16 tx_rate;
+};
+
+struct vf_macvlans {
+       struct list_head l;
+       int vf;
+       int rar_entry;
+       bool free;
+       bool is_macvlan;
+       u8 vf_macvlan[ETH_ALEN];
+};
+
+#define IXGBE_MAX_TXD_PWR      14
+#define IXGBE_MAX_DATA_PER_TXD (1 << IXGBE_MAX_TXD_PWR)
+
+/* Tx Descriptors needed, worst case */
+#define TXD_USE_COUNT(S) DIV_ROUND_UP((S), IXGBE_MAX_DATA_PER_TXD)
+#define DESC_NEEDED ((MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE)) + 4)
+
+/* wrapper around a pointer to a socket buffer,
+ * so a DMA handle can be stored along with the buffer */
+struct ixgbe_tx_buffer {
+       struct sk_buff *skb;
+       dma_addr_t dma;
+       unsigned long time_stamp;
+       u16 length;
+       u16 next_to_watch;
+       unsigned int bytecount;
+       u16 gso_segs;
+       u8 mapped_as_page;
+};
+
+struct ixgbe_rx_buffer {
+       struct sk_buff *skb;
+       dma_addr_t dma;
+       struct page *page;
+       dma_addr_t page_dma;
+       unsigned int page_offset;
+};
+
+struct ixgbe_queue_stats {
+       u64 packets;
+       u64 bytes;
+};
+
+struct ixgbe_tx_queue_stats {
+       u64 restart_queue;
+       u64 tx_busy;
+       u64 completed;
+       u64 tx_done_old;
+};
+
+struct ixgbe_rx_queue_stats {
+       u64 rsc_count;
+       u64 rsc_flush;
+       u64 non_eop_descs;
+       u64 alloc_rx_page_failed;
+       u64 alloc_rx_buff_failed;
+};
+
+enum ixbge_ring_state_t {
+       __IXGBE_TX_FDIR_INIT_DONE,
+       __IXGBE_TX_DETECT_HANG,
+       __IXGBE_HANG_CHECK_ARMED,
+       __IXGBE_RX_PS_ENABLED,
+       __IXGBE_RX_RSC_ENABLED,
+};
+
+#define ring_is_ps_enabled(ring) \
+       test_bit(__IXGBE_RX_PS_ENABLED, &(ring)->state)
+#define set_ring_ps_enabled(ring) \
+       set_bit(__IXGBE_RX_PS_ENABLED, &(ring)->state)
+#define clear_ring_ps_enabled(ring) \
+       clear_bit(__IXGBE_RX_PS_ENABLED, &(ring)->state)
+#define check_for_tx_hang(ring) \
+       test_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)
+#define set_check_for_tx_hang(ring) \
+       set_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)
+#define clear_check_for_tx_hang(ring) \
+       clear_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)
+#define ring_is_rsc_enabled(ring) \
+       test_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)
+#define set_ring_rsc_enabled(ring) \
+       set_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)
+#define clear_ring_rsc_enabled(ring) \
+       clear_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)
+struct ixgbe_ring {
+       void *desc;                     /* descriptor ring memory */
+       struct device *dev;             /* device for DMA mapping */
+       struct net_device *netdev;      /* netdev ring belongs to */
+       union {
+               struct ixgbe_tx_buffer *tx_buffer_info;
+               struct ixgbe_rx_buffer *rx_buffer_info;
+       };
+       unsigned long state;
+       u8 __iomem *tail;
+
+       u16 count;                      /* amount of descriptors */
+       u16 rx_buf_len;
+
+       u8 queue_index; /* needed for multiqueue queue management */
+       u8 reg_idx;                     /* holds the special value that gets
+                                        * the hardware register offset
+                                        * associated with this ring, which is
+                                        * different for DCB and RSS modes
+                                        */
+       u8 atr_sample_rate;
+       u8 atr_count;
+
+       u16 next_to_use;
+       u16 next_to_clean;
+
+       u8 dcb_tc;
+       struct ixgbe_queue_stats stats;
+       struct u64_stats_sync syncp;
+       union {
+               struct ixgbe_tx_queue_stats tx_stats;
+               struct ixgbe_rx_queue_stats rx_stats;
+       };
+       int numa_node;
+       unsigned int size;              /* length in bytes */
+       dma_addr_t dma;                 /* phys. address of descriptor ring */
+       struct rcu_head rcu;
+       struct ixgbe_q_vector *q_vector; /* back-pointer to host q_vector */
+} ____cacheline_internodealigned_in_smp;
+
+enum ixgbe_ring_f_enum {
+       RING_F_NONE = 0,
+       RING_F_VMDQ,  /* SR-IOV uses the same ring feature */
+       RING_F_RSS,
+       RING_F_FDIR,
+#ifdef IXGBE_FCOE
+       RING_F_FCOE,
+#endif /* IXGBE_FCOE */
+
+       RING_F_ARRAY_SIZE      /* must be last in enum set */
+};
+
+#define IXGBE_MAX_RSS_INDICES  16
+#define IXGBE_MAX_VMDQ_INDICES 64
+#define IXGBE_MAX_FDIR_INDICES 64
+#ifdef IXGBE_FCOE
+#define IXGBE_MAX_FCOE_INDICES  8
+#define MAX_RX_QUEUES (IXGBE_MAX_FDIR_INDICES + IXGBE_MAX_FCOE_INDICES)
+#define MAX_TX_QUEUES (IXGBE_MAX_FDIR_INDICES + IXGBE_MAX_FCOE_INDICES)
+#else
+#define MAX_RX_QUEUES IXGBE_MAX_FDIR_INDICES
+#define MAX_TX_QUEUES IXGBE_MAX_FDIR_INDICES
+#endif /* IXGBE_FCOE */
+struct ixgbe_ring_feature {
+       int indices;
+       int mask;
+} ____cacheline_internodealigned_in_smp;
+
+struct ixgbe_ring_container {
+#if MAX_RX_QUEUES > MAX_TX_QUEUES
+       DECLARE_BITMAP(idx, MAX_RX_QUEUES);
+#else
+       DECLARE_BITMAP(idx, MAX_TX_QUEUES);
+#endif
+       unsigned int total_bytes;       /* total bytes processed this int */
+       unsigned int total_packets;     /* total packets processed this int */
+       u16 work_limit;                 /* total work allowed per interrupt */
+       u8 count;                       /* total number of rings in vector */
+       u8 itr;                         /* current ITR setting for ring */
+};
+
+#define MAX_RX_PACKET_BUFFERS ((adapter->flags & IXGBE_FLAG_DCB_ENABLED) \
+                              ? 8 : 1)
+#define MAX_TX_PACKET_BUFFERS MAX_RX_PACKET_BUFFERS
+
+/* MAX_MSIX_Q_VECTORS of these are allocated,
+ * but we only use one per queue-specific vector.
+ */
+struct ixgbe_q_vector {
+       struct ixgbe_adapter *adapter;
+       unsigned int v_idx; /* index of q_vector within array, also used for
+                            * finding the bit in EICR and friends that
+                            * represents the vector for this ring */
+#ifdef CONFIG_IXGBE_DCA
+       int cpu;            /* CPU for DCA */
+#endif
+       struct napi_struct napi;
+       struct ixgbe_ring_container rx, tx;
+       u32 eitr;
+       cpumask_var_t affinity_mask;
+       char name[IFNAMSIZ + 9];
+};
+
+/* Helper macros to switch between ints/sec and what the register uses.
+ * And yes, it's the same math going both ways.  The lowest value
+ * supported by all of the ixgbe hardware is 8.
+ */
+#define EITR_INTS_PER_SEC_TO_REG(_eitr) \
+       ((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8)
+#define EITR_REG_TO_INTS_PER_SEC EITR_INTS_PER_SEC_TO_REG
+
+static inline u16 ixgbe_desc_unused(struct ixgbe_ring *ring)
+{
+       u16 ntc = ring->next_to_clean;
+       u16 ntu = ring->next_to_use;
+
+       return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1;
+}
+
+#define IXGBE_RX_DESC_ADV(R, i)            \
+       (&(((union ixgbe_adv_rx_desc *)((R)->desc))[i]))
+#define IXGBE_TX_DESC_ADV(R, i)            \
+       (&(((union ixgbe_adv_tx_desc *)((R)->desc))[i]))
+#define IXGBE_TX_CTXTDESC_ADV(R, i)        \
+       (&(((struct ixgbe_adv_tx_context_desc *)((R)->desc))[i]))
+
+#define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
+#ifdef IXGBE_FCOE
+/* Use 3K as the baby jumbo frame size for FCoE */
+#define IXGBE_FCOE_JUMBO_FRAME_SIZE       3072
+#endif /* IXGBE_FCOE */
+
+#define OTHER_VECTOR 1
+#define NON_Q_VECTORS (OTHER_VECTOR)
+
+#define MAX_MSIX_VECTORS_82599 64
+#define MAX_MSIX_Q_VECTORS_82599 64
+#define MAX_MSIX_VECTORS_82598 18
+#define MAX_MSIX_Q_VECTORS_82598 16
+
+#define MAX_MSIX_Q_VECTORS MAX_MSIX_Q_VECTORS_82599
+#define MAX_MSIX_COUNT MAX_MSIX_VECTORS_82599
+
+#define MIN_MSIX_Q_VECTORS 2
+#define MIN_MSIX_COUNT (MIN_MSIX_Q_VECTORS + NON_Q_VECTORS)
+
+/* board specific private data structure */
+struct ixgbe_adapter {
+       unsigned long state;
+
+       /* Some features need tri-state capability,
+        * thus the additional *_CAPABLE flags.
+        */
+       u32 flags;
+#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1)
+#define IXGBE_FLAG_MSI_CAPABLE                  (u32)(1 << 1)
+#define IXGBE_FLAG_MSI_ENABLED                  (u32)(1 << 2)
+#define IXGBE_FLAG_MSIX_CAPABLE                 (u32)(1 << 3)
+#define IXGBE_FLAG_MSIX_ENABLED                 (u32)(1 << 4)
+#define IXGBE_FLAG_RX_1BUF_CAPABLE              (u32)(1 << 6)
+#define IXGBE_FLAG_RX_PS_CAPABLE                (u32)(1 << 7)
+#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 << 8)
+#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 << 9)
+#define IXGBE_FLAG_DCA_ENABLED                  (u32)(1 << 10)
+#define IXGBE_FLAG_DCA_CAPABLE                  (u32)(1 << 11)
+#define IXGBE_FLAG_IMIR_ENABLED                 (u32)(1 << 12)
+#define IXGBE_FLAG_MQ_CAPABLE                   (u32)(1 << 13)
+#define IXGBE_FLAG_DCB_ENABLED                  (u32)(1 << 14)
+#define IXGBE_FLAG_RSS_ENABLED                  (u32)(1 << 16)
+#define IXGBE_FLAG_RSS_CAPABLE                  (u32)(1 << 17)
+#define IXGBE_FLAG_VMDQ_CAPABLE                 (u32)(1 << 18)
+#define IXGBE_FLAG_VMDQ_ENABLED                 (u32)(1 << 19)
+#define IXGBE_FLAG_FAN_FAIL_CAPABLE             (u32)(1 << 20)
+#define IXGBE_FLAG_NEED_LINK_UPDATE             (u32)(1 << 22)
+#define IXGBE_FLAG_NEED_LINK_CONFIG             (u32)(1 << 23)
+#define IXGBE_FLAG_FDIR_HASH_CAPABLE            (u32)(1 << 24)
+#define IXGBE_FLAG_FDIR_PERFECT_CAPABLE         (u32)(1 << 25)
+#define IXGBE_FLAG_FCOE_CAPABLE                 (u32)(1 << 26)
+#define IXGBE_FLAG_FCOE_ENABLED                 (u32)(1 << 27)
+#define IXGBE_FLAG_SRIOV_CAPABLE                (u32)(1 << 28)
+#define IXGBE_FLAG_SRIOV_ENABLED                (u32)(1 << 29)
+
+       u32 flags2;
+#define IXGBE_FLAG2_RSC_CAPABLE                 (u32)(1)
+#define IXGBE_FLAG2_RSC_ENABLED                 (u32)(1 << 1)
+#define IXGBE_FLAG2_TEMP_SENSOR_CAPABLE         (u32)(1 << 2)
+#define IXGBE_FLAG2_TEMP_SENSOR_EVENT           (u32)(1 << 3)
+#define IXGBE_FLAG2_SEARCH_FOR_SFP              (u32)(1 << 4)
+#define IXGBE_FLAG2_SFP_NEEDS_RESET             (u32)(1 << 5)
+#define IXGBE_FLAG2_RESET_REQUESTED             (u32)(1 << 6)
+#define IXGBE_FLAG2_FDIR_REQUIRES_REINIT        (u32)(1 << 7)
+
+       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       u16 bd_number;
+       struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
+
+       /* DCB parameters */
+       struct ieee_pfc *ixgbe_ieee_pfc;
+       struct ieee_ets *ixgbe_ieee_ets;
+       struct ixgbe_dcb_config dcb_cfg;
+       struct ixgbe_dcb_config temp_dcb_cfg;
+       u8 dcb_set_bitmap;
+       u8 dcbx_cap;
+       enum ixgbe_fc_mode last_lfc_mode;
+
+       /* Interrupt Throttle Rate */
+       u32 rx_itr_setting;
+       u32 tx_itr_setting;
+       u16 eitr_low;
+       u16 eitr_high;
+
+       /* Work limits */
+       u16 tx_work_limit;
+
+       /* TX */
+       struct ixgbe_ring *tx_ring[MAX_TX_QUEUES] ____cacheline_aligned_in_smp;
+       int num_tx_queues;
+       u32 tx_timeout_count;
+       bool detect_tx_hung;
+
+       u64 restart_queue;
+       u64 lsc_int;
+
+       /* RX */
+       struct ixgbe_ring *rx_ring[MAX_RX_QUEUES] ____cacheline_aligned_in_smp;
+       int num_rx_queues;
+       int num_rx_pools;               /* == num_rx_queues in 82598 */
+       int num_rx_queues_per_pool;     /* 1 if 82598, can be many if 82599 */
+       u64 hw_csum_rx_error;
+       u64 hw_rx_no_dma_resources;
+       u64 non_eop_descs;
+       int num_msix_vectors;
+       int max_msix_q_vectors;         /* true count of q_vectors for device */
+       struct ixgbe_ring_feature ring_feature[RING_F_ARRAY_SIZE];
+       struct msix_entry *msix_entries;
+
+       u32 alloc_rx_page_failed;
+       u32 alloc_rx_buff_failed;
+
+/* default to trying for four seconds */
+#define IXGBE_TRY_LINK_TIMEOUT (4 * HZ)
+
+       /* OS defined structs */
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+
+       u32 test_icr;
+       struct ixgbe_ring test_tx_ring;
+       struct ixgbe_ring test_rx_ring;
+
+       /* structs defined in ixgbe_hw.h */
+       struct ixgbe_hw hw;
+       u16 msg_enable;
+       struct ixgbe_hw_stats stats;
+
+       /* Interrupt Throttle Rate */
+       u32 rx_eitr_param;
+       u32 tx_eitr_param;
+
+       u64 tx_busy;
+       unsigned int tx_ring_count;
+       unsigned int rx_ring_count;
+
+       u32 link_speed;
+       bool link_up;
+       unsigned long link_check_timeout;
+
+       struct work_struct service_task;
+       struct timer_list service_timer;
+       u32 fdir_pballoc;
+       u32 atr_sample_rate;
+       unsigned long fdir_overflow; /* number of times ATR was backed off */
+       spinlock_t fdir_perfect_lock;
+#ifdef IXGBE_FCOE
+       struct ixgbe_fcoe fcoe;
+#endif /* IXGBE_FCOE */
+       u64 rsc_total_count;
+       u64 rsc_total_flush;
+       u32 wol;
+       u16 eeprom_version;
+
+       int node;
+       u32 led_reg;
+       u32 interrupt_event;
+       char lsc_int_name[IFNAMSIZ + 9];
+
+       /* SR-IOV */
+       DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS);
+       unsigned int num_vfs;
+       struct vf_data_storage *vfinfo;
+       int vf_rate_link_speed;
+       struct vf_macvlans vf_mvs;
+       struct vf_macvlans *mv_list;
+       bool antispoofing_enabled;
+
+       struct hlist_head fdir_filter_list;
+       union ixgbe_atr_input fdir_mask;
+       int fdir_filter_count;
+};
+
+struct ixgbe_fdir_filter {
+       struct hlist_node fdir_node;
+       union ixgbe_atr_input filter;
+       u16 sw_idx;
+       u16 action;
+};
+
+enum ixbge_state_t {
+       __IXGBE_TESTING,
+       __IXGBE_RESETTING,
+       __IXGBE_DOWN,
+       __IXGBE_SERVICE_SCHED,
+       __IXGBE_IN_SFP_INIT,
+};
+
+struct ixgbe_rsc_cb {
+       dma_addr_t dma;
+       u16 skb_cnt;
+       bool delay_unmap;
+};
+#define IXGBE_RSC_CB(skb) ((struct ixgbe_rsc_cb *)(skb)->cb)
+
+enum ixgbe_boards {
+       board_82598,
+       board_82599,
+       board_X540,
+};
+
+extern struct ixgbe_info ixgbe_82598_info;
+extern struct ixgbe_info ixgbe_82599_info;
+extern struct ixgbe_info ixgbe_X540_info;
+#ifdef CONFIG_IXGBE_DCB
+extern const struct dcbnl_rtnl_ops dcbnl_ops;
+extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
+                              struct ixgbe_dcb_config *dst_dcb_cfg,
+                              int tc_max);
+#endif
+
+extern char ixgbe_driver_name[];
+extern const char ixgbe_driver_version[];
+
+extern int ixgbe_up(struct ixgbe_adapter *adapter);
+extern void ixgbe_down(struct ixgbe_adapter *adapter);
+extern void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);
+extern void ixgbe_reset(struct ixgbe_adapter *adapter);
+extern void ixgbe_set_ethtool_ops(struct net_device *netdev);
+extern int ixgbe_setup_rx_resources(struct ixgbe_ring *);
+extern int ixgbe_setup_tx_resources(struct ixgbe_ring *);
+extern void ixgbe_free_rx_resources(struct ixgbe_ring *);
+extern void ixgbe_free_tx_resources(struct ixgbe_ring *);
+extern void ixgbe_configure_rx_ring(struct ixgbe_adapter *,struct ixgbe_ring *);
+extern void ixgbe_configure_tx_ring(struct ixgbe_adapter *,struct ixgbe_ring *);
+extern void ixgbe_disable_rx_queue(struct ixgbe_adapter *adapter,
+                                  struct ixgbe_ring *);
+extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);
+extern int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter);
+extern void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter);
+extern netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *,
+                                        struct ixgbe_adapter *,
+                                        struct ixgbe_ring *);
+extern void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *,
+                                             struct ixgbe_tx_buffer *);
+extern void ixgbe_alloc_rx_buffers(struct ixgbe_ring *, u16);
+extern void ixgbe_write_eitr(struct ixgbe_q_vector *);
+extern int ethtool_ioctl(struct ifreq *ifr);
+extern s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw);
+extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 fdirctrl);
+extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 fdirctrl);
+extern s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw,
+                                                union ixgbe_atr_hash_dword input,
+                                                union ixgbe_atr_hash_dword common,
+                                                 u8 queue);
+extern s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
+                                          union ixgbe_atr_input *input_mask);
+extern s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
+                                                union ixgbe_atr_input *input,
+                                                u16 soft_id, u8 queue);
+extern s32 ixgbe_fdir_erase_perfect_filter_82599(struct ixgbe_hw *hw,
+                                                union ixgbe_atr_input *input,
+                                                u16 soft_id);
+extern void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,
+                                                union ixgbe_atr_input *mask);
+extern void ixgbe_set_rx_mode(struct net_device *netdev);
+extern int ixgbe_setup_tc(struct net_device *dev, u8 tc);
+extern void ixgbe_tx_ctxtdesc(struct ixgbe_ring *, u32, u32, u32, u32);
+extern void ixgbe_do_reset(struct net_device *netdev);
+#ifdef IXGBE_FCOE
+extern void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter);
+extern int ixgbe_fso(struct ixgbe_ring *tx_ring, struct sk_buff *skb,
+                     u32 tx_flags, u8 *hdr_len);
+extern void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter);
+extern int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
+                         union ixgbe_adv_rx_desc *rx_desc,
+                         struct sk_buff *skb,
+                         u32 staterr);
+extern int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
+                              struct scatterlist *sgl, unsigned int sgc);
+extern int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,
+                                struct scatterlist *sgl, unsigned int sgc);
+extern int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid);
+extern int ixgbe_fcoe_enable(struct net_device *netdev);
+extern int ixgbe_fcoe_disable(struct net_device *netdev);
+#ifdef CONFIG_IXGBE_DCB
+extern u8 ixgbe_fcoe_getapp(struct ixgbe_adapter *adapter);
+extern u8 ixgbe_fcoe_setapp(struct ixgbe_adapter *adapter, u8 up);
+#endif /* CONFIG_IXGBE_DCB */
+extern int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type);
+#endif /* IXGBE_FCOE */
+
+#endif /* _IXGBE_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
new file mode 100644 (file)
index 0000000..0d4e382
--- /dev/null
@@ -0,0 +1,1353 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+
+#include "ixgbe.h"
+#include "ixgbe_phy.h"
+
+#define IXGBE_82598_MAX_TX_QUEUES 32
+#define IXGBE_82598_MAX_RX_QUEUES 64
+#define IXGBE_82598_RAR_ENTRIES   16
+#define IXGBE_82598_MC_TBL_SIZE  128
+#define IXGBE_82598_VFT_TBL_SIZE 128
+#define IXGBE_82598_RX_PB_SIZE  512
+
+static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw,
+                                         ixgbe_link_speed speed,
+                                         bool autoneg,
+                                         bool autoneg_wait_to_complete);
+static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset,
+                                       u8 *eeprom_data);
+
+/**
+ *  ixgbe_set_pcie_completion_timeout - set pci-e completion timeout
+ *  @hw: pointer to the HW structure
+ *
+ *  The defaults for 82598 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 250ms for capability version 1 config,
+ *  or 16ms to 55ms for version 2.
+ **/
+static void ixgbe_set_pcie_completion_timeout(struct ixgbe_hw *hw)
+{
+       struct ixgbe_adapter *adapter = hw->back;
+       u32 gcr = IXGBE_READ_REG(hw, IXGBE_GCR);
+       u16 pcie_devctl2;
+
+       /* only take action if timeout value is defaulted to 0 */
+       if (gcr & IXGBE_GCR_CMPL_TMOUT_MASK)
+               goto out;
+
+       /*
+        * if capababilities version is type 1 we can write the
+        * timeout of 10ms to 250ms through the GCR register
+        */
+       if (!(gcr & IXGBE_GCR_CAP_VER2)) {
+               gcr |= IXGBE_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
+        */
+       pci_read_config_word(adapter->pdev,
+                            IXGBE_PCI_DEVICE_CONTROL2, &pcie_devctl2);
+       pcie_devctl2 |= IXGBE_PCI_DEVICE_CONTROL2_16ms;
+       pci_write_config_word(adapter->pdev,
+                             IXGBE_PCI_DEVICE_CONTROL2, pcie_devctl2);
+out:
+       /* disable completion timeout resend */
+       gcr &= ~IXGBE_GCR_CMPL_TMOUT_RESEND;
+       IXGBE_WRITE_REG(hw, IXGBE_GCR, gcr);
+}
+
+/**
+ *  ixgbe_get_pcie_msix_count_82598 - Gets MSI-X vector count
+ *  @hw: pointer to hardware structure
+ *
+ *  Read PCIe configuration space, and get the MSI-X vector count from
+ *  the capabilities table.
+ **/
+static u16 ixgbe_get_pcie_msix_count_82598(struct ixgbe_hw *hw)
+{
+       struct ixgbe_adapter *adapter = hw->back;
+       u16 msix_count;
+       pci_read_config_word(adapter->pdev, IXGBE_PCIE_MSIX_82598_CAPS,
+                            &msix_count);
+       msix_count &= IXGBE_PCIE_MSIX_TBL_SZ_MASK;
+
+       /* MSI-X count is zero-based in HW, so increment to give proper value */
+       msix_count++;
+
+       return msix_count;
+}
+
+/**
+ */
+static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mac_info *mac = &hw->mac;
+
+       /* Call PHY identify routine to get the phy type */
+       ixgbe_identify_phy_generic(hw);
+
+       mac->mcft_size = IXGBE_82598_MC_TBL_SIZE;
+       mac->vft_size = IXGBE_82598_VFT_TBL_SIZE;
+       mac->num_rar_entries = IXGBE_82598_RAR_ENTRIES;
+       mac->max_rx_queues = IXGBE_82598_MAX_RX_QUEUES;
+       mac->max_tx_queues = IXGBE_82598_MAX_TX_QUEUES;
+       mac->max_msix_vectors = ixgbe_get_pcie_msix_count_82598(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_init_phy_ops_82598 - PHY/SFP specific init
+ *  @hw: pointer to hardware structure
+ *
+ *  Initialize any function pointers that were not able to be
+ *  set during get_invariants because the PHY/SFP type was
+ *  not known.  Perform the SFP init if necessary.
+ *
+ **/
+static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mac_info *mac = &hw->mac;
+       struct ixgbe_phy_info *phy = &hw->phy;
+       s32 ret_val = 0;
+       u16 list_offset, data_offset;
+
+       /* Identify the PHY */
+       phy->ops.identify(hw);
+
+       /* Overwrite the link function pointers if copper PHY */
+       if (mac->ops.get_media_type(hw) == ixgbe_media_type_copper) {
+               mac->ops.setup_link = &ixgbe_setup_copper_link_82598;
+               mac->ops.get_link_capabilities =
+                       &ixgbe_get_copper_link_capabilities_generic;
+       }
+
+       switch (hw->phy.type) {
+       case ixgbe_phy_tn:
+               phy->ops.setup_link = &ixgbe_setup_phy_link_tnx;
+               phy->ops.check_link = &ixgbe_check_phy_link_tnx;
+               phy->ops.get_firmware_version =
+                            &ixgbe_get_phy_firmware_version_tnx;
+               break;
+       case ixgbe_phy_nl:
+               phy->ops.reset = &ixgbe_reset_phy_nl;
+
+               /* Call SFP+ identify routine to get the SFP+ module type */
+               ret_val = phy->ops.identify_sfp(hw);
+               if (ret_val != 0)
+                       goto out;
+               else if (hw->phy.sfp_type == ixgbe_sfp_type_unknown) {
+                       ret_val = IXGBE_ERR_SFP_NOT_SUPPORTED;
+                       goto out;
+               }
+
+               /* Check to see if SFP+ module is supported */
+               ret_val = ixgbe_get_sfp_init_sequence_offsets(hw,
+                                                           &list_offset,
+                                                           &data_offset);
+               if (ret_val != 0) {
+                       ret_val = IXGBE_ERR_SFP_NOT_SUPPORTED;
+                       goto out;
+               }
+               break;
+       default:
+               break;
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_start_hw_82598 - Prepare hardware for Tx/Rx
+ *  @hw: pointer to hardware structure
+ *
+ *  Starts the hardware using the generic start_hw function.
+ *  Disables relaxed ordering Then set pcie completion timeout
+ *
+ **/
+static s32 ixgbe_start_hw_82598(struct ixgbe_hw *hw)
+{
+       u32 regval;
+       u32 i;
+       s32 ret_val = 0;
+
+       ret_val = ixgbe_start_hw_generic(hw);
+
+       /* Disable relaxed ordering */
+       for (i = 0; ((i < hw->mac.max_tx_queues) &&
+            (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {
+               regval = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));
+               regval &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
+               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(i), regval);
+       }
+
+       for (i = 0; ((i < hw->mac.max_rx_queues) &&
+            (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {
+               regval = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
+               regval &= ~(IXGBE_DCA_RXCTRL_DESC_WRO_EN |
+                           IXGBE_DCA_RXCTRL_DESC_HSRO_EN);
+               IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
+       }
+
+       hw->mac.rx_pb_size = IXGBE_82598_RX_PB_SIZE;
+
+       /* set the completion timeout for interface */
+       if (ret_val == 0)
+               ixgbe_set_pcie_completion_timeout(hw);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_get_link_capabilities_82598 - Determines link capabilities
+ *  @hw: pointer to hardware structure
+ *  @speed: pointer to link speed
+ *  @autoneg: boolean auto-negotiation value
+ *
+ *  Determines the link capabilities by reading the AUTOC register.
+ **/
+static s32 ixgbe_get_link_capabilities_82598(struct ixgbe_hw *hw,
+                                             ixgbe_link_speed *speed,
+                                             bool *autoneg)
+{
+       s32 status = 0;
+       u32 autoc = 0;
+
+       /*
+        * Determine link capabilities based on the stored value of AUTOC,
+        * which represents EEPROM defaults.  If AUTOC value has not been
+        * stored, use the current register value.
+        */
+       if (hw->mac.orig_link_settings_stored)
+               autoc = hw->mac.orig_autoc;
+       else
+               autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+
+       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
+       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+               *autoneg = false;
+               break;
+
+       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
+               *speed = IXGBE_LINK_SPEED_10GB_FULL;
+               *autoneg = false;
+               break;
+
+       case IXGBE_AUTOC_LMS_1G_AN:
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+               *autoneg = true;
+               break;
+
+       case IXGBE_AUTOC_LMS_KX4_AN:
+       case IXGBE_AUTOC_LMS_KX4_AN_1G_AN:
+               *speed = IXGBE_LINK_SPEED_UNKNOWN;
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
+               *autoneg = true;
+               break;
+
+       default:
+               status = IXGBE_ERR_LINK_SETUP;
+               break;
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_get_media_type_82598 - Determines media type
+ *  @hw: pointer to hardware structure
+ *
+ *  Returns the media type (fiber, copper, backplane)
+ **/
+static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
+{
+       enum ixgbe_media_type media_type;
+
+       /* Detect if there is a copper PHY attached. */
+       switch (hw->phy.type) {
+       case ixgbe_phy_cu_unknown:
+       case ixgbe_phy_tn:
+       case ixgbe_phy_aq:
+               media_type = ixgbe_media_type_copper;
+               goto out;
+       default:
+               break;
+       }
+
+       /* Media type for I82598 is based on device ID */
+       switch (hw->device_id) {
+       case IXGBE_DEV_ID_82598:
+       case IXGBE_DEV_ID_82598_BX:
+               /* Default device ID is mezzanine card KX/KX4 */
+               media_type = ixgbe_media_type_backplane;
+               break;
+       case IXGBE_DEV_ID_82598AF_DUAL_PORT:
+       case IXGBE_DEV_ID_82598AF_SINGLE_PORT:
+       case IXGBE_DEV_ID_82598_DA_DUAL_PORT:
+       case IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM:
+       case IXGBE_DEV_ID_82598EB_XF_LR:
+       case IXGBE_DEV_ID_82598EB_SFP_LOM:
+               media_type = ixgbe_media_type_fiber;
+               break;
+       case IXGBE_DEV_ID_82598EB_CX4:
+       case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
+               media_type = ixgbe_media_type_cx4;
+               break;
+       case IXGBE_DEV_ID_82598AT:
+       case IXGBE_DEV_ID_82598AT2:
+               media_type = ixgbe_media_type_copper;
+               break;
+       default:
+               media_type = ixgbe_media_type_unknown;
+               break;
+       }
+out:
+       return media_type;
+}
+
+/**
+ *  ixgbe_fc_enable_82598 - Enable flow control
+ *  @hw: pointer to hardware structure
+ *  @packetbuf_num: packet buffer number (0-7)
+ *
+ *  Enable flow control according to the current settings.
+ **/
+static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
+{
+       s32 ret_val = 0;
+       u32 fctrl_reg;
+       u32 rmcs_reg;
+       u32 reg;
+       u32 rx_pba_size;
+       u32 link_speed = 0;
+       bool link_up;
+
+#ifdef CONFIG_DCB
+       if (hw->fc.requested_mode == ixgbe_fc_pfc)
+               goto out;
+
+#endif /* CONFIG_DCB */
+       /*
+        * On 82598 having Rx FC on causes resets while doing 1G
+        * so if it's on turn it off once we know link_speed. For
+        * more details see 82598 Specification update.
+        */
+       hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
+       if (link_up && link_speed == IXGBE_LINK_SPEED_1GB_FULL) {
+               switch (hw->fc.requested_mode) {
+               case ixgbe_fc_full:
+                       hw->fc.requested_mode = ixgbe_fc_tx_pause;
+                       break;
+               case ixgbe_fc_rx_pause:
+                       hw->fc.requested_mode = ixgbe_fc_none;
+                       break;
+               default:
+                       /* no change */
+                       break;
+               }
+       }
+
+       /* Negotiate the fc mode to use */
+       ret_val = ixgbe_fc_autoneg(hw);
+       if (ret_val == IXGBE_ERR_FLOW_CONTROL)
+               goto out;
+
+       /* Disable any previous flow control settings */
+       fctrl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+       fctrl_reg &= ~(IXGBE_FCTRL_RFCE | IXGBE_FCTRL_RPFCE);
+
+       rmcs_reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
+       rmcs_reg &= ~(IXGBE_RMCS_TFCE_PRIORITY | IXGBE_RMCS_TFCE_802_3X);
+
+       /*
+        * The possible values of fc.current_mode 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.
+#ifdef CONFIG_DCB
+        * 4: Priority Flow Control is enabled.
+#endif
+        * other: Invalid.
+        */
+       switch (hw->fc.current_mode) {
+       case ixgbe_fc_none:
+               /*
+                * Flow control is disabled by software override or autoneg.
+                * The code below will actually disable it in the HW.
+                */
+               break;
+       case ixgbe_fc_rx_pause:
+               /*
+                * Rx Flow control is enabled and Tx Flow control is
+                * disabled by software override. 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.
+                */
+               fctrl_reg |= IXGBE_FCTRL_RFCE;
+               break;
+       case ixgbe_fc_tx_pause:
+               /*
+                * Tx Flow control is enabled, and Rx Flow control is
+                * disabled by software override.
+                */
+               rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;
+               break;
+       case ixgbe_fc_full:
+               /* Flow control (both Rx and Tx) is enabled by SW override. */
+               fctrl_reg |= IXGBE_FCTRL_RFCE;
+               rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;
+               break;
+#ifdef CONFIG_DCB
+       case ixgbe_fc_pfc:
+               goto out;
+               break;
+#endif /* CONFIG_DCB */
+       default:
+               hw_dbg(hw, "Flow control param set incorrectly\n");
+               ret_val = IXGBE_ERR_CONFIG;
+               goto out;
+               break;
+       }
+
+       /* Set 802.3x based flow control settings. */
+       fctrl_reg |= IXGBE_FCTRL_DPF;
+       IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl_reg);
+       IXGBE_WRITE_REG(hw, IXGBE_RMCS, rmcs_reg);
+
+       /* Set up and enable Rx high/low water mark thresholds, enable XON. */
+       if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
+               rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num));
+               rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
+
+               reg = (rx_pba_size - hw->fc.low_water) << 6;
+               if (hw->fc.send_xon)
+                       reg |= IXGBE_FCRTL_XONE;
+
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num), reg);
+
+               reg = (rx_pba_size - hw->fc.high_water) << 6;
+               reg |= IXGBE_FCRTH_FCEN;
+
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num), reg);
+       }
+
+       /* Configure pause time (2 TCs per register) */
+       reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
+       if ((packetbuf_num & 1) == 0)
+               reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
+       else
+               reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
+       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
+
+       IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
+
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_start_mac_link_82598 - Configures MAC link settings
+ *  @hw: pointer to hardware structure
+ *
+ *  Configures link settings based on values in the ixgbe_hw struct.
+ *  Restarts the link.  Performs autonegotiation if needed.
+ **/
+static s32 ixgbe_start_mac_link_82598(struct ixgbe_hw *hw,
+                                      bool autoneg_wait_to_complete)
+{
+       u32 autoc_reg;
+       u32 links_reg;
+       u32 i;
+       s32 status = 0;
+
+       /* Restart link */
+       autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       autoc_reg |= IXGBE_AUTOC_AN_RESTART;
+       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
+
+       /* Only poll for autoneg to complete if specified to do so */
+       if (autoneg_wait_to_complete) {
+               if ((autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
+                    IXGBE_AUTOC_LMS_KX4_AN ||
+                   (autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
+                    IXGBE_AUTOC_LMS_KX4_AN_1G_AN) {
+                       links_reg = 0; /* Just in case Autoneg time = 0 */
+                       for (i = 0; i < IXGBE_AUTO_NEG_TIME; i++) {
+                               links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
+                               if (links_reg & IXGBE_LINKS_KX_AN_COMP)
+                                       break;
+                               msleep(100);
+                       }
+                       if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {
+                               status = IXGBE_ERR_AUTONEG_NOT_COMPLETE;
+                               hw_dbg(hw, "Autonegotiation did not complete.\n");
+                       }
+               }
+       }
+
+       /* Add delay to filter out noises during initial link setup */
+       msleep(50);
+
+       return status;
+}
+
+/**
+ *  ixgbe_validate_link_ready - Function looks for phy link
+ *  @hw: pointer to hardware structure
+ *
+ *  Function indicates success when phy link is available. If phy is not ready
+ *  within 5 seconds of MAC indicating link, the function returns error.
+ **/
+static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw)
+{
+       u32 timeout;
+       u16 an_reg;
+
+       if (hw->device_id != IXGBE_DEV_ID_82598AT2)
+               return 0;
+
+       for (timeout = 0;
+            timeout < IXGBE_VALIDATE_LINK_READY_TIMEOUT; timeout++) {
+               hw->phy.ops.read_reg(hw, MDIO_STAT1, MDIO_MMD_AN, &an_reg);
+
+               if ((an_reg & MDIO_AN_STAT1_COMPLETE) &&
+                   (an_reg & MDIO_STAT1_LSTATUS))
+                       break;
+
+               msleep(100);
+       }
+
+       if (timeout == IXGBE_VALIDATE_LINK_READY_TIMEOUT) {
+               hw_dbg(hw, "Link was indicated but link is down\n");
+               return IXGBE_ERR_LINK_SETUP;
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_check_mac_link_82598 - Get link/speed status
+ *  @hw: pointer to hardware structure
+ *  @speed: pointer to link speed
+ *  @link_up: true is link is up, false otherwise
+ *  @link_up_wait_to_complete: bool used to wait for link up or not
+ *
+ *  Reads the links register to determine if link is up and the current speed
+ **/
+static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
+                                      ixgbe_link_speed *speed, bool *link_up,
+                                      bool link_up_wait_to_complete)
+{
+       u32 links_reg;
+       u32 i;
+       u16 link_reg, adapt_comp_reg;
+
+       /*
+        * SERDES PHY requires us to read link status from register 0xC79F.
+        * Bit 0 set indicates link is up/ready; clear indicates link down.
+        * 0xC00C is read to check that the XAUI lanes are active.  Bit 0
+        * clear indicates active; set indicates inactive.
+        */
+       if (hw->phy.type == ixgbe_phy_nl) {
+               hw->phy.ops.read_reg(hw, 0xC79F, MDIO_MMD_PMAPMD, &link_reg);
+               hw->phy.ops.read_reg(hw, 0xC79F, MDIO_MMD_PMAPMD, &link_reg);
+               hw->phy.ops.read_reg(hw, 0xC00C, MDIO_MMD_PMAPMD,
+                                    &adapt_comp_reg);
+               if (link_up_wait_to_complete) {
+                       for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
+                               if ((link_reg & 1) &&
+                                   ((adapt_comp_reg & 1) == 0)) {
+                                       *link_up = true;
+                                       break;
+                               } else {
+                                       *link_up = false;
+                               }
+                               msleep(100);
+                               hw->phy.ops.read_reg(hw, 0xC79F,
+                                                    MDIO_MMD_PMAPMD,
+                                                    &link_reg);
+                               hw->phy.ops.read_reg(hw, 0xC00C,
+                                                    MDIO_MMD_PMAPMD,
+                                                    &adapt_comp_reg);
+                       }
+               } else {
+                       if ((link_reg & 1) && ((adapt_comp_reg & 1) == 0))
+                               *link_up = true;
+                       else
+                               *link_up = false;
+               }
+
+               if (*link_up == false)
+                       goto out;
+       }
+
+       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
+       if (link_up_wait_to_complete) {
+               for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
+                       if (links_reg & IXGBE_LINKS_UP) {
+                               *link_up = true;
+                               break;
+                       } else {
+                               *link_up = false;
+                       }
+                       msleep(100);
+                       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
+               }
+       } else {
+               if (links_reg & IXGBE_LINKS_UP)
+                       *link_up = true;
+               else
+                       *link_up = false;
+       }
+
+       if (links_reg & IXGBE_LINKS_SPEED)
+               *speed = IXGBE_LINK_SPEED_10GB_FULL;
+       else
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+
+       if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) &&
+           (ixgbe_validate_link_ready(hw) != 0))
+               *link_up = false;
+
+       /* if link is down, zero out the current_mode */
+       if (*link_up == false) {
+               hw->fc.current_mode = ixgbe_fc_none;
+               hw->fc.fc_was_autonegged = false;
+       }
+out:
+       return 0;
+}
+
+/**
+ *  ixgbe_setup_mac_link_82598 - Set MAC link speed
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if auto-negotiation enabled
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ *  Set the link speed in the AUTOC register and restarts link.
+ **/
+static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw,
+                                           ixgbe_link_speed speed, bool autoneg,
+                                           bool autoneg_wait_to_complete)
+{
+       s32              status            = 0;
+       ixgbe_link_speed link_capabilities = IXGBE_LINK_SPEED_UNKNOWN;
+       u32              curr_autoc        = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       u32              autoc             = curr_autoc;
+       u32              link_mode         = autoc & IXGBE_AUTOC_LMS_MASK;
+
+       /* Check to see if speed passed in is supported. */
+       ixgbe_get_link_capabilities_82598(hw, &link_capabilities, &autoneg);
+       speed &= link_capabilities;
+
+       if (speed == IXGBE_LINK_SPEED_UNKNOWN)
+               status = IXGBE_ERR_LINK_SETUP;
+
+       /* Set KX4/KX support according to speed requested */
+       else if (link_mode == IXGBE_AUTOC_LMS_KX4_AN ||
+                link_mode == IXGBE_AUTOC_LMS_KX4_AN_1G_AN) {
+               autoc &= ~IXGBE_AUTOC_KX4_KX_SUPP_MASK;
+               if (speed & IXGBE_LINK_SPEED_10GB_FULL)
+                       autoc |= IXGBE_AUTOC_KX4_SUPP;
+               if (speed & IXGBE_LINK_SPEED_1GB_FULL)
+                       autoc |= IXGBE_AUTOC_KX_SUPP;
+               if (autoc != curr_autoc)
+                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);
+       }
+
+       if (status == 0) {
+               /*
+                * Setup and restart the link based on the new values in
+                * ixgbe_hw This will write the AUTOC register based on the new
+                * stored values
+                */
+               status = ixgbe_start_mac_link_82598(hw,
+                                                   autoneg_wait_to_complete);
+       }
+
+       return status;
+}
+
+
+/**
+ *  ixgbe_setup_copper_link_82598 - Set the PHY autoneg advertised field
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if autonegotiation enabled
+ *  @autoneg_wait_to_complete: true if waiting is needed to complete
+ *
+ *  Sets the link speed in the AUTOC register in the MAC and restarts link.
+ **/
+static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw,
+                                               ixgbe_link_speed speed,
+                                               bool autoneg,
+                                               bool autoneg_wait_to_complete)
+{
+       s32 status;
+
+       /* Setup the PHY according to input speed */
+       status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,
+                                             autoneg_wait_to_complete);
+       /* Set up MAC */
+       ixgbe_start_mac_link_82598(hw, autoneg_wait_to_complete);
+
+       return status;
+}
+
+/**
+ *  ixgbe_reset_hw_82598 - Performs hardware reset
+ *  @hw: pointer to hardware structure
+ *
+ *  Resets the hardware by resetting the transmit and receive units, masks and
+ *  clears all interrupts, performing a PHY reset, and performing a link (MAC)
+ *  reset.
+ **/
+static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
+{
+       s32 status = 0;
+       s32 phy_status = 0;
+       u32 ctrl;
+       u32 gheccr;
+       u32 i;
+       u32 autoc;
+       u8  analog_val;
+
+       /* Call adapter stop to disable tx/rx and clear interrupts */
+       hw->mac.ops.stop_adapter(hw);
+
+       /*
+        * Power up the Atlas Tx lanes if they are currently powered down.
+        * Atlas Tx lanes are powered down for MAC loopback tests, but
+        * they are not automatically restored on reset.
+        */
+       hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, &analog_val);
+       if (analog_val & IXGBE_ATLAS_PDN_TX_REG_EN) {
+               /* Enable Tx Atlas so packets can be transmitted again */
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK,
+                                            &analog_val);
+               analog_val &= ~IXGBE_ATLAS_PDN_TX_REG_EN;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK,
+                                             analog_val);
+
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_10G,
+                                            &analog_val);
+               analog_val &= ~IXGBE_ATLAS_PDN_TX_10G_QL_ALL;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_10G,
+                                             analog_val);
+
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_1G,
+                                            &analog_val);
+               analog_val &= ~IXGBE_ATLAS_PDN_TX_1G_QL_ALL;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_1G,
+                                             analog_val);
+
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_AN,
+                                            &analog_val);
+               analog_val &= ~IXGBE_ATLAS_PDN_TX_AN_QL_ALL;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_AN,
+                                             analog_val);
+       }
+
+       /* Reset PHY */
+       if (hw->phy.reset_disable == false) {
+               /* PHY ops must be identified and initialized prior to reset */
+
+               /* Init PHY and function pointers, perform SFP setup */
+               phy_status = hw->phy.ops.init(hw);
+               if (phy_status == IXGBE_ERR_SFP_NOT_SUPPORTED)
+                       goto reset_hw_out;
+               else if (phy_status == IXGBE_ERR_SFP_NOT_PRESENT)
+                       goto no_phy_reset;
+
+               hw->phy.ops.reset(hw);
+       }
+
+no_phy_reset:
+       /*
+        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
+        * access and verify no pending requests before reset
+        */
+       ixgbe_disable_pcie_master(hw);
+
+mac_reset_top:
+       /*
+        * Issue global reset to the MAC.  This needs to be a SW reset.
+        * If link reset is used, it might reset the MAC when mng is using it
+        */
+       ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
+       IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | IXGBE_CTRL_RST));
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Poll for reset bit to self-clear indicating reset is complete */
+       for (i = 0; i < 10; i++) {
+               udelay(1);
+               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
+               if (!(ctrl & IXGBE_CTRL_RST))
+                       break;
+       }
+       if (ctrl & IXGBE_CTRL_RST) {
+               status = IXGBE_ERR_RESET_FAILED;
+               hw_dbg(hw, "Reset polling failed to complete.\n");
+       }
+
+       /*
+        * Double resets are required for recovery from certain error
+        * conditions.  Between resets, it is necessary to stall to allow time
+        * for any pending HW events to complete.  We use 1usec since that is
+        * what is needed for ixgbe_disable_pcie_master().  The second reset
+        * then clears out any effects of those events.
+        */
+       if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
+               hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+               udelay(1);
+               goto mac_reset_top;
+       }
+
+       msleep(50);
+
+       gheccr = IXGBE_READ_REG(hw, IXGBE_GHECCR);
+       gheccr &= ~((1 << 21) | (1 << 18) | (1 << 9) | (1 << 6));
+       IXGBE_WRITE_REG(hw, IXGBE_GHECCR, gheccr);
+
+       /*
+        * Store the original AUTOC value if it has not been
+        * stored off yet.  Otherwise restore the stored original
+        * AUTOC value since the reset operation sets back to deaults.
+        */
+       autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       if (hw->mac.orig_link_settings_stored == false) {
+               hw->mac.orig_autoc = autoc;
+               hw->mac.orig_link_settings_stored = true;
+       } else if (autoc != hw->mac.orig_autoc) {
+               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc);
+       }
+
+       /* Store the permanent mac address */
+       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
+
+       /*
+        * Store MAC address from RAR0, clear receive address registers, and
+        * clear the multicast table
+        */
+       hw->mac.ops.init_rx_addrs(hw);
+
+reset_hw_out:
+       if (phy_status)
+               status = phy_status;
+
+       return status;
+}
+
+/**
+ *  ixgbe_set_vmdq_82598 - Associate a VMDq set index with a rx address
+ *  @hw: pointer to hardware struct
+ *  @rar: receive address register index to associate with a VMDq index
+ *  @vmdq: VMDq set index
+ **/
+static s32 ixgbe_set_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
+{
+       u32 rar_high;
+       u32 rar_entries = hw->mac.num_rar_entries;
+
+       /* Make sure we are using a valid rar index range */
+       if (rar >= rar_entries) {
+               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+               return IXGBE_ERR_INVALID_ARGUMENT;
+       }
+
+       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
+       rar_high &= ~IXGBE_RAH_VIND_MASK;
+       rar_high |= ((vmdq << IXGBE_RAH_VIND_SHIFT) & IXGBE_RAH_VIND_MASK);
+       IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);
+       return 0;
+}
+
+/**
+ *  ixgbe_clear_vmdq_82598 - Disassociate a VMDq set index from an rx address
+ *  @hw: pointer to hardware struct
+ *  @rar: receive address register index to associate with a VMDq index
+ *  @vmdq: VMDq clear index (not used in 82598, but elsewhere)
+ **/
+static s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
+{
+       u32 rar_high;
+       u32 rar_entries = hw->mac.num_rar_entries;
+
+
+       /* Make sure we are using a valid rar index range */
+       if (rar >= rar_entries) {
+               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+               return IXGBE_ERR_INVALID_ARGUMENT;
+       }
+
+       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
+       if (rar_high & IXGBE_RAH_VIND_MASK) {
+               rar_high &= ~IXGBE_RAH_VIND_MASK;
+               IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_set_vfta_82598 - Set VLAN filter table
+ *  @hw: pointer to hardware structure
+ *  @vlan: VLAN id to write to VLAN filter
+ *  @vind: VMDq output index that maps queue to VLAN id in VFTA
+ *  @vlan_on: boolean flag to turn on/off VLAN in VFTA
+ *
+ *  Turn on/off specified VLAN in the VLAN filter table.
+ **/
+static s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind,
+                               bool vlan_on)
+{
+       u32 regindex;
+       u32 bitindex;
+       u32 bits;
+       u32 vftabyte;
+
+       if (vlan > 4095)
+               return IXGBE_ERR_PARAM;
+
+       /* Determine 32-bit word position in array */
+       regindex = (vlan >> 5) & 0x7F;   /* upper seven bits */
+
+       /* Determine the location of the (VMD) queue index */
+       vftabyte =  ((vlan >> 3) & 0x03); /* bits (4:3) indicating byte array */
+       bitindex = (vlan & 0x7) << 2;    /* lower 3 bits indicate nibble */
+
+       /* Set the nibble for VMD queue index */
+       bits = IXGBE_READ_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex));
+       bits &= (~(0x0F << bitindex));
+       bits |= (vind << bitindex);
+       IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex), bits);
+
+       /* Determine the location of the bit for this VLAN id */
+       bitindex = vlan & 0x1F;   /* lower five bits */
+
+       bits = IXGBE_READ_REG(hw, IXGBE_VFTA(regindex));
+       if (vlan_on)
+               /* Turn on this VLAN id */
+               bits |= (1 << bitindex);
+       else
+               /* Turn off this VLAN id */
+               bits &= ~(1 << bitindex);
+       IXGBE_WRITE_REG(hw, IXGBE_VFTA(regindex), bits);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_clear_vfta_82598 - Clear VLAN filter table
+ *  @hw: pointer to hardware structure
+ *
+ *  Clears the VLAN filer table, and the VMDq index associated with the filter
+ **/
+static s32 ixgbe_clear_vfta_82598(struct ixgbe_hw *hw)
+{
+       u32 offset;
+       u32 vlanbyte;
+
+       for (offset = 0; offset < hw->mac.vft_size; offset++)
+               IXGBE_WRITE_REG(hw, IXGBE_VFTA(offset), 0);
+
+       for (vlanbyte = 0; vlanbyte < 4; vlanbyte++)
+               for (offset = 0; offset < hw->mac.vft_size; offset++)
+                       IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vlanbyte, offset),
+                                       0);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_read_analog_reg8_82598 - Reads 8 bit Atlas analog register
+ *  @hw: pointer to hardware structure
+ *  @reg: analog register to read
+ *  @val: read value
+ *
+ *  Performs read operation to Atlas analog register specified.
+ **/
+static s32 ixgbe_read_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 *val)
+{
+       u32  atlas_ctl;
+
+       IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL,
+                       IXGBE_ATLASCTL_WRITE_CMD | (reg << 8));
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(10);
+       atlas_ctl = IXGBE_READ_REG(hw, IXGBE_ATLASCTL);
+       *val = (u8)atlas_ctl;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_write_analog_reg8_82598 - Writes 8 bit Atlas analog register
+ *  @hw: pointer to hardware structure
+ *  @reg: atlas register to write
+ *  @val: value to write
+ *
+ *  Performs write operation to Atlas analog register specified.
+ **/
+static s32 ixgbe_write_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 val)
+{
+       u32  atlas_ctl;
+
+       atlas_ctl = (reg << 8) | val;
+       IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL, atlas_ctl);
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(10);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_read_i2c_eeprom_82598 - Reads 8 bit word over I2C interface.
+ *  @hw: pointer to hardware structure
+ *  @byte_offset: EEPROM byte offset to read
+ *  @eeprom_data: value read
+ *
+ *  Performs 8 byte read operation to SFP module's EEPROM over I2C interface.
+ **/
+static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset,
+                                      u8 *eeprom_data)
+{
+       s32 status = 0;
+       u16 sfp_addr = 0;
+       u16 sfp_data = 0;
+       u16 sfp_stat = 0;
+       u32 i;
+
+       if (hw->phy.type == ixgbe_phy_nl) {
+               /*
+                * phy SDA/SCL registers are at addresses 0xC30A to
+                * 0xC30D.  These registers are used to talk to the SFP+
+                * module's EEPROM through the SDA/SCL (I2C) interface.
+                */
+               sfp_addr = (IXGBE_I2C_EEPROM_DEV_ADDR << 8) + byte_offset;
+               sfp_addr = (sfp_addr | IXGBE_I2C_EEPROM_READ_MASK);
+               hw->phy.ops.write_reg(hw,
+                                     IXGBE_MDIO_PMA_PMD_SDA_SCL_ADDR,
+                                     MDIO_MMD_PMAPMD,
+                                     sfp_addr);
+
+               /* Poll status */
+               for (i = 0; i < 100; i++) {
+                       hw->phy.ops.read_reg(hw,
+                                            IXGBE_MDIO_PMA_PMD_SDA_SCL_STAT,
+                                            MDIO_MMD_PMAPMD,
+                                            &sfp_stat);
+                       sfp_stat = sfp_stat & IXGBE_I2C_EEPROM_STATUS_MASK;
+                       if (sfp_stat != IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS)
+                               break;
+                       usleep_range(10000, 20000);
+               }
+
+               if (sfp_stat != IXGBE_I2C_EEPROM_STATUS_PASS) {
+                       hw_dbg(hw, "EEPROM read did not pass.\n");
+                       status = IXGBE_ERR_SFP_NOT_PRESENT;
+                       goto out;
+               }
+
+               /* Read data */
+               hw->phy.ops.read_reg(hw, IXGBE_MDIO_PMA_PMD_SDA_SCL_DATA,
+                                    MDIO_MMD_PMAPMD, &sfp_data);
+
+               *eeprom_data = (u8)(sfp_data >> 8);
+       } else {
+               status = IXGBE_ERR_PHY;
+               goto out;
+       }
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_get_supported_physical_layer_82598 - Returns physical layer type
+ *  @hw: pointer to hardware structure
+ *
+ *  Determines physical layer capabilities of the current configuration.
+ **/
+static u32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw)
+{
+       u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
+       u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       u32 pma_pmd_10g = autoc & IXGBE_AUTOC_10G_PMA_PMD_MASK;
+       u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
+       u16 ext_ability = 0;
+
+       hw->phy.ops.identify(hw);
+
+       /* Copper PHY must be checked before AUTOC LMS to determine correct
+        * physical layer because 10GBase-T PHYs use LMS = KX4/KX */
+       switch (hw->phy.type) {
+       case ixgbe_phy_tn:
+       case ixgbe_phy_aq:
+       case ixgbe_phy_cu_unknown:
+               hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE,
+               MDIO_MMD_PMAPMD, &ext_ability);
+               if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
+               if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
+               if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
+               goto out;
+       default:
+               break;
+       }
+
+       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
+       case IXGBE_AUTOC_LMS_1G_AN:
+       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
+               if (pma_pmd_1g == IXGBE_AUTOC_1G_KX)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX;
+               else
+                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_BX;
+               break;
+       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
+               if (pma_pmd_10g == IXGBE_AUTOC_10G_CX4)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;
+               else if (pma_pmd_10g == IXGBE_AUTOC_10G_KX4)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
+               else /* XAUI */
+                       physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
+               break;
+       case IXGBE_AUTOC_LMS_KX4_AN:
+       case IXGBE_AUTOC_LMS_KX4_AN_1G_AN:
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_KX;
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
+               break;
+       default:
+               break;
+       }
+
+       if (hw->phy.type == ixgbe_phy_nl) {
+               hw->phy.ops.identify_sfp(hw);
+
+               switch (hw->phy.sfp_type) {
+               case ixgbe_sfp_type_da_cu:
+                       physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
+                       break;
+               case ixgbe_sfp_type_sr:
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
+                       break;
+               case ixgbe_sfp_type_lr:
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
+                       break;
+               default:
+                       physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
+                       break;
+               }
+       }
+
+       switch (hw->device_id) {
+       case IXGBE_DEV_ID_82598_DA_DUAL_PORT:
+               physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
+               break;
+       case IXGBE_DEV_ID_82598AF_DUAL_PORT:
+       case IXGBE_DEV_ID_82598AF_SINGLE_PORT:
+       case IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM:
+               physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
+               break;
+       case IXGBE_DEV_ID_82598EB_XF_LR:
+               physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
+               break;
+       default:
+               break;
+       }
+
+out:
+       return physical_layer;
+}
+
+/**
+ *  ixgbe_set_lan_id_multi_port_pcie_82598 - Set LAN id for PCIe multiple
+ *  port devices.
+ *  @hw: pointer to the HW structure
+ *
+ *  Calls common function and corrects issue with some single port devices
+ *  that enable LAN1 but not LAN0.
+ **/
+static void ixgbe_set_lan_id_multi_port_pcie_82598(struct ixgbe_hw *hw)
+{
+       struct ixgbe_bus_info *bus = &hw->bus;
+       u16 pci_gen = 0;
+       u16 pci_ctrl2 = 0;
+
+       ixgbe_set_lan_id_multi_port_pcie(hw);
+
+       /* check if LAN0 is disabled */
+       hw->eeprom.ops.read(hw, IXGBE_PCIE_GENERAL_PTR, &pci_gen);
+       if ((pci_gen != 0) && (pci_gen != 0xFFFF)) {
+
+               hw->eeprom.ops.read(hw, pci_gen + IXGBE_PCIE_CTRL2, &pci_ctrl2);
+
+               /* if LAN0 is completely disabled force function to 0 */
+               if ((pci_ctrl2 & IXGBE_PCIE_CTRL2_LAN_DISABLE) &&
+                   !(pci_ctrl2 & IXGBE_PCIE_CTRL2_DISABLE_SELECT) &&
+                   !(pci_ctrl2 & IXGBE_PCIE_CTRL2_DUMMY_ENABLE)) {
+
+                       bus->func = 0;
+               }
+       }
+}
+
+/**
+ * ixgbe_set_rxpba_82598 - Configure packet buffers
+ * @hw: pointer to hardware structure
+ * @dcb_config: pointer to ixgbe_dcb_config structure
+ *
+ * Configure packet buffers.
+ */
+static void ixgbe_set_rxpba_82598(struct ixgbe_hw *hw, int num_pb, u32 headroom,
+                                 int strategy)
+{
+       u32 rxpktsize = IXGBE_RXPBSIZE_64KB;
+       u8  i = 0;
+
+       if (!num_pb)
+               return;
+
+       /* Setup Rx packet buffer sizes */
+       switch (strategy) {
+       case PBA_STRATEGY_WEIGHTED:
+               /* Setup the first four at 80KB */
+               rxpktsize = IXGBE_RXPBSIZE_80KB;
+               for (; i < 4; i++)
+                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
+               /* Setup the last four at 48KB...don't re-init i */
+               rxpktsize = IXGBE_RXPBSIZE_48KB;
+               /* Fall Through */
+       case PBA_STRATEGY_EQUAL:
+       default:
+               /* Divide the remaining Rx packet buffer evenly among the TCs */
+               for (; i < IXGBE_MAX_PACKET_BUFFERS; i++)
+                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
+               break;
+       }
+
+       /* Setup Tx packet buffer sizes */
+       for (i = 0; i < IXGBE_MAX_PACKET_BUFFERS; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), IXGBE_TXPBSIZE_40KB);
+
+       return;
+}
+
+static struct ixgbe_mac_operations mac_ops_82598 = {
+       .init_hw                = &ixgbe_init_hw_generic,
+       .reset_hw               = &ixgbe_reset_hw_82598,
+       .start_hw               = &ixgbe_start_hw_82598,
+       .clear_hw_cntrs         = &ixgbe_clear_hw_cntrs_generic,
+       .get_media_type         = &ixgbe_get_media_type_82598,
+       .get_supported_physical_layer = &ixgbe_get_supported_physical_layer_82598,
+       .enable_rx_dma          = &ixgbe_enable_rx_dma_generic,
+       .get_mac_addr           = &ixgbe_get_mac_addr_generic,
+       .stop_adapter           = &ixgbe_stop_adapter_generic,
+       .get_bus_info           = &ixgbe_get_bus_info_generic,
+       .set_lan_id             = &ixgbe_set_lan_id_multi_port_pcie_82598,
+       .read_analog_reg8       = &ixgbe_read_analog_reg8_82598,
+       .write_analog_reg8      = &ixgbe_write_analog_reg8_82598,
+       .setup_link             = &ixgbe_setup_mac_link_82598,
+       .set_rxpba              = &ixgbe_set_rxpba_82598,
+       .check_link             = &ixgbe_check_mac_link_82598,
+       .get_link_capabilities  = &ixgbe_get_link_capabilities_82598,
+       .led_on                 = &ixgbe_led_on_generic,
+       .led_off                = &ixgbe_led_off_generic,
+       .blink_led_start        = &ixgbe_blink_led_start_generic,
+       .blink_led_stop         = &ixgbe_blink_led_stop_generic,
+       .set_rar                = &ixgbe_set_rar_generic,
+       .clear_rar              = &ixgbe_clear_rar_generic,
+       .set_vmdq               = &ixgbe_set_vmdq_82598,
+       .clear_vmdq             = &ixgbe_clear_vmdq_82598,
+       .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
+       .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
+       .enable_mc              = &ixgbe_enable_mc_generic,
+       .disable_mc             = &ixgbe_disable_mc_generic,
+       .clear_vfta             = &ixgbe_clear_vfta_82598,
+       .set_vfta               = &ixgbe_set_vfta_82598,
+       .fc_enable              = &ixgbe_fc_enable_82598,
+       .set_fw_drv_ver         = NULL,
+       .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
+       .release_swfw_sync      = &ixgbe_release_swfw_sync,
+};
+
+static struct ixgbe_eeprom_operations eeprom_ops_82598 = {
+       .init_params            = &ixgbe_init_eeprom_params_generic,
+       .read                   = &ixgbe_read_eerd_generic,
+       .read_buffer            = &ixgbe_read_eerd_buffer_generic,
+       .calc_checksum          = &ixgbe_calc_eeprom_checksum_generic,
+       .validate_checksum      = &ixgbe_validate_eeprom_checksum_generic,
+       .update_checksum        = &ixgbe_update_eeprom_checksum_generic,
+};
+
+static struct ixgbe_phy_operations phy_ops_82598 = {
+       .identify               = &ixgbe_identify_phy_generic,
+       .identify_sfp           = &ixgbe_identify_sfp_module_generic,
+       .init                   = &ixgbe_init_phy_ops_82598,
+       .reset                  = &ixgbe_reset_phy_generic,
+       .read_reg               = &ixgbe_read_phy_reg_generic,
+       .write_reg              = &ixgbe_write_phy_reg_generic,
+       .setup_link             = &ixgbe_setup_phy_link_generic,
+       .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
+       .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_82598,
+       .check_overtemp   = &ixgbe_tn_check_overtemp,
+};
+
+struct ixgbe_info ixgbe_82598_info = {
+       .mac                    = ixgbe_mac_82598EB,
+       .get_invariants         = &ixgbe_get_invariants_82598,
+       .mac_ops                = &mac_ops_82598,
+       .eeprom_ops             = &eeprom_ops_82598,
+       .phy_ops                = &phy_ops_82598,
+};
+
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
new file mode 100644 (file)
index 0000000..34f30ec
--- /dev/null
@@ -0,0 +1,2263 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+
+#include "ixgbe.h"
+#include "ixgbe_phy.h"
+#include "ixgbe_mbx.h"
+
+#define IXGBE_82599_MAX_TX_QUEUES 128
+#define IXGBE_82599_MAX_RX_QUEUES 128
+#define IXGBE_82599_RAR_ENTRIES   128
+#define IXGBE_82599_MC_TBL_SIZE   128
+#define IXGBE_82599_VFT_TBL_SIZE  128
+#define IXGBE_82599_RX_PB_SIZE   512
+
+static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
+static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
+static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
+static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
+                                                ixgbe_link_speed speed,
+                                                bool autoneg,
+                                                bool autoneg_wait_to_complete);
+static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
+                                           ixgbe_link_speed speed,
+                                           bool autoneg,
+                                           bool autoneg_wait_to_complete);
+static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
+                                     bool autoneg_wait_to_complete);
+static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
+                               ixgbe_link_speed speed,
+                               bool autoneg,
+                               bool autoneg_wait_to_complete);
+static s32 ixgbe_setup_copper_link_82599(struct ixgbe_hw *hw,
+                                         ixgbe_link_speed speed,
+                                         bool autoneg,
+                                         bool autoneg_wait_to_complete);
+static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw);
+static bool ixgbe_verify_lesm_fw_enabled_82599(struct ixgbe_hw *hw);
+
+static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mac_info *mac = &hw->mac;
+
+       /* enable the laser control functions for SFP+ fiber */
+       if (mac->ops.get_media_type(hw) == ixgbe_media_type_fiber) {
+               mac->ops.disable_tx_laser =
+                                      &ixgbe_disable_tx_laser_multispeed_fiber;
+               mac->ops.enable_tx_laser =
+                                       &ixgbe_enable_tx_laser_multispeed_fiber;
+               mac->ops.flap_tx_laser = &ixgbe_flap_tx_laser_multispeed_fiber;
+       } else {
+               mac->ops.disable_tx_laser = NULL;
+               mac->ops.enable_tx_laser = NULL;
+               mac->ops.flap_tx_laser = NULL;
+       }
+
+       if (hw->phy.multispeed_fiber) {
+               /* Set up dual speed SFP+ support */
+               mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber;
+       } else {
+               if ((mac->ops.get_media_type(hw) ==
+                    ixgbe_media_type_backplane) &&
+                   (hw->phy.smart_speed == ixgbe_smart_speed_auto ||
+                    hw->phy.smart_speed == ixgbe_smart_speed_on) &&
+                    !ixgbe_verify_lesm_fw_enabled_82599(hw))
+                       mac->ops.setup_link = &ixgbe_setup_mac_link_smartspeed;
+               else
+                       mac->ops.setup_link = &ixgbe_setup_mac_link_82599;
+       }
+}
+
+static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
+{
+       s32 ret_val = 0;
+       u32 reg_anlp1 = 0;
+       u32 i = 0;
+       u16 list_offset, data_offset, data_value;
+
+       if (hw->phy.sfp_type != ixgbe_sfp_type_unknown) {
+               ixgbe_init_mac_link_ops_82599(hw);
+
+               hw->phy.ops.reset = NULL;
+
+               ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,
+                                                             &data_offset);
+               if (ret_val != 0)
+                       goto setup_sfp_out;
+
+               /* PHY config will finish before releasing the semaphore */
+               ret_val = hw->mac.ops.acquire_swfw_sync(hw,
+                                                       IXGBE_GSSR_MAC_CSR_SM);
+               if (ret_val != 0) {
+                       ret_val = IXGBE_ERR_SWFW_SYNC;
+                       goto setup_sfp_out;
+               }
+
+               hw->eeprom.ops.read(hw, ++data_offset, &data_value);
+               while (data_value != 0xffff) {
+                       IXGBE_WRITE_REG(hw, IXGBE_CORECTL, data_value);
+                       IXGBE_WRITE_FLUSH(hw);
+                       hw->eeprom.ops.read(hw, ++data_offset, &data_value);
+               }
+
+               /* Release the semaphore */
+               hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);
+               /*
+                * Delay obtaining semaphore again to allow FW access,
+                * semaphore_delay is in ms usleep_range needs us.
+                */
+               usleep_range(hw->eeprom.semaphore_delay * 1000,
+                            hw->eeprom.semaphore_delay * 2000);
+
+               /* Now restart DSP by setting Restart_AN and clearing LMS */
+               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, ((IXGBE_READ_REG(hw,
+                               IXGBE_AUTOC) & ~IXGBE_AUTOC_LMS_MASK) |
+                               IXGBE_AUTOC_AN_RESTART));
+
+               /* Wait for AN to leave state 0 */
+               for (i = 0; i < 10; i++) {
+                       usleep_range(4000, 8000);
+                       reg_anlp1 = IXGBE_READ_REG(hw, IXGBE_ANLP1);
+                       if (reg_anlp1 & IXGBE_ANLP1_AN_STATE_MASK)
+                               break;
+               }
+               if (!(reg_anlp1 & IXGBE_ANLP1_AN_STATE_MASK)) {
+                       hw_dbg(hw, "sfp module setup not complete\n");
+                       ret_val = IXGBE_ERR_SFP_SETUP_NOT_COMPLETE;
+                       goto setup_sfp_out;
+               }
+
+               /* Restart DSP by setting Restart_AN and return to SFI mode */
+               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (IXGBE_READ_REG(hw,
+                               IXGBE_AUTOC) | IXGBE_AUTOC_LMS_10G_SERIAL |
+                               IXGBE_AUTOC_AN_RESTART));
+       }
+
+setup_sfp_out:
+       return ret_val;
+}
+
+static s32 ixgbe_get_invariants_82599(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mac_info *mac = &hw->mac;
+
+       ixgbe_init_mac_link_ops_82599(hw);
+
+       mac->mcft_size = IXGBE_82599_MC_TBL_SIZE;
+       mac->vft_size = IXGBE_82599_VFT_TBL_SIZE;
+       mac->num_rar_entries = IXGBE_82599_RAR_ENTRIES;
+       mac->max_rx_queues = IXGBE_82599_MAX_RX_QUEUES;
+       mac->max_tx_queues = IXGBE_82599_MAX_TX_QUEUES;
+       mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_init_phy_ops_82599 - PHY/SFP specific init
+ *  @hw: pointer to hardware structure
+ *
+ *  Initialize any function pointers that were not able to be
+ *  set during get_invariants because the PHY/SFP type was
+ *  not known.  Perform the SFP init if necessary.
+ *
+ **/
+static s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mac_info *mac = &hw->mac;
+       struct ixgbe_phy_info *phy = &hw->phy;
+       s32 ret_val = 0;
+
+       /* Identify the PHY or SFP module */
+       ret_val = phy->ops.identify(hw);
+
+       /* Setup function pointers based on detected SFP module and speeds */
+       ixgbe_init_mac_link_ops_82599(hw);
+
+       /* If copper media, overwrite with copper function pointers */
+       if (mac->ops.get_media_type(hw) == ixgbe_media_type_copper) {
+               mac->ops.setup_link = &ixgbe_setup_copper_link_82599;
+               mac->ops.get_link_capabilities =
+                       &ixgbe_get_copper_link_capabilities_generic;
+       }
+
+       /* Set necessary function pointers based on phy type */
+       switch (hw->phy.type) {
+       case ixgbe_phy_tn:
+               phy->ops.check_link = &ixgbe_check_phy_link_tnx;
+               phy->ops.setup_link = &ixgbe_setup_phy_link_tnx;
+               phy->ops.get_firmware_version =
+                            &ixgbe_get_phy_firmware_version_tnx;
+               break;
+       case ixgbe_phy_aq:
+               phy->ops.get_firmware_version =
+                       &ixgbe_get_phy_firmware_version_generic;
+               break;
+       default:
+               break;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_get_link_capabilities_82599 - Determines link capabilities
+ *  @hw: pointer to hardware structure
+ *  @speed: pointer to link speed
+ *  @negotiation: true when autoneg or autotry is enabled
+ *
+ *  Determines the link capabilities by reading the AUTOC register.
+ **/
+static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
+                                             ixgbe_link_speed *speed,
+                                             bool *negotiation)
+{
+       s32 status = 0;
+       u32 autoc = 0;
+
+       /* Determine 1G link capabilities off of SFP+ type */
+       if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+           hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) {
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+               *negotiation = true;
+               goto out;
+       }
+
+       /*
+        * Determine link capabilities based on the stored value of AUTOC,
+        * which represents EEPROM defaults.  If AUTOC value has not been
+        * stored, use the current register value.
+        */
+       if (hw->mac.orig_link_settings_stored)
+               autoc = hw->mac.orig_autoc;
+       else
+               autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+
+       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
+       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+               *negotiation = false;
+               break;
+
+       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
+               *speed = IXGBE_LINK_SPEED_10GB_FULL;
+               *negotiation = false;
+               break;
+
+       case IXGBE_AUTOC_LMS_1G_AN:
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+               *negotiation = true;
+               break;
+
+       case IXGBE_AUTOC_LMS_10G_SERIAL:
+               *speed = IXGBE_LINK_SPEED_10GB_FULL;
+               *negotiation = false;
+               break;
+
+       case IXGBE_AUTOC_LMS_KX4_KX_KR:
+       case IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN:
+               *speed = IXGBE_LINK_SPEED_UNKNOWN;
+               if (autoc & IXGBE_AUTOC_KR_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
+               *negotiation = true;
+               break;
+
+       case IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII:
+               *speed = IXGBE_LINK_SPEED_100_FULL;
+               if (autoc & IXGBE_AUTOC_KR_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
+                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
+               *negotiation = true;
+               break;
+
+       case IXGBE_AUTOC_LMS_SGMII_1G_100M:
+               *speed = IXGBE_LINK_SPEED_1GB_FULL | IXGBE_LINK_SPEED_100_FULL;
+               *negotiation = false;
+               break;
+
+       default:
+               status = IXGBE_ERR_LINK_SETUP;
+               goto out;
+               break;
+       }
+
+       if (hw->phy.multispeed_fiber) {
+               *speed |= IXGBE_LINK_SPEED_10GB_FULL |
+                         IXGBE_LINK_SPEED_1GB_FULL;
+               *negotiation = true;
+       }
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_get_media_type_82599 - Get media type
+ *  @hw: pointer to hardware structure
+ *
+ *  Returns the media type (fiber, copper, backplane)
+ **/
+static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
+{
+       enum ixgbe_media_type media_type;
+
+       /* Detect if there is a copper PHY attached. */
+       switch (hw->phy.type) {
+       case ixgbe_phy_cu_unknown:
+       case ixgbe_phy_tn:
+       case ixgbe_phy_aq:
+               media_type = ixgbe_media_type_copper;
+               goto out;
+       default:
+               break;
+       }
+
+       switch (hw->device_id) {
+       case IXGBE_DEV_ID_82599_KX4:
+       case IXGBE_DEV_ID_82599_KX4_MEZZ:
+       case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
+       case IXGBE_DEV_ID_82599_KR:
+       case IXGBE_DEV_ID_82599_BACKPLANE_FCOE:
+       case IXGBE_DEV_ID_82599_XAUI_LOM:
+               /* Default device ID is mezzanine card KX/KX4 */
+               media_type = ixgbe_media_type_backplane;
+               break;
+       case IXGBE_DEV_ID_82599_SFP:
+       case IXGBE_DEV_ID_82599_SFP_FCOE:
+       case IXGBE_DEV_ID_82599_SFP_EM:
+       case IXGBE_DEV_ID_82599_SFP_SF2:
+               media_type = ixgbe_media_type_fiber;
+               break;
+       case IXGBE_DEV_ID_82599_CX4:
+               media_type = ixgbe_media_type_cx4;
+               break;
+       case IXGBE_DEV_ID_82599_T3_LOM:
+               media_type = ixgbe_media_type_copper;
+               break;
+       case IXGBE_DEV_ID_82599_LS:
+               media_type = ixgbe_media_type_fiber_lco;
+               break;
+       default:
+               media_type = ixgbe_media_type_unknown;
+               break;
+       }
+out:
+       return media_type;
+}
+
+/**
+ *  ixgbe_start_mac_link_82599 - Setup MAC link settings
+ *  @hw: pointer to hardware structure
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ *  Configures link settings based on values in the ixgbe_hw struct.
+ *  Restarts the link.  Performs autonegotiation if needed.
+ **/
+static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
+                               bool autoneg_wait_to_complete)
+{
+       u32 autoc_reg;
+       u32 links_reg;
+       u32 i;
+       s32 status = 0;
+
+       /* Restart link */
+       autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       autoc_reg |= IXGBE_AUTOC_AN_RESTART;
+       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
+
+       /* Only poll for autoneg to complete if specified to do so */
+       if (autoneg_wait_to_complete) {
+               if ((autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
+                    IXGBE_AUTOC_LMS_KX4_KX_KR ||
+                   (autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
+                    IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
+                   (autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
+                    IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
+                       links_reg = 0; /* Just in case Autoneg time = 0 */
+                       for (i = 0; i < IXGBE_AUTO_NEG_TIME; i++) {
+                               links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
+                               if (links_reg & IXGBE_LINKS_KX_AN_COMP)
+                                       break;
+                               msleep(100);
+                       }
+                       if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {
+                               status = IXGBE_ERR_AUTONEG_NOT_COMPLETE;
+                               hw_dbg(hw, "Autoneg did not complete.\n");
+                       }
+               }
+       }
+
+       /* Add delay to filter out noises during initial link setup */
+       msleep(50);
+
+       return status;
+}
+
+/**
+ *  ixgbe_disable_tx_laser_multispeed_fiber - Disable Tx laser
+ *  @hw: pointer to hardware structure
+ *
+ *  The base drivers may require better control over SFP+ module
+ *  PHY states.  This includes selectively shutting down the Tx
+ *  laser on the PHY, effectively halting physical link.
+ **/
+static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
+{
+       u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
+
+       /* Disable tx laser; allow 100us to go dark per spec */
+       esdp_reg |= IXGBE_ESDP_SDP3;
+       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(100);
+}
+
+/**
+ *  ixgbe_enable_tx_laser_multispeed_fiber - Enable Tx laser
+ *  @hw: pointer to hardware structure
+ *
+ *  The base drivers may require better control over SFP+ module
+ *  PHY states.  This includes selectively turning on the Tx
+ *  laser on the PHY, effectively starting physical link.
+ **/
+static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
+{
+       u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
+
+       /* Enable tx laser; allow 100ms to light up */
+       esdp_reg &= ~IXGBE_ESDP_SDP3;
+       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+       IXGBE_WRITE_FLUSH(hw);
+       msleep(100);
+}
+
+/**
+ *  ixgbe_flap_tx_laser_multispeed_fiber - Flap Tx laser
+ *  @hw: pointer to hardware structure
+ *
+ *  When the driver changes the link speeds that it can support,
+ *  it sets autotry_restart to true to indicate that we need to
+ *  initiate a new autotry session with the link partner.  To do
+ *  so, we set the speed then disable and re-enable the tx laser, to
+ *  alert the link partner that it also needs to restart autotry on its
+ *  end.  This is consistent with true clause 37 autoneg, which also
+ *  involves a loss of signal.
+ **/
+static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
+{
+       if (hw->mac.autotry_restart) {
+               ixgbe_disable_tx_laser_multispeed_fiber(hw);
+               ixgbe_enable_tx_laser_multispeed_fiber(hw);
+               hw->mac.autotry_restart = false;
+       }
+}
+
+/**
+ *  ixgbe_setup_mac_link_multispeed_fiber - Set MAC link speed
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if autonegotiation enabled
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ *  Set the link speed in the AUTOC register and restarts link.
+ **/
+static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
+                                          ixgbe_link_speed speed,
+                                          bool autoneg,
+                                          bool autoneg_wait_to_complete)
+{
+       s32 status = 0;
+       ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
+       ixgbe_link_speed highest_link_speed = IXGBE_LINK_SPEED_UNKNOWN;
+       u32 speedcnt = 0;
+       u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
+       u32 i = 0;
+       bool link_up = false;
+       bool negotiation;
+
+       /* Mask off requested but non-supported speeds */
+       status = hw->mac.ops.get_link_capabilities(hw, &link_speed,
+                                                  &negotiation);
+       if (status != 0)
+               return status;
+
+       speed &= link_speed;
+
+       /*
+        * Try each speed one by one, highest priority first.  We do this in
+        * software because 10gb fiber doesn't support speed autonegotiation.
+        */
+       if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
+               speedcnt++;
+               highest_link_speed = IXGBE_LINK_SPEED_10GB_FULL;
+
+               /* If we already have link at this speed, just jump out */
+               status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
+                                               false);
+               if (status != 0)
+                       return status;
+
+               if ((link_speed == IXGBE_LINK_SPEED_10GB_FULL) && link_up)
+                       goto out;
+
+               /* Set the module link speed */
+               esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);
+               IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+               IXGBE_WRITE_FLUSH(hw);
+
+               /* Allow module to change analog characteristics (1G->10G) */
+               msleep(40);
+
+               status = ixgbe_setup_mac_link_82599(hw,
+                                                   IXGBE_LINK_SPEED_10GB_FULL,
+                                                   autoneg,
+                                                   autoneg_wait_to_complete);
+               if (status != 0)
+                       return status;
+
+               /* Flap the tx laser if it has not already been done */
+               hw->mac.ops.flap_tx_laser(hw);
+
+               /*
+                * Wait for the controller to acquire link.  Per IEEE 802.3ap,
+                * Section 73.10.2, we may have to wait up to 500ms if KR is
+                * attempted.  82599 uses the same timing for 10g SFI.
+                */
+               for (i = 0; i < 5; i++) {
+                       /* Wait for the link partner to also set speed */
+                       msleep(100);
+
+                       /* If we have link, just jump out */
+                       status = hw->mac.ops.check_link(hw, &link_speed,
+                                                       &link_up, false);
+                       if (status != 0)
+                               return status;
+
+                       if (link_up)
+                               goto out;
+               }
+       }
+
+       if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
+               speedcnt++;
+               if (highest_link_speed == IXGBE_LINK_SPEED_UNKNOWN)
+                       highest_link_speed = IXGBE_LINK_SPEED_1GB_FULL;
+
+               /* If we already have link at this speed, just jump out */
+               status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
+                                               false);
+               if (status != 0)
+                       return status;
+
+               if ((link_speed == IXGBE_LINK_SPEED_1GB_FULL) && link_up)
+                       goto out;
+
+               /* Set the module link speed */
+               esdp_reg &= ~IXGBE_ESDP_SDP5;
+               esdp_reg |= IXGBE_ESDP_SDP5_DIR;
+               IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
+               IXGBE_WRITE_FLUSH(hw);
+
+               /* Allow module to change analog characteristics (10G->1G) */
+               msleep(40);
+
+               status = ixgbe_setup_mac_link_82599(hw,
+                                                   IXGBE_LINK_SPEED_1GB_FULL,
+                                                   autoneg,
+                                                   autoneg_wait_to_complete);
+               if (status != 0)
+                       return status;
+
+               /* Flap the tx laser if it has not already been done */
+               hw->mac.ops.flap_tx_laser(hw);
+
+               /* Wait for the link partner to also set speed */
+               msleep(100);
+
+               /* If we have link, just jump out */
+               status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
+                                               false);
+               if (status != 0)
+                       return status;
+
+               if (link_up)
+                       goto out;
+       }
+
+       /*
+        * We didn't get link.  Configure back to the highest speed we tried,
+        * (if there was more than one).  We call ourselves back with just the
+        * single highest speed that the user requested.
+        */
+       if (speedcnt > 1)
+               status = ixgbe_setup_mac_link_multispeed_fiber(hw,
+                                                              highest_link_speed,
+                                                              autoneg,
+                                                              autoneg_wait_to_complete);
+
+out:
+       /* Set autoneg_advertised value based on input link speed */
+       hw->phy.autoneg_advertised = 0;
+
+       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;
+
+       if (speed & IXGBE_LINK_SPEED_1GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
+
+       return status;
+}
+
+/**
+ *  ixgbe_setup_mac_link_smartspeed - Set MAC link speed using SmartSpeed
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if autonegotiation enabled
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ *  Implements the Intel SmartSpeed algorithm.
+ **/
+static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
+                                    ixgbe_link_speed speed, bool autoneg,
+                                    bool autoneg_wait_to_complete)
+{
+       s32 status = 0;
+       ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
+       s32 i, j;
+       bool link_up = false;
+       u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+
+        /* Set autoneg_advertised value based on input link speed */
+       hw->phy.autoneg_advertised = 0;
+
+       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;
+
+       if (speed & IXGBE_LINK_SPEED_1GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
+
+       if (speed & IXGBE_LINK_SPEED_100_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_100_FULL;
+
+       /*
+        * Implement Intel SmartSpeed algorithm.  SmartSpeed will reduce the
+        * autoneg advertisement if link is unable to be established at the
+        * highest negotiated rate.  This can sometimes happen due to integrity
+        * issues with the physical media connection.
+        */
+
+       /* First, try to get link with full advertisement */
+       hw->phy.smart_speed_active = false;
+       for (j = 0; j < IXGBE_SMARTSPEED_MAX_RETRIES; j++) {
+               status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
+                                                   autoneg_wait_to_complete);
+               if (status != 0)
+                       goto out;
+
+               /*
+                * Wait for the controller to acquire link.  Per IEEE 802.3ap,
+                * Section 73.10.2, we may have to wait up to 500ms if KR is
+                * attempted, or 200ms if KX/KX4/BX/BX4 is attempted, per
+                * Table 9 in the AN MAS.
+                */
+               for (i = 0; i < 5; i++) {
+                       mdelay(100);
+
+                       /* If we have link, just jump out */
+                       status = hw->mac.ops.check_link(hw, &link_speed,
+                                                       &link_up, false);
+                       if (status != 0)
+                               goto out;
+
+                       if (link_up)
+                               goto out;
+               }
+       }
+
+       /*
+        * We didn't get link.  If we advertised KR plus one of KX4/KX
+        * (or BX4/BX), then disable KR and try again.
+        */
+       if (((autoc_reg & IXGBE_AUTOC_KR_SUPP) == 0) ||
+           ((autoc_reg & IXGBE_AUTOC_KX4_KX_SUPP_MASK) == 0))
+               goto out;
+
+       /* Turn SmartSpeed on to disable KR support */
+       hw->phy.smart_speed_active = true;
+       status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
+                                           autoneg_wait_to_complete);
+       if (status != 0)
+               goto out;
+
+       /*
+        * Wait for the controller to acquire link.  600ms will allow for
+        * the AN link_fail_inhibit_timer as well for multiple cycles of
+        * parallel detect, both 10g and 1g. This allows for the maximum
+        * connect attempts as defined in the AN MAS table 73-7.
+        */
+       for (i = 0; i < 6; i++) {
+               mdelay(100);
+
+               /* If we have link, just jump out */
+               status = hw->mac.ops.check_link(hw, &link_speed,
+                                               &link_up, false);
+               if (status != 0)
+                       goto out;
+
+               if (link_up)
+                       goto out;
+       }
+
+       /* We didn't get link.  Turn SmartSpeed back off. */
+       hw->phy.smart_speed_active = false;
+       status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
+                                           autoneg_wait_to_complete);
+
+out:
+       if (link_up && (link_speed == IXGBE_LINK_SPEED_1GB_FULL))
+               hw_dbg(hw, "Smartspeed has downgraded the link speed from "
+                      "the maximum advertised\n");
+       return status;
+}
+
+/**
+ *  ixgbe_setup_mac_link_82599 - Set MAC link speed
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if autonegotiation enabled
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ *  Set the link speed in the AUTOC register and restarts link.
+ **/
+static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
+                               ixgbe_link_speed speed, bool autoneg,
+                               bool autoneg_wait_to_complete)
+{
+       s32 status = 0;
+       u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       u32 autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+       u32 start_autoc = autoc;
+       u32 orig_autoc = 0;
+       u32 link_mode = autoc & IXGBE_AUTOC_LMS_MASK;
+       u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
+       u32 pma_pmd_10g_serial = autoc2 & IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK;
+       u32 links_reg;
+       u32 i;
+       ixgbe_link_speed link_capabilities = IXGBE_LINK_SPEED_UNKNOWN;
+
+       /* Check to see if speed passed in is supported. */
+       hw->mac.ops.get_link_capabilities(hw, &link_capabilities, &autoneg);
+       if (status != 0)
+               goto out;
+
+       speed &= link_capabilities;
+
+       if (speed == IXGBE_LINK_SPEED_UNKNOWN) {
+               status = IXGBE_ERR_LINK_SETUP;
+               goto out;
+       }
+
+       /* Use stored value (EEPROM defaults) of AUTOC to find KR/KX4 support*/
+       if (hw->mac.orig_link_settings_stored)
+               orig_autoc = hw->mac.orig_autoc;
+       else
+               orig_autoc = autoc;
+
+       if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
+           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
+           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
+               /* Set KX4/KX/KR support according to speed requested */
+               autoc &= ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP);
+               if (speed & IXGBE_LINK_SPEED_10GB_FULL)
+                       if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
+                               autoc |= IXGBE_AUTOC_KX4_SUPP;
+                       if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
+                           (hw->phy.smart_speed_active == false))
+                               autoc |= IXGBE_AUTOC_KR_SUPP;
+               if (speed & IXGBE_LINK_SPEED_1GB_FULL)
+                       autoc |= IXGBE_AUTOC_KX_SUPP;
+       } else if ((pma_pmd_1g == IXGBE_AUTOC_1G_SFI) &&
+                  (link_mode == IXGBE_AUTOC_LMS_1G_LINK_NO_AN ||
+                   link_mode == IXGBE_AUTOC_LMS_1G_AN)) {
+               /* Switch from 1G SFI to 10G SFI if requested */
+               if ((speed == IXGBE_LINK_SPEED_10GB_FULL) &&
+                   (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)) {
+                       autoc &= ~IXGBE_AUTOC_LMS_MASK;
+                       autoc |= IXGBE_AUTOC_LMS_10G_SERIAL;
+               }
+       } else if ((pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI) &&
+                  (link_mode == IXGBE_AUTOC_LMS_10G_SERIAL)) {
+               /* Switch from 10G SFI to 1G SFI if requested */
+               if ((speed == IXGBE_LINK_SPEED_1GB_FULL) &&
+                   (pma_pmd_1g == IXGBE_AUTOC_1G_SFI)) {
+                       autoc &= ~IXGBE_AUTOC_LMS_MASK;
+                       if (autoneg)
+                               autoc |= IXGBE_AUTOC_LMS_1G_AN;
+                       else
+                               autoc |= IXGBE_AUTOC_LMS_1G_LINK_NO_AN;
+               }
+       }
+
+       if (autoc != start_autoc) {
+               /* Restart link */
+               autoc |= IXGBE_AUTOC_AN_RESTART;
+               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);
+
+               /* Only poll for autoneg to complete if specified to do so */
+               if (autoneg_wait_to_complete) {
+                       if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
+                           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
+                           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
+                               links_reg = 0; /*Just in case Autoneg time=0*/
+                               for (i = 0; i < IXGBE_AUTO_NEG_TIME; i++) {
+                                       links_reg =
+                                              IXGBE_READ_REG(hw, IXGBE_LINKS);
+                                       if (links_reg & IXGBE_LINKS_KX_AN_COMP)
+                                               break;
+                                       msleep(100);
+                               }
+                               if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {
+                                       status =
+                                               IXGBE_ERR_AUTONEG_NOT_COMPLETE;
+                                       hw_dbg(hw, "Autoneg did not "
+                                              "complete.\n");
+                               }
+                       }
+               }
+
+               /* Add delay to filter out noises during initial link setup */
+               msleep(50);
+       }
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_setup_copper_link_82599 - Set the PHY autoneg advertised field
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if autonegotiation enabled
+ *  @autoneg_wait_to_complete: true if waiting is needed to complete
+ *
+ *  Restarts link on PHY and MAC based on settings passed in.
+ **/
+static s32 ixgbe_setup_copper_link_82599(struct ixgbe_hw *hw,
+                                         ixgbe_link_speed speed,
+                                         bool autoneg,
+                                         bool autoneg_wait_to_complete)
+{
+       s32 status;
+
+       /* Setup the PHY according to input speed */
+       status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,
+                                             autoneg_wait_to_complete);
+       /* Set up MAC */
+       ixgbe_start_mac_link_82599(hw, autoneg_wait_to_complete);
+
+       return status;
+}
+
+/**
+ *  ixgbe_reset_hw_82599 - Perform hardware reset
+ *  @hw: pointer to hardware structure
+ *
+ *  Resets the hardware by resetting the transmit and receive units, masks
+ *  and clears all interrupts, perform a PHY reset, and perform a link (MAC)
+ *  reset.
+ **/
+static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
+{
+       s32 status = 0;
+       u32 ctrl;
+       u32 i;
+       u32 autoc;
+       u32 autoc2;
+
+       /* Call adapter stop to disable tx/rx and clear interrupts */
+       hw->mac.ops.stop_adapter(hw);
+
+       /* PHY ops must be identified and initialized prior to reset */
+
+       /* Identify PHY and related function pointers */
+       status = hw->phy.ops.init(hw);
+
+       if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
+               goto reset_hw_out;
+
+       /* Setup SFP module if there is one present. */
+       if (hw->phy.sfp_setup_needed) {
+               status = hw->mac.ops.setup_sfp(hw);
+               hw->phy.sfp_setup_needed = false;
+       }
+
+       if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
+               goto reset_hw_out;
+
+       /* Reset PHY */
+       if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)
+               hw->phy.ops.reset(hw);
+
+       /*
+        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
+        * access and verify no pending requests before reset
+        */
+       ixgbe_disable_pcie_master(hw);
+
+mac_reset_top:
+       /*
+        * Issue global reset to the MAC.  This needs to be a SW reset.
+        * If link reset is used, it might reset the MAC when mng is using it
+        */
+       ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
+       IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | IXGBE_CTRL_RST));
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Poll for reset bit to self-clear indicating reset is complete */
+       for (i = 0; i < 10; i++) {
+               udelay(1);
+               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
+               if (!(ctrl & IXGBE_CTRL_RST))
+                       break;
+       }
+       if (ctrl & IXGBE_CTRL_RST) {
+               status = IXGBE_ERR_RESET_FAILED;
+               hw_dbg(hw, "Reset polling failed to complete.\n");
+       }
+
+       /*
+        * Double resets are required for recovery from certain error
+        * conditions.  Between resets, it is necessary to stall to allow time
+        * for any pending HW events to complete.  We use 1usec since that is
+        * what is needed for ixgbe_disable_pcie_master().  The second reset
+        * then clears out any effects of those events.
+        */
+       if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
+               hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+               udelay(1);
+               goto mac_reset_top;
+       }
+
+       msleep(50);
+
+       /*
+        * Store the original AUTOC/AUTOC2 values if they have not been
+        * stored off yet.  Otherwise restore the stored original
+        * values since the reset operation sets back to defaults.
+        */
+       autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+       if (hw->mac.orig_link_settings_stored == false) {
+               hw->mac.orig_autoc = autoc;
+               hw->mac.orig_autoc2 = autoc2;
+               hw->mac.orig_link_settings_stored = true;
+       } else {
+               if (autoc != hw->mac.orig_autoc)
+                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (hw->mac.orig_autoc |
+                                       IXGBE_AUTOC_AN_RESTART));
+
+               if ((autoc2 & IXGBE_AUTOC2_UPPER_MASK) !=
+                   (hw->mac.orig_autoc2 & IXGBE_AUTOC2_UPPER_MASK)) {
+                       autoc2 &= ~IXGBE_AUTOC2_UPPER_MASK;
+                       autoc2 |= (hw->mac.orig_autoc2 &
+                                  IXGBE_AUTOC2_UPPER_MASK);
+                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC2, autoc2);
+               }
+       }
+
+       /* Store the permanent mac address */
+       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
+
+       /*
+        * Store MAC address from RAR0, clear receive address registers, and
+        * clear the multicast table.  Also reset num_rar_entries to 128,
+        * since we modify this value when programming the SAN MAC address.
+        */
+       hw->mac.num_rar_entries = 128;
+       hw->mac.ops.init_rx_addrs(hw);
+
+       /* Store the permanent SAN mac address */
+       hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
+
+       /* Add the SAN MAC address to the RAR only if it's a valid address */
+       if (ixgbe_validate_mac_addr(hw->mac.san_addr) == 0) {
+               hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,
+                                   hw->mac.san_addr, 0, IXGBE_RAH_AV);
+
+               /* Reserve the last RAR for the SAN MAC address */
+               hw->mac.num_rar_entries--;
+       }
+
+       /* Store the alternative WWNN/WWPN prefix */
+       hw->mac.ops.get_wwn_prefix(hw, &hw->mac.wwnn_prefix,
+                                      &hw->mac.wwpn_prefix);
+
+reset_hw_out:
+       return status;
+}
+
+/**
+ *  ixgbe_reinit_fdir_tables_82599 - Reinitialize Flow Director tables.
+ *  @hw: pointer to hardware structure
+ **/
+s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw)
+{
+       int i;
+       u32 fdirctrl = IXGBE_READ_REG(hw, IXGBE_FDIRCTRL);
+       fdirctrl &= ~IXGBE_FDIRCTRL_INIT_DONE;
+
+       /*
+        * Before starting reinitialization process,
+        * FDIRCMD.CMD must be zero.
+        */
+       for (i = 0; i < IXGBE_FDIRCMD_CMD_POLL; i++) {
+               if (!(IXGBE_READ_REG(hw, IXGBE_FDIRCMD) &
+                     IXGBE_FDIRCMD_CMD_MASK))
+                       break;
+               udelay(10);
+       }
+       if (i >= IXGBE_FDIRCMD_CMD_POLL) {
+               hw_dbg(hw, "Flow Director previous command isn't complete, "
+                      "aborting table re-initialization.\n");
+               return IXGBE_ERR_FDIR_REINIT_FAILED;
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRFREE, 0);
+       IXGBE_WRITE_FLUSH(hw);
+       /*
+        * 82599 adapters flow director init flow cannot be restarted,
+        * Workaround 82599 silicon errata by performing the following steps
+        * before re-writing the FDIRCTRL control register with the same value.
+        * - write 1 to bit 8 of FDIRCMD register &
+        * - write 0 to bit 8 of FDIRCMD register
+        */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
+                       (IXGBE_READ_REG(hw, IXGBE_FDIRCMD) |
+                        IXGBE_FDIRCMD_CLEARHT));
+       IXGBE_WRITE_FLUSH(hw);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
+                       (IXGBE_READ_REG(hw, IXGBE_FDIRCMD) &
+                        ~IXGBE_FDIRCMD_CLEARHT));
+       IXGBE_WRITE_FLUSH(hw);
+       /*
+        * Clear FDIR Hash register to clear any leftover hashes
+        * waiting to be programmed.
+        */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, 0x00);
+       IXGBE_WRITE_FLUSH(hw);
+
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCTRL, fdirctrl);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Poll init-done after we write FDIRCTRL register */
+       for (i = 0; i < IXGBE_FDIR_INIT_DONE_POLL; i++) {
+               if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &
+                                  IXGBE_FDIRCTRL_INIT_DONE)
+                       break;
+               udelay(10);
+       }
+       if (i >= IXGBE_FDIR_INIT_DONE_POLL) {
+               hw_dbg(hw, "Flow Director Signature poll time exceeded!\n");
+               return IXGBE_ERR_FDIR_REINIT_FAILED;
+       }
+
+       /* Clear FDIR statistics registers (read to clear) */
+       IXGBE_READ_REG(hw, IXGBE_FDIRUSTAT);
+       IXGBE_READ_REG(hw, IXGBE_FDIRFSTAT);
+       IXGBE_READ_REG(hw, IXGBE_FDIRMATCH);
+       IXGBE_READ_REG(hw, IXGBE_FDIRMISS);
+       IXGBE_READ_REG(hw, IXGBE_FDIRLEN);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_set_fdir_rxpba_82599 - Initialize Flow Director Rx packet buffer
+ *  @hw: pointer to hardware structure
+ *  @pballoc: which mode to allocate filters with
+ **/
+static s32 ixgbe_set_fdir_rxpba_82599(struct ixgbe_hw *hw, const u32 pballoc)
+{
+       u32 fdir_pbsize = hw->mac.rx_pb_size << IXGBE_RXPBSIZE_SHIFT;
+       u32 current_rxpbsize = 0;
+       int i;
+
+       /* reserve space for Flow Director filters */
+       switch (pballoc) {
+       case IXGBE_FDIR_PBALLOC_256K:
+               fdir_pbsize -= 256 << IXGBE_RXPBSIZE_SHIFT;
+               break;
+       case IXGBE_FDIR_PBALLOC_128K:
+               fdir_pbsize -= 128 << IXGBE_RXPBSIZE_SHIFT;
+               break;
+       case IXGBE_FDIR_PBALLOC_64K:
+               fdir_pbsize -= 64 << IXGBE_RXPBSIZE_SHIFT;
+               break;
+       case IXGBE_FDIR_PBALLOC_NONE:
+       default:
+               return IXGBE_ERR_PARAM;
+       }
+
+       /* determine current RX packet buffer size */
+       for (i = 0; i < 8; i++)
+               current_rxpbsize += IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
+
+       /* if there is already room for the filters do nothing */
+       if (current_rxpbsize <= fdir_pbsize)
+               return 0;
+
+       if (current_rxpbsize > hw->mac.rx_pb_size) {
+               /*
+                * if rxpbsize is greater than max then HW max the Rx buffer
+                * sizes are unconfigured or misconfigured since HW default is
+                * to give the full buffer to each traffic class resulting in
+                * the total size being buffer size 8x actual size
+                *
+                * This assumes no DCB since the RXPBSIZE registers appear to
+                * be unconfigured.
+                */
+               IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0), fdir_pbsize);
+               for (i = 1; i < 8; i++)
+                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), 0);
+       } else {
+               /*
+                * Since the Rx packet buffer appears to have already been
+                * configured we need to shrink each packet buffer by enough
+                * to make room for the filters.  As such we take each rxpbsize
+                * value and multiply it by a fraction representing the size
+                * needed over the size we currently have.
+                *
+                * We need to reduce fdir_pbsize and current_rxpbsize to
+                * 1/1024 of their original values in order to avoid
+                * overflowing the u32 being used to store rxpbsize.
+                */
+               fdir_pbsize >>= IXGBE_RXPBSIZE_SHIFT;
+               current_rxpbsize >>= IXGBE_RXPBSIZE_SHIFT;
+               for (i = 0; i < 8; i++) {
+                       u32 rxpbsize = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
+                       rxpbsize *= fdir_pbsize;
+                       rxpbsize /= current_rxpbsize;
+                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpbsize);
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_fdir_enable_82599 - Initialize Flow Director control registers
+ *  @hw: pointer to hardware structure
+ *  @fdirctrl: value to write to flow director control register
+ **/
+static void ixgbe_fdir_enable_82599(struct ixgbe_hw *hw, u32 fdirctrl)
+{
+       int i;
+
+       /* Prime the keys for hashing */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHKEY, IXGBE_ATR_BUCKET_HASH_KEY);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRSKEY, IXGBE_ATR_SIGNATURE_HASH_KEY);
+
+       /*
+        * Poll init-done after we write the register.  Estimated times:
+        *      10G: PBALLOC = 11b, timing is 60us
+        *       1G: PBALLOC = 11b, timing is 600us
+        *     100M: PBALLOC = 11b, timing is 6ms
+        *
+        *     Multiple these timings by 4 if under full Rx load
+        *
+        * So we'll poll for IXGBE_FDIR_INIT_DONE_POLL times, sleeping for
+        * 1 msec per poll time.  If we're at line rate and drop to 100M, then
+        * this might not finish in our poll time, but we can live with that
+        * for now.
+        */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCTRL, fdirctrl);
+       IXGBE_WRITE_FLUSH(hw);
+       for (i = 0; i < IXGBE_FDIR_INIT_DONE_POLL; i++) {
+               if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &
+                                  IXGBE_FDIRCTRL_INIT_DONE)
+                       break;
+               usleep_range(1000, 2000);
+       }
+
+       if (i >= IXGBE_FDIR_INIT_DONE_POLL)
+               hw_dbg(hw, "Flow Director poll time exceeded!\n");
+}
+
+/**
+ *  ixgbe_init_fdir_signature_82599 - Initialize Flow Director signature filters
+ *  @hw: pointer to hardware structure
+ *  @fdirctrl: value to write to flow director control register, initially
+ *             contains just the value of the Rx packet buffer allocation
+ **/
+s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 fdirctrl)
+{
+       s32 err;
+
+       /* Before enabling Flow Director, verify the Rx Packet Buffer size */
+       err = ixgbe_set_fdir_rxpba_82599(hw, fdirctrl);
+       if (err)
+               return err;
+
+       /*
+        * Continue setup of fdirctrl register bits:
+        *  Move the flexible bytes to use the ethertype - shift 6 words
+        *  Set the maximum length per hash bucket to 0xA filters
+        *  Send interrupt when 64 filters are left
+        */
+       fdirctrl |= (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT) |
+                   (0xA << IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT) |
+                   (4 << IXGBE_FDIRCTRL_FULL_THRESH_SHIFT);
+
+       /* write hashes and fdirctrl register, poll for completion */
+       ixgbe_fdir_enable_82599(hw, fdirctrl);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_init_fdir_perfect_82599 - Initialize Flow Director perfect filters
+ *  @hw: pointer to hardware structure
+ *  @fdirctrl: value to write to flow director control register, initially
+ *             contains just the value of the Rx packet buffer allocation
+ **/
+s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 fdirctrl)
+{
+       s32 err;
+
+       /* Before enabling Flow Director, verify the Rx Packet Buffer size */
+       err = ixgbe_set_fdir_rxpba_82599(hw, fdirctrl);
+       if (err)
+               return err;
+
+       /*
+        * Continue setup of fdirctrl register bits:
+        *  Turn perfect match filtering on
+        *  Report hash in RSS field of Rx wb descriptor
+        *  Initialize the drop queue
+        *  Move the flexible bytes to use the ethertype - shift 6 words
+        *  Set the maximum length per hash bucket to 0xA filters
+        *  Send interrupt when 64 (0x4 * 16) filters are left
+        */
+       fdirctrl |= IXGBE_FDIRCTRL_PERFECT_MATCH |
+                   IXGBE_FDIRCTRL_REPORT_STATUS |
+                   (IXGBE_FDIR_DROP_QUEUE << IXGBE_FDIRCTRL_DROP_Q_SHIFT) |
+                   (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT) |
+                   (0xA << IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT) |
+                   (4 << IXGBE_FDIRCTRL_FULL_THRESH_SHIFT);
+
+       /* write hashes and fdirctrl register, poll for completion */
+       ixgbe_fdir_enable_82599(hw, fdirctrl);
+
+       return 0;
+}
+
+/*
+ * These defines allow us to quickly generate all of the necessary instructions
+ * in the function below by simply calling out IXGBE_COMPUTE_SIG_HASH_ITERATION
+ * for values 0 through 15
+ */
+#define IXGBE_ATR_COMMON_HASH_KEY \
+               (IXGBE_ATR_BUCKET_HASH_KEY & IXGBE_ATR_SIGNATURE_HASH_KEY)
+#define IXGBE_COMPUTE_SIG_HASH_ITERATION(_n) \
+do { \
+       u32 n = (_n); \
+       if (IXGBE_ATR_COMMON_HASH_KEY & (0x01 << n)) \
+               common_hash ^= lo_hash_dword >> n; \
+       else if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << n)) \
+               bucket_hash ^= lo_hash_dword >> n; \
+       else if (IXGBE_ATR_SIGNATURE_HASH_KEY & (0x01 << n)) \
+               sig_hash ^= lo_hash_dword << (16 - n); \
+       if (IXGBE_ATR_COMMON_HASH_KEY & (0x01 << (n + 16))) \
+               common_hash ^= hi_hash_dword >> n; \
+       else if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << (n + 16))) \
+               bucket_hash ^= hi_hash_dword >> n; \
+       else if (IXGBE_ATR_SIGNATURE_HASH_KEY & (0x01 << (n + 16))) \
+               sig_hash ^= hi_hash_dword << (16 - n); \
+} while (0);
+
+/**
+ *  ixgbe_atr_compute_sig_hash_82599 - Compute the signature hash
+ *  @stream: input bitstream to compute the hash on
+ *
+ *  This function is almost identical to the function above but contains
+ *  several optomizations such as unwinding all of the loops, letting the
+ *  compiler work out all of the conditional ifs since the keys are static
+ *  defines, and computing two keys at once since the hashed dword stream
+ *  will be the same for both keys.
+ **/
+static u32 ixgbe_atr_compute_sig_hash_82599(union ixgbe_atr_hash_dword input,
+                                           union ixgbe_atr_hash_dword common)
+{
+       u32 hi_hash_dword, lo_hash_dword, flow_vm_vlan;
+       u32 sig_hash = 0, bucket_hash = 0, common_hash = 0;
+
+       /* record the flow_vm_vlan bits as they are a key part to the hash */
+       flow_vm_vlan = ntohl(input.dword);
+
+       /* generate common hash dword */
+       hi_hash_dword = ntohl(common.dword);
+
+       /* low dword is word swapped version of common */
+       lo_hash_dword = (hi_hash_dword >> 16) | (hi_hash_dword << 16);
+
+       /* apply flow ID/VM pool/VLAN ID bits to hash words */
+       hi_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan >> 16);
+
+       /* Process bits 0 and 16 */
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(0);
+
+       /*
+        * apply flow ID/VM pool/VLAN ID bits to lo hash dword, we had to
+        * delay this because bit 0 of the stream should not be processed
+        * so we do not add the vlan until after bit 0 was processed
+        */
+       lo_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan << 16);
+
+       /* Process remaining 30 bit of the key */
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(1);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(2);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(3);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(4);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(5);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(6);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(7);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(8);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(9);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(10);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(11);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(12);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(13);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(14);
+       IXGBE_COMPUTE_SIG_HASH_ITERATION(15);
+
+       /* combine common_hash result with signature and bucket hashes */
+       bucket_hash ^= common_hash;
+       bucket_hash &= IXGBE_ATR_HASH_MASK;
+
+       sig_hash ^= common_hash << 16;
+       sig_hash &= IXGBE_ATR_HASH_MASK << 16;
+
+       /* return completed signature hash */
+       return sig_hash ^ bucket_hash;
+}
+
+/**
+ *  ixgbe_atr_add_signature_filter_82599 - Adds a signature hash filter
+ *  @hw: pointer to hardware structure
+ *  @input: unique input dword
+ *  @common: compressed common input dword
+ *  @queue: queue index to direct traffic to
+ **/
+s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw,
+                                          union ixgbe_atr_hash_dword input,
+                                          union ixgbe_atr_hash_dword common,
+                                          u8 queue)
+{
+       u64  fdirhashcmd;
+       u32  fdircmd;
+
+       /*
+        * Get the flow_type in order to program FDIRCMD properly
+        * lowest 2 bits are FDIRCMD.L4TYPE, third lowest bit is FDIRCMD.IPV6
+        */
+       switch (input.formatted.flow_type) {
+       case IXGBE_ATR_FLOW_TYPE_TCPV4:
+       case IXGBE_ATR_FLOW_TYPE_UDPV4:
+       case IXGBE_ATR_FLOW_TYPE_SCTPV4:
+       case IXGBE_ATR_FLOW_TYPE_TCPV6:
+       case IXGBE_ATR_FLOW_TYPE_UDPV6:
+       case IXGBE_ATR_FLOW_TYPE_SCTPV6:
+               break;
+       default:
+               hw_dbg(hw, " Error on flow type input\n");
+               return IXGBE_ERR_CONFIG;
+       }
+
+       /* configure FDIRCMD register */
+       fdircmd = IXGBE_FDIRCMD_CMD_ADD_FLOW | IXGBE_FDIRCMD_FILTER_UPDATE |
+                 IXGBE_FDIRCMD_LAST | IXGBE_FDIRCMD_QUEUE_EN;
+       fdircmd |= input.formatted.flow_type << IXGBE_FDIRCMD_FLOW_TYPE_SHIFT;
+       fdircmd |= (u32)queue << IXGBE_FDIRCMD_RX_QUEUE_SHIFT;
+
+       /*
+        * The lower 32-bits of fdirhashcmd is for FDIRHASH, the upper 32-bits
+        * is for FDIRCMD.  Then do a 64-bit register write from FDIRHASH.
+        */
+       fdirhashcmd = (u64)fdircmd << 32;
+       fdirhashcmd |= ixgbe_atr_compute_sig_hash_82599(input, common);
+       IXGBE_WRITE_REG64(hw, IXGBE_FDIRHASH, fdirhashcmd);
+
+       hw_dbg(hw, "Tx Queue=%x hash=%x\n", queue, (u32)fdirhashcmd);
+
+       return 0;
+}
+
+#define IXGBE_COMPUTE_BKT_HASH_ITERATION(_n) \
+do { \
+       u32 n = (_n); \
+       if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << n)) \
+               bucket_hash ^= lo_hash_dword >> n; \
+       if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << (n + 16))) \
+               bucket_hash ^= hi_hash_dword >> n; \
+} while (0);
+
+/**
+ *  ixgbe_atr_compute_perfect_hash_82599 - Compute the perfect filter hash
+ *  @atr_input: input bitstream to compute the hash on
+ *  @input_mask: mask for the input bitstream
+ *
+ *  This function serves two main purposes.  First it applys the input_mask
+ *  to the atr_input resulting in a cleaned up atr_input data stream.
+ *  Secondly it computes the hash and stores it in the bkt_hash field at
+ *  the end of the input byte stream.  This way it will be available for
+ *  future use without needing to recompute the hash.
+ **/
+void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,
+                                         union ixgbe_atr_input *input_mask)
+{
+
+       u32 hi_hash_dword, lo_hash_dword, flow_vm_vlan;
+       u32 bucket_hash = 0;
+
+       /* Apply masks to input data */
+       input->dword_stream[0]  &= input_mask->dword_stream[0];
+       input->dword_stream[1]  &= input_mask->dword_stream[1];
+       input->dword_stream[2]  &= input_mask->dword_stream[2];
+       input->dword_stream[3]  &= input_mask->dword_stream[3];
+       input->dword_stream[4]  &= input_mask->dword_stream[4];
+       input->dword_stream[5]  &= input_mask->dword_stream[5];
+       input->dword_stream[6]  &= input_mask->dword_stream[6];
+       input->dword_stream[7]  &= input_mask->dword_stream[7];
+       input->dword_stream[8]  &= input_mask->dword_stream[8];
+       input->dword_stream[9]  &= input_mask->dword_stream[9];
+       input->dword_stream[10] &= input_mask->dword_stream[10];
+
+       /* record the flow_vm_vlan bits as they are a key part to the hash */
+       flow_vm_vlan = ntohl(input->dword_stream[0]);
+
+       /* generate common hash dword */
+       hi_hash_dword = ntohl(input->dword_stream[1] ^
+                                   input->dword_stream[2] ^
+                                   input->dword_stream[3] ^
+                                   input->dword_stream[4] ^
+                                   input->dword_stream[5] ^
+                                   input->dword_stream[6] ^
+                                   input->dword_stream[7] ^
+                                   input->dword_stream[8] ^
+                                   input->dword_stream[9] ^
+                                   input->dword_stream[10]);
+
+       /* low dword is word swapped version of common */
+       lo_hash_dword = (hi_hash_dword >> 16) | (hi_hash_dword << 16);
+
+       /* apply flow ID/VM pool/VLAN ID bits to hash words */
+       hi_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan >> 16);
+
+       /* Process bits 0 and 16 */
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(0);
+
+       /*
+        * apply flow ID/VM pool/VLAN ID bits to lo hash dword, we had to
+        * delay this because bit 0 of the stream should not be processed
+        * so we do not add the vlan until after bit 0 was processed
+        */
+       lo_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan << 16);
+
+       /* Process remaining 30 bit of the key */
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(1);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(2);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(3);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(4);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(5);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(6);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(7);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(8);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(9);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(10);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(11);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(12);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(13);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(14);
+       IXGBE_COMPUTE_BKT_HASH_ITERATION(15);
+
+       /*
+        * Limit hash to 13 bits since max bucket count is 8K.
+        * Store result at the end of the input stream.
+        */
+       input->formatted.bkt_hash = bucket_hash & 0x1FFF;
+}
+
+/**
+ *  ixgbe_get_fdirtcpm_82599 - generate a tcp port from atr_input_masks
+ *  @input_mask: mask to be bit swapped
+ *
+ *  The source and destination port masks for flow director are bit swapped
+ *  in that bit 15 effects bit 0, 14 effects 1, 13, 2 etc.  In order to
+ *  generate a correctly swapped value we need to bit swap the mask and that
+ *  is what is accomplished by this function.
+ **/
+static u32 ixgbe_get_fdirtcpm_82599(union ixgbe_atr_input *input_mask)
+{
+       u32 mask = ntohs(input_mask->formatted.dst_port);
+       mask <<= IXGBE_FDIRTCPM_DPORTM_SHIFT;
+       mask |= ntohs(input_mask->formatted.src_port);
+       mask = ((mask & 0x55555555) << 1) | ((mask & 0xAAAAAAAA) >> 1);
+       mask = ((mask & 0x33333333) << 2) | ((mask & 0xCCCCCCCC) >> 2);
+       mask = ((mask & 0x0F0F0F0F) << 4) | ((mask & 0xF0F0F0F0) >> 4);
+       return ((mask & 0x00FF00FF) << 8) | ((mask & 0xFF00FF00) >> 8);
+}
+
+/*
+ * These two macros are meant to address the fact that we have registers
+ * that are either all or in part big-endian.  As a result on big-endian
+ * systems we will end up byte swapping the value to little-endian before
+ * it is byte swapped again and written to the hardware in the original
+ * big-endian format.
+ */
+#define IXGBE_STORE_AS_BE32(_value) \
+       (((u32)(_value) >> 24) | (((u32)(_value) & 0x00FF0000) >> 8) | \
+        (((u32)(_value) & 0x0000FF00) << 8) | ((u32)(_value) << 24))
+
+#define IXGBE_WRITE_REG_BE32(a, reg, value) \
+       IXGBE_WRITE_REG((a), (reg), IXGBE_STORE_AS_BE32(ntohl(value)))
+
+#define IXGBE_STORE_AS_BE16(_value) \
+       ntohs(((u16)(_value) >> 8) | ((u16)(_value) << 8))
+
+s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
+                                   union ixgbe_atr_input *input_mask)
+{
+       /* mask IPv6 since it is currently not supported */
+       u32 fdirm = IXGBE_FDIRM_DIPv6;
+       u32 fdirtcpm;
+
+       /*
+        * Program the relevant mask registers.  If src/dst_port or src/dst_addr
+        * are zero, then assume a full mask for that field.  Also assume that
+        * a VLAN of 0 is unspecified, so mask that out as well.  L4type
+        * cannot be masked out in this implementation.
+        *
+        * This also assumes IPv4 only.  IPv6 masking isn't supported at this
+        * point in time.
+        */
+
+       /* verify bucket hash is cleared on hash generation */
+       if (input_mask->formatted.bkt_hash)
+               hw_dbg(hw, " bucket hash should always be 0 in mask\n");
+
+       /* Program FDIRM and verify partial masks */
+       switch (input_mask->formatted.vm_pool & 0x7F) {
+       case 0x0:
+               fdirm |= IXGBE_FDIRM_POOL;
+       case 0x7F:
+               break;
+       default:
+               hw_dbg(hw, " Error on vm pool mask\n");
+               return IXGBE_ERR_CONFIG;
+       }
+
+       switch (input_mask->formatted.flow_type & IXGBE_ATR_L4TYPE_MASK) {
+       case 0x0:
+               fdirm |= IXGBE_FDIRM_L4P;
+               if (input_mask->formatted.dst_port ||
+                   input_mask->formatted.src_port) {
+                       hw_dbg(hw, " Error on src/dst port mask\n");
+                       return IXGBE_ERR_CONFIG;
+               }
+       case IXGBE_ATR_L4TYPE_MASK:
+               break;
+       default:
+               hw_dbg(hw, " Error on flow type mask\n");
+               return IXGBE_ERR_CONFIG;
+       }
+
+       switch (ntohs(input_mask->formatted.vlan_id) & 0xEFFF) {
+       case 0x0000:
+               /* mask VLAN ID, fall through to mask VLAN priority */
+               fdirm |= IXGBE_FDIRM_VLANID;
+       case 0x0FFF:
+               /* mask VLAN priority */
+               fdirm |= IXGBE_FDIRM_VLANP;
+               break;
+       case 0xE000:
+               /* mask VLAN ID only, fall through */
+               fdirm |= IXGBE_FDIRM_VLANID;
+       case 0xEFFF:
+               /* no VLAN fields masked */
+               break;
+       default:
+               hw_dbg(hw, " Error on VLAN mask\n");
+               return IXGBE_ERR_CONFIG;
+       }
+
+       switch (input_mask->formatted.flex_bytes & 0xFFFF) {
+       case 0x0000:
+               /* Mask Flex Bytes, fall through */
+               fdirm |= IXGBE_FDIRM_FLEX;
+       case 0xFFFF:
+               break;
+       default:
+               hw_dbg(hw, " Error on flexible byte mask\n");
+               return IXGBE_ERR_CONFIG;
+       }
+
+       /* Now mask VM pool and destination IPv6 - bits 5 and 2 */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRM, fdirm);
+
+       /* store the TCP/UDP port masks, bit reversed from port layout */
+       fdirtcpm = ixgbe_get_fdirtcpm_82599(input_mask);
+
+       /* write both the same so that UDP and TCP use the same mask */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRTCPM, ~fdirtcpm);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRUDPM, ~fdirtcpm);
+
+       /* store source and destination IP masks (big-enian) */
+       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIP4M,
+                            ~input_mask->formatted.src_ip[0]);
+       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRDIP4M,
+                            ~input_mask->formatted.dst_ip[0]);
+
+       return 0;
+}
+
+s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
+                                         union ixgbe_atr_input *input,
+                                         u16 soft_id, u8 queue)
+{
+       u32 fdirport, fdirvlan, fdirhash, fdircmd;
+
+       /* currently IPv6 is not supported, must be programmed with 0 */
+       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(0),
+                            input->formatted.src_ip[0]);
+       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(1),
+                            input->formatted.src_ip[1]);
+       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(2),
+                            input->formatted.src_ip[2]);
+
+       /* record the source address (big-endian) */
+       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRIPSA, input->formatted.src_ip[0]);
+
+       /* record the first 32 bits of the destination address (big-endian) */
+       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRIPDA, input->formatted.dst_ip[0]);
+
+       /* record source and destination port (little-endian)*/
+       fdirport = ntohs(input->formatted.dst_port);
+       fdirport <<= IXGBE_FDIRPORT_DESTINATION_SHIFT;
+       fdirport |= ntohs(input->formatted.src_port);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRPORT, fdirport);
+
+       /* record vlan (little-endian) and flex_bytes(big-endian) */
+       fdirvlan = IXGBE_STORE_AS_BE16(input->formatted.flex_bytes);
+       fdirvlan <<= IXGBE_FDIRVLAN_FLEX_SHIFT;
+       fdirvlan |= ntohs(input->formatted.vlan_id);
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRVLAN, fdirvlan);
+
+       /* configure FDIRHASH register */
+       fdirhash = input->formatted.bkt_hash;
+       fdirhash |= soft_id << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT;
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
+
+       /*
+        * flush all previous writes to make certain registers are
+        * programmed prior to issuing the command
+        */
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* configure FDIRCMD register */
+       fdircmd = IXGBE_FDIRCMD_CMD_ADD_FLOW | IXGBE_FDIRCMD_FILTER_UPDATE |
+                 IXGBE_FDIRCMD_LAST | IXGBE_FDIRCMD_QUEUE_EN;
+       if (queue == IXGBE_FDIR_DROP_QUEUE)
+               fdircmd |= IXGBE_FDIRCMD_DROP;
+       fdircmd |= input->formatted.flow_type << IXGBE_FDIRCMD_FLOW_TYPE_SHIFT;
+       fdircmd |= (u32)queue << IXGBE_FDIRCMD_RX_QUEUE_SHIFT;
+       fdircmd |= (u32)input->formatted.vm_pool << IXGBE_FDIRCMD_VT_POOL_SHIFT;
+
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD, fdircmd);
+
+       return 0;
+}
+
+s32 ixgbe_fdir_erase_perfect_filter_82599(struct ixgbe_hw *hw,
+                                         union ixgbe_atr_input *input,
+                                         u16 soft_id)
+{
+       u32 fdirhash;
+       u32 fdircmd = 0;
+       u32 retry_count;
+       s32 err = 0;
+
+       /* configure FDIRHASH register */
+       fdirhash = input->formatted.bkt_hash;
+       fdirhash |= soft_id << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT;
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
+
+       /* flush hash to HW */
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Query if filter is present */
+       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD, IXGBE_FDIRCMD_CMD_QUERY_REM_FILT);
+
+       for (retry_count = 10; retry_count; retry_count--) {
+               /* allow 10us for query to process */
+               udelay(10);
+               /* verify query completed successfully */
+               fdircmd = IXGBE_READ_REG(hw, IXGBE_FDIRCMD);
+               if (!(fdircmd & IXGBE_FDIRCMD_CMD_MASK))
+                       break;
+       }
+
+       if (!retry_count)
+               err = IXGBE_ERR_FDIR_REINIT_FAILED;
+
+       /* if filter exists in hardware then remove it */
+       if (fdircmd & IXGBE_FDIRCMD_FILTER_VALID) {
+               IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
+               IXGBE_WRITE_FLUSH(hw);
+               IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
+                               IXGBE_FDIRCMD_CMD_REMOVE_FLOW);
+       }
+
+       return err;
+}
+
+/**
+ *  ixgbe_read_analog_reg8_82599 - Reads 8 bit Omer analog register
+ *  @hw: pointer to hardware structure
+ *  @reg: analog register to read
+ *  @val: read value
+ *
+ *  Performs read operation to Omer analog register specified.
+ **/
+static s32 ixgbe_read_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 *val)
+{
+       u32  core_ctl;
+
+       IXGBE_WRITE_REG(hw, IXGBE_CORECTL, IXGBE_CORECTL_WRITE_CMD |
+                       (reg << 8));
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(10);
+       core_ctl = IXGBE_READ_REG(hw, IXGBE_CORECTL);
+       *val = (u8)core_ctl;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_write_analog_reg8_82599 - Writes 8 bit Omer analog register
+ *  @hw: pointer to hardware structure
+ *  @reg: atlas register to write
+ *  @val: value to write
+ *
+ *  Performs write operation to Omer analog register specified.
+ **/
+static s32 ixgbe_write_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 val)
+{
+       u32  core_ctl;
+
+       core_ctl = (reg << 8) | val;
+       IXGBE_WRITE_REG(hw, IXGBE_CORECTL, core_ctl);
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(10);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_start_hw_82599 - Prepare hardware for Tx/Rx
+ *  @hw: pointer to hardware structure
+ *
+ *  Starts the hardware using the generic start_hw function
+ *  and the generation start_hw function.
+ *  Then performs revision-specific operations, if any.
+ **/
+static s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
+{
+       s32 ret_val = 0;
+
+       ret_val = ixgbe_start_hw_generic(hw);
+       if (ret_val != 0)
+               goto out;
+
+       ret_val = ixgbe_start_hw_gen2(hw);
+       if (ret_val != 0)
+               goto out;
+
+       /* We need to run link autotry after the driver loads */
+       hw->mac.autotry_restart = true;
+       hw->mac.rx_pb_size = IXGBE_82599_RX_PB_SIZE;
+
+       if (ret_val == 0)
+               ret_val = ixgbe_verify_fw_version_82599(hw);
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_identify_phy_82599 - Get physical layer module
+ *  @hw: pointer to hardware structure
+ *
+ *  Determines the physical layer module found on the current adapter.
+ *  If PHY already detected, maintains current PHY type in hw struct,
+ *  otherwise executes the PHY detection routine.
+ **/
+static s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw)
+{
+       s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
+
+       /* Detect PHY if not unknown - returns success if already detected. */
+       status = ixgbe_identify_phy_generic(hw);
+       if (status != 0) {
+               /* 82599 10GBASE-T requires an external PHY */
+               if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper)
+                       goto out;
+               else
+                       status = ixgbe_identify_sfp_module_generic(hw);
+       }
+
+       /* Set PHY type none if no PHY detected */
+       if (hw->phy.type == ixgbe_phy_unknown) {
+               hw->phy.type = ixgbe_phy_none;
+               status = 0;
+       }
+
+       /* Return error if SFP module has been detected but is not supported */
+       if (hw->phy.type == ixgbe_phy_sfp_unsupported)
+               status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_get_supported_physical_layer_82599 - Returns physical layer type
+ *  @hw: pointer to hardware structure
+ *
+ *  Determines physical layer capabilities of the current configuration.
+ **/
+static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
+{
+       u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
+       u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       u32 autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+       u32 pma_pmd_10g_serial = autoc2 & IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK;
+       u32 pma_pmd_10g_parallel = autoc & IXGBE_AUTOC_10G_PMA_PMD_MASK;
+       u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
+       u16 ext_ability = 0;
+       u8 comp_codes_10g = 0;
+       u8 comp_codes_1g = 0;
+
+       hw->phy.ops.identify(hw);
+
+       switch (hw->phy.type) {
+       case ixgbe_phy_tn:
+       case ixgbe_phy_aq:
+       case ixgbe_phy_cu_unknown:
+               hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
+                                                        &ext_ability);
+               if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
+               if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
+               if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
+               goto out;
+       default:
+               break;
+       }
+
+       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
+       case IXGBE_AUTOC_LMS_1G_AN:
+       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
+               if (pma_pmd_1g == IXGBE_AUTOC_1G_KX_BX) {
+                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX |
+                           IXGBE_PHYSICAL_LAYER_1000BASE_BX;
+                       goto out;
+               } else
+                       /* SFI mode so read SFP module */
+                       goto sfp_check;
+               break;
+       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
+               if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_CX4)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;
+               else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_KX4)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
+               else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;
+               goto out;
+               break;
+       case IXGBE_AUTOC_LMS_10G_SERIAL:
+               if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR;
+                       goto out;
+               } else if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)
+                       goto sfp_check;
+               break;
+       case IXGBE_AUTOC_LMS_KX4_KX_KR:
+       case IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN:
+               if (autoc & IXGBE_AUTOC_KX_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_KX;
+               if (autoc & IXGBE_AUTOC_KX4_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
+               if (autoc & IXGBE_AUTOC_KR_SUPP)
+                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR;
+               goto out;
+               break;
+       default:
+               goto out;
+               break;
+       }
+
+sfp_check:
+       /* SFP check must be done last since DA modules are sometimes used to
+        * test KR mode -  we need to id KR mode correctly before SFP module.
+        * Call identify_sfp because the pluggable module may have changed */
+       hw->phy.ops.identify_sfp(hw);
+       if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
+               goto out;
+
+       switch (hw->phy.type) {
+       case ixgbe_phy_sfp_passive_tyco:
+       case ixgbe_phy_sfp_passive_unknown:
+               physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
+               break;
+       case ixgbe_phy_sfp_ftl_active:
+       case ixgbe_phy_sfp_active_unknown:
+               physical_layer = IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA;
+               break;
+       case ixgbe_phy_sfp_avago:
+       case ixgbe_phy_sfp_ftl:
+       case ixgbe_phy_sfp_intel:
+       case ixgbe_phy_sfp_unknown:
+               hw->phy.ops.read_i2c_eeprom(hw,
+                     IXGBE_SFF_1GBE_COMP_CODES, &comp_codes_1g);
+               hw->phy.ops.read_i2c_eeprom(hw,
+                     IXGBE_SFF_10GBE_COMP_CODES, &comp_codes_10g);
+               if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
+               else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
+               else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE)
+                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T;
+               break;
+       default:
+               break;
+       }
+
+out:
+       return physical_layer;
+}
+
+/**
+ *  ixgbe_enable_rx_dma_82599 - Enable the Rx DMA unit on 82599
+ *  @hw: pointer to hardware structure
+ *  @regval: register value to write to RXCTRL
+ *
+ *  Enables the Rx DMA unit for 82599
+ **/
+static s32 ixgbe_enable_rx_dma_82599(struct ixgbe_hw *hw, u32 regval)
+{
+#define IXGBE_MAX_SECRX_POLL 30
+       int i;
+       int secrxreg;
+
+       /*
+        * Workaround for 82599 silicon errata when enabling the Rx datapath.
+        * If traffic is incoming before we enable the Rx unit, it could hang
+        * the Rx DMA unit.  Therefore, make sure the security engine is
+        * completely disabled prior to enabling the Rx unit.
+        */
+       secrxreg = IXGBE_READ_REG(hw, IXGBE_SECRXCTRL);
+       secrxreg |= IXGBE_SECRXCTRL_RX_DIS;
+       IXGBE_WRITE_REG(hw, IXGBE_SECRXCTRL, secrxreg);
+       for (i = 0; i < IXGBE_MAX_SECRX_POLL; i++) {
+               secrxreg = IXGBE_READ_REG(hw, IXGBE_SECRXSTAT);
+               if (secrxreg & IXGBE_SECRXSTAT_SECRX_RDY)
+                       break;
+               else
+                       /* Use interrupt-safe sleep just in case */
+                       udelay(10);
+       }
+
+       /* For informational purposes only */
+       if (i >= IXGBE_MAX_SECRX_POLL)
+               hw_dbg(hw, "Rx unit being enabled before security "
+                      "path fully disabled.  Continuing with init.\n");
+
+       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, regval);
+       secrxreg = IXGBE_READ_REG(hw, IXGBE_SECRXCTRL);
+       secrxreg &= ~IXGBE_SECRXCTRL_RX_DIS;
+       IXGBE_WRITE_REG(hw, IXGBE_SECRXCTRL, secrxreg);
+       IXGBE_WRITE_FLUSH(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_verify_fw_version_82599 - verify fw version for 82599
+ *  @hw: pointer to hardware structure
+ *
+ *  Verifies that installed the firmware version is 0.6 or higher
+ *  for SFI devices. All 82599 SFI devices should have version 0.6 or higher.
+ *
+ *  Returns IXGBE_ERR_EEPROM_VERSION if the FW is not present or
+ *  if the FW version is not supported.
+ **/
+static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw)
+{
+       s32 status = IXGBE_ERR_EEPROM_VERSION;
+       u16 fw_offset, fw_ptp_cfg_offset;
+       u16 fw_version = 0;
+
+       /* firmware check is only necessary for SFI devices */
+       if (hw->phy.media_type != ixgbe_media_type_fiber) {
+               status = 0;
+               goto fw_version_out;
+       }
+
+       /* get the offset to the Firmware Module block */
+       hw->eeprom.ops.read(hw, IXGBE_FW_PTR, &fw_offset);
+
+       if ((fw_offset == 0) || (fw_offset == 0xFFFF))
+               goto fw_version_out;
+
+       /* get the offset to the Pass Through Patch Configuration block */
+       hw->eeprom.ops.read(hw, (fw_offset +
+                                IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR),
+                                &fw_ptp_cfg_offset);
+
+       if ((fw_ptp_cfg_offset == 0) || (fw_ptp_cfg_offset == 0xFFFF))
+               goto fw_version_out;
+
+       /* get the firmware version */
+       hw->eeprom.ops.read(hw, (fw_ptp_cfg_offset +
+                                IXGBE_FW_PATCH_VERSION_4),
+                                &fw_version);
+
+       if (fw_version > 0x5)
+               status = 0;
+
+fw_version_out:
+       return status;
+}
+
+/**
+ *  ixgbe_verify_lesm_fw_enabled_82599 - Checks LESM FW module state.
+ *  @hw: pointer to hardware structure
+ *
+ *  Returns true if the LESM FW module is present and enabled. Otherwise
+ *  returns false. Smart Speed must be disabled if LESM FW module is enabled.
+ **/
+static bool ixgbe_verify_lesm_fw_enabled_82599(struct ixgbe_hw *hw)
+{
+       bool lesm_enabled = false;
+       u16 fw_offset, fw_lesm_param_offset, fw_lesm_state;
+       s32 status;
+
+       /* get the offset to the Firmware Module block */
+       status = hw->eeprom.ops.read(hw, IXGBE_FW_PTR, &fw_offset);
+
+       if ((status != 0) ||
+           (fw_offset == 0) || (fw_offset == 0xFFFF))
+               goto out;
+
+       /* get the offset to the LESM Parameters block */
+       status = hw->eeprom.ops.read(hw, (fw_offset +
+                                    IXGBE_FW_LESM_PARAMETERS_PTR),
+                                    &fw_lesm_param_offset);
+
+       if ((status != 0) ||
+           (fw_lesm_param_offset == 0) || (fw_lesm_param_offset == 0xFFFF))
+               goto out;
+
+       /* get the lesm state word */
+       status = hw->eeprom.ops.read(hw, (fw_lesm_param_offset +
+                                    IXGBE_FW_LESM_STATE_1),
+                                    &fw_lesm_state);
+
+       if ((status == 0) &&
+           (fw_lesm_state & IXGBE_FW_LESM_STATE_ENABLED))
+               lesm_enabled = true;
+
+out:
+       return lesm_enabled;
+}
+
+/**
+ *  ixgbe_read_eeprom_buffer_82599 - Read EEPROM word(s) using
+ *  fastest available method
+ *
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in EEPROM to read
+ *  @words: number of words
+ *  @data: word(s) read from the EEPROM
+ *
+ *  Retrieves 16 bit word(s) read from EEPROM
+ **/
+static s32 ixgbe_read_eeprom_buffer_82599(struct ixgbe_hw *hw, u16 offset,
+                                         u16 words, u16 *data)
+{
+       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
+       s32 ret_val = IXGBE_ERR_CONFIG;
+
+       /*
+        * If EEPROM is detected and can be addressed using 14 bits,
+        * use EERD otherwise use bit bang
+        */
+       if ((eeprom->type == ixgbe_eeprom_spi) &&
+           (offset + (words - 1) <= IXGBE_EERD_MAX_ADDR))
+               ret_val = ixgbe_read_eerd_buffer_generic(hw, offset, words,
+                                                        data);
+       else
+               ret_val = ixgbe_read_eeprom_buffer_bit_bang_generic(hw, offset,
+                                                                   words,
+                                                                   data);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_read_eeprom_82599 - Read EEPROM word using
+ *  fastest available method
+ *
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to read
+ *  @data: word read from the EEPROM
+ *
+ *  Reads a 16 bit word from the EEPROM
+ **/
+static s32 ixgbe_read_eeprom_82599(struct ixgbe_hw *hw,
+                                  u16 offset, u16 *data)
+{
+       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
+       s32 ret_val = IXGBE_ERR_CONFIG;
+
+       /*
+        * If EEPROM is detected and can be addressed using 14 bits,
+        * use EERD otherwise use bit bang
+        */
+       if ((eeprom->type == ixgbe_eeprom_spi) &&
+           (offset <= IXGBE_EERD_MAX_ADDR))
+               ret_val = ixgbe_read_eerd_generic(hw, offset, data);
+       else
+               ret_val = ixgbe_read_eeprom_bit_bang_generic(hw, offset, data);
+
+       return ret_val;
+}
+
+static struct ixgbe_mac_operations mac_ops_82599 = {
+       .init_hw                = &ixgbe_init_hw_generic,
+       .reset_hw               = &ixgbe_reset_hw_82599,
+       .start_hw               = &ixgbe_start_hw_82599,
+       .clear_hw_cntrs         = &ixgbe_clear_hw_cntrs_generic,
+       .get_media_type         = &ixgbe_get_media_type_82599,
+       .get_supported_physical_layer = &ixgbe_get_supported_physical_layer_82599,
+       .enable_rx_dma          = &ixgbe_enable_rx_dma_82599,
+       .get_mac_addr           = &ixgbe_get_mac_addr_generic,
+       .get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,
+       .get_device_caps        = &ixgbe_get_device_caps_generic,
+       .get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,
+       .stop_adapter           = &ixgbe_stop_adapter_generic,
+       .get_bus_info           = &ixgbe_get_bus_info_generic,
+       .set_lan_id             = &ixgbe_set_lan_id_multi_port_pcie,
+       .read_analog_reg8       = &ixgbe_read_analog_reg8_82599,
+       .write_analog_reg8      = &ixgbe_write_analog_reg8_82599,
+       .setup_link             = &ixgbe_setup_mac_link_82599,
+       .set_rxpba              = &ixgbe_set_rxpba_generic,
+       .check_link             = &ixgbe_check_mac_link_generic,
+       .get_link_capabilities  = &ixgbe_get_link_capabilities_82599,
+       .led_on                 = &ixgbe_led_on_generic,
+       .led_off                = &ixgbe_led_off_generic,
+       .blink_led_start        = &ixgbe_blink_led_start_generic,
+       .blink_led_stop         = &ixgbe_blink_led_stop_generic,
+       .set_rar                = &ixgbe_set_rar_generic,
+       .clear_rar              = &ixgbe_clear_rar_generic,
+       .set_vmdq               = &ixgbe_set_vmdq_generic,
+       .clear_vmdq             = &ixgbe_clear_vmdq_generic,
+       .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
+       .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
+       .enable_mc              = &ixgbe_enable_mc_generic,
+       .disable_mc             = &ixgbe_disable_mc_generic,
+       .clear_vfta             = &ixgbe_clear_vfta_generic,
+       .set_vfta               = &ixgbe_set_vfta_generic,
+       .fc_enable              = &ixgbe_fc_enable_generic,
+       .set_fw_drv_ver         = &ixgbe_set_fw_drv_ver_generic,
+       .init_uta_tables        = &ixgbe_init_uta_tables_generic,
+       .setup_sfp              = &ixgbe_setup_sfp_modules_82599,
+       .set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,
+       .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
+       .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
+       .release_swfw_sync      = &ixgbe_release_swfw_sync,
+
+};
+
+static struct ixgbe_eeprom_operations eeprom_ops_82599 = {
+       .init_params            = &ixgbe_init_eeprom_params_generic,
+       .read                   = &ixgbe_read_eeprom_82599,
+       .read_buffer            = &ixgbe_read_eeprom_buffer_82599,
+       .write                  = &ixgbe_write_eeprom_generic,
+       .write_buffer           = &ixgbe_write_eeprom_buffer_bit_bang_generic,
+       .calc_checksum          = &ixgbe_calc_eeprom_checksum_generic,
+       .validate_checksum      = &ixgbe_validate_eeprom_checksum_generic,
+       .update_checksum        = &ixgbe_update_eeprom_checksum_generic,
+};
+
+static struct ixgbe_phy_operations phy_ops_82599 = {
+       .identify               = &ixgbe_identify_phy_82599,
+       .identify_sfp           = &ixgbe_identify_sfp_module_generic,
+       .init                   = &ixgbe_init_phy_ops_82599,
+       .reset                  = &ixgbe_reset_phy_generic,
+       .read_reg               = &ixgbe_read_phy_reg_generic,
+       .write_reg              = &ixgbe_write_phy_reg_generic,
+       .setup_link             = &ixgbe_setup_phy_link_generic,
+       .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
+       .read_i2c_byte          = &ixgbe_read_i2c_byte_generic,
+       .write_i2c_byte         = &ixgbe_write_i2c_byte_generic,
+       .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,
+       .write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,
+       .check_overtemp         = &ixgbe_tn_check_overtemp,
+};
+
+struct ixgbe_info ixgbe_82599_info = {
+       .mac                    = ixgbe_mac_82599EB,
+       .get_invariants         = &ixgbe_get_invariants_82599,
+       .mac_ops                = &mac_ops_82599,
+       .eeprom_ops             = &eeprom_ops_82599,
+       .phy_ops                = &phy_ops_82599,
+       .mbx_ops                = &mbx_ops_generic,
+};
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
new file mode 100644 (file)
index 0000000..fc1375f
--- /dev/null
@@ -0,0 +1,3510 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/netdevice.h>
+
+#include "ixgbe.h"
+#include "ixgbe_common.h"
+#include "ixgbe_phy.h"
+
+static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw);
+static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw);
+static void ixgbe_release_eeprom_semaphore(struct ixgbe_hw *hw);
+static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw);
+static void ixgbe_standby_eeprom(struct ixgbe_hw *hw);
+static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
+                                        u16 count);
+static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count);
+static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
+static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
+static void ixgbe_release_eeprom(struct ixgbe_hw *hw);
+
+static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);
+static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw);
+static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw);
+static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw);
+static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);
+static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
+                             u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);
+static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);
+static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
+static s32 ixgbe_read_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
+                                            u16 words, u16 *data);
+static s32 ixgbe_write_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
+                                            u16 words, u16 *data);
+static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw,
+                                                u16 offset);
+
+/**
+ *  ixgbe_start_hw_generic - Prepare hardware for Tx/Rx
+ *  @hw: pointer to hardware structure
+ *
+ *  Starts the hardware by filling the bus info structure and media type, clears
+ *  all on chip counters, initializes receive address registers, multicast
+ *  table, VLAN filter table, calls routine to set up link and flow control
+ *  settings, and leaves transmit and receive units disabled and uninitialized
+ **/
+s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)
+{
+       u32 ctrl_ext;
+
+       /* Set the media type */
+       hw->phy.media_type = hw->mac.ops.get_media_type(hw);
+
+       /* Identify the PHY */
+       hw->phy.ops.identify(hw);
+
+       /* Clear the VLAN filter table */
+       hw->mac.ops.clear_vfta(hw);
+
+       /* Clear statistics registers */
+       hw->mac.ops.clear_hw_cntrs(hw);
+
+       /* Set No Snoop Disable */
+       ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
+       ctrl_ext |= IXGBE_CTRL_EXT_NS_DIS;
+       IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Setup flow control */
+       ixgbe_setup_fc(hw, 0);
+
+       /* Clear adapter stopped flag */
+       hw->adapter_stopped = false;
+
+       return 0;
+}
+
+/**
+ *  ixgbe_start_hw_gen2 - Init sequence for common device family
+ *  @hw: pointer to hw structure
+ *
+ * Performs the init sequence common to the second generation
+ * of 10 GbE devices.
+ * Devices in the second generation:
+ *     82599
+ *     X540
+ **/
+s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
+{
+       u32 i;
+       u32 regval;
+
+       /* Clear the rate limiters */
+       for (i = 0; i < hw->mac.max_tx_queues; i++) {
+               IXGBE_WRITE_REG(hw, IXGBE_RTTDQSEL, i);
+               IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRC, 0);
+       }
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Disable relaxed ordering */
+       for (i = 0; i < hw->mac.max_tx_queues; i++) {
+               regval = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(i));
+               regval &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
+               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(i), regval);
+       }
+
+       for (i = 0; i < hw->mac.max_rx_queues; i++) {
+               regval = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
+               regval &= ~(IXGBE_DCA_RXCTRL_DESC_WRO_EN |
+                                       IXGBE_DCA_RXCTRL_DESC_HSRO_EN);
+               IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_init_hw_generic - Generic hardware initialization
+ *  @hw: pointer to hardware structure
+ *
+ *  Initialize the hardware by resetting the hardware, filling the bus info
+ *  structure and media type, clears all on chip counters, initializes receive
+ *  address registers, multicast table, VLAN filter table, calls routine to set
+ *  up link and flow control settings, and leaves transmit and receive units
+ *  disabled and uninitialized
+ **/
+s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw)
+{
+       s32 status;
+
+       /* Reset the hardware */
+       status = hw->mac.ops.reset_hw(hw);
+
+       if (status == 0) {
+               /* Start the HW */
+               status = hw->mac.ops.start_hw(hw);
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_clear_hw_cntrs_generic - Generic clear hardware counters
+ *  @hw: pointer to hardware structure
+ *
+ *  Clears all hardware statistics counters by reading them from the hardware
+ *  Statistics counters are clear on read.
+ **/
+s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)
+{
+       u16 i = 0;
+
+       IXGBE_READ_REG(hw, IXGBE_CRCERRS);
+       IXGBE_READ_REG(hw, IXGBE_ILLERRC);
+       IXGBE_READ_REG(hw, IXGBE_ERRBC);
+       IXGBE_READ_REG(hw, IXGBE_MSPDC);
+       for (i = 0; i < 8; i++)
+               IXGBE_READ_REG(hw, IXGBE_MPC(i));
+
+       IXGBE_READ_REG(hw, IXGBE_MLFC);
+       IXGBE_READ_REG(hw, IXGBE_MRFC);
+       IXGBE_READ_REG(hw, IXGBE_RLEC);
+       IXGBE_READ_REG(hw, IXGBE_LXONTXC);
+       IXGBE_READ_REG(hw, IXGBE_LXOFFTXC);
+       if (hw->mac.type >= ixgbe_mac_82599EB) {
+               IXGBE_READ_REG(hw, IXGBE_LXONRXCNT);
+               IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
+       } else {
+               IXGBE_READ_REG(hw, IXGBE_LXONRXC);
+               IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
+       }
+
+       for (i = 0; i < 8; i++) {
+               IXGBE_READ_REG(hw, IXGBE_PXONTXC(i));
+               IXGBE_READ_REG(hw, IXGBE_PXOFFTXC(i));
+               if (hw->mac.type >= ixgbe_mac_82599EB) {
+                       IXGBE_READ_REG(hw, IXGBE_PXONRXCNT(i));
+                       IXGBE_READ_REG(hw, IXGBE_PXOFFRXCNT(i));
+               } else {
+                       IXGBE_READ_REG(hw, IXGBE_PXONRXC(i));
+                       IXGBE_READ_REG(hw, IXGBE_PXOFFRXC(i));
+               }
+       }
+       if (hw->mac.type >= ixgbe_mac_82599EB)
+               for (i = 0; i < 8; i++)
+                       IXGBE_READ_REG(hw, IXGBE_PXON2OFFCNT(i));
+       IXGBE_READ_REG(hw, IXGBE_PRC64);
+       IXGBE_READ_REG(hw, IXGBE_PRC127);
+       IXGBE_READ_REG(hw, IXGBE_PRC255);
+       IXGBE_READ_REG(hw, IXGBE_PRC511);
+       IXGBE_READ_REG(hw, IXGBE_PRC1023);
+       IXGBE_READ_REG(hw, IXGBE_PRC1522);
+       IXGBE_READ_REG(hw, IXGBE_GPRC);
+       IXGBE_READ_REG(hw, IXGBE_BPRC);
+       IXGBE_READ_REG(hw, IXGBE_MPRC);
+       IXGBE_READ_REG(hw, IXGBE_GPTC);
+       IXGBE_READ_REG(hw, IXGBE_GORCL);
+       IXGBE_READ_REG(hw, IXGBE_GORCH);
+       IXGBE_READ_REG(hw, IXGBE_GOTCL);
+       IXGBE_READ_REG(hw, IXGBE_GOTCH);
+       for (i = 0; i < 8; i++)
+               IXGBE_READ_REG(hw, IXGBE_RNBC(i));
+       IXGBE_READ_REG(hw, IXGBE_RUC);
+       IXGBE_READ_REG(hw, IXGBE_RFC);
+       IXGBE_READ_REG(hw, IXGBE_ROC);
+       IXGBE_READ_REG(hw, IXGBE_RJC);
+       IXGBE_READ_REG(hw, IXGBE_MNGPRC);
+       IXGBE_READ_REG(hw, IXGBE_MNGPDC);
+       IXGBE_READ_REG(hw, IXGBE_MNGPTC);
+       IXGBE_READ_REG(hw, IXGBE_TORL);
+       IXGBE_READ_REG(hw, IXGBE_TORH);
+       IXGBE_READ_REG(hw, IXGBE_TPR);
+       IXGBE_READ_REG(hw, IXGBE_TPT);
+       IXGBE_READ_REG(hw, IXGBE_PTC64);
+       IXGBE_READ_REG(hw, IXGBE_PTC127);
+       IXGBE_READ_REG(hw, IXGBE_PTC255);
+       IXGBE_READ_REG(hw, IXGBE_PTC511);
+       IXGBE_READ_REG(hw, IXGBE_PTC1023);
+       IXGBE_READ_REG(hw, IXGBE_PTC1522);
+       IXGBE_READ_REG(hw, IXGBE_MPTC);
+       IXGBE_READ_REG(hw, IXGBE_BPTC);
+       for (i = 0; i < 16; i++) {
+               IXGBE_READ_REG(hw, IXGBE_QPRC(i));
+               IXGBE_READ_REG(hw, IXGBE_QPTC(i));
+               if (hw->mac.type >= ixgbe_mac_82599EB) {
+                       IXGBE_READ_REG(hw, IXGBE_QBRC_L(i));
+                       IXGBE_READ_REG(hw, IXGBE_QBRC_H(i));
+                       IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));
+                       IXGBE_READ_REG(hw, IXGBE_QBTC_H(i));
+                       IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
+               } else {
+                       IXGBE_READ_REG(hw, IXGBE_QBRC(i));
+                       IXGBE_READ_REG(hw, IXGBE_QBTC(i));
+               }
+       }
+
+       if (hw->mac.type == ixgbe_mac_X540) {
+               if (hw->phy.id == 0)
+                       hw->phy.ops.identify(hw);
+               hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECL, &i);
+               hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECH, &i);
+               hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECL, &i);
+               hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECH, &i);
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_read_pba_string_generic - Reads part number string from EEPROM
+ *  @hw: pointer to hardware structure
+ *  @pba_num: stores the part number string from the EEPROM
+ *  @pba_num_size: part number string buffer length
+ *
+ *  Reads the part number string from the EEPROM.
+ **/
+s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,
+                                  u32 pba_num_size)
+{
+       s32 ret_val;
+       u16 data;
+       u16 pba_ptr;
+       u16 offset;
+       u16 length;
+
+       if (pba_num == NULL) {
+               hw_dbg(hw, "PBA string buffer was null\n");
+               return IXGBE_ERR_INVALID_ARGUMENT;
+       }
+
+       ret_val = hw->eeprom.ops.read(hw, IXGBE_PBANUM0_PTR, &data);
+       if (ret_val) {
+               hw_dbg(hw, "NVM Read Error\n");
+               return ret_val;
+       }
+
+       ret_val = hw->eeprom.ops.read(hw, IXGBE_PBANUM1_PTR, &pba_ptr);
+       if (ret_val) {
+               hw_dbg(hw, "NVM Read Error\n");
+               return ret_val;
+       }
+
+       /*
+        * if data is not ptr guard the PBA must be in legacy format which
+        * means pba_ptr is actually our second data word for the PBA number
+        * and we can decode it into an ascii string
+        */
+       if (data != IXGBE_PBANUM_PTR_GUARD) {
+               hw_dbg(hw, "NVM PBA number is not stored as string\n");
+
+               /* we will need 11 characters to store the PBA */
+               if (pba_num_size < 11) {
+                       hw_dbg(hw, "PBA string buffer too small\n");
+                       return IXGBE_ERR_NO_SPACE;
+               }
+
+               /* extract hex string from data and pba_ptr */
+               pba_num[0] = (data >> 12) & 0xF;
+               pba_num[1] = (data >> 8) & 0xF;
+               pba_num[2] = (data >> 4) & 0xF;
+               pba_num[3] = data & 0xF;
+               pba_num[4] = (pba_ptr >> 12) & 0xF;
+               pba_num[5] = (pba_ptr >> 8) & 0xF;
+               pba_num[6] = '-';
+               pba_num[7] = 0;
+               pba_num[8] = (pba_ptr >> 4) & 0xF;
+               pba_num[9] = pba_ptr & 0xF;
+
+               /* put a null character on the end of our string */
+               pba_num[10] = '\0';
+
+               /* switch all the data but the '-' to hex char */
+               for (offset = 0; offset < 10; offset++) {
+                       if (pba_num[offset] < 0xA)
+                               pba_num[offset] += '0';
+                       else if (pba_num[offset] < 0x10)
+                               pba_num[offset] += 'A' - 0xA;
+               }
+
+               return 0;
+       }
+
+       ret_val = hw->eeprom.ops.read(hw, pba_ptr, &length);
+       if (ret_val) {
+               hw_dbg(hw, "NVM Read Error\n");
+               return ret_val;
+       }
+
+       if (length == 0xFFFF || length == 0) {
+               hw_dbg(hw, "NVM PBA number section invalid length\n");
+               return IXGBE_ERR_PBA_SECTION;
+       }
+
+       /* check if pba_num buffer is big enough */
+       if (pba_num_size  < (((u32)length * 2) - 1)) {
+               hw_dbg(hw, "PBA string buffer too small\n");
+               return IXGBE_ERR_NO_SPACE;
+       }
+
+       /* trim pba length from start of string */
+       pba_ptr++;
+       length--;
+
+       for (offset = 0; offset < length; offset++) {
+               ret_val = hw->eeprom.ops.read(hw, pba_ptr + offset, &data);
+               if (ret_val) {
+                       hw_dbg(hw, "NVM Read Error\n");
+                       return ret_val;
+               }
+               pba_num[offset * 2] = (u8)(data >> 8);
+               pba_num[(offset * 2) + 1] = (u8)(data & 0xFF);
+       }
+       pba_num[offset * 2] = '\0';
+
+       return 0;
+}
+
+/**
+ *  ixgbe_get_mac_addr_generic - Generic get MAC address
+ *  @hw: pointer to hardware structure
+ *  @mac_addr: Adapter MAC address
+ *
+ *  Reads the adapter's MAC address from first Receive Address Register (RAR0)
+ *  A reset of the adapter must be performed prior to calling this function
+ *  in order for the MAC address to have been loaded from the EEPROM into RAR0
+ **/
+s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr)
+{
+       u32 rar_high;
+       u32 rar_low;
+       u16 i;
+
+       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(0));
+       rar_low = IXGBE_READ_REG(hw, IXGBE_RAL(0));
+
+       for (i = 0; i < 4; i++)
+               mac_addr[i] = (u8)(rar_low >> (i*8));
+
+       for (i = 0; i < 2; i++)
+               mac_addr[i+4] = (u8)(rar_high >> (i*8));
+
+       return 0;
+}
+
+/**
+ *  ixgbe_get_bus_info_generic - Generic set PCI bus info
+ *  @hw: pointer to hardware structure
+ *
+ *  Sets the PCI bus info (speed, width, type) within the ixgbe_hw structure
+ **/
+s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw)
+{
+       struct ixgbe_adapter *adapter = hw->back;
+       struct ixgbe_mac_info *mac = &hw->mac;
+       u16 link_status;
+
+       hw->bus.type = ixgbe_bus_type_pci_express;
+
+       /* Get the negotiated link width and speed from PCI config space */
+       pci_read_config_word(adapter->pdev, IXGBE_PCI_LINK_STATUS,
+                            &link_status);
+
+       switch (link_status & IXGBE_PCI_LINK_WIDTH) {
+       case IXGBE_PCI_LINK_WIDTH_1:
+               hw->bus.width = ixgbe_bus_width_pcie_x1;
+               break;
+       case IXGBE_PCI_LINK_WIDTH_2:
+               hw->bus.width = ixgbe_bus_width_pcie_x2;
+               break;
+       case IXGBE_PCI_LINK_WIDTH_4:
+               hw->bus.width = ixgbe_bus_width_pcie_x4;
+               break;
+       case IXGBE_PCI_LINK_WIDTH_8:
+               hw->bus.width = ixgbe_bus_width_pcie_x8;
+               break;
+       default:
+               hw->bus.width = ixgbe_bus_width_unknown;
+               break;
+       }
+
+       switch (link_status & IXGBE_PCI_LINK_SPEED) {
+       case IXGBE_PCI_LINK_SPEED_2500:
+               hw->bus.speed = ixgbe_bus_speed_2500;
+               break;
+       case IXGBE_PCI_LINK_SPEED_5000:
+               hw->bus.speed = ixgbe_bus_speed_5000;
+               break;
+       default:
+               hw->bus.speed = ixgbe_bus_speed_unknown;
+               break;
+       }
+
+       mac->ops.set_lan_id(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_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.
+ **/
+void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw)
+{
+       struct ixgbe_bus_info *bus = &hw->bus;
+       u32 reg;
+
+       reg = IXGBE_READ_REG(hw, IXGBE_STATUS);
+       bus->func = (reg & IXGBE_STATUS_LAN_ID) >> IXGBE_STATUS_LAN_ID_SHIFT;
+       bus->lan_id = bus->func;
+
+       /* check for a port swap */
+       reg = IXGBE_READ_REG(hw, IXGBE_FACTPS);
+       if (reg & IXGBE_FACTPS_LFS)
+               bus->func ^= 0x1;
+}
+
+/**
+ *  ixgbe_stop_adapter_generic - Generic stop Tx/Rx units
+ *  @hw: pointer to hardware structure
+ *
+ *  Sets the adapter_stopped flag within ixgbe_hw struct. Clears interrupts,
+ *  disables transmit and receive units. The adapter_stopped flag is used by
+ *  the shared code and drivers to determine if the adapter is in a stopped
+ *  state and should not touch the hardware.
+ **/
+s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw)
+{
+       u32 number_of_queues;
+       u32 reg_val;
+       u16 i;
+
+       /*
+        * Set the adapter_stopped flag so other driver functions stop touching
+        * the hardware
+        */
+       hw->adapter_stopped = true;
+
+       /* Disable the receive unit */
+       reg_val = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
+       reg_val &= ~(IXGBE_RXCTRL_RXEN);
+       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg_val);
+       IXGBE_WRITE_FLUSH(hw);
+       usleep_range(2000, 4000);
+
+       /* Clear interrupt mask to stop from interrupts being generated */
+       IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_IRQ_CLEAR_MASK);
+
+       /* Clear any pending interrupts */
+       IXGBE_READ_REG(hw, IXGBE_EICR);
+
+       /* Disable the transmit unit.  Each queue must be disabled. */
+       number_of_queues = hw->mac.max_tx_queues;
+       for (i = 0; i < number_of_queues; i++) {
+               reg_val = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
+               if (reg_val & IXGBE_TXDCTL_ENABLE) {
+                       reg_val &= ~IXGBE_TXDCTL_ENABLE;
+                       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(i), reg_val);
+               }
+       }
+
+       /*
+        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
+        * access and verify no pending requests
+        */
+       ixgbe_disable_pcie_master(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_led_on_generic - Turns on the software controllable LEDs.
+ *  @hw: pointer to hardware structure
+ *  @index: led number to turn on
+ **/
+s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index)
+{
+       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+
+       /* To turn on the LED, set mode to ON. */
+       led_reg &= ~IXGBE_LED_MODE_MASK(index);
+       led_reg |= IXGBE_LED_ON << IXGBE_LED_MODE_SHIFT(index);
+       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
+       IXGBE_WRITE_FLUSH(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_led_off_generic - Turns off the software controllable LEDs.
+ *  @hw: pointer to hardware structure
+ *  @index: led number to turn off
+ **/
+s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index)
+{
+       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+
+       /* To turn off the LED, set mode to OFF. */
+       led_reg &= ~IXGBE_LED_MODE_MASK(index);
+       led_reg |= IXGBE_LED_OFF << IXGBE_LED_MODE_SHIFT(index);
+       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
+       IXGBE_WRITE_FLUSH(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_init_eeprom_params_generic - Initialize EEPROM params
+ *  @hw: pointer to hardware structure
+ *
+ *  Initializes the EEPROM parameters ixgbe_eeprom_info within the
+ *  ixgbe_hw struct in order to set up EEPROM access.
+ **/
+s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw)
+{
+       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
+       u32 eec;
+       u16 eeprom_size;
+
+       if (eeprom->type == ixgbe_eeprom_uninitialized) {
+               eeprom->type = ixgbe_eeprom_none;
+               /* Set default semaphore delay to 10ms which is a well
+                * tested value */
+               eeprom->semaphore_delay = 10;
+               /* Clear EEPROM page size, it will be initialized as needed */
+               eeprom->word_page_size = 0;
+
+               /*
+                * Check for EEPROM present first.
+                * If not present leave as none
+                */
+               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+               if (eec & IXGBE_EEC_PRES) {
+                       eeprom->type = ixgbe_eeprom_spi;
+
+                       /*
+                        * SPI EEPROM is assumed here.  This code would need to
+                        * change if a future EEPROM is not SPI.
+                        */
+                       eeprom_size = (u16)((eec & IXGBE_EEC_SIZE) >>
+                                           IXGBE_EEC_SIZE_SHIFT);
+                       eeprom->word_size = 1 << (eeprom_size +
+                                                 IXGBE_EEPROM_WORD_SIZE_SHIFT);
+               }
+
+               if (eec & IXGBE_EEC_ADDR_SIZE)
+                       eeprom->address_bits = 16;
+               else
+                       eeprom->address_bits = 8;
+               hw_dbg(hw, "Eeprom params: type = %d, size = %d, address bits: "
+                         "%d\n", eeprom->type, eeprom->word_size,
+                         eeprom->address_bits);
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_write_eeprom_buffer_bit_bang_generic - Write EEPROM using bit-bang
+ *  @hw: pointer to hardware structure
+ *  @offset: offset within the EEPROM to write
+ *  @words: number of words
+ *  @data: 16 bit word(s) to write to EEPROM
+ *
+ *  Reads 16 bit word(s) from EEPROM through bit-bang method
+ **/
+s32 ixgbe_write_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
+                                              u16 words, u16 *data)
+{
+       s32 status = 0;
+       u16 i, count;
+
+       hw->eeprom.ops.init_params(hw);
+
+       if (words == 0) {
+               status = IXGBE_ERR_INVALID_ARGUMENT;
+               goto out;
+       }
+
+       if (offset + words > hw->eeprom.word_size) {
+               status = IXGBE_ERR_EEPROM;
+               goto out;
+       }
+
+       /*
+        * The EEPROM page size cannot be queried from the chip. We do lazy
+        * initialization. It is worth to do that when we write large buffer.
+        */
+       if ((hw->eeprom.word_page_size == 0) &&
+           (words > IXGBE_EEPROM_PAGE_SIZE_MAX))
+               ixgbe_detect_eeprom_page_size_generic(hw, offset);
+
+       /*
+        * We cannot hold synchronization semaphores for too long
+        * to avoid other entity starvation. However it is more efficient
+        * to read in bursts than synchronizing access for each word.
+        */
+       for (i = 0; i < words; i += IXGBE_EEPROM_RD_BUFFER_MAX_COUNT) {
+               count = (words - i) / IXGBE_EEPROM_RD_BUFFER_MAX_COUNT > 0 ?
+                        IXGBE_EEPROM_RD_BUFFER_MAX_COUNT : (words - i);
+               status = ixgbe_write_eeprom_buffer_bit_bang(hw, offset + i,
+                                                           count, &data[i]);
+
+               if (status != 0)
+                       break;
+       }
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_write_eeprom_buffer_bit_bang - Writes 16 bit word(s) to EEPROM
+ *  @hw: pointer to hardware structure
+ *  @offset: offset within the EEPROM to be written to
+ *  @words: number of word(s)
+ *  @data: 16 bit word(s) to be written to the EEPROM
+ *
+ *  If ixgbe_eeprom_update_checksum is not called after this function, the
+ *  EEPROM will most likely contain an invalid checksum.
+ **/
+static s32 ixgbe_write_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
+                                             u16 words, u16 *data)
+{
+       s32 status;
+       u16 word;
+       u16 page_size;
+       u16 i;
+       u8 write_opcode = IXGBE_EEPROM_WRITE_OPCODE_SPI;
+
+       /* Prepare the EEPROM for writing  */
+       status = ixgbe_acquire_eeprom(hw);
+
+       if (status == 0) {
+               if (ixgbe_ready_eeprom(hw) != 0) {
+                       ixgbe_release_eeprom(hw);
+                       status = IXGBE_ERR_EEPROM;
+               }
+       }
+
+       if (status == 0) {
+               for (i = 0; i < words; i++) {
+                       ixgbe_standby_eeprom(hw);
+
+                       /*  Send the WRITE ENABLE command (8 bit opcode )  */
+                       ixgbe_shift_out_eeprom_bits(hw,
+                                                 IXGBE_EEPROM_WREN_OPCODE_SPI,
+                                                 IXGBE_EEPROM_OPCODE_BITS);
+
+                       ixgbe_standby_eeprom(hw);
+
+                       /*
+                        * Some SPI eeproms use the 8th address bit embedded
+                        * in the opcode
+                        */
+                       if ((hw->eeprom.address_bits == 8) &&
+                           ((offset + i) >= 128))
+                               write_opcode |= IXGBE_EEPROM_A8_OPCODE_SPI;
+
+                       /* Send the Write command (8-bit opcode + addr) */
+                       ixgbe_shift_out_eeprom_bits(hw, write_opcode,
+                                                   IXGBE_EEPROM_OPCODE_BITS);
+                       ixgbe_shift_out_eeprom_bits(hw, (u16)((offset + i) * 2),
+                                                   hw->eeprom.address_bits);
+
+                       page_size = hw->eeprom.word_page_size;
+
+                       /* Send the data in burst via SPI*/
+                       do {
+                               word = data[i];
+                               word = (word >> 8) | (word << 8);
+                               ixgbe_shift_out_eeprom_bits(hw, word, 16);
+
+                               if (page_size == 0)
+                                       break;
+
+                               /* do not wrap around page */
+                               if (((offset + i) & (page_size - 1)) ==
+                                   (page_size - 1))
+                                       break;
+                       } while (++i < words);
+
+                       ixgbe_standby_eeprom(hw);
+                       usleep_range(10000, 20000);
+               }
+               /* Done with writing - release the EEPROM */
+               ixgbe_release_eeprom(hw);
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_write_eeprom_generic - Writes 16 bit value to EEPROM
+ *  @hw: pointer to hardware structure
+ *  @offset: offset within the EEPROM to be written to
+ *  @data: 16 bit word to be written to the EEPROM
+ *
+ *  If ixgbe_eeprom_update_checksum is not called after this function, the
+ *  EEPROM will most likely contain an invalid checksum.
+ **/
+s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data)
+{
+       s32 status;
+
+       hw->eeprom.ops.init_params(hw);
+
+       if (offset >= hw->eeprom.word_size) {
+               status = IXGBE_ERR_EEPROM;
+               goto out;
+       }
+
+       status = ixgbe_write_eeprom_buffer_bit_bang(hw, offset, 1, &data);
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_read_eeprom_buffer_bit_bang_generic - Read EEPROM using bit-bang
+ *  @hw: pointer to hardware structure
+ *  @offset: offset within the EEPROM to be read
+ *  @words: number of word(s)
+ *  @data: read 16 bit words(s) from EEPROM
+ *
+ *  Reads 16 bit word(s) from EEPROM through bit-bang method
+ **/
+s32 ixgbe_read_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
+                                             u16 words, u16 *data)
+{
+       s32 status = 0;
+       u16 i, count;
+
+       hw->eeprom.ops.init_params(hw);
+
+       if (words == 0) {
+               status = IXGBE_ERR_INVALID_ARGUMENT;
+               goto out;
+       }
+
+       if (offset + words > hw->eeprom.word_size) {
+               status = IXGBE_ERR_EEPROM;
+               goto out;
+       }
+
+       /*
+        * We cannot hold synchronization semaphores for too long
+        * to avoid other entity starvation. However it is more efficient
+        * to read in bursts than synchronizing access for each word.
+        */
+       for (i = 0; i < words; i += IXGBE_EEPROM_RD_BUFFER_MAX_COUNT) {
+               count = (words - i) / IXGBE_EEPROM_RD_BUFFER_MAX_COUNT > 0 ?
+                        IXGBE_EEPROM_RD_BUFFER_MAX_COUNT : (words - i);
+
+               status = ixgbe_read_eeprom_buffer_bit_bang(hw, offset + i,
+                                                          count, &data[i]);
+
+               if (status != 0)
+                       break;
+       }
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_read_eeprom_buffer_bit_bang - Read EEPROM using bit-bang
+ *  @hw: pointer to hardware structure
+ *  @offset: offset within the EEPROM to be read
+ *  @words: number of word(s)
+ *  @data: read 16 bit word(s) from EEPROM
+ *
+ *  Reads 16 bit word(s) from EEPROM through bit-bang method
+ **/
+static s32 ixgbe_read_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
+                                            u16 words, u16 *data)
+{
+       s32 status;
+       u16 word_in;
+       u8 read_opcode = IXGBE_EEPROM_READ_OPCODE_SPI;
+       u16 i;
+
+       /* Prepare the EEPROM for reading  */
+       status = ixgbe_acquire_eeprom(hw);
+
+       if (status == 0) {
+               if (ixgbe_ready_eeprom(hw) != 0) {
+                       ixgbe_release_eeprom(hw);
+                       status = IXGBE_ERR_EEPROM;
+               }
+       }
+
+       if (status == 0) {
+               for (i = 0; i < words; i++) {
+                       ixgbe_standby_eeprom(hw);
+                       /*
+                        * Some SPI eeproms use the 8th address bit embedded
+                        * in the opcode
+                        */
+                       if ((hw->eeprom.address_bits == 8) &&
+                           ((offset + i) >= 128))
+                               read_opcode |= IXGBE_EEPROM_A8_OPCODE_SPI;
+
+                       /* Send the READ command (opcode + addr) */
+                       ixgbe_shift_out_eeprom_bits(hw, read_opcode,
+                                                   IXGBE_EEPROM_OPCODE_BITS);
+                       ixgbe_shift_out_eeprom_bits(hw, (u16)((offset + i) * 2),
+                                                   hw->eeprom.address_bits);
+
+                       /* Read the data. */
+                       word_in = ixgbe_shift_in_eeprom_bits(hw, 16);
+                       data[i] = (word_in >> 8) | (word_in << 8);
+               }
+
+               /* End this read operation */
+               ixgbe_release_eeprom(hw);
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_read_eeprom_bit_bang_generic - Read EEPROM word using bit-bang
+ *  @hw: pointer to hardware structure
+ *  @offset: offset within the EEPROM to be read
+ *  @data: read 16 bit value from EEPROM
+ *
+ *  Reads 16 bit value from EEPROM through bit-bang method
+ **/
+s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
+                                      u16 *data)
+{
+       s32 status;
+
+       hw->eeprom.ops.init_params(hw);
+
+       if (offset >= hw->eeprom.word_size) {
+               status = IXGBE_ERR_EEPROM;
+               goto out;
+       }
+
+       status = ixgbe_read_eeprom_buffer_bit_bang(hw, offset, 1, data);
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_read_eerd_buffer_generic - Read EEPROM word(s) using EERD
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of word in the EEPROM to read
+ *  @words: number of word(s)
+ *  @data: 16 bit word(s) from the EEPROM
+ *
+ *  Reads a 16 bit word(s) from the EEPROM using the EERD register.
+ **/
+s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset,
+                                  u16 words, u16 *data)
+{
+       u32 eerd;
+       s32 status = 0;
+       u32 i;
+
+       hw->eeprom.ops.init_params(hw);
+
+       if (words == 0) {
+               status = IXGBE_ERR_INVALID_ARGUMENT;
+               goto out;
+       }
+
+       if (offset >= hw->eeprom.word_size) {
+               status = IXGBE_ERR_EEPROM;
+               goto out;
+       }
+
+       for (i = 0; i < words; i++) {
+               eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) +
+                      IXGBE_EEPROM_RW_REG_START;
+
+               IXGBE_WRITE_REG(hw, IXGBE_EERD, eerd);
+               status = ixgbe_poll_eerd_eewr_done(hw, IXGBE_NVM_POLL_READ);
+
+               if (status == 0) {
+                       data[i] = (IXGBE_READ_REG(hw, IXGBE_EERD) >>
+                                  IXGBE_EEPROM_RW_REG_DATA);
+               } else {
+                       hw_dbg(hw, "Eeprom read timed out\n");
+                       goto out;
+               }
+       }
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_detect_eeprom_page_size_generic - Detect EEPROM page size
+ *  @hw: pointer to hardware structure
+ *  @offset: offset within the EEPROM to be used as a scratch pad
+ *
+ *  Discover EEPROM page size by writing marching data at given offset.
+ *  This function is called only when we are writing a new large buffer
+ *  at given offset so the data would be overwritten anyway.
+ **/
+static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw,
+                                                u16 offset)
+{
+       u16 data[IXGBE_EEPROM_PAGE_SIZE_MAX];
+       s32 status = 0;
+       u16 i;
+
+       for (i = 0; i < IXGBE_EEPROM_PAGE_SIZE_MAX; i++)
+               data[i] = i;
+
+       hw->eeprom.word_page_size = IXGBE_EEPROM_PAGE_SIZE_MAX;
+       status = ixgbe_write_eeprom_buffer_bit_bang(hw, offset,
+                                            IXGBE_EEPROM_PAGE_SIZE_MAX, data);
+       hw->eeprom.word_page_size = 0;
+       if (status != 0)
+               goto out;
+
+       status = ixgbe_read_eeprom_buffer_bit_bang(hw, offset, 1, data);
+       if (status != 0)
+               goto out;
+
+       /*
+        * When writing in burst more than the actual page size
+        * EEPROM address wraps around current page.
+        */
+       hw->eeprom.word_page_size = IXGBE_EEPROM_PAGE_SIZE_MAX - data[0];
+
+       hw_dbg(hw, "Detected EEPROM page size = %d words.",
+              hw->eeprom.word_page_size);
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_read_eerd_generic - Read EEPROM word using EERD
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to read
+ *  @data: word read from the EEPROM
+ *
+ *  Reads a 16 bit word from the EEPROM using the EERD register.
+ **/
+s32 ixgbe_read_eerd_generic(struct ixgbe_hw *hw, u16 offset, u16 *data)
+{
+       return ixgbe_read_eerd_buffer_generic(hw, offset, 1, data);
+}
+
+/**
+ *  ixgbe_write_eewr_buffer_generic - Write EEPROM word(s) using EEWR
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to write
+ *  @words: number of words
+ *  @data: word(s) write to the EEPROM
+ *
+ *  Write a 16 bit word(s) to the EEPROM using the EEWR register.
+ **/
+s32 ixgbe_write_eewr_buffer_generic(struct ixgbe_hw *hw, u16 offset,
+                                   u16 words, u16 *data)
+{
+       u32 eewr;
+       s32 status = 0;
+       u16 i;
+
+       hw->eeprom.ops.init_params(hw);
+
+       if (words == 0) {
+               status = IXGBE_ERR_INVALID_ARGUMENT;
+               goto out;
+       }
+
+       if (offset >= hw->eeprom.word_size) {
+               status = IXGBE_ERR_EEPROM;
+               goto out;
+       }
+
+       for (i = 0; i < words; i++) {
+               eewr = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) |
+                      (data[i] << IXGBE_EEPROM_RW_REG_DATA) |
+                      IXGBE_EEPROM_RW_REG_START;
+
+               status = ixgbe_poll_eerd_eewr_done(hw, IXGBE_NVM_POLL_WRITE);
+               if (status != 0) {
+                       hw_dbg(hw, "Eeprom write EEWR timed out\n");
+                       goto out;
+               }
+
+               IXGBE_WRITE_REG(hw, IXGBE_EEWR, eewr);
+
+               status = ixgbe_poll_eerd_eewr_done(hw, IXGBE_NVM_POLL_WRITE);
+               if (status != 0) {
+                       hw_dbg(hw, "Eeprom write EEWR timed out\n");
+                       goto out;
+               }
+       }
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_write_eewr_generic - Write EEPROM word using EEWR
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to write
+ *  @data: word write to the EEPROM
+ *
+ *  Write a 16 bit word to the EEPROM using the EEWR register.
+ **/
+s32 ixgbe_write_eewr_generic(struct ixgbe_hw *hw, u16 offset, u16 data)
+{
+       return ixgbe_write_eewr_buffer_generic(hw, offset, 1, &data);
+}
+
+/**
+ *  ixgbe_poll_eerd_eewr_done - Poll EERD read or EEWR write status
+ *  @hw: pointer to hardware structure
+ *  @ee_reg: EEPROM flag for polling
+ *
+ *  Polls the status bit (bit 1) of the EERD or EEWR to determine when the
+ *  read or write is done respectively.
+ **/
+static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)
+{
+       u32 i;
+       u32 reg;
+       s32 status = IXGBE_ERR_EEPROM;
+
+       for (i = 0; i < IXGBE_EERD_EEWR_ATTEMPTS; i++) {
+               if (ee_reg == IXGBE_NVM_POLL_READ)
+                       reg = IXGBE_READ_REG(hw, IXGBE_EERD);
+               else
+                       reg = IXGBE_READ_REG(hw, IXGBE_EEWR);
+
+               if (reg & IXGBE_EEPROM_RW_REG_DONE) {
+                       status = 0;
+                       break;
+               }
+               udelay(5);
+       }
+       return status;
+}
+
+/**
+ *  ixgbe_acquire_eeprom - Acquire EEPROM using bit-bang
+ *  @hw: pointer to hardware structure
+ *
+ *  Prepares EEPROM for access using bit-bang method. This function should
+ *  be called before issuing a command to the EEPROM.
+ **/
+static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)
+{
+       s32 status = 0;
+       u32 eec;
+       u32 i;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)
+               status = IXGBE_ERR_SWFW_SYNC;
+
+       if (status == 0) {
+               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+
+               /* Request EEPROM Access */
+               eec |= IXGBE_EEC_REQ;
+               IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+
+               for (i = 0; i < IXGBE_EEPROM_GRANT_ATTEMPTS; i++) {
+                       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+                       if (eec & IXGBE_EEC_GNT)
+                               break;
+                       udelay(5);
+               }
+
+               /* Release if grant not acquired */
+               if (!(eec & IXGBE_EEC_GNT)) {
+                       eec &= ~IXGBE_EEC_REQ;
+                       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+                       hw_dbg(hw, "Could not acquire EEPROM grant\n");
+
+                       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+                       status = IXGBE_ERR_EEPROM;
+               }
+
+               /* Setup EEPROM for Read/Write */
+               if (status == 0) {
+                       /* Clear CS and SK */
+                       eec &= ~(IXGBE_EEC_CS | IXGBE_EEC_SK);
+                       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+                       IXGBE_WRITE_FLUSH(hw);
+                       udelay(1);
+               }
+       }
+       return status;
+}
+
+/**
+ *  ixgbe_get_eeprom_semaphore - Get hardware semaphore
+ *  @hw: pointer to hardware structure
+ *
+ *  Sets the hardware semaphores so EEPROM access can occur for bit-bang method
+ **/
+static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
+{
+       s32 status = IXGBE_ERR_EEPROM;
+       u32 timeout = 2000;
+       u32 i;
+       u32 swsm;
+
+       /* Get SMBI software semaphore between device drivers first */
+       for (i = 0; i < timeout; i++) {
+               /*
+                * If the SMBI bit is 0 when we read it, then the bit will be
+                * set and we have the semaphore
+                */
+               swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
+               if (!(swsm & IXGBE_SWSM_SMBI)) {
+                       status = 0;
+                       break;
+               }
+               udelay(50);
+       }
+
+       if (i == timeout) {
+               hw_dbg(hw, "Driver can't access the Eeprom - SMBI Semaphore "
+                      "not granted.\n");
+               /*
+                * this release is particularly important because our attempts
+                * above to get the semaphore may have succeeded, and if there
+                * was a timeout, we should unconditionally clear the semaphore
+                * bits to free the driver to make progress
+                */
+               ixgbe_release_eeprom_semaphore(hw);
+
+               udelay(50);
+               /*
+                * one last try
+                * If the SMBI bit is 0 when we read it, then the bit will be
+                * set and we have the semaphore
+                */
+               swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
+               if (!(swsm & IXGBE_SWSM_SMBI))
+                       status = 0;
+       }
+
+       /* Now get the semaphore between SW/FW through the SWESMBI bit */
+       if (status == 0) {
+               for (i = 0; i < timeout; i++) {
+                       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
+
+                       /* Set the SW EEPROM semaphore bit to request access */
+                       swsm |= IXGBE_SWSM_SWESMBI;
+                       IXGBE_WRITE_REG(hw, IXGBE_SWSM, swsm);
+
+                       /*
+                        * If we set the bit successfully then we got the
+                        * semaphore.
+                        */
+                       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
+                       if (swsm & IXGBE_SWSM_SWESMBI)
+                               break;
+
+                       udelay(50);
+               }
+
+               /*
+                * Release semaphores and return error if SW EEPROM semaphore
+                * was not granted because we don't have access to the EEPROM
+                */
+               if (i >= timeout) {
+                       hw_dbg(hw, "SWESMBI Software EEPROM semaphore "
+                              "not granted.\n");
+                       ixgbe_release_eeprom_semaphore(hw);
+                       status = IXGBE_ERR_EEPROM;
+               }
+       } else {
+               hw_dbg(hw, "Software semaphore SMBI between device drivers "
+                      "not granted.\n");
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_release_eeprom_semaphore - Release hardware semaphore
+ *  @hw: pointer to hardware structure
+ *
+ *  This function clears hardware semaphore bits.
+ **/
+static void ixgbe_release_eeprom_semaphore(struct ixgbe_hw *hw)
+{
+       u32 swsm;
+
+       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
+
+       /* Release both semaphores by writing 0 to the bits SWESMBI and SMBI */
+       swsm &= ~(IXGBE_SWSM_SWESMBI | IXGBE_SWSM_SMBI);
+       IXGBE_WRITE_REG(hw, IXGBE_SWSM, swsm);
+       IXGBE_WRITE_FLUSH(hw);
+}
+
+/**
+ *  ixgbe_ready_eeprom - Polls for EEPROM ready
+ *  @hw: pointer to hardware structure
+ **/
+static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)
+{
+       s32 status = 0;
+       u16 i;
+       u8 spi_stat_reg;
+
+       /*
+        * 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
+        * 5 milliseconds, then error out.
+        */
+       for (i = 0; i < IXGBE_EEPROM_MAX_RETRY_SPI; i += 5) {
+               ixgbe_shift_out_eeprom_bits(hw, IXGBE_EEPROM_RDSR_OPCODE_SPI,
+                                           IXGBE_EEPROM_OPCODE_BITS);
+               spi_stat_reg = (u8)ixgbe_shift_in_eeprom_bits(hw, 8);
+               if (!(spi_stat_reg & IXGBE_EEPROM_STATUS_RDY_SPI))
+                       break;
+
+               udelay(5);
+               ixgbe_standby_eeprom(hw);
+       }
+
+       /*
+        * On some parts, SPI write time could vary from 0-20mSec on 3.3V
+        * devices (and only 0-5mSec on 5V devices)
+        */
+       if (i >= IXGBE_EEPROM_MAX_RETRY_SPI) {
+               hw_dbg(hw, "SPI EEPROM Status error\n");
+               status = IXGBE_ERR_EEPROM;
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_standby_eeprom - Returns EEPROM to a "standby" state
+ *  @hw: pointer to hardware structure
+ **/
+static void ixgbe_standby_eeprom(struct ixgbe_hw *hw)
+{
+       u32 eec;
+
+       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+
+       /* Toggle CS to flush commands */
+       eec |= IXGBE_EEC_CS;
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(1);
+       eec &= ~IXGBE_EEC_CS;
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(1);
+}
+
+/**
+ *  ixgbe_shift_out_eeprom_bits - Shift data bits out to the EEPROM.
+ *  @hw: pointer to hardware structure
+ *  @data: data to send to the EEPROM
+ *  @count: number of bits to shift out
+ **/
+static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
+                                        u16 count)
+{
+       u32 eec;
+       u32 mask;
+       u32 i;
+
+       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+
+       /*
+        * Mask is used to shift "count" bits of "data" out to the EEPROM
+        * one bit at a time.  Determine the starting bit based on count
+        */
+       mask = 0x01 << (count - 1);
+
+       for (i = 0; i < count; i++) {
+               /*
+                * A "1" is shifted out to the EEPROM by setting bit "DI" to a
+                * "1", and then raising and then lowering the clock (the SK
+                * bit controls the clock input to the EEPROM).  A "0" is
+                * shifted out to the EEPROM by setting "DI" to "0" and then
+                * raising and then lowering the clock.
+                */
+               if (data & mask)
+                       eec |= IXGBE_EEC_DI;
+               else
+                       eec &= ~IXGBE_EEC_DI;
+
+               IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+               IXGBE_WRITE_FLUSH(hw);
+
+               udelay(1);
+
+               ixgbe_raise_eeprom_clk(hw, &eec);
+               ixgbe_lower_eeprom_clk(hw, &eec);
+
+               /*
+                * Shift mask to signify next bit of data to shift in to the
+                * EEPROM
+                */
+               mask = mask >> 1;
+       }
+
+       /* We leave the "DI" bit set to "0" when we leave this routine. */
+       eec &= ~IXGBE_EEC_DI;
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+       IXGBE_WRITE_FLUSH(hw);
+}
+
+/**
+ *  ixgbe_shift_in_eeprom_bits - Shift data bits in from the EEPROM
+ *  @hw: pointer to hardware structure
+ **/
+static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count)
+{
+       u32 eec;
+       u32 i;
+       u16 data = 0;
+
+       /*
+        * 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 "DO" bit.  During this "shifting in" process the
+        * "DI" bit should always be clear.
+        */
+       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+
+       eec &= ~(IXGBE_EEC_DO | IXGBE_EEC_DI);
+
+       for (i = 0; i < count; i++) {
+               data = data << 1;
+               ixgbe_raise_eeprom_clk(hw, &eec);
+
+               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+
+               eec &= ~(IXGBE_EEC_DI);
+               if (eec & IXGBE_EEC_DO)
+                       data |= 1;
+
+               ixgbe_lower_eeprom_clk(hw, &eec);
+       }
+
+       return data;
+}
+
+/**
+ *  ixgbe_raise_eeprom_clk - Raises the EEPROM's clock input.
+ *  @hw: pointer to hardware structure
+ *  @eec: EEC register's current value
+ **/
+static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)
+{
+       /*
+        * Raise the clock input to the EEPROM
+        * (setting the SK bit), then delay
+        */
+       *eec = *eec | IXGBE_EEC_SK;
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, *eec);
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(1);
+}
+
+/**
+ *  ixgbe_lower_eeprom_clk - Lowers the EEPROM's clock input.
+ *  @hw: pointer to hardware structure
+ *  @eecd: EECD's current value
+ **/
+static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)
+{
+       /*
+        * Lower the clock input to the EEPROM (clearing the SK bit), then
+        * delay
+        */
+       *eec = *eec & ~IXGBE_EEC_SK;
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, *eec);
+       IXGBE_WRITE_FLUSH(hw);
+       udelay(1);
+}
+
+/**
+ *  ixgbe_release_eeprom - Release EEPROM, release semaphores
+ *  @hw: pointer to hardware structure
+ **/
+static void ixgbe_release_eeprom(struct ixgbe_hw *hw)
+{
+       u32 eec;
+
+       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+
+       eec |= IXGBE_EEC_CS;  /* Pull CS high */
+       eec &= ~IXGBE_EEC_SK; /* Lower SCK */
+
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+       IXGBE_WRITE_FLUSH(hw);
+
+       udelay(1);
+
+       /* Stop requesting EEPROM access */
+       eec &= ~IXGBE_EEC_REQ;
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+
+       /*
+        * Delay before attempt to obtain semaphore again to allow FW
+        * access. semaphore_delay is in ms we need us for usleep_range
+        */
+       usleep_range(hw->eeprom.semaphore_delay * 1000,
+                    hw->eeprom.semaphore_delay * 2000);
+}
+
+/**
+ *  ixgbe_calc_eeprom_checksum_generic - Calculates and returns the checksum
+ *  @hw: pointer to hardware structure
+ **/
+u16 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw)
+{
+       u16 i;
+       u16 j;
+       u16 checksum = 0;
+       u16 length = 0;
+       u16 pointer = 0;
+       u16 word = 0;
+
+       /* Include 0x0-0x3F in the checksum */
+       for (i = 0; i < IXGBE_EEPROM_CHECKSUM; i++) {
+               if (hw->eeprom.ops.read(hw, i, &word) != 0) {
+                       hw_dbg(hw, "EEPROM read failed\n");
+                       break;
+               }
+               checksum += word;
+       }
+
+       /* Include all data from pointers except for the fw pointer */
+       for (i = IXGBE_PCIE_ANALOG_PTR; i < IXGBE_FW_PTR; i++) {
+               hw->eeprom.ops.read(hw, i, &pointer);
+
+               /* Make sure the pointer seems valid */
+               if (pointer != 0xFFFF && pointer != 0) {
+                       hw->eeprom.ops.read(hw, pointer, &length);
+
+                       if (length != 0xFFFF && length != 0) {
+                               for (j = pointer+1; j <= pointer+length; j++) {
+                                       hw->eeprom.ops.read(hw, j, &word);
+                                       checksum += word;
+                               }
+                       }
+               }
+       }
+
+       checksum = (u16)IXGBE_EEPROM_SUM - checksum;
+
+       return checksum;
+}
+
+/**
+ *  ixgbe_validate_eeprom_checksum_generic - Validate EEPROM checksum
+ *  @hw: pointer to hardware structure
+ *  @checksum_val: calculated checksum
+ *
+ *  Performs checksum calculation and validates the EEPROM checksum.  If the
+ *  caller does not need checksum_val, the value can be NULL.
+ **/
+s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,
+                                           u16 *checksum_val)
+{
+       s32 status;
+       u16 checksum;
+       u16 read_checksum = 0;
+
+       /*
+        * Read the first word from the EEPROM. If this times out or fails, do
+        * not continue or we could be in for a very long wait while every
+        * EEPROM read fails
+        */
+       status = hw->eeprom.ops.read(hw, 0, &checksum);
+
+       if (status == 0) {
+               checksum = hw->eeprom.ops.calc_checksum(hw);
+
+               hw->eeprom.ops.read(hw, IXGBE_EEPROM_CHECKSUM, &read_checksum);
+
+               /*
+                * Verify read checksum from EEPROM is the same as
+                * calculated checksum
+                */
+               if (read_checksum != checksum)
+                       status = IXGBE_ERR_EEPROM_CHECKSUM;
+
+               /* If the user cares, return the calculated checksum */
+               if (checksum_val)
+                       *checksum_val = checksum;
+       } else {
+               hw_dbg(hw, "EEPROM read failed\n");
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_update_eeprom_checksum_generic - Updates the EEPROM checksum
+ *  @hw: pointer to hardware structure
+ **/
+s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw)
+{
+       s32 status;
+       u16 checksum;
+
+       /*
+        * Read the first word from the EEPROM. If this times out or fails, do
+        * not continue or we could be in for a very long wait while every
+        * EEPROM read fails
+        */
+       status = hw->eeprom.ops.read(hw, 0, &checksum);
+
+       if (status == 0) {
+               checksum = hw->eeprom.ops.calc_checksum(hw);
+               status = hw->eeprom.ops.write(hw, IXGBE_EEPROM_CHECKSUM,
+                                             checksum);
+       } else {
+               hw_dbg(hw, "EEPROM read failed\n");
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_validate_mac_addr - Validate MAC address
+ *  @mac_addr: pointer to MAC address.
+ *
+ *  Tests a MAC address to ensure it is a valid Individual Address
+ **/
+s32 ixgbe_validate_mac_addr(u8 *mac_addr)
+{
+       s32 status = 0;
+
+       /* Make sure it is not a multicast address */
+       if (IXGBE_IS_MULTICAST(mac_addr))
+               status = IXGBE_ERR_INVALID_MAC_ADDR;
+       /* Not a broadcast address */
+       else if (IXGBE_IS_BROADCAST(mac_addr))
+               status = IXGBE_ERR_INVALID_MAC_ADDR;
+       /* Reject the zero address */
+       else if (mac_addr[0] == 0 && mac_addr[1] == 0 && mac_addr[2] == 0 &&
+                mac_addr[3] == 0 && mac_addr[4] == 0 && mac_addr[5] == 0)
+               status = IXGBE_ERR_INVALID_MAC_ADDR;
+
+       return status;
+}
+
+/**
+ *  ixgbe_set_rar_generic - Set Rx address register
+ *  @hw: pointer to hardware structure
+ *  @index: Receive address register to write
+ *  @addr: Address to put into receive address register
+ *  @vmdq: VMDq "set" or "pool" index
+ *  @enable_addr: set flag that address is active
+ *
+ *  Puts an ethernet address into a receive address register.
+ **/
+s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
+                          u32 enable_addr)
+{
+       u32 rar_low, rar_high;
+       u32 rar_entries = hw->mac.num_rar_entries;
+
+       /* Make sure we are using a valid rar index range */
+       if (index >= rar_entries) {
+               hw_dbg(hw, "RAR index %d is out of range.\n", index);
+               return IXGBE_ERR_INVALID_ARGUMENT;
+       }
+
+       /* setup VMDq pool selection before this RAR gets enabled */
+       hw->mac.ops.set_vmdq(hw, index, vmdq);
+
+       /*
+        * 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));
+       /*
+        * Some parts put the VMDq setting in the extra RAH bits,
+        * so save everything except the lower 16 bits that hold part
+        * of the address and the address valid bit.
+        */
+       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
+       rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
+       rar_high |= ((u32)addr[4] | ((u32)addr[5] << 8));
+
+       if (enable_addr != 0)
+               rar_high |= IXGBE_RAH_AV;
+
+       IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);
+       IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_clear_rar_generic - Remove Rx address register
+ *  @hw: pointer to hardware structure
+ *  @index: Receive address register to write
+ *
+ *  Clears an ethernet address from a receive address register.
+ **/
+s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index)
+{
+       u32 rar_high;
+       u32 rar_entries = hw->mac.num_rar_entries;
+
+       /* Make sure we are using a valid rar index range */
+       if (index >= rar_entries) {
+               hw_dbg(hw, "RAR index %d is out of range.\n", index);
+               return IXGBE_ERR_INVALID_ARGUMENT;
+       }
+
+       /*
+        * Some parts put the VMDq setting in the extra RAH bits,
+        * so save everything except the lower 16 bits that hold part
+        * of the address and the address valid bit.
+        */
+       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
+       rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
+
+       IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
+       IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
+
+       /* clear VMDq pool/queue selection for this RAR */
+       hw->mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_init_rx_addrs_generic - Initializes receive address filters.
+ *  @hw: pointer to hardware structure
+ *
+ *  Places the MAC address in receive address register 0 and clears the rest
+ *  of the receive address registers. Clears the multicast table. Assumes
+ *  the receiver is in reset when the routine is called.
+ **/
+s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
+{
+       u32 i;
+       u32 rar_entries = hw->mac.num_rar_entries;
+
+       /*
+        * If the current mac address is valid, assume it is a software override
+        * to the permanent address.
+        * Otherwise, use the permanent address from the eeprom.
+        */
+       if (ixgbe_validate_mac_addr(hw->mac.addr) ==
+           IXGBE_ERR_INVALID_MAC_ADDR) {
+               /* Get the MAC address from the RAR0 for later reference */
+               hw->mac.ops.get_mac_addr(hw, hw->mac.addr);
+
+               hw_dbg(hw, " Keeping Current RAR0 Addr =%pM\n", hw->mac.addr);
+       } else {
+               /* Setup the receive address. */
+               hw_dbg(hw, "Overriding MAC Address in RAR[0]\n");
+               hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);
+
+               hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
+
+               /*  clear VMDq pool/queue selection for RAR 0 */
+               hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL);
+       }
+       hw->addr_ctrl.overflow_promisc = 0;
+
+       hw->addr_ctrl.rar_used_count = 1;
+
+       /* Zero out the other receive addresses. */
+       hw_dbg(hw, "Clearing RAR[1-%d]\n", rar_entries - 1);
+       for (i = 1; i < rar_entries; i++) {
+               IXGBE_WRITE_REG(hw, IXGBE_RAL(i), 0);
+               IXGBE_WRITE_REG(hw, IXGBE_RAH(i), 0);
+       }
+
+       /* Clear the MTA */
+       hw->addr_ctrl.mta_in_use = 0;
+       IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw->mac.mc_filter_type);
+
+       hw_dbg(hw, " Clearing MTA\n");
+       for (i = 0; i < hw->mac.mcft_size; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_MTA(i), 0);
+
+       if (hw->mac.ops.init_uta_tables)
+               hw->mac.ops.init_uta_tables(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_mta_vector - Determines bit-vector in multicast table to set
+ *  @hw: pointer to hardware structure
+ *  @mc_addr: the multicast address
+ *
+ *  Extracts the 12 bits, from a multicast address, to determine which
+ *  bit-vector to set in the multicast table. The hardware uses 12 bits, from
+ *  incoming rx multicast addresses, to determine the bit-vector to check in
+ *  the MTA. Which of the 4 combination, of 12-bits, the hardware uses is set
+ *  by the MO field of the MCSTCTRL. The MO field is set during initialization
+ *  to mc_filter_type.
+ **/
+static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)
+{
+       u32 vector = 0;
+
+       switch (hw->mac.mc_filter_type) {
+       case 0:   /* use bits [47:36] of the address */
+               vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
+               break;
+       case 1:   /* use bits [46:35] of the address */
+               vector = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
+               break;
+       case 2:   /* use bits [45:34] of the address */
+               vector = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
+               break;
+       case 3:   /* use bits [43:32] of the address */
+               vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
+               break;
+       default:  /* Invalid mc_filter_type */
+               hw_dbg(hw, "MC filter type param set incorrectly\n");
+               break;
+       }
+
+       /* vector can only be 12-bits or boundary will be exceeded */
+       vector &= 0xFFF;
+       return vector;
+}
+
+/**
+ *  ixgbe_set_mta - Set bit-vector in multicast table
+ *  @hw: pointer to hardware structure
+ *  @hash_value: Multicast address hash value
+ *
+ *  Sets the bit-vector in the multicast table.
+ **/
+static void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr)
+{
+       u32 vector;
+       u32 vector_bit;
+       u32 vector_reg;
+
+       hw->addr_ctrl.mta_in_use++;
+
+       vector = ixgbe_mta_vector(hw, mc_addr);
+       hw_dbg(hw, " bit-vector = 0x%03X\n", vector);
+
+       /*
+        * The MTA is a register array of 128 32-bit registers. It is treated
+        * like an array of 4096 bits.  We want to set bit
+        * BitArray[vector_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
+        * register is determined by the upper 7 bits of the vector value and
+        * the bit within that register are determined by the lower 5 bits of
+        * the value.
+        */
+       vector_reg = (vector >> 5) & 0x7F;
+       vector_bit = vector & 0x1F;
+       hw->mac.mta_shadow[vector_reg] |= (1 << vector_bit);
+}
+
+/**
+ *  ixgbe_update_mc_addr_list_generic - Updates MAC list of multicast addresses
+ *  @hw: pointer to hardware structure
+ *  @netdev: pointer to net device structure
+ *
+ *  The given list replaces any existing list. Clears the MC addrs from receive
+ *  address registers and the multicast table. Uses unused receive address
+ *  registers for the first multicast addresses, and hashes the rest into the
+ *  multicast table.
+ **/
+s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
+                                     struct net_device *netdev)
+{
+       struct netdev_hw_addr *ha;
+       u32 i;
+
+       /*
+        * Set the new number of MC addresses that we are being requested to
+        * use.
+        */
+       hw->addr_ctrl.num_mc_addrs = netdev_mc_count(netdev);
+       hw->addr_ctrl.mta_in_use = 0;
+
+       /* Clear mta_shadow */
+       hw_dbg(hw, " Clearing MTA\n");
+       memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
+
+       /* Update mta shadow */
+       netdev_for_each_mc_addr(ha, netdev) {
+               hw_dbg(hw, " Adding the multicast addresses:\n");
+               ixgbe_set_mta(hw, ha->addr);
+       }
+
+       /* Enable mta */
+       for (i = 0; i < hw->mac.mcft_size; i++)
+               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_MTA(0), i,
+                                     hw->mac.mta_shadow[i]);
+
+       if (hw->addr_ctrl.mta_in_use > 0)
+               IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,
+                               IXGBE_MCSTCTRL_MFE | hw->mac.mc_filter_type);
+
+       hw_dbg(hw, "ixgbe_update_mc_addr_list_generic Complete\n");
+       return 0;
+}
+
+/**
+ *  ixgbe_enable_mc_generic - Enable multicast address in RAR
+ *  @hw: pointer to hardware structure
+ *
+ *  Enables multicast address in RAR and the use of the multicast hash table.
+ **/
+s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw)
+{
+       struct ixgbe_addr_filter_info *a = &hw->addr_ctrl;
+
+       if (a->mta_in_use > 0)
+               IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, IXGBE_MCSTCTRL_MFE |
+                               hw->mac.mc_filter_type);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_disable_mc_generic - Disable multicast address in RAR
+ *  @hw: pointer to hardware structure
+ *
+ *  Disables multicast address in RAR and the use of the multicast hash table.
+ **/
+s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw)
+{
+       struct ixgbe_addr_filter_info *a = &hw->addr_ctrl;
+
+       if (a->mta_in_use > 0)
+               IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw->mac.mc_filter_type);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_fc_enable_generic - Enable flow control
+ *  @hw: pointer to hardware structure
+ *  @packetbuf_num: packet buffer number (0-7)
+ *
+ *  Enable flow control according to the current settings.
+ **/
+s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
+{
+       s32 ret_val = 0;
+       u32 mflcn_reg, fccfg_reg;
+       u32 reg;
+       u32 rx_pba_size;
+       u32 fcrtl, fcrth;
+
+#ifdef CONFIG_DCB
+       if (hw->fc.requested_mode == ixgbe_fc_pfc)
+               goto out;
+
+#endif /* CONFIG_DCB */
+       /* Negotiate the fc mode to use */
+       ret_val = ixgbe_fc_autoneg(hw);
+       if (ret_val == IXGBE_ERR_FLOW_CONTROL)
+               goto out;
+
+       /* Disable any previous flow control settings */
+       mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+       mflcn_reg &= ~(IXGBE_MFLCN_RFCE | IXGBE_MFLCN_RPFCE);
+
+       fccfg_reg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
+       fccfg_reg &= ~(IXGBE_FCCFG_TFCE_802_3X | IXGBE_FCCFG_TFCE_PRIORITY);
+
+       /*
+        * The possible values of fc.current_mode 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.
+#ifdef CONFIG_DCB
+        * 4: Priority Flow Control is enabled.
+#endif
+        * other: Invalid.
+        */
+       switch (hw->fc.current_mode) {
+       case ixgbe_fc_none:
+               /*
+                * Flow control is disabled by software override or autoneg.
+                * The code below will actually disable it in the HW.
+                */
+               break;
+       case ixgbe_fc_rx_pause:
+               /*
+                * Rx Flow control is enabled and Tx Flow control is
+                * disabled by software override. 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.
+                */
+               mflcn_reg |= IXGBE_MFLCN_RFCE;
+               break;
+       case ixgbe_fc_tx_pause:
+               /*
+                * Tx Flow control is enabled, and Rx Flow control is
+                * disabled by software override.
+                */
+               fccfg_reg |= IXGBE_FCCFG_TFCE_802_3X;
+               break;
+       case ixgbe_fc_full:
+               /* Flow control (both Rx and Tx) is enabled by SW override. */
+               mflcn_reg |= IXGBE_MFLCN_RFCE;
+               fccfg_reg |= IXGBE_FCCFG_TFCE_802_3X;
+               break;
+#ifdef CONFIG_DCB
+       case ixgbe_fc_pfc:
+               goto out;
+               break;
+#endif /* CONFIG_DCB */
+       default:
+               hw_dbg(hw, "Flow control param set incorrectly\n");
+               ret_val = IXGBE_ERR_CONFIG;
+               goto out;
+               break;
+       }
+
+       /* Set 802.3x based flow control settings. */
+       mflcn_reg |= IXGBE_MFLCN_DPF;
+       IXGBE_WRITE_REG(hw, IXGBE_MFLCN, mflcn_reg);
+       IXGBE_WRITE_REG(hw, IXGBE_FCCFG, fccfg_reg);
+
+       rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num));
+       rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
+
+       fcrth = (rx_pba_size - hw->fc.high_water) << 10;
+       fcrtl = (rx_pba_size - hw->fc.low_water) << 10;
+
+       if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
+               fcrth |= IXGBE_FCRTH_FCEN;
+               if (hw->fc.send_xon)
+                       fcrtl |= IXGBE_FCRTL_XONE;
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(packetbuf_num), fcrth);
+       IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(packetbuf_num), fcrtl);
+
+       /* Configure pause time (2 TCs per register) */
+       reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
+       if ((packetbuf_num & 1) == 0)
+               reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
+       else
+               reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
+       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
+
+       IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
+
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_fc_autoneg - Configure flow control
+ *  @hw: pointer to hardware structure
+ *
+ *  Compares our advertised flow control capabilities to those advertised by
+ *  our link partner, and determines the proper flow control mode to use.
+ **/
+s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
+{
+       s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+       ixgbe_link_speed speed;
+       bool link_up;
+
+       if (hw->fc.disable_fc_autoneg)
+               goto out;
+
+       /*
+        * AN should have completed when the cable was plugged in.
+        * Look for reasons to bail out.  Bail out if:
+        * - FC autoneg is disabled, or if
+        * - link is not up.
+        *
+        * Since we're being called from an LSC, link is already known to be up.
+        * So use link_up_wait_to_complete=false.
+        */
+       hw->mac.ops.check_link(hw, &speed, &link_up, false);
+       if (!link_up) {
+               ret_val = IXGBE_ERR_FLOW_CONTROL;
+               goto out;
+       }
+
+       switch (hw->phy.media_type) {
+       /* Autoneg flow control on fiber adapters */
+       case ixgbe_media_type_fiber:
+               if (speed == IXGBE_LINK_SPEED_1GB_FULL)
+                       ret_val = ixgbe_fc_autoneg_fiber(hw);
+               break;
+
+       /* Autoneg flow control on backplane adapters */
+       case ixgbe_media_type_backplane:
+               ret_val = ixgbe_fc_autoneg_backplane(hw);
+               break;
+
+       /* Autoneg flow control on copper adapters */
+       case ixgbe_media_type_copper:
+               if (ixgbe_device_supports_autoneg_fc(hw) == 0)
+                       ret_val = ixgbe_fc_autoneg_copper(hw);
+               break;
+
+       default:
+               break;
+       }
+
+out:
+       if (ret_val == 0) {
+               hw->fc.fc_was_autonegged = true;
+       } else {
+               hw->fc.fc_was_autonegged = false;
+               hw->fc.current_mode = hw->fc.requested_mode;
+       }
+       return ret_val;
+}
+
+/**
+ *  ixgbe_fc_autoneg_fiber - Enable flow control on 1 gig fiber
+ *  @hw: pointer to hardware structure
+ *
+ *  Enable flow control according on 1 gig fiber.
+ **/
+static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
+{
+       u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;
+       s32 ret_val;
+
+       /*
+        * On multispeed fiber at 1g, bail out if
+        * - link is up but AN did not complete, or if
+        * - link is up and AN completed but timed out
+        */
+
+       linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
+       if (((linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
+           ((linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
+               ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+               goto out;
+       }
+
+       pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+       pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
+
+       ret_val =  ixgbe_negotiate_fc(hw, pcs_anadv_reg,
+                              pcs_lpab_reg, IXGBE_PCS1GANA_SYM_PAUSE,
+                              IXGBE_PCS1GANA_ASM_PAUSE,
+                              IXGBE_PCS1GANA_SYM_PAUSE,
+                              IXGBE_PCS1GANA_ASM_PAUSE);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_fc_autoneg_backplane - Enable flow control IEEE clause 37
+ *  @hw: pointer to hardware structure
+ *
+ *  Enable flow control according to IEEE clause 37.
+ **/
+static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)
+{
+       u32 links2, anlp1_reg, autoc_reg, links;
+       s32 ret_val;
+
+       /*
+        * On backplane, bail out if
+        * - backplane autoneg was not completed, or if
+        * - we are 82599 and link partner is not AN enabled
+        */
+       links = IXGBE_READ_REG(hw, IXGBE_LINKS);
+       if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
+               hw->fc.fc_was_autonegged = false;
+               hw->fc.current_mode = hw->fc.requested_mode;
+               ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+               goto out;
+       }
+
+       if (hw->mac.type == ixgbe_mac_82599EB) {
+               links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
+               if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
+                       hw->fc.fc_was_autonegged = false;
+                       hw->fc.current_mode = hw->fc.requested_mode;
+                       ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+                       goto out;
+               }
+       }
+       /*
+        * Read the 10g AN autoc and LP ability registers and resolve
+        * local flow control settings accordingly
+        */
+       autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       anlp1_reg = IXGBE_READ_REG(hw, IXGBE_ANLP1);
+
+       ret_val = ixgbe_negotiate_fc(hw, autoc_reg,
+               anlp1_reg, IXGBE_AUTOC_SYM_PAUSE, IXGBE_AUTOC_ASM_PAUSE,
+               IXGBE_ANLP1_SYM_PAUSE, IXGBE_ANLP1_ASM_PAUSE);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_fc_autoneg_copper - Enable flow control IEEE clause 37
+ *  @hw: pointer to hardware structure
+ *
+ *  Enable flow control according to IEEE clause 37.
+ **/
+static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw)
+{
+       u16 technology_ability_reg = 0;
+       u16 lp_technology_ability_reg = 0;
+
+       hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                            MDIO_MMD_AN,
+                            &technology_ability_reg);
+       hw->phy.ops.read_reg(hw, MDIO_AN_LPA,
+                            MDIO_MMD_AN,
+                            &lp_technology_ability_reg);
+
+       return ixgbe_negotiate_fc(hw, (u32)technology_ability_reg,
+                                 (u32)lp_technology_ability_reg,
+                                 IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE,
+                                 IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE);
+}
+
+/**
+ *  ixgbe_negotiate_fc - Negotiate flow control
+ *  @hw: pointer to hardware structure
+ *  @adv_reg: flow control advertised settings
+ *  @lp_reg: link partner's flow control settings
+ *  @adv_sym: symmetric pause bit in advertisement
+ *  @adv_asm: asymmetric pause bit in advertisement
+ *  @lp_sym: symmetric pause bit in link partner advertisement
+ *  @lp_asm: asymmetric pause bit in link partner advertisement
+ *
+ *  Find the intersection between advertised settings and link partner's
+ *  advertised settings
+ **/
+static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
+                             u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)
+{
+       if ((!(adv_reg)) ||  (!(lp_reg)))
+               return IXGBE_ERR_FC_NOT_NEGOTIATED;
+
+       if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {
+               /*
+                * 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 == ixgbe_fc_full) {
+                       hw->fc.current_mode = ixgbe_fc_full;
+                       hw_dbg(hw, "Flow Control = FULL.\n");
+               } else {
+                       hw->fc.current_mode = ixgbe_fc_rx_pause;
+                       hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");
+               }
+       } else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                  (lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+               hw->fc.current_mode = ixgbe_fc_tx_pause;
+               hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
+       } else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                  !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+               hw->fc.current_mode = ixgbe_fc_rx_pause;
+               hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
+       } else {
+               hw->fc.current_mode = ixgbe_fc_none;
+               hw_dbg(hw, "Flow Control = NONE.\n");
+       }
+       return 0;
+}
+
+/**
+ *  ixgbe_setup_fc - Set up flow control
+ *  @hw: pointer to hardware structure
+ *
+ *  Called at init time to set up flow control.
+ **/
+static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
+{
+       s32 ret_val = 0;
+       u32 reg = 0, reg_bp = 0;
+       u16 reg_cu = 0;
+
+#ifdef CONFIG_DCB
+       if (hw->fc.requested_mode == ixgbe_fc_pfc) {
+               hw->fc.current_mode = hw->fc.requested_mode;
+               goto out;
+       }
+
+#endif /* CONFIG_DCB */
+       /* Validate the packetbuf configuration */
+       if (packetbuf_num < 0 || packetbuf_num > 7) {
+               hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
+                      "is 0-7\n", packetbuf_num);
+               ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
+               goto out;
+       }
+
+       /*
+        * Validate the water mark configuration.  Zero water marks are invalid
+        * because it causes the controller to just blast out fc packets.
+        */
+       if (!hw->fc.low_water || !hw->fc.high_water || !hw->fc.pause_time) {
+               hw_dbg(hw, "Invalid water mark configuration\n");
+               ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
+               goto out;
+       }
+
+       /*
+        * Validate the requested mode.  Strict IEEE mode does not allow
+        * ixgbe_fc_rx_pause because it will cause us to fail at UNH.
+        */
+       if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
+               hw_dbg(hw, "ixgbe_fc_rx_pause not valid in strict "
+                      "IEEE mode\n");
+               ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
+               goto out;
+       }
+
+       /*
+        * 10gig parts do not have a word in the EEPROM to determine the
+        * default flow control setting, so we explicitly set it to full.
+        */
+       if (hw->fc.requested_mode == ixgbe_fc_default)
+               hw->fc.requested_mode = ixgbe_fc_full;
+
+       /*
+        * Set up the 1G and 10G flow control advertisement registers so the
+        * HW will be able to do fc autoneg once the cable is plugged in.  If
+        * we link at 10G, the 1G advertisement is harmless and vice versa.
+        */
+
+       switch (hw->phy.media_type) {
+       case ixgbe_media_type_fiber:
+       case ixgbe_media_type_backplane:
+               reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+               reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+               break;
+
+       case ixgbe_media_type_copper:
+               hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                       MDIO_MMD_AN, &reg_cu);
+               break;
+
+       default:
+               ;
+       }
+
+       /*
+        * The possible values of fc.requested_mode 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.
+#ifdef CONFIG_DCB
+        * 4: Priority Flow Control is enabled.
+#endif
+        * other: Invalid.
+        */
+       switch (hw->fc.requested_mode) {
+       case ixgbe_fc_none:
+               /* Flow control completely disabled by software override. */
+               reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+               if (hw->phy.media_type == ixgbe_media_type_backplane)
+                       reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |
+                                   IXGBE_AUTOC_ASM_PAUSE);
+               else if (hw->phy.media_type == ixgbe_media_type_copper)
+                       reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
+               break;
+       case ixgbe_fc_rx_pause:
+               /*
+                * Rx Flow control is enabled and Tx Flow control is
+                * disabled by software override. 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.
+                */
+               reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+               if (hw->phy.media_type == ixgbe_media_type_backplane)
+                       reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
+                                  IXGBE_AUTOC_ASM_PAUSE);
+               else if (hw->phy.media_type == ixgbe_media_type_copper)
+                       reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
+               break;
+       case ixgbe_fc_tx_pause:
+               /*
+                * Tx Flow control is enabled, and Rx Flow control is
+                * disabled by software override.
+                */
+               reg |= (IXGBE_PCS1GANA_ASM_PAUSE);
+               reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE);
+               if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                       reg_bp |= (IXGBE_AUTOC_ASM_PAUSE);
+                       reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE);
+               } else if (hw->phy.media_type == ixgbe_media_type_copper) {
+                       reg_cu |= (IXGBE_TAF_ASM_PAUSE);
+                       reg_cu &= ~(IXGBE_TAF_SYM_PAUSE);
+               }
+               break;
+       case ixgbe_fc_full:
+               /* Flow control (both Rx and Tx) is enabled by SW override. */
+               reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+               if (hw->phy.media_type == ixgbe_media_type_backplane)
+                       reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
+                                  IXGBE_AUTOC_ASM_PAUSE);
+               else if (hw->phy.media_type == ixgbe_media_type_copper)
+                       reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
+               break;
+#ifdef CONFIG_DCB
+       case ixgbe_fc_pfc:
+               goto out;
+               break;
+#endif /* CONFIG_DCB */
+       default:
+               hw_dbg(hw, "Flow control param set incorrectly\n");
+               ret_val = IXGBE_ERR_CONFIG;
+               goto out;
+               break;
+       }
+
+       if (hw->mac.type != ixgbe_mac_X540) {
+               /*
+                * Enable auto-negotiation between the MAC & PHY;
+                * the MAC will advertise clause 37 flow control.
+                */
+               IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
+               reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
+
+               /* Disable AN timeout */
+               if (hw->fc.strict_ieee)
+                       reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
+
+               IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
+               hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
+       }
+
+       /*
+        * AUTOC restart handles negotiation of 1G and 10G on backplane
+        * and copper. There is no need to set the PCS1GCTL register.
+        *
+        */
+       if (hw->phy.media_type == ixgbe_media_type_backplane) {
+               reg_bp |= IXGBE_AUTOC_AN_RESTART;
+               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);
+       } else if ((hw->phy.media_type == ixgbe_media_type_copper) &&
+                   (ixgbe_device_supports_autoneg_fc(hw) == 0)) {
+               hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                     MDIO_MMD_AN, reg_cu);
+       }
+
+       hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_disable_pcie_master - Disable PCI-express master access
+ *  @hw: pointer to hardware structure
+ *
+ *  Disables PCI-Express master access and verifies there are no pending
+ *  requests. IXGBE_ERR_MASTER_REQUESTS_PENDING is returned if master disable
+ *  bit hasn't caused the master requests to be disabled, else 0
+ *  is returned signifying master requests disabled.
+ **/
+s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)
+{
+       struct ixgbe_adapter *adapter = hw->back;
+       u32 i;
+       u32 reg_val;
+       u32 number_of_queues;
+       s32 status = 0;
+       u16 dev_status = 0;
+
+       /* Just jump out if bus mastering is already disabled */
+       if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO))
+               goto out;
+
+       /* Disable the receive unit by stopping each queue */
+       number_of_queues = hw->mac.max_rx_queues;
+       for (i = 0; i < number_of_queues; i++) {
+               reg_val = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
+               if (reg_val & IXGBE_RXDCTL_ENABLE) {
+                       reg_val &= ~IXGBE_RXDCTL_ENABLE;
+                       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), reg_val);
+               }
+       }
+
+       reg_val = IXGBE_READ_REG(hw, IXGBE_CTRL);
+       reg_val |= IXGBE_CTRL_GIO_DIS;
+       IXGBE_WRITE_REG(hw, IXGBE_CTRL, reg_val);
+
+       for (i = 0; i < IXGBE_PCI_MASTER_DISABLE_TIMEOUT; i++) {
+               if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO))
+                       goto check_device_status;
+               udelay(100);
+       }
+
+       hw_dbg(hw, "GIO Master Disable bit didn't clear - requesting resets\n");
+       status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
+
+       /*
+        * Before proceeding, make sure that the PCIe block does not have
+        * transactions pending.
+        */
+check_device_status:
+       for (i = 0; i < IXGBE_PCI_MASTER_DISABLE_TIMEOUT; i++) {
+               pci_read_config_word(adapter->pdev, IXGBE_PCI_DEVICE_STATUS,
+                                                        &dev_status);
+               if (!(dev_status & IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING))
+                       break;
+               udelay(100);
+       }
+
+       if (i == IXGBE_PCI_MASTER_DISABLE_TIMEOUT)
+               hw_dbg(hw, "PCIe transaction pending bit also did not clear.\n");
+       else
+               goto out;
+
+       /*
+        * Two consecutive resets are required via CTRL.RST per datasheet
+        * 5.2.5.3.2 Master Disable.  We set a flag to inform the reset routine
+        * of this need.  The first reset prevents new master requests from
+        * being issued by our device.  We then must wait 1usec for any
+        * remaining completions from the PCIe bus to trickle in, and then reset
+        * again to clear out any effects they may have had on our device.
+        */
+        hw->mac.flags |= IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+
+out:
+       return status;
+}
+
+
+/**
+ *  ixgbe_acquire_swfw_sync - Acquire SWFW semaphore
+ *  @hw: pointer to hardware structure
+ *  @mask: Mask to specify which semaphore to acquire
+ *
+ *  Acquires the SWFW semaphore through the GSSR register for the specified
+ *  function (CSR, PHY0, PHY1, EEPROM, Flash)
+ **/
+s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)
+{
+       u32 gssr;
+       u32 swmask = mask;
+       u32 fwmask = mask << 5;
+       s32 timeout = 200;
+
+       while (timeout) {
+               /*
+                * SW EEPROM semaphore bit is used for access to all
+                * SW_FW_SYNC/GSSR bits (not just EEPROM)
+                */
+               if (ixgbe_get_eeprom_semaphore(hw))
+                       return IXGBE_ERR_SWFW_SYNC;
+
+               gssr = IXGBE_READ_REG(hw, IXGBE_GSSR);
+               if (!(gssr & (fwmask | swmask)))
+                       break;
+
+               /*
+                * Firmware currently using resource (fwmask) or other software
+                * thread currently using resource (swmask)
+                */
+               ixgbe_release_eeprom_semaphore(hw);
+               usleep_range(5000, 10000);
+               timeout--;
+       }
+
+       if (!timeout) {
+               hw_dbg(hw, "Driver can't access resource, SW_FW_SYNC timeout.\n");
+               return IXGBE_ERR_SWFW_SYNC;
+       }
+
+       gssr |= swmask;
+       IXGBE_WRITE_REG(hw, IXGBE_GSSR, gssr);
+
+       ixgbe_release_eeprom_semaphore(hw);
+       return 0;
+}
+
+/**
+ *  ixgbe_release_swfw_sync - Release SWFW semaphore
+ *  @hw: pointer to hardware structure
+ *  @mask: Mask to specify which semaphore to release
+ *
+ *  Releases the SWFW semaphore through the GSSR register for the specified
+ *  function (CSR, PHY0, PHY1, EEPROM, Flash)
+ **/
+void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask)
+{
+       u32 gssr;
+       u32 swmask = mask;
+
+       ixgbe_get_eeprom_semaphore(hw);
+
+       gssr = IXGBE_READ_REG(hw, IXGBE_GSSR);
+       gssr &= ~swmask;
+       IXGBE_WRITE_REG(hw, IXGBE_GSSR, gssr);
+
+       ixgbe_release_eeprom_semaphore(hw);
+}
+
+/**
+ *  ixgbe_enable_rx_dma_generic - Enable the Rx DMA unit
+ *  @hw: pointer to hardware structure
+ *  @regval: register value to write to RXCTRL
+ *
+ *  Enables the Rx DMA unit
+ **/
+s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval)
+{
+       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, regval);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_blink_led_start_generic - Blink LED based on index.
+ *  @hw: pointer to hardware structure
+ *  @index: led number to blink
+ **/
+s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index)
+{
+       ixgbe_link_speed speed = 0;
+       bool link_up = 0;
+       u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+
+       /*
+        * Link must be up to auto-blink the LEDs;
+        * Force it if link is down.
+        */
+       hw->mac.ops.check_link(hw, &speed, &link_up, false);
+
+       if (!link_up) {
+               autoc_reg |= IXGBE_AUTOC_AN_RESTART;
+               autoc_reg |= IXGBE_AUTOC_FLU;
+               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
+               IXGBE_WRITE_FLUSH(hw);
+               usleep_range(10000, 20000);
+       }
+
+       led_reg &= ~IXGBE_LED_MODE_MASK(index);
+       led_reg |= IXGBE_LED_BLINK(index);
+       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
+       IXGBE_WRITE_FLUSH(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_blink_led_stop_generic - Stop blinking LED based on index.
+ *  @hw: pointer to hardware structure
+ *  @index: led number to stop blinking
+ **/
+s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index)
+{
+       u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+
+       autoc_reg &= ~IXGBE_AUTOC_FLU;
+       autoc_reg |= IXGBE_AUTOC_AN_RESTART;
+       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
+
+       led_reg &= ~IXGBE_LED_MODE_MASK(index);
+       led_reg &= ~IXGBE_LED_BLINK(index);
+       led_reg |= IXGBE_LED_LINK_ACTIVE << IXGBE_LED_MODE_SHIFT(index);
+       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
+       IXGBE_WRITE_FLUSH(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_get_san_mac_addr_offset - Get SAN MAC address offset from the EEPROM
+ *  @hw: pointer to hardware structure
+ *  @san_mac_offset: SAN MAC address offset
+ *
+ *  This function will read the EEPROM location for the SAN MAC address
+ *  pointer, and returns the value at that location.  This is used in both
+ *  get and set mac_addr routines.
+ **/
+static s32 ixgbe_get_san_mac_addr_offset(struct ixgbe_hw *hw,
+                                        u16 *san_mac_offset)
+{
+       /*
+        * First read the EEPROM pointer to see if the MAC addresses are
+        * available.
+        */
+       hw->eeprom.ops.read(hw, IXGBE_SAN_MAC_ADDR_PTR, san_mac_offset);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_get_san_mac_addr_generic - SAN MAC address retrieval from the EEPROM
+ *  @hw: pointer to hardware structure
+ *  @san_mac_addr: SAN MAC address
+ *
+ *  Reads the SAN MAC address from the EEPROM, if it's available.  This is
+ *  per-port, so set_lan_id() must be called before reading the addresses.
+ *  set_lan_id() is called by identify_sfp(), but this cannot be relied
+ *  upon for non-SFP connections, so we must call it here.
+ **/
+s32 ixgbe_get_san_mac_addr_generic(struct ixgbe_hw *hw, u8 *san_mac_addr)
+{
+       u16 san_mac_data, san_mac_offset;
+       u8 i;
+
+       /*
+        * First read the EEPROM pointer to see if the MAC addresses are
+        * available.  If they're not, no point in calling set_lan_id() here.
+        */
+       ixgbe_get_san_mac_addr_offset(hw, &san_mac_offset);
+
+       if ((san_mac_offset == 0) || (san_mac_offset == 0xFFFF)) {
+               /*
+                * No addresses available in this EEPROM.  It's not an
+                * error though, so just wipe the local address and return.
+                */
+               for (i = 0; i < 6; i++)
+                       san_mac_addr[i] = 0xFF;
+
+               goto san_mac_addr_out;
+       }
+
+       /* make sure we know which port we need to program */
+       hw->mac.ops.set_lan_id(hw);
+       /* apply the port offset to the address offset */
+       (hw->bus.func) ? (san_mac_offset += IXGBE_SAN_MAC_ADDR_PORT1_OFFSET) :
+                        (san_mac_offset += IXGBE_SAN_MAC_ADDR_PORT0_OFFSET);
+       for (i = 0; i < 3; i++) {
+               hw->eeprom.ops.read(hw, san_mac_offset, &san_mac_data);
+               san_mac_addr[i * 2] = (u8)(san_mac_data);
+               san_mac_addr[i * 2 + 1] = (u8)(san_mac_data >> 8);
+               san_mac_offset++;
+       }
+
+san_mac_addr_out:
+       return 0;
+}
+
+/**
+ *  ixgbe_get_pcie_msix_count_generic - Gets MSI-X vector count
+ *  @hw: pointer to hardware structure
+ *
+ *  Read PCIe configuration space, and get the MSI-X vector count from
+ *  the capabilities table.
+ **/
+u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw)
+{
+       struct ixgbe_adapter *adapter = hw->back;
+       u16 msix_count;
+       pci_read_config_word(adapter->pdev, IXGBE_PCIE_MSIX_82599_CAPS,
+                            &msix_count);
+       msix_count &= IXGBE_PCIE_MSIX_TBL_SZ_MASK;
+
+       /* MSI-X count is zero-based in HW, so increment to give proper value */
+       msix_count++;
+
+       return msix_count;
+}
+
+/**
+ *  ixgbe_clear_vmdq_generic - Disassociate a VMDq pool index from a rx address
+ *  @hw: pointer to hardware struct
+ *  @rar: receive address register index to disassociate
+ *  @vmdq: VMDq pool index to remove from the rar
+ **/
+s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
+{
+       u32 mpsar_lo, mpsar_hi;
+       u32 rar_entries = hw->mac.num_rar_entries;
+
+       /* Make sure we are using a valid rar index range */
+       if (rar >= rar_entries) {
+               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+               return IXGBE_ERR_INVALID_ARGUMENT;
+       }
+
+       mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
+       mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
+
+       if (!mpsar_lo && !mpsar_hi)
+               goto done;
+
+       if (vmdq == IXGBE_CLEAR_VMDQ_ALL) {
+               if (mpsar_lo) {
+                       IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0);
+                       mpsar_lo = 0;
+               }
+               if (mpsar_hi) {
+                       IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0);
+                       mpsar_hi = 0;
+               }
+       } else if (vmdq < 32) {
+               mpsar_lo &= ~(1 << vmdq);
+               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar_lo);
+       } else {
+               mpsar_hi &= ~(1 << (vmdq - 32));
+               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar_hi);
+       }
+
+       /* was that the last pool using this rar? */
+       if (mpsar_lo == 0 && mpsar_hi == 0 && rar != 0)
+               hw->mac.ops.clear_rar(hw, rar);
+done:
+       return 0;
+}
+
+/**
+ *  ixgbe_set_vmdq_generic - Associate a VMDq pool index with a rx address
+ *  @hw: pointer to hardware struct
+ *  @rar: receive address register index to associate with a VMDq index
+ *  @vmdq: VMDq pool index
+ **/
+s32 ixgbe_set_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
+{
+       u32 mpsar;
+       u32 rar_entries = hw->mac.num_rar_entries;
+
+       /* Make sure we are using a valid rar index range */
+       if (rar >= rar_entries) {
+               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+               return IXGBE_ERR_INVALID_ARGUMENT;
+       }
+
+       if (vmdq < 32) {
+               mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
+               mpsar |= 1 << vmdq;
+               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar);
+       } else {
+               mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
+               mpsar |= 1 << (vmdq - 32);
+               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar);
+       }
+       return 0;
+}
+
+/**
+ *  ixgbe_init_uta_tables_generic - Initialize the Unicast Table Array
+ *  @hw: pointer to hardware structure
+ **/
+s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw)
+{
+       int i;
+
+       for (i = 0; i < 128; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_UTA(i), 0);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_find_vlvf_slot - find the vlanid or the first empty slot
+ *  @hw: pointer to hardware structure
+ *  @vlan: VLAN id to write to VLAN filter
+ *
+ *  return the VLVF index where this VLAN id should be placed
+ *
+ **/
+static s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan)
+{
+       u32 bits = 0;
+       u32 first_empty_slot = 0;
+       s32 regindex;
+
+       /* short cut the special case */
+       if (vlan == 0)
+               return 0;
+
+       /*
+         * Search for the vlan id in the VLVF entries. Save off the first empty
+         * slot found along the way
+         */
+       for (regindex = 1; regindex < IXGBE_VLVF_ENTRIES; regindex++) {
+               bits = IXGBE_READ_REG(hw, IXGBE_VLVF(regindex));
+               if (!bits && !(first_empty_slot))
+                       first_empty_slot = regindex;
+               else if ((bits & 0x0FFF) == vlan)
+                       break;
+       }
+
+       /*
+         * If regindex is less than IXGBE_VLVF_ENTRIES, then we found the vlan
+         * in the VLVF. Else use the first empty VLVF register for this
+         * vlan id.
+         */
+       if (regindex >= IXGBE_VLVF_ENTRIES) {
+               if (first_empty_slot)
+                       regindex = first_empty_slot;
+               else {
+                       hw_dbg(hw, "No space in VLVF.\n");
+                       regindex = IXGBE_ERR_NO_SPACE;
+               }
+       }
+
+       return regindex;
+}
+
+/**
+ *  ixgbe_set_vfta_generic - Set VLAN filter table
+ *  @hw: pointer to hardware structure
+ *  @vlan: VLAN id to write to VLAN filter
+ *  @vind: VMDq output index that maps queue to VLAN id in VFVFB
+ *  @vlan_on: boolean flag to turn on/off VLAN in VFVF
+ *
+ *  Turn on/off specified VLAN in the VLAN filter table.
+ **/
+s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
+                           bool vlan_on)
+{
+       s32 regindex;
+       u32 bitindex;
+       u32 vfta;
+       u32 bits;
+       u32 vt;
+       u32 targetbit;
+       bool vfta_changed = false;
+
+       if (vlan > 4095)
+               return IXGBE_ERR_PARAM;
+
+       /*
+        * this is a 2 part operation - first the VFTA, then the
+        * VLVF and VLVFB if VT Mode is set
+        * We don't write the VFTA until we know the VLVF part succeeded.
+        */
+
+       /* Part 1
+        * The VFTA is a bitstring made up of 128 32-bit registers
+        * that enable the particular VLAN id, much like the MTA:
+        *    bits[11-5]: which register
+        *    bits[4-0]:  which bit in the register
+        */
+       regindex = (vlan >> 5) & 0x7F;
+       bitindex = vlan & 0x1F;
+       targetbit = (1 << bitindex);
+       vfta = IXGBE_READ_REG(hw, IXGBE_VFTA(regindex));
+
+       if (vlan_on) {
+               if (!(vfta & targetbit)) {
+                       vfta |= targetbit;
+                       vfta_changed = true;
+               }
+       } else {
+               if ((vfta & targetbit)) {
+                       vfta &= ~targetbit;
+                       vfta_changed = true;
+               }
+       }
+
+       /* Part 2
+        * If VT Mode is set
+        *   Either vlan_on
+        *     make sure the vlan is in VLVF
+        *     set the vind bit in the matching VLVFB
+        *   Or !vlan_on
+        *     clear the pool bit and possibly the vind
+        */
+       vt = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
+       if (vt & IXGBE_VT_CTL_VT_ENABLE) {
+               s32 vlvf_index;
+
+               vlvf_index = ixgbe_find_vlvf_slot(hw, vlan);
+               if (vlvf_index < 0)
+                       return vlvf_index;
+
+               if (vlan_on) {
+                       /* set the pool bit */
+                       if (vind < 32) {
+                               bits = IXGBE_READ_REG(hw,
+                                               IXGBE_VLVFB(vlvf_index*2));
+                               bits |= (1 << vind);
+                               IXGBE_WRITE_REG(hw,
+                                               IXGBE_VLVFB(vlvf_index*2),
+                                               bits);
+                       } else {
+                               bits = IXGBE_READ_REG(hw,
+                                               IXGBE_VLVFB((vlvf_index*2)+1));
+                               bits |= (1 << (vind-32));
+                               IXGBE_WRITE_REG(hw,
+                                               IXGBE_VLVFB((vlvf_index*2)+1),
+                                               bits);
+                       }
+               } else {
+                       /* clear the pool bit */
+                       if (vind < 32) {
+                               bits = IXGBE_READ_REG(hw,
+                                               IXGBE_VLVFB(vlvf_index*2));
+                               bits &= ~(1 << vind);
+                               IXGBE_WRITE_REG(hw,
+                                               IXGBE_VLVFB(vlvf_index*2),
+                                               bits);
+                               bits |= IXGBE_READ_REG(hw,
+                                               IXGBE_VLVFB((vlvf_index*2)+1));
+                       } else {
+                               bits = IXGBE_READ_REG(hw,
+                                               IXGBE_VLVFB((vlvf_index*2)+1));
+                               bits &= ~(1 << (vind-32));
+                               IXGBE_WRITE_REG(hw,
+                                               IXGBE_VLVFB((vlvf_index*2)+1),
+                                               bits);
+                               bits |= IXGBE_READ_REG(hw,
+                                               IXGBE_VLVFB(vlvf_index*2));
+                       }
+               }
+
+               /*
+                * If there are still bits set in the VLVFB registers
+                * for the VLAN ID indicated we need to see if the
+                * caller is requesting that we clear the VFTA entry bit.
+                * If the caller has requested that we clear the VFTA
+                * entry bit but there are still pools/VFs using this VLAN
+                * ID entry then ignore the request.  We're not worried
+                * about the case where we're turning the VFTA VLAN ID
+                * entry bit on, only when requested to turn it off as
+                * there may be multiple pools and/or VFs using the
+                * VLAN ID entry.  In that case we cannot clear the
+                * VFTA bit until all pools/VFs using that VLAN ID have also
+                * been cleared.  This will be indicated by "bits" being
+                * zero.
+                */
+               if (bits) {
+                       IXGBE_WRITE_REG(hw, IXGBE_VLVF(vlvf_index),
+                                       (IXGBE_VLVF_VIEN | vlan));
+                       if (!vlan_on) {
+                               /* someone wants to clear the vfta entry
+                                * but some pools/VFs are still using it.
+                                * Ignore it. */
+                               vfta_changed = false;
+                       }
+               }
+               else
+                       IXGBE_WRITE_REG(hw, IXGBE_VLVF(vlvf_index), 0);
+       }
+
+       if (vfta_changed)
+               IXGBE_WRITE_REG(hw, IXGBE_VFTA(regindex), vfta);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_clear_vfta_generic - Clear VLAN filter table
+ *  @hw: pointer to hardware structure
+ *
+ *  Clears the VLAN filer table, and the VMDq index associated with the filter
+ **/
+s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw)
+{
+       u32 offset;
+
+       for (offset = 0; offset < hw->mac.vft_size; offset++)
+               IXGBE_WRITE_REG(hw, IXGBE_VFTA(offset), 0);
+
+       for (offset = 0; offset < IXGBE_VLVF_ENTRIES; offset++) {
+               IXGBE_WRITE_REG(hw, IXGBE_VLVF(offset), 0);
+               IXGBE_WRITE_REG(hw, IXGBE_VLVFB(offset*2), 0);
+               IXGBE_WRITE_REG(hw, IXGBE_VLVFB((offset*2)+1), 0);
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_check_mac_link_generic - Determine link and speed status
+ *  @hw: pointer to hardware structure
+ *  @speed: pointer to link speed
+ *  @link_up: true when link is up
+ *  @link_up_wait_to_complete: bool used to wait for link up or not
+ *
+ *  Reads the links register to determine if link is up and the current speed
+ **/
+s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
+                                bool *link_up, bool link_up_wait_to_complete)
+{
+       u32 links_reg, links_orig;
+       u32 i;
+
+       /* clear the old state */
+       links_orig = IXGBE_READ_REG(hw, IXGBE_LINKS);
+
+       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
+
+       if (links_orig != links_reg) {
+               hw_dbg(hw, "LINKS changed from %08X to %08X\n",
+                      links_orig, links_reg);
+       }
+
+       if (link_up_wait_to_complete) {
+               for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
+                       if (links_reg & IXGBE_LINKS_UP) {
+                               *link_up = true;
+                               break;
+                       } else {
+                               *link_up = false;
+                       }
+                       msleep(100);
+                       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
+               }
+       } else {
+               if (links_reg & IXGBE_LINKS_UP)
+                       *link_up = true;
+               else
+                       *link_up = false;
+       }
+
+       if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
+           IXGBE_LINKS_SPEED_10G_82599)
+               *speed = IXGBE_LINK_SPEED_10GB_FULL;
+       else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
+                IXGBE_LINKS_SPEED_1G_82599)
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+       else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
+                IXGBE_LINKS_SPEED_100_82599)
+               *speed = IXGBE_LINK_SPEED_100_FULL;
+       else
+               *speed = IXGBE_LINK_SPEED_UNKNOWN;
+
+       /* if link is down, zero out the current_mode */
+       if (*link_up == false) {
+               hw->fc.current_mode = ixgbe_fc_none;
+               hw->fc.fc_was_autonegged = false;
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_get_wwn_prefix_generic Get alternative WWNN/WWPN prefix from
+ *  the EEPROM
+ *  @hw: pointer to hardware structure
+ *  @wwnn_prefix: the alternative WWNN prefix
+ *  @wwpn_prefix: the alternative WWPN prefix
+ *
+ *  This function will read the EEPROM from the alternative SAN MAC address
+ *  block to check the support for the alternative WWNN/WWPN prefix support.
+ **/
+s32 ixgbe_get_wwn_prefix_generic(struct ixgbe_hw *hw, u16 *wwnn_prefix,
+                                        u16 *wwpn_prefix)
+{
+       u16 offset, caps;
+       u16 alt_san_mac_blk_offset;
+
+       /* clear output first */
+       *wwnn_prefix = 0xFFFF;
+       *wwpn_prefix = 0xFFFF;
+
+       /* check if alternative SAN MAC is supported */
+       hw->eeprom.ops.read(hw, IXGBE_ALT_SAN_MAC_ADDR_BLK_PTR,
+                           &alt_san_mac_blk_offset);
+
+       if ((alt_san_mac_blk_offset == 0) ||
+           (alt_san_mac_blk_offset == 0xFFFF))
+               goto wwn_prefix_out;
+
+       /* check capability in alternative san mac address block */
+       offset = alt_san_mac_blk_offset + IXGBE_ALT_SAN_MAC_ADDR_CAPS_OFFSET;
+       hw->eeprom.ops.read(hw, offset, &caps);
+       if (!(caps & IXGBE_ALT_SAN_MAC_ADDR_CAPS_ALTWWN))
+               goto wwn_prefix_out;
+
+       /* get the corresponding prefix for WWNN/WWPN */
+       offset = alt_san_mac_blk_offset + IXGBE_ALT_SAN_MAC_ADDR_WWNN_OFFSET;
+       hw->eeprom.ops.read(hw, offset, wwnn_prefix);
+
+       offset = alt_san_mac_blk_offset + IXGBE_ALT_SAN_MAC_ADDR_WWPN_OFFSET;
+       hw->eeprom.ops.read(hw, offset, wwpn_prefix);
+
+wwn_prefix_out:
+       return 0;
+}
+
+/**
+ *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow
+ *  control
+ *  @hw: pointer to hardware structure
+ *
+ *  There are several phys that do not support autoneg flow control. This
+ *  function check the device id to see if the associated phy supports
+ *  autoneg flow control.
+ **/
+static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
+{
+
+       switch (hw->device_id) {
+       case IXGBE_DEV_ID_X540T:
+               return 0;
+       case IXGBE_DEV_ID_82599_T3_LOM:
+               return 0;
+       default:
+               return IXGBE_ERR_FC_NOT_SUPPORTED;
+       }
+}
+
+/**
+ *  ixgbe_set_mac_anti_spoofing - Enable/Disable MAC anti-spoofing
+ *  @hw: pointer to hardware structure
+ *  @enable: enable or disable switch for anti-spoofing
+ *  @pf: Physical Function pool - do not enable anti-spoofing for the PF
+ *
+ **/
+void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf)
+{
+       int j;
+       int pf_target_reg = pf >> 3;
+       int pf_target_shift = pf % 8;
+       u32 pfvfspoof = 0;
+
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               return;
+
+       if (enable)
+               pfvfspoof = IXGBE_SPOOF_MACAS_MASK;
+
+       /*
+        * PFVFSPOOF register array is size 8 with 8 bits assigned to
+        * MAC anti-spoof enables in each register array element.
+        */
+       for (j = 0; j < IXGBE_PFVFSPOOF_REG_COUNT; j++)
+               IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(j), pfvfspoof);
+
+       /* If not enabling anti-spoofing then done */
+       if (!enable)
+               return;
+
+       /*
+        * The PF should be allowed to spoof so that it can support
+        * emulation mode NICs.  Reset the bit assigned to the PF
+        */
+       pfvfspoof = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(pf_target_reg));
+       pfvfspoof ^= (1 << pf_target_shift);
+       IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(pf_target_reg), pfvfspoof);
+}
+
+/**
+ *  ixgbe_set_vlan_anti_spoofing - Enable/Disable VLAN anti-spoofing
+ *  @hw: pointer to hardware structure
+ *  @enable: enable or disable switch for VLAN anti-spoofing
+ *  @pf: Virtual Function pool - VF Pool to set for VLAN anti-spoofing
+ *
+ **/
+void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf)
+{
+       int vf_target_reg = vf >> 3;
+       int vf_target_shift = vf % 8 + IXGBE_SPOOF_VLANAS_SHIFT;
+       u32 pfvfspoof;
+
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               return;
+
+       pfvfspoof = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg));
+       if (enable)
+               pfvfspoof |= (1 << vf_target_shift);
+       else
+               pfvfspoof &= ~(1 << vf_target_shift);
+       IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), pfvfspoof);
+}
+
+/**
+ *  ixgbe_get_device_caps_generic - Get additional device capabilities
+ *  @hw: pointer to hardware structure
+ *  @device_caps: the EEPROM word with the extra device capabilities
+ *
+ *  This function will read the EEPROM location for the device capabilities,
+ *  and return the word through device_caps.
+ **/
+s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps)
+{
+       hw->eeprom.ops.read(hw, IXGBE_DEVICE_CAPS, device_caps);
+
+       return 0;
+}
+
+/**
+ * ixgbe_set_rxpba_generic - Initialize RX packet buffer
+ * @hw: pointer to hardware structure
+ * @num_pb: number of packet buffers to allocate
+ * @headroom: reserve n KB of headroom
+ * @strategy: packet buffer allocation strategy
+ **/
+void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw,
+                            int num_pb,
+                            u32 headroom,
+                            int strategy)
+{
+       u32 pbsize = hw->mac.rx_pb_size;
+       int i = 0;
+       u32 rxpktsize, txpktsize, txpbthresh;
+
+       /* Reserve headroom */
+       pbsize -= headroom;
+
+       if (!num_pb)
+               num_pb = 1;
+
+       /* Divide remaining packet buffer space amongst the number
+        * of packet buffers requested using supplied strategy.
+        */
+       switch (strategy) {
+       case (PBA_STRATEGY_WEIGHTED):
+               /* pba_80_48 strategy weight first half of packet buffer with
+                * 5/8 of the packet buffer space.
+                */
+               rxpktsize = ((pbsize * 5 * 2) / (num_pb * 8));
+               pbsize -= rxpktsize * (num_pb / 2);
+               rxpktsize <<= IXGBE_RXPBSIZE_SHIFT;
+               for (; i < (num_pb / 2); i++)
+                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
+               /* Fall through to configure remaining packet buffers */
+       case (PBA_STRATEGY_EQUAL):
+               /* Divide the remaining Rx packet buffer evenly among the TCs */
+               rxpktsize = (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT;
+               for (; i < num_pb; i++)
+                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
+               break;
+       default:
+               break;
+       }
+
+       /*
+        * Setup Tx packet buffer and threshold equally for all TCs
+        * TXPBTHRESH register is set in K so divide by 1024 and subtract
+        * 10 since the largest packet we support is just over 9K.
+        */
+       txpktsize = IXGBE_TXPBSIZE_MAX / num_pb;
+       txpbthresh = (txpktsize / 1024) - IXGBE_TXPKT_SIZE_MAX;
+       for (i = 0; i < num_pb; i++) {
+               IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), txpktsize);
+               IXGBE_WRITE_REG(hw, IXGBE_TXPBTHRESH(i), txpbthresh);
+       }
+
+       /* Clear unused TCs, if any, to zero buffer size*/
+       for (; i < IXGBE_MAX_PB; i++) {
+               IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), 0);
+               IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), 0);
+               IXGBE_WRITE_REG(hw, IXGBE_TXPBTHRESH(i), 0);
+       }
+}
+
+/**
+ *  ixgbe_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 ixgbe_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);
+}
+
+/**
+ *  ixgbe_host_interface_command - Issue command to manageability block
+ *  @hw: pointer to the HW structure
+ *  @buffer: contains the command to write and where the return status will
+ *           be placed
+ *  @lenght: lenght of buffer, must be multiple of 4 bytes
+ *
+ *  Communicates with the manageability block.  On success return 0
+ *  else return IXGBE_ERR_HOST_INTERFACE_COMMAND.
+ **/
+static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u8 *buffer,
+                                       u32 length)
+{
+       u32 hicr, i;
+       u32 hdr_size = sizeof(struct ixgbe_hic_hdr);
+       u8 buf_len, dword_len;
+
+       s32 ret_val = 0;
+
+       if (length == 0 || length & 0x3 ||
+           length > IXGBE_HI_MAX_BLOCK_BYTE_LENGTH) {
+               hw_dbg(hw, "Buffer length failure.\n");
+               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
+               goto out;
+       }
+
+       /* Check that the host interface is enabled. */
+       hicr = IXGBE_READ_REG(hw, IXGBE_HICR);
+       if ((hicr & IXGBE_HICR_EN) == 0) {
+               hw_dbg(hw, "IXGBE_HOST_EN bit disabled.\n");
+               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
+               goto out;
+       }
+
+       /* Calculate length in DWORDs */
+       dword_len = length >> 2;
+
+       /*
+        * The device driver writes the relevant command block
+        * into the ram area.
+        */
+       for (i = 0; i < dword_len; i++)
+               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_FLEX_MNG,
+                                     i, *((u32 *)buffer + i));
+
+       /* Setting this bit tells the ARC that a new command is pending. */
+       IXGBE_WRITE_REG(hw, IXGBE_HICR, hicr | IXGBE_HICR_C);
+
+       for (i = 0; i < IXGBE_HI_COMMAND_TIMEOUT; i++) {
+               hicr = IXGBE_READ_REG(hw, IXGBE_HICR);
+               if (!(hicr & IXGBE_HICR_C))
+                       break;
+               usleep_range(1000, 2000);
+       }
+
+       /* Check command successful completion. */
+       if (i == IXGBE_HI_COMMAND_TIMEOUT ||
+           (!(IXGBE_READ_REG(hw, IXGBE_HICR) & IXGBE_HICR_SV))) {
+               hw_dbg(hw, "Command has failed with no status valid.\n");
+               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
+               goto out;
+       }
+
+       /* Calculate length in DWORDs */
+       dword_len = hdr_size >> 2;
+
+       /* first pull in the header so we know the buffer length */
+       for (i = 0; i < dword_len; i++)
+               *((u32 *)buffer + i) =
+                       IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
+
+       /* If there is any thing in data position pull it in */
+       buf_len = ((struct ixgbe_hic_hdr *)buffer)->buf_len;
+       if (buf_len == 0)
+               goto out;
+
+       if (length < (buf_len + hdr_size)) {
+               hw_dbg(hw, "Buffer not large enough for reply message.\n");
+               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
+               goto out;
+       }
+
+       /* Calculate length in DWORDs, add one for odd lengths */
+       dword_len = (buf_len + 1) >> 2;
+
+       /* Pull in the rest of the buffer (i is where we left off)*/
+       for (; i < buf_len; i++)
+               *((u32 *)buffer + i) =
+                       IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
+
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_set_fw_drv_ver_generic - Sends driver version to firmware
+ *  @hw: pointer to the HW structure
+ *  @maj: driver version major number
+ *  @min: driver version minor number
+ *  @build: driver version build number
+ *  @sub: driver version sub build number
+ *
+ *  Sends driver version number to firmware through the manageability
+ *  block.  On success return 0
+ *  else returns IXGBE_ERR_SWFW_SYNC when encountering an error acquiring
+ *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.
+ **/
+s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,
+                                u8 build, u8 sub)
+{
+       struct ixgbe_hic_drv_info fw_cmd;
+       int i;
+       s32 ret_val = 0;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_SW_MNG_SM) != 0) {
+               ret_val = IXGBE_ERR_SWFW_SYNC;
+               goto out;
+       }
+
+       fw_cmd.hdr.cmd = FW_CEM_CMD_DRIVER_INFO;
+       fw_cmd.hdr.buf_len = FW_CEM_CMD_DRIVER_INFO_LEN;
+       fw_cmd.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
+       fw_cmd.port_num = (u8)hw->bus.func;
+       fw_cmd.ver_maj = maj;
+       fw_cmd.ver_min = min;
+       fw_cmd.ver_build = build;
+       fw_cmd.ver_sub = sub;
+       fw_cmd.hdr.checksum = 0;
+       fw_cmd.hdr.checksum = ixgbe_calculate_checksum((u8 *)&fw_cmd,
+                               (FW_CEM_HDR_LEN + fw_cmd.hdr.buf_len));
+       fw_cmd.pad = 0;
+       fw_cmd.pad2 = 0;
+
+       for (i = 0; i <= FW_CEM_MAX_RETRIES; i++) {
+               ret_val = ixgbe_host_interface_command(hw, (u8 *)&fw_cmd,
+                                                      sizeof(fw_cmd));
+               if (ret_val != 0)
+                       continue;
+
+               if (fw_cmd.hdr.cmd_or_resp.ret_status ==
+                   FW_CEM_RESP_STATUS_SUCCESS)
+                       ret_val = 0;
+               else
+                       ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
+
+               break;
+       }
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_SW_MNG_SM);
+out:
+       return ret_val;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
new file mode 100644 (file)
index 0000000..f24fd64
--- /dev/null
@@ -0,0 +1,145 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_COMMON_H_
+#define _IXGBE_COMMON_H_
+
+#include "ixgbe_type.h"
+#include "ixgbe.h"
+
+u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
+s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
+s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw);
+s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw);
+s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw);
+s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw);
+s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,
+                                  u32 pba_num_size);
+s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr);
+s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw);
+void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw);
+s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);
+
+s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index);
+s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);
+
+s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw);
+s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data);
+s32 ixgbe_write_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
+                                              u16 words, u16 *data);
+s32 ixgbe_read_eerd_generic(struct ixgbe_hw *hw, u16 offset, u16 *data);
+s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset,
+                                  u16 words, u16 *data);
+s32 ixgbe_write_eewr_generic(struct ixgbe_hw *hw, u16 offset, u16 data);
+s32 ixgbe_write_eewr_buffer_generic(struct ixgbe_hw *hw, u16 offset,
+                                   u16 words, u16 *data);
+s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
+                                       u16 *data);
+s32 ixgbe_read_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
+                                             u16 words, u16 *data);
+u16 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw);
+s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,
+                                           u16 *checksum_val);
+s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);
+
+s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
+                          u32 enable_addr);
+s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index);
+s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw);
+s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
+                                     struct net_device *netdev);
+s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw);
+s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);
+s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval);
+s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packtetbuf_num);
+s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw);
+
+s32 ixgbe_validate_mac_addr(u8 *mac_addr);
+s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask);
+void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask);
+s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw);
+s32 ixgbe_get_san_mac_addr_generic(struct ixgbe_hw *hw, u8 *san_mac_addr);
+s32 ixgbe_set_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq);
+s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq);
+s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw);
+s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan,
+                           u32 vind, bool vlan_on);
+s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw);
+s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw,
+                                 ixgbe_link_speed *speed,
+                                 bool *link_up, bool link_up_wait_to_complete);
+s32 ixgbe_get_wwn_prefix_generic(struct ixgbe_hw *hw, u16 *wwnn_prefix,
+                                 u16 *wwpn_prefix);
+s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index);
+s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index);
+void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf);
+void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);
+s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps);
+s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,
+                                u8 build, u8 ver);
+
+void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int num_pb,
+                            u32 headroom, int strategy);
+
+#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
+
+#ifndef writeq
+#define writeq(val, addr) writel((u32) (val), addr); \
+    writel((u32) (val >> 32), (addr + 4));
+#endif
+
+#define IXGBE_WRITE_REG64(a, reg, value) writeq((value), ((a)->hw_addr + (reg)))
+
+#define IXGBE_READ_REG(a, reg) readl((a)->hw_addr + (reg))
+
+#define IXGBE_WRITE_REG_ARRAY(a, reg, offset, value) (\
+    writel((value), ((a)->hw_addr + (reg) + ((offset) << 2))))
+
+#define IXGBE_READ_REG_ARRAY(a, reg, offset) (\
+    readl((a)->hw_addr + (reg) + ((offset) << 2)))
+
+#define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
+
+#define hw_dbg(hw, format, arg...) \
+       netdev_dbg(((struct ixgbe_adapter *)(hw->back))->netdev, format, ##arg)
+#define e_dev_info(format, arg...) \
+       dev_info(&adapter->pdev->dev, format, ## arg)
+#define e_dev_warn(format, arg...) \
+       dev_warn(&adapter->pdev->dev, format, ## arg)
+#define e_dev_err(format, arg...) \
+       dev_err(&adapter->pdev->dev, format, ## arg)
+#define e_dev_notice(format, arg...) \
+       dev_notice(&adapter->pdev->dev, format, ## arg)
+#define e_info(msglvl, format, arg...) \
+       netif_info(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_err(msglvl, format, arg...) \
+       netif_err(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_warn(msglvl, format, arg...) \
+       netif_warn(adapter, msglvl, adapter->netdev, format, ## arg)
+#define e_crit(msglvl, format, arg...) \
+       netif_crit(adapter, msglvl, adapter->netdev, format, ## arg)
+#endif /* IXGBE_COMMON */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
new file mode 100644 (file)
index 0000000..9d88c31
--- /dev/null
@@ -0,0 +1,320 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+
+#include "ixgbe.h"
+#include "ixgbe_type.h"
+#include "ixgbe_dcb.h"
+#include "ixgbe_dcb_82598.h"
+#include "ixgbe_dcb_82599.h"
+
+/**
+ * ixgbe_ieee_credits - This calculates the ieee traffic class
+ * credits from the configured bandwidth percentages. Credits
+ * are the smallest unit programmable into the underlying
+ * hardware. The IEEE 802.1Qaz specification do not use bandwidth
+ * groups so this is much simplified from the CEE case.
+ */
+s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame)
+{
+       int min_percent = 100;
+       int min_credit, multiplier;
+       int i;
+
+       min_credit = ((max_frame / 2) + DCB_CREDIT_QUANTUM - 1) /
+                       DCB_CREDIT_QUANTUM;
+
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               if (bw[i] < min_percent && bw[i])
+                       min_percent = bw[i];
+       }
+
+       multiplier = (min_credit / min_percent) + 1;
+
+       /* Find out the hw credits for each TC */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               int val = min(bw[i] * multiplier, MAX_CREDIT_REFILL);
+
+               if (val < min_credit)
+                       val = min_credit;
+               refill[i] = val;
+
+               max[i] = bw[i] ? (bw[i] * MAX_CREDIT)/100 : min_credit;
+       }
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_calculate_tc_credits - Calculates traffic class credits
+ * @ixgbe_dcb_config: Struct containing DCB settings.
+ * @direction: Configuring either Tx or Rx.
+ *
+ * This function calculates the credits allocated to each traffic class.
+ * It should be called only after the rules are checked by
+ * ixgbe_dcb_check_config().
+ */
+s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *hw,
+                                  struct ixgbe_dcb_config *dcb_config,
+                                  int max_frame, u8 direction)
+{
+       struct tc_bw_alloc *p;
+       int min_credit;
+       int min_multiplier;
+       int min_percent = 100;
+       s32 ret_val = 0;
+       /* Initialization values default for Tx settings */
+       u32 credit_refill       = 0;
+       u32 credit_max          = 0;
+       u16 link_percentage     = 0;
+       u8  bw_percent          = 0;
+       u8  i;
+
+       if (dcb_config == NULL) {
+               ret_val = DCB_ERR_CONFIG;
+               goto out;
+       }
+
+       min_credit = ((max_frame / 2) + DCB_CREDIT_QUANTUM - 1) /
+                       DCB_CREDIT_QUANTUM;
+
+       /* Find smallest link percentage */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               p = &dcb_config->tc_config[i].path[direction];
+               bw_percent = dcb_config->bw_percentage[direction][p->bwg_id];
+               link_percentage = p->bwg_percent;
+
+               link_percentage = (link_percentage * bw_percent) / 100;
+
+               if (link_percentage && link_percentage < min_percent)
+                       min_percent = link_percentage;
+       }
+
+       /*
+        * The ratio between traffic classes will control the bandwidth
+        * percentages seen on the wire. To calculate this ratio we use
+        * a multiplier. It is required that the refill credits must be
+        * larger than the max frame size so here we find the smallest
+        * multiplier that will allow all bandwidth percentages to be
+        * greater than the max frame size.
+        */
+       min_multiplier = (min_credit / min_percent) + 1;
+
+       /* Find out the link percentage for each TC first */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               p = &dcb_config->tc_config[i].path[direction];
+               bw_percent = dcb_config->bw_percentage[direction][p->bwg_id];
+
+               link_percentage = p->bwg_percent;
+               /* Must be careful of integer division for very small nums */
+               link_percentage = (link_percentage * bw_percent) / 100;
+               if (p->bwg_percent > 0 && link_percentage == 0)
+                       link_percentage = 1;
+
+               /* Save link_percentage for reference */
+               p->link_percent = (u8)link_percentage;
+
+               /* Calculate credit refill ratio using multiplier */
+               credit_refill = min(link_percentage * min_multiplier,
+                                   MAX_CREDIT_REFILL);
+               p->data_credits_refill = (u16)credit_refill;
+
+               /* Calculate maximum credit for the TC */
+               credit_max = (link_percentage * MAX_CREDIT) / 100;
+
+               /*
+                * Adjustment based on rule checking, if the percentage
+                * of a TC is too small, the maximum credit may not be
+                * enough to send out a jumbo frame in data plane arbitration.
+                */
+               if (credit_max && (credit_max < min_credit))
+                       credit_max = min_credit;
+
+               if (direction == DCB_TX_CONFIG) {
+                       /*
+                        * Adjustment based on rule checking, if the
+                        * percentage of a TC is too small, the maximum
+                        * credit may not be enough to send out a TSO
+                        * packet in descriptor plane arbitration.
+                        */
+                       if ((hw->mac.type == ixgbe_mac_82598EB) &&
+                           credit_max &&
+                           (credit_max < MINIMUM_CREDIT_FOR_TSO))
+                               credit_max = MINIMUM_CREDIT_FOR_TSO;
+
+                       dcb_config->tc_config[i].desc_credits_max =
+                               (u16)credit_max;
+               }
+
+               p->data_credits_max = (u16)credit_max;
+       }
+
+out:
+       return ret_val;
+}
+
+void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en)
+{
+       int i;
+
+       *pfc_en = 0;
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+               *pfc_en |= (cfg->tc_config[i].dcb_pfc & 0xF) << i;
+}
+
+void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *cfg, int direction,
+                            u16 *refill)
+{
+       struct tc_bw_alloc *p;
+       int i;
+
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               p = &cfg->tc_config[i].path[direction];
+               refill[i] = p->data_credits_refill;
+       }
+}
+
+void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *cfg, u16 *max)
+{
+       int i;
+
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+               max[i] = cfg->tc_config[i].desc_credits_max;
+}
+
+void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *cfg, int direction,
+                           u8 *bwgid)
+{
+       struct tc_bw_alloc *p;
+       int i;
+
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               p = &cfg->tc_config[i].path[direction];
+               bwgid[i] = p->bwg_id;
+       }
+}
+
+void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *cfg, int direction,
+                           u8 *ptype)
+{
+       struct tc_bw_alloc *p;
+       int i;
+
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               p = &cfg->tc_config[i].path[direction];
+               ptype[i] = p->prio_type;
+       }
+}
+
+/**
+ * ixgbe_dcb_hw_config - Config and enable DCB
+ * @hw: pointer to hardware structure
+ * @dcb_config: pointer to ixgbe_dcb_config structure
+ *
+ * Configure dcb settings and enable dcb mode.
+ */
+s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
+                        struct ixgbe_dcb_config *dcb_config)
+{
+       s32 ret = 0;
+       u8 pfc_en;
+       u8 ptype[MAX_TRAFFIC_CLASS];
+       u8 bwgid[MAX_TRAFFIC_CLASS];
+       u16 refill[MAX_TRAFFIC_CLASS];
+       u16 max[MAX_TRAFFIC_CLASS];
+       /* CEE does not define a priority to tc mapping so map 1:1 */
+       u8 prio_tc[MAX_TRAFFIC_CLASS] = {0, 1, 2, 3, 4, 5, 6, 7};
+
+       /* Unpack CEE standard containers */
+       ixgbe_dcb_unpack_pfc(dcb_config, &pfc_en);
+       ixgbe_dcb_unpack_refill(dcb_config, DCB_TX_CONFIG, refill);
+       ixgbe_dcb_unpack_max(dcb_config, max);
+       ixgbe_dcb_unpack_bwgid(dcb_config, DCB_TX_CONFIG, bwgid);
+       ixgbe_dcb_unpack_prio(dcb_config, DCB_TX_CONFIG, ptype);
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               ret = ixgbe_dcb_hw_config_82598(hw, pfc_en, refill, max,
+                                               bwgid, ptype);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               ret = ixgbe_dcb_hw_config_82599(hw, pfc_en, refill, max,
+                                               bwgid, ptype, prio_tc);
+               break;
+       default:
+               break;
+       }
+       return ret;
+}
+
+/* Helper routines to abstract HW specifics from DCB netlink ops */
+s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en)
+{
+       int ret = -EINVAL;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               ret = ixgbe_dcb_config_pfc_82598(hw, pfc_en);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               ret = ixgbe_dcb_config_pfc_82599(hw, pfc_en);
+               break;
+       default:
+               break;
+       }
+       return ret;
+}
+
+s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw,
+                           u16 *refill, u16 *max, u8 *bwg_id,
+                           u8 *prio_type, u8 *prio_tc)
+{
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max,
+                                                       prio_type);
+               ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
+                                                            bwg_id, prio_type);
+               ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
+                                                            bwg_id, prio_type);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max,
+                                                 bwg_id, prio_type, prio_tc);
+               ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
+                                                      bwg_id, prio_type);
+               ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max, bwg_id,
+                                                      prio_type, prio_tc);
+               break;
+       default:
+               break;
+       }
+       return 0;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
new file mode 100644 (file)
index 0000000..e85826a
--- /dev/null
@@ -0,0 +1,167 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _DCB_CONFIG_H_
+#define _DCB_CONFIG_H_
+
+#include "ixgbe_type.h"
+
+/* DCB data structures */
+
+#define IXGBE_MAX_PACKET_BUFFERS 8
+#define MAX_USER_PRIORITY        8
+#define MAX_TRAFFIC_CLASS        8
+#define MAX_BW_GROUP             8
+#define BW_PERCENT               100
+
+#define DCB_TX_CONFIG            0
+#define DCB_RX_CONFIG            1
+
+/* DCB error Codes */
+#define DCB_SUCCESS              0
+#define DCB_ERR_CONFIG           -1
+#define DCB_ERR_PARAM            -2
+
+/* Transmit and receive Errors */
+/* Error in bandwidth group allocation */
+#define DCB_ERR_BW_GROUP        -3
+/* Error in traffic class bandwidth allocation */
+#define DCB_ERR_TC_BW           -4
+/* Traffic class has both link strict and group strict enabled */
+#define DCB_ERR_LS_GS           -5
+/* Link strict traffic class has non zero bandwidth */
+#define DCB_ERR_LS_BW_NONZERO   -6
+/* Link strict bandwidth group has non zero bandwidth */
+#define DCB_ERR_LS_BWG_NONZERO  -7
+/*  Traffic class has zero bandwidth */
+#define DCB_ERR_TC_BW_ZERO      -8
+
+#define DCB_NOT_IMPLEMENTED      0x7FFFFFFF
+
+struct dcb_pfc_tc_debug {
+       u8  tc;
+       u8  pause_status;
+       u64 pause_quanta;
+};
+
+enum strict_prio_type {
+       prio_none = 0,
+       prio_group,
+       prio_link
+};
+
+/* DCB capability definitions */
+#define IXGBE_DCB_PG_SUPPORT        0x00000001
+#define IXGBE_DCB_PFC_SUPPORT       0x00000002
+#define IXGBE_DCB_BCN_SUPPORT       0x00000004
+#define IXGBE_DCB_UP2TC_SUPPORT     0x00000008
+#define IXGBE_DCB_GSP_SUPPORT       0x00000010
+
+#define IXGBE_DCB_8_TC_SUPPORT      0x80
+
+struct dcb_support {
+       /* DCB capabilities */
+       u32 capabilities;
+
+       /* Each bit represents a number of TCs configurable in the hw.
+        * If 8 traffic classes can be configured, the value is 0x80.
+        */
+       u8  traffic_classes;
+       u8  pfc_traffic_classes;
+};
+
+/* Traffic class bandwidth allocation per direction */
+struct tc_bw_alloc {
+       u8 bwg_id;                /* Bandwidth Group (BWG) ID */
+       u8 bwg_percent;           /* % of BWG's bandwidth */
+       u8 link_percent;          /* % of link bandwidth */
+       u8 up_to_tc_bitmap;       /* User Priority to Traffic Class mapping */
+       u16 data_credits_refill;  /* Credit refill amount in 64B granularity */
+       u16 data_credits_max;     /* Max credits for a configured packet buffer
+                                  * in 64B granularity.*/
+       enum strict_prio_type prio_type; /* Link or Group Strict Priority */
+};
+
+enum dcb_pfc_type {
+       pfc_disabled = 0,
+       pfc_enabled_full,
+       pfc_enabled_tx,
+       pfc_enabled_rx
+};
+
+/* Traffic class configuration */
+struct tc_configuration {
+       struct tc_bw_alloc path[2]; /* One each for Tx/Rx */
+       enum dcb_pfc_type  dcb_pfc; /* Class based flow control setting */
+
+       u16 desc_credits_max; /* For Tx Descriptor arbitration */
+       u8 tc; /* Traffic class (TC) */
+};
+
+struct dcb_num_tcs {
+       u8 pg_tcs;
+       u8 pfc_tcs;
+};
+
+struct ixgbe_dcb_config {
+       struct dcb_support support;
+       struct dcb_num_tcs num_tcs;
+       struct tc_configuration tc_config[MAX_TRAFFIC_CLASS];
+       u8     bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */
+       bool   pfc_mode_enable;
+
+       u32  dcb_cfg_version; /* Not used...OS-specific? */
+       u32  link_speed; /* For bandwidth allocation validation purpose */
+};
+
+/* DCB driver APIs */
+void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en);
+void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *, int, u16 *);
+void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *, u16 *);
+void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *, int, u8 *);
+void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *, int, u8 *);
+
+/* DCB credits calculation */
+s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame);
+s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *,
+                                  struct ixgbe_dcb_config *, int, u8);
+
+/* DCB hw initialization */
+s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw, u16 *refill, u16 *max,
+                           u8 *bwg_id, u8 *prio_type, u8 *tc_prio);
+s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en);
+s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *);
+
+/* DCB definitions for credit calculation */
+#define DCB_CREDIT_QUANTUM     64   /* DCB Quantum */
+#define MAX_CREDIT_REFILL       511  /* 0x1FF * 64B = 32704B */
+#define DCB_MAX_TSO_SIZE        (32*1024) /* MAX TSO packet size supported in DCB mode */
+#define MINIMUM_CREDIT_FOR_TSO  (DCB_MAX_TSO_SIZE/64 + 1) /* 513 for 32KB TSO packet */
+#define MAX_CREDIT              4095 /* Maximum credit supported: 256KB * 1204 / 64B */
+
+#endif /* _DCB_CONFIG_H */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
new file mode 100644 (file)
index 0000000..2288c3c
--- /dev/null
@@ -0,0 +1,297 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include "ixgbe.h"
+#include "ixgbe_type.h"
+#include "ixgbe_dcb.h"
+#include "ixgbe_dcb_82598.h"
+
+/**
+ * ixgbe_dcb_config_rx_arbiter_82598 - Config Rx data arbiter
+ * @hw: pointer to hardware structure
+ * @dcb_config: pointer to ixgbe_dcb_config structure
+ *
+ * Configure Rx Data Arbiter and credits for each traffic class.
+ */
+s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
+                                       u16 *refill,
+                                       u16 *max,
+                                       u8 *prio_type)
+{
+       u32    reg           = 0;
+       u32    credit_refill = 0;
+       u32    credit_max    = 0;
+       u8     i             = 0;
+
+       reg = IXGBE_READ_REG(hw, IXGBE_RUPPBMR) | IXGBE_RUPPBMR_MQA;
+       IXGBE_WRITE_REG(hw, IXGBE_RUPPBMR, reg);
+
+       reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
+       /* Enable Arbiter */
+       reg &= ~IXGBE_RMCS_ARBDIS;
+       /* Enable Receive Recycle within the BWG */
+       reg |= IXGBE_RMCS_RRM;
+       /* Enable Deficit Fixed Priority arbitration*/
+       reg |= IXGBE_RMCS_DFP;
+
+       IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
+
+       /* Configure traffic class credits and priority */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               credit_refill = refill[i];
+               credit_max    = max[i];
+
+               reg = credit_refill | (credit_max << IXGBE_RT2CR_MCL_SHIFT);
+
+               if (prio_type[i] == prio_link)
+                       reg |= IXGBE_RT2CR_LSP;
+
+               IXGBE_WRITE_REG(hw, IXGBE_RT2CR(i), reg);
+       }
+
+       reg = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);
+       reg |= IXGBE_RDRXCTL_RDMTS_1_2;
+       reg |= IXGBE_RDRXCTL_MPBEN;
+       reg |= IXGBE_RDRXCTL_MCEN;
+       IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, reg);
+
+       reg = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
+       /* Make sure there is enough descriptors before arbitration */
+       reg &= ~IXGBE_RXCTRL_DMBYPS;
+       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg);
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_tx_desc_arbiter_82598 - Config Tx Desc. arbiter
+ * @hw: pointer to hardware structure
+ * @dcb_config: pointer to ixgbe_dcb_config structure
+ *
+ * Configure Tx Descriptor Arbiter and credits for each traffic class.
+ */
+s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
+                                               u16 *refill,
+                                               u16 *max,
+                                               u8 *bwg_id,
+                                               u8 *prio_type)
+{
+       u32    reg, max_credits;
+       u8     i;
+
+       reg = IXGBE_READ_REG(hw, IXGBE_DPMCS);
+
+       /* Enable arbiter */
+       reg &= ~IXGBE_DPMCS_ARBDIS;
+       /* Enable DFP and Recycle mode */
+       reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);
+       reg |= IXGBE_DPMCS_TSOEF;
+       /* Configure Max TSO packet size 34KB including payload and headers */
+       reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT);
+
+       IXGBE_WRITE_REG(hw, IXGBE_DPMCS, reg);
+
+       /* Configure traffic class credits and priority */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               max_credits = max[i];
+               reg = max_credits << IXGBE_TDTQ2TCCR_MCL_SHIFT;
+               reg |= refill[i];
+               reg |= (u32)(bwg_id[i]) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
+
+               if (prio_type[i] == prio_group)
+                       reg |= IXGBE_TDTQ2TCCR_GSP;
+
+               if (prio_type[i] == prio_link)
+                       reg |= IXGBE_TDTQ2TCCR_LSP;
+
+               IXGBE_WRITE_REG(hw, IXGBE_TDTQ2TCCR(i), reg);
+       }
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_tx_data_arbiter_82598 - Config Tx data arbiter
+ * @hw: pointer to hardware structure
+ * @dcb_config: pointer to ixgbe_dcb_config structure
+ *
+ * Configure Tx Data Arbiter and credits for each traffic class.
+ */
+s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
+                                               u16 *refill,
+                                               u16 *max,
+                                               u8 *bwg_id,
+                                               u8 *prio_type)
+{
+       u32 reg;
+       u8 i;
+
+       reg = IXGBE_READ_REG(hw, IXGBE_PDPMCS);
+       /* Enable Data Plane Arbiter */
+       reg &= ~IXGBE_PDPMCS_ARBDIS;
+       /* Enable DFP and Transmit Recycle Mode */
+       reg |= (IXGBE_PDPMCS_TPPAC | IXGBE_PDPMCS_TRM);
+
+       IXGBE_WRITE_REG(hw, IXGBE_PDPMCS, reg);
+
+       /* Configure traffic class credits and priority */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               reg = refill[i];
+               reg |= (u32)(max[i]) << IXGBE_TDPT2TCCR_MCL_SHIFT;
+               reg |= (u32)(bwg_id[i]) << IXGBE_TDPT2TCCR_BWG_SHIFT;
+
+               if (prio_type[i] == prio_group)
+                       reg |= IXGBE_TDPT2TCCR_GSP;
+
+               if (prio_type[i] == prio_link)
+                       reg |= IXGBE_TDPT2TCCR_LSP;
+
+               IXGBE_WRITE_REG(hw, IXGBE_TDPT2TCCR(i), reg);
+       }
+
+       /* Enable Tx packet buffer division */
+       reg = IXGBE_READ_REG(hw, IXGBE_DTXCTL);
+       reg |= IXGBE_DTXCTL_ENDBUBD;
+       IXGBE_WRITE_REG(hw, IXGBE_DTXCTL, reg);
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_pfc_82598 - Config priority flow control
+ * @hw: pointer to hardware structure
+ * @dcb_config: pointer to ixgbe_dcb_config structure
+ *
+ * Configure Priority Flow Control for each traffic class.
+ */
+s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, u8 pfc_en)
+{
+       u32 reg, rx_pba_size;
+       u8  i;
+
+       if (pfc_en) {
+               /* Enable Transmit Priority Flow Control */
+               reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
+               reg &= ~IXGBE_RMCS_TFCE_802_3X;
+               /* correct the reporting of our flow control status */
+               reg |= IXGBE_RMCS_TFCE_PRIORITY;
+               IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
+
+               /* Enable Receive Priority Flow Control */
+               reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+               reg &= ~IXGBE_FCTRL_RFCE;
+               reg |= IXGBE_FCTRL_RPFCE;
+               IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg);
+
+               /* Configure pause time */
+               for (i = 0; i < (MAX_TRAFFIC_CLASS >> 1); i++)
+                       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), 0x68006800);
+
+               /* Configure flow control refresh threshold value */
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTV, 0x3400);
+       }
+
+       /*
+        * Configure flow control thresholds and enable priority flow control
+        * for each traffic class.
+        */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               int enabled = pfc_en & (1 << i);
+               rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
+               rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
+               reg = (rx_pba_size - hw->fc.low_water) << 10;
+
+               if (enabled == pfc_enabled_tx ||
+                   enabled == pfc_enabled_full)
+                       reg |= IXGBE_FCRTL_XONE;
+
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), reg);
+
+               reg = (rx_pba_size - hw->fc.high_water) << 10;
+               if (enabled == pfc_enabled_tx ||
+                   enabled == pfc_enabled_full)
+                       reg |= IXGBE_FCRTH_FCEN;
+
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg);
+       }
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_tc_stats_82598 - Configure traffic class statistics
+ * @hw: pointer to hardware structure
+ *
+ * Configure queue statistics registers, all queues belonging to same traffic
+ * class uses a single set of queue statistics counters.
+ */
+static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
+{
+       u32 reg = 0;
+       u8  i   = 0;
+       u8  j   = 0;
+
+       /* Receive Queues stats setting -  8 queues per statistics reg */
+       for (i = 0, j = 0; i < 15 && j < 8; i = i + 2, j++) {
+               reg = IXGBE_READ_REG(hw, IXGBE_RQSMR(i));
+               reg |= ((0x1010101) * j);
+               IXGBE_WRITE_REG(hw, IXGBE_RQSMR(i), reg);
+               reg = IXGBE_READ_REG(hw, IXGBE_RQSMR(i + 1));
+               reg |= ((0x1010101) * j);
+               IXGBE_WRITE_REG(hw, IXGBE_RQSMR(i + 1), reg);
+       }
+       /* Transmit Queues stats setting -  4 queues per statistics reg */
+       for (i = 0; i < 8; i++) {
+               reg = IXGBE_READ_REG(hw, IXGBE_TQSMR(i));
+               reg |= ((0x1010101) * i);
+               IXGBE_WRITE_REG(hw, IXGBE_TQSMR(i), reg);
+       }
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_hw_config_82598 - Config and enable DCB
+ * @hw: pointer to hardware structure
+ * @dcb_config: pointer to ixgbe_dcb_config structure
+ *
+ * Configure dcb settings and enable dcb mode.
+ */
+s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
+                             u16 *max, u8 *bwg_id, u8 *prio_type)
+{
+       ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max, prio_type);
+       ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
+                                              bwg_id, prio_type);
+       ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
+                                              bwg_id, prio_type);
+       ixgbe_dcb_config_pfc_82598(hw, pfc_en);
+       ixgbe_dcb_config_tc_stats_82598(hw);
+
+       return 0;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
new file mode 100644 (file)
index 0000000..2f31893
--- /dev/null
@@ -0,0 +1,97 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _DCB_82598_CONFIG_H_
+#define _DCB_82598_CONFIG_H_
+
+/* DCB register definitions */
+
+#define IXGBE_DPMCS_MTSOS_SHIFT 16
+#define IXGBE_DPMCS_TDPAC       0x00000001 /* 0 Round Robin, 1 DFP - Deficit Fixed Priority */
+#define IXGBE_DPMCS_TRM         0x00000010 /* Transmit Recycle Mode */
+#define IXGBE_DPMCS_ARBDIS      0x00000040 /* DCB arbiter disable */
+#define IXGBE_DPMCS_TSOEF       0x00080000 /* TSO Expand Factor: 0=x4, 1=x2 */
+
+#define IXGBE_RUPPBMR_MQA       0x80000000 /* Enable UP to queue mapping */
+
+#define IXGBE_RT2CR_MCL_SHIFT   12 /* Offset to Max Credit Limit setting */
+#define IXGBE_RT2CR_LSP         0x80000000 /* LSP enable bit */
+
+#define IXGBE_RDRXCTL_MPBEN     0x00000010 /* DMA config for multiple packet buffers enable */
+#define IXGBE_RDRXCTL_MCEN      0x00000040 /* DMA config for multiple cores (RSS) enable */
+
+#define IXGBE_TDTQ2TCCR_MCL_SHIFT   12
+#define IXGBE_TDTQ2TCCR_BWG_SHIFT   9
+#define IXGBE_TDTQ2TCCR_GSP     0x40000000
+#define IXGBE_TDTQ2TCCR_LSP     0x80000000
+
+#define IXGBE_TDPT2TCCR_MCL_SHIFT   12
+#define IXGBE_TDPT2TCCR_BWG_SHIFT   9
+#define IXGBE_TDPT2TCCR_GSP     0x40000000
+#define IXGBE_TDPT2TCCR_LSP     0x80000000
+
+#define IXGBE_PDPMCS_TPPAC      0x00000020 /* 0 Round Robin, 1 for DFP - Deficit Fixed Priority */
+#define IXGBE_PDPMCS_ARBDIS     0x00000040 /* Arbiter disable */
+#define IXGBE_PDPMCS_TRM        0x00000100 /* Transmit Recycle Mode enable */
+
+#define IXGBE_DTXCTL_ENDBUBD    0x00000004 /* Enable DBU buffer division */
+
+#define IXGBE_TXPBSIZE_40KB     0x0000A000 /* 40KB Packet Buffer */
+#define IXGBE_RXPBSIZE_48KB     0x0000C000 /* 48KB Packet Buffer */
+#define IXGBE_RXPBSIZE_64KB     0x00010000 /* 64KB Packet Buffer */
+#define IXGBE_RXPBSIZE_80KB     0x00014000 /* 80KB Packet Buffer */
+
+#define IXGBE_RDRXCTL_RDMTS_1_2 0x00000000
+
+/* DCB hardware-specific driver APIs */
+
+/* DCB PFC functions */
+s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, u8 pfc_en);
+
+/* DCB hw initialization */
+s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
+                                       u16 *refill,
+                                       u16 *max,
+                                       u8 *prio_type);
+
+s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
+                                               u16 *refill,
+                                               u16 *max,
+                                               u8 *bwg_id,
+                                               u8 *prio_type);
+
+s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
+                                               u16 *refill,
+                                               u16 *max,
+                                               u8 *bwg_id,
+                                               u8 *prio_type);
+
+s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
+                             u16 *max, u8 *bwg_id, u8 *prio_type);
+
+#endif /* _DCB_82598_CONFIG_H */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
new file mode 100644 (file)
index 0000000..ade9820
--- /dev/null
@@ -0,0 +1,346 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include "ixgbe.h"
+#include "ixgbe_type.h"
+#include "ixgbe_dcb.h"
+#include "ixgbe_dcb_82599.h"
+
+/**
+ * ixgbe_dcb_config_rx_arbiter_82599 - Config Rx Data arbiter
+ * @hw: pointer to hardware structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
+ *
+ * Configure Rx Packet Arbiter and credits for each traffic class.
+ */
+s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
+                                     u16 *refill,
+                                     u16 *max,
+                                     u8 *bwg_id,
+                                     u8 *prio_type,
+                                     u8 *prio_tc)
+{
+       u32    reg           = 0;
+       u32    credit_refill = 0;
+       u32    credit_max    = 0;
+       u8     i             = 0;
+
+       /*
+        * Disable the arbiter before changing parameters
+        * (always enable recycle mode; WSP)
+        */
+       reg = IXGBE_RTRPCS_RRM | IXGBE_RTRPCS_RAC | IXGBE_RTRPCS_ARBDIS;
+       IXGBE_WRITE_REG(hw, IXGBE_RTRPCS, reg);
+
+       /* Map all traffic classes to their UP, 1 to 1 */
+       reg = 0;
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+               reg |= (prio_tc[i] << (i * IXGBE_RTRUP2TC_UP_SHIFT));
+       IXGBE_WRITE_REG(hw, IXGBE_RTRUP2TC, reg);
+
+       /* Configure traffic class credits and priority */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               credit_refill = refill[i];
+               credit_max    = max[i];
+               reg = credit_refill | (credit_max << IXGBE_RTRPT4C_MCL_SHIFT);
+
+               reg |= (u32)(bwg_id[i]) << IXGBE_RTRPT4C_BWG_SHIFT;
+
+               if (prio_type[i] == prio_link)
+                       reg |= IXGBE_RTRPT4C_LSP;
+
+               IXGBE_WRITE_REG(hw, IXGBE_RTRPT4C(i), reg);
+       }
+
+       /*
+        * Configure Rx packet plane (recycle mode; WSP) and
+        * enable arbiter
+        */
+       reg = IXGBE_RTRPCS_RRM | IXGBE_RTRPCS_RAC;
+       IXGBE_WRITE_REG(hw, IXGBE_RTRPCS, reg);
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_tx_desc_arbiter_82599 - Config Tx Desc. arbiter
+ * @hw: pointer to hardware structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
+ *
+ * Configure Tx Descriptor Arbiter and credits for each traffic class.
+ */
+s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
+                                          u16 *refill,
+                                          u16 *max,
+                                          u8 *bwg_id,
+                                          u8 *prio_type)
+{
+       u32    reg, max_credits;
+       u8     i;
+
+       /* Clear the per-Tx queue credits; we use per-TC instead */
+       for (i = 0; i < 128; i++) {
+               IXGBE_WRITE_REG(hw, IXGBE_RTTDQSEL, i);
+               IXGBE_WRITE_REG(hw, IXGBE_RTTDT1C, 0);
+       }
+
+       /* Configure traffic class credits and priority */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               max_credits = max[i];
+               reg = max_credits << IXGBE_RTTDT2C_MCL_SHIFT;
+               reg |= refill[i];
+               reg |= (u32)(bwg_id[i]) << IXGBE_RTTDT2C_BWG_SHIFT;
+
+               if (prio_type[i] == prio_group)
+                       reg |= IXGBE_RTTDT2C_GSP;
+
+               if (prio_type[i] == prio_link)
+                       reg |= IXGBE_RTTDT2C_LSP;
+
+               IXGBE_WRITE_REG(hw, IXGBE_RTTDT2C(i), reg);
+       }
+
+       /*
+        * Configure Tx descriptor plane (recycle mode; WSP) and
+        * enable arbiter
+        */
+       reg = IXGBE_RTTDCS_TDPAC | IXGBE_RTTDCS_TDRM;
+       IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, reg);
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_tx_data_arbiter_82599 - Config Tx Data arbiter
+ * @hw: pointer to hardware structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
+ *
+ * Configure Tx Packet Arbiter and credits for each traffic class.
+ */
+s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
+                                          u16 *refill,
+                                          u16 *max,
+                                          u8 *bwg_id,
+                                          u8 *prio_type,
+                                          u8 *prio_tc)
+{
+       u32 reg;
+       u8 i;
+
+       /*
+        * Disable the arbiter before changing parameters
+        * (always enable recycle mode; SP; arb delay)
+        */
+       reg = IXGBE_RTTPCS_TPPAC | IXGBE_RTTPCS_TPRM |
+             (IXGBE_RTTPCS_ARBD_DCB << IXGBE_RTTPCS_ARBD_SHIFT) |
+             IXGBE_RTTPCS_ARBDIS;
+       IXGBE_WRITE_REG(hw, IXGBE_RTTPCS, reg);
+
+       /* Map all traffic classes to their UP, 1 to 1 */
+       reg = 0;
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+               reg |= (prio_tc[i] << (i * IXGBE_RTTUP2TC_UP_SHIFT));
+       IXGBE_WRITE_REG(hw, IXGBE_RTTUP2TC, reg);
+
+       /* Configure traffic class credits and priority */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               reg = refill[i];
+               reg |= (u32)(max[i]) << IXGBE_RTTPT2C_MCL_SHIFT;
+               reg |= (u32)(bwg_id[i]) << IXGBE_RTTPT2C_BWG_SHIFT;
+
+               if (prio_type[i] == prio_group)
+                       reg |= IXGBE_RTTPT2C_GSP;
+
+               if (prio_type[i] == prio_link)
+                       reg |= IXGBE_RTTPT2C_LSP;
+
+               IXGBE_WRITE_REG(hw, IXGBE_RTTPT2C(i), reg);
+       }
+
+       /*
+        * Configure Tx packet plane (recycle mode; SP; arb delay) and
+        * enable arbiter
+        */
+       reg = IXGBE_RTTPCS_TPPAC | IXGBE_RTTPCS_TPRM |
+             (IXGBE_RTTPCS_ARBD_DCB << IXGBE_RTTPCS_ARBD_SHIFT);
+       IXGBE_WRITE_REG(hw, IXGBE_RTTPCS, reg);
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_pfc_82599 - Configure priority flow control
+ * @hw: pointer to hardware structure
+ * @pfc_en: enabled pfc bitmask
+ *
+ * Configure Priority Flow Control (PFC) for each traffic class.
+ */
+s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en)
+{
+       u32 i, reg, rx_pba_size;
+
+       /* Configure PFC Tx thresholds per TC */
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               int enabled = pfc_en & (1 << i);
+               rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
+               rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
+
+               reg = (rx_pba_size - hw->fc.low_water) << 10;
+
+               if (enabled)
+                       reg |= IXGBE_FCRTL_XONE;
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg);
+
+               reg = (rx_pba_size - hw->fc.high_water) << 10;
+               if (enabled)
+                       reg |= IXGBE_FCRTH_FCEN;
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg);
+       }
+
+       if (pfc_en) {
+               /* Configure pause time (2 TCs per register) */
+               reg = hw->fc.pause_time | (hw->fc.pause_time << 16);
+               for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
+                       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
+
+               /* Configure flow control refresh threshold value */
+               IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
+
+
+               reg = IXGBE_FCCFG_TFCE_PRIORITY;
+               IXGBE_WRITE_REG(hw, IXGBE_FCCFG, reg);
+               /*
+                * Enable Receive PFC
+                * 82599 will always honor XOFF frames we receive when
+                * we are in PFC mode however X540 only honors enabled
+                * traffic classes.
+                */
+               reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+               reg &= ~IXGBE_MFLCN_RFCE;
+               reg |= IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_DPF;
+
+               if (hw->mac.type == ixgbe_mac_X540)
+                       reg |= pfc_en << IXGBE_MFLCN_RPFCE_SHIFT;
+
+               IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
+
+       } else {
+               for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                       hw->mac.ops.fc_enable(hw, i);
+       }
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_config_tc_stats_82599 - Config traffic class statistics
+ * @hw: pointer to hardware structure
+ *
+ * Configure queue statistics registers, all queues belonging to same traffic
+ * class uses a single set of queue statistics counters.
+ */
+static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
+{
+       u32 reg = 0;
+       u8  i   = 0;
+
+       /*
+        * Receive Queues stats setting
+        * 32 RQSMR registers, each configuring 4 queues.
+        * Set all 16 queues of each TC to the same stat
+        * with TC 'n' going to stat 'n'.
+        */
+       for (i = 0; i < 32; i++) {
+               reg = 0x01010101 * (i / 4);
+               IXGBE_WRITE_REG(hw, IXGBE_RQSMR(i), reg);
+       }
+       /*
+        * Transmit Queues stats setting
+        * 32 TQSM registers, each controlling 4 queues.
+        * Set all queues of each TC to the same stat
+        * with TC 'n' going to stat 'n'.
+        * Tx queues are allocated non-uniformly to TCs:
+        * 32, 32, 16, 16, 8, 8, 8, 8.
+        */
+       for (i = 0; i < 32; i++) {
+               if (i < 8)
+                       reg = 0x00000000;
+               else if (i < 16)
+                       reg = 0x01010101;
+               else if (i < 20)
+                       reg = 0x02020202;
+               else if (i < 24)
+                       reg = 0x03030303;
+               else if (i < 26)
+                       reg = 0x04040404;
+               else if (i < 28)
+                       reg = 0x05050505;
+               else if (i < 30)
+                       reg = 0x06060606;
+               else
+                       reg = 0x07070707;
+               IXGBE_WRITE_REG(hw, IXGBE_TQSM(i), reg);
+       }
+
+       return 0;
+}
+
+/**
+ * ixgbe_dcb_hw_config_82599 - Configure and enable DCB
+ * @hw: pointer to hardware structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
+ * @pfc_en: enabled pfc bitmask
+ *
+ * Configure dcb settings and enable dcb mode.
+ */
+s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
+                             u16 *max, u8 *bwg_id, u8 *prio_type, u8 *prio_tc)
+{
+       ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max, bwg_id,
+                                         prio_type, prio_tc);
+       ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
+                                              bwg_id, prio_type);
+       ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max,
+                                              bwg_id, prio_type, prio_tc);
+       ixgbe_dcb_config_pfc_82599(hw, pfc_en);
+       ixgbe_dcb_config_tc_stats_82599(hw);
+
+       return 0;
+}
+
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
new file mode 100644 (file)
index 0000000..08d1749
--- /dev/null
@@ -0,0 +1,123 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _DCB_82599_CONFIG_H_
+#define _DCB_82599_CONFIG_H_
+
+/* DCB register definitions */
+#define IXGBE_RTTDCS_TDPAC      0x00000001 /* 0 Round Robin,
+                                            * 1 WSP - Weighted Strict Priority
+                                            */
+#define IXGBE_RTTDCS_VMPAC      0x00000002 /* 0 Round Robin,
+                                            * 1 WRR - Weighted Round Robin
+                                            */
+#define IXGBE_RTTDCS_TDRM       0x00000010 /* Transmit Recycle Mode */
+#define IXGBE_RTTDCS_ARBDIS     0x00000040 /* DCB arbiter disable */
+#define IXGBE_RTTDCS_BDPM       0x00400000 /* Bypass Data Pipe - must clear! */
+#define IXGBE_RTTDCS_BPBFSM     0x00800000 /* Bypass PB Free Space - must
+                                             * clear!
+                                             */
+#define IXGBE_RTTDCS_SPEED_CHG  0x80000000 /* Link speed change */
+
+/* Receive UP2TC mapping */
+#define IXGBE_RTRUP2TC_UP_SHIFT 3
+/* Transmit UP2TC mapping */
+#define IXGBE_RTTUP2TC_UP_SHIFT 3
+
+#define IXGBE_RTRPT4C_MCL_SHIFT 12 /* Offset to Max Credit Limit setting */
+#define IXGBE_RTRPT4C_BWG_SHIFT 9  /* Offset to BWG index */
+#define IXGBE_RTRPT4C_GSP       0x40000000 /* GSP enable bit */
+#define IXGBE_RTRPT4C_LSP       0x80000000 /* LSP enable bit */
+
+#define IXGBE_RDRXCTL_MPBEN     0x00000010 /* DMA config for multiple packet
+                                            * buffers enable
+                                            */
+#define IXGBE_RDRXCTL_MCEN      0x00000040 /* DMA config for multiple cores
+                                            * (RSS) enable
+                                            */
+
+/* RTRPCS Bit Masks */
+#define IXGBE_RTRPCS_RRM        0x00000002 /* Receive Recycle Mode enable */
+/* Receive Arbitration Control: 0 Round Robin, 1 DFP */
+#define IXGBE_RTRPCS_RAC        0x00000004
+#define IXGBE_RTRPCS_ARBDIS     0x00000040 /* Arbitration disable bit */
+
+/* RTTDT2C Bit Masks */
+#define IXGBE_RTTDT2C_MCL_SHIFT 12
+#define IXGBE_RTTDT2C_BWG_SHIFT 9
+#define IXGBE_RTTDT2C_GSP       0x40000000
+#define IXGBE_RTTDT2C_LSP       0x80000000
+
+#define IXGBE_RTTPT2C_MCL_SHIFT 12
+#define IXGBE_RTTPT2C_BWG_SHIFT 9
+#define IXGBE_RTTPT2C_GSP       0x40000000
+#define IXGBE_RTTPT2C_LSP       0x80000000
+
+/* RTTPCS Bit Masks */
+#define IXGBE_RTTPCS_TPPAC      0x00000020 /* 0 Round Robin,
+                                            * 1 SP - Strict Priority
+                                            */
+#define IXGBE_RTTPCS_ARBDIS     0x00000040 /* Arbiter disable */
+#define IXGBE_RTTPCS_TPRM       0x00000100 /* Transmit Recycle Mode enable */
+#define IXGBE_RTTPCS_ARBD_SHIFT 22
+#define IXGBE_RTTPCS_ARBD_DCB   0x4        /* Arbitration delay in DCB mode */
+
+/* SECTXMINIFG DCB */
+#define IXGBE_SECTX_DCB                0x00001F00 /* DCB TX Buffer IFG */
+
+
+/* DCB hardware-specific driver APIs */
+
+/* DCB PFC functions */
+s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en);
+
+/* DCB hw initialization */
+s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
+                                       u16 *refill,
+                                       u16 *max,
+                                       u8 *bwg_id,
+                                       u8 *prio_type,
+                                       u8 *prio_tc);
+
+s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
+                                               u16 *refill,
+                                               u16 *max,
+                                               u8 *bwg_id,
+                                               u8 *prio_type);
+
+s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
+                                               u16 *refill,
+                                               u16 *max,
+                                               u8 *bwg_id,
+                                               u8 *prio_type,
+                                               u8 *prio_tc);
+
+s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
+                             u16 *max, u8 *bwg_id, u8 *prio_type,
+                             u8 *prio_tc);
+
+#endif /* _DCB_82599_CONFIG_H */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
new file mode 100644 (file)
index 0000000..0ace6ce
--- /dev/null
@@ -0,0 +1,816 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include "ixgbe.h"
+#include <linux/dcbnl.h>
+#include "ixgbe_dcb_82598.h"
+#include "ixgbe_dcb_82599.h"
+
+/* Callbacks for DCB netlink in the kernel */
+#define BIT_DCB_MODE   0x01
+#define BIT_PFC                0x02
+#define BIT_PG_RX      0x04
+#define BIT_PG_TX      0x08
+#define BIT_APP_UPCHG  0x10
+#define BIT_LINKSPEED   0x80
+
+/* Responses for the DCB_C_SET_ALL command */
+#define DCB_HW_CHG_RST  0  /* DCB configuration changed with reset */
+#define DCB_NO_HW_CHG   1  /* DCB configuration did not change */
+#define DCB_HW_CHG      2  /* DCB configuration changed, no reset */
+
+int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
+                       struct ixgbe_dcb_config *dst_dcb_cfg, int tc_max)
+{
+       struct tc_configuration *src_tc_cfg = NULL;
+       struct tc_configuration *dst_tc_cfg = NULL;
+       int i;
+
+       if (!src_dcb_cfg || !dst_dcb_cfg)
+               return -EINVAL;
+
+       for (i = DCB_PG_ATTR_TC_0; i < tc_max + DCB_PG_ATTR_TC_0; i++) {
+               src_tc_cfg = &src_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
+               dst_tc_cfg = &dst_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
+
+               dst_tc_cfg->path[DCB_TX_CONFIG].prio_type =
+                               src_tc_cfg->path[DCB_TX_CONFIG].prio_type;
+
+               dst_tc_cfg->path[DCB_TX_CONFIG].bwg_id =
+                               src_tc_cfg->path[DCB_TX_CONFIG].bwg_id;
+
+               dst_tc_cfg->path[DCB_TX_CONFIG].bwg_percent =
+                               src_tc_cfg->path[DCB_TX_CONFIG].bwg_percent;
+
+               dst_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap =
+                               src_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap;
+
+               dst_tc_cfg->path[DCB_RX_CONFIG].prio_type =
+                               src_tc_cfg->path[DCB_RX_CONFIG].prio_type;
+
+               dst_tc_cfg->path[DCB_RX_CONFIG].bwg_id =
+                               src_tc_cfg->path[DCB_RX_CONFIG].bwg_id;
+
+               dst_tc_cfg->path[DCB_RX_CONFIG].bwg_percent =
+                               src_tc_cfg->path[DCB_RX_CONFIG].bwg_percent;
+
+               dst_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap =
+                               src_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap;
+       }
+
+       for (i = DCB_PG_ATTR_BW_ID_0; i < DCB_PG_ATTR_BW_ID_MAX; i++) {
+               dst_dcb_cfg->bw_percentage[DCB_TX_CONFIG]
+                       [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
+                               [DCB_TX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
+               dst_dcb_cfg->bw_percentage[DCB_RX_CONFIG]
+                       [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
+                               [DCB_RX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
+       }
+
+       for (i = DCB_PFC_UP_ATTR_0; i < DCB_PFC_UP_ATTR_MAX; i++) {
+               dst_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc =
+                       src_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc;
+       }
+
+       dst_dcb_cfg->pfc_mode_enable = src_dcb_cfg->pfc_mode_enable;
+
+       return 0;
+}
+
+static u8 ixgbe_dcbnl_get_state(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       return !!(adapter->flags & IXGBE_FLAG_DCB_ENABLED);
+}
+
+static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
+{
+       u8 err = 0;
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       /* verify there is something to do, if not then exit */
+       if (!!state != !(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
+               return err;
+
+       if (state > 0) {
+               /* Turn on DCB */
+               if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
+                       e_err(drv, "Enable failed, needs MSI-X\n");
+                       err = 1;
+                       goto out;
+               }
+
+               adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
+
+               switch (adapter->hw.mac.type) {
+               case ixgbe_mac_82598EB:
+                       adapter->last_lfc_mode = adapter->hw.fc.current_mode;
+                       adapter->hw.fc.requested_mode = ixgbe_fc_none;
+                       break;
+               case ixgbe_mac_82599EB:
+               case ixgbe_mac_X540:
+                       adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
+                       break;
+               default:
+                       break;
+               }
+
+               ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);
+       } else {
+               /* Turn off DCB */
+               adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
+               adapter->temp_dcb_cfg.pfc_mode_enable = false;
+               adapter->dcb_cfg.pfc_mode_enable = false;
+               adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
+               switch (adapter->hw.mac.type) {
+               case ixgbe_mac_82599EB:
+               case ixgbe_mac_X540:
+                       if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
+                               adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
+                       break;
+               default:
+                       break;
+               }
+               ixgbe_setup_tc(netdev, 0);
+       }
+
+out:
+       return err;
+}
+
+static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev,
+                                        u8 *perm_addr)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       int i, j;
+
+       memset(perm_addr, 0xff, MAX_ADDR_LEN);
+
+       for (i = 0; i < netdev->addr_len; i++)
+               perm_addr[i] = adapter->hw.mac.perm_addr[i];
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               for (j = 0; j < netdev->addr_len; j++, i++)
+                       perm_addr[i] = adapter->hw.mac.san_addr[j];
+               break;
+       default:
+               break;
+       }
+}
+
+static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
+                                         u8 prio, u8 bwg_id, u8 bw_pct,
+                                         u8 up_map)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       if (prio != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type = prio;
+       if (bwg_id != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_id = bwg_id;
+       if (bw_pct != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent =
+                       bw_pct;
+       if (up_map != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap =
+                       up_map;
+
+       if ((adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type !=
+            adapter->dcb_cfg.tc_config[tc].path[0].prio_type) ||
+           (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_id !=
+            adapter->dcb_cfg.tc_config[tc].path[0].bwg_id) ||
+           (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent !=
+            adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent) ||
+           (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
+            adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap))
+               adapter->dcb_set_bitmap |= BIT_PG_TX;
+}
+
+static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
+                                          u8 bw_pct)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;
+
+       if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] !=
+           adapter->dcb_cfg.bw_percentage[0][bwg_id])
+               adapter->dcb_set_bitmap |= BIT_PG_TX;
+}
+
+static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
+                                         u8 prio, u8 bwg_id, u8 bw_pct,
+                                         u8 up_map)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       if (prio != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type = prio;
+       if (bwg_id != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_id = bwg_id;
+       if (bw_pct != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent =
+                       bw_pct;
+       if (up_map != DCB_ATTR_VALUE_UNDEFINED)
+               adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap =
+                       up_map;
+
+       if ((adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type !=
+            adapter->dcb_cfg.tc_config[tc].path[1].prio_type) ||
+           (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_id !=
+            adapter->dcb_cfg.tc_config[tc].path[1].bwg_id) ||
+           (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent !=
+            adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent) ||
+           (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
+            adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap))
+               adapter->dcb_set_bitmap |= BIT_PG_RX;
+}
+
+static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
+                                          u8 bw_pct)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;
+
+       if (adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] !=
+           adapter->dcb_cfg.bw_percentage[1][bwg_id])
+               adapter->dcb_set_bitmap |= BIT_PG_RX;
+}
+
+static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
+                                         u8 *prio, u8 *bwg_id, u8 *bw_pct,
+                                         u8 *up_map)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       *prio = adapter->dcb_cfg.tc_config[tc].path[0].prio_type;
+       *bwg_id = adapter->dcb_cfg.tc_config[tc].path[0].bwg_id;
+       *bw_pct = adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent;
+       *up_map = adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap;
+}
+
+static void ixgbe_dcbnl_get_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
+                                          u8 *bw_pct)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       *bw_pct = adapter->dcb_cfg.bw_percentage[0][bwg_id];
+}
+
+static void ixgbe_dcbnl_get_pg_tc_cfg_rx(struct net_device *netdev, int tc,
+                                         u8 *prio, u8 *bwg_id, u8 *bw_pct,
+                                         u8 *up_map)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       *prio = adapter->dcb_cfg.tc_config[tc].path[1].prio_type;
+       *bwg_id = adapter->dcb_cfg.tc_config[tc].path[1].bwg_id;
+       *bw_pct = adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent;
+       *up_map = adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap;
+}
+
+static void ixgbe_dcbnl_get_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
+                                          u8 *bw_pct)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       *bw_pct = adapter->dcb_cfg.bw_percentage[1][bwg_id];
+}
+
+static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,
+                                    u8 setting)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc = setting;
+       if (adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc !=
+           adapter->dcb_cfg.tc_config[priority].dcb_pfc) {
+               adapter->dcb_set_bitmap |= BIT_PFC;
+               adapter->temp_dcb_cfg.pfc_mode_enable = true;
+       }
+}
+
+static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,
+                                    u8 *setting)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       *setting = adapter->dcb_cfg.tc_config[priority].dcb_pfc;
+}
+
+static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       int ret;
+#ifdef IXGBE_FCOE
+       struct dcb_app app = {
+                             .selector = DCB_APP_IDTYPE_ETHTYPE,
+                             .protocol = ETH_P_FCOE,
+                            };
+       u8 up = dcb_getapp(netdev, &app);
+#endif
+
+       ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
+                                MAX_TRAFFIC_CLASS);
+       if (ret)
+               return DCB_NO_HW_CHG;
+
+#ifdef IXGBE_FCOE
+       if (up && (up != (1 << adapter->fcoe.up)))
+               adapter->dcb_set_bitmap |= BIT_APP_UPCHG;
+
+       /*
+        * Only take down the adapter if an app change occurred. FCoE
+        * may shuffle tx rings in this case and this can not be done
+        * without a reset currently.
+        */
+       if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
+               while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
+                       usleep_range(1000, 2000);
+
+               adapter->fcoe.up = ffs(up) - 1;
+
+               if (netif_running(netdev))
+                       netdev->netdev_ops->ndo_stop(netdev);
+               ixgbe_clear_interrupt_scheme(adapter);
+       }
+#endif
+
+       if (adapter->dcb_cfg.pfc_mode_enable) {
+               switch (adapter->hw.mac.type) {
+               case ixgbe_mac_82599EB:
+               case ixgbe_mac_X540:
+                       if (adapter->hw.fc.current_mode != ixgbe_fc_pfc)
+                               adapter->last_lfc_mode =
+                                                 adapter->hw.fc.current_mode;
+                       break;
+               default:
+                       break;
+               }
+               adapter->hw.fc.requested_mode = ixgbe_fc_pfc;
+       } else {
+               switch (adapter->hw.mac.type) {
+               case ixgbe_mac_82598EB:
+                       adapter->hw.fc.requested_mode = ixgbe_fc_none;
+                       break;
+               case ixgbe_mac_82599EB:
+               case ixgbe_mac_X540:
+                       adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+#ifdef IXGBE_FCOE
+       if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
+               ixgbe_init_interrupt_scheme(adapter);
+               if (netif_running(netdev))
+                       netdev->netdev_ops->ndo_open(netdev);
+               ret = DCB_HW_CHG_RST;
+       }
+#endif
+
+       if (adapter->dcb_set_bitmap & BIT_PFC) {
+               u8 pfc_en;
+               ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
+               ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc_en);
+               ret = DCB_HW_CHG;
+       }
+
+       if (adapter->dcb_set_bitmap & (BIT_PG_TX|BIT_PG_RX)) {
+               u16 refill[MAX_TRAFFIC_CLASS], max[MAX_TRAFFIC_CLASS];
+               u8 bwg_id[MAX_TRAFFIC_CLASS], prio_type[MAX_TRAFFIC_CLASS];
+               /* Priority to TC mapping in CEE case default to 1:1 */
+               u8 prio_tc[MAX_TRAFFIC_CLASS] = {0, 1, 2, 3, 4, 5, 6, 7};
+               int max_frame = adapter->netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+
+#ifdef CONFIG_FCOE
+               if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+                       max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+#endif
+
+               ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
+                                              max_frame, DCB_TX_CONFIG);
+               ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
+                                              max_frame, DCB_RX_CONFIG);
+
+               ixgbe_dcb_unpack_refill(&adapter->dcb_cfg,
+                                       DCB_TX_CONFIG, refill);
+               ixgbe_dcb_unpack_max(&adapter->dcb_cfg, max);
+               ixgbe_dcb_unpack_bwgid(&adapter->dcb_cfg,
+                                      DCB_TX_CONFIG, bwg_id);
+               ixgbe_dcb_unpack_prio(&adapter->dcb_cfg,
+                                     DCB_TX_CONFIG, prio_type);
+
+               ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
+                                       bwg_id, prio_type, prio_tc);
+       }
+
+       if (adapter->dcb_cfg.pfc_mode_enable)
+               adapter->hw.fc.current_mode = ixgbe_fc_pfc;
+
+       if (adapter->dcb_set_bitmap & BIT_APP_UPCHG)
+               clear_bit(__IXGBE_RESETTING, &adapter->state);
+       adapter->dcb_set_bitmap = 0x00;
+       return ret;
+}
+
+static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       switch (capid) {
+       case DCB_CAP_ATTR_PG:
+               *cap = true;
+               break;
+       case DCB_CAP_ATTR_PFC:
+               *cap = true;
+               break;
+       case DCB_CAP_ATTR_UP2TC:
+               *cap = false;
+               break;
+       case DCB_CAP_ATTR_PG_TCS:
+               *cap = 0x80;
+               break;
+       case DCB_CAP_ATTR_PFC_TCS:
+               *cap = 0x80;
+               break;
+       case DCB_CAP_ATTR_GSP:
+               *cap = true;
+               break;
+       case DCB_CAP_ATTR_BCN:
+               *cap = false;
+               break;
+       case DCB_CAP_ATTR_DCBX:
+               *cap = adapter->dcbx_cap;
+               break;
+       default:
+               *cap = false;
+               break;
+       }
+
+       return 0;
+}
+
+static u8 ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       u8 rval = 0;
+
+       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+               switch (tcid) {
+               case DCB_NUMTCS_ATTR_PG:
+                       *num = MAX_TRAFFIC_CLASS;
+                       break;
+               case DCB_NUMTCS_ATTR_PFC:
+                       *num = MAX_TRAFFIC_CLASS;
+                       break;
+               default:
+                       rval = -EINVAL;
+                       break;
+               }
+       } else {
+               rval = -EINVAL;
+       }
+
+       return rval;
+}
+
+static u8 ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num)
+{
+       return -EINVAL;
+}
+
+static u8 ixgbe_dcbnl_getpfcstate(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       return adapter->dcb_cfg.pfc_mode_enable;
+}
+
+static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       adapter->temp_dcb_cfg.pfc_mode_enable = state;
+       if (adapter->temp_dcb_cfg.pfc_mode_enable !=
+               adapter->dcb_cfg.pfc_mode_enable)
+               adapter->dcb_set_bitmap |= BIT_PFC;
+}
+
+/**
+ * ixgbe_dcbnl_getapp - retrieve the DCBX application user priority
+ * @netdev : the corresponding netdev
+ * @idtype : identifies the id as ether type or TCP/UDP port number
+ * @id: id is either ether type or TCP/UDP port number
+ *
+ * Returns : on success, returns a non-zero 802.1p user priority bitmap
+ * otherwise returns 0 as the invalid user priority bitmap to indicate an
+ * error.
+ */
+static u8 ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct dcb_app app = {
+                               .selector = idtype,
+                               .protocol = id,
+                            };
+
+       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
+               return 0;
+
+       return dcb_getapp(netdev, &app);
+}
+
+static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
+                                  struct ieee_ets *ets)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
+
+       /* No IEEE PFC settings available */
+       if (!my_ets)
+               return -EINVAL;
+
+       ets->ets_cap = MAX_TRAFFIC_CLASS;
+       ets->cbs = my_ets->cbs;
+       memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
+       memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw));
+       memcpy(ets->tc_tsa, my_ets->tc_tsa, sizeof(ets->tc_tsa));
+       memcpy(ets->prio_tc, my_ets->prio_tc, sizeof(ets->prio_tc));
+       return 0;
+}
+
+static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,
+                                  struct ieee_ets *ets)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       __u16 refill[IEEE_8021QAZ_MAX_TCS], max[IEEE_8021QAZ_MAX_TCS];
+       __u8 prio_type[IEEE_8021QAZ_MAX_TCS];
+       int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
+       int i, err;
+       __u64 *p = (__u64 *) ets->prio_tc;
+       /* naively give each TC a bwg to map onto CEE hardware */
+       __u8 bwg_id[IEEE_8021QAZ_MAX_TCS] = {0, 1, 2, 3, 4, 5, 6, 7};
+
+       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
+               return -EINVAL;
+
+       if (!adapter->ixgbe_ieee_ets) {
+               adapter->ixgbe_ieee_ets = kmalloc(sizeof(struct ieee_ets),
+                                                 GFP_KERNEL);
+               if (!adapter->ixgbe_ieee_ets)
+                       return -ENOMEM;
+       }
+
+       memcpy(adapter->ixgbe_ieee_ets, ets, sizeof(*adapter->ixgbe_ieee_ets));
+
+       /* Map TSA onto CEE prio type */
+       for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
+               switch (ets->tc_tsa[i]) {
+               case IEEE_8021QAZ_TSA_STRICT:
+                       prio_type[i] = 2;
+                       break;
+               case IEEE_8021QAZ_TSA_ETS:
+                       prio_type[i] = 0;
+                       break;
+               default:
+                       /* Hardware only supports priority strict or
+                        * ETS transmission selection algorithms if
+                        * we receive some other value from dcbnl
+                        * throw an error
+                        */
+                       return -EINVAL;
+               }
+       }
+
+       if (*p)
+               ixgbe_dcbnl_set_state(dev, 1);
+       else
+               ixgbe_dcbnl_set_state(dev, 0);
+
+       ixgbe_ieee_credits(ets->tc_tx_bw, refill, max, max_frame);
+       err = ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
+                                     bwg_id, prio_type, ets->prio_tc);
+       return err;
+}
+
+static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
+                                  struct ieee_pfc *pfc)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
+       int i;
+
+       /* No IEEE PFC settings available */
+       if (!my_pfc)
+               return -EINVAL;
+
+       pfc->pfc_cap = MAX_TRAFFIC_CLASS;
+       pfc->pfc_en = my_pfc->pfc_en;
+       pfc->mbc = my_pfc->mbc;
+       pfc->delay = my_pfc->delay;
+
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               pfc->requests[i] = adapter->stats.pxoffrxc[i];
+               pfc->indications[i] = adapter->stats.pxofftxc[i];
+       }
+
+       return 0;
+}
+
+static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
+                                  struct ieee_pfc *pfc)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       int err;
+
+       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
+               return -EINVAL;
+
+       if (!adapter->ixgbe_ieee_pfc) {
+               adapter->ixgbe_ieee_pfc = kmalloc(sizeof(struct ieee_pfc),
+                                                 GFP_KERNEL);
+               if (!adapter->ixgbe_ieee_pfc)
+                       return -ENOMEM;
+       }
+
+       memcpy(adapter->ixgbe_ieee_pfc, pfc, sizeof(*adapter->ixgbe_ieee_pfc));
+       err = ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en);
+       return err;
+}
+
+#ifdef IXGBE_FCOE
+static void ixgbe_dcbnl_devreset(struct net_device *dev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+
+       if (netif_running(dev))
+               dev->netdev_ops->ndo_stop(dev);
+
+       ixgbe_clear_interrupt_scheme(adapter);
+       ixgbe_init_interrupt_scheme(adapter);
+
+       if (netif_running(dev))
+               dev->netdev_ops->ndo_open(dev);
+}
+#endif
+
+static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,
+                                  struct dcb_app *app)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       int err = -EINVAL;
+
+       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
+               return err;
+
+       err = dcb_ieee_setapp(dev, app);
+
+#ifdef IXGBE_FCOE
+       if (!err && app->selector == IEEE_8021QAZ_APP_SEL_ETHERTYPE &&
+           app->protocol == ETH_P_FCOE) {
+               u8 app_mask = dcb_ieee_getapp_mask(dev, app);
+
+               if (app_mask & (1 << adapter->fcoe.up))
+                       return err;
+
+               adapter->fcoe.up = app->priority;
+               ixgbe_dcbnl_devreset(dev);
+       }
+#endif
+       return 0;
+}
+
+static int ixgbe_dcbnl_ieee_delapp(struct net_device *dev,
+                                  struct dcb_app *app)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       int err;
+
+       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
+               return -EINVAL;
+
+       err = dcb_ieee_delapp(dev, app);
+
+#ifdef IXGBE_FCOE
+       if (!err && app->selector == IEEE_8021QAZ_APP_SEL_ETHERTYPE &&
+           app->protocol == ETH_P_FCOE) {
+               u8 app_mask = dcb_ieee_getapp_mask(dev, app);
+
+               if (app_mask & (1 << adapter->fcoe.up))
+                       return err;
+
+               adapter->fcoe.up = app_mask ?
+                                  ffs(app_mask) - 1 : IXGBE_FCOE_DEFTC;
+               ixgbe_dcbnl_devreset(dev);
+       }
+#endif
+       return err;
+}
+
+static u8 ixgbe_dcbnl_getdcbx(struct net_device *dev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       return adapter->dcbx_cap;
+}
+
+static u8 ixgbe_dcbnl_setdcbx(struct net_device *dev, u8 mode)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       struct ieee_ets ets = {0};
+       struct ieee_pfc pfc = {0};
+
+       /* no support for LLD_MANAGED modes or CEE+IEEE */
+       if ((mode & DCB_CAP_DCBX_LLD_MANAGED) ||
+           ((mode & DCB_CAP_DCBX_VER_IEEE) && (mode & DCB_CAP_DCBX_VER_CEE)) ||
+           !(mode & DCB_CAP_DCBX_HOST))
+               return 1;
+
+       if (mode == adapter->dcbx_cap)
+               return 0;
+
+       adapter->dcbx_cap = mode;
+
+       /* ETS and PFC defaults */
+       ets.ets_cap = 8;
+       pfc.pfc_cap = 8;
+
+       if (mode & DCB_CAP_DCBX_VER_IEEE) {
+               ixgbe_dcbnl_ieee_setets(dev, &ets);
+               ixgbe_dcbnl_ieee_setpfc(dev, &pfc);
+       } else if (mode & DCB_CAP_DCBX_VER_CEE) {
+               adapter->dcb_set_bitmap |= (BIT_PFC & BIT_PG_TX & BIT_PG_RX);
+               ixgbe_dcbnl_set_all(dev);
+       } else {
+               /* Drop into single TC mode strict priority as this
+                * indicates CEE and IEEE versions are disabled
+                */
+               ixgbe_dcbnl_ieee_setets(dev, &ets);
+               ixgbe_dcbnl_ieee_setpfc(dev, &pfc);
+               ixgbe_dcbnl_set_state(dev, 0);
+       }
+
+       return 0;
+}
+
+const struct dcbnl_rtnl_ops dcbnl_ops = {
+       .ieee_getets    = ixgbe_dcbnl_ieee_getets,
+       .ieee_setets    = ixgbe_dcbnl_ieee_setets,
+       .ieee_getpfc    = ixgbe_dcbnl_ieee_getpfc,
+       .ieee_setpfc    = ixgbe_dcbnl_ieee_setpfc,
+       .ieee_setapp    = ixgbe_dcbnl_ieee_setapp,
+       .ieee_delapp    = ixgbe_dcbnl_ieee_delapp,
+       .getstate       = ixgbe_dcbnl_get_state,
+       .setstate       = ixgbe_dcbnl_set_state,
+       .getpermhwaddr  = ixgbe_dcbnl_get_perm_hw_addr,
+       .setpgtccfgtx   = ixgbe_dcbnl_set_pg_tc_cfg_tx,
+       .setpgbwgcfgtx  = ixgbe_dcbnl_set_pg_bwg_cfg_tx,
+       .setpgtccfgrx   = ixgbe_dcbnl_set_pg_tc_cfg_rx,
+       .setpgbwgcfgrx  = ixgbe_dcbnl_set_pg_bwg_cfg_rx,
+       .getpgtccfgtx   = ixgbe_dcbnl_get_pg_tc_cfg_tx,
+       .getpgbwgcfgtx  = ixgbe_dcbnl_get_pg_bwg_cfg_tx,
+       .getpgtccfgrx   = ixgbe_dcbnl_get_pg_tc_cfg_rx,
+       .getpgbwgcfgrx  = ixgbe_dcbnl_get_pg_bwg_cfg_rx,
+       .setpfccfg      = ixgbe_dcbnl_set_pfc_cfg,
+       .getpfccfg      = ixgbe_dcbnl_get_pfc_cfg,
+       .setall         = ixgbe_dcbnl_set_all,
+       .getcap         = ixgbe_dcbnl_getcap,
+       .getnumtcs      = ixgbe_dcbnl_getnumtcs,
+       .setnumtcs      = ixgbe_dcbnl_setnumtcs,
+       .getpfcstate    = ixgbe_dcbnl_getpfcstate,
+       .setpfcstate    = ixgbe_dcbnl_setpfcstate,
+       .getapp         = ixgbe_dcbnl_getapp,
+       .getdcbx        = ixgbe_dcbnl_getdcbx,
+       .setdcbx        = ixgbe_dcbnl_setdcbx,
+};
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
new file mode 100644 (file)
index 0000000..82d4244
--- /dev/null
@@ -0,0 +1,2592 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+/* ethtool support for ixgbe */
+
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/vmalloc.h>
+#include <linux/uaccess.h>
+
+#include "ixgbe.h"
+
+
+#define IXGBE_ALL_RAR_ENTRIES 16
+
+enum {NETDEV_STATS, IXGBE_STATS};
+
+struct ixgbe_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int type;
+       int sizeof_stat;
+       int stat_offset;
+};
+
+#define IXGBE_STAT(m)          IXGBE_STATS, \
+                               sizeof(((struct ixgbe_adapter *)0)->m), \
+                               offsetof(struct ixgbe_adapter, m)
+#define IXGBE_NETDEV_STAT(m)   NETDEV_STATS, \
+                               sizeof(((struct rtnl_link_stats64 *)0)->m), \
+                               offsetof(struct rtnl_link_stats64, m)
+
+static struct ixgbe_stats ixgbe_gstrings_stats[] = {
+       {"rx_packets", IXGBE_NETDEV_STAT(rx_packets)},
+       {"tx_packets", IXGBE_NETDEV_STAT(tx_packets)},
+       {"rx_bytes", IXGBE_NETDEV_STAT(rx_bytes)},
+       {"tx_bytes", IXGBE_NETDEV_STAT(tx_bytes)},
+       {"rx_pkts_nic", IXGBE_STAT(stats.gprc)},
+       {"tx_pkts_nic", IXGBE_STAT(stats.gptc)},
+       {"rx_bytes_nic", IXGBE_STAT(stats.gorc)},
+       {"tx_bytes_nic", IXGBE_STAT(stats.gotc)},
+       {"lsc_int", IXGBE_STAT(lsc_int)},
+       {"tx_busy", IXGBE_STAT(tx_busy)},
+       {"non_eop_descs", IXGBE_STAT(non_eop_descs)},
+       {"rx_errors", IXGBE_NETDEV_STAT(rx_errors)},
+       {"tx_errors", IXGBE_NETDEV_STAT(tx_errors)},
+       {"rx_dropped", IXGBE_NETDEV_STAT(rx_dropped)},
+       {"tx_dropped", IXGBE_NETDEV_STAT(tx_dropped)},
+       {"multicast", IXGBE_NETDEV_STAT(multicast)},
+       {"broadcast", IXGBE_STAT(stats.bprc)},
+       {"rx_no_buffer_count", IXGBE_STAT(stats.rnbc[0]) },
+       {"collisions", IXGBE_NETDEV_STAT(collisions)},
+       {"rx_over_errors", IXGBE_NETDEV_STAT(rx_over_errors)},
+       {"rx_crc_errors", IXGBE_NETDEV_STAT(rx_crc_errors)},
+       {"rx_frame_errors", IXGBE_NETDEV_STAT(rx_frame_errors)},
+       {"hw_rsc_aggregated", IXGBE_STAT(rsc_total_count)},
+       {"hw_rsc_flushed", IXGBE_STAT(rsc_total_flush)},
+       {"fdir_match", IXGBE_STAT(stats.fdirmatch)},
+       {"fdir_miss", IXGBE_STAT(stats.fdirmiss)},
+       {"fdir_overflow", IXGBE_STAT(fdir_overflow)},
+       {"rx_fifo_errors", IXGBE_NETDEV_STAT(rx_fifo_errors)},
+       {"rx_missed_errors", IXGBE_NETDEV_STAT(rx_missed_errors)},
+       {"tx_aborted_errors", IXGBE_NETDEV_STAT(tx_aborted_errors)},
+       {"tx_carrier_errors", IXGBE_NETDEV_STAT(tx_carrier_errors)},
+       {"tx_fifo_errors", IXGBE_NETDEV_STAT(tx_fifo_errors)},
+       {"tx_heartbeat_errors", IXGBE_NETDEV_STAT(tx_heartbeat_errors)},
+       {"tx_timeout_count", IXGBE_STAT(tx_timeout_count)},
+       {"tx_restart_queue", IXGBE_STAT(restart_queue)},
+       {"rx_long_length_errors", IXGBE_STAT(stats.roc)},
+       {"rx_short_length_errors", IXGBE_STAT(stats.ruc)},
+       {"tx_flow_control_xon", IXGBE_STAT(stats.lxontxc)},
+       {"rx_flow_control_xon", IXGBE_STAT(stats.lxonrxc)},
+       {"tx_flow_control_xoff", IXGBE_STAT(stats.lxofftxc)},
+       {"rx_flow_control_xoff", IXGBE_STAT(stats.lxoffrxc)},
+       {"rx_csum_offload_errors", IXGBE_STAT(hw_csum_rx_error)},
+       {"alloc_rx_page_failed", IXGBE_STAT(alloc_rx_page_failed)},
+       {"alloc_rx_buff_failed", IXGBE_STAT(alloc_rx_buff_failed)},
+       {"rx_no_dma_resources", IXGBE_STAT(hw_rx_no_dma_resources)},
+       {"os2bmc_rx_by_bmc", IXGBE_STAT(stats.o2bgptc)},
+       {"os2bmc_tx_by_bmc", IXGBE_STAT(stats.b2ospc)},
+       {"os2bmc_tx_by_host", IXGBE_STAT(stats.o2bspc)},
+       {"os2bmc_rx_by_host", IXGBE_STAT(stats.b2ogprc)},
+#ifdef IXGBE_FCOE
+       {"fcoe_bad_fccrc", IXGBE_STAT(stats.fccrc)},
+       {"rx_fcoe_dropped", IXGBE_STAT(stats.fcoerpdc)},
+       {"rx_fcoe_packets", IXGBE_STAT(stats.fcoeprc)},
+       {"rx_fcoe_dwords", IXGBE_STAT(stats.fcoedwrc)},
+       {"tx_fcoe_packets", IXGBE_STAT(stats.fcoeptc)},
+       {"tx_fcoe_dwords", IXGBE_STAT(stats.fcoedwtc)},
+#endif /* IXGBE_FCOE */
+};
+
+#define IXGBE_QUEUE_STATS_LEN \
+       ((((struct ixgbe_adapter *)netdev_priv(netdev))->num_tx_queues + \
+       ((struct ixgbe_adapter *)netdev_priv(netdev))->num_rx_queues) * \
+       (sizeof(struct ixgbe_queue_stats) / sizeof(u64)))
+#define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)
+#define IXGBE_PB_STATS_LEN ( \
+                 (((struct ixgbe_adapter *)netdev_priv(netdev))->flags & \
+                 IXGBE_FLAG_DCB_ENABLED) ? \
+                 (sizeof(((struct ixgbe_adapter *)0)->stats.pxonrxc) + \
+                  sizeof(((struct ixgbe_adapter *)0)->stats.pxontxc) + \
+                  sizeof(((struct ixgbe_adapter *)0)->stats.pxoffrxc) + \
+                  sizeof(((struct ixgbe_adapter *)0)->stats.pxofftxc)) \
+                  / sizeof(u64) : 0)
+#define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + \
+                         IXGBE_PB_STATS_LEN + \
+                         IXGBE_QUEUE_STATS_LEN)
+
+static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = {
+       "Register test  (offline)", "Eeprom test    (offline)",
+       "Interrupt test (offline)", "Loopback test  (offline)",
+       "Link test   (on/offline)"
+};
+#define IXGBE_TEST_LEN sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN
+
+static int ixgbe_get_settings(struct net_device *netdev,
+                              struct ethtool_cmd *ecmd)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 link_speed = 0;
+       bool link_up;
+
+       ecmd->supported = SUPPORTED_10000baseT_Full;
+       ecmd->autoneg = AUTONEG_ENABLE;
+       ecmd->transceiver = XCVR_EXTERNAL;
+       if ((hw->phy.media_type == ixgbe_media_type_copper) ||
+           (hw->phy.multispeed_fiber)) {
+               ecmd->supported |= (SUPPORTED_1000baseT_Full |
+                                   SUPPORTED_Autoneg);
+
+               switch (hw->mac.type) {
+               case ixgbe_mac_X540:
+                       ecmd->supported |= SUPPORTED_100baseT_Full;
+                       break;
+               default:
+                       break;
+               }
+
+               ecmd->advertising = ADVERTISED_Autoneg;
+               if (hw->phy.autoneg_advertised) {
+                       if (hw->phy.autoneg_advertised &
+                           IXGBE_LINK_SPEED_100_FULL)
+                               ecmd->advertising |= ADVERTISED_100baseT_Full;
+                       if (hw->phy.autoneg_advertised &
+                           IXGBE_LINK_SPEED_10GB_FULL)
+                               ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                       if (hw->phy.autoneg_advertised &
+                           IXGBE_LINK_SPEED_1GB_FULL)
+                               ecmd->advertising |= ADVERTISED_1000baseT_Full;
+               } else {
+                       /*
+                        * Default advertised modes in case
+                        * phy.autoneg_advertised isn't set.
+                        */
+                       ecmd->advertising |= (ADVERTISED_10000baseT_Full |
+                                             ADVERTISED_1000baseT_Full);
+                       if (hw->mac.type == ixgbe_mac_X540)
+                               ecmd->advertising |= ADVERTISED_100baseT_Full;
+               }
+
+               if (hw->phy.media_type == ixgbe_media_type_copper) {
+                       ecmd->supported |= SUPPORTED_TP;
+                       ecmd->advertising |= ADVERTISED_TP;
+                       ecmd->port = PORT_TP;
+               } else {
+                       ecmd->supported |= SUPPORTED_FIBRE;
+                       ecmd->advertising |= ADVERTISED_FIBRE;
+                       ecmd->port = PORT_FIBRE;
+               }
+       } else if (hw->phy.media_type == ixgbe_media_type_backplane) {
+               /* Set as FIBRE until SERDES defined in kernel */
+               if (hw->device_id == IXGBE_DEV_ID_82598_BX) {
+                       ecmd->supported = (SUPPORTED_1000baseT_Full |
+                                          SUPPORTED_FIBRE);
+                       ecmd->advertising = (ADVERTISED_1000baseT_Full |
+                                            ADVERTISED_FIBRE);
+                       ecmd->port = PORT_FIBRE;
+                       ecmd->autoneg = AUTONEG_DISABLE;
+               } else if ((hw->device_id == IXGBE_DEV_ID_82599_COMBO_BACKPLANE) ||
+                          (hw->device_id == IXGBE_DEV_ID_82599_KX4_MEZZ)) {
+                       ecmd->supported |= (SUPPORTED_1000baseT_Full |
+                                           SUPPORTED_Autoneg |
+                                           SUPPORTED_FIBRE);
+                       ecmd->advertising = (ADVERTISED_10000baseT_Full |
+                                            ADVERTISED_1000baseT_Full |
+                                            ADVERTISED_Autoneg |
+                                            ADVERTISED_FIBRE);
+                       ecmd->port = PORT_FIBRE;
+               } else {
+                       ecmd->supported |= (SUPPORTED_1000baseT_Full |
+                                           SUPPORTED_FIBRE);
+                       ecmd->advertising = (ADVERTISED_10000baseT_Full |
+                                            ADVERTISED_1000baseT_Full |
+                                            ADVERTISED_FIBRE);
+                       ecmd->port = PORT_FIBRE;
+               }
+       } else {
+               ecmd->supported |= SUPPORTED_FIBRE;
+               ecmd->advertising = (ADVERTISED_10000baseT_Full |
+                                    ADVERTISED_FIBRE);
+               ecmd->port = PORT_FIBRE;
+               ecmd->autoneg = AUTONEG_DISABLE;
+       }
+
+       /* Get PHY type */
+       switch (adapter->hw.phy.type) {
+       case ixgbe_phy_tn:
+       case ixgbe_phy_aq:
+       case ixgbe_phy_cu_unknown:
+               /* Copper 10G-BASET */
+               ecmd->port = PORT_TP;
+               break;
+       case ixgbe_phy_qt:
+               ecmd->port = PORT_FIBRE;
+               break;
+       case ixgbe_phy_nl:
+       case ixgbe_phy_sfp_passive_tyco:
+       case ixgbe_phy_sfp_passive_unknown:
+       case ixgbe_phy_sfp_ftl:
+       case ixgbe_phy_sfp_avago:
+       case ixgbe_phy_sfp_intel:
+       case ixgbe_phy_sfp_unknown:
+               switch (adapter->hw.phy.sfp_type) {
+               /* SFP+ devices, further checking needed */
+               case ixgbe_sfp_type_da_cu:
+               case ixgbe_sfp_type_da_cu_core0:
+               case ixgbe_sfp_type_da_cu_core1:
+                       ecmd->port = PORT_DA;
+                       break;
+               case ixgbe_sfp_type_sr:
+               case ixgbe_sfp_type_lr:
+               case ixgbe_sfp_type_srlr_core0:
+               case ixgbe_sfp_type_srlr_core1:
+                       ecmd->port = PORT_FIBRE;
+                       break;
+               case ixgbe_sfp_type_not_present:
+                       ecmd->port = PORT_NONE;
+                       break;
+               case ixgbe_sfp_type_1g_cu_core0:
+               case ixgbe_sfp_type_1g_cu_core1:
+                       ecmd->port = PORT_TP;
+                       ecmd->supported = SUPPORTED_TP;
+                       ecmd->advertising = (ADVERTISED_1000baseT_Full |
+                                            ADVERTISED_TP);
+                       break;
+               case ixgbe_sfp_type_unknown:
+               default:
+                       ecmd->port = PORT_OTHER;
+                       break;
+               }
+               break;
+       case ixgbe_phy_xaui:
+               ecmd->port = PORT_NONE;
+               break;
+       case ixgbe_phy_unknown:
+       case ixgbe_phy_generic:
+       case ixgbe_phy_sfp_unsupported:
+       default:
+               ecmd->port = PORT_OTHER;
+               break;
+       }
+
+       hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
+       if (link_up) {
+               switch (link_speed) {
+               case IXGBE_LINK_SPEED_10GB_FULL:
+                       ethtool_cmd_speed_set(ecmd, SPEED_10000);
+                       break;
+               case IXGBE_LINK_SPEED_1GB_FULL:
+                       ethtool_cmd_speed_set(ecmd, SPEED_1000);
+                       break;
+               case IXGBE_LINK_SPEED_100_FULL:
+                       ethtool_cmd_speed_set(ecmd, SPEED_100);
+                       break;
+               default:
+                       break;
+               }
+               ecmd->duplex = DUPLEX_FULL;
+       } else {
+               ethtool_cmd_speed_set(ecmd, -1);
+               ecmd->duplex = -1;
+       }
+
+       return 0;
+}
+
+static int ixgbe_set_settings(struct net_device *netdev,
+                              struct ethtool_cmd *ecmd)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 advertised, old;
+       s32 err = 0;
+
+       if ((hw->phy.media_type == ixgbe_media_type_copper) ||
+           (hw->phy.multispeed_fiber)) {
+               /* 10000/copper and 1000/copper must autoneg
+                * this function does not support any duplex forcing, but can
+                * limit the advertising of the adapter to only 10000 or 1000 */
+               if (ecmd->autoneg == AUTONEG_DISABLE)
+                       return -EINVAL;
+
+               old = hw->phy.autoneg_advertised;
+               advertised = 0;
+               if (ecmd->advertising & ADVERTISED_10000baseT_Full)
+                       advertised |= IXGBE_LINK_SPEED_10GB_FULL;
+
+               if (ecmd->advertising & ADVERTISED_1000baseT_Full)
+                       advertised |= IXGBE_LINK_SPEED_1GB_FULL;
+
+               if (ecmd->advertising & ADVERTISED_100baseT_Full)
+                       advertised |= IXGBE_LINK_SPEED_100_FULL;
+
+               if (old == advertised)
+                       return err;
+               /* this sets the link speed and restarts auto-neg */
+               hw->mac.autotry_restart = true;
+               err = hw->mac.ops.setup_link(hw, advertised, true, true);
+               if (err) {
+                       e_info(probe, "setup link failed with code %d\n", err);
+                       hw->mac.ops.setup_link(hw, old, true, true);
+               }
+       } else {
+               /* in this case we currently only support 10Gb/FULL */
+               u32 speed = ethtool_cmd_speed(ecmd);
+               if ((ecmd->autoneg == AUTONEG_ENABLE) ||
+                   (ecmd->advertising != ADVERTISED_10000baseT_Full) ||
+                   (speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL))
+                       return -EINVAL;
+       }
+
+       return err;
+}
+
+static void ixgbe_get_pauseparam(struct net_device *netdev,
+                                 struct ethtool_pauseparam *pause)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       /*
+        * Flow Control Autoneg isn't on if
+        *  - we didn't ask for it OR
+        *  - it failed, we know this by tx & rx being off
+        */
+       if (hw->fc.disable_fc_autoneg ||
+           (hw->fc.current_mode == ixgbe_fc_none))
+               pause->autoneg = 0;
+       else
+               pause->autoneg = 1;
+
+       if (hw->fc.current_mode == ixgbe_fc_rx_pause) {
+               pause->rx_pause = 1;
+       } else if (hw->fc.current_mode == ixgbe_fc_tx_pause) {
+               pause->tx_pause = 1;
+       } else if (hw->fc.current_mode == ixgbe_fc_full) {
+               pause->rx_pause = 1;
+               pause->tx_pause = 1;
+#ifdef CONFIG_DCB
+       } else if (hw->fc.current_mode == ixgbe_fc_pfc) {
+               pause->rx_pause = 0;
+               pause->tx_pause = 0;
+#endif
+       }
+}
+
+static int ixgbe_set_pauseparam(struct net_device *netdev,
+                                struct ethtool_pauseparam *pause)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbe_fc_info fc;
+
+#ifdef CONFIG_DCB
+       if (adapter->dcb_cfg.pfc_mode_enable ||
+               ((hw->mac.type == ixgbe_mac_82598EB) &&
+               (adapter->flags & IXGBE_FLAG_DCB_ENABLED)))
+               return -EINVAL;
+
+#endif
+       fc = hw->fc;
+
+       if (pause->autoneg != AUTONEG_ENABLE)
+               fc.disable_fc_autoneg = true;
+       else
+               fc.disable_fc_autoneg = false;
+
+       if ((pause->rx_pause && pause->tx_pause) || pause->autoneg)
+               fc.requested_mode = ixgbe_fc_full;
+       else if (pause->rx_pause && !pause->tx_pause)
+               fc.requested_mode = ixgbe_fc_rx_pause;
+       else if (!pause->rx_pause && pause->tx_pause)
+               fc.requested_mode = ixgbe_fc_tx_pause;
+       else if (!pause->rx_pause && !pause->tx_pause)
+               fc.requested_mode = ixgbe_fc_none;
+       else
+               return -EINVAL;
+
+#ifdef CONFIG_DCB
+       adapter->last_lfc_mode = fc.requested_mode;
+#endif
+
+       /* if the thing changed then we'll update and use new autoneg */
+       if (memcmp(&fc, &hw->fc, sizeof(struct ixgbe_fc_info))) {
+               hw->fc = fc;
+               if (netif_running(netdev))
+                       ixgbe_reinit_locked(adapter);
+               else
+                       ixgbe_reset(adapter);
+       }
+
+       return 0;
+}
+
+static u32 ixgbe_get_msglevel(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       return adapter->msg_enable;
+}
+
+static void ixgbe_set_msglevel(struct net_device *netdev, u32 data)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       adapter->msg_enable = data;
+}
+
+static int ixgbe_get_regs_len(struct net_device *netdev)
+{
+#define IXGBE_REGS_LEN  1128
+       return IXGBE_REGS_LEN * sizeof(u32);
+}
+
+#define IXGBE_GET_STAT(_A_, _R_) _A_->stats._R_
+
+static void ixgbe_get_regs(struct net_device *netdev,
+                           struct ethtool_regs *regs, void *p)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 *regs_buff = p;
+       u8 i;
+
+       memset(p, 0, IXGBE_REGS_LEN * sizeof(u32));
+
+       regs->version = (1 << 24) | hw->revision_id << 16 | hw->device_id;
+
+       /* General Registers */
+       regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_CTRL);
+       regs_buff[1] = IXGBE_READ_REG(hw, IXGBE_STATUS);
+       regs_buff[2] = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
+       regs_buff[3] = IXGBE_READ_REG(hw, IXGBE_ESDP);
+       regs_buff[4] = IXGBE_READ_REG(hw, IXGBE_EODSDP);
+       regs_buff[5] = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+       regs_buff[6] = IXGBE_READ_REG(hw, IXGBE_FRTIMER);
+       regs_buff[7] = IXGBE_READ_REG(hw, IXGBE_TCPTIMER);
+
+       /* NVM Register */
+       regs_buff[8] = IXGBE_READ_REG(hw, IXGBE_EEC);
+       regs_buff[9] = IXGBE_READ_REG(hw, IXGBE_EERD);
+       regs_buff[10] = IXGBE_READ_REG(hw, IXGBE_FLA);
+       regs_buff[11] = IXGBE_READ_REG(hw, IXGBE_EEMNGCTL);
+       regs_buff[12] = IXGBE_READ_REG(hw, IXGBE_EEMNGDATA);
+       regs_buff[13] = IXGBE_READ_REG(hw, IXGBE_FLMNGCTL);
+       regs_buff[14] = IXGBE_READ_REG(hw, IXGBE_FLMNGDATA);
+       regs_buff[15] = IXGBE_READ_REG(hw, IXGBE_FLMNGCNT);
+       regs_buff[16] = IXGBE_READ_REG(hw, IXGBE_FLOP);
+       regs_buff[17] = IXGBE_READ_REG(hw, IXGBE_GRC);
+
+       /* Interrupt */
+       /* don't read EICR because it can clear interrupt causes, instead
+        * read EICS which is a shadow but doesn't clear EICR */
+       regs_buff[18] = IXGBE_READ_REG(hw, IXGBE_EICS);
+       regs_buff[19] = IXGBE_READ_REG(hw, IXGBE_EICS);
+       regs_buff[20] = IXGBE_READ_REG(hw, IXGBE_EIMS);
+       regs_buff[21] = IXGBE_READ_REG(hw, IXGBE_EIMC);
+       regs_buff[22] = IXGBE_READ_REG(hw, IXGBE_EIAC);
+       regs_buff[23] = IXGBE_READ_REG(hw, IXGBE_EIAM);
+       regs_buff[24] = IXGBE_READ_REG(hw, IXGBE_EITR(0));
+       regs_buff[25] = IXGBE_READ_REG(hw, IXGBE_IVAR(0));
+       regs_buff[26] = IXGBE_READ_REG(hw, IXGBE_MSIXT);
+       regs_buff[27] = IXGBE_READ_REG(hw, IXGBE_MSIXPBA);
+       regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_PBACL(0));
+       regs_buff[29] = IXGBE_READ_REG(hw, IXGBE_GPIE);
+
+       /* Flow Control */
+       regs_buff[30] = IXGBE_READ_REG(hw, IXGBE_PFCTOP);
+       regs_buff[31] = IXGBE_READ_REG(hw, IXGBE_FCTTV(0));
+       regs_buff[32] = IXGBE_READ_REG(hw, IXGBE_FCTTV(1));
+       regs_buff[33] = IXGBE_READ_REG(hw, IXGBE_FCTTV(2));
+       regs_buff[34] = IXGBE_READ_REG(hw, IXGBE_FCTTV(3));
+       for (i = 0; i < 8; i++) {
+               switch (hw->mac.type) {
+               case ixgbe_mac_82598EB:
+                       regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL(i));
+                       regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH(i));
+                       break;
+               case ixgbe_mac_82599EB:
+                       regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL_82599(i));
+                       regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH_82599(i));
+                       break;
+               default:
+                       break;
+               }
+       }
+       regs_buff[51] = IXGBE_READ_REG(hw, IXGBE_FCRTV);
+       regs_buff[52] = IXGBE_READ_REG(hw, IXGBE_TFCS);
+
+       /* Receive DMA */
+       for (i = 0; i < 64; i++)
+               regs_buff[53 + i] = IXGBE_READ_REG(hw, IXGBE_RDBAL(i));
+       for (i = 0; i < 64; i++)
+               regs_buff[117 + i] = IXGBE_READ_REG(hw, IXGBE_RDBAH(i));
+       for (i = 0; i < 64; i++)
+               regs_buff[181 + i] = IXGBE_READ_REG(hw, IXGBE_RDLEN(i));
+       for (i = 0; i < 64; i++)
+               regs_buff[245 + i] = IXGBE_READ_REG(hw, IXGBE_RDH(i));
+       for (i = 0; i < 64; i++)
+               regs_buff[309 + i] = IXGBE_READ_REG(hw, IXGBE_RDT(i));
+       for (i = 0; i < 64; i++)
+               regs_buff[373 + i] = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
+       for (i = 0; i < 16; i++)
+               regs_buff[437 + i] = IXGBE_READ_REG(hw, IXGBE_SRRCTL(i));
+       for (i = 0; i < 16; i++)
+               regs_buff[453 + i] = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
+       regs_buff[469] = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);
+       for (i = 0; i < 8; i++)
+               regs_buff[470 + i] = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
+       regs_buff[478] = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
+       regs_buff[479] = IXGBE_READ_REG(hw, IXGBE_DROPEN);
+
+       /* Receive */
+       regs_buff[480] = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
+       regs_buff[481] = IXGBE_READ_REG(hw, IXGBE_RFCTL);
+       for (i = 0; i < 16; i++)
+               regs_buff[482 + i] = IXGBE_READ_REG(hw, IXGBE_RAL(i));
+       for (i = 0; i < 16; i++)
+               regs_buff[498 + i] = IXGBE_READ_REG(hw, IXGBE_RAH(i));
+       regs_buff[514] = IXGBE_READ_REG(hw, IXGBE_PSRTYPE(0));
+       regs_buff[515] = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+       regs_buff[516] = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
+       regs_buff[517] = IXGBE_READ_REG(hw, IXGBE_MCSTCTRL);
+       regs_buff[518] = IXGBE_READ_REG(hw, IXGBE_MRQC);
+       regs_buff[519] = IXGBE_READ_REG(hw, IXGBE_VMD_CTL);
+       for (i = 0; i < 8; i++)
+               regs_buff[520 + i] = IXGBE_READ_REG(hw, IXGBE_IMIR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[528 + i] = IXGBE_READ_REG(hw, IXGBE_IMIREXT(i));
+       regs_buff[536] = IXGBE_READ_REG(hw, IXGBE_IMIRVP);
+
+       /* Transmit */
+       for (i = 0; i < 32; i++)
+               regs_buff[537 + i] = IXGBE_READ_REG(hw, IXGBE_TDBAL(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[569 + i] = IXGBE_READ_REG(hw, IXGBE_TDBAH(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[601 + i] = IXGBE_READ_REG(hw, IXGBE_TDLEN(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[633 + i] = IXGBE_READ_REG(hw, IXGBE_TDH(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[665 + i] = IXGBE_READ_REG(hw, IXGBE_TDT(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[697 + i] = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[729 + i] = IXGBE_READ_REG(hw, IXGBE_TDWBAL(i));
+       for (i = 0; i < 32; i++)
+               regs_buff[761 + i] = IXGBE_READ_REG(hw, IXGBE_TDWBAH(i));
+       regs_buff[793] = IXGBE_READ_REG(hw, IXGBE_DTXCTL);
+       for (i = 0; i < 16; i++)
+               regs_buff[794 + i] = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));
+       regs_buff[810] = IXGBE_READ_REG(hw, IXGBE_TIPG);
+       for (i = 0; i < 8; i++)
+               regs_buff[811 + i] = IXGBE_READ_REG(hw, IXGBE_TXPBSIZE(i));
+       regs_buff[819] = IXGBE_READ_REG(hw, IXGBE_MNGTXMAP);
+
+       /* Wake Up */
+       regs_buff[820] = IXGBE_READ_REG(hw, IXGBE_WUC);
+       regs_buff[821] = IXGBE_READ_REG(hw, IXGBE_WUFC);
+       regs_buff[822] = IXGBE_READ_REG(hw, IXGBE_WUS);
+       regs_buff[823] = IXGBE_READ_REG(hw, IXGBE_IPAV);
+       regs_buff[824] = IXGBE_READ_REG(hw, IXGBE_IP4AT);
+       regs_buff[825] = IXGBE_READ_REG(hw, IXGBE_IP6AT);
+       regs_buff[826] = IXGBE_READ_REG(hw, IXGBE_WUPL);
+       regs_buff[827] = IXGBE_READ_REG(hw, IXGBE_WUPM);
+       regs_buff[828] = IXGBE_READ_REG(hw, IXGBE_FHFT(0));
+
+       /* DCB */
+       regs_buff[829] = IXGBE_READ_REG(hw, IXGBE_RMCS);
+       regs_buff[830] = IXGBE_READ_REG(hw, IXGBE_DPMCS);
+       regs_buff[831] = IXGBE_READ_REG(hw, IXGBE_PDPMCS);
+       regs_buff[832] = IXGBE_READ_REG(hw, IXGBE_RUPPBMR);
+       for (i = 0; i < 8; i++)
+               regs_buff[833 + i] = IXGBE_READ_REG(hw, IXGBE_RT2CR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[841 + i] = IXGBE_READ_REG(hw, IXGBE_RT2SR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[849 + i] = IXGBE_READ_REG(hw, IXGBE_TDTQ2TCCR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[857 + i] = IXGBE_READ_REG(hw, IXGBE_TDTQ2TCSR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[865 + i] = IXGBE_READ_REG(hw, IXGBE_TDPT2TCCR(i));
+       for (i = 0; i < 8; i++)
+               regs_buff[873 + i] = IXGBE_READ_REG(hw, IXGBE_TDPT2TCSR(i));
+
+       /* Statistics */
+       regs_buff[881] = IXGBE_GET_STAT(adapter, crcerrs);
+       regs_buff[882] = IXGBE_GET_STAT(adapter, illerrc);
+       regs_buff[883] = IXGBE_GET_STAT(adapter, errbc);
+       regs_buff[884] = IXGBE_GET_STAT(adapter, mspdc);
+       for (i = 0; i < 8; i++)
+               regs_buff[885 + i] = IXGBE_GET_STAT(adapter, mpc[i]);
+       regs_buff[893] = IXGBE_GET_STAT(adapter, mlfc);
+       regs_buff[894] = IXGBE_GET_STAT(adapter, mrfc);
+       regs_buff[895] = IXGBE_GET_STAT(adapter, rlec);
+       regs_buff[896] = IXGBE_GET_STAT(adapter, lxontxc);
+       regs_buff[897] = IXGBE_GET_STAT(adapter, lxonrxc);
+       regs_buff[898] = IXGBE_GET_STAT(adapter, lxofftxc);
+       regs_buff[899] = IXGBE_GET_STAT(adapter, lxoffrxc);
+       for (i = 0; i < 8; i++)
+               regs_buff[900 + i] = IXGBE_GET_STAT(adapter, pxontxc[i]);
+       for (i = 0; i < 8; i++)
+               regs_buff[908 + i] = IXGBE_GET_STAT(adapter, pxonrxc[i]);
+       for (i = 0; i < 8; i++)
+               regs_buff[916 + i] = IXGBE_GET_STAT(adapter, pxofftxc[i]);
+       for (i = 0; i < 8; i++)
+               regs_buff[924 + i] = IXGBE_GET_STAT(adapter, pxoffrxc[i]);
+       regs_buff[932] = IXGBE_GET_STAT(adapter, prc64);
+       regs_buff[933] = IXGBE_GET_STAT(adapter, prc127);
+       regs_buff[934] = IXGBE_GET_STAT(adapter, prc255);
+       regs_buff[935] = IXGBE_GET_STAT(adapter, prc511);
+       regs_buff[936] = IXGBE_GET_STAT(adapter, prc1023);
+       regs_buff[937] = IXGBE_GET_STAT(adapter, prc1522);
+       regs_buff[938] = IXGBE_GET_STAT(adapter, gprc);
+       regs_buff[939] = IXGBE_GET_STAT(adapter, bprc);
+       regs_buff[940] = IXGBE_GET_STAT(adapter, mprc);
+       regs_buff[941] = IXGBE_GET_STAT(adapter, gptc);
+       regs_buff[942] = IXGBE_GET_STAT(adapter, gorc);
+       regs_buff[944] = IXGBE_GET_STAT(adapter, gotc);
+       for (i = 0; i < 8; i++)
+               regs_buff[946 + i] = IXGBE_GET_STAT(adapter, rnbc[i]);
+       regs_buff[954] = IXGBE_GET_STAT(adapter, ruc);
+       regs_buff[955] = IXGBE_GET_STAT(adapter, rfc);
+       regs_buff[956] = IXGBE_GET_STAT(adapter, roc);
+       regs_buff[957] = IXGBE_GET_STAT(adapter, rjc);
+       regs_buff[958] = IXGBE_GET_STAT(adapter, mngprc);
+       regs_buff[959] = IXGBE_GET_STAT(adapter, mngpdc);
+       regs_buff[960] = IXGBE_GET_STAT(adapter, mngptc);
+       regs_buff[961] = IXGBE_GET_STAT(adapter, tor);
+       regs_buff[963] = IXGBE_GET_STAT(adapter, tpr);
+       regs_buff[964] = IXGBE_GET_STAT(adapter, tpt);
+       regs_buff[965] = IXGBE_GET_STAT(adapter, ptc64);
+       regs_buff[966] = IXGBE_GET_STAT(adapter, ptc127);
+       regs_buff[967] = IXGBE_GET_STAT(adapter, ptc255);
+       regs_buff[968] = IXGBE_GET_STAT(adapter, ptc511);
+       regs_buff[969] = IXGBE_GET_STAT(adapter, ptc1023);
+       regs_buff[970] = IXGBE_GET_STAT(adapter, ptc1522);
+       regs_buff[971] = IXGBE_GET_STAT(adapter, mptc);
+       regs_buff[972] = IXGBE_GET_STAT(adapter, bptc);
+       regs_buff[973] = IXGBE_GET_STAT(adapter, xec);
+       for (i = 0; i < 16; i++)
+               regs_buff[974 + i] = IXGBE_GET_STAT(adapter, qprc[i]);
+       for (i = 0; i < 16; i++)
+               regs_buff[990 + i] = IXGBE_GET_STAT(adapter, qptc[i]);
+       for (i = 0; i < 16; i++)
+               regs_buff[1006 + i] = IXGBE_GET_STAT(adapter, qbrc[i]);
+       for (i = 0; i < 16; i++)
+               regs_buff[1022 + i] = IXGBE_GET_STAT(adapter, qbtc[i]);
+
+       /* MAC */
+       regs_buff[1038] = IXGBE_READ_REG(hw, IXGBE_PCS1GCFIG);
+       regs_buff[1039] = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
+       regs_buff[1040] = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
+       regs_buff[1041] = IXGBE_READ_REG(hw, IXGBE_PCS1GDBG0);
+       regs_buff[1042] = IXGBE_READ_REG(hw, IXGBE_PCS1GDBG1);
+       regs_buff[1043] = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+       regs_buff[1044] = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
+       regs_buff[1045] = IXGBE_READ_REG(hw, IXGBE_PCS1GANNP);
+       regs_buff[1046] = IXGBE_READ_REG(hw, IXGBE_PCS1GANLPNP);
+       regs_buff[1047] = IXGBE_READ_REG(hw, IXGBE_HLREG0);
+       regs_buff[1048] = IXGBE_READ_REG(hw, IXGBE_HLREG1);
+       regs_buff[1049] = IXGBE_READ_REG(hw, IXGBE_PAP);
+       regs_buff[1050] = IXGBE_READ_REG(hw, IXGBE_MACA);
+       regs_buff[1051] = IXGBE_READ_REG(hw, IXGBE_APAE);
+       regs_buff[1052] = IXGBE_READ_REG(hw, IXGBE_ARD);
+       regs_buff[1053] = IXGBE_READ_REG(hw, IXGBE_AIS);
+       regs_buff[1054] = IXGBE_READ_REG(hw, IXGBE_MSCA);
+       regs_buff[1055] = IXGBE_READ_REG(hw, IXGBE_MSRWD);
+       regs_buff[1056] = IXGBE_READ_REG(hw, IXGBE_MLADD);
+       regs_buff[1057] = IXGBE_READ_REG(hw, IXGBE_MHADD);
+       regs_buff[1058] = IXGBE_READ_REG(hw, IXGBE_TREG);
+       regs_buff[1059] = IXGBE_READ_REG(hw, IXGBE_PCSS1);
+       regs_buff[1060] = IXGBE_READ_REG(hw, IXGBE_PCSS2);
+       regs_buff[1061] = IXGBE_READ_REG(hw, IXGBE_XPCSS);
+       regs_buff[1062] = IXGBE_READ_REG(hw, IXGBE_SERDESC);
+       regs_buff[1063] = IXGBE_READ_REG(hw, IXGBE_MACS);
+       regs_buff[1064] = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       regs_buff[1065] = IXGBE_READ_REG(hw, IXGBE_LINKS);
+       regs_buff[1066] = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+       regs_buff[1067] = IXGBE_READ_REG(hw, IXGBE_AUTOC3);
+       regs_buff[1068] = IXGBE_READ_REG(hw, IXGBE_ANLP1);
+       regs_buff[1069] = IXGBE_READ_REG(hw, IXGBE_ANLP2);
+       regs_buff[1070] = IXGBE_READ_REG(hw, IXGBE_ATLASCTL);
+
+       /* Diagnostic */
+       regs_buff[1071] = IXGBE_READ_REG(hw, IXGBE_RDSTATCTL);
+       for (i = 0; i < 8; i++)
+               regs_buff[1072 + i] = IXGBE_READ_REG(hw, IXGBE_RDSTAT(i));
+       regs_buff[1080] = IXGBE_READ_REG(hw, IXGBE_RDHMPN);
+       for (i = 0; i < 4; i++)
+               regs_buff[1081 + i] = IXGBE_READ_REG(hw, IXGBE_RIC_DW(i));
+       regs_buff[1085] = IXGBE_READ_REG(hw, IXGBE_RDPROBE);
+       regs_buff[1086] = IXGBE_READ_REG(hw, IXGBE_TDSTATCTL);
+       for (i = 0; i < 8; i++)
+               regs_buff[1087 + i] = IXGBE_READ_REG(hw, IXGBE_TDSTAT(i));
+       regs_buff[1095] = IXGBE_READ_REG(hw, IXGBE_TDHMPN);
+       for (i = 0; i < 4; i++)
+               regs_buff[1096 + i] = IXGBE_READ_REG(hw, IXGBE_TIC_DW(i));
+       regs_buff[1100] = IXGBE_READ_REG(hw, IXGBE_TDPROBE);
+       regs_buff[1101] = IXGBE_READ_REG(hw, IXGBE_TXBUFCTRL);
+       regs_buff[1102] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA0);
+       regs_buff[1103] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA1);
+       regs_buff[1104] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA2);
+       regs_buff[1105] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA3);
+       regs_buff[1106] = IXGBE_READ_REG(hw, IXGBE_RXBUFCTRL);
+       regs_buff[1107] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA0);
+       regs_buff[1108] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA1);
+       regs_buff[1109] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA2);
+       regs_buff[1110] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA3);
+       for (i = 0; i < 8; i++)
+               regs_buff[1111 + i] = IXGBE_READ_REG(hw, IXGBE_PCIE_DIAG(i));
+       regs_buff[1119] = IXGBE_READ_REG(hw, IXGBE_RFVAL);
+       regs_buff[1120] = IXGBE_READ_REG(hw, IXGBE_MDFTC1);
+       regs_buff[1121] = IXGBE_READ_REG(hw, IXGBE_MDFTC2);
+       regs_buff[1122] = IXGBE_READ_REG(hw, IXGBE_MDFTFIFO1);
+       regs_buff[1123] = IXGBE_READ_REG(hw, IXGBE_MDFTFIFO2);
+       regs_buff[1124] = IXGBE_READ_REG(hw, IXGBE_MDFTS);
+       regs_buff[1125] = IXGBE_READ_REG(hw, IXGBE_PCIEECCCTL);
+       regs_buff[1126] = IXGBE_READ_REG(hw, IXGBE_PBTXECC);
+       regs_buff[1127] = IXGBE_READ_REG(hw, IXGBE_PBRXECC);
+}
+
+static int ixgbe_get_eeprom_len(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       return adapter->hw.eeprom.word_size * 2;
+}
+
+static int ixgbe_get_eeprom(struct net_device *netdev,
+                            struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u16 *eeprom_buff;
+       int first_word, last_word, eeprom_len;
+       int ret_val = 0;
+       u16 i;
+
+       if (eeprom->len == 0)
+               return -EINVAL;
+
+       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+       first_word = eeprom->offset >> 1;
+       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+       eeprom_len = last_word - first_word + 1;
+
+       eeprom_buff = kmalloc(sizeof(u16) * eeprom_len, GFP_KERNEL);
+       if (!eeprom_buff)
+               return -ENOMEM;
+
+       ret_val = hw->eeprom.ops.read_buffer(hw, first_word, eeprom_len,
+                                            eeprom_buff);
+
+       /* Device's eeprom is always little-endian, word addressable */
+       for (i = 0; i < eeprom_len; i++)
+               le16_to_cpus(&eeprom_buff[i]);
+
+       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
+       kfree(eeprom_buff);
+
+       return ret_val;
+}
+
+static void ixgbe_get_drvinfo(struct net_device *netdev,
+                              struct ethtool_drvinfo *drvinfo)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       char firmware_version[32];
+
+       strncpy(drvinfo->driver, ixgbe_driver_name,
+               sizeof(drvinfo->driver) - 1);
+       strncpy(drvinfo->version, ixgbe_driver_version,
+               sizeof(drvinfo->version) - 1);
+
+       snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
+                (adapter->eeprom_version & 0xF000) >> 12,
+                (adapter->eeprom_version & 0x0FF0) >> 4,
+                adapter->eeprom_version & 0x000F);
+
+       strncpy(drvinfo->fw_version, firmware_version,
+               sizeof(drvinfo->fw_version));
+       strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
+               sizeof(drvinfo->bus_info));
+       drvinfo->n_stats = IXGBE_STATS_LEN;
+       drvinfo->testinfo_len = IXGBE_TEST_LEN;
+       drvinfo->regdump_len = ixgbe_get_regs_len(netdev);
+}
+
+static void ixgbe_get_ringparam(struct net_device *netdev,
+                                struct ethtool_ringparam *ring)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_ring *tx_ring = adapter->tx_ring[0];
+       struct ixgbe_ring *rx_ring = adapter->rx_ring[0];
+
+       ring->rx_max_pending = IXGBE_MAX_RXD;
+       ring->tx_max_pending = IXGBE_MAX_TXD;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = rx_ring->count;
+       ring->tx_pending = tx_ring->count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int ixgbe_set_ringparam(struct net_device *netdev,
+                               struct ethtool_ringparam *ring)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_ring *temp_tx_ring, *temp_rx_ring;
+       int i, err = 0;
+       u32 new_rx_count, new_tx_count;
+       bool need_update = false;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       new_rx_count = max(ring->rx_pending, (u32)IXGBE_MIN_RXD);
+       new_rx_count = min(new_rx_count, (u32)IXGBE_MAX_RXD);
+       new_rx_count = ALIGN(new_rx_count, IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE);
+
+       new_tx_count = max(ring->tx_pending, (u32)IXGBE_MIN_TXD);
+       new_tx_count = min(new_tx_count, (u32)IXGBE_MAX_TXD);
+       new_tx_count = ALIGN(new_tx_count, IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE);
+
+       if ((new_tx_count == adapter->tx_ring[0]->count) &&
+           (new_rx_count == adapter->rx_ring[0]->count)) {
+               /* nothing to do */
+               return 0;
+       }
+
+       while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
+               usleep_range(1000, 2000);
+
+       if (!netif_running(adapter->netdev)) {
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       adapter->tx_ring[i]->count = new_tx_count;
+               for (i = 0; i < adapter->num_rx_queues; i++)
+                       adapter->rx_ring[i]->count = new_rx_count;
+               adapter->tx_ring_count = new_tx_count;
+               adapter->rx_ring_count = new_rx_count;
+               goto clear_reset;
+       }
+
+       temp_tx_ring = vmalloc(adapter->num_tx_queues * sizeof(struct ixgbe_ring));
+       if (!temp_tx_ring) {
+               err = -ENOMEM;
+               goto clear_reset;
+       }
+
+       if (new_tx_count != adapter->tx_ring_count) {
+               for (i = 0; i < adapter->num_tx_queues; i++) {
+                       memcpy(&temp_tx_ring[i], adapter->tx_ring[i],
+                              sizeof(struct ixgbe_ring));
+                       temp_tx_ring[i].count = new_tx_count;
+                       err = ixgbe_setup_tx_resources(&temp_tx_ring[i]);
+                       if (err) {
+                               while (i) {
+                                       i--;
+                                       ixgbe_free_tx_resources(&temp_tx_ring[i]);
+                               }
+                               goto clear_reset;
+                       }
+               }
+               need_update = true;
+       }
+
+       temp_rx_ring = vmalloc(adapter->num_rx_queues * sizeof(struct ixgbe_ring));
+       if (!temp_rx_ring) {
+               err = -ENOMEM;
+               goto err_setup;
+       }
+
+       if (new_rx_count != adapter->rx_ring_count) {
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       memcpy(&temp_rx_ring[i], adapter->rx_ring[i],
+                              sizeof(struct ixgbe_ring));
+                       temp_rx_ring[i].count = new_rx_count;
+                       err = ixgbe_setup_rx_resources(&temp_rx_ring[i]);
+                       if (err) {
+                               while (i) {
+                                       i--;
+                                       ixgbe_free_rx_resources(&temp_rx_ring[i]);
+                               }
+                               goto err_setup;
+                       }
+               }
+               need_update = true;
+       }
+
+       /* if rings need to be updated, here's the place to do it in one shot */
+       if (need_update) {
+               ixgbe_down(adapter);
+
+               /* tx */
+               if (new_tx_count != adapter->tx_ring_count) {
+                       for (i = 0; i < adapter->num_tx_queues; i++) {
+                               ixgbe_free_tx_resources(adapter->tx_ring[i]);
+                               memcpy(adapter->tx_ring[i], &temp_tx_ring[i],
+                                      sizeof(struct ixgbe_ring));
+                       }
+                       adapter->tx_ring_count = new_tx_count;
+               }
+
+               /* rx */
+               if (new_rx_count != adapter->rx_ring_count) {
+                       for (i = 0; i < adapter->num_rx_queues; i++) {
+                               ixgbe_free_rx_resources(adapter->rx_ring[i]);
+                               memcpy(adapter->rx_ring[i], &temp_rx_ring[i],
+                                      sizeof(struct ixgbe_ring));
+                       }
+                       adapter->rx_ring_count = new_rx_count;
+               }
+               ixgbe_up(adapter);
+       }
+
+       vfree(temp_rx_ring);
+err_setup:
+       vfree(temp_tx_ring);
+clear_reset:
+       clear_bit(__IXGBE_RESETTING, &adapter->state);
+       return err;
+}
+
+static int ixgbe_get_sset_count(struct net_device *netdev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_TEST:
+               return IXGBE_TEST_LEN;
+       case ETH_SS_STATS:
+               return IXGBE_STATS_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static void ixgbe_get_ethtool_stats(struct net_device *netdev,
+                                    struct ethtool_stats *stats, u64 *data)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct rtnl_link_stats64 temp;
+       const struct rtnl_link_stats64 *net_stats;
+       unsigned int start;
+       struct ixgbe_ring *ring;
+       int i, j;
+       char *p = NULL;
+
+       ixgbe_update_stats(adapter);
+       net_stats = dev_get_stats(netdev, &temp);
+       for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
+               switch (ixgbe_gstrings_stats[i].type) {
+               case NETDEV_STATS:
+                       p = (char *) net_stats +
+                                       ixgbe_gstrings_stats[i].stat_offset;
+                       break;
+               case IXGBE_STATS:
+                       p = (char *) adapter +
+                                       ixgbe_gstrings_stats[i].stat_offset;
+                       break;
+               }
+
+               data[i] = (ixgbe_gstrings_stats[i].sizeof_stat ==
+                          sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+       }
+       for (j = 0; j < adapter->num_tx_queues; j++) {
+               ring = adapter->tx_ring[j];
+               do {
+                       start = u64_stats_fetch_begin_bh(&ring->syncp);
+                       data[i]   = ring->stats.packets;
+                       data[i+1] = ring->stats.bytes;
+               } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+               i += 2;
+       }
+       for (j = 0; j < adapter->num_rx_queues; j++) {
+               ring = adapter->rx_ring[j];
+               do {
+                       start = u64_stats_fetch_begin_bh(&ring->syncp);
+                       data[i]   = ring->stats.packets;
+                       data[i+1] = ring->stats.bytes;
+               } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+               i += 2;
+       }
+       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+               for (j = 0; j < MAX_TX_PACKET_BUFFERS; j++) {
+                       data[i++] = adapter->stats.pxontxc[j];
+                       data[i++] = adapter->stats.pxofftxc[j];
+               }
+               for (j = 0; j < MAX_RX_PACKET_BUFFERS; j++) {
+                       data[i++] = adapter->stats.pxonrxc[j];
+                       data[i++] = adapter->stats.pxoffrxc[j];
+               }
+       }
+}
+
+static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,
+                              u8 *data)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       char *p = (char *)data;
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_TEST:
+               memcpy(data, *ixgbe_gstrings_test,
+                      IXGBE_TEST_LEN * ETH_GSTRING_LEN);
+               break;
+       case ETH_SS_STATS:
+               for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
+                       memcpy(p, ixgbe_gstrings_stats[i].stat_string,
+                              ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < adapter->num_tx_queues; i++) {
+                       sprintf(p, "tx_queue_%u_packets", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "tx_queue_%u_bytes", i);
+                       p += ETH_GSTRING_LEN;
+               }
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       sprintf(p, "rx_queue_%u_packets", i);
+                       p += ETH_GSTRING_LEN;
+                       sprintf(p, "rx_queue_%u_bytes", i);
+                       p += ETH_GSTRING_LEN;
+               }
+               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+                       for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) {
+                               sprintf(p, "tx_pb_%u_pxon", i);
+                               p += ETH_GSTRING_LEN;
+                               sprintf(p, "tx_pb_%u_pxoff", i);
+                               p += ETH_GSTRING_LEN;
+                       }
+                       for (i = 0; i < MAX_RX_PACKET_BUFFERS; i++) {
+                               sprintf(p, "rx_pb_%u_pxon", i);
+                               p += ETH_GSTRING_LEN;
+                               sprintf(p, "rx_pb_%u_pxoff", i);
+                               p += ETH_GSTRING_LEN;
+                       }
+               }
+               /* BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */
+               break;
+       }
+}
+
+static int ixgbe_link_test(struct ixgbe_adapter *adapter, u64 *data)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       bool link_up;
+       u32 link_speed = 0;
+       *data = 0;
+
+       hw->mac.ops.check_link(hw, &link_speed, &link_up, true);
+       if (link_up)
+               return *data;
+       else
+               *data = 1;
+       return *data;
+}
+
+/* ethtool register test data */
+struct ixgbe_reg_test {
+       u16 reg;
+       u8  array_len;
+       u8  test_type;
+       u32 mask;
+       u32 write;
+};
+
+/* In the hardware, registers are laid out either singly, in arrays
+ * spaced 0x40 bytes apart, or in contiguous tables.  We assume
+ * most tests take place on arrays or single registers (handled
+ * as a single-element array) and special-case the tables.
+ * Table tests are always pattern tests.
+ *
+ * We also make provision for some required setup steps by specifying
+ * registers to be written without any read-back testing.
+ */
+
+#define PATTERN_TEST   1
+#define SET_READ_TEST  2
+#define WRITE_NO_TEST  3
+#define TABLE32_TEST   4
+#define TABLE64_TEST_LO        5
+#define TABLE64_TEST_HI        6
+
+/* default 82599 register test */
+static const struct ixgbe_reg_test reg_test_82599[] = {
+       { IXGBE_FCRTL_82599(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
+       { IXGBE_FCRTH_82599(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
+       { IXGBE_PFCTOP, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_VLNCTRL, 1, PATTERN_TEST, 0x00000000, 0x00000000 },
+       { IXGBE_RDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFF80 },
+       { IXGBE_RDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_RDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, IXGBE_RXDCTL_ENABLE },
+       { IXGBE_RDT(0), 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, 0 },
+       { IXGBE_FCRTH(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
+       { IXGBE_FCTTV(0), 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_TDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { IXGBE_TDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_TDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFF80 },
+       { IXGBE_RXCTRL, 1, SET_READ_TEST, 0x00000001, 0x00000001 },
+       { IXGBE_RAL(0), 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_RAL(0), 16, TABLE64_TEST_HI, 0x8001FFFF, 0x800CFFFF },
+       { IXGBE_MTA(0), 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { 0, 0, 0, 0 }
+};
+
+/* default 82598 register test */
+static const struct ixgbe_reg_test reg_test_82598[] = {
+       { IXGBE_FCRTL(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
+       { IXGBE_FCRTH(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
+       { IXGBE_PFCTOP, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_VLNCTRL, 1, PATTERN_TEST, 0x00000000, 0x00000000 },
+       { IXGBE_RDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { IXGBE_RDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_RDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       /* Enable all four RX queues before testing. */
+       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, IXGBE_RXDCTL_ENABLE },
+       /* RDH is read-only for 82598, only test RDT. */
+       { IXGBE_RDT(0), 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, 0 },
+       { IXGBE_FCRTH(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
+       { IXGBE_FCTTV(0), 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_TIPG, 1, PATTERN_TEST, 0x000000FF, 0x000000FF },
+       { IXGBE_TDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { IXGBE_TDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_TDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       { IXGBE_RXCTRL, 1, SET_READ_TEST, 0x00000003, 0x00000003 },
+       { IXGBE_DTXCTL, 1, SET_READ_TEST, 0x00000005, 0x00000005 },
+       { IXGBE_RAL(0), 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_RAL(0), 16, TABLE64_TEST_HI, 0x800CFFFF, 0x800CFFFF },
+       { IXGBE_MTA(0), 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { 0, 0, 0, 0 }
+};
+
+static bool reg_pattern_test(struct ixgbe_adapter *adapter, u64 *data, int reg,
+                            u32 mask, u32 write)
+{
+       u32 pat, val, before;
+       static const u32 test_pattern[] = {
+               0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
+
+       for (pat = 0; pat < ARRAY_SIZE(test_pattern); pat++) {
+               before = readl(adapter->hw.hw_addr + reg);
+               writel((test_pattern[pat] & write),
+                      (adapter->hw.hw_addr + reg));
+               val = readl(adapter->hw.hw_addr + reg);
+               if (val != (test_pattern[pat] & write & mask)) {
+                       e_err(drv, "pattern test reg %04X failed: got "
+                             "0x%08X expected 0x%08X\n",
+                             reg, val, (test_pattern[pat] & write & mask));
+                       *data = reg;
+                       writel(before, adapter->hw.hw_addr + reg);
+                       return 1;
+               }
+               writel(before, adapter->hw.hw_addr + reg);
+       }
+       return 0;
+}
+
+static bool reg_set_and_check(struct ixgbe_adapter *adapter, u64 *data, int reg,
+                             u32 mask, u32 write)
+{
+       u32 val, before;
+       before = readl(adapter->hw.hw_addr + reg);
+       writel((write & mask), (adapter->hw.hw_addr + reg));
+       val = readl(adapter->hw.hw_addr + reg);
+       if ((write & mask) != (val & mask)) {
+               e_err(drv, "set/check reg %04X test failed: got 0x%08X "
+                     "expected 0x%08X\n", reg, (val & mask), (write & mask));
+               *data = reg;
+               writel(before, (adapter->hw.hw_addr + reg));
+               return 1;
+       }
+       writel(before, (adapter->hw.hw_addr + reg));
+       return 0;
+}
+
+#define REG_PATTERN_TEST(reg, mask, write)                                   \
+       do {                                                                  \
+               if (reg_pattern_test(adapter, data, reg, mask, write))        \
+                       return 1;                                             \
+       } while (0)                                                           \
+
+
+#define REG_SET_AND_CHECK(reg, mask, write)                                  \
+       do {                                                                  \
+               if (reg_set_and_check(adapter, data, reg, mask, write))       \
+                       return 1;                                             \
+       } while (0)                                                           \
+
+static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data)
+{
+       const struct ixgbe_reg_test *test;
+       u32 value, before, after;
+       u32 i, toggle;
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82598EB:
+               toggle = 0x7FFFF3FF;
+               test = reg_test_82598;
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               toggle = 0x7FFFF30F;
+               test = reg_test_82599;
+               break;
+       default:
+               *data = 1;
+               return 1;
+               break;
+       }
+
+       /*
+        * Because the status register is such a special case,
+        * we handle it separately from the rest of the register
+        * tests.  Some bits are read-only, some toggle, and some
+        * are writeable on newer MACs.
+        */
+       before = IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS);
+       value = (IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS) & toggle);
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_STATUS, toggle);
+       after = IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS) & toggle;
+       if (value != after) {
+               e_err(drv, "failed STATUS register test got: 0x%08X "
+                     "expected: 0x%08X\n", after, value);
+               *data = 1;
+               return 1;
+       }
+       /* restore previous status */
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_STATUS, before);
+
+       /*
+        * Perform the remainder of the register test, looping through
+        * the test table until we either fail or reach the null entry.
+        */
+       while (test->reg) {
+               for (i = 0; i < test->array_len; i++) {
+                       switch (test->test_type) {
+                       case PATTERN_TEST:
+                               REG_PATTERN_TEST(test->reg + (i * 0x40),
+                                                test->mask,
+                                                test->write);
+                               break;
+                       case SET_READ_TEST:
+                               REG_SET_AND_CHECK(test->reg + (i * 0x40),
+                                                 test->mask,
+                                                 test->write);
+                               break;
+                       case WRITE_NO_TEST:
+                               writel(test->write,
+                                      (adapter->hw.hw_addr + test->reg)
+                                      + (i * 0x40));
+                               break;
+                       case TABLE32_TEST:
+                               REG_PATTERN_TEST(test->reg + (i * 4),
+                                                test->mask,
+                                                test->write);
+                               break;
+                       case TABLE64_TEST_LO:
+                               REG_PATTERN_TEST(test->reg + (i * 8),
+                                                test->mask,
+                                                test->write);
+                               break;
+                       case TABLE64_TEST_HI:
+                               REG_PATTERN_TEST((test->reg + 4) + (i * 8),
+                                                test->mask,
+                                                test->write);
+                               break;
+                       }
+               }
+               test++;
+       }
+
+       *data = 0;
+       return 0;
+}
+
+static int ixgbe_eeprom_test(struct ixgbe_adapter *adapter, u64 *data)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       if (hw->eeprom.ops.validate_checksum(hw, NULL))
+               *data = 1;
+       else
+               *data = 0;
+       return *data;
+}
+
+static irqreturn_t ixgbe_test_intr(int irq, void *data)
+{
+       struct net_device *netdev = (struct net_device *) data;
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       adapter->test_icr |= IXGBE_READ_REG(&adapter->hw, IXGBE_EICR);
+
+       return IRQ_HANDLED;
+}
+
+static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data)
+{
+       struct net_device *netdev = adapter->netdev;
+       u32 mask, i = 0, shared_int = true;
+       u32 irq = adapter->pdev->irq;
+
+       *data = 0;
+
+       /* Hook up test interrupt handler just for this test */
+       if (adapter->msix_entries) {
+               /* NOTE: we don't test MSI-X interrupts here, yet */
+               return 0;
+       } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
+               shared_int = false;
+               if (request_irq(irq, ixgbe_test_intr, 0, netdev->name,
+                               netdev)) {
+                       *data = 1;
+                       return -1;
+               }
+       } else if (!request_irq(irq, ixgbe_test_intr, IRQF_PROBE_SHARED,
+                               netdev->name, netdev)) {
+               shared_int = false;
+       } else if (request_irq(irq, ixgbe_test_intr, IRQF_SHARED,
+                              netdev->name, netdev)) {
+               *data = 1;
+               return -1;
+       }
+       e_info(hw, "testing %s interrupt\n", shared_int ?
+              "shared" : "unshared");
+
+       /* Disable all the interrupts */
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);
+       IXGBE_WRITE_FLUSH(&adapter->hw);
+       usleep_range(10000, 20000);
+
+       /* Test each interrupt */
+       for (; i < 10; i++) {
+               /* Interrupt to test */
+               mask = 1 << i;
+
+               if (!shared_int) {
+                       /*
+                        * Disable the interrupts to be reported in
+                        * the cause register and then force the same
+                        * interrupt and see if one gets posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC,
+                                       ~mask & 0x00007FFF);
+                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS,
+                                       ~mask & 0x00007FFF);
+                       IXGBE_WRITE_FLUSH(&adapter->hw);
+                       usleep_range(10000, 20000);
+
+                       if (adapter->test_icr & mask) {
+                               *data = 3;
+                               break;
+                       }
+               }
+
+               /*
+                * Enable the interrupt to be reported in the cause
+                * register and then force the same interrupt and see
+                * if one gets posted.  If an interrupt was not posted
+                * to the bus, the test failed.
+                */
+               adapter->test_icr = 0;
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, mask);
+               IXGBE_WRITE_FLUSH(&adapter->hw);
+               usleep_range(10000, 20000);
+
+               if (!(adapter->test_icr &mask)) {
+                       *data = 4;
+                       break;
+               }
+
+               if (!shared_int) {
+                       /*
+                        * Disable the other interrupts to be reported in
+                        * the cause register and then force the other
+                        * interrupts and see if any get posted.  If
+                        * an interrupt was posted to the bus, the
+                        * test failed.
+                        */
+                       adapter->test_icr = 0;
+                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC,
+                                       ~mask & 0x00007FFF);
+                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS,
+                                       ~mask & 0x00007FFF);
+                       IXGBE_WRITE_FLUSH(&adapter->hw);
+                       usleep_range(10000, 20000);
+
+                       if (adapter->test_icr) {
+                               *data = 5;
+                               break;
+                       }
+               }
+       }
+
+       /* Disable all the interrupts */
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);
+       IXGBE_WRITE_FLUSH(&adapter->hw);
+       usleep_range(10000, 20000);
+
+       /* Unhook test interrupt handler */
+       free_irq(irq, netdev);
+
+       return *data;
+}
+
+static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_ring *tx_ring = &adapter->test_tx_ring;
+       struct ixgbe_ring *rx_ring = &adapter->test_rx_ring;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 reg_ctl;
+
+       /* shut down the DMA engines now so they can be reinitialized later */
+
+       /* first Rx */
+       reg_ctl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
+       reg_ctl &= ~IXGBE_RXCTRL_RXEN;
+       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg_ctl);
+       ixgbe_disable_rx_queue(adapter, rx_ring);
+
+       /* now Tx */
+       reg_ctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(tx_ring->reg_idx));
+       reg_ctl &= ~IXGBE_TXDCTL_ENABLE;
+       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(tx_ring->reg_idx), reg_ctl);
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               reg_ctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);
+               reg_ctl &= ~IXGBE_DMATXCTL_TE;
+               IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, reg_ctl);
+               break;
+       default:
+               break;
+       }
+
+       ixgbe_reset(adapter);
+
+       ixgbe_free_tx_resources(&adapter->test_tx_ring);
+       ixgbe_free_rx_resources(&adapter->test_rx_ring);
+}
+
+static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_ring *tx_ring = &adapter->test_tx_ring;
+       struct ixgbe_ring *rx_ring = &adapter->test_rx_ring;
+       u32 rctl, reg_data;
+       int ret_val;
+       int err;
+
+       /* Setup Tx descriptor ring and Tx buffers */
+       tx_ring->count = IXGBE_DEFAULT_TXD;
+       tx_ring->queue_index = 0;
+       tx_ring->dev = &adapter->pdev->dev;
+       tx_ring->netdev = adapter->netdev;
+       tx_ring->reg_idx = adapter->tx_ring[0]->reg_idx;
+       tx_ring->numa_node = adapter->node;
+
+       err = ixgbe_setup_tx_resources(tx_ring);
+       if (err)
+               return 1;
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_DMATXCTL);
+               reg_data |= IXGBE_DMATXCTL_TE;
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_DMATXCTL, reg_data);
+               break;
+       default:
+               break;
+       }
+
+       ixgbe_configure_tx_ring(adapter, tx_ring);
+
+       /* Setup Rx Descriptor ring and Rx buffers */
+       rx_ring->count = IXGBE_DEFAULT_RXD;
+       rx_ring->queue_index = 0;
+       rx_ring->dev = &adapter->pdev->dev;
+       rx_ring->netdev = adapter->netdev;
+       rx_ring->reg_idx = adapter->rx_ring[0]->reg_idx;
+       rx_ring->rx_buf_len = IXGBE_RXBUFFER_2048;
+       rx_ring->numa_node = adapter->node;
+
+       err = ixgbe_setup_rx_resources(rx_ring);
+       if (err) {
+               ret_val = 4;
+               goto err_nomem;
+       }
+
+       rctl = IXGBE_READ_REG(&adapter->hw, IXGBE_RXCTRL);
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXCTRL, rctl & ~IXGBE_RXCTRL_RXEN);
+
+       ixgbe_configure_rx_ring(adapter, rx_ring);
+
+       rctl |= IXGBE_RXCTRL_RXEN | IXGBE_RXCTRL_DMBYPS;
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXCTRL, rctl);
+
+       return 0;
+
+err_nomem:
+       ixgbe_free_desc_rings(adapter);
+       return ret_val;
+}
+
+static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 reg_data;
+
+       /* X540 needs to set the MACC.FLU bit to force link up */
+       if (adapter->hw.mac.type == ixgbe_mac_X540) {
+               reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_MACC);
+               reg_data |= IXGBE_MACC_FLU;
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_MACC, reg_data);
+       }
+
+       /* right now we only support MAC loopback in the driver */
+       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0);
+       /* Setup MAC loopback */
+       reg_data |= IXGBE_HLREG0_LPBK;
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_HLREG0, reg_data);
+
+       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_FCTRL);
+       reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE;
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCTRL, reg_data);
+
+       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_AUTOC);
+       reg_data &= ~IXGBE_AUTOC_LMS_MASK;
+       reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU;
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_AUTOC, reg_data);
+       IXGBE_WRITE_FLUSH(&adapter->hw);
+       usleep_range(10000, 20000);
+
+       /* Disable Atlas Tx lanes; re-enabled in reset path */
+       if (hw->mac.type == ixgbe_mac_82598EB) {
+               u8 atlas;
+
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, &atlas);
+               atlas |= IXGBE_ATLAS_PDN_TX_REG_EN;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, atlas);
+
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_10G, &atlas);
+               atlas |= IXGBE_ATLAS_PDN_TX_10G_QL_ALL;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_10G, atlas);
+
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_1G, &atlas);
+               atlas |= IXGBE_ATLAS_PDN_TX_1G_QL_ALL;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_1G, atlas);
+
+               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_AN, &atlas);
+               atlas |= IXGBE_ATLAS_PDN_TX_AN_QL_ALL;
+               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_AN, atlas);
+       }
+
+       return 0;
+}
+
+static void ixgbe_loopback_cleanup(struct ixgbe_adapter *adapter)
+{
+       u32 reg_data;
+
+       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0);
+       reg_data &= ~IXGBE_HLREG0_LPBK;
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_HLREG0, reg_data);
+}
+
+static void ixgbe_create_lbtest_frame(struct sk_buff *skb,
+                                      unsigned int frame_size)
+{
+       memset(skb->data, 0xFF, frame_size);
+       frame_size &= ~1;
+       memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
+       memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
+       memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
+}
+
+static int ixgbe_check_lbtest_frame(struct sk_buff *skb,
+                                    unsigned int frame_size)
+{
+       frame_size &= ~1;
+       if (*(skb->data + 3) == 0xFF) {
+               if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
+                   (*(skb->data + frame_size / 2 + 12) == 0xAF)) {
+                       return 0;
+               }
+       }
+       return 13;
+}
+
+static u16 ixgbe_clean_test_rings(struct ixgbe_ring *rx_ring,
+                                  struct ixgbe_ring *tx_ring,
+                                  unsigned int size)
+{
+       union ixgbe_adv_rx_desc *rx_desc;
+       struct ixgbe_rx_buffer *rx_buffer_info;
+       struct ixgbe_tx_buffer *tx_buffer_info;
+       const int bufsz = rx_ring->rx_buf_len;
+       u32 staterr;
+       u16 rx_ntc, tx_ntc, count = 0;
+
+       /* initialize next to clean and descriptor values */
+       rx_ntc = rx_ring->next_to_clean;
+       tx_ntc = tx_ring->next_to_clean;
+       rx_desc = IXGBE_RX_DESC_ADV(rx_ring, rx_ntc);
+       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+
+       while (staterr & IXGBE_RXD_STAT_DD) {
+               /* check Rx buffer */
+               rx_buffer_info = &rx_ring->rx_buffer_info[rx_ntc];
+
+               /* unmap Rx buffer, will be remapped by alloc_rx_buffers */
+               dma_unmap_single(rx_ring->dev,
+                                rx_buffer_info->dma,
+                                bufsz,
+                                DMA_FROM_DEVICE);
+               rx_buffer_info->dma = 0;
+
+               /* verify contents of skb */
+               if (!ixgbe_check_lbtest_frame(rx_buffer_info->skb, size))
+                       count++;
+
+               /* unmap buffer on Tx side */
+               tx_buffer_info = &tx_ring->tx_buffer_info[tx_ntc];
+               ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
+
+               /* increment Rx/Tx next to clean counters */
+               rx_ntc++;
+               if (rx_ntc == rx_ring->count)
+                       rx_ntc = 0;
+               tx_ntc++;
+               if (tx_ntc == tx_ring->count)
+                       tx_ntc = 0;
+
+               /* fetch next descriptor */
+               rx_desc = IXGBE_RX_DESC_ADV(rx_ring, rx_ntc);
+               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+       }
+
+       /* re-map buffers to ring, store next to clean values */
+       ixgbe_alloc_rx_buffers(rx_ring, count);
+       rx_ring->next_to_clean = rx_ntc;
+       tx_ring->next_to_clean = tx_ntc;
+
+       return count;
+}
+
+static int ixgbe_run_loopback_test(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_ring *tx_ring = &adapter->test_tx_ring;
+       struct ixgbe_ring *rx_ring = &adapter->test_rx_ring;
+       int i, j, lc, good_cnt, ret_val = 0;
+       unsigned int size = 1024;
+       netdev_tx_t tx_ret_val;
+       struct sk_buff *skb;
+
+       /* allocate test skb */
+       skb = alloc_skb(size, GFP_KERNEL);
+       if (!skb)
+               return 11;
+
+       /* place data into test skb */
+       ixgbe_create_lbtest_frame(skb, size);
+       skb_put(skb, size);
+
+       /*
+        * Calculate the loop count based on the largest descriptor ring
+        * The idea is to wrap the largest ring a number of times using 64
+        * send/receive pairs during each loop
+        */
+
+       if (rx_ring->count <= tx_ring->count)
+               lc = ((tx_ring->count / 64) * 2) + 1;
+       else
+               lc = ((rx_ring->count / 64) * 2) + 1;
+
+       for (j = 0; j <= lc; j++) {
+               /* reset count of good packets */
+               good_cnt = 0;
+
+               /* place 64 packets on the transmit queue*/
+               for (i = 0; i < 64; i++) {
+                       skb_get(skb);
+                       tx_ret_val = ixgbe_xmit_frame_ring(skb,
+                                                          adapter,
+                                                          tx_ring);
+                       if (tx_ret_val == NETDEV_TX_OK)
+                               good_cnt++;
+               }
+
+               if (good_cnt != 64) {
+                       ret_val = 12;
+                       break;
+               }
+
+               /* allow 200 milliseconds for packets to go from Tx to Rx */
+               msleep(200);
+
+               good_cnt = ixgbe_clean_test_rings(rx_ring, tx_ring, size);
+               if (good_cnt != 64) {
+                       ret_val = 13;
+                       break;
+               }
+       }
+
+       /* free the original skb */
+       kfree_skb(skb);
+
+       return ret_val;
+}
+
+static int ixgbe_loopback_test(struct ixgbe_adapter *adapter, u64 *data)
+{
+       *data = ixgbe_setup_desc_rings(adapter);
+       if (*data)
+               goto out;
+       *data = ixgbe_setup_loopback_test(adapter);
+       if (*data)
+               goto err_loopback;
+       *data = ixgbe_run_loopback_test(adapter);
+       ixgbe_loopback_cleanup(adapter);
+
+err_loopback:
+       ixgbe_free_desc_rings(adapter);
+out:
+       return *data;
+}
+
+static void ixgbe_diag_test(struct net_device *netdev,
+                            struct ethtool_test *eth_test, u64 *data)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       bool if_running = netif_running(netdev);
+
+       set_bit(__IXGBE_TESTING, &adapter->state);
+       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
+               /* Offline tests */
+
+               e_info(hw, "offline testing starting\n");
+
+               /* Link test performed before hardware reset so autoneg doesn't
+                * interfere with test result */
+               if (ixgbe_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+                       int i;
+                       for (i = 0; i < adapter->num_vfs; i++) {
+                               if (adapter->vfinfo[i].clear_to_send) {
+                                       netdev_warn(netdev, "%s",
+                                                   "offline diagnostic is not "
+                                                   "supported when VFs are "
+                                                   "present\n");
+                                       data[0] = 1;
+                                       data[1] = 1;
+                                       data[2] = 1;
+                                       data[3] = 1;
+                                       eth_test->flags |= ETH_TEST_FL_FAILED;
+                                       clear_bit(__IXGBE_TESTING,
+                                                 &adapter->state);
+                                       goto skip_ol_tests;
+                               }
+                       }
+               }
+
+               if (if_running)
+                       /* indicate we're in test mode */
+                       dev_close(netdev);
+               else
+                       ixgbe_reset(adapter);
+
+               e_info(hw, "register testing starting\n");
+               if (ixgbe_reg_test(adapter, &data[0]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               ixgbe_reset(adapter);
+               e_info(hw, "eeprom testing starting\n");
+               if (ixgbe_eeprom_test(adapter, &data[1]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               ixgbe_reset(adapter);
+               e_info(hw, "interrupt testing starting\n");
+               if (ixgbe_intr_test(adapter, &data[2]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* If SRIOV or VMDq is enabled then skip MAC
+                * loopback diagnostic. */
+               if (adapter->flags & (IXGBE_FLAG_SRIOV_ENABLED |
+                                     IXGBE_FLAG_VMDQ_ENABLED)) {
+                       e_info(hw, "Skip MAC loopback diagnostic in VT "
+                              "mode\n");
+                       data[3] = 0;
+                       goto skip_loopback;
+               }
+
+               ixgbe_reset(adapter);
+               e_info(hw, "loopback testing starting\n");
+               if (ixgbe_loopback_test(adapter, &data[3]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+skip_loopback:
+               ixgbe_reset(adapter);
+
+               clear_bit(__IXGBE_TESTING, &adapter->state);
+               if (if_running)
+                       dev_open(netdev);
+       } else {
+               e_info(hw, "online testing starting\n");
+               /* Online tests */
+               if (ixgbe_link_test(adapter, &data[4]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* Online tests aren't run; pass by default */
+               data[0] = 0;
+               data[1] = 0;
+               data[2] = 0;
+               data[3] = 0;
+
+               clear_bit(__IXGBE_TESTING, &adapter->state);
+       }
+skip_ol_tests:
+       msleep_interruptible(4 * 1000);
+}
+
+static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter,
+                               struct ethtool_wolinfo *wol)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int retval = 1;
+
+       /* WOL not supported except for the following */
+       switch(hw->device_id) {
+       case IXGBE_DEV_ID_82599_SFP:
+               /* Only this subdevice supports WOL */
+               if (hw->subsystem_device_id != IXGBE_SUBDEV_ID_82599_SFP) {
+                       wol->supported = 0;
+                       break;
+               }
+               retval = 0;
+               break;
+       case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
+               /* All except this subdevice support WOL */
+               if (hw->subsystem_device_id ==
+                   IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ) {
+                       wol->supported = 0;
+                       break;
+               }
+               retval = 0;
+               break;
+       case IXGBE_DEV_ID_82599_KX4:
+               retval = 0;
+               break;
+       default:
+               wol->supported = 0;
+       }
+
+       return retval;
+}
+
+static void ixgbe_get_wol(struct net_device *netdev,
+                          struct ethtool_wolinfo *wol)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       wol->supported = WAKE_UCAST | WAKE_MCAST |
+                        WAKE_BCAST | WAKE_MAGIC;
+       wol->wolopts = 0;
+
+       if (ixgbe_wol_exclusion(adapter, wol) ||
+           !device_can_wakeup(&adapter->pdev->dev))
+               return;
+
+       if (adapter->wol & IXGBE_WUFC_EX)
+               wol->wolopts |= WAKE_UCAST;
+       if (adapter->wol & IXGBE_WUFC_MC)
+               wol->wolopts |= WAKE_MCAST;
+       if (adapter->wol & IXGBE_WUFC_BC)
+               wol->wolopts |= WAKE_BCAST;
+       if (adapter->wol & IXGBE_WUFC_MAG)
+               wol->wolopts |= WAKE_MAGIC;
+}
+
+static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
+               return -EOPNOTSUPP;
+
+       if (ixgbe_wol_exclusion(adapter, wol))
+               return wol->wolopts ? -EOPNOTSUPP : 0;
+
+       adapter->wol = 0;
+
+       if (wol->wolopts & WAKE_UCAST)
+               adapter->wol |= IXGBE_WUFC_EX;
+       if (wol->wolopts & WAKE_MCAST)
+               adapter->wol |= IXGBE_WUFC_MC;
+       if (wol->wolopts & WAKE_BCAST)
+               adapter->wol |= IXGBE_WUFC_BC;
+       if (wol->wolopts & WAKE_MAGIC)
+               adapter->wol |= IXGBE_WUFC_MAG;
+
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       return 0;
+}
+
+static int ixgbe_nway_reset(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       if (netif_running(netdev))
+               ixgbe_reinit_locked(adapter);
+
+       return 0;
+}
+
+static int ixgbe_set_phys_id(struct net_device *netdev,
+                            enum ethtool_phys_id_state state)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       switch (state) {
+       case ETHTOOL_ID_ACTIVE:
+               adapter->led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+               return 2;
+
+       case ETHTOOL_ID_ON:
+               hw->mac.ops.led_on(hw, IXGBE_LED_ON);
+               break;
+
+       case ETHTOOL_ID_OFF:
+               hw->mac.ops.led_off(hw, IXGBE_LED_ON);
+               break;
+
+       case ETHTOOL_ID_INACTIVE:
+               /* Restore LED settings */
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_LEDCTL, adapter->led_reg);
+               break;
+       }
+
+       return 0;
+}
+
+static int ixgbe_get_coalesce(struct net_device *netdev,
+                              struct ethtool_coalesce *ec)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       ec->tx_max_coalesced_frames_irq = adapter->tx_work_limit;
+
+       /* only valid if in constant ITR mode */
+       switch (adapter->rx_itr_setting) {
+       case 0:
+               /* throttling disabled */
+               ec->rx_coalesce_usecs = 0;
+               break;
+       case 1:
+               /* dynamic ITR mode */
+               ec->rx_coalesce_usecs = 1;
+               break;
+       default:
+               /* fixed interrupt rate mode */
+               ec->rx_coalesce_usecs = 1000000/adapter->rx_eitr_param;
+               break;
+       }
+
+       /* if in mixed tx/rx queues per vector mode, report only rx settings */
+       if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count)
+               return 0;
+
+       /* only valid if in constant ITR mode */
+       switch (adapter->tx_itr_setting) {
+       case 0:
+               /* throttling disabled */
+               ec->tx_coalesce_usecs = 0;
+               break;
+       case 1:
+               /* dynamic ITR mode */
+               ec->tx_coalesce_usecs = 1;
+               break;
+       default:
+               ec->tx_coalesce_usecs = 1000000/adapter->tx_eitr_param;
+               break;
+       }
+
+       return 0;
+}
+
+/*
+ * this function must be called before setting the new value of
+ * rx_itr_setting
+ */
+static bool ixgbe_update_rsc(struct ixgbe_adapter *adapter,
+                            struct ethtool_coalesce *ec)
+{
+       struct net_device *netdev = adapter->netdev;
+
+       if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))
+               return false;
+
+       /* if interrupt rate is too high then disable RSC */
+       if (ec->rx_coalesce_usecs != 1 &&
+           ec->rx_coalesce_usecs <= 1000000/IXGBE_MAX_RSC_INT_RATE) {
+               if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
+                       e_info(probe, "rx-usecs set too low, "
+                                     "disabling RSC\n");
+                       adapter->flags2 &= ~IXGBE_FLAG2_RSC_ENABLED;
+                       return true;
+               }
+       } else {
+               /* check the feature flag value and enable RSC if necessary */
+               if ((netdev->features & NETIF_F_LRO) &&
+                   !(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)) {
+                       e_info(probe, "rx-usecs set to %d, "
+                                     "re-enabling RSC\n",
+                              ec->rx_coalesce_usecs);
+                       adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;
+                       return true;
+               }
+       }
+       return false;
+}
+
+static int ixgbe_set_coalesce(struct net_device *netdev,
+                              struct ethtool_coalesce *ec)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_q_vector *q_vector;
+       int i;
+       bool need_reset = false;
+
+       /* don't accept tx specific changes if we've got mixed RxTx vectors */
+       if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count
+          && ec->tx_coalesce_usecs)
+               return -EINVAL;
+
+       if (ec->tx_max_coalesced_frames_irq)
+               adapter->tx_work_limit = ec->tx_max_coalesced_frames_irq;
+
+       if (ec->rx_coalesce_usecs > 1) {
+               /* check the limits */
+               if ((1000000/ec->rx_coalesce_usecs > IXGBE_MAX_INT_RATE) ||
+                   (1000000/ec->rx_coalesce_usecs < IXGBE_MIN_INT_RATE))
+                       return -EINVAL;
+
+               /* check the old value and enable RSC if necessary */
+               need_reset = ixgbe_update_rsc(adapter, ec);
+
+               /* store the value in ints/second */
+               adapter->rx_eitr_param = 1000000/ec->rx_coalesce_usecs;
+
+               /* static value of interrupt rate */
+               adapter->rx_itr_setting = adapter->rx_eitr_param;
+               /* clear the lower bit as its used for dynamic state */
+               adapter->rx_itr_setting &= ~1;
+       } else if (ec->rx_coalesce_usecs == 1) {
+               /* check the old value and enable RSC if necessary */
+               need_reset = ixgbe_update_rsc(adapter, ec);
+
+               /* 1 means dynamic mode */
+               adapter->rx_eitr_param = 20000;
+               adapter->rx_itr_setting = 1;
+       } else {
+               /* check the old value and enable RSC if necessary */
+               need_reset = ixgbe_update_rsc(adapter, ec);
+               /*
+                * any other value means disable eitr, which is best
+                * served by setting the interrupt rate very high
+                */
+               adapter->rx_eitr_param = IXGBE_MAX_INT_RATE;
+               adapter->rx_itr_setting = 0;
+       }
+
+       if (ec->tx_coalesce_usecs > 1) {
+               /*
+                * don't have to worry about max_int as above because
+                * tx vectors don't do hardware RSC (an rx function)
+                */
+               /* check the limits */
+               if ((1000000/ec->tx_coalesce_usecs > IXGBE_MAX_INT_RATE) ||
+                   (1000000/ec->tx_coalesce_usecs < IXGBE_MIN_INT_RATE))
+                       return -EINVAL;
+
+               /* store the value in ints/second */
+               adapter->tx_eitr_param = 1000000/ec->tx_coalesce_usecs;
+
+               /* static value of interrupt rate */
+               adapter->tx_itr_setting = adapter->tx_eitr_param;
+
+               /* clear the lower bit as its used for dynamic state */
+               adapter->tx_itr_setting &= ~1;
+       } else if (ec->tx_coalesce_usecs == 1) {
+               /* 1 means dynamic mode */
+               adapter->tx_eitr_param = 10000;
+               adapter->tx_itr_setting = 1;
+       } else {
+               adapter->tx_eitr_param = IXGBE_MAX_INT_RATE;
+               adapter->tx_itr_setting = 0;
+       }
+
+       /* MSI/MSIx Interrupt Mode */
+       if (adapter->flags &
+           (IXGBE_FLAG_MSIX_ENABLED | IXGBE_FLAG_MSI_ENABLED)) {
+               int num_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+               for (i = 0; i < num_vectors; i++) {
+                       q_vector = adapter->q_vector[i];
+                       if (q_vector->tx.count && !q_vector->rx.count)
+                               /* tx only */
+                               q_vector->eitr = adapter->tx_eitr_param;
+                       else
+                               /* rx only or mixed */
+                               q_vector->eitr = adapter->rx_eitr_param;
+                       q_vector->tx.work_limit = adapter->tx_work_limit;
+                       ixgbe_write_eitr(q_vector);
+               }
+       /* Legacy Interrupt Mode */
+       } else {
+               q_vector = adapter->q_vector[0];
+               q_vector->eitr = adapter->rx_eitr_param;
+               q_vector->tx.work_limit = adapter->tx_work_limit;
+               ixgbe_write_eitr(q_vector);
+       }
+
+       /*
+        * do reset here at the end to make sure EITR==0 case is handled
+        * correctly w.r.t stopping tx, and changing TXDCTL.WTHRESH settings
+        * also locks in RSC enable/disable which requires reset
+        */
+       if (need_reset)
+               ixgbe_do_reset(netdev);
+
+       return 0;
+}
+
+static int ixgbe_get_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
+                                       struct ethtool_rxnfc *cmd)
+{
+       union ixgbe_atr_input *mask = &adapter->fdir_mask;
+       struct ethtool_rx_flow_spec *fsp =
+               (struct ethtool_rx_flow_spec *)&cmd->fs;
+       struct hlist_node *node, *node2;
+       struct ixgbe_fdir_filter *rule = NULL;
+
+       /* report total rule count */
+       cmd->data = (1024 << adapter->fdir_pballoc) - 2;
+
+       hlist_for_each_entry_safe(rule, node, node2,
+                                 &adapter->fdir_filter_list, fdir_node) {
+               if (fsp->location <= rule->sw_idx)
+                       break;
+       }
+
+       if (!rule || fsp->location != rule->sw_idx)
+               return -EINVAL;
+
+       /* fill out the flow spec entry */
+
+       /* set flow type field */
+       switch (rule->filter.formatted.flow_type) {
+       case IXGBE_ATR_FLOW_TYPE_TCPV4:
+               fsp->flow_type = TCP_V4_FLOW;
+               break;
+       case IXGBE_ATR_FLOW_TYPE_UDPV4:
+               fsp->flow_type = UDP_V4_FLOW;
+               break;
+       case IXGBE_ATR_FLOW_TYPE_SCTPV4:
+               fsp->flow_type = SCTP_V4_FLOW;
+               break;
+       case IXGBE_ATR_FLOW_TYPE_IPV4:
+               fsp->flow_type = IP_USER_FLOW;
+               fsp->h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4;
+               fsp->h_u.usr_ip4_spec.proto = 0;
+               fsp->m_u.usr_ip4_spec.proto = 0;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       fsp->h_u.tcp_ip4_spec.psrc = rule->filter.formatted.src_port;
+       fsp->m_u.tcp_ip4_spec.psrc = mask->formatted.src_port;
+       fsp->h_u.tcp_ip4_spec.pdst = rule->filter.formatted.dst_port;
+       fsp->m_u.tcp_ip4_spec.pdst = mask->formatted.dst_port;
+       fsp->h_u.tcp_ip4_spec.ip4src = rule->filter.formatted.src_ip[0];
+       fsp->m_u.tcp_ip4_spec.ip4src = mask->formatted.src_ip[0];
+       fsp->h_u.tcp_ip4_spec.ip4dst = rule->filter.formatted.dst_ip[0];
+       fsp->m_u.tcp_ip4_spec.ip4dst = mask->formatted.dst_ip[0];
+       fsp->h_ext.vlan_tci = rule->filter.formatted.vlan_id;
+       fsp->m_ext.vlan_tci = mask->formatted.vlan_id;
+       fsp->h_ext.vlan_etype = rule->filter.formatted.flex_bytes;
+       fsp->m_ext.vlan_etype = mask->formatted.flex_bytes;
+       fsp->h_ext.data[1] = htonl(rule->filter.formatted.vm_pool);
+       fsp->m_ext.data[1] = htonl(mask->formatted.vm_pool);
+       fsp->flow_type |= FLOW_EXT;
+
+       /* record action */
+       if (rule->action == IXGBE_FDIR_DROP_QUEUE)
+               fsp->ring_cookie = RX_CLS_FLOW_DISC;
+       else
+               fsp->ring_cookie = rule->action;
+
+       return 0;
+}
+
+static int ixgbe_get_ethtool_fdir_all(struct ixgbe_adapter *adapter,
+                                     struct ethtool_rxnfc *cmd,
+                                     u32 *rule_locs)
+{
+       struct hlist_node *node, *node2;
+       struct ixgbe_fdir_filter *rule;
+       int cnt = 0;
+
+       /* report total rule count */
+       cmd->data = (1024 << adapter->fdir_pballoc) - 2;
+
+       hlist_for_each_entry_safe(rule, node, node2,
+                                 &adapter->fdir_filter_list, fdir_node) {
+               if (cnt == cmd->rule_cnt)
+                       return -EMSGSIZE;
+               rule_locs[cnt] = rule->sw_idx;
+               cnt++;
+       }
+
+       return 0;
+}
+
+static int ixgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
+                          void *rule_locs)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       int ret = -EOPNOTSUPP;
+
+       switch (cmd->cmd) {
+       case ETHTOOL_GRXRINGS:
+               cmd->data = adapter->num_rx_queues;
+               ret = 0;
+               break;
+       case ETHTOOL_GRXCLSRLCNT:
+               cmd->rule_cnt = adapter->fdir_filter_count;
+               ret = 0;
+               break;
+       case ETHTOOL_GRXCLSRULE:
+               ret = ixgbe_get_ethtool_fdir_entry(adapter, cmd);
+               break;
+       case ETHTOOL_GRXCLSRLALL:
+               ret = ixgbe_get_ethtool_fdir_all(adapter, cmd,
+                                                (u32 *)rule_locs);
+               break;
+       default:
+               break;
+       }
+
+       return ret;
+}
+
+static int ixgbe_update_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
+                                          struct ixgbe_fdir_filter *input,
+                                          u16 sw_idx)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct hlist_node *node, *node2, *parent;
+       struct ixgbe_fdir_filter *rule;
+       int err = -EINVAL;
+
+       parent = NULL;
+       rule = NULL;
+
+       hlist_for_each_entry_safe(rule, node, node2,
+                                 &adapter->fdir_filter_list, fdir_node) {
+               /* hash found, or no matching entry */
+               if (rule->sw_idx >= sw_idx)
+                       break;
+               parent = node;
+       }
+
+       /* if there is an old rule occupying our place remove it */
+       if (rule && (rule->sw_idx == sw_idx)) {
+               if (!input || (rule->filter.formatted.bkt_hash !=
+                              input->filter.formatted.bkt_hash)) {
+                       err = ixgbe_fdir_erase_perfect_filter_82599(hw,
+                                                               &rule->filter,
+                                                               sw_idx);
+               }
+
+               hlist_del(&rule->fdir_node);
+               kfree(rule);
+               adapter->fdir_filter_count--;
+       }
+
+       /*
+        * If no input this was a delete, err should be 0 if a rule was
+        * successfully found and removed from the list else -EINVAL
+        */
+       if (!input)
+               return err;
+
+       /* initialize node and set software index */
+       INIT_HLIST_NODE(&input->fdir_node);
+
+       /* add filter to the list */
+       if (parent)
+               hlist_add_after(parent, &input->fdir_node);
+       else
+               hlist_add_head(&input->fdir_node,
+                              &adapter->fdir_filter_list);
+
+       /* update counts */
+       adapter->fdir_filter_count++;
+
+       return 0;
+}
+
+static int ixgbe_flowspec_to_flow_type(struct ethtool_rx_flow_spec *fsp,
+                                      u8 *flow_type)
+{
+       switch (fsp->flow_type & ~FLOW_EXT) {
+       case TCP_V4_FLOW:
+               *flow_type = IXGBE_ATR_FLOW_TYPE_TCPV4;
+               break;
+       case UDP_V4_FLOW:
+               *flow_type = IXGBE_ATR_FLOW_TYPE_UDPV4;
+               break;
+       case SCTP_V4_FLOW:
+               *flow_type = IXGBE_ATR_FLOW_TYPE_SCTPV4;
+               break;
+       case IP_USER_FLOW:
+               switch (fsp->h_u.usr_ip4_spec.proto) {
+               case IPPROTO_TCP:
+                       *flow_type = IXGBE_ATR_FLOW_TYPE_TCPV4;
+                       break;
+               case IPPROTO_UDP:
+                       *flow_type = IXGBE_ATR_FLOW_TYPE_UDPV4;
+                       break;
+               case IPPROTO_SCTP:
+                       *flow_type = IXGBE_ATR_FLOW_TYPE_SCTPV4;
+                       break;
+               case 0:
+                       if (!fsp->m_u.usr_ip4_spec.proto) {
+                               *flow_type = IXGBE_ATR_FLOW_TYPE_IPV4;
+                               break;
+                       }
+               default:
+                       return 0;
+               }
+               break;
+       default:
+               return 0;
+       }
+
+       return 1;
+}
+
+static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
+                                       struct ethtool_rxnfc *cmd)
+{
+       struct ethtool_rx_flow_spec *fsp =
+               (struct ethtool_rx_flow_spec *)&cmd->fs;
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbe_fdir_filter *input;
+       union ixgbe_atr_input mask;
+       int err;
+
+       if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
+               return -EOPNOTSUPP;
+
+       /*
+        * Don't allow programming if the action is a queue greater than
+        * the number of online Rx queues.
+        */
+       if ((fsp->ring_cookie != RX_CLS_FLOW_DISC) &&
+           (fsp->ring_cookie >= adapter->num_rx_queues))
+               return -EINVAL;
+
+       /* Don't allow indexes to exist outside of available space */
+       if (fsp->location >= ((1024 << adapter->fdir_pballoc) - 2)) {
+               e_err(drv, "Location out of range\n");
+               return -EINVAL;
+       }
+
+       input = kzalloc(sizeof(*input), GFP_ATOMIC);
+       if (!input)
+               return -ENOMEM;
+
+       memset(&mask, 0, sizeof(union ixgbe_atr_input));
+
+       /* set SW index */
+       input->sw_idx = fsp->location;
+
+       /* record flow type */
+       if (!ixgbe_flowspec_to_flow_type(fsp,
+                                        &input->filter.formatted.flow_type)) {
+               e_err(drv, "Unrecognized flow type\n");
+               goto err_out;
+       }
+
+       mask.formatted.flow_type = IXGBE_ATR_L4TYPE_IPV6_MASK |
+                                  IXGBE_ATR_L4TYPE_MASK;
+
+       if (input->filter.formatted.flow_type == IXGBE_ATR_FLOW_TYPE_IPV4)
+               mask.formatted.flow_type &= IXGBE_ATR_L4TYPE_IPV6_MASK;
+
+       /* Copy input into formatted structures */
+       input->filter.formatted.src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4src;
+       mask.formatted.src_ip[0] = fsp->m_u.tcp_ip4_spec.ip4src;
+       input->filter.formatted.dst_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;
+       mask.formatted.dst_ip[0] = fsp->m_u.tcp_ip4_spec.ip4dst;
+       input->filter.formatted.src_port = fsp->h_u.tcp_ip4_spec.psrc;
+       mask.formatted.src_port = fsp->m_u.tcp_ip4_spec.psrc;
+       input->filter.formatted.dst_port = fsp->h_u.tcp_ip4_spec.pdst;
+       mask.formatted.dst_port = fsp->m_u.tcp_ip4_spec.pdst;
+
+       if (fsp->flow_type & FLOW_EXT) {
+               input->filter.formatted.vm_pool =
+                               (unsigned char)ntohl(fsp->h_ext.data[1]);
+               mask.formatted.vm_pool =
+                               (unsigned char)ntohl(fsp->m_ext.data[1]);
+               input->filter.formatted.vlan_id = fsp->h_ext.vlan_tci;
+               mask.formatted.vlan_id = fsp->m_ext.vlan_tci;
+               input->filter.formatted.flex_bytes =
+                                               fsp->h_ext.vlan_etype;
+               mask.formatted.flex_bytes = fsp->m_ext.vlan_etype;
+       }
+
+       /* determine if we need to drop or route the packet */
+       if (fsp->ring_cookie == RX_CLS_FLOW_DISC)
+               input->action = IXGBE_FDIR_DROP_QUEUE;
+       else
+               input->action = fsp->ring_cookie;
+
+       spin_lock(&adapter->fdir_perfect_lock);
+
+       if (hlist_empty(&adapter->fdir_filter_list)) {
+               /* save mask and program input mask into HW */
+               memcpy(&adapter->fdir_mask, &mask, sizeof(mask));
+               err = ixgbe_fdir_set_input_mask_82599(hw, &mask);
+               if (err) {
+                       e_err(drv, "Error writing mask\n");
+                       goto err_out_w_lock;
+               }
+       } else if (memcmp(&adapter->fdir_mask, &mask, sizeof(mask))) {
+               e_err(drv, "Only one mask supported per port\n");
+               goto err_out_w_lock;
+       }
+
+       /* apply mask and compute/store hash */
+       ixgbe_atr_compute_perfect_hash_82599(&input->filter, &mask);
+
+       /* program filters to filter memory */
+       err = ixgbe_fdir_write_perfect_filter_82599(hw,
+                               &input->filter, input->sw_idx,
+                               (input->action == IXGBE_FDIR_DROP_QUEUE) ?
+                               IXGBE_FDIR_DROP_QUEUE :
+                               adapter->rx_ring[input->action]->reg_idx);
+       if (err)
+               goto err_out_w_lock;
+
+       ixgbe_update_ethtool_fdir_entry(adapter, input, input->sw_idx);
+
+       spin_unlock(&adapter->fdir_perfect_lock);
+
+       return err;
+err_out_w_lock:
+       spin_unlock(&adapter->fdir_perfect_lock);
+err_out:
+       kfree(input);
+       return -EINVAL;
+}
+
+static int ixgbe_del_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
+                                       struct ethtool_rxnfc *cmd)
+{
+       struct ethtool_rx_flow_spec *fsp =
+               (struct ethtool_rx_flow_spec *)&cmd->fs;
+       int err;
+
+       spin_lock(&adapter->fdir_perfect_lock);
+       err = ixgbe_update_ethtool_fdir_entry(adapter, NULL, fsp->location);
+       spin_unlock(&adapter->fdir_perfect_lock);
+
+       return err;
+}
+
+static int ixgbe_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       int ret = -EOPNOTSUPP;
+
+       switch (cmd->cmd) {
+       case ETHTOOL_SRXCLSRLINS:
+               ret = ixgbe_add_ethtool_fdir_entry(adapter, cmd);
+               break;
+       case ETHTOOL_SRXCLSRLDEL:
+               ret = ixgbe_del_ethtool_fdir_entry(adapter, cmd);
+               break;
+       default:
+               break;
+       }
+
+       return ret;
+}
+
+static const struct ethtool_ops ixgbe_ethtool_ops = {
+       .get_settings           = ixgbe_get_settings,
+       .set_settings           = ixgbe_set_settings,
+       .get_drvinfo            = ixgbe_get_drvinfo,
+       .get_regs_len           = ixgbe_get_regs_len,
+       .get_regs               = ixgbe_get_regs,
+       .get_wol                = ixgbe_get_wol,
+       .set_wol                = ixgbe_set_wol,
+       .nway_reset             = ixgbe_nway_reset,
+       .get_link               = ethtool_op_get_link,
+       .get_eeprom_len         = ixgbe_get_eeprom_len,
+       .get_eeprom             = ixgbe_get_eeprom,
+       .get_ringparam          = ixgbe_get_ringparam,
+       .set_ringparam          = ixgbe_set_ringparam,
+       .get_pauseparam         = ixgbe_get_pauseparam,
+       .set_pauseparam         = ixgbe_set_pauseparam,
+       .get_msglevel           = ixgbe_get_msglevel,
+       .set_msglevel           = ixgbe_set_msglevel,
+       .self_test              = ixgbe_diag_test,
+       .get_strings            = ixgbe_get_strings,
+       .set_phys_id            = ixgbe_set_phys_id,
+       .get_sset_count         = ixgbe_get_sset_count,
+       .get_ethtool_stats      = ixgbe_get_ethtool_stats,
+       .get_coalesce           = ixgbe_get_coalesce,
+       .set_coalesce           = ixgbe_set_coalesce,
+       .get_rxnfc              = ixgbe_get_rxnfc,
+       .set_rxnfc              = ixgbe_set_rxnfc,
+};
+
+void ixgbe_set_ethtool_ops(struct net_device *netdev)
+{
+       SET_ETHTOOL_OPS(netdev, &ixgbe_ethtool_ops);
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
new file mode 100644 (file)
index 0000000..824edae
--- /dev/null
@@ -0,0 +1,836 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include "ixgbe.h"
+#include <linux/if_ether.h>
+#include <linux/gfp.h>
+#include <linux/if_vlan.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/fc/fc_fs.h>
+#include <scsi/fc/fc_fcoe.h>
+#include <scsi/libfc.h>
+#include <scsi/libfcoe.h>
+
+/**
+ * ixgbe_fcoe_clear_ddp - clear the given ddp context
+ * @ddp - ptr to the ixgbe_fcoe_ddp
+ *
+ * Returns : none
+ *
+ */
+static inline void ixgbe_fcoe_clear_ddp(struct ixgbe_fcoe_ddp *ddp)
+{
+       ddp->len = 0;
+       ddp->err = 1;
+       ddp->udl = NULL;
+       ddp->udp = 0UL;
+       ddp->sgl = NULL;
+       ddp->sgc = 0;
+}
+
+/**
+ * ixgbe_fcoe_ddp_put - free the ddp context for a given xid
+ * @netdev: the corresponding net_device
+ * @xid: the xid that corresponding ddp will be freed
+ *
+ * This is the implementation of net_device_ops.ndo_fcoe_ddp_done
+ * and it is expected to be called by ULD, i.e., FCP layer of libfc
+ * to release the corresponding ddp context when the I/O is done.
+ *
+ * Returns : data length already ddp-ed in bytes
+ */
+int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid)
+{
+       int len = 0;
+       struct ixgbe_fcoe *fcoe;
+       struct ixgbe_adapter *adapter;
+       struct ixgbe_fcoe_ddp *ddp;
+       u32 fcbuff;
+
+       if (!netdev)
+               goto out_ddp_put;
+
+       if (xid >= IXGBE_FCOE_DDP_MAX)
+               goto out_ddp_put;
+
+       adapter = netdev_priv(netdev);
+       fcoe = &adapter->fcoe;
+       ddp = &fcoe->ddp[xid];
+       if (!ddp->udl)
+               goto out_ddp_put;
+
+       len = ddp->len;
+       /* if there an error, force to invalidate ddp context */
+       if (ddp->err) {
+               spin_lock_bh(&fcoe->lock);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCFLT, 0);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCFLTRW,
+                               (xid | IXGBE_FCFLTRW_WE));
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCBUFF, 0);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCDMARW,
+                               (xid | IXGBE_FCDMARW_WE));
+
+               /* guaranteed to be invalidated after 100us */
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCDMARW,
+                               (xid | IXGBE_FCDMARW_RE));
+               fcbuff = IXGBE_READ_REG(&adapter->hw, IXGBE_FCBUFF);
+               spin_unlock_bh(&fcoe->lock);
+               if (fcbuff & IXGBE_FCBUFF_VALID)
+                       udelay(100);
+       }
+       if (ddp->sgl)
+               pci_unmap_sg(adapter->pdev, ddp->sgl, ddp->sgc,
+                            DMA_FROM_DEVICE);
+       if (ddp->pool) {
+               pci_pool_free(ddp->pool, ddp->udl, ddp->udp);
+               ddp->pool = NULL;
+       }
+
+       ixgbe_fcoe_clear_ddp(ddp);
+
+out_ddp_put:
+       return len;
+}
+
+/**
+ * ixgbe_fcoe_ddp_setup - called to set up ddp context
+ * @netdev: the corresponding net_device
+ * @xid: the exchange id requesting ddp
+ * @sgl: the scatter-gather list for this request
+ * @sgc: the number of scatter-gather items
+ *
+ * Returns : 1 for success and 0 for no ddp
+ */
+static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid,
+                               struct scatterlist *sgl, unsigned int sgc,
+                               int target_mode)
+{
+       struct ixgbe_adapter *adapter;
+       struct ixgbe_hw *hw;
+       struct ixgbe_fcoe *fcoe;
+       struct ixgbe_fcoe_ddp *ddp;
+       struct scatterlist *sg;
+       unsigned int i, j, dmacount;
+       unsigned int len;
+       static const unsigned int bufflen = IXGBE_FCBUFF_MIN;
+       unsigned int firstoff = 0;
+       unsigned int lastsize;
+       unsigned int thisoff = 0;
+       unsigned int thislen = 0;
+       u32 fcbuff, fcdmarw, fcfltrw, fcrxctl;
+       dma_addr_t addr = 0;
+       struct pci_pool *pool;
+
+       if (!netdev || !sgl)
+               return 0;
+
+       adapter = netdev_priv(netdev);
+       if (xid >= IXGBE_FCOE_DDP_MAX) {
+               e_warn(drv, "xid=0x%x out-of-range\n", xid);
+               return 0;
+       }
+
+       /* no DDP if we are already down or resetting */
+       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
+           test_bit(__IXGBE_RESETTING, &adapter->state))
+               return 0;
+
+       fcoe = &adapter->fcoe;
+       if (!fcoe->pool) {
+               e_warn(drv, "xid=0x%x no ddp pool for fcoe\n", xid);
+               return 0;
+       }
+
+       ddp = &fcoe->ddp[xid];
+       if (ddp->sgl) {
+               e_err(drv, "xid 0x%x w/ non-null sgl=%p nents=%d\n",
+                     xid, ddp->sgl, ddp->sgc);
+               return 0;
+       }
+       ixgbe_fcoe_clear_ddp(ddp);
+
+       /* setup dma from scsi command sgl */
+       dmacount = pci_map_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);
+       if (dmacount == 0) {
+               e_err(drv, "xid 0x%x DMA map error\n", xid);
+               return 0;
+       }
+
+       /* alloc the udl from per cpu ddp pool */
+       pool = *per_cpu_ptr(fcoe->pool, get_cpu());
+       ddp->udl = pci_pool_alloc(pool, GFP_ATOMIC, &ddp->udp);
+       if (!ddp->udl) {
+               e_err(drv, "failed allocated ddp context\n");
+               goto out_noddp_unmap;
+       }
+       ddp->pool = pool;
+       ddp->sgl = sgl;
+       ddp->sgc = sgc;
+
+       j = 0;
+       for_each_sg(sgl, sg, dmacount, i) {
+               addr = sg_dma_address(sg);
+               len = sg_dma_len(sg);
+               while (len) {
+                       /* max number of buffers allowed in one DDP context */
+                       if (j >= IXGBE_BUFFCNT_MAX) {
+                               e_err(drv, "xid=%x:%d,%d,%d:addr=%llx "
+                                     "not enough descriptors\n",
+                                     xid, i, j, dmacount, (u64)addr);
+                               goto out_noddp_free;
+                       }
+
+                       /* get the offset of length of current buffer */
+                       thisoff = addr & ((dma_addr_t)bufflen - 1);
+                       thislen = min((bufflen - thisoff), len);
+                       /*
+                        * all but the 1st buffer (j == 0)
+                        * must be aligned on bufflen
+                        */
+                       if ((j != 0) && (thisoff))
+                               goto out_noddp_free;
+                       /*
+                        * all but the last buffer
+                        * ((i == (dmacount - 1)) && (thislen == len))
+                        * must end at bufflen
+                        */
+                       if (((i != (dmacount - 1)) || (thislen != len))
+                           && ((thislen + thisoff) != bufflen))
+                               goto out_noddp_free;
+
+                       ddp->udl[j] = (u64)(addr - thisoff);
+                       /* only the first buffer may have none-zero offset */
+                       if (j == 0)
+                               firstoff = thisoff;
+                       len -= thislen;
+                       addr += thislen;
+                       j++;
+               }
+       }
+       /* only the last buffer may have non-full bufflen */
+       lastsize = thisoff + thislen;
+
+       /*
+        * lastsize can not be buffer len.
+        * If it is then adding another buffer with lastsize = 1.
+        */
+       if (lastsize == bufflen) {
+               if (j >= IXGBE_BUFFCNT_MAX) {
+                       e_err(drv, "xid=%x:%d,%d,%d:addr=%llx "
+                               "not enough user buffers. We need an extra "
+                               "buffer because lastsize is bufflen.\n",
+                               xid, i, j, dmacount, (u64)addr);
+                       goto out_noddp_free;
+               }
+
+               ddp->udl[j] = (u64)(fcoe->extra_ddp_buffer_dma);
+               j++;
+               lastsize = 1;
+       }
+       put_cpu();
+
+       fcbuff = (IXGBE_FCBUFF_4KB << IXGBE_FCBUFF_BUFFSIZE_SHIFT);
+       fcbuff |= ((j & 0xff) << IXGBE_FCBUFF_BUFFCNT_SHIFT);
+       fcbuff |= (firstoff << IXGBE_FCBUFF_OFFSET_SHIFT);
+       /* Set WRCONTX bit to allow DDP for target */
+       if (target_mode)
+               fcbuff |= (IXGBE_FCBUFF_WRCONTX);
+       fcbuff |= (IXGBE_FCBUFF_VALID);
+
+       fcdmarw = xid;
+       fcdmarw |= IXGBE_FCDMARW_WE;
+       fcdmarw |= (lastsize << IXGBE_FCDMARW_LASTSIZE_SHIFT);
+
+       fcfltrw = xid;
+       fcfltrw |= IXGBE_FCFLTRW_WE;
+
+       /* program DMA context */
+       hw = &adapter->hw;
+       spin_lock_bh(&fcoe->lock);
+
+       /* turn on last frame indication for target mode as FCP_RSPtarget is
+        * supposed to send FCP_RSP when it is done. */
+       if (target_mode && !test_bit(__IXGBE_FCOE_TARGET, &fcoe->mode)) {
+               set_bit(__IXGBE_FCOE_TARGET, &fcoe->mode);
+               fcrxctl = IXGBE_READ_REG(hw, IXGBE_FCRXCTRL);
+               fcrxctl |= IXGBE_FCRXCTRL_LASTSEQH;
+               IXGBE_WRITE_REG(hw, IXGBE_FCRXCTRL, fcrxctl);
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_FCPTRL, ddp->udp & DMA_BIT_MASK(32));
+       IXGBE_WRITE_REG(hw, IXGBE_FCPTRH, (u64)ddp->udp >> 32);
+       IXGBE_WRITE_REG(hw, IXGBE_FCBUFF, fcbuff);
+       IXGBE_WRITE_REG(hw, IXGBE_FCDMARW, fcdmarw);
+       /* program filter context */
+       IXGBE_WRITE_REG(hw, IXGBE_FCPARAM, 0);
+       IXGBE_WRITE_REG(hw, IXGBE_FCFLT, IXGBE_FCFLT_VALID);
+       IXGBE_WRITE_REG(hw, IXGBE_FCFLTRW, fcfltrw);
+
+       spin_unlock_bh(&fcoe->lock);
+
+       return 1;
+
+out_noddp_free:
+       pci_pool_free(pool, ddp->udl, ddp->udp);
+       ixgbe_fcoe_clear_ddp(ddp);
+
+out_noddp_unmap:
+       pci_unmap_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);
+       put_cpu();
+       return 0;
+}
+
+/**
+ * ixgbe_fcoe_ddp_get - called to set up ddp context in initiator mode
+ * @netdev: the corresponding net_device
+ * @xid: the exchange id requesting ddp
+ * @sgl: the scatter-gather list for this request
+ * @sgc: the number of scatter-gather items
+ *
+ * This is the implementation of net_device_ops.ndo_fcoe_ddp_setup
+ * and is expected to be called from ULD, e.g., FCP layer of libfc
+ * to set up ddp for the corresponding xid of the given sglist for
+ * the corresponding I/O.
+ *
+ * Returns : 1 for success and 0 for no ddp
+ */
+int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
+                      struct scatterlist *sgl, unsigned int sgc)
+{
+       return ixgbe_fcoe_ddp_setup(netdev, xid, sgl, sgc, 0);
+}
+
+/**
+ * ixgbe_fcoe_ddp_target - called to set up ddp context in target mode
+ * @netdev: the corresponding net_device
+ * @xid: the exchange id requesting ddp
+ * @sgl: the scatter-gather list for this request
+ * @sgc: the number of scatter-gather items
+ *
+ * This is the implementation of net_device_ops.ndo_fcoe_ddp_target
+ * and is expected to be called from ULD, e.g., FCP layer of libfc
+ * to set up ddp for the corresponding xid of the given sglist for
+ * the corresponding I/O. The DDP in target mode is a write I/O request
+ * from the initiator.
+ *
+ * Returns : 1 for success and 0 for no ddp
+ */
+int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,
+                           struct scatterlist *sgl, unsigned int sgc)
+{
+       return ixgbe_fcoe_ddp_setup(netdev, xid, sgl, sgc, 1);
+}
+
+/**
+ * ixgbe_fcoe_ddp - check ddp status and mark it done
+ * @adapter: ixgbe adapter
+ * @rx_desc: advanced rx descriptor
+ * @skb: the skb holding the received data
+ *
+ * This checks ddp status.
+ *
+ * Returns : < 0 indicates an error or not a FCiE ddp, 0 indicates
+ * not passing the skb to ULD, > 0 indicates is the length of data
+ * being ddped.
+ */
+int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
+                  union ixgbe_adv_rx_desc *rx_desc,
+                  struct sk_buff *skb,
+                  u32 staterr)
+{
+       u16 xid;
+       u32 fctl;
+       u32 fceofe, fcerr, fcstat;
+       int rc = -EINVAL;
+       struct ixgbe_fcoe *fcoe;
+       struct ixgbe_fcoe_ddp *ddp;
+       struct fc_frame_header *fh;
+       struct fcoe_crc_eof *crc;
+
+       fcerr = (staterr & IXGBE_RXDADV_ERR_FCERR);
+       fceofe = (staterr & IXGBE_RXDADV_ERR_FCEOFE);
+       if (fcerr == IXGBE_FCERR_BADCRC)
+               skb_checksum_none_assert(skb);
+       else
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+       if (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q))
+               fh = (struct fc_frame_header *)(skb->data +
+                       sizeof(struct vlan_hdr) + sizeof(struct fcoe_hdr));
+       else
+               fh = (struct fc_frame_header *)(skb->data +
+                       sizeof(struct fcoe_hdr));
+       fctl = ntoh24(fh->fh_f_ctl);
+       if (fctl & FC_FC_EX_CTX)
+               xid =  be16_to_cpu(fh->fh_ox_id);
+       else
+               xid =  be16_to_cpu(fh->fh_rx_id);
+
+       if (xid >= IXGBE_FCOE_DDP_MAX)
+               goto ddp_out;
+
+       fcoe = &adapter->fcoe;
+       ddp = &fcoe->ddp[xid];
+       if (!ddp->udl)
+               goto ddp_out;
+
+       if (fcerr | fceofe)
+               goto ddp_out;
+
+       fcstat = (staterr & IXGBE_RXDADV_STAT_FCSTAT);
+       if (fcstat) {
+               /* update length of DDPed data */
+               ddp->len = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
+               /* unmap the sg list when FCP_RSP is received */
+               if (fcstat == IXGBE_RXDADV_STAT_FCSTAT_FCPRSP) {
+                       pci_unmap_sg(adapter->pdev, ddp->sgl,
+                                    ddp->sgc, DMA_FROM_DEVICE);
+                       ddp->err = (fcerr | fceofe);
+                       ddp->sgl = NULL;
+                       ddp->sgc = 0;
+               }
+               /* return 0 to bypass going to ULD for DDPed data */
+               if (fcstat == IXGBE_RXDADV_STAT_FCSTAT_DDP)
+                       rc = 0;
+               else if (ddp->len)
+                       rc = ddp->len;
+       }
+       /* In target mode, check the last data frame of the sequence.
+        * For DDP in target mode, data is already DDPed but the header
+        * indication of the last data frame ould allow is to tell if we
+        * got all the data and the ULP can send FCP_RSP back, as this is
+        * not a full fcoe frame, we fill the trailer here so it won't be
+        * dropped by the ULP stack.
+        */
+       if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&
+           (fctl & FC_FC_END_SEQ)) {
+               crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));
+               crc->fcoe_eof = FC_EOF_T;
+       }
+ddp_out:
+       return rc;
+}
+
+/**
+ * ixgbe_fso - ixgbe FCoE Sequence Offload (FSO)
+ * @adapter: ixgbe adapter
+ * @tx_ring: tx desc ring
+ * @skb: associated skb
+ * @tx_flags: tx flags
+ * @hdr_len: hdr_len to be returned
+ *
+ * This sets up large send offload for FCoE
+ *
+ * Returns : 0 indicates no FSO, > 0 for FSO, < 0 for error
+ */
+int ixgbe_fso(struct ixgbe_ring *tx_ring, struct sk_buff *skb,
+              u32 tx_flags, u8 *hdr_len)
+{
+       struct fc_frame_header *fh;
+       u32 vlan_macip_lens;
+       u32 fcoe_sof_eof = 0;
+       u32 mss_l4len_idx;
+       u8 sof, eof;
+
+       if (skb_is_gso(skb) && (skb_shinfo(skb)->gso_type != SKB_GSO_FCOE)) {
+               dev_err(tx_ring->dev, "Wrong gso type %d:expecting SKB_GSO_FCOE\n",
+                       skb_shinfo(skb)->gso_type);
+               return -EINVAL;
+       }
+
+       /* resets the header to point fcoe/fc */
+       skb_set_network_header(skb, skb->mac_len);
+       skb_set_transport_header(skb, skb->mac_len +
+                                sizeof(struct fcoe_hdr));
+
+       /* sets up SOF and ORIS */
+       sof = ((struct fcoe_hdr *)skb_network_header(skb))->fcoe_sof;
+       switch (sof) {
+       case FC_SOF_I2:
+               fcoe_sof_eof = IXGBE_ADVTXD_FCOEF_ORIS;
+               break;
+       case FC_SOF_I3:
+               fcoe_sof_eof = IXGBE_ADVTXD_FCOEF_SOF |
+                              IXGBE_ADVTXD_FCOEF_ORIS;
+               break;
+       case FC_SOF_N2:
+               break;
+       case FC_SOF_N3:
+               fcoe_sof_eof = IXGBE_ADVTXD_FCOEF_SOF;
+               break;
+       default:
+               dev_warn(tx_ring->dev, "unknown sof = 0x%x\n", sof);
+               return -EINVAL;
+       }
+
+       /* the first byte of the last dword is EOF */
+       skb_copy_bits(skb, skb->len - 4, &eof, 1);
+       /* sets up EOF and ORIE */
+       switch (eof) {
+       case FC_EOF_N:
+               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_N;
+               break;
+       case FC_EOF_T:
+               /* lso needs ORIE */
+               if (skb_is_gso(skb))
+                       fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_N |
+                                       IXGBE_ADVTXD_FCOEF_ORIE;
+               else
+                       fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_T;
+               break;
+       case FC_EOF_NI:
+               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_NI;
+               break;
+       case FC_EOF_A:
+               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_A;
+               break;
+       default:
+               dev_warn(tx_ring->dev, "unknown eof = 0x%x\n", eof);
+               return -EINVAL;
+       }
+
+       /* sets up PARINC indicating data offset */
+       fh = (struct fc_frame_header *)skb_transport_header(skb);
+       if (fh->fh_f_ctl[2] & FC_FC_REL_OFF)
+               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_PARINC;
+
+       /* include trailer in headlen as it is replicated per frame */
+       *hdr_len = sizeof(struct fcoe_crc_eof);
+
+       /* hdr_len includes fc_hdr if FCoE LSO is enabled */
+       if (skb_is_gso(skb))
+               *hdr_len += (skb_transport_offset(skb) +
+                            sizeof(struct fc_frame_header));
+
+       /* mss_l4len_id: use 1 for FSO as TSO, no need for L4LEN */
+       mss_l4len_idx = skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT;
+       mss_l4len_idx |= 1 << IXGBE_ADVTXD_IDX_SHIFT;
+
+       /* vlan_macip_lens: HEADLEN, MACLEN, VLAN tag */
+       vlan_macip_lens = skb_transport_offset(skb) +
+                         sizeof(struct fc_frame_header);
+       vlan_macip_lens |= (skb_transport_offset(skb) - 4)
+                          << IXGBE_ADVTXD_MACLEN_SHIFT;
+       vlan_macip_lens |= tx_flags & IXGBE_TX_FLAGS_VLAN_MASK;
+
+       /* write context desc */
+       ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, fcoe_sof_eof,
+                         IXGBE_ADVTXT_TUCMD_FCOE, mss_l4len_idx);
+
+       return skb_is_gso(skb);
+}
+
+static void ixgbe_fcoe_ddp_pools_free(struct ixgbe_fcoe *fcoe)
+{
+       unsigned int cpu;
+       struct pci_pool **pool;
+
+       for_each_possible_cpu(cpu) {
+               pool = per_cpu_ptr(fcoe->pool, cpu);
+               if (*pool)
+                       pci_pool_destroy(*pool);
+       }
+       free_percpu(fcoe->pool);
+       fcoe->pool = NULL;
+}
+
+static void ixgbe_fcoe_ddp_pools_alloc(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
+       unsigned int cpu;
+       struct pci_pool **pool;
+       char pool_name[32];
+
+       fcoe->pool = alloc_percpu(struct pci_pool *);
+       if (!fcoe->pool)
+               return;
+
+       /* allocate pci pool for each cpu */
+       for_each_possible_cpu(cpu) {
+               snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%d", cpu);
+               pool = per_cpu_ptr(fcoe->pool, cpu);
+               *pool = pci_pool_create(pool_name,
+                                       adapter->pdev, IXGBE_FCPTR_MAX,
+                                       IXGBE_FCPTR_ALIGN, PAGE_SIZE);
+               if (!*pool) {
+                       e_err(drv, "failed to alloc DDP pool on cpu:%d\n", cpu);
+                       ixgbe_fcoe_ddp_pools_free(fcoe);
+                       return;
+               }
+       }
+}
+
+/**
+ * ixgbe_configure_fcoe - configures registers for fcoe at start
+ * @adapter: ptr to ixgbe adapter
+ *
+ * This sets up FCoE related registers
+ *
+ * Returns : none
+ */
+void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
+{
+       int i, fcoe_q, fcoe_i;
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
+       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
+
+       if (!fcoe->pool) {
+               spin_lock_init(&fcoe->lock);
+
+               ixgbe_fcoe_ddp_pools_alloc(adapter);
+               if (!fcoe->pool) {
+                       e_err(drv, "failed to alloc percpu fcoe DDP pools\n");
+                       return;
+               }
+
+               /* Extra buffer to be shared by all DDPs for HW work around */
+               fcoe->extra_ddp_buffer = kmalloc(IXGBE_FCBUFF_MIN, GFP_ATOMIC);
+               if (fcoe->extra_ddp_buffer == NULL) {
+                       e_err(drv, "failed to allocated extra DDP buffer\n");
+                       goto out_ddp_pools;
+               }
+
+               fcoe->extra_ddp_buffer_dma =
+                       dma_map_single(&adapter->pdev->dev,
+                                      fcoe->extra_ddp_buffer,
+                                      IXGBE_FCBUFF_MIN,
+                                      DMA_FROM_DEVICE);
+               if (dma_mapping_error(&adapter->pdev->dev,
+                                     fcoe->extra_ddp_buffer_dma)) {
+                       e_err(drv, "failed to map extra DDP buffer\n");
+                       goto out_extra_ddp_buffer;
+               }
+       }
+
+       /* Enable L2 eth type filter for FCoE */
+       IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FCOE),
+                       (ETH_P_FCOE | IXGBE_ETQF_FCOE | IXGBE_ETQF_FILTER_EN));
+       /* Enable L2 eth type filter for FIP */
+       IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FIP),
+                       (ETH_P_FIP | IXGBE_ETQF_FILTER_EN));
+       if (adapter->ring_feature[RING_F_FCOE].indices) {
+               /* Use multiple rx queues for FCoE by redirection table */
+               for (i = 0; i < IXGBE_FCRETA_SIZE; i++) {
+                       fcoe_i = f->mask + i % f->indices;
+                       fcoe_i &= IXGBE_FCRETA_ENTRY_MASK;
+                       fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;
+                       IXGBE_WRITE_REG(hw, IXGBE_FCRETA(i), fcoe_q);
+               }
+               IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, IXGBE_FCRECTL_ENA);
+               IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE), 0);
+       } else  {
+               /* Use single rx queue for FCoE */
+               fcoe_i = f->mask;
+               fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;
+               IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, 0);
+               IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE),
+                               IXGBE_ETQS_QUEUE_EN |
+                               (fcoe_q << IXGBE_ETQS_RX_QUEUE_SHIFT));
+       }
+       /* send FIP frames to the first FCoE queue */
+       fcoe_i = f->mask;
+       fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;
+       IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FIP),
+                       IXGBE_ETQS_QUEUE_EN |
+                       (fcoe_q << IXGBE_ETQS_RX_QUEUE_SHIFT));
+
+       IXGBE_WRITE_REG(hw, IXGBE_FCRXCTRL,
+                       IXGBE_FCRXCTRL_FCOELLI |
+                       IXGBE_FCRXCTRL_FCCRCBO |
+                       (FC_FCOE_VER << IXGBE_FCRXCTRL_FCOEVER_SHIFT));
+       return;
+
+out_extra_ddp_buffer:
+       kfree(fcoe->extra_ddp_buffer);
+out_ddp_pools:
+       ixgbe_fcoe_ddp_pools_free(fcoe);
+}
+
+/**
+ * ixgbe_cleanup_fcoe - release all fcoe ddp context resources
+ * @adapter : ixgbe adapter
+ *
+ * Cleans up outstanding ddp context resources
+ *
+ * Returns : none
+ */
+void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter)
+{
+       int i;
+       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
+
+       if (!fcoe->pool)
+               return;
+
+       for (i = 0; i < IXGBE_FCOE_DDP_MAX; i++)
+               ixgbe_fcoe_ddp_put(adapter->netdev, i);
+       dma_unmap_single(&adapter->pdev->dev,
+                        fcoe->extra_ddp_buffer_dma,
+                        IXGBE_FCBUFF_MIN,
+                        DMA_FROM_DEVICE);
+       kfree(fcoe->extra_ddp_buffer);
+       ixgbe_fcoe_ddp_pools_free(fcoe);
+}
+
+/**
+ * ixgbe_fcoe_enable - turn on FCoE offload feature
+ * @netdev: the corresponding netdev
+ *
+ * Turns on FCoE offload feature in 82599.
+ *
+ * Returns : 0 indicates success or -EINVAL on failure
+ */
+int ixgbe_fcoe_enable(struct net_device *netdev)
+{
+       int rc = -EINVAL;
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
+
+
+       if (!(adapter->flags & IXGBE_FLAG_FCOE_CAPABLE))
+               goto out_enable;
+
+       atomic_inc(&fcoe->refcnt);
+       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
+               goto out_enable;
+
+       e_info(drv, "Enabling FCoE offload features.\n");
+       if (netif_running(netdev))
+               netdev->netdev_ops->ndo_stop(netdev);
+
+       ixgbe_clear_interrupt_scheme(adapter);
+
+       adapter->flags |= IXGBE_FLAG_FCOE_ENABLED;
+       adapter->ring_feature[RING_F_FCOE].indices = IXGBE_FCRETA_SIZE;
+       netdev->features |= NETIF_F_FCOE_CRC;
+       netdev->features |= NETIF_F_FSO;
+       netdev->features |= NETIF_F_FCOE_MTU;
+       netdev->fcoe_ddp_xid = IXGBE_FCOE_DDP_MAX - 1;
+
+       ixgbe_init_interrupt_scheme(adapter);
+       netdev_features_change(netdev);
+
+       if (netif_running(netdev))
+               netdev->netdev_ops->ndo_open(netdev);
+       rc = 0;
+
+out_enable:
+       return rc;
+}
+
+/**
+ * ixgbe_fcoe_disable - turn off FCoE offload feature
+ * @netdev: the corresponding netdev
+ *
+ * Turns off FCoE offload feature in 82599.
+ *
+ * Returns : 0 indicates success or -EINVAL on failure
+ */
+int ixgbe_fcoe_disable(struct net_device *netdev)
+{
+       int rc = -EINVAL;
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
+
+       if (!(adapter->flags & IXGBE_FLAG_FCOE_CAPABLE))
+               goto out_disable;
+
+       if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
+               goto out_disable;
+
+       if (!atomic_dec_and_test(&fcoe->refcnt))
+               goto out_disable;
+
+       e_info(drv, "Disabling FCoE offload features.\n");
+       netdev->features &= ~NETIF_F_FCOE_CRC;
+       netdev->features &= ~NETIF_F_FSO;
+       netdev->features &= ~NETIF_F_FCOE_MTU;
+       netdev->fcoe_ddp_xid = 0;
+       netdev_features_change(netdev);
+
+       if (netif_running(netdev))
+               netdev->netdev_ops->ndo_stop(netdev);
+
+       ixgbe_clear_interrupt_scheme(adapter);
+       adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED;
+       adapter->ring_feature[RING_F_FCOE].indices = 0;
+       ixgbe_cleanup_fcoe(adapter);
+       ixgbe_init_interrupt_scheme(adapter);
+
+       if (netif_running(netdev))
+               netdev->netdev_ops->ndo_open(netdev);
+       rc = 0;
+
+out_disable:
+       return rc;
+}
+
+/**
+ * ixgbe_fcoe_get_wwn - get world wide name for the node or the port
+ * @netdev : ixgbe adapter
+ * @wwn : the world wide name
+ * @type: the type of world wide name
+ *
+ * Returns the node or port world wide name if both the prefix and the san
+ * mac address are valid, then the wwn is formed based on the NAA-2 for
+ * IEEE Extended name identifier (ref. to T10 FC-LS Spec., Sec. 15.3).
+ *
+ * Returns : 0 on success
+ */
+int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type)
+{
+       int rc = -EINVAL;
+       u16 prefix = 0xffff;
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_mac_info *mac = &adapter->hw.mac;
+
+       switch (type) {
+       case NETDEV_FCOE_WWNN:
+               prefix = mac->wwnn_prefix;
+               break;
+       case NETDEV_FCOE_WWPN:
+               prefix = mac->wwpn_prefix;
+               break;
+       default:
+               break;
+       }
+
+       if ((prefix != 0xffff) &&
+           is_valid_ether_addr(mac->san_addr)) {
+               *wwn = ((u64) prefix << 48) |
+                      ((u64) mac->san_addr[0] << 40) |
+                      ((u64) mac->san_addr[1] << 32) |
+                      ((u64) mac->san_addr[2] << 24) |
+                      ((u64) mac->san_addr[3] << 16) |
+                      ((u64) mac->san_addr[4] << 8)  |
+                      ((u64) mac->san_addr[5]);
+               rc = 0;
+       }
+       return rc;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
new file mode 100644 (file)
index 0000000..99de145
--- /dev/null
@@ -0,0 +1,81 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_FCOE_H
+#define _IXGBE_FCOE_H
+
+#include <scsi/fc/fc_fs.h>
+#include <scsi/fc/fc_fcoe.h>
+
+/* shift bits within STAT fo FCSTAT */
+#define IXGBE_RXDADV_FCSTAT_SHIFT      4
+
+/* ddp user buffer */
+#define IXGBE_BUFFCNT_MAX      256     /* 8 bits bufcnt */
+#define IXGBE_FCPTR_ALIGN      16
+#define IXGBE_FCPTR_MAX        (IXGBE_BUFFCNT_MAX * sizeof(dma_addr_t))
+#define IXGBE_FCBUFF_4KB       0x0
+#define IXGBE_FCBUFF_8KB       0x1
+#define IXGBE_FCBUFF_16KB      0x2
+#define IXGBE_FCBUFF_64KB      0x3
+#define IXGBE_FCBUFF_MAX       65536   /* 64KB max */
+#define IXGBE_FCBUFF_MIN       4096    /* 4KB min */
+#define IXGBE_FCOE_DDP_MAX     512     /* 9 bits xid */
+
+/* Default traffic class to use for FCoE */
+#define IXGBE_FCOE_DEFTC       3
+
+/* fcerr */
+#define IXGBE_FCERR_BADCRC       0x00100000
+
+/* FCoE DDP for target mode */
+#define __IXGBE_FCOE_TARGET    1
+
+struct ixgbe_fcoe_ddp {
+       int len;
+       u32 err;
+       unsigned int sgc;
+       struct scatterlist *sgl;
+       dma_addr_t udp;
+       u64 *udl;
+       struct pci_pool *pool;
+};
+
+struct ixgbe_fcoe {
+       struct pci_pool **pool;
+       atomic_t refcnt;
+       spinlock_t lock;
+       struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];
+       unsigned char *extra_ddp_buffer;
+       dma_addr_t extra_ddp_buffer_dma;
+       unsigned long mode;
+#ifdef CONFIG_IXGBE_DCB
+       u8 up;
+#endif
+};
+
+#endif /* _IXGBE_FCOE_H */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
new file mode 100644 (file)
index 0000000..e86297b
--- /dev/null
@@ -0,0 +1,7934 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+#include <linux/string.h>
+#include <linux/in.h>
+#include <linux/interrupt.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/sctp.h>
+#include <linux/pkt_sched.h>
+#include <linux/ipv6.h>
+#include <linux/slab.h>
+#include <net/checksum.h>
+#include <net/ip6_checksum.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+#include <linux/prefetch.h>
+#include <scsi/fc/fc_fcoe.h>
+
+#include "ixgbe.h"
+#include "ixgbe_common.h"
+#include "ixgbe_dcb_82599.h"
+#include "ixgbe_sriov.h"
+
+char ixgbe_driver_name[] = "ixgbe";
+static const char ixgbe_driver_string[] =
+                             "Intel(R) 10 Gigabit PCI Express Network Driver";
+#define MAJ 3
+#define MIN 4
+#define BUILD 8
+#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
+       __stringify(BUILD) "-k"
+const char ixgbe_driver_version[] = DRV_VERSION;
+static const char ixgbe_copyright[] =
+                               "Copyright (c) 1999-2011 Intel Corporation.";
+
+static const struct ixgbe_info *ixgbe_info_tbl[] = {
+       [board_82598] = &ixgbe_82598_info,
+       [board_82599] = &ixgbe_82599_info,
+       [board_X540] = &ixgbe_X540_info,
+};
+
+/* ixgbe_pci_tbl - PCI Device ID Table
+ *
+ * Wildcard entries (PCI_ANY_ID) should come last
+ * Last entry must be all 0s
+ *
+ * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
+ *   Class, Class Mask, private data (not used) }
+ */
+static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT2),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_XF_LR),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX),
+        board_82598 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_FCOE),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T),
+        board_X540 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2),
+        board_82599 },
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS),
+        board_82599 },
+
+       /* required last entry */
+       {0, }
+};
+MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);
+
+#ifdef CONFIG_IXGBE_DCA
+static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,
+                           void *p);
+static struct notifier_block dca_notifier = {
+       .notifier_call = ixgbe_notify_dca,
+       .next          = NULL,
+       .priority      = 0
+};
+#endif
+
+#ifdef CONFIG_PCI_IOV
+static unsigned int max_vfs;
+module_param(max_vfs, uint, 0);
+MODULE_PARM_DESC(max_vfs,
+                "Maximum number of virtual functions to allocate per physical function");
+#endif /* CONFIG_PCI_IOV */
+
+MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
+MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+#define DEFAULT_DEBUG_LEVEL_SHIFT 3
+
+static inline void ixgbe_disable_sriov(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 gcr;
+       u32 gpie;
+       u32 vmdctl;
+
+#ifdef CONFIG_PCI_IOV
+       /* disable iov and allow time for transactions to clear */
+       pci_disable_sriov(adapter->pdev);
+#endif
+
+       /* turn off device IOV mode */
+       gcr = IXGBE_READ_REG(hw, IXGBE_GCR_EXT);
+       gcr &= ~(IXGBE_GCR_EXT_SRIOV);
+       IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr);
+       gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
+       gpie &= ~IXGBE_GPIE_VTMODE_MASK;
+       IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
+
+       /* set default pool back to 0 */
+       vmdctl = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
+       vmdctl &= ~IXGBE_VT_CTL_POOL_MASK;
+       IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vmdctl);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* take a breather then clean up driver data */
+       msleep(100);
+
+       kfree(adapter->vfinfo);
+       adapter->vfinfo = NULL;
+
+       adapter->num_vfs = 0;
+       adapter->flags &= ~IXGBE_FLAG_SRIOV_ENABLED;
+}
+
+static void ixgbe_service_event_schedule(struct ixgbe_adapter *adapter)
+{
+       if (!test_bit(__IXGBE_DOWN, &adapter->state) &&
+           !test_and_set_bit(__IXGBE_SERVICE_SCHED, &adapter->state))
+               schedule_work(&adapter->service_task);
+}
+
+static void ixgbe_service_event_complete(struct ixgbe_adapter *adapter)
+{
+       BUG_ON(!test_bit(__IXGBE_SERVICE_SCHED, &adapter->state));
+
+       /* flush memory to make sure state is correct before next watchog */
+       smp_mb__before_clear_bit();
+       clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state);
+}
+
+struct ixgbe_reg_info {
+       u32 ofs;
+       char *name;
+};
+
+static const struct ixgbe_reg_info ixgbe_reg_info_tbl[] = {
+
+       /* General Registers */
+       {IXGBE_CTRL, "CTRL"},
+       {IXGBE_STATUS, "STATUS"},
+       {IXGBE_CTRL_EXT, "CTRL_EXT"},
+
+       /* Interrupt Registers */
+       {IXGBE_EICR, "EICR"},
+
+       /* RX Registers */
+       {IXGBE_SRRCTL(0), "SRRCTL"},
+       {IXGBE_DCA_RXCTRL(0), "DRXCTL"},
+       {IXGBE_RDLEN(0), "RDLEN"},
+       {IXGBE_RDH(0), "RDH"},
+       {IXGBE_RDT(0), "RDT"},
+       {IXGBE_RXDCTL(0), "RXDCTL"},
+       {IXGBE_RDBAL(0), "RDBAL"},
+       {IXGBE_RDBAH(0), "RDBAH"},
+
+       /* TX Registers */
+       {IXGBE_TDBAL(0), "TDBAL"},
+       {IXGBE_TDBAH(0), "TDBAH"},
+       {IXGBE_TDLEN(0), "TDLEN"},
+       {IXGBE_TDH(0), "TDH"},
+       {IXGBE_TDT(0), "TDT"},
+       {IXGBE_TXDCTL(0), "TXDCTL"},
+
+       /* List Terminator */
+       {}
+};
+
+
+/*
+ * ixgbe_regdump - register printout routine
+ */
+static void ixgbe_regdump(struct ixgbe_hw *hw, struct ixgbe_reg_info *reginfo)
+{
+       int i = 0, j = 0;
+       char rname[16];
+       u32 regs[64];
+
+       switch (reginfo->ofs) {
+       case IXGBE_SRRCTL(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_SRRCTL(i));
+               break;
+       case IXGBE_DCA_RXCTRL(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
+               break;
+       case IXGBE_RDLEN(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDLEN(i));
+               break;
+       case IXGBE_RDH(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDH(i));
+               break;
+       case IXGBE_RDT(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDT(i));
+               break;
+       case IXGBE_RXDCTL(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
+               break;
+       case IXGBE_RDBAL(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDBAL(i));
+               break;
+       case IXGBE_RDBAH(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDBAH(i));
+               break;
+       case IXGBE_TDBAL(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDBAL(i));
+               break;
+       case IXGBE_TDBAH(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDBAH(i));
+               break;
+       case IXGBE_TDLEN(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDLEN(i));
+               break;
+       case IXGBE_TDH(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDH(i));
+               break;
+       case IXGBE_TDT(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDT(i));
+               break;
+       case IXGBE_TXDCTL(0):
+               for (i = 0; i < 64; i++)
+                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
+               break;
+       default:
+               pr_info("%-15s %08x\n", reginfo->name,
+                       IXGBE_READ_REG(hw, reginfo->ofs));
+               return;
+       }
+
+       for (i = 0; i < 8; i++) {
+               snprintf(rname, 16, "%s[%d-%d]", reginfo->name, i*8, i*8+7);
+               pr_err("%-15s", rname);
+               for (j = 0; j < 8; j++)
+                       pr_cont(" %08x", regs[i*8+j]);
+               pr_cont("\n");
+       }
+
+}
+
+/*
+ * ixgbe_dump - Print registers, tx-rings and rx-rings
+ */
+static void ixgbe_dump(struct ixgbe_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbe_reg_info *reginfo;
+       int n = 0;
+       struct ixgbe_ring *tx_ring;
+       struct ixgbe_tx_buffer *tx_buffer_info;
+       union ixgbe_adv_tx_desc *tx_desc;
+       struct my_u0 { u64 a; u64 b; } *u0;
+       struct ixgbe_ring *rx_ring;
+       union ixgbe_adv_rx_desc *rx_desc;
+       struct ixgbe_rx_buffer *rx_buffer_info;
+       u32 staterr;
+       int i = 0;
+
+       if (!netif_msg_hw(adapter))
+               return;
+
+       /* Print netdevice Info */
+       if (netdev) {
+               dev_info(&adapter->pdev->dev, "Net device Info\n");
+               pr_info("Device Name     state            "
+                       "trans_start      last_rx\n");
+               pr_info("%-15s %016lX %016lX %016lX\n",
+                       netdev->name,
+                       netdev->state,
+                       netdev->trans_start,
+                       netdev->last_rx);
+       }
+
+       /* Print Registers */
+       dev_info(&adapter->pdev->dev, "Register Dump\n");
+       pr_info(" Register Name   Value\n");
+       for (reginfo = (struct ixgbe_reg_info *)ixgbe_reg_info_tbl;
+            reginfo->name; reginfo++) {
+               ixgbe_regdump(hw, reginfo);
+       }
+
+       /* Print TX Ring Summary */
+       if (!netdev || !netif_running(netdev))
+               goto exit;
+
+       dev_info(&adapter->pdev->dev, "TX Rings Summary\n");
+       pr_info("Queue [NTU] [NTC] [bi(ntc)->dma  ] leng ntw timestamp\n");
+       for (n = 0; n < adapter->num_tx_queues; n++) {
+               tx_ring = adapter->tx_ring[n];
+               tx_buffer_info =
+                       &tx_ring->tx_buffer_info[tx_ring->next_to_clean];
+               pr_info(" %5d %5X %5X %016llX %04X %3X %016llX\n",
+                          n, tx_ring->next_to_use, tx_ring->next_to_clean,
+                          (u64)tx_buffer_info->dma,
+                          tx_buffer_info->length,
+                          tx_buffer_info->next_to_watch,
+                          (u64)tx_buffer_info->time_stamp);
+       }
+
+       /* Print TX Rings */
+       if (!netif_msg_tx_done(adapter))
+               goto rx_ring_summary;
+
+       dev_info(&adapter->pdev->dev, "TX Rings Dump\n");
+
+       /* Transmit Descriptor Formats
+        *
+        * Advanced Transmit Descriptor
+        *   +--------------------------------------------------------------+
+        * 0 |         Buffer Address [63:0]                                |
+        *   +--------------------------------------------------------------+
+        * 8 |  PAYLEN  | PORTS  | IDX | STA | DCMD  |DTYP |  RSV |  DTALEN |
+        *   +--------------------------------------------------------------+
+        *   63       46 45    40 39 36 35 32 31   24 23 20 19              0
+        */
+
+       for (n = 0; n < adapter->num_tx_queues; n++) {
+               tx_ring = adapter->tx_ring[n];
+               pr_info("------------------------------------\n");
+               pr_info("TX QUEUE INDEX = %d\n", tx_ring->queue_index);
+               pr_info("------------------------------------\n");
+               pr_info("T [desc]     [address 63:0  ] "
+                       "[PlPOIdStDDt Ln] [bi->dma       ] "
+                       "leng  ntw timestamp        bi->skb\n");
+
+               for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
+                       tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
+                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
+                       u0 = (struct my_u0 *)tx_desc;
+                       pr_info("T [0x%03X]    %016llX %016llX %016llX"
+                               " %04X  %3X %016llX %p", i,
+                               le64_to_cpu(u0->a),
+                               le64_to_cpu(u0->b),
+                               (u64)tx_buffer_info->dma,
+                               tx_buffer_info->length,
+                               tx_buffer_info->next_to_watch,
+                               (u64)tx_buffer_info->time_stamp,
+                               tx_buffer_info->skb);
+                       if (i == tx_ring->next_to_use &&
+                               i == tx_ring->next_to_clean)
+                               pr_cont(" NTC/U\n");
+                       else if (i == tx_ring->next_to_use)
+                               pr_cont(" NTU\n");
+                       else if (i == tx_ring->next_to_clean)
+                               pr_cont(" NTC\n");
+                       else
+                               pr_cont("\n");
+
+                       if (netif_msg_pktdata(adapter) &&
+                               tx_buffer_info->dma != 0)
+                               print_hex_dump(KERN_INFO, "",
+                                       DUMP_PREFIX_ADDRESS, 16, 1,
+                                       phys_to_virt(tx_buffer_info->dma),
+                                       tx_buffer_info->length, true);
+               }
+       }
+
+       /* Print RX Rings Summary */
+rx_ring_summary:
+       dev_info(&adapter->pdev->dev, "RX Rings Summary\n");
+       pr_info("Queue [NTU] [NTC]\n");
+       for (n = 0; n < adapter->num_rx_queues; n++) {
+               rx_ring = adapter->rx_ring[n];
+               pr_info("%5d %5X %5X\n",
+                       n, rx_ring->next_to_use, rx_ring->next_to_clean);
+       }
+
+       /* Print RX Rings */
+       if (!netif_msg_rx_status(adapter))
+               goto exit;
+
+       dev_info(&adapter->pdev->dev, "RX Rings Dump\n");
+
+       /* Advanced Receive Descriptor (Read) Format
+        *    63                                           1        0
+        *    +-----------------------------------------------------+
+        *  0 |       Packet Buffer Address [63:1]           |A0/NSE|
+        *    +----------------------------------------------+------+
+        *  8 |       Header Buffer Address [63:1]           |  DD  |
+        *    +-----------------------------------------------------+
+        *
+        *
+        * Advanced Receive Descriptor (Write-Back) Format
+        *
+        *   63       48 47    32 31  30      21 20 16 15   4 3     0
+        *   +------------------------------------------------------+
+        * 0 | Packet     IP     |SPH| HDR_LEN   | RSV|Packet|  RSS |
+        *   | Checksum   Ident  |   |           |    | Type | Type |
+        *   +------------------------------------------------------+
+        * 8 | VLAN Tag | Length | Extended Error | Extended Status |
+        *   +------------------------------------------------------+
+        *   63       48 47    32 31            20 19               0
+        */
+       for (n = 0; n < adapter->num_rx_queues; n++) {
+               rx_ring = adapter->rx_ring[n];
+               pr_info("------------------------------------\n");
+               pr_info("RX QUEUE INDEX = %d\n", rx_ring->queue_index);
+               pr_info("------------------------------------\n");
+               pr_info("R  [desc]      [ PktBuf     A0] "
+                       "[  HeadBuf   DD] [bi->dma       ] [bi->skb] "
+                       "<-- Adv Rx Read format\n");
+               pr_info("RWB[desc]      [PcsmIpSHl PtRs] "
+                       "[vl er S cks ln] ---------------- [bi->skb] "
+                       "<-- Adv Rx Write-Back format\n");
+
+               for (i = 0; i < rx_ring->count; i++) {
+                       rx_buffer_info = &rx_ring->rx_buffer_info[i];
+                       rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);
+                       u0 = (struct my_u0 *)rx_desc;
+                       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+                       if (staterr & IXGBE_RXD_STAT_DD) {
+                               /* Descriptor Done */
+                               pr_info("RWB[0x%03X]     %016llX "
+                                       "%016llX ---------------- %p", i,
+                                       le64_to_cpu(u0->a),
+                                       le64_to_cpu(u0->b),
+                                       rx_buffer_info->skb);
+                       } else {
+                               pr_info("R  [0x%03X]     %016llX "
+                                       "%016llX %016llX %p", i,
+                                       le64_to_cpu(u0->a),
+                                       le64_to_cpu(u0->b),
+                                       (u64)rx_buffer_info->dma,
+                                       rx_buffer_info->skb);
+
+                               if (netif_msg_pktdata(adapter)) {
+                                       print_hex_dump(KERN_INFO, "",
+                                          DUMP_PREFIX_ADDRESS, 16, 1,
+                                          phys_to_virt(rx_buffer_info->dma),
+                                          rx_ring->rx_buf_len, true);
+
+                                       if (rx_ring->rx_buf_len
+                                               < IXGBE_RXBUFFER_2048)
+                                               print_hex_dump(KERN_INFO, "",
+                                                 DUMP_PREFIX_ADDRESS, 16, 1,
+                                                 phys_to_virt(
+                                                   rx_buffer_info->page_dma +
+                                                   rx_buffer_info->page_offset
+                                                 ),
+                                                 PAGE_SIZE/2, true);
+                               }
+                       }
+
+                       if (i == rx_ring->next_to_use)
+                               pr_cont(" NTU\n");
+                       else if (i == rx_ring->next_to_clean)
+                               pr_cont(" NTC\n");
+                       else
+                               pr_cont("\n");
+
+               }
+       }
+
+exit:
+       return;
+}
+
+static void ixgbe_release_hw_control(struct ixgbe_adapter *adapter)
+{
+       u32 ctrl_ext;
+
+       /* Let firmware take over control of h/w */
+       ctrl_ext = IXGBE_READ_REG(&adapter->hw, IXGBE_CTRL_EXT);
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_CTRL_EXT,
+                       ctrl_ext & ~IXGBE_CTRL_EXT_DRV_LOAD);
+}
+
+static void ixgbe_get_hw_control(struct ixgbe_adapter *adapter)
+{
+       u32 ctrl_ext;
+
+       /* Let firmware know the driver has taken over */
+       ctrl_ext = IXGBE_READ_REG(&adapter->hw, IXGBE_CTRL_EXT);
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_CTRL_EXT,
+                       ctrl_ext | IXGBE_CTRL_EXT_DRV_LOAD);
+}
+
+/*
+ * ixgbe_set_ivar - set the IVAR registers, mapping interrupt causes to vectors
+ * @adapter: pointer to adapter struct
+ * @direction: 0 for Rx, 1 for Tx, -1 for other causes
+ * @queue: queue to map the corresponding interrupt to
+ * @msix_vector: the vector to map to the corresponding queue
+ *
+ */
+static void ixgbe_set_ivar(struct ixgbe_adapter *adapter, s8 direction,
+                          u8 queue, u8 msix_vector)
+{
+       u32 ivar, index;
+       struct ixgbe_hw *hw = &adapter->hw;
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               msix_vector |= IXGBE_IVAR_ALLOC_VAL;
+               if (direction == -1)
+                       direction = 0;
+               index = (((direction * 64) + queue) >> 2) & 0x1F;
+               ivar = IXGBE_READ_REG(hw, IXGBE_IVAR(index));
+               ivar &= ~(0xFF << (8 * (queue & 0x3)));
+               ivar |= (msix_vector << (8 * (queue & 0x3)));
+               IXGBE_WRITE_REG(hw, IXGBE_IVAR(index), ivar);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               if (direction == -1) {
+                       /* other causes */
+                       msix_vector |= IXGBE_IVAR_ALLOC_VAL;
+                       index = ((queue & 1) * 8);
+                       ivar = IXGBE_READ_REG(&adapter->hw, IXGBE_IVAR_MISC);
+                       ivar &= ~(0xFF << index);
+                       ivar |= (msix_vector << index);
+                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_IVAR_MISC, ivar);
+                       break;
+               } else {
+                       /* tx or rx causes */
+                       msix_vector |= IXGBE_IVAR_ALLOC_VAL;
+                       index = ((16 * (queue & 1)) + (8 * direction));
+                       ivar = IXGBE_READ_REG(hw, IXGBE_IVAR(queue >> 1));
+                       ivar &= ~(0xFF << index);
+                       ivar |= (msix_vector << index);
+                       IXGBE_WRITE_REG(hw, IXGBE_IVAR(queue >> 1), ivar);
+                       break;
+               }
+       default:
+               break;
+       }
+}
+
+static inline void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter,
+                                         u64 qmask)
+{
+       u32 mask;
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82598EB:
+               mask = (IXGBE_EIMS_RTX_QUEUE & qmask);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, mask);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               mask = (qmask & 0xFFFFFFFF);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(0), mask);
+               mask = (qmask >> 32);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(1), mask);
+               break;
+       default:
+               break;
+       }
+}
+
+void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *tx_ring,
+                                     struct ixgbe_tx_buffer *tx_buffer_info)
+{
+       if (tx_buffer_info->dma) {
+               if (tx_buffer_info->mapped_as_page)
+                       dma_unmap_page(tx_ring->dev,
+                                      tx_buffer_info->dma,
+                                      tx_buffer_info->length,
+                                      DMA_TO_DEVICE);
+               else
+                       dma_unmap_single(tx_ring->dev,
+                                        tx_buffer_info->dma,
+                                        tx_buffer_info->length,
+                                        DMA_TO_DEVICE);
+               tx_buffer_info->dma = 0;
+       }
+       if (tx_buffer_info->skb) {
+               dev_kfree_skb_any(tx_buffer_info->skb);
+               tx_buffer_info->skb = NULL;
+       }
+       tx_buffer_info->time_stamp = 0;
+       /* tx_buffer_info must be completely set up in the transmit path */
+}
+
+static void ixgbe_update_xoff_received(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbe_hw_stats *hwstats = &adapter->stats;
+       u32 data = 0;
+       u32 xoff[8] = {0};
+       int i;
+
+       if ((hw->fc.current_mode == ixgbe_fc_full) ||
+           (hw->fc.current_mode == ixgbe_fc_rx_pause)) {
+               switch (hw->mac.type) {
+               case ixgbe_mac_82598EB:
+                       data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
+                       break;
+               default:
+                       data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
+               }
+               hwstats->lxoffrxc += data;
+
+               /* refill credits (no tx hang) if we received xoff */
+               if (!data)
+                       return;
+
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       clear_bit(__IXGBE_HANG_CHECK_ARMED,
+                                 &adapter->tx_ring[i]->state);
+               return;
+       } else if (!(adapter->dcb_cfg.pfc_mode_enable))
+               return;
+
+       /* update stats for each tc, only valid with PFC enabled */
+       for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) {
+               switch (hw->mac.type) {
+               case ixgbe_mac_82598EB:
+                       xoff[i] = IXGBE_READ_REG(hw, IXGBE_PXOFFRXC(i));
+                       break;
+               default:
+                       xoff[i] = IXGBE_READ_REG(hw, IXGBE_PXOFFRXCNT(i));
+               }
+               hwstats->pxoffrxc[i] += xoff[i];
+       }
+
+       /* disarm tx queues that have received xoff frames */
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               struct ixgbe_ring *tx_ring = adapter->tx_ring[i];
+               u8 tc = tx_ring->dcb_tc;
+
+               if (xoff[tc])
+                       clear_bit(__IXGBE_HANG_CHECK_ARMED, &tx_ring->state);
+       }
+}
+
+static u64 ixgbe_get_tx_completed(struct ixgbe_ring *ring)
+{
+       return ring->tx_stats.completed;
+}
+
+static u64 ixgbe_get_tx_pending(struct ixgbe_ring *ring)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(ring->netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       u32 head = IXGBE_READ_REG(hw, IXGBE_TDH(ring->reg_idx));
+       u32 tail = IXGBE_READ_REG(hw, IXGBE_TDT(ring->reg_idx));
+
+       if (head != tail)
+               return (head < tail) ?
+                       tail - head : (tail + ring->count - head);
+
+       return 0;
+}
+
+static inline bool ixgbe_check_tx_hang(struct ixgbe_ring *tx_ring)
+{
+       u32 tx_done = ixgbe_get_tx_completed(tx_ring);
+       u32 tx_done_old = tx_ring->tx_stats.tx_done_old;
+       u32 tx_pending = ixgbe_get_tx_pending(tx_ring);
+       bool ret = false;
+
+       clear_check_for_tx_hang(tx_ring);
+
+       /*
+        * Check for a hung queue, but be thorough. This verifies
+        * that a transmit has been completed since the previous
+        * check AND there is at least one packet pending. The
+        * ARMED bit is set to indicate a potential hang. The
+        * bit is cleared if a pause frame is received to remove
+        * false hang detection due to PFC or 802.3x frames. By
+        * requiring this to fail twice we avoid races with
+        * pfc clearing the ARMED bit and conditions where we
+        * run the check_tx_hang logic with a transmit completion
+        * pending but without time to complete it yet.
+        */
+       if ((tx_done_old == tx_done) && tx_pending) {
+               /* make sure it is true for two checks in a row */
+               ret = test_and_set_bit(__IXGBE_HANG_CHECK_ARMED,
+                                      &tx_ring->state);
+       } else {
+               /* update completed stats and continue */
+               tx_ring->tx_stats.tx_done_old = tx_done;
+               /* reset the countdown */
+               clear_bit(__IXGBE_HANG_CHECK_ARMED, &tx_ring->state);
+       }
+
+       return ret;
+}
+
+/**
+ * ixgbe_tx_timeout_reset - initiate reset due to Tx timeout
+ * @adapter: driver private struct
+ **/
+static void ixgbe_tx_timeout_reset(struct ixgbe_adapter *adapter)
+{
+
+       /* Do the reset outside of interrupt context */
+       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
+               adapter->flags2 |= IXGBE_FLAG2_RESET_REQUESTED;
+               ixgbe_service_event_schedule(adapter);
+       }
+}
+
+/**
+ * ixgbe_clean_tx_irq - Reclaim resources after transmit completes
+ * @q_vector: structure containing interrupt and ring information
+ * @tx_ring: tx ring to clean
+ **/
+static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
+                              struct ixgbe_ring *tx_ring)
+{
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       union ixgbe_adv_tx_desc *tx_desc, *eop_desc;
+       struct ixgbe_tx_buffer *tx_buffer_info;
+       unsigned int total_bytes = 0, total_packets = 0;
+       u16 i, eop, count = 0;
+
+       i = tx_ring->next_to_clean;
+       eop = tx_ring->tx_buffer_info[i].next_to_watch;
+       eop_desc = IXGBE_TX_DESC_ADV(tx_ring, eop);
+
+       while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
+              (count < q_vector->tx.work_limit)) {
+               bool cleaned = false;
+               rmb(); /* read buffer_info after eop_desc */
+               for ( ; !cleaned; count++) {
+                       tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
+                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
+
+                       tx_desc->wb.status = 0;
+                       cleaned = (i == eop);
+
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+
+                       if (cleaned && tx_buffer_info->skb) {
+                               total_bytes += tx_buffer_info->bytecount;
+                               total_packets += tx_buffer_info->gso_segs;
+                       }
+
+                       ixgbe_unmap_and_free_tx_resource(tx_ring,
+                                                        tx_buffer_info);
+               }
+
+               tx_ring->tx_stats.completed++;
+               eop = tx_ring->tx_buffer_info[i].next_to_watch;
+               eop_desc = IXGBE_TX_DESC_ADV(tx_ring, eop);
+       }
+
+       tx_ring->next_to_clean = i;
+       tx_ring->stats.bytes += total_bytes;
+       tx_ring->stats.packets += total_packets;
+       u64_stats_update_begin(&tx_ring->syncp);
+       q_vector->tx.total_bytes += total_bytes;
+       q_vector->tx.total_packets += total_packets;
+       u64_stats_update_end(&tx_ring->syncp);
+
+       if (check_for_tx_hang(tx_ring) && ixgbe_check_tx_hang(tx_ring)) {
+               /* schedule immediate reset if we believe we hung */
+               struct ixgbe_hw *hw = &adapter->hw;
+               tx_desc = IXGBE_TX_DESC_ADV(tx_ring, eop);
+               e_err(drv, "Detected Tx Unit Hang\n"
+                       "  Tx Queue             <%d>\n"
+                       "  TDH, TDT             <%x>, <%x>\n"
+                       "  next_to_use          <%x>\n"
+                       "  next_to_clean        <%x>\n"
+                       "tx_buffer_info[next_to_clean]\n"
+                       "  time_stamp           <%lx>\n"
+                       "  jiffies              <%lx>\n",
+                       tx_ring->queue_index,
+                       IXGBE_READ_REG(hw, IXGBE_TDH(tx_ring->reg_idx)),
+                       IXGBE_READ_REG(hw, IXGBE_TDT(tx_ring->reg_idx)),
+                       tx_ring->next_to_use, eop,
+                       tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
+
+               netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
+
+               e_info(probe,
+                      "tx hang %d detected on queue %d, resetting adapter\n",
+                       adapter->tx_timeout_count + 1, tx_ring->queue_index);
+
+               /* schedule immediate reset if we believe we hung */
+               ixgbe_tx_timeout_reset(adapter);
+
+               /* the adapter is about to reset, no point in enabling stuff */
+               return true;
+       }
+
+#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
+       if (unlikely(count && netif_carrier_ok(tx_ring->netdev) &&
+                    (ixgbe_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD))) {
+               /* Make sure that anybody stopping the queue after this
+                * sees the new next_to_clean.
+                */
+               smp_mb();
+               if (__netif_subqueue_stopped(tx_ring->netdev, tx_ring->queue_index) &&
+                   !test_bit(__IXGBE_DOWN, &adapter->state)) {
+                       netif_wake_subqueue(tx_ring->netdev, tx_ring->queue_index);
+                       ++tx_ring->tx_stats.restart_queue;
+               }
+       }
+
+       return count < q_vector->tx.work_limit;
+}
+
+#ifdef CONFIG_IXGBE_DCA
+static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
+                               struct ixgbe_ring *rx_ring,
+                               int cpu)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 rxctrl;
+       u8 reg_idx = rx_ring->reg_idx;
+
+       rxctrl = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(reg_idx));
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK;
+               rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK_82599;
+               rxctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
+                          IXGBE_DCA_RXCTRL_CPUID_SHIFT_82599);
+               break;
+       default:
+               break;
+       }
+       rxctrl |= IXGBE_DCA_RXCTRL_DESC_DCA_EN;
+       rxctrl |= IXGBE_DCA_RXCTRL_HEAD_DCA_EN;
+       rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_RRO_EN);
+       IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(reg_idx), rxctrl);
+}
+
+static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,
+                               struct ixgbe_ring *tx_ring,
+                               int cpu)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 txctrl;
+       u8 reg_idx = tx_ring->reg_idx;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(reg_idx));
+               txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK;
+               txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
+               txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
+               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(reg_idx), txctrl);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(reg_idx));
+               txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK_82599;
+               txctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
+                          IXGBE_DCA_TXCTRL_CPUID_SHIFT_82599);
+               txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
+               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(reg_idx), txctrl);
+               break;
+       default:
+               break;
+       }
+}
+
+static void ixgbe_update_dca(struct ixgbe_q_vector *q_vector)
+{
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       int cpu = get_cpu();
+       long r_idx;
+       int i;
+
+       if (q_vector->cpu == cpu)
+               goto out_no_update;
+
+       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
+       for (i = 0; i < q_vector->tx.count; i++) {
+               ixgbe_update_tx_dca(adapter, adapter->tx_ring[r_idx], cpu);
+               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
+                                     r_idx + 1);
+       }
+
+       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
+       for (i = 0; i < q_vector->rx.count; i++) {
+               ixgbe_update_rx_dca(adapter, adapter->rx_ring[r_idx], cpu);
+               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
+                                     r_idx + 1);
+       }
+
+       q_vector->cpu = cpu;
+out_no_update:
+       put_cpu();
+}
+
+static void ixgbe_setup_dca(struct ixgbe_adapter *adapter)
+{
+       int num_q_vectors;
+       int i;
+
+       if (!(adapter->flags & IXGBE_FLAG_DCA_ENABLED))
+               return;
+
+       /* always use CB2 mode, difference is masked in the CB driver */
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 2);
+
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
+               num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+       else
+               num_q_vectors = 1;
+
+       for (i = 0; i < num_q_vectors; i++) {
+               adapter->q_vector[i]->cpu = -1;
+               ixgbe_update_dca(adapter->q_vector[i]);
+       }
+}
+
+static int __ixgbe_notify_dca(struct device *dev, void *data)
+{
+       struct ixgbe_adapter *adapter = dev_get_drvdata(dev);
+       unsigned long event = *(unsigned long *)data;
+
+       if (!(adapter->flags & IXGBE_FLAG_DCA_CAPABLE))
+               return 0;
+
+       switch (event) {
+       case DCA_PROVIDER_ADD:
+               /* if we're already enabled, don't do it again */
+               if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+                       break;
+               if (dca_add_requester(dev) == 0) {
+                       adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
+                       ixgbe_setup_dca(adapter);
+                       break;
+               }
+               /* Fall Through since DCA is disabled. */
+       case DCA_PROVIDER_REMOVE:
+               if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
+                       dca_remove_requester(dev);
+                       adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
+                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 1);
+               }
+               break;
+       }
+
+       return 0;
+}
+#endif /* CONFIG_IXGBE_DCA */
+
+static inline void ixgbe_rx_hash(union ixgbe_adv_rx_desc *rx_desc,
+                                struct sk_buff *skb)
+{
+       skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
+}
+
+/**
+ * ixgbe_rx_is_fcoe - check the rx desc for incoming pkt type
+ * @adapter: address of board private structure
+ * @rx_desc: advanced rx descriptor
+ *
+ * Returns : true if it is FCoE pkt
+ */
+static inline bool ixgbe_rx_is_fcoe(struct ixgbe_adapter *adapter,
+                                   union ixgbe_adv_rx_desc *rx_desc)
+{
+       __le16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
+
+       return (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
+              ((pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_ETQF_MASK)) ==
+               (cpu_to_le16(IXGBE_ETQF_FILTER_FCOE <<
+                            IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT)));
+}
+
+/**
+ * ixgbe_receive_skb - Send a completed packet up the stack
+ * @adapter: board private structure
+ * @skb: packet to send up
+ * @status: hardware indication of status of receive
+ * @rx_ring: rx descriptor ring (for a specific queue) to setup
+ * @rx_desc: rx descriptor
+ **/
+static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
+                             struct sk_buff *skb, u8 status,
+                             struct ixgbe_ring *ring,
+                             union ixgbe_adv_rx_desc *rx_desc)
+{
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       struct napi_struct *napi = &q_vector->napi;
+       bool is_vlan = (status & IXGBE_RXD_STAT_VP);
+       u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
+
+       if (is_vlan && (tag & VLAN_VID_MASK))
+               __vlan_hwaccel_put_tag(skb, tag);
+
+       if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))
+               napi_gro_receive(napi, skb);
+       else
+               netif_rx(skb);
+}
+
+/**
+ * ixgbe_rx_checksum - indicate in skb if hw indicated a good cksum
+ * @adapter: address of board private structure
+ * @status_err: hardware indication of status of receive
+ * @skb: skb currently being received and modified
+ * @status_err: status error value of last descriptor in packet
+ **/
+static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,
+                                    union ixgbe_adv_rx_desc *rx_desc,
+                                    struct sk_buff *skb,
+                                    u32 status_err)
+{
+       skb->ip_summed = CHECKSUM_NONE;
+
+       /* Rx csum disabled */
+       if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED))
+               return;
+
+       /* if IP and error */
+       if ((status_err & IXGBE_RXD_STAT_IPCS) &&
+           (status_err & IXGBE_RXDADV_ERR_IPE)) {
+               adapter->hw_csum_rx_error++;
+               return;
+       }
+
+       if (!(status_err & IXGBE_RXD_STAT_L4CS))
+               return;
+
+       if (status_err & IXGBE_RXDADV_ERR_TCPE) {
+               u16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
+
+               /*
+                * 82599 errata, UDP frames with a 0 checksum can be marked as
+                * checksum errors.
+                */
+               if ((pkt_info & IXGBE_RXDADV_PKTTYPE_UDP) &&
+                   (adapter->hw.mac.type == ixgbe_mac_82599EB))
+                       return;
+
+               adapter->hw_csum_rx_error++;
+               return;
+       }
+
+       /* It must be a TCP or UDP packet with a valid checksum */
+       skb->ip_summed = CHECKSUM_UNNECESSARY;
+}
+
+static inline void ixgbe_release_rx_desc(struct ixgbe_ring *rx_ring, u32 val)
+{
+       /*
+        * Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64).
+        */
+       wmb();
+       writel(val, rx_ring->tail);
+}
+
+/**
+ * ixgbe_alloc_rx_buffers - Replace used receive buffers; packet split
+ * @rx_ring: ring to place buffers on
+ * @cleaned_count: number of buffers to replace
+ **/
+void ixgbe_alloc_rx_buffers(struct ixgbe_ring *rx_ring, u16 cleaned_count)
+{
+       union ixgbe_adv_rx_desc *rx_desc;
+       struct ixgbe_rx_buffer *bi;
+       struct sk_buff *skb;
+       u16 i = rx_ring->next_to_use;
+
+       /* do nothing if no valid netdev defined */
+       if (!rx_ring->netdev)
+               return;
+
+       while (cleaned_count--) {
+               rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);
+               bi = &rx_ring->rx_buffer_info[i];
+               skb = bi->skb;
+
+               if (!skb) {
+                       skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
+                                                       rx_ring->rx_buf_len);
+                       if (!skb) {
+                               rx_ring->rx_stats.alloc_rx_buff_failed++;
+                               goto no_buffers;
+                       }
+                       /* initialize queue mapping */
+                       skb_record_rx_queue(skb, rx_ring->queue_index);
+                       bi->skb = skb;
+               }
+
+               if (!bi->dma) {
+                       bi->dma = dma_map_single(rx_ring->dev,
+                                                skb->data,
+                                                rx_ring->rx_buf_len,
+                                                DMA_FROM_DEVICE);
+                       if (dma_mapping_error(rx_ring->dev, bi->dma)) {
+                               rx_ring->rx_stats.alloc_rx_buff_failed++;
+                               bi->dma = 0;
+                               goto no_buffers;
+                       }
+               }
+
+               if (ring_is_ps_enabled(rx_ring)) {
+                       if (!bi->page) {
+                               bi->page = netdev_alloc_page(rx_ring->netdev);
+                               if (!bi->page) {
+                                       rx_ring->rx_stats.alloc_rx_page_failed++;
+                                       goto no_buffers;
+                               }
+                       }
+
+                       if (!bi->page_dma) {
+                               /* use a half page if we're re-using */
+                               bi->page_offset ^= PAGE_SIZE / 2;
+                               bi->page_dma = dma_map_page(rx_ring->dev,
+                                                           bi->page,
+                                                           bi->page_offset,
+                                                           PAGE_SIZE / 2,
+                                                           DMA_FROM_DEVICE);
+                               if (dma_mapping_error(rx_ring->dev,
+                                                     bi->page_dma)) {
+                                       rx_ring->rx_stats.alloc_rx_page_failed++;
+                                       bi->page_dma = 0;
+                                       goto no_buffers;
+                               }
+                       }
+
+                       /* Refresh the desc even if buffer_addrs didn't change
+                        * because each write-back erases this info. */
+                       rx_desc->read.pkt_addr = cpu_to_le64(bi->page_dma);
+                       rx_desc->read.hdr_addr = cpu_to_le64(bi->dma);
+               } else {
+                       rx_desc->read.pkt_addr = cpu_to_le64(bi->dma);
+                       rx_desc->read.hdr_addr = 0;
+               }
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+       }
+
+no_buffers:
+       if (rx_ring->next_to_use != i) {
+               rx_ring->next_to_use = i;
+               ixgbe_release_rx_desc(rx_ring, i);
+       }
+}
+
+static inline u16 ixgbe_get_hlen(union ixgbe_adv_rx_desc *rx_desc)
+{
+       /* HW will not DMA in data larger than the given buffer, even if it
+        * parses the (NFS, of course) header to be larger.  In that case, it
+        * fills the header buffer and spills the rest into the page.
+        */
+       u16 hdr_info = le16_to_cpu(rx_desc->wb.lower.lo_dword.hs_rss.hdr_info);
+       u16 hlen = (hdr_info &  IXGBE_RXDADV_HDRBUFLEN_MASK) >>
+                   IXGBE_RXDADV_HDRBUFLEN_SHIFT;
+       if (hlen > IXGBE_RX_HDR_SIZE)
+               hlen = IXGBE_RX_HDR_SIZE;
+       return hlen;
+}
+
+/**
+ * ixgbe_transform_rsc_queue - change rsc queue into a full packet
+ * @skb: pointer to the last skb in the rsc queue
+ *
+ * This function changes a queue full of hw rsc buffers into a completed
+ * packet.  It uses the ->prev pointers to find the first packet and then
+ * turns it into the frag list owner.
+ **/
+static inline struct sk_buff *ixgbe_transform_rsc_queue(struct sk_buff *skb)
+{
+       unsigned int frag_list_size = 0;
+       unsigned int skb_cnt = 1;
+
+       while (skb->prev) {
+               struct sk_buff *prev = skb->prev;
+               frag_list_size += skb->len;
+               skb->prev = NULL;
+               skb = prev;
+               skb_cnt++;
+       }
+
+       skb_shinfo(skb)->frag_list = skb->next;
+       skb->next = NULL;
+       skb->len += frag_list_size;
+       skb->data_len += frag_list_size;
+       skb->truesize += frag_list_size;
+       IXGBE_RSC_CB(skb)->skb_cnt = skb_cnt;
+
+       return skb;
+}
+
+static inline bool ixgbe_get_rsc_state(union ixgbe_adv_rx_desc *rx_desc)
+{
+       return !!(le32_to_cpu(rx_desc->wb.lower.lo_dword.data) &
+               IXGBE_RXDADV_RSCCNT_MASK);
+}
+
+static void ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
+                              struct ixgbe_ring *rx_ring,
+                              int *work_done, int work_to_do)
+{
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       union ixgbe_adv_rx_desc *rx_desc, *next_rxd;
+       struct ixgbe_rx_buffer *rx_buffer_info, *next_buffer;
+       struct sk_buff *skb;
+       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+       const int current_node = numa_node_id();
+#ifdef IXGBE_FCOE
+       int ddp_bytes = 0;
+#endif /* IXGBE_FCOE */
+       u32 staterr;
+       u16 i;
+       u16 cleaned_count = 0;
+       bool pkt_is_rsc = false;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);
+       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+
+       while (staterr & IXGBE_RXD_STAT_DD) {
+               u32 upper_len = 0;
+
+               rmb(); /* read descriptor and rx_buffer_info after status DD */
+
+               rx_buffer_info = &rx_ring->rx_buffer_info[i];
+
+               skb = rx_buffer_info->skb;
+               rx_buffer_info->skb = NULL;
+               prefetch(skb->data);
+
+               if (ring_is_rsc_enabled(rx_ring))
+                       pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
+
+               /* if this is a skb from previous receive DMA will be 0 */
+               if (rx_buffer_info->dma) {
+                       u16 hlen;
+                       if (pkt_is_rsc &&
+                           !(staterr & IXGBE_RXD_STAT_EOP) &&
+                           !skb->prev) {
+                               /*
+                                * When HWRSC is enabled, delay unmapping
+                                * of the first packet. It carries the
+                                * header information, HW may still
+                                * access the header after the writeback.
+                                * Only unmap it when EOP is reached
+                                */
+                               IXGBE_RSC_CB(skb)->delay_unmap = true;
+                               IXGBE_RSC_CB(skb)->dma = rx_buffer_info->dma;
+                       } else {
+                               dma_unmap_single(rx_ring->dev,
+                                                rx_buffer_info->dma,
+                                                rx_ring->rx_buf_len,
+                                                DMA_FROM_DEVICE);
+                       }
+                       rx_buffer_info->dma = 0;
+
+                       if (ring_is_ps_enabled(rx_ring)) {
+                               hlen = ixgbe_get_hlen(rx_desc);
+                               upper_len = le16_to_cpu(rx_desc->wb.upper.length);
+                       } else {
+                               hlen = le16_to_cpu(rx_desc->wb.upper.length);
+                       }
+
+                       skb_put(skb, hlen);
+               } else {
+                       /* assume packet split since header is unmapped */
+                       upper_len = le16_to_cpu(rx_desc->wb.upper.length);
+               }
+
+               if (upper_len) {
+                       dma_unmap_page(rx_ring->dev,
+                                      rx_buffer_info->page_dma,
+                                      PAGE_SIZE / 2,
+                                      DMA_FROM_DEVICE);
+                       rx_buffer_info->page_dma = 0;
+                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
+                                          rx_buffer_info->page,
+                                          rx_buffer_info->page_offset,
+                                          upper_len);
+
+                       if ((page_count(rx_buffer_info->page) == 1) &&
+                           (page_to_nid(rx_buffer_info->page) == current_node))
+                               get_page(rx_buffer_info->page);
+                       else
+                               rx_buffer_info->page = NULL;
+
+                       skb->len += upper_len;
+                       skb->data_len += upper_len;
+                       skb->truesize += upper_len;
+               }
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+
+               next_rxd = IXGBE_RX_DESC_ADV(rx_ring, i);
+               prefetch(next_rxd);
+               cleaned_count++;
+
+               if (pkt_is_rsc) {
+                       u32 nextp = (staterr & IXGBE_RXDADV_NEXTP_MASK) >>
+                                    IXGBE_RXDADV_NEXTP_SHIFT;
+                       next_buffer = &rx_ring->rx_buffer_info[nextp];
+               } else {
+                       next_buffer = &rx_ring->rx_buffer_info[i];
+               }
+
+               if (!(staterr & IXGBE_RXD_STAT_EOP)) {
+                       if (ring_is_ps_enabled(rx_ring)) {
+                               rx_buffer_info->skb = next_buffer->skb;
+                               rx_buffer_info->dma = next_buffer->dma;
+                               next_buffer->skb = skb;
+                               next_buffer->dma = 0;
+                       } else {
+                               skb->next = next_buffer->skb;
+                               skb->next->prev = skb;
+                       }
+                       rx_ring->rx_stats.non_eop_descs++;
+                       goto next_desc;
+               }
+
+               if (skb->prev) {
+                       skb = ixgbe_transform_rsc_queue(skb);
+                       /* if we got here without RSC the packet is invalid */
+                       if (!pkt_is_rsc) {
+                               __pskb_trim(skb, 0);
+                               rx_buffer_info->skb = skb;
+                               goto next_desc;
+                       }
+               }
+
+               if (ring_is_rsc_enabled(rx_ring)) {
+                       if (IXGBE_RSC_CB(skb)->delay_unmap) {
+                               dma_unmap_single(rx_ring->dev,
+                                                IXGBE_RSC_CB(skb)->dma,
+                                                rx_ring->rx_buf_len,
+                                                DMA_FROM_DEVICE);
+                               IXGBE_RSC_CB(skb)->dma = 0;
+                               IXGBE_RSC_CB(skb)->delay_unmap = false;
+                       }
+               }
+               if (pkt_is_rsc) {
+                       if (ring_is_ps_enabled(rx_ring))
+                               rx_ring->rx_stats.rsc_count +=
+                                       skb_shinfo(skb)->nr_frags;
+                       else
+                               rx_ring->rx_stats.rsc_count +=
+                                       IXGBE_RSC_CB(skb)->skb_cnt;
+                       rx_ring->rx_stats.rsc_flush++;
+               }
+
+               /* ERR_MASK will only have valid bits if EOP set */
+               if (unlikely(staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK)) {
+                       dev_kfree_skb_any(skb);
+                       goto next_desc;
+               }
+
+               ixgbe_rx_checksum(adapter, rx_desc, skb, staterr);
+               if (adapter->netdev->features & NETIF_F_RXHASH)
+                       ixgbe_rx_hash(rx_desc, skb);
+
+               /* probably a little skewed due to removing CRC */
+               total_rx_bytes += skb->len;
+               total_rx_packets++;
+
+               skb->protocol = eth_type_trans(skb, rx_ring->netdev);
+#ifdef IXGBE_FCOE
+               /* if ddp, not passing to ULD unless for FCP_RSP or error */
+               if (ixgbe_rx_is_fcoe(adapter, rx_desc)) {
+                       ddp_bytes = ixgbe_fcoe_ddp(adapter, rx_desc, skb,
+                                                  staterr);
+                       if (!ddp_bytes)
+                               goto next_desc;
+               }
+#endif /* IXGBE_FCOE */
+               ixgbe_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc);
+
+next_desc:
+               rx_desc->wb.upper.status_error = 0;
+
+               (*work_done)++;
+               if (*work_done >= work_to_do)
+                       break;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (cleaned_count >= IXGBE_RX_BUFFER_WRITE) {
+                       ixgbe_alloc_rx_buffers(rx_ring, cleaned_count);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+       }
+
+       rx_ring->next_to_clean = i;
+       cleaned_count = ixgbe_desc_unused(rx_ring);
+
+       if (cleaned_count)
+               ixgbe_alloc_rx_buffers(rx_ring, cleaned_count);
+
+#ifdef IXGBE_FCOE
+       /* include DDPed FCoE data */
+       if (ddp_bytes > 0) {
+               unsigned int mss;
+
+               mss = rx_ring->netdev->mtu - sizeof(struct fcoe_hdr) -
+                       sizeof(struct fc_frame_header) -
+                       sizeof(struct fcoe_crc_eof);
+               if (mss > 512)
+                       mss &= ~511;
+               total_rx_bytes += ddp_bytes;
+               total_rx_packets += DIV_ROUND_UP(ddp_bytes, mss);
+       }
+#endif /* IXGBE_FCOE */
+
+       u64_stats_update_begin(&rx_ring->syncp);
+       rx_ring->stats.packets += total_rx_packets;
+       rx_ring->stats.bytes += total_rx_bytes;
+       u64_stats_update_end(&rx_ring->syncp);
+       q_vector->rx.total_packets += total_rx_packets;
+       q_vector->rx.total_bytes += total_rx_bytes;
+}
+
+static int ixgbe_clean_rxonly(struct napi_struct *, int);
+/**
+ * ixgbe_configure_msix - Configure MSI-X hardware
+ * @adapter: board private structure
+ *
+ * ixgbe_configure_msix sets up the hardware to properly generate MSI-X
+ * interrupts.
+ **/
+static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_q_vector *q_vector;
+       int i, q_vectors, v_idx, r_idx;
+       u32 mask;
+
+       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       /*
+        * Populate the IVAR table and set the ITR values to the
+        * corresponding register.
+        */
+       for (v_idx = 0; v_idx < q_vectors; v_idx++) {
+               q_vector = adapter->q_vector[v_idx];
+               /* XXX for_each_set_bit(...) */
+               r_idx = find_first_bit(q_vector->rx.idx,
+                                      adapter->num_rx_queues);
+
+               for (i = 0; i < q_vector->rx.count; i++) {
+                       u8 reg_idx = adapter->rx_ring[r_idx]->reg_idx;
+                       ixgbe_set_ivar(adapter, 0, reg_idx, v_idx);
+                       r_idx = find_next_bit(q_vector->rx.idx,
+                                             adapter->num_rx_queues,
+                                             r_idx + 1);
+               }
+               r_idx = find_first_bit(q_vector->tx.idx,
+                                      adapter->num_tx_queues);
+
+               for (i = 0; i < q_vector->tx.count; i++) {
+                       u8 reg_idx = adapter->tx_ring[r_idx]->reg_idx;
+                       ixgbe_set_ivar(adapter, 1, reg_idx, v_idx);
+                       r_idx = find_next_bit(q_vector->tx.idx,
+                                             adapter->num_tx_queues,
+                                             r_idx + 1);
+               }
+
+               if (q_vector->tx.count && !q_vector->rx.count)
+                       /* tx only */
+                       q_vector->eitr = adapter->tx_eitr_param;
+               else if (q_vector->rx.count)
+                       /* rx or mixed */
+                       q_vector->eitr = adapter->rx_eitr_param;
+
+               ixgbe_write_eitr(q_vector);
+               /* If ATR is enabled, set interrupt affinity */
+               if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
+                       /*
+                        * Allocate the affinity_hint cpumask, assign the mask
+                        * for this vector, and set our affinity_hint for
+                        * this irq.
+                        */
+                       if (!alloc_cpumask_var(&q_vector->affinity_mask,
+                                              GFP_KERNEL))
+                               return;
+                       cpumask_set_cpu(v_idx, q_vector->affinity_mask);
+                       irq_set_affinity_hint(adapter->msix_entries[v_idx].vector,
+                                             q_vector->affinity_mask);
+               }
+       }
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82598EB:
+               ixgbe_set_ivar(adapter, -1, IXGBE_IVAR_OTHER_CAUSES_INDEX,
+                              v_idx);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               ixgbe_set_ivar(adapter, -1, 1, v_idx);
+               break;
+
+       default:
+               break;
+       }
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITR(v_idx), 1950);
+
+       /* set up to autoclear timer, and the vectors */
+       mask = IXGBE_EIMS_ENABLE_MASK;
+       if (adapter->num_vfs)
+               mask &= ~(IXGBE_EIMS_OTHER |
+                         IXGBE_EIMS_MAILBOX |
+                         IXGBE_EIMS_LSC);
+       else
+               mask &= ~(IXGBE_EIMS_OTHER | IXGBE_EIMS_LSC);
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIAC, mask);
+}
+
+enum latency_range {
+       lowest_latency = 0,
+       low_latency = 1,
+       bulk_latency = 2,
+       latency_invalid = 255
+};
+
+/**
+ * ixgbe_update_itr - update the dynamic ITR value based on statistics
+ * @q_vector: structure containing interrupt and ring information
+ * @ring_container: structure containing ring performance data
+ *
+ *      Stores a new ITR value based on packets and byte
+ *      counts during the last interrupt.  The advantage of per interrupt
+ *      computation is faster updates and more accurate ITR for the current
+ *      traffic pattern.  Constants in this function were computed
+ *      based on theoretical maximum wire speed and thresholds were set based
+ *      on testing data as well as attempting to minimize response time
+ *      while increasing bulk throughput.
+ *      this functionality is controlled by the InterruptThrottleRate module
+ *      parameter (see ixgbe_param.c)
+ **/
+static void ixgbe_update_itr(struct ixgbe_q_vector *q_vector,
+                            struct ixgbe_ring_container *ring_container)
+{
+       u64 bytes_perint;
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       int bytes = ring_container->total_bytes;
+       int packets = ring_container->total_packets;
+       u32 timepassed_us;
+       u8 itr_setting = ring_container->itr;
+
+       if (packets == 0)
+               return;
+
+       /* simple throttlerate management
+        *    0-20MB/s lowest (100000 ints/s)
+        *   20-100MB/s low   (20000 ints/s)
+        *  100-1249MB/s bulk (8000 ints/s)
+        */
+       /* what was last interrupt timeslice? */
+       timepassed_us = 1000000/q_vector->eitr;
+       bytes_perint = bytes / timepassed_us; /* bytes/usec */
+
+       switch (itr_setting) {
+       case lowest_latency:
+               if (bytes_perint > adapter->eitr_low)
+                       itr_setting = low_latency;
+               break;
+       case low_latency:
+               if (bytes_perint > adapter->eitr_high)
+                       itr_setting = bulk_latency;
+               else if (bytes_perint <= adapter->eitr_low)
+                       itr_setting = lowest_latency;
+               break;
+       case bulk_latency:
+               if (bytes_perint <= adapter->eitr_high)
+                       itr_setting = low_latency;
+               break;
+       }
+
+       /* clear work counters since we have the values we need */
+       ring_container->total_bytes = 0;
+       ring_container->total_packets = 0;
+
+       /* write updated itr to ring container */
+       ring_container->itr = itr_setting;
+}
+
+/**
+ * ixgbe_write_eitr - write EITR register in hardware specific way
+ * @q_vector: structure containing interrupt and ring information
+ *
+ * This function is made to be called by ethtool and by the driver
+ * when it needs to update EITR registers at runtime.  Hardware
+ * specific quirks/differences are taken care of here.
+ */
+void ixgbe_write_eitr(struct ixgbe_q_vector *q_vector)
+{
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       struct ixgbe_hw *hw = &adapter->hw;
+       int v_idx = q_vector->v_idx;
+       u32 itr_reg = EITR_INTS_PER_SEC_TO_REG(q_vector->eitr);
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82598EB:
+               /* must write high and low 16 bits to reset counter */
+               itr_reg |= (itr_reg << 16);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               /*
+                * 82599 and X540 can support a value of zero, so allow it for
+                * max interrupt rate, but there is an errata where it can
+                * not be zero with RSC
+                */
+               if (itr_reg == 8 &&
+                   !(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED))
+                       itr_reg = 0;
+
+               /*
+                * set the WDIS bit to not clear the timer bits and cause an
+                * immediate assertion of the interrupt
+                */
+               itr_reg |= IXGBE_EITR_CNT_WDIS;
+               break;
+       default:
+               break;
+       }
+       IXGBE_WRITE_REG(hw, IXGBE_EITR(v_idx), itr_reg);
+}
+
+static void ixgbe_set_itr(struct ixgbe_q_vector *q_vector)
+{
+       u32 new_itr = q_vector->eitr;
+       u8 current_itr;
+
+       ixgbe_update_itr(q_vector, &q_vector->tx);
+       ixgbe_update_itr(q_vector, &q_vector->rx);
+
+       current_itr = max(q_vector->rx.itr, q_vector->tx.itr);
+
+       switch (current_itr) {
+       /* counts and packets in update_itr are dependent on these numbers */
+       case lowest_latency:
+               new_itr = 100000;
+               break;
+       case low_latency:
+               new_itr = 20000; /* aka hwitr = ~200 */
+               break;
+       case bulk_latency:
+               new_itr = 8000;
+               break;
+       default:
+               break;
+       }
+
+       if (new_itr != q_vector->eitr) {
+               /* do an exponential smoothing */
+               new_itr = ((q_vector->eitr * 9) + new_itr)/10;
+
+               /* save the algorithm value here */
+               q_vector->eitr = new_itr;
+
+               ixgbe_write_eitr(q_vector);
+       }
+}
+
+/**
+ * ixgbe_check_overtemp_subtask - check for over tempurature
+ * @adapter: pointer to adapter
+ **/
+static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 eicr = adapter->interrupt_event;
+
+       if (test_bit(__IXGBE_DOWN, &adapter->state))
+               return;
+
+       if (!(adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&
+           !(adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_EVENT))
+               return;
+
+       adapter->flags2 &= ~IXGBE_FLAG2_TEMP_SENSOR_EVENT;
+
+       switch (hw->device_id) {
+       case IXGBE_DEV_ID_82599_T3_LOM:
+               /*
+                * Since the warning interrupt is for both ports
+                * we don't have to check if:
+                *  - This interrupt wasn't for our port.
+                *  - We may have missed the interrupt so always have to
+                *    check if we  got a LSC
+                */
+               if (!(eicr & IXGBE_EICR_GPI_SDP0) &&
+                   !(eicr & IXGBE_EICR_LSC))
+                       return;
+
+               if (!(eicr & IXGBE_EICR_LSC) && hw->mac.ops.check_link) {
+                       u32 autoneg;
+                       bool link_up = false;
+
+                       hw->mac.ops.check_link(hw, &autoneg, &link_up, false);
+
+                       if (link_up)
+                               return;
+               }
+
+               /* Check if this is not due to overtemp */
+               if (hw->phy.ops.check_overtemp(hw) != IXGBE_ERR_OVERTEMP)
+                       return;
+
+               break;
+       default:
+               if (!(eicr & IXGBE_EICR_GPI_SDP0))
+                       return;
+               break;
+       }
+       e_crit(drv,
+              "Network adapter has been stopped because it has over heated. "
+              "Restart the computer. If the problem persists, "
+              "power off the system and replace the adapter\n");
+
+       adapter->interrupt_event = 0;
+}
+
+static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       if ((adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) &&
+           (eicr & IXGBE_EICR_GPI_SDP1)) {
+               e_crit(probe, "Fan has stopped, replace the adapter\n");
+               /* write to clear the interrupt */
+               IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1);
+       }
+}
+
+static void ixgbe_check_sfp_event(struct ixgbe_adapter *adapter, u32 eicr)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       if (eicr & IXGBE_EICR_GPI_SDP2) {
+               /* Clear the interrupt */
+               IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP2);
+               if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
+                       adapter->flags2 |= IXGBE_FLAG2_SFP_NEEDS_RESET;
+                       ixgbe_service_event_schedule(adapter);
+               }
+       }
+
+       if (eicr & IXGBE_EICR_GPI_SDP1) {
+               /* Clear the interrupt */
+               IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1);
+               if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
+                       adapter->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
+                       ixgbe_service_event_schedule(adapter);
+               }
+       }
+}
+
+static void ixgbe_check_lsc(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       adapter->lsc_int++;
+       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
+       adapter->link_check_timeout = jiffies;
+       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
+               IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_LSC);
+               IXGBE_WRITE_FLUSH(hw);
+               ixgbe_service_event_schedule(adapter);
+       }
+}
+
+static irqreturn_t ixgbe_msix_lsc(int irq, void *data)
+{
+       struct ixgbe_adapter *adapter = data;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 eicr;
+
+       /*
+        * Workaround for Silicon errata.  Use clear-by-write instead
+        * of clear-by-read.  Reading with EICS will return the
+        * interrupt causes without clearing, which later be done
+        * with the write to EICR.
+        */
+       eicr = IXGBE_READ_REG(hw, IXGBE_EICS);
+       IXGBE_WRITE_REG(hw, IXGBE_EICR, eicr);
+
+       if (eicr & IXGBE_EICR_LSC)
+               ixgbe_check_lsc(adapter);
+
+       if (eicr & IXGBE_EICR_MAILBOX)
+               ixgbe_msg_task(adapter);
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               /* Handle Flow Director Full threshold interrupt */
+               if (eicr & IXGBE_EICR_FLOW_DIR) {
+                       int reinit_count = 0;
+                       int i;
+                       for (i = 0; i < adapter->num_tx_queues; i++) {
+                               struct ixgbe_ring *ring = adapter->tx_ring[i];
+                               if (test_and_clear_bit(__IXGBE_TX_FDIR_INIT_DONE,
+                                                      &ring->state))
+                                       reinit_count++;
+                       }
+                       if (reinit_count) {
+                               /* no more flow director interrupts until after init */
+                               IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_FLOW_DIR);
+                               eicr &= ~IXGBE_EICR_FLOW_DIR;
+                               adapter->flags2 |= IXGBE_FLAG2_FDIR_REQUIRES_REINIT;
+                               ixgbe_service_event_schedule(adapter);
+                       }
+               }
+               ixgbe_check_sfp_event(adapter, eicr);
+               if ((adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&
+                   ((eicr & IXGBE_EICR_GPI_SDP0) || (eicr & IXGBE_EICR_LSC))) {
+                       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
+                               adapter->interrupt_event = eicr;
+                               adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_EVENT;
+                               ixgbe_service_event_schedule(adapter);
+                       }
+               }
+               break;
+       default:
+               break;
+       }
+
+       ixgbe_check_fan_failure(adapter, eicr);
+
+       /* re-enable the original interrupt state, no lsc, no queues */
+       if (!test_bit(__IXGBE_DOWN, &adapter->state))
+               IXGBE_WRITE_REG(hw, IXGBE_EIMS, eicr &
+                               ~(IXGBE_EIMS_LSC | IXGBE_EIMS_RTX_QUEUE));
+
+       return IRQ_HANDLED;
+}
+
+static inline void ixgbe_irq_enable_queues(struct ixgbe_adapter *adapter,
+                                          u64 qmask)
+{
+       u32 mask;
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               mask = (IXGBE_EIMS_RTX_QUEUE & qmask);
+               IXGBE_WRITE_REG(hw, IXGBE_EIMS, mask);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               mask = (qmask & 0xFFFFFFFF);
+               if (mask)
+                       IXGBE_WRITE_REG(hw, IXGBE_EIMS_EX(0), mask);
+               mask = (qmask >> 32);
+               if (mask)
+                       IXGBE_WRITE_REG(hw, IXGBE_EIMS_EX(1), mask);
+               break;
+       default:
+               break;
+       }
+       /* skip the flush */
+}
+
+static inline void ixgbe_irq_disable_queues(struct ixgbe_adapter *adapter,
+                                           u64 qmask)
+{
+       u32 mask;
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               mask = (IXGBE_EIMS_RTX_QUEUE & qmask);
+               IXGBE_WRITE_REG(hw, IXGBE_EIMC, mask);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               mask = (qmask & 0xFFFFFFFF);
+               if (mask)
+                       IXGBE_WRITE_REG(hw, IXGBE_EIMC_EX(0), mask);
+               mask = (qmask >> 32);
+               if (mask)
+                       IXGBE_WRITE_REG(hw, IXGBE_EIMC_EX(1), mask);
+               break;
+       default:
+               break;
+       }
+       /* skip the flush */
+}
+
+static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
+{
+       struct ixgbe_q_vector *q_vector = data;
+       struct ixgbe_adapter  *adapter = q_vector->adapter;
+       struct ixgbe_ring     *tx_ring;
+       int i, r_idx;
+
+       if (!q_vector->tx.count)
+               return IRQ_HANDLED;
+
+       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
+       for (i = 0; i < q_vector->tx.count; i++) {
+               tx_ring = adapter->tx_ring[r_idx];
+               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
+                                     r_idx + 1);
+       }
+
+       /* EIAM disabled interrupts (on this vector) for us */
+       napi_schedule(&q_vector->napi);
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * ixgbe_msix_clean_rx - single unshared vector rx clean (all queues)
+ * @irq: unused
+ * @data: pointer to our q_vector struct for this interrupt vector
+ **/
+static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
+{
+       struct ixgbe_q_vector *q_vector = data;
+       struct ixgbe_adapter  *adapter = q_vector->adapter;
+       struct ixgbe_ring  *rx_ring;
+       int r_idx;
+       int i;
+
+#ifdef CONFIG_IXGBE_DCA
+       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+               ixgbe_update_dca(q_vector);
+#endif
+
+       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
+       for (i = 0; i < q_vector->rx.count; i++) {
+               rx_ring = adapter->rx_ring[r_idx];
+               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
+                                     r_idx + 1);
+       }
+
+       if (!q_vector->rx.count)
+               return IRQ_HANDLED;
+
+       /* EIAM disabled interrupts (on this vector) for us */
+       napi_schedule(&q_vector->napi);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t ixgbe_msix_clean_many(int irq, void *data)
+{
+       struct ixgbe_q_vector *q_vector = data;
+       struct ixgbe_adapter  *adapter = q_vector->adapter;
+       struct ixgbe_ring  *ring;
+       int r_idx;
+       int i;
+
+       if (!q_vector->tx.count && !q_vector->rx.count)
+               return IRQ_HANDLED;
+
+       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
+       for (i = 0; i < q_vector->tx.count; i++) {
+               ring = adapter->tx_ring[r_idx];
+               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
+                                     r_idx + 1);
+       }
+
+       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
+       for (i = 0; i < q_vector->rx.count; i++) {
+               ring = adapter->rx_ring[r_idx];
+               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
+                                     r_idx + 1);
+       }
+
+       /* EIAM disabled interrupts (on this vector) for us */
+       napi_schedule(&q_vector->napi);
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * ixgbe_clean_rxonly - msix (aka one shot) rx clean routine
+ * @napi: napi struct with our devices info in it
+ * @budget: amount of work driver is allowed to do this pass, in packets
+ *
+ * This function is optimized for cleaning one queue only on a single
+ * q_vector!!!
+ **/
+static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
+{
+       struct ixgbe_q_vector *q_vector =
+                              container_of(napi, struct ixgbe_q_vector, napi);
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       struct ixgbe_ring *rx_ring = NULL;
+       int work_done = 0;
+       long r_idx;
+
+#ifdef CONFIG_IXGBE_DCA
+       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+               ixgbe_update_dca(q_vector);
+#endif
+
+       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
+       rx_ring = adapter->rx_ring[r_idx];
+
+       ixgbe_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
+
+       /* If all Rx work done, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               if (adapter->rx_itr_setting & 1)
+                       ixgbe_set_itr(q_vector);
+               if (!test_bit(__IXGBE_DOWN, &adapter->state))
+                       ixgbe_irq_enable_queues(adapter,
+                                               ((u64)1 << q_vector->v_idx));
+       }
+
+       return work_done;
+}
+
+/**
+ * ixgbe_clean_rxtx_many - msix (aka one shot) rx clean routine
+ * @napi: napi struct with our devices info in it
+ * @budget: amount of work driver is allowed to do this pass, in packets
+ *
+ * This function will clean more than one rx queue associated with a
+ * q_vector.
+ **/
+static int ixgbe_clean_rxtx_many(struct napi_struct *napi, int budget)
+{
+       struct ixgbe_q_vector *q_vector =
+                              container_of(napi, struct ixgbe_q_vector, napi);
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       struct ixgbe_ring *ring = NULL;
+       int work_done = 0, i;
+       long r_idx;
+       bool tx_clean_complete = true;
+
+#ifdef CONFIG_IXGBE_DCA
+       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+               ixgbe_update_dca(q_vector);
+#endif
+
+       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
+       for (i = 0; i < q_vector->tx.count; i++) {
+               ring = adapter->tx_ring[r_idx];
+               tx_clean_complete &= ixgbe_clean_tx_irq(q_vector, ring);
+               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
+                                     r_idx + 1);
+       }
+
+       /* attempt to distribute budget to each queue fairly, but don't allow
+        * the budget to go below 1 because we'll exit polling */
+       budget /= (q_vector->rx.count ?: 1);
+       budget = max(budget, 1);
+       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
+       for (i = 0; i < q_vector->rx.count; i++) {
+               ring = adapter->rx_ring[r_idx];
+               ixgbe_clean_rx_irq(q_vector, ring, &work_done, budget);
+               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
+                                     r_idx + 1);
+       }
+
+       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
+       ring = adapter->rx_ring[r_idx];
+       /* If all Rx work done, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               if (adapter->rx_itr_setting & 1)
+                       ixgbe_set_itr(q_vector);
+               if (!test_bit(__IXGBE_DOWN, &adapter->state))
+                       ixgbe_irq_enable_queues(adapter,
+                                               ((u64)1 << q_vector->v_idx));
+               return 0;
+       }
+
+       return work_done;
+}
+
+/**
+ * ixgbe_clean_txonly - msix (aka one shot) tx clean routine
+ * @napi: napi struct with our devices info in it
+ * @budget: amount of work driver is allowed to do this pass, in packets
+ *
+ * This function is optimized for cleaning one queue only on a single
+ * q_vector!!!
+ **/
+static int ixgbe_clean_txonly(struct napi_struct *napi, int budget)
+{
+       struct ixgbe_q_vector *q_vector =
+                              container_of(napi, struct ixgbe_q_vector, napi);
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       struct ixgbe_ring *tx_ring = NULL;
+       int work_done = 0;
+       long r_idx;
+
+#ifdef CONFIG_IXGBE_DCA
+       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+               ixgbe_update_dca(q_vector);
+#endif
+
+       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
+       tx_ring = adapter->tx_ring[r_idx];
+
+       if (!ixgbe_clean_tx_irq(q_vector, tx_ring))
+               work_done = budget;
+
+       /* If all Tx work done, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               if (adapter->tx_itr_setting & 1)
+                       ixgbe_set_itr(q_vector);
+               if (!test_bit(__IXGBE_DOWN, &adapter->state))
+                       ixgbe_irq_enable_queues(adapter,
+                                               ((u64)1 << q_vector->v_idx));
+       }
+
+       return work_done;
+}
+
+static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,
+                                    int r_idx)
+{
+       struct ixgbe_q_vector *q_vector = a->q_vector[v_idx];
+       struct ixgbe_ring *rx_ring = a->rx_ring[r_idx];
+
+       set_bit(r_idx, q_vector->rx.idx);
+       q_vector->rx.count++;
+       rx_ring->q_vector = q_vector;
+}
+
+static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,
+                                    int t_idx)
+{
+       struct ixgbe_q_vector *q_vector = a->q_vector[v_idx];
+       struct ixgbe_ring *tx_ring = a->tx_ring[t_idx];
+
+       set_bit(t_idx, q_vector->tx.idx);
+       q_vector->tx.count++;
+       tx_ring->q_vector = q_vector;
+       q_vector->tx.work_limit = a->tx_work_limit;
+}
+
+/**
+ * ixgbe_map_rings_to_vectors - Maps descriptor rings to vectors
+ * @adapter: board private structure to initialize
+ *
+ * This function maps descriptor rings to the queue-specific vectors
+ * we were allotted through the MSI-X enabling code.  Ideally, we'd have
+ * one vector per ring/queue, but on a constrained vector budget, we
+ * group the rings as "efficiently" as possible.  You would add new
+ * mapping configurations in here.
+ **/
+static int ixgbe_map_rings_to_vectors(struct ixgbe_adapter *adapter)
+{
+       int q_vectors;
+       int v_start = 0;
+       int rxr_idx = 0, txr_idx = 0;
+       int rxr_remaining = adapter->num_rx_queues;
+       int txr_remaining = adapter->num_tx_queues;
+       int i, j;
+       int rqpv, tqpv;
+       int err = 0;
+
+       /* No mapping required if MSI-X is disabled. */
+       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
+               goto out;
+
+       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       /*
+        * The ideal configuration...
+        * We have enough vectors to map one per queue.
+        */
+       if (q_vectors == adapter->num_rx_queues + adapter->num_tx_queues) {
+               for (; rxr_idx < rxr_remaining; v_start++, rxr_idx++)
+                       map_vector_to_rxq(adapter, v_start, rxr_idx);
+
+               for (; txr_idx < txr_remaining; v_start++, txr_idx++)
+                       map_vector_to_txq(adapter, v_start, txr_idx);
+
+               goto out;
+       }
+
+       /*
+        * If we don't have enough vectors for a 1-to-1
+        * mapping, we'll have to group them so there are
+        * multiple queues per vector.
+        */
+       /* Re-adjusting *qpv takes care of the remainder. */
+       for (i = v_start; i < q_vectors; i++) {
+               rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors - i);
+               for (j = 0; j < rqpv; j++) {
+                       map_vector_to_rxq(adapter, i, rxr_idx);
+                       rxr_idx++;
+                       rxr_remaining--;
+               }
+               tqpv = DIV_ROUND_UP(txr_remaining, q_vectors - i);
+               for (j = 0; j < tqpv; j++) {
+                       map_vector_to_txq(adapter, i, txr_idx);
+                       txr_idx++;
+                       txr_remaining--;
+               }
+       }
+out:
+       return err;
+}
+
+/**
+ * ixgbe_request_msix_irqs - Initialize MSI-X interrupts
+ * @adapter: board private structure
+ *
+ * ixgbe_request_msix_irqs allocates MSI-X vectors and requests
+ * interrupts from the kernel.
+ **/
+static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       irqreturn_t (*handler)(int, void *);
+       int i, vector, q_vectors, err;
+       int ri = 0, ti = 0;
+
+       /* Decrement for Other and TCP Timer vectors */
+       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       err = ixgbe_map_rings_to_vectors(adapter);
+       if (err)
+               return err;
+
+#define SET_HANDLER(_v) (((_v)->rx.count && (_v)->tx.count)        \
+                                         ? &ixgbe_msix_clean_many : \
+                         (_v)->rx.count ? &ixgbe_msix_clean_rx   : \
+                         (_v)->tx.count ? &ixgbe_msix_clean_tx   : \
+                         NULL)
+       for (vector = 0; vector < q_vectors; vector++) {
+               struct ixgbe_q_vector *q_vector = adapter->q_vector[vector];
+               handler = SET_HANDLER(q_vector);
+
+               if (handler == &ixgbe_msix_clean_rx) {
+                       snprintf(q_vector->name, sizeof(q_vector->name) - 1,
+                                "%s-%s-%d", netdev->name, "rx", ri++);
+               } else if (handler == &ixgbe_msix_clean_tx) {
+                       snprintf(q_vector->name, sizeof(q_vector->name) - 1,
+                                "%s-%s-%d", netdev->name, "tx", ti++);
+               } else if (handler == &ixgbe_msix_clean_many) {
+                       snprintf(q_vector->name, sizeof(q_vector->name) - 1,
+                                "%s-%s-%d", netdev->name, "TxRx", ri++);
+                       ti++;
+               } else {
+                       /* skip this unused q_vector */
+                       continue;
+               }
+               err = request_irq(adapter->msix_entries[vector].vector,
+                                 handler, 0, q_vector->name,
+                                 q_vector);
+               if (err) {
+                       e_err(probe, "request_irq failed for MSIX interrupt "
+                             "Error: %d\n", err);
+                       goto free_queue_irqs;
+               }
+       }
+
+       sprintf(adapter->lsc_int_name, "%s:lsc", netdev->name);
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         ixgbe_msix_lsc, 0, adapter->lsc_int_name, adapter);
+       if (err) {
+               e_err(probe, "request_irq for msix_lsc failed: %d\n", err);
+               goto free_queue_irqs;
+       }
+
+       return 0;
+
+free_queue_irqs:
+       for (i = vector - 1; i >= 0; i--)
+               free_irq(adapter->msix_entries[--vector].vector,
+                        adapter->q_vector[i]);
+       adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
+       pci_disable_msix(adapter->pdev);
+       kfree(adapter->msix_entries);
+       adapter->msix_entries = NULL;
+       return err;
+}
+
+/**
+ * ixgbe_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ **/
+static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues,
+                                   bool flush)
+{
+       u32 mask;
+
+       mask = (IXGBE_EIMS_ENABLE_MASK & ~IXGBE_EIMS_RTX_QUEUE);
+       if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)
+               mask |= IXGBE_EIMS_GPI_SDP0;
+       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)
+               mask |= IXGBE_EIMS_GPI_SDP1;
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               mask |= IXGBE_EIMS_ECC;
+               mask |= IXGBE_EIMS_GPI_SDP1;
+               mask |= IXGBE_EIMS_GPI_SDP2;
+               if (adapter->num_vfs)
+                       mask |= IXGBE_EIMS_MAILBOX;
+               break;
+       default:
+               break;
+       }
+       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)
+               mask |= IXGBE_EIMS_FLOW_DIR;
+
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);
+       if (queues)
+               ixgbe_irq_enable_queues(adapter, ~0);
+       if (flush)
+               IXGBE_WRITE_FLUSH(&adapter->hw);
+
+       if (adapter->num_vfs > 32) {
+               u32 eitrsel = (1 << (adapter->num_vfs - 32)) - 1;
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITRSEL, eitrsel);
+       }
+}
+
+/**
+ * ixgbe_intr - legacy mode Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+static irqreturn_t ixgbe_intr(int irq, void *data)
+{
+       struct ixgbe_adapter *adapter = data;
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbe_q_vector *q_vector = adapter->q_vector[0];
+       u32 eicr;
+
+       /*
+        * Workaround for silicon errata on 82598.  Mask the interrupts
+        * before the read of EICR.
+        */
+       IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_IRQ_CLEAR_MASK);
+
+       /* for NAPI, using EIAM to auto-mask tx/rx interrupt bits on read
+        * therefore no explict interrupt disable is necessary */
+       eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
+       if (!eicr) {
+               /*
+                * shared interrupt alert!
+                * make sure interrupts are enabled because the read will
+                * have disabled interrupts due to EIAM
+                * finish the workaround of silicon errata on 82598.  Unmask
+                * the interrupt that we masked before the EICR read.
+                */
+               if (!test_bit(__IXGBE_DOWN, &adapter->state))
+                       ixgbe_irq_enable(adapter, true, true);
+               return IRQ_NONE;        /* Not our interrupt */
+       }
+
+       if (eicr & IXGBE_EICR_LSC)
+               ixgbe_check_lsc(adapter);
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82599EB:
+               ixgbe_check_sfp_event(adapter, eicr);
+               if ((adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&
+                   ((eicr & IXGBE_EICR_GPI_SDP0) || (eicr & IXGBE_EICR_LSC))) {
+                       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
+                               adapter->interrupt_event = eicr;
+                               adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_EVENT;
+                               ixgbe_service_event_schedule(adapter);
+                       }
+               }
+               break;
+       default:
+               break;
+       }
+
+       ixgbe_check_fan_failure(adapter, eicr);
+
+       if (napi_schedule_prep(&(q_vector->napi))) {
+               /* would disable interrupts here but EIAM disabled it */
+               __napi_schedule(&(q_vector->napi));
+       }
+
+       /*
+        * re-enable link(maybe) and non-queue interrupts, no flush.
+        * ixgbe_poll will re-enable the queue interrupts
+        */
+
+       if (!test_bit(__IXGBE_DOWN, &adapter->state))
+               ixgbe_irq_enable(adapter, false, false);
+
+       return IRQ_HANDLED;
+}
+
+static inline void ixgbe_reset_q_vectors(struct ixgbe_adapter *adapter)
+{
+       int i, q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       for (i = 0; i < q_vectors; i++) {
+               struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
+               bitmap_zero(q_vector->rx.idx, MAX_RX_QUEUES);
+               bitmap_zero(q_vector->tx.idx, MAX_TX_QUEUES);
+               q_vector->rx.count = 0;
+               q_vector->tx.count = 0;
+       }
+}
+
+/**
+ * ixgbe_request_irq - initialize interrupts
+ * @adapter: board private structure
+ *
+ * Attempts to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+static int ixgbe_request_irq(struct ixgbe_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int err;
+
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+               err = ixgbe_request_msix_irqs(adapter);
+       } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
+               err = request_irq(adapter->pdev->irq, ixgbe_intr, 0,
+                                 netdev->name, adapter);
+       } else {
+               err = request_irq(adapter->pdev->irq, ixgbe_intr, IRQF_SHARED,
+                                 netdev->name, adapter);
+       }
+
+       if (err)
+               e_err(probe, "request_irq failed, Error %d\n", err);
+
+       return err;
+}
+
+static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
+{
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+               int i, q_vectors;
+
+               q_vectors = adapter->num_msix_vectors;
+
+               i = q_vectors - 1;
+               free_irq(adapter->msix_entries[i].vector, adapter);
+
+               i--;
+               for (; i >= 0; i--) {
+                       /* free only the irqs that were actually requested */
+                       if (!adapter->q_vector[i]->rx.count &&
+                           !adapter->q_vector[i]->tx.count)
+                               continue;
+
+                       free_irq(adapter->msix_entries[i].vector,
+                                adapter->q_vector[i]);
+               }
+
+               ixgbe_reset_q_vectors(adapter);
+       } else {
+               free_irq(adapter->pdev->irq, adapter);
+       }
+}
+
+/**
+ * ixgbe_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ **/
+static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
+{
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82598EB:
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFF0000);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(0), ~0);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(1), ~0);
+               if (adapter->num_vfs > 32)
+                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITRSEL, 0);
+               break;
+       default:
+               break;
+       }
+       IXGBE_WRITE_FLUSH(&adapter->hw);
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+               int i;
+               for (i = 0; i < adapter->num_msix_vectors; i++)
+                       synchronize_irq(adapter->msix_entries[i].vector);
+       } else {
+               synchronize_irq(adapter->pdev->irq);
+       }
+}
+
+/**
+ * ixgbe_configure_msi_and_legacy - Initialize PIN (INTA...) and MSI interrupts
+ *
+ **/
+static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       IXGBE_WRITE_REG(hw, IXGBE_EITR(0),
+                       EITR_INTS_PER_SEC_TO_REG(adapter->rx_eitr_param));
+
+       ixgbe_set_ivar(adapter, 0, 0, 0);
+       ixgbe_set_ivar(adapter, 1, 0, 0);
+
+       map_vector_to_rxq(adapter, 0, 0);
+       map_vector_to_txq(adapter, 0, 0);
+
+       e_info(hw, "Legacy interrupt IVAR setup done\n");
+}
+
+/**
+ * ixgbe_configure_tx_ring - Configure 8259x Tx ring after Reset
+ * @adapter: board private structure
+ * @ring: structure containing ring specific data
+ *
+ * Configure the Tx descriptor ring after a reset.
+ **/
+void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
+                            struct ixgbe_ring *ring)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u64 tdba = ring->dma;
+       int wait_loop = 10;
+       u32 txdctl;
+       u8 reg_idx = ring->reg_idx;
+
+       /* disable queue to avoid issues while updating state */
+       txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));
+       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx),
+                       txdctl & ~IXGBE_TXDCTL_ENABLE);
+       IXGBE_WRITE_FLUSH(hw);
+
+       IXGBE_WRITE_REG(hw, IXGBE_TDBAL(reg_idx),
+                       (tdba & DMA_BIT_MASK(32)));
+       IXGBE_WRITE_REG(hw, IXGBE_TDBAH(reg_idx), (tdba >> 32));
+       IXGBE_WRITE_REG(hw, IXGBE_TDLEN(reg_idx),
+                       ring->count * sizeof(union ixgbe_adv_tx_desc));
+       IXGBE_WRITE_REG(hw, IXGBE_TDH(reg_idx), 0);
+       IXGBE_WRITE_REG(hw, IXGBE_TDT(reg_idx), 0);
+       ring->tail = hw->hw_addr + IXGBE_TDT(reg_idx);
+
+       /* configure fetching thresholds */
+       if (adapter->rx_itr_setting == 0) {
+               /* cannot set wthresh when itr==0 */
+               txdctl &= ~0x007F0000;
+       } else {
+               /* enable WTHRESH=8 descriptors, to encourage burst writeback */
+               txdctl |= (8 << 16);
+       }
+       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+               /* PThresh workaround for Tx hang with DFP enabled. */
+               txdctl |= 32;
+       }
+
+       /* reinitialize flowdirector state */
+       if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) &&
+           adapter->atr_sample_rate) {
+               ring->atr_sample_rate = adapter->atr_sample_rate;
+               ring->atr_count = 0;
+               set_bit(__IXGBE_TX_FDIR_INIT_DONE, &ring->state);
+       } else {
+               ring->atr_sample_rate = 0;
+       }
+
+       clear_bit(__IXGBE_HANG_CHECK_ARMED, &ring->state);
+
+       /* enable queue */
+       txdctl |= IXGBE_TXDCTL_ENABLE;
+       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), txdctl);
+
+       /* TXDCTL.EN will return 0 on 82598 if link is down, so skip it */
+       if (hw->mac.type == ixgbe_mac_82598EB &&
+           !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
+               return;
+
+       /* poll to verify queue is enabled */
+       do {
+               usleep_range(1000, 2000);
+               txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));
+       } while (--wait_loop && !(txdctl & IXGBE_TXDCTL_ENABLE));
+       if (!wait_loop)
+               e_err(drv, "Could not enable Tx Queue %d\n", reg_idx);
+}
+
+static void ixgbe_setup_mtqc(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 rttdcs;
+       u32 reg;
+       u8 tcs = netdev_get_num_tc(adapter->netdev);
+
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               return;
+
+       /* disable the arbiter while setting MTQC */
+       rttdcs = IXGBE_READ_REG(hw, IXGBE_RTTDCS);
+       rttdcs |= IXGBE_RTTDCS_ARBDIS;
+       IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
+
+       /* set transmit pool layout */
+       switch (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+       case (IXGBE_FLAG_SRIOV_ENABLED):
+               IXGBE_WRITE_REG(hw, IXGBE_MTQC,
+                               (IXGBE_MTQC_VT_ENA | IXGBE_MTQC_64VF));
+               break;
+       default:
+               if (!tcs)
+                       reg = IXGBE_MTQC_64Q_1PB;
+               else if (tcs <= 4)
+                       reg = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ;
+               else
+                       reg = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_8TC_8TQ;
+
+               IXGBE_WRITE_REG(hw, IXGBE_MTQC, reg);
+
+               /* Enable Security TX Buffer IFG for multiple pb */
+               if (tcs) {
+                       reg = IXGBE_READ_REG(hw, IXGBE_SECTXMINIFG);
+                       reg |= IXGBE_SECTX_DCB;
+                       IXGBE_WRITE_REG(hw, IXGBE_SECTXMINIFG, reg);
+               }
+               break;
+       }
+
+       /* re-enable the arbiter */
+       rttdcs &= ~IXGBE_RTTDCS_ARBDIS;
+       IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
+}
+
+/**
+ * ixgbe_configure_tx - Configure 8259x Transmit Unit after Reset
+ * @adapter: board private structure
+ *
+ * Configure the Tx unit of the MAC after a reset.
+ **/
+static void ixgbe_configure_tx(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 dmatxctl;
+       u32 i;
+
+       ixgbe_setup_mtqc(adapter);
+
+       if (hw->mac.type != ixgbe_mac_82598EB) {
+               /* DMATXCTL.EN must be before Tx queues are enabled */
+               dmatxctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);
+               dmatxctl |= IXGBE_DMATXCTL_TE;
+               IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, dmatxctl);
+       }
+
+       /* Setup the HW Tx Head and Tail descriptor pointers */
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               ixgbe_configure_tx_ring(adapter, adapter->tx_ring[i]);
+}
+
+#define IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT 2
+
+static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter,
+                                  struct ixgbe_ring *rx_ring)
+{
+       u32 srrctl;
+       u8 reg_idx = rx_ring->reg_idx;
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82598EB: {
+               struct ixgbe_ring_feature *feature = adapter->ring_feature;
+               const int mask = feature[RING_F_RSS].mask;
+               reg_idx = reg_idx & mask;
+       }
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+       default:
+               break;
+       }
+
+       srrctl = IXGBE_READ_REG(&adapter->hw, IXGBE_SRRCTL(reg_idx));
+
+       srrctl &= ~IXGBE_SRRCTL_BSIZEHDR_MASK;
+       srrctl &= ~IXGBE_SRRCTL_BSIZEPKT_MASK;
+       if (adapter->num_vfs)
+               srrctl |= IXGBE_SRRCTL_DROP_EN;
+
+       srrctl |= (IXGBE_RX_HDR_SIZE << IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) &
+                 IXGBE_SRRCTL_BSIZEHDR_MASK;
+
+       if (ring_is_ps_enabled(rx_ring)) {
+#if (PAGE_SIZE / 2) > IXGBE_MAX_RXBUFFER
+               srrctl |= IXGBE_MAX_RXBUFFER >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+#else
+               srrctl |= (PAGE_SIZE / 2) >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+#endif
+               srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
+       } else {
+               srrctl |= ALIGN(rx_ring->rx_buf_len, 1024) >>
+                         IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+               srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF;
+       }
+
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_SRRCTL(reg_idx), srrctl);
+}
+
+static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       static const u32 seed[10] = { 0xE291D73D, 0x1805EC6C, 0x2A94B30D,
+                         0xA54F2BEC, 0xEA49AF7C, 0xE214AD3D, 0xB855AABE,
+                         0x6A3E67EA, 0x14364D17, 0x3BED200D};
+       u32 mrqc = 0, reta = 0;
+       u32 rxcsum;
+       int i, j;
+       u8 tcs = netdev_get_num_tc(adapter->netdev);
+       int maxq = adapter->ring_feature[RING_F_RSS].indices;
+
+       if (tcs)
+               maxq = min(maxq, adapter->num_tx_queues / tcs);
+
+       /* Fill out hash function seeds */
+       for (i = 0; i < 10; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), seed[i]);
+
+       /* Fill out redirection table */
+       for (i = 0, j = 0; i < 128; i++, j++) {
+               if (j == maxq)
+                       j = 0;
+               /* reta = 4-byte sliding window of
+                * 0x00..(indices-1)(indices-1)00..etc. */
+               reta = (reta << 8) | (j * 0x11);
+               if ((i & 3) == 3)
+                       IXGBE_WRITE_REG(hw, IXGBE_RETA(i >> 2), reta);
+       }
+
+       /* Disable indicating checksum in descriptor, enables RSS hash */
+       rxcsum = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
+       rxcsum |= IXGBE_RXCSUM_PCSD;
+       IXGBE_WRITE_REG(hw, IXGBE_RXCSUM, rxcsum);
+
+       if (adapter->hw.mac.type == ixgbe_mac_82598EB &&
+           (adapter->flags & IXGBE_FLAG_RSS_ENABLED)) {
+               mrqc = IXGBE_MRQC_RSSEN;
+       } else {
+               int mask = adapter->flags & (IXGBE_FLAG_RSS_ENABLED
+                                            | IXGBE_FLAG_SRIOV_ENABLED);
+
+               switch (mask) {
+               case (IXGBE_FLAG_RSS_ENABLED):
+                       if (!tcs)
+                               mrqc = IXGBE_MRQC_RSSEN;
+                       else if (tcs <= 4)
+                               mrqc = IXGBE_MRQC_RTRSS4TCEN;
+                       else
+                               mrqc = IXGBE_MRQC_RTRSS8TCEN;
+                       break;
+               case (IXGBE_FLAG_SRIOV_ENABLED):
+                       mrqc = IXGBE_MRQC_VMDQEN;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       /* Perform hash on these packet types */
+       mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4
+             | IXGBE_MRQC_RSS_FIELD_IPV4_TCP
+             | IXGBE_MRQC_RSS_FIELD_IPV6
+             | IXGBE_MRQC_RSS_FIELD_IPV6_TCP;
+
+       IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);
+}
+
+/**
+ * ixgbe_configure_rscctl - enable RSC for the indicated ring
+ * @adapter:    address of board private structure
+ * @index:      index of ring to set
+ **/
+static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,
+                                  struct ixgbe_ring *ring)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 rscctrl;
+       int rx_buf_len;
+       u8 reg_idx = ring->reg_idx;
+
+       if (!ring_is_rsc_enabled(ring))
+               return;
+
+       rx_buf_len = ring->rx_buf_len;
+       rscctrl = IXGBE_READ_REG(hw, IXGBE_RSCCTL(reg_idx));
+       rscctrl |= IXGBE_RSCCTL_RSCEN;
+       /*
+        * we must limit the number of descriptors so that the
+        * total size of max desc * buf_len is not greater
+        * than 65535
+        */
+       if (ring_is_ps_enabled(ring)) {
+#if (MAX_SKB_FRAGS > 16)
+               rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
+#elif (MAX_SKB_FRAGS > 8)
+               rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
+#elif (MAX_SKB_FRAGS > 4)
+               rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
+#else
+               rscctrl |= IXGBE_RSCCTL_MAXDESC_1;
+#endif
+       } else {
+               if (rx_buf_len < IXGBE_RXBUFFER_4096)
+                       rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
+               else if (rx_buf_len < IXGBE_RXBUFFER_8192)
+                       rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
+               else
+                       rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
+       }
+       IXGBE_WRITE_REG(hw, IXGBE_RSCCTL(reg_idx), rscctrl);
+}
+
+/**
+ *  ixgbe_set_uta - Set unicast filter table address
+ *  @adapter: board private structure
+ *
+ *  The unicast table address is a register array of 32-bit registers.
+ *  The table is meant to be used in a way similar to how the MTA is used
+ *  however due to certain limitations in the hardware it is necessary to
+ *  set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscuous
+ *  enable bit to allow vlan tag stripping when promiscuous mode is enabled
+ **/
+static void ixgbe_set_uta(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int i;
+
+       /* The UTA table only exists on 82599 hardware and newer */
+       if (hw->mac.type < ixgbe_mac_82599EB)
+               return;
+
+       /* we only need to do this if VMDq is enabled */
+       if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))
+               return;
+
+       for (i = 0; i < 128; i++)
+               IXGBE_WRITE_REG(hw, IXGBE_UTA(i), ~0);
+}
+
+#define IXGBE_MAX_RX_DESC_POLL 10
+static void ixgbe_rx_desc_queue_enable(struct ixgbe_adapter *adapter,
+                                      struct ixgbe_ring *ring)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int wait_loop = IXGBE_MAX_RX_DESC_POLL;
+       u32 rxdctl;
+       u8 reg_idx = ring->reg_idx;
+
+       /* RXDCTL.EN will return 0 on 82598 if link is down, so skip it */
+       if (hw->mac.type == ixgbe_mac_82598EB &&
+           !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
+               return;
+
+       do {
+               usleep_range(1000, 2000);
+               rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
+       } while (--wait_loop && !(rxdctl & IXGBE_RXDCTL_ENABLE));
+
+       if (!wait_loop) {
+               e_err(drv, "RXDCTL.ENABLE on Rx queue %d not set within "
+                     "the polling period\n", reg_idx);
+       }
+}
+
+void ixgbe_disable_rx_queue(struct ixgbe_adapter *adapter,
+                           struct ixgbe_ring *ring)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int wait_loop = IXGBE_MAX_RX_DESC_POLL;
+       u32 rxdctl;
+       u8 reg_idx = ring->reg_idx;
+
+       rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
+       rxdctl &= ~IXGBE_RXDCTL_ENABLE;
+
+       /* write value back with RXDCTL.ENABLE bit cleared */
+       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(reg_idx), rxdctl);
+
+       if (hw->mac.type == ixgbe_mac_82598EB &&
+           !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
+               return;
+
+       /* the hardware may take up to 100us to really disable the rx queue */
+       do {
+               udelay(10);
+               rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
+       } while (--wait_loop && (rxdctl & IXGBE_RXDCTL_ENABLE));
+
+       if (!wait_loop) {
+               e_err(drv, "RXDCTL.ENABLE on Rx queue %d not cleared within "
+                     "the polling period\n", reg_idx);
+       }
+}
+
+void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,
+                            struct ixgbe_ring *ring)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u64 rdba = ring->dma;
+       u32 rxdctl;
+       u8 reg_idx = ring->reg_idx;
+
+       /* disable queue to avoid issues while updating state */
+       rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
+       ixgbe_disable_rx_queue(adapter, ring);
+
+       IXGBE_WRITE_REG(hw, IXGBE_RDBAL(reg_idx), (rdba & DMA_BIT_MASK(32)));
+       IXGBE_WRITE_REG(hw, IXGBE_RDBAH(reg_idx), (rdba >> 32));
+       IXGBE_WRITE_REG(hw, IXGBE_RDLEN(reg_idx),
+                       ring->count * sizeof(union ixgbe_adv_rx_desc));
+       IXGBE_WRITE_REG(hw, IXGBE_RDH(reg_idx), 0);
+       IXGBE_WRITE_REG(hw, IXGBE_RDT(reg_idx), 0);
+       ring->tail = hw->hw_addr + IXGBE_RDT(reg_idx);
+
+       ixgbe_configure_srrctl(adapter, ring);
+       ixgbe_configure_rscctl(adapter, ring);
+
+       /* If operating in IOV mode set RLPML for X540 */
+       if ((adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) &&
+           hw->mac.type == ixgbe_mac_X540) {
+               rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
+               rxdctl |= ((ring->netdev->mtu + ETH_HLEN +
+                           ETH_FCS_LEN + VLAN_HLEN) | IXGBE_RXDCTL_RLPML_EN);
+       }
+
+       if (hw->mac.type == ixgbe_mac_82598EB) {
+               /*
+                * enable cache line friendly hardware writes:
+                * PTHRESH=32 descriptors (half the internal cache),
+                * this also removes ugly rx_no_buffer_count increment
+                * HTHRESH=4 descriptors (to minimize latency on fetch)
+                * WTHRESH=8 burst writeback up to two cache lines
+                */
+               rxdctl &= ~0x3FFFFF;
+               rxdctl |=  0x080420;
+       }
+
+       /* enable receive descriptor ring */
+       rxdctl |= IXGBE_RXDCTL_ENABLE;
+       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(reg_idx), rxdctl);
+
+       ixgbe_rx_desc_queue_enable(adapter, ring);
+       ixgbe_alloc_rx_buffers(ring, ixgbe_desc_unused(ring));
+}
+
+static void ixgbe_setup_psrtype(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int p;
+
+       /* PSRTYPE must be initialized in non 82598 adapters */
+       u32 psrtype = IXGBE_PSRTYPE_TCPHDR |
+                     IXGBE_PSRTYPE_UDPHDR |
+                     IXGBE_PSRTYPE_IPV4HDR |
+                     IXGBE_PSRTYPE_L2HDR |
+                     IXGBE_PSRTYPE_IPV6HDR;
+
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               return;
+
+       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED)
+               psrtype |= (adapter->num_rx_queues_per_pool << 29);
+
+       for (p = 0; p < adapter->num_rx_pools; p++)
+               IXGBE_WRITE_REG(hw, IXGBE_PSRTYPE(adapter->num_vfs + p),
+                               psrtype);
+}
+
+static void ixgbe_configure_virtualization(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 gcr_ext;
+       u32 vt_reg_bits;
+       u32 reg_offset, vf_shift;
+       u32 vmdctl;
+
+       if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))
+               return;
+
+       vmdctl = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
+       vt_reg_bits = IXGBE_VMD_CTL_VMDQ_EN | IXGBE_VT_CTL_REPLEN;
+       vt_reg_bits |= (adapter->num_vfs << IXGBE_VT_CTL_POOL_SHIFT);
+       IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vmdctl | vt_reg_bits);
+
+       vf_shift = adapter->num_vfs % 32;
+       reg_offset = (adapter->num_vfs > 32) ? 1 : 0;
+
+       /* Enable only the PF's pool for Tx/Rx */
+       IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), (1 << vf_shift));
+       IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset ^ 1), 0);
+       IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), (1 << vf_shift));
+       IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset ^ 1), 0);
+       IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);
+
+       /* Map PF MAC address in RAR Entry 0 to first pool following VFs */
+       hw->mac.ops.set_vmdq(hw, 0, adapter->num_vfs);
+
+       /*
+        * Set up VF register offsets for selected VT Mode,
+        * i.e. 32 or 64 VFs for SR-IOV
+        */
+       gcr_ext = IXGBE_READ_REG(hw, IXGBE_GCR_EXT);
+       gcr_ext |= IXGBE_GCR_EXT_MSIX_EN;
+       gcr_ext |= IXGBE_GCR_EXT_VT_MODE_64;
+       IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);
+
+       /* enable Tx loopback for VF/PF communication */
+       IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);
+       /* Enable MAC Anti-Spoofing */
+       hw->mac.ops.set_mac_anti_spoofing(hw,
+                                         (adapter->antispoofing_enabled =
+                                          (adapter->num_vfs != 0)),
+                                         adapter->num_vfs);
+}
+
+static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+       int rx_buf_len;
+       struct ixgbe_ring *rx_ring;
+       int i;
+       u32 mhadd, hlreg0;
+
+       /* Decide whether to use packet split mode or not */
+       /* On by default */
+       adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+
+       /* Do not use packet split if we're in SR-IOV Mode */
+       if (adapter->num_vfs)
+               adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+
+       /* Disable packet split due to 82599 erratum #45 */
+       if (hw->mac.type == ixgbe_mac_82599EB)
+               adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+
+       /* Set the RX buffer length according to the mode */
+       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+               rx_buf_len = IXGBE_RX_HDR_SIZE;
+       } else {
+               if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) &&
+                   (netdev->mtu <= ETH_DATA_LEN))
+                       rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+               else
+                       rx_buf_len = ALIGN(max_frame + VLAN_HLEN, 1024);
+       }
+
+#ifdef IXGBE_FCOE
+       /* adjust max frame to be able to do baby jumbo for FCoE */
+       if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
+           (max_frame < IXGBE_FCOE_JUMBO_FRAME_SIZE))
+               max_frame = IXGBE_FCOE_JUMBO_FRAME_SIZE;
+
+#endif /* IXGBE_FCOE */
+       mhadd = IXGBE_READ_REG(hw, IXGBE_MHADD);
+       if (max_frame != (mhadd >> IXGBE_MHADD_MFS_SHIFT)) {
+               mhadd &= ~IXGBE_MHADD_MFS_MASK;
+               mhadd |= max_frame << IXGBE_MHADD_MFS_SHIFT;
+
+               IXGBE_WRITE_REG(hw, IXGBE_MHADD, mhadd);
+       }
+
+       hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
+       /* set jumbo enable since MHADD.MFS is keeping size locked at max_frame */
+       hlreg0 |= IXGBE_HLREG0_JUMBOEN;
+       IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
+
+       /*
+        * Setup the HW Rx Head and Tail Descriptor Pointers and
+        * the Base and Length of the Rx Descriptor Ring
+        */
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               rx_ring = adapter->rx_ring[i];
+               rx_ring->rx_buf_len = rx_buf_len;
+
+               if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED)
+                       set_ring_ps_enabled(rx_ring);
+               else
+                       clear_ring_ps_enabled(rx_ring);
+
+               if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)
+                       set_ring_rsc_enabled(rx_ring);
+               else
+                       clear_ring_rsc_enabled(rx_ring);
+
+#ifdef IXGBE_FCOE
+               if (netdev->features & NETIF_F_FCOE_MTU) {
+                       struct ixgbe_ring_feature *f;
+                       f = &adapter->ring_feature[RING_F_FCOE];
+                       if ((i >= f->mask) && (i < f->mask + f->indices)) {
+                               clear_ring_ps_enabled(rx_ring);
+                               if (rx_buf_len < IXGBE_FCOE_JUMBO_FRAME_SIZE)
+                                       rx_ring->rx_buf_len =
+                                               IXGBE_FCOE_JUMBO_FRAME_SIZE;
+                       } else if (!ring_is_rsc_enabled(rx_ring) &&
+                                  !ring_is_ps_enabled(rx_ring)) {
+                               rx_ring->rx_buf_len =
+                                               IXGBE_FCOE_JUMBO_FRAME_SIZE;
+                       }
+               }
+#endif /* IXGBE_FCOE */
+       }
+}
+
+static void ixgbe_setup_rdrxctl(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 rdrxctl = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               /*
+                * For VMDq support of different descriptor types or
+                * buffer sizes through the use of multiple SRRCTL
+                * registers, RDRXCTL.MVMEN must be set to 1
+                *
+                * also, the manual doesn't mention it clearly but DCA hints
+                * will only use queue 0's tags unless this bit is set.  Side
+                * effects of setting this bit are only that SRRCTL must be
+                * fully programmed [0..15]
+                */
+               rdrxctl |= IXGBE_RDRXCTL_MVMEN;
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               /* Disable RSC for ACK packets */
+               IXGBE_WRITE_REG(hw, IXGBE_RSCDBU,
+                  (IXGBE_RSCDBU_RSCACKDIS | IXGBE_READ_REG(hw, IXGBE_RSCDBU)));
+               rdrxctl &= ~IXGBE_RDRXCTL_RSCFRSTSIZE;
+               /* hardware requires some bits to be set by default */
+               rdrxctl |= (IXGBE_RDRXCTL_RSCACKC | IXGBE_RDRXCTL_FCOE_WRFIX);
+               rdrxctl |= IXGBE_RDRXCTL_CRCSTRIP;
+               break;
+       default:
+               /* We should do nothing since we don't know this hardware */
+               return;
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl);
+}
+
+/**
+ * ixgbe_configure_rx - Configure 8259x Receive Unit after Reset
+ * @adapter: board private structure
+ *
+ * Configure the Rx unit of the MAC after a reset.
+ **/
+static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int i;
+       u32 rxctrl;
+
+       /* disable receives while setting up the descriptors */
+       rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
+       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl & ~IXGBE_RXCTRL_RXEN);
+
+       ixgbe_setup_psrtype(adapter);
+       ixgbe_setup_rdrxctl(adapter);
+
+       /* Program registers for the distribution of queues */
+       ixgbe_setup_mrqc(adapter);
+
+       ixgbe_set_uta(adapter);
+
+       /* set_rx_buffer_len must be called before ring initialization */
+       ixgbe_set_rx_buffer_len(adapter);
+
+       /*
+        * Setup the HW Rx Head and Tail Descriptor Pointers and
+        * the Base and Length of the Rx Descriptor Ring
+        */
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               ixgbe_configure_rx_ring(adapter, adapter->rx_ring[i]);
+
+       /* disable drop enable for 82598 parts */
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               rxctrl |= IXGBE_RXCTRL_DMBYPS;
+
+       /* enable all receives */
+       rxctrl |= IXGBE_RXCTRL_RXEN;
+       hw->mac.ops.enable_rx_dma(hw, rxctrl);
+}
+
+static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       int pool_ndx = adapter->num_vfs;
+
+       /* add VID to filter table */
+       hw->mac.ops.set_vfta(&adapter->hw, vid, pool_ndx, true);
+       set_bit(vid, adapter->active_vlans);
+}
+
+static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       int pool_ndx = adapter->num_vfs;
+
+       /* remove VID from filter table */
+       hw->mac.ops.set_vfta(&adapter->hw, vid, pool_ndx, false);
+       clear_bit(vid, adapter->active_vlans);
+}
+
+/**
+ * ixgbe_vlan_filter_disable - helper to disable hw vlan filtering
+ * @adapter: driver data
+ */
+static void ixgbe_vlan_filter_disable(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 vlnctrl;
+
+       vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
+       vlnctrl &= ~(IXGBE_VLNCTRL_VFE | IXGBE_VLNCTRL_CFIEN);
+       IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
+}
+
+/**
+ * ixgbe_vlan_filter_enable - helper to enable hw vlan filtering
+ * @adapter: driver data
+ */
+static void ixgbe_vlan_filter_enable(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 vlnctrl;
+
+       vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
+       vlnctrl |= IXGBE_VLNCTRL_VFE;
+       vlnctrl &= ~IXGBE_VLNCTRL_CFIEN;
+       IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
+}
+
+/**
+ * ixgbe_vlan_strip_disable - helper to disable hw vlan stripping
+ * @adapter: driver data
+ */
+static void ixgbe_vlan_strip_disable(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 vlnctrl;
+       int i, j;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
+               vlnctrl &= ~IXGBE_VLNCTRL_VME;
+               IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       j = adapter->rx_ring[i]->reg_idx;
+                       vlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));
+                       vlnctrl &= ~IXGBE_RXDCTL_VME;
+                       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(j), vlnctrl);
+               }
+               break;
+       default:
+               break;
+       }
+}
+
+/**
+ * ixgbe_vlan_strip_enable - helper to enable hw vlan stripping
+ * @adapter: driver data
+ */
+static void ixgbe_vlan_strip_enable(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 vlnctrl;
+       int i, j;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
+               vlnctrl |= IXGBE_VLNCTRL_VME;
+               IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       j = adapter->rx_ring[i]->reg_idx;
+                       vlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));
+                       vlnctrl |= IXGBE_RXDCTL_VME;
+                       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(j), vlnctrl);
+               }
+               break;
+       default:
+               break;
+       }
+}
+
+static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
+{
+       u16 vid;
+
+       ixgbe_vlan_rx_add_vid(adapter->netdev, 0);
+
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               ixgbe_vlan_rx_add_vid(adapter->netdev, vid);
+}
+
+/**
+ * ixgbe_write_uc_addr_list - write unicast addresses to RAR table
+ * @netdev: network interface device structure
+ *
+ * Writes unicast address list to the RAR table.
+ * Returns: -ENOMEM on failure/insufficient address space
+ *                0 on no addresses written
+ *                X on writing X addresses to the RAR table
+ **/
+static int ixgbe_write_uc_addr_list(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       unsigned int vfn = adapter->num_vfs;
+       unsigned int rar_entries = IXGBE_MAX_PF_MACVLANS;
+       int count = 0;
+
+       /* return ENOMEM indicating insufficient memory for addresses */
+       if (netdev_uc_count(netdev) > rar_entries)
+               return -ENOMEM;
+
+       if (!netdev_uc_empty(netdev) && rar_entries) {
+               struct netdev_hw_addr *ha;
+               /* return error if we do not support writing to RAR table */
+               if (!hw->mac.ops.set_rar)
+                       return -ENOMEM;
+
+               netdev_for_each_uc_addr(ha, netdev) {
+                       if (!rar_entries)
+                               break;
+                       hw->mac.ops.set_rar(hw, rar_entries--, ha->addr,
+                                           vfn, IXGBE_RAH_AV);
+                       count++;
+               }
+       }
+       /* write the addresses in reverse order to avoid write combining */
+       for (; rar_entries > 0 ; rar_entries--)
+               hw->mac.ops.clear_rar(hw, rar_entries);
+
+       return count;
+}
+
+/**
+ * ixgbe_set_rx_mode - Unicast, Multicast and Promiscuous mode set
+ * @netdev: network interface device structure
+ *
+ * The set_rx_method entry point is called whenever the unicast/multicast
+ * address list or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper unicast, multicast and
+ * promiscuous mode.
+ **/
+void ixgbe_set_rx_mode(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 fctrl, vmolr = IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE;
+       int count;
+
+       /* Check for Promiscuous and All Multicast modes */
+
+       fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+
+       /* set all bits that we expect to always be set */
+       fctrl |= IXGBE_FCTRL_BAM;
+       fctrl |= IXGBE_FCTRL_DPF; /* discard pause frames when FC enabled */
+       fctrl |= IXGBE_FCTRL_PMCF;
+
+       /* clear the bits we are changing the status of */
+       fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+
+       if (netdev->flags & IFF_PROMISC) {
+               hw->addr_ctrl.user_set_promisc = true;
+               fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
+               vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_MPE);
+               /* don't hardware filter vlans in promisc mode */
+               ixgbe_vlan_filter_disable(adapter);
+       } else {
+               if (netdev->flags & IFF_ALLMULTI) {
+                       fctrl |= IXGBE_FCTRL_MPE;
+                       vmolr |= IXGBE_VMOLR_MPE;
+               } else {
+                       /*
+                        * Write addresses to the MTA, if the attempt fails
+                        * then we should just turn on promiscuous mode so
+                        * that we can at least receive multicast traffic
+                        */
+                       hw->mac.ops.update_mc_addr_list(hw, netdev);
+                       vmolr |= IXGBE_VMOLR_ROMPE;
+               }
+               ixgbe_vlan_filter_enable(adapter);
+               hw->addr_ctrl.user_set_promisc = false;
+               /*
+                * Write addresses to available RAR registers, if there is not
+                * sufficient space to store all the addresses then enable
+                * unicast promiscuous mode
+                */
+               count = ixgbe_write_uc_addr_list(netdev);
+               if (count < 0) {
+                       fctrl |= IXGBE_FCTRL_UPE;
+                       vmolr |= IXGBE_VMOLR_ROPE;
+               }
+       }
+
+       if (adapter->num_vfs) {
+               ixgbe_restore_vf_multicasts(adapter);
+               vmolr |= IXGBE_READ_REG(hw, IXGBE_VMOLR(adapter->num_vfs)) &
+                        ~(IXGBE_VMOLR_MPE | IXGBE_VMOLR_ROMPE |
+                          IXGBE_VMOLR_ROPE);
+               IXGBE_WRITE_REG(hw, IXGBE_VMOLR(adapter->num_vfs), vmolr);
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
+
+       if (netdev->features & NETIF_F_HW_VLAN_RX)
+               ixgbe_vlan_strip_enable(adapter);
+       else
+               ixgbe_vlan_strip_disable(adapter);
+}
+
+static void ixgbe_napi_enable_all(struct ixgbe_adapter *adapter)
+{
+       int q_idx;
+       struct ixgbe_q_vector *q_vector;
+       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       /* legacy and MSI only use one vector */
+       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
+               q_vectors = 1;
+
+       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
+               struct napi_struct *napi;
+               q_vector = adapter->q_vector[q_idx];
+               napi = &q_vector->napi;
+               if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+                       if (!q_vector->rx.count || !q_vector->tx.count) {
+                               if (q_vector->tx.count == 1)
+                                       napi->poll = &ixgbe_clean_txonly;
+                               else if (q_vector->rx.count == 1)
+                                       napi->poll = &ixgbe_clean_rxonly;
+                       }
+               }
+
+               napi_enable(napi);
+       }
+}
+
+static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter)
+{
+       int q_idx;
+       struct ixgbe_q_vector *q_vector;
+       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       /* legacy and MSI only use one vector */
+       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
+               q_vectors = 1;
+
+       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
+               q_vector = adapter->q_vector[q_idx];
+               napi_disable(&q_vector->napi);
+       }
+}
+
+#ifdef CONFIG_IXGBE_DCB
+/*
+ * ixgbe_configure_dcb - Configure DCB hardware
+ * @adapter: ixgbe adapter struct
+ *
+ * This is called by the driver on open to configure the DCB hardware.
+ * This is also called by the gennetlink interface when reconfiguring
+ * the DCB state.
+ */
+static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int max_frame = adapter->netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+
+       if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED)) {
+               if (hw->mac.type == ixgbe_mac_82598EB)
+                       netif_set_gso_max_size(adapter->netdev, 65536);
+               return;
+       }
+
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               netif_set_gso_max_size(adapter->netdev, 32768);
+
+
+       /* Enable VLAN tag insert/strip */
+       adapter->netdev->features |= NETIF_F_HW_VLAN_RX;
+
+       hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
+
+       /* reconfigure the hardware */
+       if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
+#ifdef CONFIG_FCOE
+               if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+                       max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+#endif
+               ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
+                                               DCB_TX_CONFIG);
+               ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
+                                               DCB_RX_CONFIG);
+               ixgbe_dcb_hw_config(hw, &adapter->dcb_cfg);
+       } else {
+               struct net_device *dev = adapter->netdev;
+
+               if (adapter->ixgbe_ieee_ets)
+                       dev->dcbnl_ops->ieee_setets(dev,
+                                                   adapter->ixgbe_ieee_ets);
+               if (adapter->ixgbe_ieee_pfc)
+                       dev->dcbnl_ops->ieee_setpfc(dev,
+                                                   adapter->ixgbe_ieee_pfc);
+       }
+
+       /* Enable RSS Hash per TC */
+       if (hw->mac.type != ixgbe_mac_82598EB) {
+               int i;
+               u32 reg = 0;
+
+               for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                       u8 msb = 0;
+                       u8 cnt = adapter->netdev->tc_to_txq[i].count;
+
+                       while (cnt >>= 1)
+                               msb++;
+
+                       reg |= msb << IXGBE_RQTC_SHIFT_TC(i);
+               }
+               IXGBE_WRITE_REG(hw, IXGBE_RQTC, reg);
+       }
+}
+
+#endif
+
+static void ixgbe_configure_pb(struct ixgbe_adapter *adapter)
+{
+       int hdrm = 0;
+       int num_tc = netdev_get_num_tc(adapter->netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE ||
+           adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)
+               hdrm = 64 << adapter->fdir_pballoc;
+
+       hw->mac.ops.set_rxpba(&adapter->hw, num_tc, hdrm, PBA_STRATEGY_EQUAL);
+}
+
+static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct hlist_node *node, *node2;
+       struct ixgbe_fdir_filter *filter;
+
+       spin_lock(&adapter->fdir_perfect_lock);
+
+       if (!hlist_empty(&adapter->fdir_filter_list))
+               ixgbe_fdir_set_input_mask_82599(hw, &adapter->fdir_mask);
+
+       hlist_for_each_entry_safe(filter, node, node2,
+                                 &adapter->fdir_filter_list, fdir_node) {
+               ixgbe_fdir_write_perfect_filter_82599(hw,
+                               &filter->filter,
+                               filter->sw_idx,
+                               (filter->action == IXGBE_FDIR_DROP_QUEUE) ?
+                               IXGBE_FDIR_DROP_QUEUE :
+                               adapter->rx_ring[filter->action]->reg_idx);
+       }
+
+       spin_unlock(&adapter->fdir_perfect_lock);
+}
+
+static void ixgbe_configure(struct ixgbe_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       int i;
+
+       ixgbe_configure_pb(adapter);
+#ifdef CONFIG_IXGBE_DCB
+       ixgbe_configure_dcb(adapter);
+#endif
+
+       ixgbe_set_rx_mode(netdev);
+       ixgbe_restore_vlan(adapter);
+
+#ifdef IXGBE_FCOE
+       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
+               ixgbe_configure_fcoe(adapter);
+
+#endif /* IXGBE_FCOE */
+       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       adapter->tx_ring[i]->atr_sample_rate =
+                                                      adapter->atr_sample_rate;
+               ixgbe_init_fdir_signature_82599(hw, adapter->fdir_pballoc);
+       } else if (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE) {
+               ixgbe_init_fdir_perfect_82599(&adapter->hw,
+                                             adapter->fdir_pballoc);
+               ixgbe_fdir_filter_restore(adapter);
+       }
+       ixgbe_configure_virtualization(adapter);
+
+       ixgbe_configure_tx(adapter);
+       ixgbe_configure_rx(adapter);
+}
+
+static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
+{
+       switch (hw->phy.type) {
+       case ixgbe_phy_sfp_avago:
+       case ixgbe_phy_sfp_ftl:
+       case ixgbe_phy_sfp_intel:
+       case ixgbe_phy_sfp_unknown:
+       case ixgbe_phy_sfp_passive_tyco:
+       case ixgbe_phy_sfp_passive_unknown:
+       case ixgbe_phy_sfp_active_unknown:
+       case ixgbe_phy_sfp_ftl_active:
+               return true;
+       default:
+               return false;
+       }
+}
+
+/**
+ * ixgbe_sfp_link_config - set up SFP+ link
+ * @adapter: pointer to private adapter struct
+ **/
+static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter)
+{
+       /*
+        * We are assuming the worst case scenerio here, and that
+        * is that an SFP was inserted/removed after the reset
+        * but before SFP detection was enabled.  As such the best
+        * solution is to just start searching as soon as we start
+        */
+       if (adapter->hw.mac.type == ixgbe_mac_82598EB)
+               adapter->flags2 |= IXGBE_FLAG2_SEARCH_FOR_SFP;
+
+       adapter->flags2 |= IXGBE_FLAG2_SFP_NEEDS_RESET;
+}
+
+/**
+ * ixgbe_non_sfp_link_config - set up non-SFP+ link
+ * @hw: pointer to private hardware struct
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
+{
+       u32 autoneg;
+       bool negotiation, link_up = false;
+       u32 ret = IXGBE_ERR_LINK_SETUP;
+
+       if (hw->mac.ops.check_link)
+               ret = hw->mac.ops.check_link(hw, &autoneg, &link_up, false);
+
+       if (ret)
+               goto link_cfg_out;
+
+       autoneg = hw->phy.autoneg_advertised;
+       if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
+               ret = hw->mac.ops.get_link_capabilities(hw, &autoneg,
+                                                       &negotiation);
+       if (ret)
+               goto link_cfg_out;
+
+       if (hw->mac.ops.setup_link)
+               ret = hw->mac.ops.setup_link(hw, autoneg, negotiation, link_up);
+link_cfg_out:
+       return ret;
+}
+
+static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 gpie = 0;
+
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+               gpie = IXGBE_GPIE_MSIX_MODE | IXGBE_GPIE_PBA_SUPPORT |
+                      IXGBE_GPIE_OCD;
+               gpie |= IXGBE_GPIE_EIAME;
+               /*
+                * use EIAM to auto-mask when MSI-X interrupt is asserted
+                * this saves a register write for every interrupt
+                */
+               switch (hw->mac.type) {
+               case ixgbe_mac_82598EB:
+                       IXGBE_WRITE_REG(hw, IXGBE_EIAM, IXGBE_EICS_RTX_QUEUE);
+                       break;
+               case ixgbe_mac_82599EB:
+               case ixgbe_mac_X540:
+               default:
+                       IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(0), 0xFFFFFFFF);
+                       IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(1), 0xFFFFFFFF);
+                       break;
+               }
+       } else {
+               /* legacy interrupts, use EIAM to auto-mask when reading EICR,
+                * specifically only auto mask tx and rx interrupts */
+               IXGBE_WRITE_REG(hw, IXGBE_EIAM, IXGBE_EICS_RTX_QUEUE);
+       }
+
+       /* XXX: to interrupt immediately for EICS writes, enable this */
+       /* gpie |= IXGBE_GPIE_EIMEN; */
+
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+               gpie &= ~IXGBE_GPIE_VTMODE_MASK;
+               gpie |= IXGBE_GPIE_VTMODE_64;
+       }
+
+       /* Enable fan failure interrupt */
+       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)
+               gpie |= IXGBE_SDP1_GPIEN;
+
+       if (hw->mac.type == ixgbe_mac_82599EB) {
+               gpie |= IXGBE_SDP1_GPIEN;
+               gpie |= IXGBE_SDP2_GPIEN;
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
+}
+
+static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int err;
+       u32 ctrl_ext;
+
+       ixgbe_get_hw_control(adapter);
+       ixgbe_setup_gpie(adapter);
+
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
+               ixgbe_configure_msix(adapter);
+       else
+               ixgbe_configure_msi_and_legacy(adapter);
+
+       /* enable the optics for both mult-speed fiber and 82599 SFP+ fiber */
+       if (hw->mac.ops.enable_tx_laser &&
+           ((hw->phy.multispeed_fiber) ||
+            ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+             (hw->mac.type == ixgbe_mac_82599EB))))
+               hw->mac.ops.enable_tx_laser(hw);
+
+       clear_bit(__IXGBE_DOWN, &adapter->state);
+       ixgbe_napi_enable_all(adapter);
+
+       if (ixgbe_is_sfp(hw)) {
+               ixgbe_sfp_link_config(adapter);
+       } else {
+               err = ixgbe_non_sfp_link_config(hw);
+               if (err)
+                       e_err(probe, "link_config FAILED %d\n", err);
+       }
+
+       /* clear any pending interrupts, may auto mask */
+       IXGBE_READ_REG(hw, IXGBE_EICR);
+       ixgbe_irq_enable(adapter, true, true);
+
+       /*
+        * If this adapter has a fan, check to see if we had a failure
+        * before we enabled the interrupt.
+        */
+       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
+               u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
+               if (esdp & IXGBE_ESDP_SDP1)
+                       e_crit(drv, "Fan has stopped, replace the adapter\n");
+       }
+
+       /* enable transmits */
+       netif_tx_start_all_queues(adapter->netdev);
+
+       /* bring the link up in the watchdog, this could race with our first
+        * link up interrupt but shouldn't be a problem */
+       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
+       adapter->link_check_timeout = jiffies;
+       mod_timer(&adapter->service_timer, jiffies);
+
+       /* Set PF Reset Done bit so PF/VF Mail Ops can work */
+       ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
+       ctrl_ext |= IXGBE_CTRL_EXT_PFRSTD;
+       IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);
+
+       return 0;
+}
+
+void ixgbe_reinit_locked(struct ixgbe_adapter *adapter)
+{
+       WARN_ON(in_interrupt());
+       /* put off any impending NetWatchDogTimeout */
+       adapter->netdev->trans_start = jiffies;
+
+       while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
+               usleep_range(1000, 2000);
+       ixgbe_down(adapter);
+       /*
+        * If SR-IOV enabled then wait a bit before bringing the adapter
+        * back up to give the VFs time to respond to the reset.  The
+        * two second wait is based upon the watchdog timer cycle in
+        * the VF driver.
+        */
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+               msleep(2000);
+       ixgbe_up(adapter);
+       clear_bit(__IXGBE_RESETTING, &adapter->state);
+}
+
+int ixgbe_up(struct ixgbe_adapter *adapter)
+{
+       /* hardware has been reset, we need to reload some things */
+       ixgbe_configure(adapter);
+
+       return ixgbe_up_complete(adapter);
+}
+
+void ixgbe_reset(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int err;
+
+       /* lock SFP init bit to prevent race conditions with the watchdog */
+       while (test_and_set_bit(__IXGBE_IN_SFP_INIT, &adapter->state))
+               usleep_range(1000, 2000);
+
+       /* clear all SFP and link config related flags while holding SFP_INIT */
+       adapter->flags2 &= ~(IXGBE_FLAG2_SEARCH_FOR_SFP |
+                            IXGBE_FLAG2_SFP_NEEDS_RESET);
+       adapter->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
+
+       err = hw->mac.ops.init_hw(hw);
+       switch (err) {
+       case 0:
+       case IXGBE_ERR_SFP_NOT_PRESENT:
+       case IXGBE_ERR_SFP_NOT_SUPPORTED:
+               break;
+       case IXGBE_ERR_MASTER_REQUESTS_PENDING:
+               e_dev_err("master disable timed out\n");
+               break;
+       case IXGBE_ERR_EEPROM_VERSION:
+               /* We are running on a pre-production device, log a warning */
+               e_dev_warn("This device is a pre-production adapter/LOM. "
+                          "Please be aware there may be issuesassociated with "
+                          "your hardware.  If you are experiencing problems "
+                          "please contact your Intel or hardware "
+                          "representative who provided you with this "
+                          "hardware.\n");
+               break;
+       default:
+               e_dev_err("Hardware Error: %d\n", err);
+       }
+
+       clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);
+
+       /* reprogram the RAR[0] in case user changed it. */
+       hw->mac.ops.set_rar(hw, 0, hw->mac.addr, adapter->num_vfs,
+                           IXGBE_RAH_AV);
+}
+
+/**
+ * ixgbe_clean_rx_ring - Free Rx Buffers per Queue
+ * @rx_ring: ring to free buffers from
+ **/
+static void ixgbe_clean_rx_ring(struct ixgbe_ring *rx_ring)
+{
+       struct device *dev = rx_ring->dev;
+       unsigned long size;
+       u16 i;
+
+       /* ring already cleared, nothing to do */
+       if (!rx_ring->rx_buffer_info)
+               return;
+
+       /* Free all the Rx ring sk_buffs */
+       for (i = 0; i < rx_ring->count; i++) {
+               struct ixgbe_rx_buffer *rx_buffer_info;
+
+               rx_buffer_info = &rx_ring->rx_buffer_info[i];
+               if (rx_buffer_info->dma) {
+                       dma_unmap_single(rx_ring->dev, rx_buffer_info->dma,
+                                        rx_ring->rx_buf_len,
+                                        DMA_FROM_DEVICE);
+                       rx_buffer_info->dma = 0;
+               }
+               if (rx_buffer_info->skb) {
+                       struct sk_buff *skb = rx_buffer_info->skb;
+                       rx_buffer_info->skb = NULL;
+                       do {
+                               struct sk_buff *this = skb;
+                               if (IXGBE_RSC_CB(this)->delay_unmap) {
+                                       dma_unmap_single(dev,
+                                                        IXGBE_RSC_CB(this)->dma,
+                                                        rx_ring->rx_buf_len,
+                                                        DMA_FROM_DEVICE);
+                                       IXGBE_RSC_CB(this)->dma = 0;
+                                       IXGBE_RSC_CB(skb)->delay_unmap = false;
+                               }
+                               skb = skb->prev;
+                               dev_kfree_skb(this);
+                       } while (skb);
+               }
+               if (!rx_buffer_info->page)
+                       continue;
+               if (rx_buffer_info->page_dma) {
+                       dma_unmap_page(dev, rx_buffer_info->page_dma,
+                                      PAGE_SIZE / 2, DMA_FROM_DEVICE);
+                       rx_buffer_info->page_dma = 0;
+               }
+               put_page(rx_buffer_info->page);
+               rx_buffer_info->page = NULL;
+               rx_buffer_info->page_offset = 0;
+       }
+
+       size = sizeof(struct ixgbe_rx_buffer) * rx_ring->count;
+       memset(rx_ring->rx_buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(rx_ring->desc, 0, rx_ring->size);
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+}
+
+/**
+ * ixgbe_clean_tx_ring - Free Tx Buffers
+ * @tx_ring: ring to be cleaned
+ **/
+static void ixgbe_clean_tx_ring(struct ixgbe_ring *tx_ring)
+{
+       struct ixgbe_tx_buffer *tx_buffer_info;
+       unsigned long size;
+       u16 i;
+
+       /* ring already cleared, nothing to do */
+       if (!tx_ring->tx_buffer_info)
+               return;
+
+       /* Free all the Tx ring sk_buffs */
+       for (i = 0; i < tx_ring->count; i++) {
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
+       }
+
+       size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
+       memset(tx_ring->tx_buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(tx_ring->desc, 0, tx_ring->size);
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+}
+
+/**
+ * ixgbe_clean_all_rx_rings - Free Rx Buffers for all queues
+ * @adapter: board private structure
+ **/
+static void ixgbe_clean_all_rx_rings(struct ixgbe_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               ixgbe_clean_rx_ring(adapter->rx_ring[i]);
+}
+
+/**
+ * ixgbe_clean_all_tx_rings - Free Tx Buffers for all queues
+ * @adapter: board private structure
+ **/
+static void ixgbe_clean_all_tx_rings(struct ixgbe_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               ixgbe_clean_tx_ring(adapter->tx_ring[i]);
+}
+
+static void ixgbe_fdir_filter_exit(struct ixgbe_adapter *adapter)
+{
+       struct hlist_node *node, *node2;
+       struct ixgbe_fdir_filter *filter;
+
+       spin_lock(&adapter->fdir_perfect_lock);
+
+       hlist_for_each_entry_safe(filter, node, node2,
+                                 &adapter->fdir_filter_list, fdir_node) {
+               hlist_del(&filter->fdir_node);
+               kfree(filter);
+       }
+       adapter->fdir_filter_count = 0;
+
+       spin_unlock(&adapter->fdir_perfect_lock);
+}
+
+void ixgbe_down(struct ixgbe_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 rxctrl;
+       int i;
+       int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       /* signal that we are down to the interrupt handler */
+       set_bit(__IXGBE_DOWN, &adapter->state);
+
+       /* disable receives */
+       rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
+       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl & ~IXGBE_RXCTRL_RXEN);
+
+       /* disable all enabled rx queues */
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               /* this call also flushes the previous write */
+               ixgbe_disable_rx_queue(adapter, adapter->rx_ring[i]);
+
+       usleep_range(10000, 20000);
+
+       netif_tx_stop_all_queues(netdev);
+
+       /* call carrier off first to avoid false dev_watchdog timeouts */
+       netif_carrier_off(netdev);
+       netif_tx_disable(netdev);
+
+       ixgbe_irq_disable(adapter);
+
+       ixgbe_napi_disable_all(adapter);
+
+       adapter->flags2 &= ~(IXGBE_FLAG2_FDIR_REQUIRES_REINIT |
+                            IXGBE_FLAG2_RESET_REQUESTED);
+       adapter->flags &= ~IXGBE_FLAG_NEED_LINK_UPDATE;
+
+       del_timer_sync(&adapter->service_timer);
+
+       /* disable receive for all VFs and wait one second */
+       if (adapter->num_vfs) {
+               /* ping all the active vfs to let them know we are going down */
+               ixgbe_ping_all_vfs(adapter);
+
+               /* Disable all VFTE/VFRE TX/RX */
+               ixgbe_disable_tx_rx(adapter);
+
+               /* Mark all the VFs as inactive */
+               for (i = 0 ; i < adapter->num_vfs; i++)
+                       adapter->vfinfo[i].clear_to_send = 0;
+       }
+
+       /* Cleanup the affinity_hint CPU mask memory and callback */
+       for (i = 0; i < num_q_vectors; i++) {
+               struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
+               /* clear the affinity_mask in the IRQ descriptor */
+               irq_set_affinity_hint(adapter->msix_entries[i]. vector, NULL);
+               /* release the CPU mask memory */
+               free_cpumask_var(q_vector->affinity_mask);
+       }
+
+       /* disable transmits in the hardware now that interrupts are off */
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               u8 reg_idx = adapter->tx_ring[i]->reg_idx;
+               IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), IXGBE_TXDCTL_SWFLSH);
+       }
+
+       /* Disable the Tx DMA engine on 82599 and X540 */
+       switch (hw->mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL,
+                               (IXGBE_READ_REG(hw, IXGBE_DMATXCTL) &
+                                ~IXGBE_DMATXCTL_TE));
+               break;
+       default:
+               break;
+       }
+
+       if (!pci_channel_offline(adapter->pdev))
+               ixgbe_reset(adapter);
+
+       /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
+       if (hw->mac.ops.disable_tx_laser &&
+           ((hw->phy.multispeed_fiber) ||
+            ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+             (hw->mac.type == ixgbe_mac_82599EB))))
+               hw->mac.ops.disable_tx_laser(hw);
+
+       ixgbe_clean_all_tx_rings(adapter);
+       ixgbe_clean_all_rx_rings(adapter);
+
+#ifdef CONFIG_IXGBE_DCA
+       /* since we reset the hardware DCA settings were cleared */
+       ixgbe_setup_dca(adapter);
+#endif
+}
+
+/**
+ * ixgbe_poll - NAPI Rx polling callback
+ * @napi: structure for representing this polling device
+ * @budget: how many packets driver is allowed to clean
+ *
+ * This function is used for legacy and MSI, NAPI mode
+ **/
+static int ixgbe_poll(struct napi_struct *napi, int budget)
+{
+       struct ixgbe_q_vector *q_vector =
+                               container_of(napi, struct ixgbe_q_vector, napi);
+       struct ixgbe_adapter *adapter = q_vector->adapter;
+       int tx_clean_complete, work_done = 0;
+
+#ifdef CONFIG_IXGBE_DCA
+       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+               ixgbe_update_dca(q_vector);
+#endif
+
+       tx_clean_complete = ixgbe_clean_tx_irq(q_vector, adapter->tx_ring[0]);
+       ixgbe_clean_rx_irq(q_vector, adapter->rx_ring[0], &work_done, budget);
+
+       if (!tx_clean_complete)
+               work_done = budget;
+
+       /* If budget not fully consumed, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               if (adapter->rx_itr_setting & 1)
+                       ixgbe_set_itr(q_vector);
+               if (!test_bit(__IXGBE_DOWN, &adapter->state))
+                       ixgbe_irq_enable_queues(adapter, IXGBE_EIMS_RTX_QUEUE);
+       }
+       return work_done;
+}
+
+/**
+ * ixgbe_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+static void ixgbe_tx_timeout(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       /* Do the reset outside of interrupt context */
+       ixgbe_tx_timeout_reset(adapter);
+}
+
+/**
+ * ixgbe_set_rss_queues: Allocate queues for RSS
+ * @adapter: board private structure to initialize
+ *
+ * This is our "base" multiqueue mode.  RSS (Receive Side Scaling) will try
+ * to allocate one Rx queue per CPU, and if available, one Tx queue per CPU.
+ *
+ **/
+static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
+{
+       bool ret = false;
+       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_RSS];
+
+       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
+               f->mask = 0xF;
+               adapter->num_rx_queues = f->indices;
+               adapter->num_tx_queues = f->indices;
+               ret = true;
+       } else {
+               ret = false;
+       }
+
+       return ret;
+}
+
+/**
+ * ixgbe_set_fdir_queues: Allocate queues for Flow Director
+ * @adapter: board private structure to initialize
+ *
+ * Flow Director is an advanced Rx filter, attempting to get Rx flows back
+ * to the original CPU that initiated the Tx session.  This runs in addition
+ * to RSS, so if a packet doesn't match an FDIR filter, we can still spread the
+ * Rx load across CPUs using RSS.
+ *
+ **/
+static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter)
+{
+       bool ret = false;
+       struct ixgbe_ring_feature *f_fdir = &adapter->ring_feature[RING_F_FDIR];
+
+       f_fdir->indices = min((int)num_online_cpus(), f_fdir->indices);
+       f_fdir->mask = 0;
+
+       /* Flow Director must have RSS enabled */
+       if ((adapter->flags & IXGBE_FLAG_RSS_ENABLED) &&
+           (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)) {
+               adapter->num_tx_queues = f_fdir->indices;
+               adapter->num_rx_queues = f_fdir->indices;
+               ret = true;
+       } else {
+               adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
+       }
+       return ret;
+}
+
+#ifdef IXGBE_FCOE
+/**
+ * ixgbe_set_fcoe_queues: Allocate queues for Fiber Channel over Ethernet (FCoE)
+ * @adapter: board private structure to initialize
+ *
+ * FCoE RX FCRETA can use up to 8 rx queues for up to 8 different exchanges.
+ * The ring feature mask is not used as a mask for FCoE, as it can take any 8
+ * rx queues out of the max number of rx queues, instead, it is used as the
+ * index of the first rx queue used by FCoE.
+ *
+ **/
+static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
+
+       if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
+               return false;
+
+       f->indices = min((int)num_online_cpus(), f->indices);
+
+       adapter->num_rx_queues = 1;
+       adapter->num_tx_queues = 1;
+
+       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
+               e_info(probe, "FCoE enabled with RSS\n");
+               if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)
+                       ixgbe_set_fdir_queues(adapter);
+               else
+                       ixgbe_set_rss_queues(adapter);
+       }
+
+       /* adding FCoE rx rings to the end */
+       f->mask = adapter->num_rx_queues;
+       adapter->num_rx_queues += f->indices;
+       adapter->num_tx_queues += f->indices;
+
+       return true;
+}
+#endif /* IXGBE_FCOE */
+
+/* Artificial max queue cap per traffic class in DCB mode */
+#define DCB_QUEUE_CAP 8
+
+#ifdef CONFIG_IXGBE_DCB
+static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter)
+{
+       int per_tc_q, q, i, offset = 0;
+       struct net_device *dev = adapter->netdev;
+       int tcs = netdev_get_num_tc(dev);
+
+       if (!tcs)
+               return false;
+
+       /* Map queue offset and counts onto allocated tx queues */
+       per_tc_q = min(dev->num_tx_queues / tcs, (unsigned int)DCB_QUEUE_CAP);
+       q = min((int)num_online_cpus(), per_tc_q);
+
+       for (i = 0; i < tcs; i++) {
+               netdev_set_prio_tc_map(dev, i, i);
+               netdev_set_tc_queue(dev, i, q, offset);
+               offset += q;
+       }
+
+       adapter->num_tx_queues = q * tcs;
+       adapter->num_rx_queues = q * tcs;
+
+#ifdef IXGBE_FCOE
+       /* FCoE enabled queues require special configuration indexed
+        * by feature specific indices and mask. Here we map FCoE
+        * indices onto the DCB queue pairs allowing FCoE to own
+        * configuration later.
+        */
+       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {
+               int tc;
+               struct ixgbe_ring_feature *f =
+                                       &adapter->ring_feature[RING_F_FCOE];
+
+               tc = netdev_get_prio_tc_map(dev, adapter->fcoe.up);
+               f->indices = dev->tc_to_txq[tc].count;
+               f->mask = dev->tc_to_txq[tc].offset;
+       }
+#endif
+
+       return true;
+}
+#endif
+
+/**
+ * ixgbe_set_sriov_queues: Allocate queues for IOV use
+ * @adapter: board private structure to initialize
+ *
+ * IOV doesn't actually use anything, so just NAK the
+ * request for now and let the other queue routines
+ * figure out what to do.
+ */
+static inline bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)
+{
+       return false;
+}
+
+/*
+ * ixgbe_set_num_queues: Allocate queues for device, feature dependent
+ * @adapter: board private structure to initialize
+ *
+ * This is the top level queue allocation routine.  The order here is very
+ * important, starting with the "most" number of features turned on at once,
+ * and ending with the smallest set of features.  This way large combinations
+ * can be allocated if they're turned on, and smaller combinations are the
+ * fallthrough conditions.
+ *
+ **/
+static int ixgbe_set_num_queues(struct ixgbe_adapter *adapter)
+{
+       /* Start with base case */
+       adapter->num_rx_queues = 1;
+       adapter->num_tx_queues = 1;
+       adapter->num_rx_pools = adapter->num_rx_queues;
+       adapter->num_rx_queues_per_pool = 1;
+
+       if (ixgbe_set_sriov_queues(adapter))
+               goto done;
+
+#ifdef CONFIG_IXGBE_DCB
+       if (ixgbe_set_dcb_queues(adapter))
+               goto done;
+
+#endif
+#ifdef IXGBE_FCOE
+       if (ixgbe_set_fcoe_queues(adapter))
+               goto done;
+
+#endif /* IXGBE_FCOE */
+       if (ixgbe_set_fdir_queues(adapter))
+               goto done;
+
+       if (ixgbe_set_rss_queues(adapter))
+               goto done;
+
+       /* fallback to base case */
+       adapter->num_rx_queues = 1;
+       adapter->num_tx_queues = 1;
+
+done:
+       /* Notify the stack of the (possibly) reduced queue counts. */
+       netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
+       return netif_set_real_num_rx_queues(adapter->netdev,
+                                           adapter->num_rx_queues);
+}
+
+static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
+                                      int vectors)
+{
+       int err, vector_threshold;
+
+       /* We'll want at least 3 (vector_threshold):
+        * 1) TxQ[0] Cleanup
+        * 2) RxQ[0] Cleanup
+        * 3) Other (Link Status Change, etc.)
+        * 4) TCP Timer (optional)
+        */
+       vector_threshold = MIN_MSIX_COUNT;
+
+       /* The more we get, the more we will assign to Tx/Rx Cleanup
+        * for the separate queues...where Rx Cleanup >= Tx Cleanup.
+        * Right now, we simply care about how many we'll get; we'll
+        * set them up later while requesting irq's.
+        */
+       while (vectors >= vector_threshold) {
+               err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
+                                     vectors);
+               if (!err) /* Success in acquiring all requested vectors. */
+                       break;
+               else if (err < 0)
+                       vectors = 0; /* Nasty failure, quit now */
+               else /* err == number of vectors we should try again with */
+                       vectors = err;
+       }
+
+       if (vectors < vector_threshold) {
+               /* Can't allocate enough MSI-X interrupts?  Oh well.
+                * This just means we'll go with either a single MSI
+                * vector or fall back to legacy interrupts.
+                */
+               netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
+                            "Unable to allocate MSI-X interrupts\n");
+               adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
+               kfree(adapter->msix_entries);
+               adapter->msix_entries = NULL;
+       } else {
+               adapter->flags |= IXGBE_FLAG_MSIX_ENABLED; /* Woot! */
+               /*
+                * Adjust for only the vectors we'll use, which is minimum
+                * of max_msix_q_vectors + NON_Q_VECTORS, or the number of
+                * vectors we were allocated.
+                */
+               adapter->num_msix_vectors = min(vectors,
+                                  adapter->max_msix_q_vectors + NON_Q_VECTORS);
+       }
+}
+
+/**
+ * ixgbe_cache_ring_rss - Descriptor ring to register mapping for RSS
+ * @adapter: board private structure to initialize
+ *
+ * Cache the descriptor ring offsets for RSS to the assigned rings.
+ *
+ **/
+static inline bool ixgbe_cache_ring_rss(struct ixgbe_adapter *adapter)
+{
+       int i;
+
+       if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))
+               return false;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               adapter->rx_ring[i]->reg_idx = i;
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               adapter->tx_ring[i]->reg_idx = i;
+
+       return true;
+}
+
+#ifdef CONFIG_IXGBE_DCB
+
+/* ixgbe_get_first_reg_idx - Return first register index associated with ring */
+static void ixgbe_get_first_reg_idx(struct ixgbe_adapter *adapter, u8 tc,
+                                   unsigned int *tx, unsigned int *rx)
+{
+       struct net_device *dev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u8 num_tcs = netdev_get_num_tc(dev);
+
+       *tx = 0;
+       *rx = 0;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               *tx = tc << 2;
+               *rx = tc << 3;
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               if (num_tcs == 8) {
+                       if (tc < 3) {
+                               *tx = tc << 5;
+                               *rx = tc << 4;
+                       } else if (tc <  5) {
+                               *tx = ((tc + 2) << 4);
+                               *rx = tc << 4;
+                       } else if (tc < num_tcs) {
+                               *tx = ((tc + 8) << 3);
+                               *rx = tc << 4;
+                       }
+               } else if (num_tcs == 4) {
+                       *rx =  tc << 5;
+                       switch (tc) {
+                       case 0:
+                               *tx =  0;
+                               break;
+                       case 1:
+                               *tx = 64;
+                               break;
+                       case 2:
+                               *tx = 96;
+                               break;
+                       case 3:
+                               *tx = 112;
+                               break;
+                       default:
+                               break;
+                       }
+               }
+               break;
+       default:
+               break;
+       }
+}
+
+/**
+ * ixgbe_cache_ring_dcb - Descriptor ring to register mapping for DCB
+ * @adapter: board private structure to initialize
+ *
+ * Cache the descriptor ring offsets for DCB to the assigned rings.
+ *
+ **/
+static inline bool ixgbe_cache_ring_dcb(struct ixgbe_adapter *adapter)
+{
+       struct net_device *dev = adapter->netdev;
+       int i, j, k;
+       u8 num_tcs = netdev_get_num_tc(dev);
+
+       if (!num_tcs)
+               return false;
+
+       for (i = 0, k = 0; i < num_tcs; i++) {
+               unsigned int tx_s, rx_s;
+               u16 count = dev->tc_to_txq[i].count;
+
+               ixgbe_get_first_reg_idx(adapter, i, &tx_s, &rx_s);
+               for (j = 0; j < count; j++, k++) {
+                       adapter->tx_ring[k]->reg_idx = tx_s + j;
+                       adapter->rx_ring[k]->reg_idx = rx_s + j;
+                       adapter->tx_ring[k]->dcb_tc = i;
+                       adapter->rx_ring[k]->dcb_tc = i;
+               }
+       }
+
+       return true;
+}
+#endif
+
+/**
+ * ixgbe_cache_ring_fdir - Descriptor ring to register mapping for Flow Director
+ * @adapter: board private structure to initialize
+ *
+ * Cache the descriptor ring offsets for Flow Director to the assigned rings.
+ *
+ **/
+static inline bool ixgbe_cache_ring_fdir(struct ixgbe_adapter *adapter)
+{
+       int i;
+       bool ret = false;
+
+       if ((adapter->flags & IXGBE_FLAG_RSS_ENABLED) &&
+           (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)) {
+               for (i = 0; i < adapter->num_rx_queues; i++)
+                       adapter->rx_ring[i]->reg_idx = i;
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       adapter->tx_ring[i]->reg_idx = i;
+               ret = true;
+       }
+
+       return ret;
+}
+
+#ifdef IXGBE_FCOE
+/**
+ * ixgbe_cache_ring_fcoe - Descriptor ring to register mapping for the FCoE
+ * @adapter: board private structure to initialize
+ *
+ * Cache the descriptor ring offsets for FCoE mode to the assigned rings.
+ *
+ */
+static inline bool ixgbe_cache_ring_fcoe(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
+       int i;
+       u8 fcoe_rx_i = 0, fcoe_tx_i = 0;
+
+       if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
+               return false;
+
+       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
+               if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)
+                       ixgbe_cache_ring_fdir(adapter);
+               else
+                       ixgbe_cache_ring_rss(adapter);
+
+               fcoe_rx_i = f->mask;
+               fcoe_tx_i = f->mask;
+       }
+       for (i = 0; i < f->indices; i++, fcoe_rx_i++, fcoe_tx_i++) {
+               adapter->rx_ring[f->mask + i]->reg_idx = fcoe_rx_i;
+               adapter->tx_ring[f->mask + i]->reg_idx = fcoe_tx_i;
+       }
+       return true;
+}
+
+#endif /* IXGBE_FCOE */
+/**
+ * ixgbe_cache_ring_sriov - Descriptor ring to register mapping for sriov
+ * @adapter: board private structure to initialize
+ *
+ * SR-IOV doesn't use any descriptor rings but changes the default if
+ * no other mapping is used.
+ *
+ */
+static inline bool ixgbe_cache_ring_sriov(struct ixgbe_adapter *adapter)
+{
+       adapter->rx_ring[0]->reg_idx = adapter->num_vfs * 2;
+       adapter->tx_ring[0]->reg_idx = adapter->num_vfs * 2;
+       if (adapter->num_vfs)
+               return true;
+       else
+               return false;
+}
+
+/**
+ * ixgbe_cache_ring_register - Descriptor ring to register mapping
+ * @adapter: board private structure to initialize
+ *
+ * Once we know the feature-set enabled for the device, we'll cache
+ * the register offset the descriptor ring is assigned to.
+ *
+ * Note, the order the various feature calls is important.  It must start with
+ * the "most" features enabled at the same time, then trickle down to the
+ * least amount of features turned on at once.
+ **/
+static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
+{
+       /* start with default case */
+       adapter->rx_ring[0]->reg_idx = 0;
+       adapter->tx_ring[0]->reg_idx = 0;
+
+       if (ixgbe_cache_ring_sriov(adapter))
+               return;
+
+#ifdef CONFIG_IXGBE_DCB
+       if (ixgbe_cache_ring_dcb(adapter))
+               return;
+#endif
+
+#ifdef IXGBE_FCOE
+       if (ixgbe_cache_ring_fcoe(adapter))
+               return;
+#endif /* IXGBE_FCOE */
+
+       if (ixgbe_cache_ring_fdir(adapter))
+               return;
+
+       if (ixgbe_cache_ring_rss(adapter))
+               return;
+}
+
+/**
+ * ixgbe_alloc_queues - Allocate memory for all rings
+ * @adapter: board private structure to initialize
+ *
+ * We allocate one ring per queue at run-time since we don't know the
+ * number of queues at compile-time.  The polling_netdev array is
+ * intended for Multiqueue, but should work fine with a single queue.
+ **/
+static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter)
+{
+       int rx = 0, tx = 0, nid = adapter->node;
+
+       if (nid < 0 || !node_online(nid))
+               nid = first_online_node;
+
+       for (; tx < adapter->num_tx_queues; tx++) {
+               struct ixgbe_ring *ring;
+
+               ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, nid);
+               if (!ring)
+                       ring = kzalloc(sizeof(*ring), GFP_KERNEL);
+               if (!ring)
+                       goto err_allocation;
+               ring->count = adapter->tx_ring_count;
+               ring->queue_index = tx;
+               ring->numa_node = nid;
+               ring->dev = &adapter->pdev->dev;
+               ring->netdev = adapter->netdev;
+
+               adapter->tx_ring[tx] = ring;
+       }
+
+       for (; rx < adapter->num_rx_queues; rx++) {
+               struct ixgbe_ring *ring;
+
+               ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, nid);
+               if (!ring)
+                       ring = kzalloc(sizeof(*ring), GFP_KERNEL);
+               if (!ring)
+                       goto err_allocation;
+               ring->count = adapter->rx_ring_count;
+               ring->queue_index = rx;
+               ring->numa_node = nid;
+               ring->dev = &adapter->pdev->dev;
+               ring->netdev = adapter->netdev;
+
+               adapter->rx_ring[rx] = ring;
+       }
+
+       ixgbe_cache_ring_register(adapter);
+
+       return 0;
+
+err_allocation:
+       while (tx)
+               kfree(adapter->tx_ring[--tx]);
+
+       while (rx)
+               kfree(adapter->rx_ring[--rx]);
+       return -ENOMEM;
+}
+
+/**
+ * ixgbe_set_interrupt_capability - set MSI-X or MSI if supported
+ * @adapter: board private structure to initialize
+ *
+ * Attempt to configure the interrupts using the best available
+ * capabilities of the hardware and the kernel.
+ **/
+static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int err = 0;
+       int vector, v_budget;
+
+       /*
+        * It's easy to be greedy for MSI-X vectors, but it really
+        * doesn't do us much good if we have a lot more vectors
+        * than CPU's.  So let's be conservative and only ask for
+        * (roughly) the same number of vectors as there are CPU's.
+        */
+       v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues,
+                      (int)num_online_cpus()) + NON_Q_VECTORS;
+
+       /*
+        * At the same time, hardware can only support a maximum of
+        * hw.mac->max_msix_vectors vectors.  With features
+        * such as RSS and VMDq, we can easily surpass the number of Rx and Tx
+        * descriptor queues supported by our device.  Thus, we cap it off in
+        * those rare cases where the cpu count also exceeds our vector limit.
+        */
+       v_budget = min(v_budget, (int)hw->mac.max_msix_vectors);
+
+       /* A failure in MSI-X entry allocation isn't fatal, but it does
+        * mean we disable MSI-X capabilities of the adapter. */
+       adapter->msix_entries = kcalloc(v_budget,
+                                       sizeof(struct msix_entry), GFP_KERNEL);
+       if (adapter->msix_entries) {
+               for (vector = 0; vector < v_budget; vector++)
+                       adapter->msix_entries[vector].entry = vector;
+
+               ixgbe_acquire_msix_vectors(adapter, v_budget);
+
+               if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
+                       goto out;
+       }
+
+       adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
+       adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
+       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
+               e_err(probe,
+                     "ATR is not supported while multiple "
+                     "queues are disabled.  Disabling Flow Director\n");
+       }
+       adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
+       adapter->atr_sample_rate = 0;
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+               ixgbe_disable_sriov(adapter);
+
+       err = ixgbe_set_num_queues(adapter);
+       if (err)
+               return err;
+
+       err = pci_enable_msi(adapter->pdev);
+       if (!err) {
+               adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
+       } else {
+               netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
+                            "Unable to allocate MSI interrupt, "
+                            "falling back to legacy.  Error: %d\n", err);
+               /* reset err */
+               err = 0;
+       }
+
+out:
+       return err;
+}
+
+/**
+ * ixgbe_alloc_q_vectors - Allocate memory for interrupt vectors
+ * @adapter: board private structure to initialize
+ *
+ * We allocate one q_vector per queue interrupt.  If allocation fails we
+ * return -ENOMEM.
+ **/
+static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
+{
+       int q_idx, num_q_vectors;
+       struct ixgbe_q_vector *q_vector;
+       int (*poll)(struct napi_struct *, int);
+
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+               num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+               poll = &ixgbe_clean_rxtx_many;
+       } else {
+               num_q_vectors = 1;
+               poll = &ixgbe_poll;
+       }
+
+       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
+               q_vector = kzalloc_node(sizeof(struct ixgbe_q_vector),
+                                       GFP_KERNEL, adapter->node);
+               if (!q_vector)
+                       q_vector = kzalloc(sizeof(struct ixgbe_q_vector),
+                                          GFP_KERNEL);
+               if (!q_vector)
+                       goto err_out;
+               q_vector->adapter = adapter;
+               if (q_vector->tx.count && !q_vector->rx.count)
+                       q_vector->eitr = adapter->tx_eitr_param;
+               else
+                       q_vector->eitr = adapter->rx_eitr_param;
+               q_vector->v_idx = q_idx;
+               netif_napi_add(adapter->netdev, &q_vector->napi, (*poll), 64);
+               adapter->q_vector[q_idx] = q_vector;
+       }
+
+       return 0;
+
+err_out:
+       while (q_idx) {
+               q_idx--;
+               q_vector = adapter->q_vector[q_idx];
+               netif_napi_del(&q_vector->napi);
+               kfree(q_vector);
+               adapter->q_vector[q_idx] = NULL;
+       }
+       return -ENOMEM;
+}
+
+/**
+ * ixgbe_free_q_vectors - Free memory allocated for interrupt vectors
+ * @adapter: board private structure to initialize
+ *
+ * This function frees the memory allocated to the q_vectors.  In addition if
+ * NAPI is enabled it will delete any references to the NAPI struct prior
+ * to freeing the q_vector.
+ **/
+static void ixgbe_free_q_vectors(struct ixgbe_adapter *adapter)
+{
+       int q_idx, num_q_vectors;
+
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
+               num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+       else
+               num_q_vectors = 1;
+
+       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
+               struct ixgbe_q_vector *q_vector = adapter->q_vector[q_idx];
+               adapter->q_vector[q_idx] = NULL;
+               netif_napi_del(&q_vector->napi);
+               kfree(q_vector);
+       }
+}
+
+static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
+{
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+               adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
+               pci_disable_msix(adapter->pdev);
+               kfree(adapter->msix_entries);
+               adapter->msix_entries = NULL;
+       } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
+               adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
+               pci_disable_msi(adapter->pdev);
+       }
+}
+
+/**
+ * ixgbe_init_interrupt_scheme - Determine proper interrupt scheme
+ * @adapter: board private structure to initialize
+ *
+ * We determine which interrupt scheme to use based on...
+ * - Kernel support (MSI, MSI-X)
+ *   - which can be user-defined (via MODULE_PARAM)
+ * - Hardware queue count (num_*_queues)
+ *   - defined by miscellaneous hardware support/features (RSS, etc.)
+ **/
+int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)
+{
+       int err;
+
+       /* Number of supported queues */
+       err = ixgbe_set_num_queues(adapter);
+       if (err)
+               return err;
+
+       err = ixgbe_set_interrupt_capability(adapter);
+       if (err) {
+               e_dev_err("Unable to setup interrupt capabilities\n");
+               goto err_set_interrupt;
+       }
+
+       err = ixgbe_alloc_q_vectors(adapter);
+       if (err) {
+               e_dev_err("Unable to allocate memory for queue vectors\n");
+               goto err_alloc_q_vectors;
+       }
+
+       err = ixgbe_alloc_queues(adapter);
+       if (err) {
+               e_dev_err("Unable to allocate memory for queues\n");
+               goto err_alloc_queues;
+       }
+
+       e_dev_info("Multiqueue %s: Rx Queue count = %u, Tx Queue count = %u\n",
+                  (adapter->num_rx_queues > 1) ? "Enabled" : "Disabled",
+                  adapter->num_rx_queues, adapter->num_tx_queues);
+
+       set_bit(__IXGBE_DOWN, &adapter->state);
+
+       return 0;
+
+err_alloc_queues:
+       ixgbe_free_q_vectors(adapter);
+err_alloc_q_vectors:
+       ixgbe_reset_interrupt_capability(adapter);
+err_set_interrupt:
+       return err;
+}
+
+/**
+ * ixgbe_clear_interrupt_scheme - Clear the current interrupt scheme settings
+ * @adapter: board private structure to clear interrupt scheme on
+ *
+ * We go through and clear interrupt specific resources and reset the structure
+ * to pre-load conditions
+ **/
+void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               kfree(adapter->tx_ring[i]);
+               adapter->tx_ring[i] = NULL;
+       }
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               struct ixgbe_ring *ring = adapter->rx_ring[i];
+
+               /* ixgbe_get_stats64() might access this ring, we must wait
+                * a grace period before freeing it.
+                */
+               kfree_rcu(ring, rcu);
+               adapter->rx_ring[i] = NULL;
+       }
+
+       adapter->num_tx_queues = 0;
+       adapter->num_rx_queues = 0;
+
+       ixgbe_free_q_vectors(adapter);
+       ixgbe_reset_interrupt_capability(adapter);
+}
+
+/**
+ * ixgbe_sw_init - Initialize general software structures (struct ixgbe_adapter)
+ * @adapter: board private structure to initialize
+ *
+ * ixgbe_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 __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+       struct net_device *dev = adapter->netdev;
+       unsigned int rss;
+#ifdef CONFIG_IXGBE_DCB
+       int j;
+       struct tc_configuration *tc;
+#endif
+       int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
+
+       /* PCI config space info */
+
+       hw->vendor_id = pdev->vendor;
+       hw->device_id = pdev->device;
+       hw->revision_id = pdev->revision;
+       hw->subsystem_vendor_id = pdev->subsystem_vendor;
+       hw->subsystem_device_id = pdev->subsystem_device;
+
+       /* Set capability flags */
+       rss = min(IXGBE_MAX_RSS_INDICES, (int)num_online_cpus());
+       adapter->ring_feature[RING_F_RSS].indices = rss;
+       adapter->flags |= IXGBE_FLAG_RSS_ENABLED;
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               if (hw->device_id == IXGBE_DEV_ID_82598AT)
+                       adapter->flags |= IXGBE_FLAG_FAN_FAIL_CAPABLE;
+               adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82598;
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82599;
+               adapter->flags2 |= IXGBE_FLAG2_RSC_CAPABLE;
+               adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;
+               if (hw->device_id == IXGBE_DEV_ID_82599_T3_LOM)
+                       adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_CAPABLE;
+               /* Flow Director hash filters enabled */
+               adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
+               adapter->atr_sample_rate = 20;
+               adapter->ring_feature[RING_F_FDIR].indices =
+                                                        IXGBE_MAX_FDIR_INDICES;
+               adapter->fdir_pballoc = IXGBE_FDIR_PBALLOC_64K;
+#ifdef IXGBE_FCOE
+               adapter->flags |= IXGBE_FLAG_FCOE_CAPABLE;
+               adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED;
+               adapter->ring_feature[RING_F_FCOE].indices = 0;
+#ifdef CONFIG_IXGBE_DCB
+               /* Default traffic class to use for FCoE */
+               adapter->fcoe.up = IXGBE_FCOE_DEFTC;
+#endif
+#endif /* IXGBE_FCOE */
+               break;
+       default:
+               break;
+       }
+
+       /* n-tuple support exists, always init our spinlock */
+       spin_lock_init(&adapter->fdir_perfect_lock);
+
+#ifdef CONFIG_IXGBE_DCB
+       /* Configure DCB traffic classes */
+       for (j = 0; j < MAX_TRAFFIC_CLASS; j++) {
+               tc = &adapter->dcb_cfg.tc_config[j];
+               tc->path[DCB_TX_CONFIG].bwg_id = 0;
+               tc->path[DCB_TX_CONFIG].bwg_percent = 12 + (j & 1);
+               tc->path[DCB_RX_CONFIG].bwg_id = 0;
+               tc->path[DCB_RX_CONFIG].bwg_percent = 12 + (j & 1);
+               tc->dcb_pfc = pfc_disabled;
+       }
+       adapter->dcb_cfg.bw_percentage[DCB_TX_CONFIG][0] = 100;
+       adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100;
+       adapter->dcb_cfg.pfc_mode_enable = false;
+       adapter->dcb_set_bitmap = 0x00;
+       adapter->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE;
+       ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,
+                          MAX_TRAFFIC_CLASS);
+
+#endif
+
+       /* default flow control settings */
+       hw->fc.requested_mode = ixgbe_fc_full;
+       hw->fc.current_mode = ixgbe_fc_full;    /* init for ethtool output */
+#ifdef CONFIG_DCB
+       adapter->last_lfc_mode = hw->fc.current_mode;
+#endif
+       hw->fc.high_water = FC_HIGH_WATER(max_frame);
+       hw->fc.low_water = FC_LOW_WATER(max_frame);
+       hw->fc.pause_time = IXGBE_DEFAULT_FCPAUSE;
+       hw->fc.send_xon = true;
+       hw->fc.disable_fc_autoneg = false;
+
+       /* enable itr by default in dynamic mode */
+       adapter->rx_itr_setting = 1;
+       adapter->rx_eitr_param = 20000;
+       adapter->tx_itr_setting = 1;
+       adapter->tx_eitr_param = 10000;
+
+       /* set defaults for eitr in MegaBytes */
+       adapter->eitr_low = 10;
+       adapter->eitr_high = 20;
+
+       /* set default ring sizes */
+       adapter->tx_ring_count = IXGBE_DEFAULT_TXD;
+       adapter->rx_ring_count = IXGBE_DEFAULT_RXD;
+
+       /* set default work limits */
+       adapter->tx_work_limit = adapter->tx_ring_count;
+
+       /* initialize eeprom parameters */
+       if (ixgbe_init_eeprom_params_generic(hw)) {
+               e_dev_err("EEPROM initialization failed\n");
+               return -EIO;
+       }
+
+       /* enable rx csum by default */
+       adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
+
+       /* get assigned NUMA node */
+       adapter->node = dev_to_node(&pdev->dev);
+
+       set_bit(__IXGBE_DOWN, &adapter->state);
+
+       return 0;
+}
+
+/**
+ * ixgbe_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @tx_ring:    tx descriptor ring (for a specific queue) to setup
+ *
+ * Return 0 on success, negative on failure
+ **/
+int ixgbe_setup_tx_resources(struct ixgbe_ring *tx_ring)
+{
+       struct device *dev = tx_ring->dev;
+       int size;
+
+       size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
+       tx_ring->tx_buffer_info = vzalloc_node(size, tx_ring->numa_node);
+       if (!tx_ring->tx_buffer_info)
+               tx_ring->tx_buffer_info = vzalloc(size);
+       if (!tx_ring->tx_buffer_info)
+               goto err;
+
+       /* round up to nearest 4K */
+       tx_ring->size = tx_ring->count * sizeof(union ixgbe_adv_tx_desc);
+       tx_ring->size = ALIGN(tx_ring->size, 4096);
+
+       tx_ring->desc = dma_alloc_coherent(dev, tx_ring->size,
+                                          &tx_ring->dma, GFP_KERNEL);
+       if (!tx_ring->desc)
+               goto err;
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+       return 0;
+
+err:
+       vfree(tx_ring->tx_buffer_info);
+       tx_ring->tx_buffer_info = NULL;
+       dev_err(dev, "Unable to allocate memory for the Tx descriptor ring\n");
+       return -ENOMEM;
+}
+
+/**
+ * ixgbe_setup_all_tx_resources - allocate all queues Tx resources
+ * @adapter: board private structure
+ *
+ * If this function returns with an error, then it's possible one or
+ * more of the rings is populated (while the rest are not).  It is the
+ * callers duty to clean those orphaned rings.
+ *
+ * Return 0 on success, negative on failure
+ **/
+static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)
+{
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               err = ixgbe_setup_tx_resources(adapter->tx_ring[i]);
+               if (!err)
+                       continue;
+               e_err(probe, "Allocation for Tx Queue %u failed\n", i);
+               break;
+       }
+
+       return err;
+}
+
+/**
+ * ixgbe_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @rx_ring:    rx descriptor ring (for a specific queue) to setup
+ *
+ * Returns 0 on success, negative on failure
+ **/
+int ixgbe_setup_rx_resources(struct ixgbe_ring *rx_ring)
+{
+       struct device *dev = rx_ring->dev;
+       int size;
+
+       size = sizeof(struct ixgbe_rx_buffer) * rx_ring->count;
+       rx_ring->rx_buffer_info = vzalloc_node(size, rx_ring->numa_node);
+       if (!rx_ring->rx_buffer_info)
+               rx_ring->rx_buffer_info = vzalloc(size);
+       if (!rx_ring->rx_buffer_info)
+               goto err;
+
+       /* Round up to nearest 4K */
+       rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
+       rx_ring->size = ALIGN(rx_ring->size, 4096);
+
+       rx_ring->desc = dma_alloc_coherent(dev, rx_ring->size,
+                                          &rx_ring->dma, GFP_KERNEL);
+
+       if (!rx_ring->desc)
+               goto err;
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       return 0;
+err:
+       vfree(rx_ring->rx_buffer_info);
+       rx_ring->rx_buffer_info = NULL;
+       dev_err(dev, "Unable to allocate memory for the Rx descriptor ring\n");
+       return -ENOMEM;
+}
+
+/**
+ * ixgbe_setup_all_rx_resources - allocate all queues Rx resources
+ * @adapter: board private structure
+ *
+ * If this function returns with an error, then it's possible one or
+ * more of the rings is populated (while the rest are not).  It is the
+ * callers duty to clean those orphaned rings.
+ *
+ * Return 0 on success, negative on failure
+ **/
+static int ixgbe_setup_all_rx_resources(struct ixgbe_adapter *adapter)
+{
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               err = ixgbe_setup_rx_resources(adapter->rx_ring[i]);
+               if (!err)
+                       continue;
+               e_err(probe, "Allocation for Rx Queue %u failed\n", i);
+               break;
+       }
+
+       return err;
+}
+
+/**
+ * ixgbe_free_tx_resources - Free Tx Resources per Queue
+ * @tx_ring: Tx descriptor ring for a specific queue
+ *
+ * Free all transmit software resources
+ **/
+void ixgbe_free_tx_resources(struct ixgbe_ring *tx_ring)
+{
+       ixgbe_clean_tx_ring(tx_ring);
+
+       vfree(tx_ring->tx_buffer_info);
+       tx_ring->tx_buffer_info = NULL;
+
+       /* if not set, then don't free */
+       if (!tx_ring->desc)
+               return;
+
+       dma_free_coherent(tx_ring->dev, tx_ring->size,
+                         tx_ring->desc, tx_ring->dma);
+
+       tx_ring->desc = NULL;
+}
+
+/**
+ * ixgbe_free_all_tx_resources - Free Tx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all transmit software resources
+ **/
+static void ixgbe_free_all_tx_resources(struct ixgbe_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               if (adapter->tx_ring[i]->desc)
+                       ixgbe_free_tx_resources(adapter->tx_ring[i]);
+}
+
+/**
+ * ixgbe_free_rx_resources - Free Rx Resources
+ * @rx_ring: ring to clean the resources from
+ *
+ * Free all receive software resources
+ **/
+void ixgbe_free_rx_resources(struct ixgbe_ring *rx_ring)
+{
+       ixgbe_clean_rx_ring(rx_ring);
+
+       vfree(rx_ring->rx_buffer_info);
+       rx_ring->rx_buffer_info = NULL;
+
+       /* if not set, then don't free */
+       if (!rx_ring->desc)
+               return;
+
+       dma_free_coherent(rx_ring->dev, rx_ring->size,
+                         rx_ring->desc, rx_ring->dma);
+
+       rx_ring->desc = NULL;
+}
+
+/**
+ * ixgbe_free_all_rx_resources - Free Rx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all receive software resources
+ **/
+static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               if (adapter->rx_ring[i]->desc)
+                       ixgbe_free_rx_resources(adapter->rx_ring[i]);
+}
+
+/**
+ * ixgbe_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+
+       /* MTU < 68 is an error and causes problems on some kernels */
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED &&
+           hw->mac.type != ixgbe_mac_X540) {
+               if ((new_mtu < 68) || (max_frame > MAXIMUM_ETHERNET_VLAN_SIZE))
+                       return -EINVAL;
+       } else {
+               if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
+                       return -EINVAL;
+       }
+
+       e_info(probe, "changing MTU from %d to %d\n", netdev->mtu, new_mtu);
+       /* must set new MTU before calling down or up */
+       netdev->mtu = new_mtu;
+
+       hw->fc.high_water = FC_HIGH_WATER(max_frame);
+       hw->fc.low_water = FC_LOW_WATER(max_frame);
+
+       if (netif_running(netdev))
+               ixgbe_reinit_locked(adapter);
+
+       return 0;
+}
+
+/**
+ * ixgbe_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+static int ixgbe_open(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       int err;
+
+       /* disallow open during test */
+       if (test_bit(__IXGBE_TESTING, &adapter->state))
+               return -EBUSY;
+
+       netif_carrier_off(netdev);
+
+       /* allocate transmit descriptors */
+       err = ixgbe_setup_all_tx_resources(adapter);
+       if (err)
+               goto err_setup_tx;
+
+       /* allocate receive descriptors */
+       err = ixgbe_setup_all_rx_resources(adapter);
+       if (err)
+               goto err_setup_rx;
+
+       ixgbe_configure(adapter);
+
+       err = ixgbe_request_irq(adapter);
+       if (err)
+               goto err_req_irq;
+
+       err = ixgbe_up_complete(adapter);
+       if (err)
+               goto err_up;
+
+       netif_tx_start_all_queues(netdev);
+
+       return 0;
+
+err_up:
+       ixgbe_release_hw_control(adapter);
+       ixgbe_free_irq(adapter);
+err_req_irq:
+err_setup_rx:
+       ixgbe_free_all_rx_resources(adapter);
+err_setup_tx:
+       ixgbe_free_all_tx_resources(adapter);
+       ixgbe_reset(adapter);
+
+       return err;
+}
+
+/**
+ * ixgbe_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+static int ixgbe_close(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       ixgbe_down(adapter);
+       ixgbe_free_irq(adapter);
+
+       ixgbe_fdir_filter_exit(adapter);
+
+       ixgbe_free_all_tx_resources(adapter);
+       ixgbe_free_all_rx_resources(adapter);
+
+       ixgbe_release_hw_control(adapter);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int ixgbe_resume(struct pci_dev *pdev)
+{
+       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
+       struct net_device *netdev = adapter->netdev;
+       u32 err;
+
+       pci_set_power_state(pdev, PCI_D0);
+       pci_restore_state(pdev);
+       /*
+        * pci_restore_state clears dev->state_saved so call
+        * pci_save_state to restore it.
+        */
+       pci_save_state(pdev);
+
+       err = pci_enable_device_mem(pdev);
+       if (err) {
+               e_dev_err("Cannot enable PCI device from suspend\n");
+               return err;
+       }
+       pci_set_master(pdev);
+
+       pci_wake_from_d3(pdev, false);
+
+       err = ixgbe_init_interrupt_scheme(adapter);
+       if (err) {
+               e_dev_err("Cannot initialize interrupts for device\n");
+               return err;
+       }
+
+       ixgbe_reset(adapter);
+
+       IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
+
+       if (netif_running(netdev)) {
+               err = ixgbe_open(netdev);
+               if (err)
+                       return err;
+       }
+
+       netif_device_attach(netdev);
+
+       return 0;
+}
+#endif /* CONFIG_PM */
+
+static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
+{
+       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 ctrl, fctrl;
+       u32 wufc = adapter->wol;
+#ifdef CONFIG_PM
+       int retval = 0;
+#endif
+
+       netif_device_detach(netdev);
+
+       if (netif_running(netdev)) {
+               ixgbe_down(adapter);
+               ixgbe_free_irq(adapter);
+               ixgbe_free_all_tx_resources(adapter);
+               ixgbe_free_all_rx_resources(adapter);
+       }
+
+       ixgbe_clear_interrupt_scheme(adapter);
+#ifdef CONFIG_DCB
+       kfree(adapter->ixgbe_ieee_pfc);
+       kfree(adapter->ixgbe_ieee_ets);
+#endif
+
+#ifdef CONFIG_PM
+       retval = pci_save_state(pdev);
+       if (retval)
+               return retval;
+
+#endif
+       if (wufc) {
+               ixgbe_set_rx_mode(netdev);
+
+               /* turn on all-multi mode if wake on multicast is enabled */
+               if (wufc & IXGBE_WUFC_MC) {
+                       fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+                       fctrl |= IXGBE_FCTRL_MPE;
+                       IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
+               }
+
+               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
+               ctrl |= IXGBE_CTRL_GIO_DIS;
+               IXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);
+
+               IXGBE_WRITE_REG(hw, IXGBE_WUFC, wufc);
+       } else {
+               IXGBE_WRITE_REG(hw, IXGBE_WUC, 0);
+               IXGBE_WRITE_REG(hw, IXGBE_WUFC, 0);
+       }
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               pci_wake_from_d3(pdev, false);
+               break;
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               pci_wake_from_d3(pdev, !!wufc);
+               break;
+       default:
+               break;
+       }
+
+       *enable_wake = !!wufc;
+
+       ixgbe_release_hw_control(adapter);
+
+       pci_disable_device(pdev);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int ixgbe_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       int retval;
+       bool wake;
+
+       retval = __ixgbe_shutdown(pdev, &wake);
+       if (retval)
+               return retval;
+
+       if (wake) {
+               pci_prepare_to_sleep(pdev);
+       } else {
+               pci_wake_from_d3(pdev, false);
+               pci_set_power_state(pdev, PCI_D3hot);
+       }
+
+       return 0;
+}
+#endif /* CONFIG_PM */
+
+static void ixgbe_shutdown(struct pci_dev *pdev)
+{
+       bool wake;
+
+       __ixgbe_shutdown(pdev, &wake);
+
+       if (system_state == SYSTEM_POWER_OFF) {
+               pci_wake_from_d3(pdev, wake);
+               pci_set_power_state(pdev, PCI_D3hot);
+       }
+}
+
+/**
+ * ixgbe_update_stats - Update the board statistics counters.
+ * @adapter: board private structure
+ **/
+void ixgbe_update_stats(struct ixgbe_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbe_hw_stats *hwstats = &adapter->stats;
+       u64 total_mpc = 0;
+       u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
+       u64 non_eop_descs = 0, restart_queue = 0, tx_busy = 0;
+       u64 alloc_rx_page_failed = 0, alloc_rx_buff_failed = 0;
+       u64 bytes = 0, packets = 0;
+
+       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
+           test_bit(__IXGBE_RESETTING, &adapter->state))
+               return;
+
+       if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
+               u64 rsc_count = 0;
+               u64 rsc_flush = 0;
+               for (i = 0; i < 16; i++)
+                       adapter->hw_rx_no_dma_resources +=
+                               IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
+               for (i = 0; i < adapter->num_rx_queues; i++) {
+                       rsc_count += adapter->rx_ring[i]->rx_stats.rsc_count;
+                       rsc_flush += adapter->rx_ring[i]->rx_stats.rsc_flush;
+               }
+               adapter->rsc_total_count = rsc_count;
+               adapter->rsc_total_flush = rsc_flush;
+       }
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               struct ixgbe_ring *rx_ring = adapter->rx_ring[i];
+               non_eop_descs += rx_ring->rx_stats.non_eop_descs;
+               alloc_rx_page_failed += rx_ring->rx_stats.alloc_rx_page_failed;
+               alloc_rx_buff_failed += rx_ring->rx_stats.alloc_rx_buff_failed;
+               bytes += rx_ring->stats.bytes;
+               packets += rx_ring->stats.packets;
+       }
+       adapter->non_eop_descs = non_eop_descs;
+       adapter->alloc_rx_page_failed = alloc_rx_page_failed;
+       adapter->alloc_rx_buff_failed = alloc_rx_buff_failed;
+       netdev->stats.rx_bytes = bytes;
+       netdev->stats.rx_packets = packets;
+
+       bytes = 0;
+       packets = 0;
+       /* gather some stats to the adapter struct that are per queue */
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               struct ixgbe_ring *tx_ring = adapter->tx_ring[i];
+               restart_queue += tx_ring->tx_stats.restart_queue;
+               tx_busy += tx_ring->tx_stats.tx_busy;
+               bytes += tx_ring->stats.bytes;
+               packets += tx_ring->stats.packets;
+       }
+       adapter->restart_queue = restart_queue;
+       adapter->tx_busy = tx_busy;
+       netdev->stats.tx_bytes = bytes;
+       netdev->stats.tx_packets = packets;
+
+       hwstats->crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
+       for (i = 0; i < 8; i++) {
+               /* for packet buffers not used, the register should read 0 */
+               mpc = IXGBE_READ_REG(hw, IXGBE_MPC(i));
+               missed_rx += mpc;
+               hwstats->mpc[i] += mpc;
+               total_mpc += hwstats->mpc[i];
+               if (hw->mac.type == ixgbe_mac_82598EB)
+                       hwstats->rnbc[i] += IXGBE_READ_REG(hw, IXGBE_RNBC(i));
+               hwstats->qptc[i] += IXGBE_READ_REG(hw, IXGBE_QPTC(i));
+               hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC(i));
+               hwstats->qprc[i] += IXGBE_READ_REG(hw, IXGBE_QPRC(i));
+               hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC(i));
+               switch (hw->mac.type) {
+               case ixgbe_mac_82598EB:
+                       hwstats->pxonrxc[i] +=
+                               IXGBE_READ_REG(hw, IXGBE_PXONRXC(i));
+                       break;
+               case ixgbe_mac_82599EB:
+               case ixgbe_mac_X540:
+                       hwstats->pxonrxc[i] +=
+                               IXGBE_READ_REG(hw, IXGBE_PXONRXCNT(i));
+                       break;
+               default:
+                       break;
+               }
+               hwstats->pxontxc[i] += IXGBE_READ_REG(hw, IXGBE_PXONTXC(i));
+               hwstats->pxofftxc[i] += IXGBE_READ_REG(hw, IXGBE_PXOFFTXC(i));
+       }
+       hwstats->gprc += IXGBE_READ_REG(hw, IXGBE_GPRC);
+       /* work around hardware counting issue */
+       hwstats->gprc -= missed_rx;
+
+       ixgbe_update_xoff_received(adapter);
+
+       /* 82598 hardware only has a 32 bit counter in the high register */
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB:
+               hwstats->lxonrxc += IXGBE_READ_REG(hw, IXGBE_LXONRXC);
+               hwstats->gorc += IXGBE_READ_REG(hw, IXGBE_GORCH);
+               hwstats->gotc += IXGBE_READ_REG(hw, IXGBE_GOTCH);
+               hwstats->tor += IXGBE_READ_REG(hw, IXGBE_TORH);
+               break;
+       case ixgbe_mac_X540:
+               /* OS2BMC stats are X540 only*/
+               hwstats->o2bgptc += IXGBE_READ_REG(hw, IXGBE_O2BGPTC);
+               hwstats->o2bspc += IXGBE_READ_REG(hw, IXGBE_O2BSPC);
+               hwstats->b2ospc += IXGBE_READ_REG(hw, IXGBE_B2OSPC);
+               hwstats->b2ogprc += IXGBE_READ_REG(hw, IXGBE_B2OGPRC);
+       case ixgbe_mac_82599EB:
+               hwstats->gorc += IXGBE_READ_REG(hw, IXGBE_GORCL);
+               IXGBE_READ_REG(hw, IXGBE_GORCH); /* to clear */
+               hwstats->gotc += IXGBE_READ_REG(hw, IXGBE_GOTCL);
+               IXGBE_READ_REG(hw, IXGBE_GOTCH); /* to clear */
+               hwstats->tor += IXGBE_READ_REG(hw, IXGBE_TORL);
+               IXGBE_READ_REG(hw, IXGBE_TORH); /* to clear */
+               hwstats->lxonrxc += IXGBE_READ_REG(hw, IXGBE_LXONRXCNT);
+               hwstats->fdirmatch += IXGBE_READ_REG(hw, IXGBE_FDIRMATCH);
+               hwstats->fdirmiss += IXGBE_READ_REG(hw, IXGBE_FDIRMISS);
+#ifdef IXGBE_FCOE
+               hwstats->fccrc += IXGBE_READ_REG(hw, IXGBE_FCCRC);
+               hwstats->fcoerpdc += IXGBE_READ_REG(hw, IXGBE_FCOERPDC);
+               hwstats->fcoeprc += IXGBE_READ_REG(hw, IXGBE_FCOEPRC);
+               hwstats->fcoeptc += IXGBE_READ_REG(hw, IXGBE_FCOEPTC);
+               hwstats->fcoedwrc += IXGBE_READ_REG(hw, IXGBE_FCOEDWRC);
+               hwstats->fcoedwtc += IXGBE_READ_REG(hw, IXGBE_FCOEDWTC);
+#endif /* IXGBE_FCOE */
+               break;
+       default:
+               break;
+       }
+       bprc = IXGBE_READ_REG(hw, IXGBE_BPRC);
+       hwstats->bprc += bprc;
+       hwstats->mprc += IXGBE_READ_REG(hw, IXGBE_MPRC);
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               hwstats->mprc -= bprc;
+       hwstats->roc += IXGBE_READ_REG(hw, IXGBE_ROC);
+       hwstats->prc64 += IXGBE_READ_REG(hw, IXGBE_PRC64);
+       hwstats->prc127 += IXGBE_READ_REG(hw, IXGBE_PRC127);
+       hwstats->prc255 += IXGBE_READ_REG(hw, IXGBE_PRC255);
+       hwstats->prc511 += IXGBE_READ_REG(hw, IXGBE_PRC511);
+       hwstats->prc1023 += IXGBE_READ_REG(hw, IXGBE_PRC1023);
+       hwstats->prc1522 += IXGBE_READ_REG(hw, IXGBE_PRC1522);
+       hwstats->rlec += IXGBE_READ_REG(hw, IXGBE_RLEC);
+       lxon = IXGBE_READ_REG(hw, IXGBE_LXONTXC);
+       hwstats->lxontxc += lxon;
+       lxoff = IXGBE_READ_REG(hw, IXGBE_LXOFFTXC);
+       hwstats->lxofftxc += lxoff;
+       hwstats->ruc += IXGBE_READ_REG(hw, IXGBE_RUC);
+       hwstats->gptc += IXGBE_READ_REG(hw, IXGBE_GPTC);
+       hwstats->mptc += IXGBE_READ_REG(hw, IXGBE_MPTC);
+       /*
+        * 82598 errata - tx of flow control packets is included in tx counters
+        */
+       xon_off_tot = lxon + lxoff;
+       hwstats->gptc -= xon_off_tot;
+       hwstats->mptc -= xon_off_tot;
+       hwstats->gotc -= (xon_off_tot * (ETH_ZLEN + ETH_FCS_LEN));
+       hwstats->ruc += IXGBE_READ_REG(hw, IXGBE_RUC);
+       hwstats->rfc += IXGBE_READ_REG(hw, IXGBE_RFC);
+       hwstats->rjc += IXGBE_READ_REG(hw, IXGBE_RJC);
+       hwstats->tpr += IXGBE_READ_REG(hw, IXGBE_TPR);
+       hwstats->ptc64 += IXGBE_READ_REG(hw, IXGBE_PTC64);
+       hwstats->ptc64 -= xon_off_tot;
+       hwstats->ptc127 += IXGBE_READ_REG(hw, IXGBE_PTC127);
+       hwstats->ptc255 += IXGBE_READ_REG(hw, IXGBE_PTC255);
+       hwstats->ptc511 += IXGBE_READ_REG(hw, IXGBE_PTC511);
+       hwstats->ptc1023 += IXGBE_READ_REG(hw, IXGBE_PTC1023);
+       hwstats->ptc1522 += IXGBE_READ_REG(hw, IXGBE_PTC1522);
+       hwstats->bptc += IXGBE_READ_REG(hw, IXGBE_BPTC);
+
+       /* Fill out the OS statistics structure */
+       netdev->stats.multicast = hwstats->mprc;
+
+       /* Rx Errors */
+       netdev->stats.rx_errors = hwstats->crcerrs + hwstats->rlec;
+       netdev->stats.rx_dropped = 0;
+       netdev->stats.rx_length_errors = hwstats->rlec;
+       netdev->stats.rx_crc_errors = hwstats->crcerrs;
+       netdev->stats.rx_missed_errors = total_mpc;
+}
+
+/**
+ * ixgbe_fdir_reinit_subtask - worker thread to reinit FDIR filter table
+ * @adapter - pointer to the device adapter structure
+ **/
+static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int i;
+
+       if (!(adapter->flags2 & IXGBE_FLAG2_FDIR_REQUIRES_REINIT))
+               return;
+
+       adapter->flags2 &= ~IXGBE_FLAG2_FDIR_REQUIRES_REINIT;
+
+       /* if interface is down do nothing */
+       if (test_bit(__IXGBE_DOWN, &adapter->state))
+               return;
+
+       /* do nothing if we are not using signature filters */
+       if (!(adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE))
+               return;
+
+       adapter->fdir_overflow++;
+
+       if (ixgbe_reinit_fdir_tables_82599(hw) == 0) {
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       set_bit(__IXGBE_TX_FDIR_INIT_DONE,
+                               &(adapter->tx_ring[i]->state));
+               /* re-enable flow director interrupts */
+               IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_FLOW_DIR);
+       } else {
+               e_err(probe, "failed to finish FDIR re-initialization, "
+                     "ignored adding FDIR ATR filters\n");
+       }
+}
+
+/**
+ * ixgbe_check_hang_subtask - check for hung queues and dropped interrupts
+ * @adapter - pointer to the device adapter structure
+ *
+ * This function serves two purposes.  First it strobes the interrupt lines
+ * in order to make certain interrupts are occuring.  Secondly it sets the
+ * bits needed to check for TX hangs.  As a result we should immediately
+ * determine if a hang has occured.
+ */
+static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u64 eics = 0;
+       int i;
+
+       /* If we're down or resetting, just bail */
+       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
+           test_bit(__IXGBE_RESETTING, &adapter->state))
+               return;
+
+       /* Force detection of hung controller */
+       if (netif_carrier_ok(adapter->netdev)) {
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       set_check_for_tx_hang(adapter->tx_ring[i]);
+       }
+
+       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
+               /*
+                * for legacy and MSI interrupts don't set any bits
+                * that are enabled for EIAM, because this operation
+                * would set *both* EIMS and EICS for any bit in EIAM
+                */
+               IXGBE_WRITE_REG(hw, IXGBE_EICS,
+                       (IXGBE_EICS_TCP_TIMER | IXGBE_EICS_OTHER));
+       } else {
+               /* get one bit for every active tx/rx interrupt vector */
+               for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) {
+                       struct ixgbe_q_vector *qv = adapter->q_vector[i];
+                       if (qv->rx.count || qv->tx.count)
+                               eics |= ((u64)1 << i);
+               }
+       }
+
+       /* Cause software interrupt to ensure rings are cleaned */
+       ixgbe_irq_rearm_queues(adapter, eics);
+
+}
+
+/**
+ * ixgbe_watchdog_update_link - update the link status
+ * @adapter - pointer to the device adapter structure
+ * @link_speed - pointer to a u32 to store the link_speed
+ **/
+static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 link_speed = adapter->link_speed;
+       bool link_up = adapter->link_up;
+       int i;
+
+       if (!(adapter->flags & IXGBE_FLAG_NEED_LINK_UPDATE))
+               return;
+
+       if (hw->mac.ops.check_link) {
+               hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
+       } else {
+               /* always assume link is up, if no check link function */
+               link_speed = IXGBE_LINK_SPEED_10GB_FULL;
+               link_up = true;
+       }
+       if (link_up) {
+               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+                       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                               hw->mac.ops.fc_enable(hw, i);
+               } else {
+                       hw->mac.ops.fc_enable(hw, 0);
+               }
+       }
+
+       if (link_up ||
+           time_after(jiffies, (adapter->link_check_timeout +
+                                IXGBE_TRY_LINK_TIMEOUT))) {
+               adapter->flags &= ~IXGBE_FLAG_NEED_LINK_UPDATE;
+               IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMC_LSC);
+               IXGBE_WRITE_FLUSH(hw);
+       }
+
+       adapter->link_up = link_up;
+       adapter->link_speed = link_speed;
+}
+
+/**
+ * ixgbe_watchdog_link_is_up - update netif_carrier status and
+ *                             print link up message
+ * @adapter - pointer to the device adapter structure
+ **/
+static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 link_speed = adapter->link_speed;
+       bool flow_rx, flow_tx;
+
+       /* only continue if link was previously down */
+       if (netif_carrier_ok(netdev))
+               return;
+
+       adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82598EB: {
+               u32 frctl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+               u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS);
+               flow_rx = !!(frctl & IXGBE_FCTRL_RFCE);
+               flow_tx = !!(rmcs & IXGBE_RMCS_TFCE_802_3X);
+       }
+               break;
+       case ixgbe_mac_X540:
+       case ixgbe_mac_82599EB: {
+               u32 mflcn = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+               u32 fccfg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
+               flow_rx = !!(mflcn & IXGBE_MFLCN_RFCE);
+               flow_tx = !!(fccfg & IXGBE_FCCFG_TFCE_802_3X);
+       }
+               break;
+       default:
+               flow_tx = false;
+               flow_rx = false;
+               break;
+       }
+       e_info(drv, "NIC Link is Up %s, Flow Control: %s\n",
+              (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
+              "10 Gbps" :
+              (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
+              "1 Gbps" :
+              (link_speed == IXGBE_LINK_SPEED_100_FULL ?
+              "100 Mbps" :
+              "unknown speed"))),
+              ((flow_rx && flow_tx) ? "RX/TX" :
+              (flow_rx ? "RX" :
+              (flow_tx ? "TX" : "None"))));
+
+       netif_carrier_on(netdev);
+       ixgbe_check_vf_rate_limit(adapter);
+}
+
+/**
+ * ixgbe_watchdog_link_is_down - update netif_carrier status and
+ *                               print link down message
+ * @adapter - pointer to the adapter structure
+ **/
+static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter* adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       adapter->link_up = false;
+       adapter->link_speed = 0;
+
+       /* only continue if link was up previously */
+       if (!netif_carrier_ok(netdev))
+               return;
+
+       /* poll for SFP+ cable when link is down */
+       if (ixgbe_is_sfp(hw) && hw->mac.type == ixgbe_mac_82598EB)
+               adapter->flags2 |= IXGBE_FLAG2_SEARCH_FOR_SFP;
+
+       e_info(drv, "NIC Link is Down\n");
+       netif_carrier_off(netdev);
+}
+
+/**
+ * ixgbe_watchdog_flush_tx - flush queues on link down
+ * @adapter - pointer to the device adapter structure
+ **/
+static void ixgbe_watchdog_flush_tx(struct ixgbe_adapter *adapter)
+{
+       int i;
+       int some_tx_pending = 0;
+
+       if (!netif_carrier_ok(adapter->netdev)) {
+               for (i = 0; i < adapter->num_tx_queues; i++) {
+                       struct ixgbe_ring *tx_ring = adapter->tx_ring[i];
+                       if (tx_ring->next_to_use != tx_ring->next_to_clean) {
+                               some_tx_pending = 1;
+                               break;
+                       }
+               }
+
+               if (some_tx_pending) {
+                       /* We've lost link, so the controller stops DMA,
+                        * but we've got queued Tx work that's never going
+                        * to get done, so reset controller to flush Tx.
+                        * (Do the reset outside of interrupt context).
+                        */
+                       adapter->flags2 |= IXGBE_FLAG2_RESET_REQUESTED;
+               }
+       }
+}
+
+static void ixgbe_spoof_check(struct ixgbe_adapter *adapter)
+{
+       u32 ssvpc;
+
+       /* Do not perform spoof check for 82598 */
+       if (adapter->hw.mac.type == ixgbe_mac_82598EB)
+               return;
+
+       ssvpc = IXGBE_READ_REG(&adapter->hw, IXGBE_SSVPC);
+
+       /*
+        * ssvpc register is cleared on read, if zero then no
+        * spoofed packets in the last interval.
+        */
+       if (!ssvpc)
+               return;
+
+       e_warn(drv, "%d Spoofed packets detected\n", ssvpc);
+}
+
+/**
+ * ixgbe_watchdog_subtask - check and bring link up
+ * @adapter - pointer to the device adapter structure
+ **/
+static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter)
+{
+       /* if interface is down do nothing */
+       if (test_bit(__IXGBE_DOWN, &adapter->state))
+               return;
+
+       ixgbe_watchdog_update_link(adapter);
+
+       if (adapter->link_up)
+               ixgbe_watchdog_link_is_up(adapter);
+       else
+               ixgbe_watchdog_link_is_down(adapter);
+
+       ixgbe_spoof_check(adapter);
+       ixgbe_update_stats(adapter);
+
+       ixgbe_watchdog_flush_tx(adapter);
+}
+
+/**
+ * ixgbe_sfp_detection_subtask - poll for SFP+ cable
+ * @adapter - the ixgbe adapter structure
+ **/
+static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       s32 err;
+
+       /* not searching for SFP so there is nothing to do here */
+       if (!(adapter->flags2 & IXGBE_FLAG2_SEARCH_FOR_SFP) &&
+           !(adapter->flags2 & IXGBE_FLAG2_SFP_NEEDS_RESET))
+               return;
+
+       /* someone else is in init, wait until next service event */
+       if (test_and_set_bit(__IXGBE_IN_SFP_INIT, &adapter->state))
+               return;
+
+       err = hw->phy.ops.identify_sfp(hw);
+       if (err == IXGBE_ERR_SFP_NOT_SUPPORTED)
+               goto sfp_out;
+
+       if (err == IXGBE_ERR_SFP_NOT_PRESENT) {
+               /* If no cable is present, then we need to reset
+                * the next time we find a good cable. */
+               adapter->flags2 |= IXGBE_FLAG2_SFP_NEEDS_RESET;
+       }
+
+       /* exit on error */
+       if (err)
+               goto sfp_out;
+
+       /* exit if reset not needed */
+       if (!(adapter->flags2 & IXGBE_FLAG2_SFP_NEEDS_RESET))
+               goto sfp_out;
+
+       adapter->flags2 &= ~IXGBE_FLAG2_SFP_NEEDS_RESET;
+
+       /*
+        * A module may be identified correctly, but the EEPROM may not have
+        * support for that module.  setup_sfp() will fail in that case, so
+        * we should not allow that module to load.
+        */
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               err = hw->phy.ops.reset(hw);
+       else
+               err = hw->mac.ops.setup_sfp(hw);
+
+       if (err == IXGBE_ERR_SFP_NOT_SUPPORTED)
+               goto sfp_out;
+
+       adapter->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
+       e_info(probe, "detected SFP+: %d\n", hw->phy.sfp_type);
+
+sfp_out:
+       clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);
+
+       if ((err == IXGBE_ERR_SFP_NOT_SUPPORTED) &&
+           (adapter->netdev->reg_state == NETREG_REGISTERED)) {
+               e_dev_err("failed to initialize because an unsupported "
+                         "SFP+ module type was detected.\n");
+               e_dev_err("Reload the driver after installing a "
+                         "supported module.\n");
+               unregister_netdev(adapter->netdev);
+       }
+}
+
+/**
+ * ixgbe_sfp_link_config_subtask - set up link SFP after module install
+ * @adapter - the ixgbe adapter structure
+ **/
+static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 autoneg;
+       bool negotiation;
+
+       if (!(adapter->flags & IXGBE_FLAG_NEED_LINK_CONFIG))
+               return;
+
+       /* someone else is in init, wait until next service event */
+       if (test_and_set_bit(__IXGBE_IN_SFP_INIT, &adapter->state))
+               return;
+
+       adapter->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
+
+       autoneg = hw->phy.autoneg_advertised;
+       if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
+               hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
+       hw->mac.autotry_restart = false;
+       if (hw->mac.ops.setup_link)
+               hw->mac.ops.setup_link(hw, autoneg, negotiation, true);
+
+       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
+       adapter->link_check_timeout = jiffies;
+       clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);
+}
+
+/**
+ * ixgbe_service_timer - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+static void ixgbe_service_timer(unsigned long data)
+{
+       struct ixgbe_adapter *adapter = (struct ixgbe_adapter *)data;
+       unsigned long next_event_offset;
+
+       /* poll faster when waiting for link */
+       if (adapter->flags & IXGBE_FLAG_NEED_LINK_UPDATE)
+               next_event_offset = HZ / 10;
+       else
+               next_event_offset = HZ * 2;
+
+       /* Reset the timer */
+       mod_timer(&adapter->service_timer, next_event_offset + jiffies);
+
+       ixgbe_service_event_schedule(adapter);
+}
+
+static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter)
+{
+       if (!(adapter->flags2 & IXGBE_FLAG2_RESET_REQUESTED))
+               return;
+
+       adapter->flags2 &= ~IXGBE_FLAG2_RESET_REQUESTED;
+
+       /* If we're already down or resetting, just bail */
+       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
+           test_bit(__IXGBE_RESETTING, &adapter->state))
+               return;
+
+       ixgbe_dump(adapter);
+       netdev_err(adapter->netdev, "Reset adapter\n");
+       adapter->tx_timeout_count++;
+
+       ixgbe_reinit_locked(adapter);
+}
+
+/**
+ * ixgbe_service_task - manages and runs subtasks
+ * @work: pointer to work_struct containing our data
+ **/
+static void ixgbe_service_task(struct work_struct *work)
+{
+       struct ixgbe_adapter *adapter = container_of(work,
+                                                    struct ixgbe_adapter,
+                                                    service_task);
+
+       ixgbe_reset_subtask(adapter);
+       ixgbe_sfp_detection_subtask(adapter);
+       ixgbe_sfp_link_config_subtask(adapter);
+       ixgbe_check_overtemp_subtask(adapter);
+       ixgbe_watchdog_subtask(adapter);
+       ixgbe_fdir_reinit_subtask(adapter);
+       ixgbe_check_hang_subtask(adapter);
+
+       ixgbe_service_event_complete(adapter);
+}
+
+void ixgbe_tx_ctxtdesc(struct ixgbe_ring *tx_ring, u32 vlan_macip_lens,
+                      u32 fcoe_sof_eof, u32 type_tucmd, u32 mss_l4len_idx)
+{
+       struct ixgbe_adv_tx_context_desc *context_desc;
+       u16 i = tx_ring->next_to_use;
+
+       context_desc = IXGBE_TX_CTXTDESC_ADV(tx_ring, i);
+
+       i++;
+       tx_ring->next_to_use = (i < tx_ring->count) ? i : 0;
+
+       /* set bits to identify this as an advanced context descriptor */
+       type_tucmd |= IXGBE_TXD_CMD_DEXT | IXGBE_ADVTXD_DTYP_CTXT;
+
+       context_desc->vlan_macip_lens   = cpu_to_le32(vlan_macip_lens);
+       context_desc->seqnum_seed       = cpu_to_le32(fcoe_sof_eof);
+       context_desc->type_tucmd_mlhl   = cpu_to_le32(type_tucmd);
+       context_desc->mss_l4len_idx     = cpu_to_le32(mss_l4len_idx);
+}
+
+static int ixgbe_tso(struct ixgbe_ring *tx_ring, struct sk_buff *skb,
+                    u32 tx_flags, __be16 protocol, u8 *hdr_len)
+{
+       int err;
+       u32 vlan_macip_lens, type_tucmd;
+       u32 mss_l4len_idx, l4len;
+
+       if (!skb_is_gso(skb))
+               return 0;
+
+       if (skb_header_cloned(skb)) {
+               err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+               if (err)
+                       return err;
+       }
+
+       /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
+       type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP;
+
+       if (protocol == __constant_htons(ETH_P_IP)) {
+               struct iphdr *iph = ip_hdr(skb);
+               iph->tot_len = 0;
+               iph->check = 0;
+               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                        iph->daddr, 0,
+                                                        IPPROTO_TCP,
+                                                        0);
+               type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4;
+       } else if (skb_is_gso_v6(skb)) {
+               ipv6_hdr(skb)->payload_len = 0;
+               tcp_hdr(skb)->check =
+                   ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                    &ipv6_hdr(skb)->daddr,
+                                    0, IPPROTO_TCP, 0);
+       }
+
+       l4len = tcp_hdrlen(skb);
+       *hdr_len = skb_transport_offset(skb) + l4len;
+
+       /* mss_l4len_id: use 1 as index for TSO */
+       mss_l4len_idx = l4len << IXGBE_ADVTXD_L4LEN_SHIFT;
+       mss_l4len_idx |= skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT;
+       mss_l4len_idx |= 1 << IXGBE_ADVTXD_IDX_SHIFT;
+
+       /* vlan_macip_lens: HEADLEN, MACLEN, VLAN tag */
+       vlan_macip_lens = skb_network_header_len(skb);
+       vlan_macip_lens |= skb_network_offset(skb) << IXGBE_ADVTXD_MACLEN_SHIFT;
+       vlan_macip_lens |= tx_flags & IXGBE_TX_FLAGS_VLAN_MASK;
+
+       ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, 0, type_tucmd,
+                         mss_l4len_idx);
+
+       return 1;
+}
+
+static bool ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
+                         struct sk_buff *skb, u32 tx_flags,
+                         __be16 protocol)
+{
+       u32 vlan_macip_lens = 0;
+       u32 mss_l4len_idx = 0;
+       u32 type_tucmd = 0;
+
+       if (skb->ip_summed != CHECKSUM_PARTIAL) {
+           if (!(tx_flags & IXGBE_TX_FLAGS_VLAN))
+                       return false;
+       } else {
+               u8 l4_hdr = 0;
+               switch (protocol) {
+               case __constant_htons(ETH_P_IP):
+                       vlan_macip_lens |= skb_network_header_len(skb);
+                       type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4;
+                       l4_hdr = ip_hdr(skb)->protocol;
+                       break;
+               case __constant_htons(ETH_P_IPV6):
+                       vlan_macip_lens |= skb_network_header_len(skb);
+                       l4_hdr = ipv6_hdr(skb)->nexthdr;
+                       break;
+               default:
+                       if (unlikely(net_ratelimit())) {
+                               dev_warn(tx_ring->dev,
+                                "partial checksum but proto=%x!\n",
+                                skb->protocol);
+                       }
+                       break;
+               }
+
+               switch (l4_hdr) {
+               case IPPROTO_TCP:
+                       type_tucmd |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
+                       mss_l4len_idx = tcp_hdrlen(skb) <<
+                                       IXGBE_ADVTXD_L4LEN_SHIFT;
+                       break;
+               case IPPROTO_SCTP:
+                       type_tucmd |= IXGBE_ADVTXD_TUCMD_L4T_SCTP;
+                       mss_l4len_idx = sizeof(struct sctphdr) <<
+                                       IXGBE_ADVTXD_L4LEN_SHIFT;
+                       break;
+               case IPPROTO_UDP:
+                       mss_l4len_idx = sizeof(struct udphdr) <<
+                                       IXGBE_ADVTXD_L4LEN_SHIFT;
+                       break;
+               default:
+                       if (unlikely(net_ratelimit())) {
+                               dev_warn(tx_ring->dev,
+                                "partial checksum but l4 proto=%x!\n",
+                                skb->protocol);
+                       }
+                       break;
+               }
+       }
+
+       vlan_macip_lens |= skb_network_offset(skb) << IXGBE_ADVTXD_MACLEN_SHIFT;
+       vlan_macip_lens |= tx_flags & IXGBE_TX_FLAGS_VLAN_MASK;
+
+       ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, 0,
+                         type_tucmd, mss_l4len_idx);
+
+       return (skb->ip_summed == CHECKSUM_PARTIAL);
+}
+
+static int ixgbe_tx_map(struct ixgbe_adapter *adapter,
+                       struct ixgbe_ring *tx_ring,
+                       struct sk_buff *skb, u32 tx_flags,
+                       unsigned int first, const u8 hdr_len)
+{
+       struct device *dev = tx_ring->dev;
+       struct ixgbe_tx_buffer *tx_buffer_info;
+       unsigned int len;
+       unsigned int total = skb->len;
+       unsigned int offset = 0, size, count = 0;
+       unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
+       unsigned int f;
+       unsigned int bytecount = skb->len;
+       u16 gso_segs = 1;
+       u16 i;
+
+       i = tx_ring->next_to_use;
+
+       if (tx_flags & IXGBE_TX_FLAGS_FCOE)
+               /* excluding fcoe_crc_eof for FCoE */
+               total -= sizeof(struct fcoe_crc_eof);
+
+       len = min(skb_headlen(skb), total);
+       while (len) {
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               size = min(len, (uint)IXGBE_MAX_DATA_PER_TXD);
+
+               tx_buffer_info->length = size;
+               tx_buffer_info->mapped_as_page = false;
+               tx_buffer_info->dma = dma_map_single(dev,
+                                                    skb->data + offset,
+                                                    size, DMA_TO_DEVICE);
+               if (dma_mapping_error(dev, tx_buffer_info->dma))
+                       goto dma_error;
+               tx_buffer_info->time_stamp = jiffies;
+               tx_buffer_info->next_to_watch = i;
+
+               len -= size;
+               total -= size;
+               offset += size;
+               count++;
+
+               if (len) {
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+       }
+
+       for (f = 0; f < nr_frags; f++) {
+               struct skb_frag_struct *frag;
+
+               frag = &skb_shinfo(skb)->frags[f];
+               len = min((unsigned int)frag->size, total);
+               offset = frag->page_offset;
+
+               while (len) {
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+
+                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
+                       size = min(len, (uint)IXGBE_MAX_DATA_PER_TXD);
+
+                       tx_buffer_info->length = size;
+                       tx_buffer_info->dma = dma_map_page(dev,
+                                                          frag->page,
+                                                          offset, size,
+                                                          DMA_TO_DEVICE);
+                       tx_buffer_info->mapped_as_page = true;
+                       if (dma_mapping_error(dev, tx_buffer_info->dma))
+                               goto dma_error;
+                       tx_buffer_info->time_stamp = jiffies;
+                       tx_buffer_info->next_to_watch = i;
+
+                       len -= size;
+                       total -= size;
+                       offset += size;
+                       count++;
+               }
+               if (total == 0)
+                       break;
+       }
+
+       if (tx_flags & IXGBE_TX_FLAGS_TSO)
+               gso_segs = skb_shinfo(skb)->gso_segs;
+#ifdef IXGBE_FCOE
+       /* adjust for FCoE Sequence Offload */
+       else if (tx_flags & IXGBE_TX_FLAGS_FSO)
+               gso_segs = DIV_ROUND_UP(skb->len - hdr_len,
+                                       skb_shinfo(skb)->gso_size);
+#endif /* IXGBE_FCOE */
+       bytecount += (gso_segs - 1) * hdr_len;
+
+       /* multiply data chunks by size of headers */
+       tx_ring->tx_buffer_info[i].bytecount = bytecount;
+       tx_ring->tx_buffer_info[i].gso_segs = gso_segs;
+       tx_ring->tx_buffer_info[i].skb = skb;
+       tx_ring->tx_buffer_info[first].next_to_watch = i;
+
+       return count;
+
+dma_error:
+       e_dev_err("TX DMA map failed\n");
+
+       /* clear timestamp and dma mappings for failed tx_buffer_info map */
+       tx_buffer_info->dma = 0;
+       tx_buffer_info->time_stamp = 0;
+       tx_buffer_info->next_to_watch = 0;
+       if (count)
+               count--;
+
+       /* clear timestamp and dma mappings for remaining portion of packet */
+       while (count--) {
+               if (i == 0)
+                       i += tx_ring->count;
+               i--;
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
+       }
+
+       return 0;
+}
+
+static void ixgbe_tx_queue(struct ixgbe_ring *tx_ring,
+                          int tx_flags, int count, u32 paylen, u8 hdr_len)
+{
+       union ixgbe_adv_tx_desc *tx_desc = NULL;
+       struct ixgbe_tx_buffer *tx_buffer_info;
+       u32 olinfo_status = 0, cmd_type_len = 0;
+       unsigned int i;
+       u32 txd_cmd = IXGBE_TXD_CMD_EOP | IXGBE_TXD_CMD_RS | IXGBE_TXD_CMD_IFCS;
+
+       cmd_type_len |= IXGBE_ADVTXD_DTYP_DATA;
+
+       cmd_type_len |= IXGBE_ADVTXD_DCMD_IFCS | IXGBE_ADVTXD_DCMD_DEXT;
+
+       if (tx_flags & IXGBE_TX_FLAGS_VLAN)
+               cmd_type_len |= IXGBE_ADVTXD_DCMD_VLE;
+
+       if (tx_flags & IXGBE_TX_FLAGS_TSO) {
+               cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
+
+               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
+                                IXGBE_ADVTXD_POPTS_SHIFT;
+
+               /* use index 1 context for tso */
+               olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
+               if (tx_flags & IXGBE_TX_FLAGS_IPV4)
+                       olinfo_status |= IXGBE_TXD_POPTS_IXSM <<
+                                        IXGBE_ADVTXD_POPTS_SHIFT;
+
+       } else if (tx_flags & IXGBE_TX_FLAGS_CSUM)
+               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
+                                IXGBE_ADVTXD_POPTS_SHIFT;
+
+       if (tx_flags & IXGBE_TX_FLAGS_FCOE) {
+               olinfo_status |= IXGBE_ADVTXD_CC;
+               olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
+               if (tx_flags & IXGBE_TX_FLAGS_FSO)
+                       cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
+       }
+
+       olinfo_status |= ((paylen - hdr_len) << IXGBE_ADVTXD_PAYLEN_SHIFT);
+
+       i = tx_ring->next_to_use;
+       while (count--) {
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
+               tx_desc->read.buffer_addr = cpu_to_le64(tx_buffer_info->dma);
+               tx_desc->read.cmd_type_len =
+                       cpu_to_le32(cmd_type_len | tx_buffer_info->length);
+               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+       }
+
+       tx_desc->read.cmd_type_len |= cpu_to_le32(txd_cmd);
+
+       /*
+        * Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64).
+        */
+       wmb();
+
+       tx_ring->next_to_use = i;
+       writel(i, tx_ring->tail);
+}
+
+static void ixgbe_atr(struct ixgbe_ring *ring, struct sk_buff *skb,
+                     u32 tx_flags, __be16 protocol)
+{
+       struct ixgbe_q_vector *q_vector = ring->q_vector;
+       union ixgbe_atr_hash_dword input = { .dword = 0 };
+       union ixgbe_atr_hash_dword common = { .dword = 0 };
+       union {
+               unsigned char *network;
+               struct iphdr *ipv4;
+               struct ipv6hdr *ipv6;
+       } hdr;
+       struct tcphdr *th;
+       __be16 vlan_id;
+
+       /* if ring doesn't have a interrupt vector, cannot perform ATR */
+       if (!q_vector)
+               return;
+
+       /* do nothing if sampling is disabled */
+       if (!ring->atr_sample_rate)
+               return;
+
+       ring->atr_count++;
+
+       /* snag network header to get L4 type and address */
+       hdr.network = skb_network_header(skb);
+
+       /* Currently only IPv4/IPv6 with TCP is supported */
+       if ((protocol != __constant_htons(ETH_P_IPV6) ||
+            hdr.ipv6->nexthdr != IPPROTO_TCP) &&
+           (protocol != __constant_htons(ETH_P_IP) ||
+            hdr.ipv4->protocol != IPPROTO_TCP))
+               return;
+
+       th = tcp_hdr(skb);
+
+       /* skip this packet since the socket is closing */
+       if (th->fin)
+               return;
+
+       /* sample on all syn packets or once every atr sample count */
+       if (!th->syn && (ring->atr_count < ring->atr_sample_rate))
+               return;
+
+       /* reset sample count */
+       ring->atr_count = 0;
+
+       vlan_id = htons(tx_flags >> IXGBE_TX_FLAGS_VLAN_SHIFT);
+
+       /*
+        * src and dst are inverted, think how the receiver sees them
+        *
+        * The input is broken into two sections, a non-compressed section
+        * containing vm_pool, vlan_id, and flow_type.  The rest of the data
+        * is XORed together and stored in the compressed dword.
+        */
+       input.formatted.vlan_id = vlan_id;
+
+       /*
+        * since src port and flex bytes occupy the same word XOR them together
+        * and write the value to source port portion of compressed dword
+        */
+       if (vlan_id)
+               common.port.src ^= th->dest ^ __constant_htons(ETH_P_8021Q);
+       else
+               common.port.src ^= th->dest ^ protocol;
+       common.port.dst ^= th->source;
+
+       if (protocol == __constant_htons(ETH_P_IP)) {
+               input.formatted.flow_type = IXGBE_ATR_FLOW_TYPE_TCPV4;
+               common.ip ^= hdr.ipv4->saddr ^ hdr.ipv4->daddr;
+       } else {
+               input.formatted.flow_type = IXGBE_ATR_FLOW_TYPE_TCPV6;
+               common.ip ^= hdr.ipv6->saddr.s6_addr32[0] ^
+                            hdr.ipv6->saddr.s6_addr32[1] ^
+                            hdr.ipv6->saddr.s6_addr32[2] ^
+                            hdr.ipv6->saddr.s6_addr32[3] ^
+                            hdr.ipv6->daddr.s6_addr32[0] ^
+                            hdr.ipv6->daddr.s6_addr32[1] ^
+                            hdr.ipv6->daddr.s6_addr32[2] ^
+                            hdr.ipv6->daddr.s6_addr32[3];
+       }
+
+       /* This assumes the Rx queue and Tx queue are bound to the same CPU */
+       ixgbe_fdir_add_signature_filter_82599(&q_vector->adapter->hw,
+                                             input, common, ring->queue_index);
+}
+
+static int __ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
+{
+       netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
+       /* Herbert's original patch had:
+        *  smp_mb__after_netif_stop_queue();
+        * but since that doesn't exist yet, just open code it. */
+       smp_mb();
+
+       /* We need to check again in a case another CPU has just
+        * made room available. */
+       if (likely(ixgbe_desc_unused(tx_ring) < size))
+               return -EBUSY;
+
+       /* A reprieve! - use start_queue because it doesn't call schedule */
+       netif_start_subqueue(tx_ring->netdev, tx_ring->queue_index);
+       ++tx_ring->tx_stats.restart_queue;
+       return 0;
+}
+
+static inline int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
+{
+       if (likely(ixgbe_desc_unused(tx_ring) >= size))
+               return 0;
+       return __ixgbe_maybe_stop_tx(tx_ring, size);
+}
+
+static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       int txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) :
+                                              smp_processor_id();
+#ifdef IXGBE_FCOE
+       __be16 protocol = vlan_get_protocol(skb);
+
+       if (((protocol == htons(ETH_P_FCOE)) ||
+           (protocol == htons(ETH_P_FIP))) &&
+           (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)) {
+               txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
+               txq += adapter->ring_feature[RING_F_FCOE].mask;
+               return txq;
+       }
+#endif
+
+       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
+               while (unlikely(txq >= dev->real_num_tx_queues))
+                       txq -= dev->real_num_tx_queues;
+               return txq;
+       }
+
+       return skb_tx_hash(dev, skb);
+}
+
+netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
+                         struct ixgbe_adapter *adapter,
+                         struct ixgbe_ring *tx_ring)
+{
+       int tso;
+       u32  tx_flags = 0;
+#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD
+       unsigned short f;
+#endif
+       u16 first;
+       u16 count = TXD_USE_COUNT(skb_headlen(skb));
+       __be16 protocol;
+       u8 hdr_len = 0;
+
+       /*
+        * need: 1 descriptor per page * PAGE_SIZE/IXGBE_MAX_DATA_PER_TXD,
+        *       + 1 desc for skb_head_len/IXGBE_MAX_DATA_PER_TXD,
+        *       + 2 desc gap to keep tail from touching head,
+        *       + 1 desc for context descriptor,
+        * otherwise try next time
+        */
+#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD
+       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
+               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);
+#else
+       count += skb_shinfo(skb)->nr_frags;
+#endif
+       if (ixgbe_maybe_stop_tx(tx_ring, count + 3)) {
+               tx_ring->tx_stats.tx_busy++;
+               return NETDEV_TX_BUSY;
+       }
+
+       protocol = vlan_get_protocol(skb);
+
+       if (vlan_tx_tag_present(skb)) {
+               tx_flags |= vlan_tx_tag_get(skb);
+               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+                       tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK;
+                       tx_flags |= tx_ring->dcb_tc << 13;
+               }
+               tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
+               tx_flags |= IXGBE_TX_FLAGS_VLAN;
+       } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED &&
+                  skb->priority != TC_PRIO_CONTROL) {
+               tx_flags |= tx_ring->dcb_tc << 13;
+               tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
+               tx_flags |= IXGBE_TX_FLAGS_VLAN;
+       }
+
+#ifdef IXGBE_FCOE
+       /* for FCoE with DCB, we force the priority to what
+        * was specified by the switch */
+       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED &&
+           (protocol == htons(ETH_P_FCOE)))
+               tx_flags |= IXGBE_TX_FLAGS_FCOE;
+
+#endif
+       /* record the location of the first descriptor for this packet */
+       first = tx_ring->next_to_use;
+
+       if (tx_flags & IXGBE_TX_FLAGS_FCOE) {
+#ifdef IXGBE_FCOE
+               /* setup tx offload for FCoE */
+               tso = ixgbe_fso(tx_ring, skb, tx_flags, &hdr_len);
+               if (tso < 0)
+                       goto out_drop;
+               else if (tso)
+                       tx_flags |= IXGBE_TX_FLAGS_FSO;
+#endif /* IXGBE_FCOE */
+       } else {
+               if (protocol == htons(ETH_P_IP))
+                       tx_flags |= IXGBE_TX_FLAGS_IPV4;
+               tso = ixgbe_tso(tx_ring, skb, tx_flags, protocol, &hdr_len);
+               if (tso < 0)
+                       goto out_drop;
+               else if (tso)
+                       tx_flags |= IXGBE_TX_FLAGS_TSO;
+               else if (ixgbe_tx_csum(tx_ring, skb, tx_flags, protocol))
+                       tx_flags |= IXGBE_TX_FLAGS_CSUM;
+       }
+
+       count = ixgbe_tx_map(adapter, tx_ring, skb, tx_flags, first, hdr_len);
+       if (count) {
+               /* add the ATR filter if ATR is on */
+               if (test_bit(__IXGBE_TX_FDIR_INIT_DONE, &tx_ring->state))
+                       ixgbe_atr(tx_ring, skb, tx_flags, protocol);
+               ixgbe_tx_queue(tx_ring, tx_flags, count, skb->len, hdr_len);
+               ixgbe_maybe_stop_tx(tx_ring, DESC_NEEDED);
+
+       } else {
+               tx_ring->tx_buffer_info[first].time_stamp = 0;
+               tx_ring->next_to_use = first;
+               goto out_drop;
+       }
+
+       return NETDEV_TX_OK;
+
+out_drop:
+       dev_kfree_skb_any(skb);
+       return NETDEV_TX_OK;
+}
+
+static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_ring *tx_ring;
+
+       tx_ring = adapter->tx_ring[skb->queue_mapping];
+       return ixgbe_xmit_frame_ring(skb, adapter, tx_ring);
+}
+
+/**
+ * ixgbe_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int ixgbe_set_mac(struct net_device *netdev, void *p)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
+
+       hw->mac.ops.set_rar(hw, 0, hw->mac.addr, adapter->num_vfs,
+                           IXGBE_RAH_AV);
+
+       return 0;
+}
+
+static int
+ixgbe_mdio_read(struct net_device *netdev, int prtad, int devad, u16 addr)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u16 value;
+       int rc;
+
+       if (prtad != hw->phy.mdio.prtad)
+               return -EINVAL;
+       rc = hw->phy.ops.read_reg(hw, addr, devad, &value);
+       if (!rc)
+               rc = value;
+       return rc;
+}
+
+static int ixgbe_mdio_write(struct net_device *netdev, int prtad, int devad,
+                           u16 addr, u16 value)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       if (prtad != hw->phy.mdio.prtad)
+               return -EINVAL;
+       return hw->phy.ops.write_reg(hw, addr, devad, value);
+}
+
+static int ixgbe_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       return mdio_mii_ioctl(&adapter->hw.phy.mdio, if_mii(req), cmd);
+}
+
+/**
+ * ixgbe_add_sanmac_netdev - Add the SAN MAC address to the corresponding
+ * netdev->dev_addrs
+ * @netdev: network interface device structure
+ *
+ * Returns non-zero on failure
+ **/
+static int ixgbe_add_sanmac_netdev(struct net_device *dev)
+{
+       int err = 0;
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       struct ixgbe_mac_info *mac = &adapter->hw.mac;
+
+       if (is_valid_ether_addr(mac->san_addr)) {
+               rtnl_lock();
+               err = dev_addr_add(dev, mac->san_addr, NETDEV_HW_ADDR_T_SAN);
+               rtnl_unlock();
+       }
+       return err;
+}
+
+/**
+ * ixgbe_del_sanmac_netdev - Removes the SAN MAC address to the corresponding
+ * netdev->dev_addrs
+ * @netdev: network interface device structure
+ *
+ * Returns non-zero on failure
+ **/
+static int ixgbe_del_sanmac_netdev(struct net_device *dev)
+{
+       int err = 0;
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       struct ixgbe_mac_info *mac = &adapter->hw.mac;
+
+       if (is_valid_ether_addr(mac->san_addr)) {
+               rtnl_lock();
+               err = dev_addr_del(dev, mac->san_addr, NETDEV_HW_ADDR_T_SAN);
+               rtnl_unlock();
+       }
+       return err;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void ixgbe_netpoll(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       int i;
+
+       /* if interface is down do nothing */
+       if (test_bit(__IXGBE_DOWN, &adapter->state))
+               return;
+
+       adapter->flags |= IXGBE_FLAG_IN_NETPOLL;
+       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+               int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+               for (i = 0; i < num_q_vectors; i++) {
+                       struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
+                       ixgbe_msix_clean_many(0, q_vector);
+               }
+       } else {
+               ixgbe_intr(adapter->pdev->irq, netdev);
+       }
+       adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL;
+}
+#endif
+
+static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
+                                                  struct rtnl_link_stats64 *stats)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       int i;
+
+       rcu_read_lock();
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               struct ixgbe_ring *ring = ACCESS_ONCE(adapter->rx_ring[i]);
+               u64 bytes, packets;
+               unsigned int start;
+
+               if (ring) {
+                       do {
+                               start = u64_stats_fetch_begin_bh(&ring->syncp);
+                               packets = ring->stats.packets;
+                               bytes   = ring->stats.bytes;
+                       } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                       stats->rx_packets += packets;
+                       stats->rx_bytes   += bytes;
+               }
+       }
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               struct ixgbe_ring *ring = ACCESS_ONCE(adapter->tx_ring[i]);
+               u64 bytes, packets;
+               unsigned int start;
+
+               if (ring) {
+                       do {
+                               start = u64_stats_fetch_begin_bh(&ring->syncp);
+                               packets = ring->stats.packets;
+                               bytes   = ring->stats.bytes;
+                       } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                       stats->tx_packets += packets;
+                       stats->tx_bytes   += bytes;
+               }
+       }
+       rcu_read_unlock();
+       /* following stats updated by ixgbe_watchdog_task() */
+       stats->multicast        = netdev->stats.multicast;
+       stats->rx_errors        = netdev->stats.rx_errors;
+       stats->rx_length_errors = netdev->stats.rx_length_errors;
+       stats->rx_crc_errors    = netdev->stats.rx_crc_errors;
+       stats->rx_missed_errors = netdev->stats.rx_missed_errors;
+       return stats;
+}
+
+/* ixgbe_validate_rtr - verify 802.1Qp to Rx packet buffer mapping is valid.
+ * #adapter: pointer to ixgbe_adapter
+ * @tc: number of traffic classes currently enabled
+ *
+ * Configure a valid 802.1Qp to Rx packet buffer mapping ie confirm
+ * 802.1Q priority maps to a packet buffer that exists.
+ */
+static void ixgbe_validate_rtr(struct ixgbe_adapter *adapter, u8 tc)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 reg, rsave;
+       int i;
+
+       /* 82598 have a static priority to TC mapping that can not
+        * be changed so no validation is needed.
+        */
+       if (hw->mac.type == ixgbe_mac_82598EB)
+               return;
+
+       reg = IXGBE_READ_REG(hw, IXGBE_RTRUP2TC);
+       rsave = reg;
+
+       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+               u8 up2tc = reg >> (i * IXGBE_RTRUP2TC_UP_SHIFT);
+
+               /* If up2tc is out of bounds default to zero */
+               if (up2tc > tc)
+                       reg &= ~(0x7 << IXGBE_RTRUP2TC_UP_SHIFT);
+       }
+
+       if (reg != rsave)
+               IXGBE_WRITE_REG(hw, IXGBE_RTRUP2TC, reg);
+
+       return;
+}
+
+
+/* ixgbe_setup_tc - routine to configure net_device for multiple traffic
+ * classes.
+ *
+ * @netdev: net device to configure
+ * @tc: number of traffic classes to enable
+ */
+int ixgbe_setup_tc(struct net_device *dev, u8 tc)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(dev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       /* If DCB is anabled do not remove traffic classes, multiple
+        * traffic classes are required to implement DCB
+        */
+       if (!tc && (adapter->flags & IXGBE_FLAG_DCB_ENABLED))
+               return 0;
+
+       /* Hardware supports up to 8 traffic classes */
+       if (tc > MAX_TRAFFIC_CLASS ||
+           (hw->mac.type == ixgbe_mac_82598EB && tc < MAX_TRAFFIC_CLASS))
+               return -EINVAL;
+
+       /* Hardware has to reinitialize queues and interrupts to
+        * match packet buffer alignment. Unfortunantly, the
+        * hardware is not flexible enough to do this dynamically.
+        */
+       if (netif_running(dev))
+               ixgbe_close(dev);
+       ixgbe_clear_interrupt_scheme(adapter);
+
+       if (tc)
+               netdev_set_num_tc(dev, tc);
+       else
+               netdev_reset_tc(dev);
+
+       ixgbe_init_interrupt_scheme(adapter);
+       ixgbe_validate_rtr(adapter, tc);
+       if (netif_running(dev))
+               ixgbe_open(dev);
+
+       return 0;
+}
+
+void ixgbe_do_reset(struct net_device *netdev)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+       if (netif_running(netdev))
+               ixgbe_reinit_locked(adapter);
+       else
+               ixgbe_reset(adapter);
+}
+
+static u32 ixgbe_fix_features(struct net_device *netdev, u32 data)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+
+#ifdef CONFIG_DCB
+       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
+               data &= ~NETIF_F_HW_VLAN_RX;
+#endif
+
+       /* return error if RXHASH is being enabled when RSS is not supported */
+       if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))
+               data &= ~NETIF_F_RXHASH;
+
+       /* If Rx checksum is disabled, then RSC/LRO should also be disabled */
+       if (!(data & NETIF_F_RXCSUM))
+               data &= ~NETIF_F_LRO;
+
+       /* Turn off LRO if not RSC capable or invalid ITR settings */
+       if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)) {
+               data &= ~NETIF_F_LRO;
+       } else if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) &&
+                  (adapter->rx_itr_setting != 1 &&
+                   adapter->rx_itr_setting > IXGBE_MAX_RSC_INT_RATE)) {
+               data &= ~NETIF_F_LRO;
+               e_info(probe, "rx-usecs set too low, not enabling RSC\n");
+       }
+
+       return data;
+}
+
+static int ixgbe_set_features(struct net_device *netdev, u32 data)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       bool need_reset = false;
+
+       /* If Rx checksum is disabled, then RSC/LRO should also be disabled */
+       if (!(data & NETIF_F_RXCSUM))
+               adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;
+       else
+               adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
+
+       /* Make sure RSC matches LRO, reset if change */
+       if (!!(data & NETIF_F_LRO) !=
+            !!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)) {
+               adapter->flags2 ^= IXGBE_FLAG2_RSC_ENABLED;
+               switch (adapter->hw.mac.type) {
+               case ixgbe_mac_X540:
+               case ixgbe_mac_82599EB:
+                       need_reset = true;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       /*
+        * Check if Flow Director n-tuple support was enabled or disabled.  If
+        * the state changed, we need to reset.
+        */
+       if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)) {
+               /* turn off ATR, enable perfect filters and reset */
+               if (data & NETIF_F_NTUPLE) {
+                       adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
+                       adapter->flags |= IXGBE_FLAG_FDIR_PERFECT_CAPABLE;
+                       need_reset = true;
+               }
+       } else if (!(data & NETIF_F_NTUPLE)) {
+               /* turn off Flow Director, set ATR and reset */
+               adapter->flags &= ~IXGBE_FLAG_FDIR_PERFECT_CAPABLE;
+               if ((adapter->flags &  IXGBE_FLAG_RSS_ENABLED) &&
+                   !(adapter->flags &  IXGBE_FLAG_DCB_ENABLED))
+                       adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
+               need_reset = true;
+       }
+
+       if (need_reset)
+               ixgbe_do_reset(netdev);
+
+       return 0;
+
+}
+
+static const struct net_device_ops ixgbe_netdev_ops = {
+       .ndo_open               = ixgbe_open,
+       .ndo_stop               = ixgbe_close,
+       .ndo_start_xmit         = ixgbe_xmit_frame,
+       .ndo_select_queue       = ixgbe_select_queue,
+       .ndo_set_rx_mode        = ixgbe_set_rx_mode,
+       .ndo_set_multicast_list = ixgbe_set_rx_mode,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = ixgbe_set_mac,
+       .ndo_change_mtu         = ixgbe_change_mtu,
+       .ndo_tx_timeout         = ixgbe_tx_timeout,
+       .ndo_vlan_rx_add_vid    = ixgbe_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = ixgbe_vlan_rx_kill_vid,
+       .ndo_do_ioctl           = ixgbe_ioctl,
+       .ndo_set_vf_mac         = ixgbe_ndo_set_vf_mac,
+       .ndo_set_vf_vlan        = ixgbe_ndo_set_vf_vlan,
+       .ndo_set_vf_tx_rate     = ixgbe_ndo_set_vf_bw,
+       .ndo_get_vf_config      = ixgbe_ndo_get_vf_config,
+       .ndo_get_stats64        = ixgbe_get_stats64,
+       .ndo_setup_tc           = ixgbe_setup_tc,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ixgbe_netpoll,
+#endif
+#ifdef IXGBE_FCOE
+       .ndo_fcoe_ddp_setup = ixgbe_fcoe_ddp_get,
+       .ndo_fcoe_ddp_target = ixgbe_fcoe_ddp_target,
+       .ndo_fcoe_ddp_done = ixgbe_fcoe_ddp_put,
+       .ndo_fcoe_enable = ixgbe_fcoe_enable,
+       .ndo_fcoe_disable = ixgbe_fcoe_disable,
+       .ndo_fcoe_get_wwn = ixgbe_fcoe_get_wwn,
+#endif /* IXGBE_FCOE */
+       .ndo_set_features = ixgbe_set_features,
+       .ndo_fix_features = ixgbe_fix_features,
+};
+
+static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
+                          const struct ixgbe_info *ii)
+{
+#ifdef CONFIG_PCI_IOV
+       struct ixgbe_hw *hw = &adapter->hw;
+       int err;
+       int num_vf_macvlans, i;
+       struct vf_macvlans *mv_list;
+
+       if (hw->mac.type == ixgbe_mac_82598EB || !max_vfs)
+               return;
+
+       /* The 82599 supports up to 64 VFs per physical function
+        * but this implementation limits allocation to 63 so that
+        * basic networking resources are still available to the
+        * physical function
+        */
+       adapter->num_vfs = (max_vfs > 63) ? 63 : max_vfs;
+       adapter->flags |= IXGBE_FLAG_SRIOV_ENABLED;
+       err = pci_enable_sriov(adapter->pdev, adapter->num_vfs);
+       if (err) {
+               e_err(probe, "Failed to enable PCI sriov: %d\n", err);
+               goto err_novfs;
+       }
+
+       num_vf_macvlans = hw->mac.num_rar_entries -
+               (IXGBE_MAX_PF_MACVLANS + 1 + adapter->num_vfs);
+
+       adapter->mv_list = mv_list = kcalloc(num_vf_macvlans,
+                                            sizeof(struct vf_macvlans),
+                                            GFP_KERNEL);
+       if (mv_list) {
+               /* Initialize list of VF macvlans */
+               INIT_LIST_HEAD(&adapter->vf_mvs.l);
+               for (i = 0; i < num_vf_macvlans; i++) {
+                       mv_list->vf = -1;
+                       mv_list->free = true;
+                       mv_list->rar_entry = hw->mac.num_rar_entries -
+                               (i + adapter->num_vfs + 1);
+                       list_add(&mv_list->l, &adapter->vf_mvs.l);
+                       mv_list++;
+               }
+       }
+
+       /* If call to enable VFs succeeded then allocate memory
+        * for per VF control structures.
+        */
+       adapter->vfinfo =
+               kcalloc(adapter->num_vfs,
+                       sizeof(struct vf_data_storage), GFP_KERNEL);
+       if (adapter->vfinfo) {
+               /* Now that we're sure SR-IOV is enabled
+                * and memory allocated set up the mailbox parameters
+                */
+               ixgbe_init_mbx_params_pf(hw);
+               memcpy(&hw->mbx.ops, ii->mbx_ops,
+                      sizeof(hw->mbx.ops));
+
+               /* Disable RSC when in SR-IOV mode */
+               adapter->flags2 &= ~(IXGBE_FLAG2_RSC_CAPABLE |
+                                    IXGBE_FLAG2_RSC_ENABLED);
+               return;
+       }
+
+       /* Oh oh */
+       e_err(probe, "Unable to allocate memory for VF Data Storage - "
+             "SRIOV disabled\n");
+       pci_disable_sriov(adapter->pdev);
+
+err_novfs:
+       adapter->flags &= ~IXGBE_FLAG_SRIOV_ENABLED;
+       adapter->num_vfs = 0;
+#endif /* CONFIG_PCI_IOV */
+}
+
+/**
+ * ixgbe_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in ixgbe_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * ixgbe_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+static int __devinit ixgbe_probe(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+       struct net_device *netdev;
+       struct ixgbe_adapter *adapter = NULL;
+       struct ixgbe_hw *hw;
+       const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data];
+       static int cards_found;
+       int i, err, pci_using_dac;
+       u8 part_str[IXGBE_PBANUM_LENGTH];
+       unsigned int indices = num_possible_cpus();
+#ifdef IXGBE_FCOE
+       u16 device_caps;
+#endif
+       u32 eec;
+
+       /* Catch broken hardware that put the wrong VF device ID in
+        * the PCIe SR-IOV capability.
+        */
+       if (pdev->is_virtfn) {
+               WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
+                    pci_name(pdev), pdev->vendor, pdev->device);
+               return -EINVAL;
+       }
+
+       err = pci_enable_device_mem(pdev);
+       if (err)
+               return err;
+
+       if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
+           !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+               pci_using_dac = 1;
+       } else {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               if (err) {
+                       err = dma_set_coherent_mask(&pdev->dev,
+                                                   DMA_BIT_MASK(32));
+                       if (err) {
+                               dev_err(&pdev->dev,
+                                       "No usable DMA configuration, aborting\n");
+                               goto err_dma;
+                       }
+               }
+               pci_using_dac = 0;
+       }
+
+       err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
+                                          IORESOURCE_MEM), ixgbe_driver_name);
+       if (err) {
+               dev_err(&pdev->dev,
+                       "pci_request_selected_regions failed 0x%x\n", err);
+               goto err_pci_reg;
+       }
+
+       pci_enable_pcie_error_reporting(pdev);
+
+       pci_set_master(pdev);
+       pci_save_state(pdev);
+
+#ifdef CONFIG_IXGBE_DCB
+       indices *= MAX_TRAFFIC_CLASS;
+#endif
+
+       if (ii->mac == ixgbe_mac_82598EB)
+               indices = min_t(unsigned int, indices, IXGBE_MAX_RSS_INDICES);
+       else
+               indices = min_t(unsigned int, indices, IXGBE_MAX_FDIR_INDICES);
+
+#ifdef IXGBE_FCOE
+       indices += min_t(unsigned int, num_possible_cpus(),
+                        IXGBE_MAX_FCOE_INDICES);
+#endif
+       netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), indices);
+       if (!netdev) {
+               err = -ENOMEM;
+               goto err_alloc_etherdev;
+       }
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       adapter = netdev_priv(netdev);
+       pci_set_drvdata(pdev, adapter);
+
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+       hw = &adapter->hw;
+       hw->back = adapter;
+       adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;
+
+       hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
+                             pci_resource_len(pdev, 0));
+       if (!hw->hw_addr) {
+               err = -EIO;
+               goto err_ioremap;
+       }
+
+       for (i = 1; i <= 5; i++) {
+               if (pci_resource_len(pdev, i) == 0)
+                       continue;
+       }
+
+       netdev->netdev_ops = &ixgbe_netdev_ops;
+       ixgbe_set_ethtool_ops(netdev);
+       netdev->watchdog_timeo = 5 * HZ;
+       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+
+       adapter->bd_number = cards_found;
+
+       /* Setup hw api */
+       memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
+       hw->mac.type  = ii->mac;
+
+       /* EEPROM */
+       memcpy(&hw->eeprom.ops, ii->eeprom_ops, sizeof(hw->eeprom.ops));
+       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+       /* If EEPROM is valid (bit 8 = 1), use default otherwise use bit bang */
+       if (!(eec & (1 << 8)))
+               hw->eeprom.ops.read = &ixgbe_read_eeprom_bit_bang_generic;
+
+       /* PHY */
+       memcpy(&hw->phy.ops, ii->phy_ops, sizeof(hw->phy.ops));
+       hw->phy.sfp_type = ixgbe_sfp_type_unknown;
+       /* ixgbe_identify_phy_generic will set prtad and mmds properly */
+       hw->phy.mdio.prtad = MDIO_PRTAD_NONE;
+       hw->phy.mdio.mmds = 0;
+       hw->phy.mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
+       hw->phy.mdio.dev = netdev;
+       hw->phy.mdio.mdio_read = ixgbe_mdio_read;
+       hw->phy.mdio.mdio_write = ixgbe_mdio_write;
+
+       ii->get_invariants(hw);
+
+       /* setup the private structure */
+       err = ixgbe_sw_init(adapter);
+       if (err)
+               goto err_sw_init;
+
+       /* Make it possible the adapter to be woken up via WOL */
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
+               break;
+       default:
+               break;
+       }
+
+       /*
+        * If there is a fan on this device and it has failed log the
+        * failure.
+        */
+       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
+               u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
+               if (esdp & IXGBE_ESDP_SDP1)
+                       e_crit(probe, "Fan has stopped, replace the adapter\n");
+       }
+
+       /* reset_hw fills in the perm_addr as well */
+       hw->phy.reset_if_overtemp = true;
+       err = hw->mac.ops.reset_hw(hw);
+       hw->phy.reset_if_overtemp = false;
+       if (err == IXGBE_ERR_SFP_NOT_PRESENT &&
+           hw->mac.type == ixgbe_mac_82598EB) {
+               err = 0;
+       } else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
+               e_dev_err("failed to load because an unsupported SFP+ "
+                         "module type was detected.\n");
+               e_dev_err("Reload the driver after installing a supported "
+                         "module.\n");
+               goto err_sw_init;
+       } else if (err) {
+               e_dev_err("HW Init failed: %d\n", err);
+               goto err_sw_init;
+       }
+
+       ixgbe_probe_vf(adapter, ii);
+
+       netdev->features = NETIF_F_SG |
+                          NETIF_F_IP_CSUM |
+                          NETIF_F_IPV6_CSUM |
+                          NETIF_F_HW_VLAN_TX |
+                          NETIF_F_HW_VLAN_RX |
+                          NETIF_F_HW_VLAN_FILTER |
+                          NETIF_F_TSO |
+                          NETIF_F_TSO6 |
+                          NETIF_F_GRO |
+                          NETIF_F_RXHASH |
+                          NETIF_F_RXCSUM;
+
+       netdev->hw_features = netdev->features;
+
+       switch (adapter->hw.mac.type) {
+       case ixgbe_mac_82599EB:
+       case ixgbe_mac_X540:
+               netdev->features |= NETIF_F_SCTP_CSUM;
+               netdev->hw_features |= NETIF_F_SCTP_CSUM |
+                                      NETIF_F_NTUPLE;
+               break;
+       default:
+               break;
+       }
+
+       netdev->vlan_features |= NETIF_F_TSO;
+       netdev->vlan_features |= NETIF_F_TSO6;
+       netdev->vlan_features |= NETIF_F_IP_CSUM;
+       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
+       netdev->vlan_features |= NETIF_F_SG;
+
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+               adapter->flags &= ~(IXGBE_FLAG_RSS_ENABLED |
+                                   IXGBE_FLAG_DCB_ENABLED);
+
+#ifdef CONFIG_IXGBE_DCB
+       netdev->dcbnl_ops = &dcbnl_ops;
+#endif
+
+#ifdef IXGBE_FCOE
+       if (adapter->flags & IXGBE_FLAG_FCOE_CAPABLE) {
+               if (hw->mac.ops.get_device_caps) {
+                       hw->mac.ops.get_device_caps(hw, &device_caps);
+                       if (device_caps & IXGBE_DEVICE_CAPS_FCOE_OFFLOADS)
+                               adapter->flags &= ~IXGBE_FLAG_FCOE_CAPABLE;
+               }
+       }
+       if (adapter->flags & IXGBE_FLAG_FCOE_CAPABLE) {
+               netdev->vlan_features |= NETIF_F_FCOE_CRC;
+               netdev->vlan_features |= NETIF_F_FSO;
+               netdev->vlan_features |= NETIF_F_FCOE_MTU;
+       }
+#endif /* IXGBE_FCOE */
+       if (pci_using_dac) {
+               netdev->features |= NETIF_F_HIGHDMA;
+               netdev->vlan_features |= NETIF_F_HIGHDMA;
+       }
+
+       if (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)
+               netdev->hw_features |= NETIF_F_LRO;
+       if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)
+               netdev->features |= NETIF_F_LRO;
+
+       /* make sure the EEPROM is good */
+       if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) {
+               e_dev_err("The EEPROM Checksum Is Not Valid\n");
+               err = -EIO;
+               goto err_eeprom;
+       }
+
+       memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
+       memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len);
+
+       if (ixgbe_validate_mac_addr(netdev->perm_addr)) {
+               e_dev_err("invalid MAC address\n");
+               err = -EIO;
+               goto err_eeprom;
+       }
+
+       /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
+       if (hw->mac.ops.disable_tx_laser &&
+           ((hw->phy.multispeed_fiber) ||
+            ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+             (hw->mac.type == ixgbe_mac_82599EB))))
+               hw->mac.ops.disable_tx_laser(hw);
+
+       setup_timer(&adapter->service_timer, &ixgbe_service_timer,
+                   (unsigned long) adapter);
+
+       INIT_WORK(&adapter->service_task, ixgbe_service_task);
+       clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state);
+
+       err = ixgbe_init_interrupt_scheme(adapter);
+       if (err)
+               goto err_sw_init;
+
+       if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED)) {
+               netdev->hw_features &= ~NETIF_F_RXHASH;
+               netdev->features &= ~NETIF_F_RXHASH;
+       }
+
+       switch (pdev->device) {
+       case IXGBE_DEV_ID_82599_SFP:
+               /* Only this subdevice supports WOL */
+               if (pdev->subsystem_device == IXGBE_SUBDEV_ID_82599_SFP)
+                       adapter->wol = IXGBE_WUFC_MAG;
+               break;
+       case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
+               /* All except this subdevice support WOL */
+               if (pdev->subsystem_device != IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)
+                       adapter->wol = IXGBE_WUFC_MAG;
+               break;
+       case IXGBE_DEV_ID_82599_KX4:
+               adapter->wol = IXGBE_WUFC_MAG;
+               break;
+       default:
+               adapter->wol = 0;
+               break;
+       }
+       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+       /* pick up the PCI bus settings for reporting later */
+       hw->mac.ops.get_bus_info(hw);
+
+       /* print bus type/speed/width info */
+       e_dev_info("(PCI Express:%s:%s) %pM\n",
+                  (hw->bus.speed == ixgbe_bus_speed_5000 ? "5.0GT/s" :
+                   hw->bus.speed == ixgbe_bus_speed_2500 ? "2.5GT/s" :
+                   "Unknown"),
+                  (hw->bus.width == ixgbe_bus_width_pcie_x8 ? "Width x8" :
+                   hw->bus.width == ixgbe_bus_width_pcie_x4 ? "Width x4" :
+                   hw->bus.width == ixgbe_bus_width_pcie_x1 ? "Width x1" :
+                   "Unknown"),
+                  netdev->dev_addr);
+
+       err = ixgbe_read_pba_string_generic(hw, part_str, IXGBE_PBANUM_LENGTH);
+       if (err)
+               strncpy(part_str, "Unknown", IXGBE_PBANUM_LENGTH);
+       if (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)
+               e_dev_info("MAC: %d, PHY: %d, SFP+: %d, PBA No: %s\n",
+                          hw->mac.type, hw->phy.type, hw->phy.sfp_type,
+                          part_str);
+       else
+               e_dev_info("MAC: %d, PHY: %d, PBA No: %s\n",
+                          hw->mac.type, hw->phy.type, part_str);
+
+       if (hw->bus.width <= ixgbe_bus_width_pcie_x4) {
+               e_dev_warn("PCI-Express bandwidth available for this card is "
+                          "not sufficient for optimal performance.\n");
+               e_dev_warn("For optimal performance a x8 PCI-Express slot "
+                          "is required.\n");
+       }
+
+       /* save off EEPROM version number */
+       hw->eeprom.ops.read(hw, 0x29, &adapter->eeprom_version);
+
+       /* reset the hardware with the new settings */
+       err = hw->mac.ops.start_hw(hw);
+
+       if (err == IXGBE_ERR_EEPROM_VERSION) {
+               /* We are running on a pre-production device, log a warning */
+               e_dev_warn("This device is a pre-production adapter/LOM. "
+                          "Please be aware there may be issues associated "
+                          "with your hardware.  If you are experiencing "
+                          "problems please contact your Intel or hardware "
+                          "representative who provided you with this "
+                          "hardware.\n");
+       }
+       strcpy(netdev->name, "eth%d");
+       err = register_netdev(netdev);
+       if (err)
+               goto err_register;
+
+       /* carrier off reporting is important to ethtool even BEFORE open */
+       netif_carrier_off(netdev);
+
+#ifdef CONFIG_IXGBE_DCA
+       if (dca_add_requester(&pdev->dev) == 0) {
+               adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
+               ixgbe_setup_dca(adapter);
+       }
+#endif
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+               e_info(probe, "IOV is enabled with %d VFs\n", adapter->num_vfs);
+               for (i = 0; i < adapter->num_vfs; i++)
+                       ixgbe_vf_configuration(pdev, (i | 0x10000000));
+       }
+
+       /* Inform firmware of driver version */
+       if (hw->mac.ops.set_fw_drv_ver)
+               hw->mac.ops.set_fw_drv_ver(hw, MAJ, MIN, BUILD,
+                                          FW_CEM_UNUSED_VER);
+
+       /* add san mac addr to netdev */
+       ixgbe_add_sanmac_netdev(netdev);
+
+       e_dev_info("Intel(R) 10 Gigabit Network Connection\n");
+       cards_found++;
+       return 0;
+
+err_register:
+       ixgbe_release_hw_control(adapter);
+       ixgbe_clear_interrupt_scheme(adapter);
+err_sw_init:
+err_eeprom:
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+               ixgbe_disable_sriov(adapter);
+       adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;
+       iounmap(hw->hw_addr);
+err_ioremap:
+       free_netdev(netdev);
+err_alloc_etherdev:
+       pci_release_selected_regions(pdev,
+                                    pci_select_bars(pdev, IORESOURCE_MEM));
+err_pci_reg:
+err_dma:
+       pci_disable_device(pdev);
+       return err;
+}
+
+/**
+ * ixgbe_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * ixgbe_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+static void __devexit ixgbe_remove(struct pci_dev *pdev)
+{
+       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
+       struct net_device *netdev = adapter->netdev;
+
+       set_bit(__IXGBE_DOWN, &adapter->state);
+       cancel_work_sync(&adapter->service_task);
+
+#ifdef CONFIG_IXGBE_DCA
+       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
+               adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
+               dca_remove_requester(&pdev->dev);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 1);
+       }
+
+#endif
+#ifdef IXGBE_FCOE
+       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
+               ixgbe_cleanup_fcoe(adapter);
+
+#endif /* IXGBE_FCOE */
+
+       /* remove the added san mac */
+       ixgbe_del_sanmac_netdev(netdev);
+
+       if (netdev->reg_state == NETREG_REGISTERED)
+               unregister_netdev(netdev);
+
+       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+               ixgbe_disable_sriov(adapter);
+
+       ixgbe_clear_interrupt_scheme(adapter);
+
+       ixgbe_release_hw_control(adapter);
+
+       iounmap(adapter->hw.hw_addr);
+       pci_release_selected_regions(pdev, pci_select_bars(pdev,
+                                    IORESOURCE_MEM));
+
+       e_dev_info("complete\n");
+
+       free_netdev(netdev);
+
+       pci_disable_pcie_error_reporting(pdev);
+
+       pci_disable_device(pdev);
+}
+
+/**
+ * ixgbe_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci connection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
+                                               pci_channel_state_t state)
+{
+       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
+       struct net_device *netdev = adapter->netdev;
+
+       netif_device_detach(netdev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       if (netif_running(netdev))
+               ixgbe_down(adapter);
+       pci_disable_device(pdev);
+
+       /* Request a slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * ixgbe_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot.
+ */
+static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
+{
+       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
+       pci_ers_result_t result;
+       int err;
+
+       if (pci_enable_device_mem(pdev)) {
+               e_err(probe, "Cannot re-enable PCI device after reset.\n");
+               result = PCI_ERS_RESULT_DISCONNECT;
+       } else {
+               pci_set_master(pdev);
+               pci_restore_state(pdev);
+               pci_save_state(pdev);
+
+               pci_wake_from_d3(pdev, false);
+
+               ixgbe_reset(adapter);
+               IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
+               result = PCI_ERS_RESULT_RECOVERED;
+       }
+
+       err = pci_cleanup_aer_uncorrect_error_status(pdev);
+       if (err) {
+               e_dev_err("pci_cleanup_aer_uncorrect_error_status "
+                         "failed 0x%0x\n", err);
+               /* non-fatal, continue */
+       }
+
+       return result;
+}
+
+/**
+ * ixgbe_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation.
+ */
+static void ixgbe_io_resume(struct pci_dev *pdev)
+{
+       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
+       struct net_device *netdev = adapter->netdev;
+
+       if (netif_running(netdev)) {
+               if (ixgbe_up(adapter)) {
+                       e_info(probe, "ixgbe_up failed after reset\n");
+                       return;
+               }
+       }
+
+       netif_device_attach(netdev);
+}
+
+static struct pci_error_handlers ixgbe_err_handler = {
+       .error_detected = ixgbe_io_error_detected,
+       .slot_reset = ixgbe_io_slot_reset,
+       .resume = ixgbe_io_resume,
+};
+
+static struct pci_driver ixgbe_driver = {
+       .name     = ixgbe_driver_name,
+       .id_table = ixgbe_pci_tbl,
+       .probe    = ixgbe_probe,
+       .remove   = __devexit_p(ixgbe_remove),
+#ifdef CONFIG_PM
+       .suspend  = ixgbe_suspend,
+       .resume   = ixgbe_resume,
+#endif
+       .shutdown = ixgbe_shutdown,
+       .err_handler = &ixgbe_err_handler
+};
+
+/**
+ * ixgbe_init_module - Driver Registration Routine
+ *
+ * ixgbe_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init ixgbe_init_module(void)
+{
+       int ret;
+       pr_info("%s - version %s\n", ixgbe_driver_string, ixgbe_driver_version);
+       pr_info("%s\n", ixgbe_copyright);
+
+#ifdef CONFIG_IXGBE_DCA
+       dca_register_notify(&dca_notifier);
+#endif
+
+       ret = pci_register_driver(&ixgbe_driver);
+       return ret;
+}
+
+module_init(ixgbe_init_module);
+
+/**
+ * ixgbe_exit_module - Driver Exit Cleanup Routine
+ *
+ * ixgbe_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+static void __exit ixgbe_exit_module(void)
+{
+#ifdef CONFIG_IXGBE_DCA
+       dca_unregister_notify(&dca_notifier);
+#endif
+       pci_unregister_driver(&ixgbe_driver);
+       rcu_barrier(); /* Wait for completion of call_rcu()'s */
+}
+
+#ifdef CONFIG_IXGBE_DCA
+static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
+                           void *p)
+{
+       int ret_val;
+
+       ret_val = driver_for_each_device(&ixgbe_driver.driver, NULL, &event,
+                                        __ixgbe_notify_dca);
+
+       return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
+}
+
+#endif /* CONFIG_IXGBE_DCA */
+
+module_exit(ixgbe_exit_module);
+
+/* ixgbe_main.c */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
new file mode 100644 (file)
index 0000000..1ff0eef
--- /dev/null
@@ -0,0 +1,471 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include "ixgbe_type.h"
+#include "ixgbe_common.h"
+#include "ixgbe_mbx.h"
+
+/**
+ *  ixgbe_read_mbx - Reads a message from the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to read
+ *
+ *  returns SUCCESS if it successfuly read message from buffer
+ **/
+s32 ixgbe_read_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       /* limit read to size of mailbox */
+       if (size > mbx->size)
+               size = mbx->size;
+
+       if (mbx->ops.read)
+               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_write_mbx - Write a message to the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer
+ **/
+s32 ixgbe_write_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = 0;
+
+       if (size > mbx->size)
+               ret_val = IXGBE_ERR_MBX;
+
+       else if (mbx->ops.write)
+               ret_val = mbx->ops.write(hw, msg, size, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_check_for_msg - checks to see if someone sent us mail
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to check
+ *
+ *  returns SUCCESS if the Status bit was found or else ERR_MBX
+ **/
+s32 ixgbe_check_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (mbx->ops.check_for_msg)
+               ret_val = mbx->ops.check_for_msg(hw, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_check_for_ack - checks to see if someone sent us ACK
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to check
+ *
+ *  returns SUCCESS if the Status bit was found or else ERR_MBX
+ **/
+s32 ixgbe_check_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (mbx->ops.check_for_ack)
+               ret_val = mbx->ops.check_for_ack(hw, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_check_for_rst - checks to see if other side has reset
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to check
+ *
+ *  returns SUCCESS if the Status bit was found or else ERR_MBX
+ **/
+s32 ixgbe_check_for_rst(struct ixgbe_hw *hw, u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (mbx->ops.check_for_rst)
+               ret_val = mbx->ops.check_for_rst(hw, mbx_id);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_poll_for_msg - Wait for message notification
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully received a message notification
+ **/
+static s32 ixgbe_poll_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       if (!countdown || !mbx->ops.check_for_msg)
+               goto out;
+
+       while (countdown && mbx->ops.check_for_msg(hw, mbx_id)) {
+               countdown--;
+               if (!countdown)
+                       break;
+               udelay(mbx->usec_delay);
+       }
+
+out:
+       return countdown ? 0 : IXGBE_ERR_MBX;
+}
+
+/**
+ *  ixgbe_poll_for_ack - Wait for message acknowledgement
+ *  @hw: pointer to the HW structure
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully received a message acknowledgement
+ **/
+static s32 ixgbe_poll_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       if (!countdown || !mbx->ops.check_for_ack)
+               goto out;
+
+       while (countdown && mbx->ops.check_for_ack(hw, mbx_id)) {
+               countdown--;
+               if (!countdown)
+                       break;
+               udelay(mbx->usec_delay);
+       }
+
+out:
+       return countdown ? 0 : IXGBE_ERR_MBX;
+}
+
+/**
+ *  ixgbe_read_posted_mbx - Wait for message notification and receive message
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully received a message notification and
+ *  copied it into the receive buffer.
+ **/
+static s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
+                                u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (!mbx->ops.read)
+               goto out;
+
+       ret_val = ixgbe_poll_for_msg(hw, mbx_id);
+
+       /* if ack received read message, otherwise we timed out */
+       if (!ret_val)
+               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_write_posted_mbx - Write a message to the mailbox, wait for ack
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @mbx_id: id of mailbox to write
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer and
+ *  received an ack to that message within delay * timeout period
+ **/
+static s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
+                           u16 mbx_id)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       /* exit if either we can't write or there isn't a defined timeout */
+       if (!mbx->ops.write || !mbx->timeout)
+               goto out;
+
+       /* send msg */
+       ret_val = mbx->ops.write(hw, msg, size, mbx_id);
+
+       /* if msg sent wait until we receive an ack */
+       if (!ret_val)
+               ret_val = ixgbe_poll_for_ack(hw, mbx_id);
+out:
+       return ret_val;
+}
+
+static s32 ixgbe_check_for_bit_pf(struct ixgbe_hw *hw, u32 mask, s32 index)
+{
+       u32 mbvficr = IXGBE_READ_REG(hw, IXGBE_MBVFICR(index));
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (mbvficr & mask) {
+               ret_val = 0;
+               IXGBE_WRITE_REG(hw, IXGBE_MBVFICR(index), mask);
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_check_for_msg_pf - checks to see if the VF has sent mail
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
+ **/
+static s32 ixgbe_check_for_msg_pf(struct ixgbe_hw *hw, u16 vf_number)
+{
+       s32 ret_val = IXGBE_ERR_MBX;
+       s32 index = IXGBE_MBVFICR_INDEX(vf_number);
+       u32 vf_bit = vf_number % 16;
+
+       if (!ixgbe_check_for_bit_pf(hw, IXGBE_MBVFICR_VFREQ_VF1 << vf_bit,
+                                   index)) {
+               ret_val = 0;
+               hw->mbx.stats.reqs++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_check_for_ack_pf - checks to see if the VF has ACKed
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
+ **/
+static s32 ixgbe_check_for_ack_pf(struct ixgbe_hw *hw, u16 vf_number)
+{
+       s32 ret_val = IXGBE_ERR_MBX;
+       s32 index = IXGBE_MBVFICR_INDEX(vf_number);
+       u32 vf_bit = vf_number % 16;
+
+       if (!ixgbe_check_for_bit_pf(hw, IXGBE_MBVFICR_VFACK_VF1 << vf_bit,
+                                   index)) {
+               ret_val = 0;
+               hw->mbx.stats.acks++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_check_for_rst_pf - checks to see if the VF has reset
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
+ **/
+static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number)
+{
+       u32 reg_offset = (vf_number < 32) ? 0 : 1;
+       u32 vf_shift = vf_number % 32;
+       u32 vflre = 0;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       switch (hw->mac.type) {
+       case ixgbe_mac_82599EB:
+               vflre = IXGBE_READ_REG(hw, IXGBE_VFLRE(reg_offset));
+               break;
+       case ixgbe_mac_X540:
+               vflre = IXGBE_READ_REG(hw, IXGBE_VFLREC(reg_offset));
+               break;
+       default:
+               break;
+       }
+
+       if (vflre & (1 << vf_shift)) {
+               ret_val = 0;
+               IXGBE_WRITE_REG(hw, IXGBE_VFLREC(reg_offset), (1 << vf_shift));
+               hw->mbx.stats.rsts++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_obtain_mbx_lock_pf - obtain mailbox lock
+ *  @hw: pointer to the HW structure
+ *  @vf_number: the VF index
+ *
+ *  return SUCCESS if we obtained the mailbox lock
+ **/
+static s32 ixgbe_obtain_mbx_lock_pf(struct ixgbe_hw *hw, u16 vf_number)
+{
+       s32 ret_val = IXGBE_ERR_MBX;
+       u32 p2v_mailbox;
+
+       /* Take ownership of the buffer */
+       IXGBE_WRITE_REG(hw, IXGBE_PFMAILBOX(vf_number), IXGBE_PFMAILBOX_PFU);
+
+       /* reserve mailbox for vf use */
+       p2v_mailbox = IXGBE_READ_REG(hw, IXGBE_PFMAILBOX(vf_number));
+       if (p2v_mailbox & IXGBE_PFMAILBOX_PFU)
+               ret_val = 0;
+
+       return ret_val;
+}
+
+/**
+ *  ixgbe_write_mbx_pf - Places a message in the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @vf_number: the VF index
+ *
+ *  returns SUCCESS if it successfully copied message into the buffer
+ **/
+static s32 ixgbe_write_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
+                              u16 vf_number)
+{
+       s32 ret_val;
+       u16 i;
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       ret_val = ixgbe_obtain_mbx_lock_pf(hw, vf_number);
+       if (ret_val)
+               goto out_no_write;
+
+       /* flush msg and acks as we are overwriting the message buffer */
+       ixgbe_check_for_msg_pf(hw, vf_number);
+       ixgbe_check_for_ack_pf(hw, vf_number);
+
+       /* copy the caller specified message to the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_PFMBMEM(vf_number), i, msg[i]);
+
+       /* Interrupt VF to tell it a message has been sent and release buffer*/
+       IXGBE_WRITE_REG(hw, IXGBE_PFMAILBOX(vf_number), IXGBE_PFMAILBOX_STS);
+
+       /* update stats */
+       hw->mbx.stats.msgs_tx++;
+
+out_no_write:
+       return ret_val;
+
+}
+
+/**
+ *  ixgbe_read_mbx_pf - Read a message from the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *  @vf_number: the VF index
+ *
+ *  This function copies a message from the mailbox buffer to the caller's
+ *  memory buffer.  The presumption is that the caller knows that there was
+ *  a message due to a VF request so no polling for message is needed.
+ **/
+static s32 ixgbe_read_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
+                             u16 vf_number)
+{
+       s32 ret_val;
+       u16 i;
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       ret_val = ixgbe_obtain_mbx_lock_pf(hw, vf_number);
+       if (ret_val)
+               goto out_no_read;
+
+       /* copy the message to the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               msg[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_PFMBMEM(vf_number), i);
+
+       /* Acknowledge the message and release buffer */
+       IXGBE_WRITE_REG(hw, IXGBE_PFMAILBOX(vf_number), IXGBE_PFMAILBOX_ACK);
+
+       /* update stats */
+       hw->mbx.stats.msgs_rx++;
+
+out_no_read:
+       return ret_val;
+}
+
+#ifdef CONFIG_PCI_IOV
+/**
+ *  ixgbe_init_mbx_params_pf - set initial values for pf mailbox
+ *  @hw: pointer to the HW structure
+ *
+ *  Initializes the hw->mbx struct to correct values for pf mailbox
+ */
+void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+
+       if (hw->mac.type != ixgbe_mac_82599EB &&
+           hw->mac.type != ixgbe_mac_X540)
+               return;
+
+       mbx->timeout = 0;
+       mbx->usec_delay = 0;
+
+       mbx->stats.msgs_tx = 0;
+       mbx->stats.msgs_rx = 0;
+       mbx->stats.reqs = 0;
+       mbx->stats.acks = 0;
+       mbx->stats.rsts = 0;
+
+       mbx->size = IXGBE_VFMAILBOX_SIZE;
+}
+#endif /* CONFIG_PCI_IOV */
+
+struct ixgbe_mbx_operations mbx_ops_generic = {
+       .read                   = ixgbe_read_mbx_pf,
+       .write                  = ixgbe_write_mbx_pf,
+       .read_posted            = ixgbe_read_posted_mbx,
+       .write_posted           = ixgbe_write_posted_mbx,
+       .check_for_msg          = ixgbe_check_for_msg_pf,
+       .check_for_ack          = ixgbe_check_for_ack_pf,
+       .check_for_rst          = ixgbe_check_for_rst_pf,
+};
+
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
new file mode 100644 (file)
index 0000000..b239bda
--- /dev/null
@@ -0,0 +1,93 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_MBX_H_
+#define _IXGBE_MBX_H_
+
+#include "ixgbe_type.h"
+
+#define IXGBE_VFMAILBOX_SIZE        16 /* 16 32 bit words - 64 bytes */
+#define IXGBE_ERR_MBX               -100
+
+#define IXGBE_VFMAILBOX             0x002FC
+#define IXGBE_VFMBMEM               0x00200
+
+#define IXGBE_PFMAILBOX_STS   0x00000001 /* Initiate message send to VF */
+#define IXGBE_PFMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
+#define IXGBE_PFMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
+#define IXGBE_PFMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
+#define IXGBE_PFMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
+
+#define IXGBE_MBVFICR_VFREQ_MASK 0x0000FFFF /* bits for VF messages */
+#define IXGBE_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
+#define IXGBE_MBVFICR_VFACK_MASK 0xFFFF0000 /* bits for VF acks */
+#define IXGBE_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
+
+
+/* If it's a IXGBE_VF_* msg then it originates in the VF and is sent to the
+ * PF.  The reverse is true if it is IXGBE_PF_*.
+ * Message ACK's are the value or'd with 0xF0000000
+ */
+#define IXGBE_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
+                                               * this are the ACK */
+#define IXGBE_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
+                                               * this are the NACK */
+#define IXGBE_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
+                                                 clear to send requests */
+#define IXGBE_VT_MSGINFO_SHIFT    16
+/* bits 23:16 are used for exra info for certain messages */
+#define IXGBE_VT_MSGINFO_MASK     (0xFF << IXGBE_VT_MSGINFO_SHIFT)
+
+#define IXGBE_VF_RESET            0x01 /* VF requests reset */
+#define IXGBE_VF_SET_MAC_ADDR     0x02 /* VF requests PF to set MAC addr */
+#define IXGBE_VF_SET_MULTICAST    0x03 /* VF requests PF to set MC addr */
+#define IXGBE_VF_SET_VLAN         0x04 /* VF requests PF to set VLAN */
+#define IXGBE_VF_SET_LPE          0x05 /* VF requests PF to set VMOLR.LPE */
+#define IXGBE_VF_SET_MACVLAN      0x06 /* VF requests PF for unicast filter */
+
+/* length of permanent address message returned from PF */
+#define IXGBE_VF_PERMADDR_MSG_LEN 4
+/* word in permanent address message with the current multicast type */
+#define IXGBE_VF_MC_TYPE_WORD     3
+
+#define IXGBE_PF_CONTROL_MSG      0x0100 /* PF control message */
+
+#define IXGBE_VF_MBX_INIT_TIMEOUT 2000 /* number of retries on mailbox */
+#define IXGBE_VF_MBX_INIT_DELAY   500  /* microseconds between retries */
+
+s32 ixgbe_read_mbx(struct ixgbe_hw *, u32 *, u16, u16);
+s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16);
+s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16);
+s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16);
+s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16);
+#ifdef CONFIG_PCI_IOV
+void ixgbe_init_mbx_params_pf(struct ixgbe_hw *);
+#endif /* CONFIG_PCI_IOV */
+
+extern struct ixgbe_mbx_operations mbx_ops_generic;
+
+#endif /* _IXGBE_MBX_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
new file mode 100644 (file)
index 0000000..f7ca351
--- /dev/null
@@ -0,0 +1,1725 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+
+#include "ixgbe_common.h"
+#include "ixgbe_phy.h"
+
+static void ixgbe_i2c_start(struct ixgbe_hw *hw);
+static void ixgbe_i2c_stop(struct ixgbe_hw *hw);
+static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data);
+static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data);
+static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw);
+static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data);
+static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data);
+static s32 ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
+static void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
+static s32 ixgbe_set_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl, bool data);
+static bool ixgbe_get_i2c_data(u32 *i2cctl);
+static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw);
+static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id);
+static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw);
+
+/**
+ *  ixgbe_identify_phy_generic - Get physical layer module
+ *  @hw: pointer to hardware structure
+ *
+ *  Determines the physical layer module found on the current adapter.
+ **/
+s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)
+{
+       s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
+       u32 phy_addr;
+       u16 ext_ability = 0;
+
+       if (hw->phy.type == ixgbe_phy_unknown) {
+               for (phy_addr = 0; phy_addr < IXGBE_MAX_PHY_ADDR; phy_addr++) {
+                       hw->phy.mdio.prtad = phy_addr;
+                       if (mdio45_probe(&hw->phy.mdio, phy_addr) == 0) {
+                               ixgbe_get_phy_id(hw);
+                               hw->phy.type =
+                                       ixgbe_get_phy_type_from_id(hw->phy.id);
+
+                               if (hw->phy.type == ixgbe_phy_unknown) {
+                                       hw->phy.ops.read_reg(hw,
+                                                            MDIO_PMA_EXTABLE,
+                                                            MDIO_MMD_PMAPMD,
+                                                            &ext_ability);
+                                       if (ext_ability &
+                                           (MDIO_PMA_EXTABLE_10GBT |
+                                            MDIO_PMA_EXTABLE_1000BT))
+                                               hw->phy.type =
+                                                        ixgbe_phy_cu_unknown;
+                                       else
+                                               hw->phy.type =
+                                                        ixgbe_phy_generic;
+                               }
+
+                               status = 0;
+                               break;
+                       }
+               }
+               /* clear value if nothing found */
+               if (status != 0)
+                       hw->phy.mdio.prtad = 0;
+       } else {
+               status = 0;
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_get_phy_id - Get the phy type
+ *  @hw: pointer to hardware structure
+ *
+ **/
+static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw)
+{
+       u32 status;
+       u16 phy_id_high = 0;
+       u16 phy_id_low = 0;
+
+       status = hw->phy.ops.read_reg(hw, MDIO_DEVID1, MDIO_MMD_PMAPMD,
+                                     &phy_id_high);
+
+       if (status == 0) {
+               hw->phy.id = (u32)(phy_id_high << 16);
+               status = hw->phy.ops.read_reg(hw, MDIO_DEVID2, MDIO_MMD_PMAPMD,
+                                             &phy_id_low);
+               hw->phy.id |= (u32)(phy_id_low & IXGBE_PHY_REVISION_MASK);
+               hw->phy.revision = (u32)(phy_id_low & ~IXGBE_PHY_REVISION_MASK);
+       }
+       return status;
+}
+
+/**
+ *  ixgbe_get_phy_type_from_id - Get the phy type
+ *  @hw: pointer to hardware structure
+ *
+ **/
+static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)
+{
+       enum ixgbe_phy_type phy_type;
+
+       switch (phy_id) {
+       case TN1010_PHY_ID:
+               phy_type = ixgbe_phy_tn;
+               break;
+       case X540_PHY_ID:
+               phy_type = ixgbe_phy_aq;
+               break;
+       case QT2022_PHY_ID:
+               phy_type = ixgbe_phy_qt;
+               break;
+       case ATH_PHY_ID:
+               phy_type = ixgbe_phy_nl;
+               break;
+       default:
+               phy_type = ixgbe_phy_unknown;
+               break;
+       }
+
+       return phy_type;
+}
+
+/**
+ *  ixgbe_reset_phy_generic - Performs a PHY reset
+ *  @hw: pointer to hardware structure
+ **/
+s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)
+{
+       u32 i;
+       u16 ctrl = 0;
+       s32 status = 0;
+
+       if (hw->phy.type == ixgbe_phy_unknown)
+               status = ixgbe_identify_phy_generic(hw);
+
+       if (status != 0 || hw->phy.type == ixgbe_phy_none)
+               goto out;
+
+       /* Don't reset PHY if it's shut down due to overtemp. */
+       if (!hw->phy.reset_if_overtemp &&
+           (IXGBE_ERR_OVERTEMP == hw->phy.ops.check_overtemp(hw)))
+               goto out;
+
+       /*
+        * Perform soft PHY reset to the PHY_XS.
+        * This will cause a soft reset to the PHY
+        */
+       hw->phy.ops.write_reg(hw, MDIO_CTRL1,
+                             MDIO_MMD_PHYXS,
+                             MDIO_CTRL1_RESET);
+
+       /*
+        * Poll for reset bit to self-clear indicating reset is complete.
+        * Some PHYs could take up to 3 seconds to complete and need about
+        * 1.7 usec delay after the reset is complete.
+        */
+       for (i = 0; i < 30; i++) {
+               msleep(100);
+               hw->phy.ops.read_reg(hw, MDIO_CTRL1,
+                                    MDIO_MMD_PHYXS, &ctrl);
+               if (!(ctrl & MDIO_CTRL1_RESET)) {
+                       udelay(2);
+                       break;
+               }
+       }
+
+       if (ctrl & MDIO_CTRL1_RESET) {
+               status = IXGBE_ERR_RESET_FAILED;
+               hw_dbg(hw, "PHY reset polling failed to complete.\n");
+       }
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_read_phy_reg_generic - Reads a value from a specified PHY register
+ *  @hw: pointer to hardware structure
+ *  @reg_addr: 32 bit address of PHY register to read
+ *  @phy_data: Pointer to read data from PHY register
+ **/
+s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
+                               u32 device_type, u16 *phy_data)
+{
+       u32 command;
+       u32 i;
+       u32 data;
+       s32 status = 0;
+       u16 gssr;
+
+       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
+               gssr = IXGBE_GSSR_PHY1_SM;
+       else
+               gssr = IXGBE_GSSR_PHY0_SM;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)
+               status = IXGBE_ERR_SWFW_SYNC;
+
+       if (status == 0) {
+               /* Setup and write the address cycle command */
+               command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
+                          (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
+                          (hw->phy.mdio.prtad << IXGBE_MSCA_PHY_ADDR_SHIFT) |
+                          (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));
+
+               IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
+
+               /*
+                * Check every 10 usec to see if the address cycle completed.
+                * The MDI Command bit will clear when the operation is
+                * complete
+                */
+               for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
+                       udelay(10);
+
+                       command = IXGBE_READ_REG(hw, IXGBE_MSCA);
+
+                       if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
+                               break;
+               }
+
+               if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
+                       hw_dbg(hw, "PHY address command did not complete.\n");
+                       status = IXGBE_ERR_PHY;
+               }
+
+               if (status == 0) {
+                       /*
+                        * Address cycle complete, setup and write the read
+                        * command
+                        */
+                       command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
+                                  (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
+                                  (hw->phy.mdio.prtad <<
+                                   IXGBE_MSCA_PHY_ADDR_SHIFT) |
+                                  (IXGBE_MSCA_READ | IXGBE_MSCA_MDI_COMMAND));
+
+                       IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
+
+                       /*
+                        * Check every 10 usec to see if the address cycle
+                        * completed. The MDI Command bit will clear when the
+                        * operation is complete
+                        */
+                       for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
+                               udelay(10);
+
+                               command = IXGBE_READ_REG(hw, IXGBE_MSCA);
+
+                               if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
+                                       break;
+                       }
+
+                       if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
+                               hw_dbg(hw, "PHY read command didn't complete\n");
+                               status = IXGBE_ERR_PHY;
+                       } else {
+                               /*
+                                * Read operation is complete.  Get the data
+                                * from MSRWD
+                                */
+                               data = IXGBE_READ_REG(hw, IXGBE_MSRWD);
+                               data >>= IXGBE_MSRWD_READ_DATA_SHIFT;
+                               *phy_data = (u16)(data);
+                       }
+               }
+
+               hw->mac.ops.release_swfw_sync(hw, gssr);
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_write_phy_reg_generic - Writes a value to specified PHY register
+ *  @hw: pointer to hardware structure
+ *  @reg_addr: 32 bit PHY register to write
+ *  @device_type: 5 bit device type
+ *  @phy_data: Data to write to the PHY register
+ **/
+s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
+                                u32 device_type, u16 phy_data)
+{
+       u32 command;
+       u32 i;
+       s32 status = 0;
+       u16 gssr;
+
+       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
+               gssr = IXGBE_GSSR_PHY1_SM;
+       else
+               gssr = IXGBE_GSSR_PHY0_SM;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)
+               status = IXGBE_ERR_SWFW_SYNC;
+
+       if (status == 0) {
+               /* Put the data in the MDI single read and write data register*/
+               IXGBE_WRITE_REG(hw, IXGBE_MSRWD, (u32)phy_data);
+
+               /* Setup and write the address cycle command */
+               command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
+                          (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
+                          (hw->phy.mdio.prtad << IXGBE_MSCA_PHY_ADDR_SHIFT) |
+                          (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));
+
+               IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
+
+               /*
+                * Check every 10 usec to see if the address cycle completed.
+                * The MDI Command bit will clear when the operation is
+                * complete
+                */
+               for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
+                       udelay(10);
+
+                       command = IXGBE_READ_REG(hw, IXGBE_MSCA);
+
+                       if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
+                               break;
+               }
+
+               if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
+                       hw_dbg(hw, "PHY address cmd didn't complete\n");
+                       status = IXGBE_ERR_PHY;
+               }
+
+               if (status == 0) {
+                       /*
+                        * Address cycle complete, setup and write the write
+                        * command
+                        */
+                       command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
+                                  (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
+                                  (hw->phy.mdio.prtad <<
+                                   IXGBE_MSCA_PHY_ADDR_SHIFT) |
+                                  (IXGBE_MSCA_WRITE | IXGBE_MSCA_MDI_COMMAND));
+
+                       IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
+
+                       /*
+                        * Check every 10 usec to see if the address cycle
+                        * completed. The MDI Command bit will clear when the
+                        * operation is complete
+                        */
+                       for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
+                               udelay(10);
+
+                               command = IXGBE_READ_REG(hw, IXGBE_MSCA);
+
+                               if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
+                                       break;
+                       }
+
+                       if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
+                               hw_dbg(hw, "PHY address cmd didn't complete\n");
+                               status = IXGBE_ERR_PHY;
+                       }
+               }
+
+               hw->mac.ops.release_swfw_sync(hw, gssr);
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_setup_phy_link_generic - Set and restart autoneg
+ *  @hw: pointer to hardware structure
+ *
+ *  Restart autonegotiation and PHY and waits for completion.
+ **/
+s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
+{
+       s32 status = 0;
+       u32 time_out;
+       u32 max_time_out = 10;
+       u16 autoneg_reg = IXGBE_MII_AUTONEG_REG;
+       bool autoneg = false;
+       ixgbe_link_speed speed;
+
+       ixgbe_get_copper_link_capabilities_generic(hw, &speed, &autoneg);
+
+       if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
+               /* Set or unset auto-negotiation 10G advertisement */
+               hw->phy.ops.read_reg(hw, MDIO_AN_10GBT_CTRL,
+                                    MDIO_MMD_AN,
+                                    &autoneg_reg);
+
+               autoneg_reg &= ~MDIO_AN_10GBT_CTRL_ADV10G;
+               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
+                       autoneg_reg |= MDIO_AN_10GBT_CTRL_ADV10G;
+
+               hw->phy.ops.write_reg(hw, MDIO_AN_10GBT_CTRL,
+                                     MDIO_MMD_AN,
+                                     autoneg_reg);
+       }
+
+       if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
+               /* Set or unset auto-negotiation 1G advertisement */
+               hw->phy.ops.read_reg(hw,
+                                    IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
+                                    MDIO_MMD_AN,
+                                    &autoneg_reg);
+
+               autoneg_reg &= ~IXGBE_MII_1GBASE_T_ADVERTISE;
+               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
+                       autoneg_reg |= IXGBE_MII_1GBASE_T_ADVERTISE;
+
+               hw->phy.ops.write_reg(hw,
+                                     IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
+                                     MDIO_MMD_AN,
+                                     autoneg_reg);
+       }
+
+       if (speed & IXGBE_LINK_SPEED_100_FULL) {
+               /* Set or unset auto-negotiation 100M advertisement */
+               hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                    MDIO_MMD_AN,
+                                    &autoneg_reg);
+
+               autoneg_reg &= ~(ADVERTISE_100FULL |
+                                ADVERTISE_100HALF);
+               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
+                       autoneg_reg |= ADVERTISE_100FULL;
+
+               hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                     MDIO_MMD_AN,
+                                     autoneg_reg);
+       }
+
+       /* Restart PHY autonegotiation and wait for completion */
+       hw->phy.ops.read_reg(hw, MDIO_CTRL1,
+                            MDIO_MMD_AN, &autoneg_reg);
+
+       autoneg_reg |= MDIO_AN_CTRL1_RESTART;
+
+       hw->phy.ops.write_reg(hw, MDIO_CTRL1,
+                             MDIO_MMD_AN, autoneg_reg);
+
+       /* Wait for autonegotiation to finish */
+       for (time_out = 0; time_out < max_time_out; time_out++) {
+               udelay(10);
+               /* Restart PHY autonegotiation and wait for completion */
+               status = hw->phy.ops.read_reg(hw, MDIO_STAT1,
+                                             MDIO_MMD_AN,
+                                             &autoneg_reg);
+
+               autoneg_reg &= MDIO_AN_STAT1_COMPLETE;
+               if (autoneg_reg == MDIO_AN_STAT1_COMPLETE) {
+                       break;
+               }
+       }
+
+       if (time_out == max_time_out) {
+               status = IXGBE_ERR_LINK_SETUP;
+               hw_dbg(hw, "ixgbe_setup_phy_link_generic: time out");
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_setup_phy_link_speed_generic - Sets the auto advertised capabilities
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if autonegotiation enabled
+ **/
+s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
+                                       ixgbe_link_speed speed,
+                                       bool autoneg,
+                                       bool autoneg_wait_to_complete)
+{
+
+       /*
+        * Clear autoneg_advertised and set new values based on input link
+        * speed.
+        */
+       hw->phy.autoneg_advertised = 0;
+
+       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;
+
+       if (speed & IXGBE_LINK_SPEED_1GB_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
+
+       if (speed & IXGBE_LINK_SPEED_100_FULL)
+               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_100_FULL;
+
+       /* Setup link based on the new speed settings */
+       hw->phy.ops.setup_link(hw);
+
+       return 0;
+}
+
+/**
+ * ixgbe_get_copper_link_capabilities_generic - Determines link capabilities
+ * @hw: pointer to hardware structure
+ * @speed: pointer to link speed
+ * @autoneg: boolean auto-negotiation value
+ *
+ * Determines the link capabilities by reading the AUTOC register.
+ */
+s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
+                                               ixgbe_link_speed *speed,
+                                               bool *autoneg)
+{
+       s32 status = IXGBE_ERR_LINK_SETUP;
+       u16 speed_ability;
+
+       *speed = 0;
+       *autoneg = true;
+
+       status = hw->phy.ops.read_reg(hw, MDIO_SPEED, MDIO_MMD_PMAPMD,
+                                     &speed_ability);
+
+       if (status == 0) {
+               if (speed_ability & MDIO_SPEED_10G)
+                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
+               if (speed_ability & MDIO_PMA_SPEED_1000)
+                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
+               if (speed_ability & MDIO_PMA_SPEED_100)
+                       *speed |= IXGBE_LINK_SPEED_100_FULL;
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_check_phy_link_tnx - Determine link and speed status
+ *  @hw: pointer to hardware structure
+ *
+ *  Reads the VS1 register to determine if link is up and the current speed for
+ *  the PHY.
+ **/
+s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
+                            bool *link_up)
+{
+       s32 status = 0;
+       u32 time_out;
+       u32 max_time_out = 10;
+       u16 phy_link = 0;
+       u16 phy_speed = 0;
+       u16 phy_data = 0;
+
+       /* Initialize speed and link to default case */
+       *link_up = false;
+       *speed = IXGBE_LINK_SPEED_10GB_FULL;
+
+       /*
+        * Check current speed and link status of the PHY register.
+        * This is a vendor specific register and may have to
+        * be changed for other copper PHYs.
+        */
+       for (time_out = 0; time_out < max_time_out; time_out++) {
+               udelay(10);
+               status = hw->phy.ops.read_reg(hw,
+                                             MDIO_STAT1,
+                                             MDIO_MMD_VEND1,
+                                             &phy_data);
+               phy_link = phy_data &
+                           IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS;
+               phy_speed = phy_data &
+                           IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS;
+               if (phy_link == IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS) {
+                       *link_up = true;
+                       if (phy_speed ==
+                           IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS)
+                               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+                       break;
+               }
+       }
+
+       return status;
+}
+
+/**
+ *     ixgbe_setup_phy_link_tnx - Set and restart autoneg
+ *     @hw: pointer to hardware structure
+ *
+ *     Restart autonegotiation and PHY and waits for completion.
+ **/
+s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
+{
+       s32 status = 0;
+       u32 time_out;
+       u32 max_time_out = 10;
+       u16 autoneg_reg = IXGBE_MII_AUTONEG_REG;
+       bool autoneg = false;
+       ixgbe_link_speed speed;
+
+       ixgbe_get_copper_link_capabilities_generic(hw, &speed, &autoneg);
+
+       if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
+               /* Set or unset auto-negotiation 10G advertisement */
+               hw->phy.ops.read_reg(hw, MDIO_AN_10GBT_CTRL,
+                                    MDIO_MMD_AN,
+                                    &autoneg_reg);
+
+               autoneg_reg &= ~MDIO_AN_10GBT_CTRL_ADV10G;
+               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
+                       autoneg_reg |= MDIO_AN_10GBT_CTRL_ADV10G;
+
+               hw->phy.ops.write_reg(hw, MDIO_AN_10GBT_CTRL,
+                                     MDIO_MMD_AN,
+                                     autoneg_reg);
+       }
+
+       if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
+               /* Set or unset auto-negotiation 1G advertisement */
+               hw->phy.ops.read_reg(hw, IXGBE_MII_AUTONEG_XNP_TX_REG,
+                                    MDIO_MMD_AN,
+                                    &autoneg_reg);
+
+               autoneg_reg &= ~IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX;
+               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
+                       autoneg_reg |= IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX;
+
+               hw->phy.ops.write_reg(hw, IXGBE_MII_AUTONEG_XNP_TX_REG,
+                                     MDIO_MMD_AN,
+                                     autoneg_reg);
+       }
+
+       if (speed & IXGBE_LINK_SPEED_100_FULL) {
+               /* Set or unset auto-negotiation 100M advertisement */
+               hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                    MDIO_MMD_AN,
+                                    &autoneg_reg);
+
+               autoneg_reg &= ~(ADVERTISE_100FULL |
+                                ADVERTISE_100HALF);
+               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
+                       autoneg_reg |= ADVERTISE_100FULL;
+
+               hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                     MDIO_MMD_AN,
+                                     autoneg_reg);
+       }
+
+       /* Restart PHY autonegotiation and wait for completion */
+       hw->phy.ops.read_reg(hw, MDIO_CTRL1,
+                            MDIO_MMD_AN, &autoneg_reg);
+
+       autoneg_reg |= MDIO_AN_CTRL1_RESTART;
+
+       hw->phy.ops.write_reg(hw, MDIO_CTRL1,
+                             MDIO_MMD_AN, autoneg_reg);
+
+       /* Wait for autonegotiation to finish */
+       for (time_out = 0; time_out < max_time_out; time_out++) {
+               udelay(10);
+               /* Restart PHY autonegotiation and wait for completion */
+               status = hw->phy.ops.read_reg(hw, MDIO_STAT1,
+                                             MDIO_MMD_AN,
+                                             &autoneg_reg);
+
+               autoneg_reg &= MDIO_AN_STAT1_COMPLETE;
+               if (autoneg_reg == MDIO_AN_STAT1_COMPLETE)
+                       break;
+       }
+
+       if (time_out == max_time_out) {
+               status = IXGBE_ERR_LINK_SETUP;
+               hw_dbg(hw, "ixgbe_setup_phy_link_tnx: time out");
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_get_phy_firmware_version_tnx - Gets the PHY Firmware Version
+ *  @hw: pointer to hardware structure
+ *  @firmware_version: pointer to the PHY Firmware Version
+ **/
+s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,
+                                      u16 *firmware_version)
+{
+       s32 status = 0;
+
+       status = hw->phy.ops.read_reg(hw, TNX_FW_REV,
+                                     MDIO_MMD_VEND1,
+                                     firmware_version);
+
+       return status;
+}
+
+/**
+ *  ixgbe_get_phy_firmware_version_generic - Gets the PHY Firmware Version
+ *  @hw: pointer to hardware structure
+ *  @firmware_version: pointer to the PHY Firmware Version
+ **/
+s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw,
+                                          u16 *firmware_version)
+{
+       s32 status = 0;
+
+       status = hw->phy.ops.read_reg(hw, AQ_FW_REV,
+                                     MDIO_MMD_VEND1,
+                                     firmware_version);
+
+       return status;
+}
+
+/**
+ *  ixgbe_reset_phy_nl - Performs a PHY reset
+ *  @hw: pointer to hardware structure
+ **/
+s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw)
+{
+       u16 phy_offset, control, eword, edata, block_crc;
+       bool end_data = false;
+       u16 list_offset, data_offset;
+       u16 phy_data = 0;
+       s32 ret_val = 0;
+       u32 i;
+
+       hw->phy.ops.read_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS, &phy_data);
+
+       /* reset the PHY and poll for completion */
+       hw->phy.ops.write_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS,
+                             (phy_data | MDIO_CTRL1_RESET));
+
+       for (i = 0; i < 100; i++) {
+               hw->phy.ops.read_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS,
+                                    &phy_data);
+               if ((phy_data & MDIO_CTRL1_RESET) == 0)
+                       break;
+               usleep_range(10000, 20000);
+       }
+
+       if ((phy_data & MDIO_CTRL1_RESET) != 0) {
+               hw_dbg(hw, "PHY reset did not complete.\n");
+               ret_val = IXGBE_ERR_PHY;
+               goto out;
+       }
+
+       /* Get init offsets */
+       ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,
+                                                     &data_offset);
+       if (ret_val != 0)
+               goto out;
+
+       ret_val = hw->eeprom.ops.read(hw, data_offset, &block_crc);
+       data_offset++;
+       while (!end_data) {
+               /*
+                * Read control word from PHY init contents offset
+                */
+               ret_val = hw->eeprom.ops.read(hw, data_offset, &eword);
+               control = (eword & IXGBE_CONTROL_MASK_NL) >>
+                          IXGBE_CONTROL_SHIFT_NL;
+               edata = eword & IXGBE_DATA_MASK_NL;
+               switch (control) {
+               case IXGBE_DELAY_NL:
+                       data_offset++;
+                       hw_dbg(hw, "DELAY: %d MS\n", edata);
+                       usleep_range(edata * 1000, edata * 2000);
+                       break;
+               case IXGBE_DATA_NL:
+                       hw_dbg(hw, "DATA:\n");
+                       data_offset++;
+                       hw->eeprom.ops.read(hw, data_offset++,
+                                           &phy_offset);
+                       for (i = 0; i < edata; i++) {
+                               hw->eeprom.ops.read(hw, data_offset, &eword);
+                               hw->phy.ops.write_reg(hw, phy_offset,
+                                                     MDIO_MMD_PMAPMD, eword);
+                               hw_dbg(hw, "Wrote %4.4x to %4.4x\n", eword,
+                                      phy_offset);
+                               data_offset++;
+                               phy_offset++;
+                       }
+                       break;
+               case IXGBE_CONTROL_NL:
+                       data_offset++;
+                       hw_dbg(hw, "CONTROL:\n");
+                       if (edata == IXGBE_CONTROL_EOL_NL) {
+                               hw_dbg(hw, "EOL\n");
+                               end_data = true;
+                       } else if (edata == IXGBE_CONTROL_SOL_NL) {
+                               hw_dbg(hw, "SOL\n");
+                       } else {
+                               hw_dbg(hw, "Bad control value\n");
+                               ret_val = IXGBE_ERR_PHY;
+                               goto out;
+                       }
+                       break;
+               default:
+                       hw_dbg(hw, "Bad control type\n");
+                       ret_val = IXGBE_ERR_PHY;
+                       goto out;
+               }
+       }
+
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_identify_sfp_module_generic - Identifies SFP modules
+ *  @hw: pointer to hardware structure
+ *
+ *  Searches for and identifies the SFP module and assigns appropriate PHY type.
+ **/
+s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
+{
+       s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
+       u32 vendor_oui = 0;
+       enum ixgbe_sfp_type stored_sfp_type = hw->phy.sfp_type;
+       u8 identifier = 0;
+       u8 comp_codes_1g = 0;
+       u8 comp_codes_10g = 0;
+       u8 oui_bytes[3] = {0, 0, 0};
+       u8 cable_tech = 0;
+       u8 cable_spec = 0;
+       u16 enforce_sfp = 0;
+
+       if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_fiber) {
+               hw->phy.sfp_type = ixgbe_sfp_type_not_present;
+               status = IXGBE_ERR_SFP_NOT_PRESENT;
+               goto out;
+       }
+
+       status = hw->phy.ops.read_i2c_eeprom(hw,
+                                            IXGBE_SFF_IDENTIFIER,
+                                            &identifier);
+
+       if (status == IXGBE_ERR_SWFW_SYNC ||
+           status == IXGBE_ERR_I2C ||
+           status == IXGBE_ERR_SFP_NOT_PRESENT)
+               goto err_read_i2c_eeprom;
+
+       /* LAN ID is needed for sfp_type determination */
+       hw->mac.ops.set_lan_id(hw);
+
+       if (identifier != IXGBE_SFF_IDENTIFIER_SFP) {
+               hw->phy.type = ixgbe_phy_sfp_unsupported;
+               status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+       } else {
+               status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                    IXGBE_SFF_1GBE_COMP_CODES,
+                                                    &comp_codes_1g);
+
+               if (status == IXGBE_ERR_SWFW_SYNC ||
+                   status == IXGBE_ERR_I2C ||
+                   status == IXGBE_ERR_SFP_NOT_PRESENT)
+                       goto err_read_i2c_eeprom;
+
+               status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                    IXGBE_SFF_10GBE_COMP_CODES,
+                                                    &comp_codes_10g);
+
+               if (status == IXGBE_ERR_SWFW_SYNC ||
+                   status == IXGBE_ERR_I2C ||
+                   status == IXGBE_ERR_SFP_NOT_PRESENT)
+                       goto err_read_i2c_eeprom;
+               status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                    IXGBE_SFF_CABLE_TECHNOLOGY,
+                                                    &cable_tech);
+
+               if (status == IXGBE_ERR_SWFW_SYNC ||
+                   status == IXGBE_ERR_I2C ||
+                   status == IXGBE_ERR_SFP_NOT_PRESENT)
+                       goto err_read_i2c_eeprom;
+
+                /* ID Module
+                 * =========
+                 * 0   SFP_DA_CU
+                 * 1   SFP_SR
+                 * 2   SFP_LR
+                 * 3   SFP_DA_CORE0 - 82599-specific
+                 * 4   SFP_DA_CORE1 - 82599-specific
+                 * 5   SFP_SR/LR_CORE0 - 82599-specific
+                 * 6   SFP_SR/LR_CORE1 - 82599-specific
+                 * 7   SFP_act_lmt_DA_CORE0 - 82599-specific
+                 * 8   SFP_act_lmt_DA_CORE1 - 82599-specific
+                 * 9   SFP_1g_cu_CORE0 - 82599-specific
+                 * 10  SFP_1g_cu_CORE1 - 82599-specific
+                 */
+               if (hw->mac.type == ixgbe_mac_82598EB) {
+                       if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
+                               hw->phy.sfp_type = ixgbe_sfp_type_da_cu;
+                       else if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
+                               hw->phy.sfp_type = ixgbe_sfp_type_sr;
+                       else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
+                               hw->phy.sfp_type = ixgbe_sfp_type_lr;
+                       else
+                               hw->phy.sfp_type = ixgbe_sfp_type_unknown;
+               } else if (hw->mac.type == ixgbe_mac_82599EB) {
+                       if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE) {
+                               if (hw->bus.lan_id == 0)
+                                       hw->phy.sfp_type =
+                                                    ixgbe_sfp_type_da_cu_core0;
+                               else
+                                       hw->phy.sfp_type =
+                                                    ixgbe_sfp_type_da_cu_core1;
+                       } else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE) {
+                               hw->phy.ops.read_i2c_eeprom(
+                                               hw, IXGBE_SFF_CABLE_SPEC_COMP,
+                                               &cable_spec);
+                               if (cable_spec &
+                                   IXGBE_SFF_DA_SPEC_ACTIVE_LIMITING) {
+                                       if (hw->bus.lan_id == 0)
+                                               hw->phy.sfp_type =
+                                               ixgbe_sfp_type_da_act_lmt_core0;
+                                       else
+                                               hw->phy.sfp_type =
+                                               ixgbe_sfp_type_da_act_lmt_core1;
+                               } else {
+                                       hw->phy.sfp_type =
+                                                       ixgbe_sfp_type_unknown;
+                               }
+                       } else if (comp_codes_10g &
+                                  (IXGBE_SFF_10GBASESR_CAPABLE |
+                                   IXGBE_SFF_10GBASELR_CAPABLE)) {
+                               if (hw->bus.lan_id == 0)
+                                       hw->phy.sfp_type =
+                                                     ixgbe_sfp_type_srlr_core0;
+                               else
+                                       hw->phy.sfp_type =
+                                                     ixgbe_sfp_type_srlr_core1;
+                       } else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE) {
+                               if (hw->bus.lan_id == 0)
+                                       hw->phy.sfp_type =
+                                               ixgbe_sfp_type_1g_cu_core0;
+                               else
+                                       hw->phy.sfp_type =
+                                               ixgbe_sfp_type_1g_cu_core1;
+                       } else {
+                               hw->phy.sfp_type = ixgbe_sfp_type_unknown;
+                       }
+               }
+
+               if (hw->phy.sfp_type != stored_sfp_type)
+                       hw->phy.sfp_setup_needed = true;
+
+               /* Determine if the SFP+ PHY is dual speed or not. */
+               hw->phy.multispeed_fiber = false;
+               if (((comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) &&
+                  (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)) ||
+                  ((comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) &&
+                  (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)))
+                       hw->phy.multispeed_fiber = true;
+
+               /* Determine PHY vendor */
+               if (hw->phy.type != ixgbe_phy_nl) {
+                       hw->phy.id = identifier;
+                       status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                   IXGBE_SFF_VENDOR_OUI_BYTE0,
+                                                   &oui_bytes[0]);
+
+                       if (status == IXGBE_ERR_SWFW_SYNC ||
+                           status == IXGBE_ERR_I2C ||
+                           status == IXGBE_ERR_SFP_NOT_PRESENT)
+                               goto err_read_i2c_eeprom;
+
+                       status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                   IXGBE_SFF_VENDOR_OUI_BYTE1,
+                                                   &oui_bytes[1]);
+
+                       if (status == IXGBE_ERR_SWFW_SYNC ||
+                           status == IXGBE_ERR_I2C ||
+                           status == IXGBE_ERR_SFP_NOT_PRESENT)
+                               goto err_read_i2c_eeprom;
+
+                       status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                   IXGBE_SFF_VENDOR_OUI_BYTE2,
+                                                   &oui_bytes[2]);
+
+                       if (status == IXGBE_ERR_SWFW_SYNC ||
+                           status == IXGBE_ERR_I2C ||
+                           status == IXGBE_ERR_SFP_NOT_PRESENT)
+                               goto err_read_i2c_eeprom;
+
+                       vendor_oui =
+                         ((oui_bytes[0] << IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT) |
+                          (oui_bytes[1] << IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT) |
+                          (oui_bytes[2] << IXGBE_SFF_VENDOR_OUI_BYTE2_SHIFT));
+
+                       switch (vendor_oui) {
+                       case IXGBE_SFF_VENDOR_OUI_TYCO:
+                               if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
+                                       hw->phy.type =
+                                                   ixgbe_phy_sfp_passive_tyco;
+                               break;
+                       case IXGBE_SFF_VENDOR_OUI_FTL:
+                               if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
+                                       hw->phy.type = ixgbe_phy_sfp_ftl_active;
+                               else
+                                       hw->phy.type = ixgbe_phy_sfp_ftl;
+                               break;
+                       case IXGBE_SFF_VENDOR_OUI_AVAGO:
+                               hw->phy.type = ixgbe_phy_sfp_avago;
+                               break;
+                       case IXGBE_SFF_VENDOR_OUI_INTEL:
+                               hw->phy.type = ixgbe_phy_sfp_intel;
+                               break;
+                       default:
+                               if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
+                                       hw->phy.type =
+                                                ixgbe_phy_sfp_passive_unknown;
+                               else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
+                                       hw->phy.type =
+                                               ixgbe_phy_sfp_active_unknown;
+                               else
+                                       hw->phy.type = ixgbe_phy_sfp_unknown;
+                               break;
+                       }
+               }
+
+               /* Allow any DA cable vendor */
+               if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |
+                   IXGBE_SFF_DA_ACTIVE_CABLE)) {
+                       status = 0;
+                       goto out;
+               }
+
+               /* Verify supported 1G SFP modules */
+               if (comp_codes_10g == 0 &&
+                   !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+                     hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0)) {
+                       hw->phy.type = ixgbe_phy_sfp_unsupported;
+                       status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+                       goto out;
+               }
+
+               /* Anything else 82598-based is supported */
+               if (hw->mac.type == ixgbe_mac_82598EB) {
+                       status = 0;
+                       goto out;
+               }
+
+               hw->mac.ops.get_device_caps(hw, &enforce_sfp);
+               if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&
+                   !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||
+                     (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1))) {
+                       /* Make sure we're a supported PHY type */
+                       if (hw->phy.type == ixgbe_phy_sfp_intel) {
+                               status = 0;
+                       } else {
+                               hw_dbg(hw, "SFP+ module not supported\n");
+                               hw->phy.type = ixgbe_phy_sfp_unsupported;
+                               status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+                       }
+               } else {
+                       status = 0;
+               }
+       }
+
+out:
+       return status;
+
+err_read_i2c_eeprom:
+       hw->phy.sfp_type = ixgbe_sfp_type_not_present;
+       if (hw->phy.type != ixgbe_phy_nl) {
+               hw->phy.id = 0;
+               hw->phy.type = ixgbe_phy_unknown;
+       }
+       return IXGBE_ERR_SFP_NOT_PRESENT;
+}
+
+/**
+ *  ixgbe_get_sfp_init_sequence_offsets - Provides offset of PHY init sequence
+ *  @hw: pointer to hardware structure
+ *  @list_offset: offset to the SFP ID list
+ *  @data_offset: offset to the SFP data block
+ *
+ *  Checks the MAC's EEPROM to see if it supports a given SFP+ module type, if
+ *  so it returns the offsets to the phy init sequence block.
+ **/
+s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
+                                        u16 *list_offset,
+                                        u16 *data_offset)
+{
+       u16 sfp_id;
+       u16 sfp_type = hw->phy.sfp_type;
+
+       if (hw->phy.sfp_type == ixgbe_sfp_type_unknown)
+               return IXGBE_ERR_SFP_NOT_SUPPORTED;
+
+       if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
+               return IXGBE_ERR_SFP_NOT_PRESENT;
+
+       if ((hw->device_id == IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM) &&
+           (hw->phy.sfp_type == ixgbe_sfp_type_da_cu))
+               return IXGBE_ERR_SFP_NOT_SUPPORTED;
+
+       /*
+        * Limiting active cables and 1G Phys must be initialized as
+        * SR modules
+        */
+       if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
+           sfp_type == ixgbe_sfp_type_1g_cu_core0)
+               sfp_type = ixgbe_sfp_type_srlr_core0;
+       else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
+                sfp_type == ixgbe_sfp_type_1g_cu_core1)
+               sfp_type = ixgbe_sfp_type_srlr_core1;
+
+       /* Read offset to PHY init contents */
+       hw->eeprom.ops.read(hw, IXGBE_PHY_INIT_OFFSET_NL, list_offset);
+
+       if ((!*list_offset) || (*list_offset == 0xFFFF))
+               return IXGBE_ERR_SFP_NO_INIT_SEQ_PRESENT;
+
+       /* Shift offset to first ID word */
+       (*list_offset)++;
+
+       /*
+        * Find the matching SFP ID in the EEPROM
+        * and program the init sequence
+        */
+       hw->eeprom.ops.read(hw, *list_offset, &sfp_id);
+
+       while (sfp_id != IXGBE_PHY_INIT_END_NL) {
+               if (sfp_id == sfp_type) {
+                       (*list_offset)++;
+                       hw->eeprom.ops.read(hw, *list_offset, data_offset);
+                       if ((!*data_offset) || (*data_offset == 0xFFFF)) {
+                               hw_dbg(hw, "SFP+ module not supported\n");
+                               return IXGBE_ERR_SFP_NOT_SUPPORTED;
+                       } else {
+                               break;
+                       }
+               } else {
+                       (*list_offset) += 2;
+                       if (hw->eeprom.ops.read(hw, *list_offset, &sfp_id))
+                               return IXGBE_ERR_PHY;
+               }
+       }
+
+       if (sfp_id == IXGBE_PHY_INIT_END_NL) {
+               hw_dbg(hw, "No matching SFP+ module found\n");
+               return IXGBE_ERR_SFP_NOT_SUPPORTED;
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_read_i2c_eeprom_generic - Reads 8 bit EEPROM word over I2C interface
+ *  @hw: pointer to hardware structure
+ *  @byte_offset: EEPROM byte offset to read
+ *  @eeprom_data: value read
+ *
+ *  Performs byte read operation to SFP module's EEPROM over I2C interface.
+ **/
+s32 ixgbe_read_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                  u8 *eeprom_data)
+{
+       return hw->phy.ops.read_i2c_byte(hw, byte_offset,
+                                        IXGBE_I2C_EEPROM_DEV_ADDR,
+                                        eeprom_data);
+}
+
+/**
+ *  ixgbe_write_i2c_eeprom_generic - Writes 8 bit EEPROM word over I2C interface
+ *  @hw: pointer to hardware structure
+ *  @byte_offset: EEPROM byte offset to write
+ *  @eeprom_data: value to write
+ *
+ *  Performs byte write operation to SFP module's EEPROM over I2C interface.
+ **/
+s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                   u8 eeprom_data)
+{
+       return hw->phy.ops.write_i2c_byte(hw, byte_offset,
+                                         IXGBE_I2C_EEPROM_DEV_ADDR,
+                                         eeprom_data);
+}
+
+/**
+ *  ixgbe_read_i2c_byte_generic - Reads 8 bit word over I2C
+ *  @hw: pointer to hardware structure
+ *  @byte_offset: byte offset to read
+ *  @data: value read
+ *
+ *  Performs byte read operation to SFP module's EEPROM over I2C interface at
+ *  a specified deivce address.
+ **/
+s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                u8 dev_addr, u8 *data)
+{
+       s32 status = 0;
+       u32 max_retry = 10;
+       u32 retry = 0;
+       u16 swfw_mask = 0;
+       bool nack = 1;
+
+       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
+               swfw_mask = IXGBE_GSSR_PHY1_SM;
+       else
+               swfw_mask = IXGBE_GSSR_PHY0_SM;
+
+       do {
+               if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask) != 0) {
+                       status = IXGBE_ERR_SWFW_SYNC;
+                       goto read_byte_out;
+               }
+
+               ixgbe_i2c_start(hw);
+
+               /* Device Address and write indication */
+               status = ixgbe_clock_out_i2c_byte(hw, dev_addr);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_get_i2c_ack(hw);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_clock_out_i2c_byte(hw, byte_offset);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_get_i2c_ack(hw);
+               if (status != 0)
+                       goto fail;
+
+               ixgbe_i2c_start(hw);
+
+               /* Device Address and read indication */
+               status = ixgbe_clock_out_i2c_byte(hw, (dev_addr | 0x1));
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_get_i2c_ack(hw);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_clock_in_i2c_byte(hw, data);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_clock_out_i2c_bit(hw, nack);
+               if (status != 0)
+                       goto fail;
+
+               ixgbe_i2c_stop(hw);
+               break;
+
+fail:
+               hw->mac.ops.release_swfw_sync(hw, swfw_mask);
+               msleep(100);
+               ixgbe_i2c_bus_clear(hw);
+               retry++;
+               if (retry < max_retry)
+                       hw_dbg(hw, "I2C byte read error - Retrying.\n");
+               else
+                       hw_dbg(hw, "I2C byte read error.\n");
+
+       } while (retry < max_retry);
+
+       hw->mac.ops.release_swfw_sync(hw, swfw_mask);
+
+read_byte_out:
+       return status;
+}
+
+/**
+ *  ixgbe_write_i2c_byte_generic - Writes 8 bit word over I2C
+ *  @hw: pointer to hardware structure
+ *  @byte_offset: byte offset to write
+ *  @data: value to write
+ *
+ *  Performs byte write operation to SFP module's EEPROM over I2C interface at
+ *  a specified device address.
+ **/
+s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                 u8 dev_addr, u8 data)
+{
+       s32 status = 0;
+       u32 max_retry = 1;
+       u32 retry = 0;
+       u16 swfw_mask = 0;
+
+       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
+               swfw_mask = IXGBE_GSSR_PHY1_SM;
+       else
+               swfw_mask = IXGBE_GSSR_PHY0_SM;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask) != 0) {
+               status = IXGBE_ERR_SWFW_SYNC;
+               goto write_byte_out;
+       }
+
+       do {
+               ixgbe_i2c_start(hw);
+
+               status = ixgbe_clock_out_i2c_byte(hw, dev_addr);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_get_i2c_ack(hw);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_clock_out_i2c_byte(hw, byte_offset);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_get_i2c_ack(hw);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_clock_out_i2c_byte(hw, data);
+               if (status != 0)
+                       goto fail;
+
+               status = ixgbe_get_i2c_ack(hw);
+               if (status != 0)
+                       goto fail;
+
+               ixgbe_i2c_stop(hw);
+               break;
+
+fail:
+               ixgbe_i2c_bus_clear(hw);
+               retry++;
+               if (retry < max_retry)
+                       hw_dbg(hw, "I2C byte write error - Retrying.\n");
+               else
+                       hw_dbg(hw, "I2C byte write error.\n");
+       } while (retry < max_retry);
+
+       hw->mac.ops.release_swfw_sync(hw, swfw_mask);
+
+write_byte_out:
+       return status;
+}
+
+/**
+ *  ixgbe_i2c_start - Sets I2C start condition
+ *  @hw: pointer to hardware structure
+ *
+ *  Sets I2C start condition (High -> Low on SDA while SCL is High)
+ **/
+static void ixgbe_i2c_start(struct ixgbe_hw *hw)
+{
+       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+
+       /* Start condition must begin with data and clock high */
+       ixgbe_set_i2c_data(hw, &i2cctl, 1);
+       ixgbe_raise_i2c_clk(hw, &i2cctl);
+
+       /* Setup time for start condition (4.7us) */
+       udelay(IXGBE_I2C_T_SU_STA);
+
+       ixgbe_set_i2c_data(hw, &i2cctl, 0);
+
+       /* Hold time for start condition (4us) */
+       udelay(IXGBE_I2C_T_HD_STA);
+
+       ixgbe_lower_i2c_clk(hw, &i2cctl);
+
+       /* Minimum low period of clock is 4.7 us */
+       udelay(IXGBE_I2C_T_LOW);
+
+}
+
+/**
+ *  ixgbe_i2c_stop - Sets I2C stop condition
+ *  @hw: pointer to hardware structure
+ *
+ *  Sets I2C stop condition (Low -> High on SDA while SCL is High)
+ **/
+static void ixgbe_i2c_stop(struct ixgbe_hw *hw)
+{
+       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+
+       /* Stop condition must begin with data low and clock high */
+       ixgbe_set_i2c_data(hw, &i2cctl, 0);
+       ixgbe_raise_i2c_clk(hw, &i2cctl);
+
+       /* Setup time for stop condition (4us) */
+       udelay(IXGBE_I2C_T_SU_STO);
+
+       ixgbe_set_i2c_data(hw, &i2cctl, 1);
+
+       /* bus free time between stop and start (4.7us)*/
+       udelay(IXGBE_I2C_T_BUF);
+}
+
+/**
+ *  ixgbe_clock_in_i2c_byte - Clocks in one byte via I2C
+ *  @hw: pointer to hardware structure
+ *  @data: data byte to clock in
+ *
+ *  Clocks in one byte data via I2C data/clock
+ **/
+static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)
+{
+       s32 status = 0;
+       s32 i;
+       bool bit = 0;
+
+       for (i = 7; i >= 0; i--) {
+               status = ixgbe_clock_in_i2c_bit(hw, &bit);
+               *data |= bit << i;
+
+               if (status != 0)
+                       break;
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_clock_out_i2c_byte - Clocks out one byte via I2C
+ *  @hw: pointer to hardware structure
+ *  @data: data byte clocked out
+ *
+ *  Clocks out one byte data via I2C data/clock
+ **/
+static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data)
+{
+       s32 status = 0;
+       s32 i;
+       u32 i2cctl;
+       bool bit = 0;
+
+       for (i = 7; i >= 0; i--) {
+               bit = (data >> i) & 0x1;
+               status = ixgbe_clock_out_i2c_bit(hw, bit);
+
+               if (status != 0)
+                       break;
+       }
+
+       /* Release SDA line (set high) */
+       i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+       i2cctl |= IXGBE_I2C_DATA_OUT;
+       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, i2cctl);
+
+       return status;
+}
+
+/**
+ *  ixgbe_get_i2c_ack - Polls for I2C ACK
+ *  @hw: pointer to hardware structure
+ *
+ *  Clocks in/out one bit via I2C data/clock
+ **/
+static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)
+{
+       s32 status;
+       u32 i = 0;
+       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+       u32 timeout = 10;
+       bool ack = 1;
+
+       status = ixgbe_raise_i2c_clk(hw, &i2cctl);
+
+       if (status != 0)
+               goto out;
+
+       /* Minimum high period of clock is 4us */
+       udelay(IXGBE_I2C_T_HIGH);
+
+       /* Poll for ACK.  Note that ACK in I2C spec is
+        * transition from 1 to 0 */
+       for (i = 0; i < timeout; i++) {
+               i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+               ack = ixgbe_get_i2c_data(&i2cctl);
+
+               udelay(1);
+               if (ack == 0)
+                       break;
+       }
+
+       if (ack == 1) {
+               hw_dbg(hw, "I2C ack was not received.\n");
+               status = IXGBE_ERR_I2C;
+       }
+
+       ixgbe_lower_i2c_clk(hw, &i2cctl);
+
+       /* Minimum low period of clock is 4.7 us */
+       udelay(IXGBE_I2C_T_LOW);
+
+out:
+       return status;
+}
+
+/**
+ *  ixgbe_clock_in_i2c_bit - Clocks in one bit via I2C data/clock
+ *  @hw: pointer to hardware structure
+ *  @data: read data value
+ *
+ *  Clocks in one bit via I2C data/clock
+ **/
+static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data)
+{
+       s32 status;
+       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+
+       status = ixgbe_raise_i2c_clk(hw, &i2cctl);
+
+       /* Minimum high period of clock is 4us */
+       udelay(IXGBE_I2C_T_HIGH);
+
+       i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+       *data = ixgbe_get_i2c_data(&i2cctl);
+
+       ixgbe_lower_i2c_clk(hw, &i2cctl);
+
+       /* Minimum low period of clock is 4.7 us */
+       udelay(IXGBE_I2C_T_LOW);
+
+       return status;
+}
+
+/**
+ *  ixgbe_clock_out_i2c_bit - Clocks in/out one bit via I2C data/clock
+ *  @hw: pointer to hardware structure
+ *  @data: data value to write
+ *
+ *  Clocks out one bit via I2C data/clock
+ **/
+static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data)
+{
+       s32 status;
+       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+
+       status = ixgbe_set_i2c_data(hw, &i2cctl, data);
+       if (status == 0) {
+               status = ixgbe_raise_i2c_clk(hw, &i2cctl);
+
+               /* Minimum high period of clock is 4us */
+               udelay(IXGBE_I2C_T_HIGH);
+
+               ixgbe_lower_i2c_clk(hw, &i2cctl);
+
+               /* Minimum low period of clock is 4.7 us.
+                * This also takes care of the data hold time.
+                */
+               udelay(IXGBE_I2C_T_LOW);
+       } else {
+               status = IXGBE_ERR_I2C;
+               hw_dbg(hw, "I2C data was not set to %X\n", data);
+       }
+
+       return status;
+}
+/**
+ *  ixgbe_raise_i2c_clk - Raises the I2C SCL clock
+ *  @hw: pointer to hardware structure
+ *  @i2cctl: Current value of I2CCTL register
+ *
+ *  Raises the I2C clock line '0'->'1'
+ **/
+static s32 ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
+{
+       s32 status = 0;
+
+       *i2cctl |= IXGBE_I2C_CLK_OUT;
+
+       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* SCL rise time (1000ns) */
+       udelay(IXGBE_I2C_T_RISE);
+
+       return status;
+}
+
+/**
+ *  ixgbe_lower_i2c_clk - Lowers the I2C SCL clock
+ *  @hw: pointer to hardware structure
+ *  @i2cctl: Current value of I2CCTL register
+ *
+ *  Lowers the I2C clock line '1'->'0'
+ **/
+static void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
+{
+
+       *i2cctl &= ~IXGBE_I2C_CLK_OUT;
+
+       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* SCL fall time (300ns) */
+       udelay(IXGBE_I2C_T_FALL);
+}
+
+/**
+ *  ixgbe_set_i2c_data - Sets the I2C data bit
+ *  @hw: pointer to hardware structure
+ *  @i2cctl: Current value of I2CCTL register
+ *  @data: I2C data value (0 or 1) to set
+ *
+ *  Sets the I2C data bit
+ **/
+static s32 ixgbe_set_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl, bool data)
+{
+       s32 status = 0;
+
+       if (data)
+               *i2cctl |= IXGBE_I2C_DATA_OUT;
+       else
+               *i2cctl &= ~IXGBE_I2C_DATA_OUT;
+
+       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Data rise/fall (1000ns/300ns) and set-up time (250ns) */
+       udelay(IXGBE_I2C_T_RISE + IXGBE_I2C_T_FALL + IXGBE_I2C_T_SU_DATA);
+
+       /* Verify data was set correctly */
+       *i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+       if (data != ixgbe_get_i2c_data(i2cctl)) {
+               status = IXGBE_ERR_I2C;
+               hw_dbg(hw, "Error - I2C data was not set to %X.\n", data);
+       }
+
+       return status;
+}
+
+/**
+ *  ixgbe_get_i2c_data - Reads the I2C SDA data bit
+ *  @hw: pointer to hardware structure
+ *  @i2cctl: Current value of I2CCTL register
+ *
+ *  Returns the I2C data bit value
+ **/
+static bool ixgbe_get_i2c_data(u32 *i2cctl)
+{
+       bool data;
+
+       if (*i2cctl & IXGBE_I2C_DATA_IN)
+               data = 1;
+       else
+               data = 0;
+
+       return data;
+}
+
+/**
+ *  ixgbe_i2c_bus_clear - Clears the I2C bus
+ *  @hw: pointer to hardware structure
+ *
+ *  Clears the I2C bus by sending nine clock pulses.
+ *  Used when data line is stuck low.
+ **/
+static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw)
+{
+       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+       u32 i;
+
+       ixgbe_i2c_start(hw);
+
+       ixgbe_set_i2c_data(hw, &i2cctl, 1);
+
+       for (i = 0; i < 9; i++) {
+               ixgbe_raise_i2c_clk(hw, &i2cctl);
+
+               /* Min high period of clock is 4us */
+               udelay(IXGBE_I2C_T_HIGH);
+
+               ixgbe_lower_i2c_clk(hw, &i2cctl);
+
+               /* Min low period of clock is 4.7us*/
+               udelay(IXGBE_I2C_T_LOW);
+       }
+
+       ixgbe_i2c_start(hw);
+
+       /* Put the i2c bus back to default state */
+       ixgbe_i2c_stop(hw);
+}
+
+/**
+ *  ixgbe_tn_check_overtemp - Checks if an overtemp occurred.
+ *  @hw: pointer to hardware structure
+ *
+ *  Checks if the LASI temp alarm status was triggered due to overtemp
+ **/
+s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw)
+{
+       s32 status = 0;
+       u16 phy_data = 0;
+
+       if (hw->device_id != IXGBE_DEV_ID_82599_T3_LOM)
+               goto out;
+
+       /* Check that the LASI temp alarm status was triggered */
+       hw->phy.ops.read_reg(hw, IXGBE_TN_LASI_STATUS_REG,
+                            MDIO_MMD_PMAPMD, &phy_data);
+
+       if (!(phy_data & IXGBE_TN_LASI_STATUS_TEMP_ALARM))
+               goto out;
+
+       status = IXGBE_ERR_OVERTEMP;
+out:
+       return status;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
new file mode 100644 (file)
index 0000000..197bdd1
--- /dev/null
@@ -0,0 +1,131 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_PHY_H_
+#define _IXGBE_PHY_H_
+
+#include "ixgbe_type.h"
+#define IXGBE_I2C_EEPROM_DEV_ADDR    0xA0
+
+/* EEPROM byte offsets */
+#define IXGBE_SFF_IDENTIFIER         0x0
+#define IXGBE_SFF_IDENTIFIER_SFP     0x3
+#define IXGBE_SFF_VENDOR_OUI_BYTE0   0x25
+#define IXGBE_SFF_VENDOR_OUI_BYTE1   0x26
+#define IXGBE_SFF_VENDOR_OUI_BYTE2   0x27
+#define IXGBE_SFF_1GBE_COMP_CODES    0x6
+#define IXGBE_SFF_10GBE_COMP_CODES   0x3
+#define IXGBE_SFF_CABLE_TECHNOLOGY   0x8
+#define IXGBE_SFF_CABLE_SPEC_COMP    0x3C
+
+/* Bitmasks */
+#define IXGBE_SFF_DA_PASSIVE_CABLE           0x4
+#define IXGBE_SFF_DA_ACTIVE_CABLE            0x8
+#define IXGBE_SFF_DA_SPEC_ACTIVE_LIMITING    0x4
+#define IXGBE_SFF_1GBASESX_CAPABLE           0x1
+#define IXGBE_SFF_1GBASELX_CAPABLE           0x2
+#define IXGBE_SFF_1GBASET_CAPABLE            0x8
+#define IXGBE_SFF_10GBASESR_CAPABLE          0x10
+#define IXGBE_SFF_10GBASELR_CAPABLE          0x20
+#define IXGBE_I2C_EEPROM_READ_MASK           0x100
+#define IXGBE_I2C_EEPROM_STATUS_MASK         0x3
+#define IXGBE_I2C_EEPROM_STATUS_NO_OPERATION 0x0
+#define IXGBE_I2C_EEPROM_STATUS_PASS         0x1
+#define IXGBE_I2C_EEPROM_STATUS_FAIL         0x2
+#define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS  0x3
+
+/* Flow control defines */
+#define IXGBE_TAF_SYM_PAUSE                  0x400
+#define IXGBE_TAF_ASM_PAUSE                  0x800
+
+/* Bit-shift macros */
+#define IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT    24
+#define IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT    16
+#define IXGBE_SFF_VENDOR_OUI_BYTE2_SHIFT    8
+
+/* Vendor OUIs: format of OUI is 0x[byte0][byte1][byte2][00] */
+#define IXGBE_SFF_VENDOR_OUI_TYCO     0x00407600
+#define IXGBE_SFF_VENDOR_OUI_FTL      0x00906500
+#define IXGBE_SFF_VENDOR_OUI_AVAGO    0x00176A00
+#define IXGBE_SFF_VENDOR_OUI_INTEL    0x001B2100
+
+/* I2C SDA and SCL timing parameters for standard mode */
+#define IXGBE_I2C_T_HD_STA  4
+#define IXGBE_I2C_T_LOW     5
+#define IXGBE_I2C_T_HIGH    4
+#define IXGBE_I2C_T_SU_STA  5
+#define IXGBE_I2C_T_HD_DATA 5
+#define IXGBE_I2C_T_SU_DATA 1
+#define IXGBE_I2C_T_RISE    1
+#define IXGBE_I2C_T_FALL    1
+#define IXGBE_I2C_T_SU_STO  4
+#define IXGBE_I2C_T_BUF     5
+
+#define IXGBE_TN_LASI_STATUS_REG        0x9005
+#define IXGBE_TN_LASI_STATUS_TEMP_ALARM 0x0008
+
+s32 ixgbe_init_phy_ops_generic(struct ixgbe_hw *hw);
+s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw);
+s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw);
+s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
+                               u32 device_type, u16 *phy_data);
+s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
+                                u32 device_type, u16 phy_data);
+s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw);
+s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
+                                       ixgbe_link_speed speed,
+                                       bool autoneg,
+                                       bool autoneg_wait_to_complete);
+s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
+                                               ixgbe_link_speed *speed,
+                                               bool *autoneg);
+
+/* PHY specific */
+s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw,
+                             ixgbe_link_speed *speed,
+                             bool *link_up);
+s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw);
+s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,
+                                       u16 *firmware_version);
+s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw,
+                                           u16 *firmware_version);
+
+s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw);
+s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw);
+s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
+                                        u16 *list_offset,
+                                        u16 *data_offset);
+s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw);
+s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                u8 dev_addr, u8 *data);
+s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                 u8 dev_addr, u8 data);
+s32 ixgbe_read_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                  u8 *eeprom_data);
+s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
+                                   u8 eeprom_data);
+#endif /* _IXGBE_PHY_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
new file mode 100644 (file)
index 0000000..d99d01e
--- /dev/null
@@ -0,0 +1,687 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+#include <linux/string.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/ipv6.h>
+#ifdef NETIF_F_HW_VLAN_TX
+#include <linux/if_vlan.h>
+#endif
+
+#include "ixgbe.h"
+
+#include "ixgbe_sriov.h"
+
+static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
+                                  int entries, u16 *hash_list, u32 vf)
+{
+       struct vf_data_storage *vfinfo = &adapter->vfinfo[vf];
+       struct ixgbe_hw *hw = &adapter->hw;
+       int i;
+       u32 vector_bit;
+       u32 vector_reg;
+       u32 mta_reg;
+
+       /* only so many hash values supported */
+       entries = min(entries, IXGBE_MAX_VF_MC_ENTRIES);
+
+       /*
+        * salt away the number of multi cast addresses assigned
+        * to this VF for later use to restore when the PF multi cast
+        * list changes
+        */
+       vfinfo->num_vf_mc_hashes = entries;
+
+       /*
+        * VFs are limited to using the MTA hash table for their multicast
+        * addresses
+        */
+       for (i = 0; i < entries; i++) {
+               vfinfo->vf_mc_hashes[i] = hash_list[i];
+       }
+
+       for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
+               vector_reg = (vfinfo->vf_mc_hashes[i] >> 5) & 0x7F;
+               vector_bit = vfinfo->vf_mc_hashes[i] & 0x1F;
+               mta_reg = IXGBE_READ_REG(hw, IXGBE_MTA(vector_reg));
+               mta_reg |= (1 << vector_bit);
+               IXGBE_WRITE_REG(hw, IXGBE_MTA(vector_reg), mta_reg);
+       }
+
+       return 0;
+}
+
+static void ixgbe_restore_vf_macvlans(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct list_head *pos;
+       struct vf_macvlans *entry;
+
+       list_for_each(pos, &adapter->vf_mvs.l) {
+               entry = list_entry(pos, struct vf_macvlans, l);
+               if (entry->free == false)
+                       hw->mac.ops.set_rar(hw, entry->rar_entry,
+                                           entry->vf_macvlan,
+                                           entry->vf, IXGBE_RAH_AV);
+       }
+}
+
+void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct vf_data_storage *vfinfo;
+       int i, j;
+       u32 vector_bit;
+       u32 vector_reg;
+       u32 mta_reg;
+
+       for (i = 0; i < adapter->num_vfs; i++) {
+               vfinfo = &adapter->vfinfo[i];
+               for (j = 0; j < vfinfo->num_vf_mc_hashes; j++) {
+                       hw->addr_ctrl.mta_in_use++;
+                       vector_reg = (vfinfo->vf_mc_hashes[j] >> 5) & 0x7F;
+                       vector_bit = vfinfo->vf_mc_hashes[j] & 0x1F;
+                       mta_reg = IXGBE_READ_REG(hw, IXGBE_MTA(vector_reg));
+                       mta_reg |= (1 << vector_bit);
+                       IXGBE_WRITE_REG(hw, IXGBE_MTA(vector_reg), mta_reg);
+               }
+       }
+
+       /* Restore any VF macvlans */
+       ixgbe_restore_vf_macvlans(adapter);
+}
+
+static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid,
+                            u32 vf)
+{
+       return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add);
+}
+
+static void ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 *msgbuf)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int new_mtu = msgbuf[1];
+       u32 max_frs;
+       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+
+       /* Only X540 supports jumbo frames in IOV mode */
+       if (adapter->hw.mac.type != ixgbe_mac_X540)
+               return;
+
+       /* MTU < 68 is an error and causes problems on some kernels */
+       if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE)) {
+               e_err(drv, "VF mtu %d out of range\n", new_mtu);
+               return;
+       }
+
+       max_frs = (IXGBE_READ_REG(hw, IXGBE_MAXFRS) &
+                  IXGBE_MHADD_MFS_MASK) >> IXGBE_MHADD_MFS_SHIFT;
+       if (max_frs < new_mtu) {
+               max_frs = new_mtu << IXGBE_MHADD_MFS_SHIFT;
+               IXGBE_WRITE_REG(hw, IXGBE_MAXFRS, max_frs);
+       }
+
+       e_info(hw, "VF requests change max MTU to %d\n", new_mtu);
+}
+
+static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
+{
+       u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
+       vmolr |= (IXGBE_VMOLR_ROMPE |
+                 IXGBE_VMOLR_BAM);
+       if (aupe)
+               vmolr |= IXGBE_VMOLR_AUPE;
+       else
+               vmolr &= ~IXGBE_VMOLR_AUPE;
+       IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+}
+
+static void ixgbe_set_vmvir(struct ixgbe_adapter *adapter, u32 vid, u32 vf)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       if (vid)
+               IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf),
+                               (vid | IXGBE_VMVIR_VLANA_DEFAULT));
+       else
+               IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf), 0);
+}
+
+static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int rar_entry = hw->mac.num_rar_entries - (vf + 1);
+
+       /* reset offloads to defaults */
+       if (adapter->vfinfo[vf].pf_vlan) {
+               ixgbe_set_vf_vlan(adapter, true,
+                                 adapter->vfinfo[vf].pf_vlan, vf);
+               ixgbe_set_vmvir(adapter,
+                               (adapter->vfinfo[vf].pf_vlan |
+                                (adapter->vfinfo[vf].pf_qos <<
+                                 VLAN_PRIO_SHIFT)), vf);
+               ixgbe_set_vmolr(hw, vf, false);
+       } else {
+               ixgbe_set_vmvir(adapter, 0, vf);
+               ixgbe_set_vmolr(hw, vf, true);
+       }
+
+       /* reset multicast table array for vf */
+       adapter->vfinfo[vf].num_vf_mc_hashes = 0;
+
+       /* Flush and reset the mta with the new values */
+       ixgbe_set_rx_mode(adapter->netdev);
+
+       hw->mac.ops.clear_rar(hw, rar_entry);
+}
+
+static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
+                           int vf, unsigned char *mac_addr)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int rar_entry = hw->mac.num_rar_entries - (vf + 1);
+
+       memcpy(adapter->vfinfo[vf].vf_mac_addresses, mac_addr, 6);
+       hw->mac.ops.set_rar(hw, rar_entry, mac_addr, vf, IXGBE_RAH_AV);
+
+       return 0;
+}
+
+static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter,
+                               int vf, int index, unsigned char *mac_addr)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct list_head *pos;
+       struct vf_macvlans *entry;
+
+       if (index <= 1) {
+               list_for_each(pos, &adapter->vf_mvs.l) {
+                       entry = list_entry(pos, struct vf_macvlans, l);
+                       if (entry->vf == vf) {
+                               entry->vf = -1;
+                               entry->free = true;
+                               entry->is_macvlan = false;
+                               hw->mac.ops.clear_rar(hw, entry->rar_entry);
+                       }
+               }
+       }
+
+       /*
+        * If index was zero then we were asked to clear the uc list
+        * for the VF.  We're done.
+        */
+       if (!index)
+               return 0;
+
+       entry = NULL;
+
+       list_for_each(pos, &adapter->vf_mvs.l) {
+               entry = list_entry(pos, struct vf_macvlans, l);
+               if (entry->free)
+                       break;
+       }
+
+       /*
+        * If we traversed the entire list and didn't find a free entry
+        * then we're out of space on the RAR table.  Also entry may
+        * be NULL because the original memory allocation for the list
+        * failed, which is not fatal but does mean we can't support
+        * VF requests for MACVLAN because we couldn't allocate
+        * memory for the list management required.
+        */
+       if (!entry || !entry->free)
+               return -ENOSPC;
+
+       entry->free = false;
+       entry->is_macvlan = true;
+       entry->vf = vf;
+       memcpy(entry->vf_macvlan, mac_addr, ETH_ALEN);
+
+       hw->mac.ops.set_rar(hw, entry->rar_entry, mac_addr, vf, IXGBE_RAH_AV);
+
+       return 0;
+}
+
+int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
+{
+       unsigned char vf_mac_addr[6];
+       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
+       unsigned int vfn = (event_mask & 0x3f);
+
+       bool enable = ((event_mask & 0x10000000U) != 0);
+
+       if (enable) {
+               random_ether_addr(vf_mac_addr);
+               e_info(probe, "IOV: VF %d is enabled MAC %pM\n",
+                      vfn, vf_mac_addr);
+               /*
+                * Store away the VF "permananet" MAC address, it will ask
+                * for it later.
+                */
+               memcpy(adapter->vfinfo[vfn].vf_mac_addresses, vf_mac_addr, 6);
+       }
+
+       return 0;
+}
+
+static inline void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 reg;
+       u32 reg_offset, vf_shift;
+
+       vf_shift = vf % 32;
+       reg_offset = vf / 32;
+
+       /* enable transmit and receive for vf */
+       reg = IXGBE_READ_REG(hw, IXGBE_VFTE(reg_offset));
+       reg |= (reg | (1 << vf_shift));
+       IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), reg);
+
+       reg = IXGBE_READ_REG(hw, IXGBE_VFRE(reg_offset));
+       reg |= (reg | (1 << vf_shift));
+       IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), reg);
+
+       /* Enable counting of spoofed packets in the SSVPC register */
+       reg = IXGBE_READ_REG(hw, IXGBE_VMECM(reg_offset));
+       reg |= (1 << vf_shift);
+       IXGBE_WRITE_REG(hw, IXGBE_VMECM(reg_offset), reg);
+
+       ixgbe_vf_reset_event(adapter, vf);
+}
+
+static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
+{
+       u32 mbx_size = IXGBE_VFMAILBOX_SIZE;
+       u32 msgbuf[IXGBE_VFMAILBOX_SIZE];
+       struct ixgbe_hw *hw = &adapter->hw;
+       s32 retval;
+       int entries;
+       u16 *hash_list;
+       int add, vid, index;
+       u8 *new_mac;
+
+       retval = ixgbe_read_mbx(hw, msgbuf, mbx_size, vf);
+
+       if (retval)
+               pr_err("Error receiving message from VF\n");
+
+       /* this is a message we already processed, do nothing */
+       if (msgbuf[0] & (IXGBE_VT_MSGTYPE_ACK | IXGBE_VT_MSGTYPE_NACK))
+               return retval;
+
+       /*
+        * until the vf completes a virtual function reset it should not be
+        * allowed to start any configuration.
+        */
+
+       if (msgbuf[0] == IXGBE_VF_RESET) {
+               unsigned char *vf_mac = adapter->vfinfo[vf].vf_mac_addresses;
+               new_mac = (u8 *)(&msgbuf[1]);
+               e_info(probe, "VF Reset msg received from vf %d\n", vf);
+               adapter->vfinfo[vf].clear_to_send = false;
+               ixgbe_vf_reset_msg(adapter, vf);
+               adapter->vfinfo[vf].clear_to_send = true;
+
+               if (is_valid_ether_addr(new_mac) &&
+                   !adapter->vfinfo[vf].pf_set_mac)
+                       ixgbe_set_vf_mac(adapter, vf, vf_mac);
+               else
+                       ixgbe_set_vf_mac(adapter,
+                                vf, adapter->vfinfo[vf].vf_mac_addresses);
+
+               /* reply to reset with ack and vf mac address */
+               msgbuf[0] = IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK;
+               memcpy(new_mac, vf_mac, IXGBE_ETH_LENGTH_OF_ADDRESS);
+               /*
+                * Piggyback the multicast filter type so VF can compute the
+                * correct vectors
+                */
+               msgbuf[3] = hw->mac.mc_filter_type;
+               ixgbe_write_mbx(hw, msgbuf, IXGBE_VF_PERMADDR_MSG_LEN, vf);
+
+               return retval;
+       }
+
+       if (!adapter->vfinfo[vf].clear_to_send) {
+               msgbuf[0] |= IXGBE_VT_MSGTYPE_NACK;
+               ixgbe_write_mbx(hw, msgbuf, 1, vf);
+               return retval;
+       }
+
+       switch ((msgbuf[0] & 0xFFFF)) {
+       case IXGBE_VF_SET_MAC_ADDR:
+               new_mac = ((u8 *)(&msgbuf[1]));
+               if (is_valid_ether_addr(new_mac) &&
+                   !adapter->vfinfo[vf].pf_set_mac) {
+                       ixgbe_set_vf_mac(adapter, vf, new_mac);
+               } else if (memcmp(adapter->vfinfo[vf].vf_mac_addresses,
+                                 new_mac, ETH_ALEN)) {
+                       e_warn(drv, "VF %d attempted to override "
+                              "administratively set MAC address\nReload "
+                              "the VF driver to resume operations\n", vf);
+                       retval = -1;
+               }
+               break;
+       case IXGBE_VF_SET_MULTICAST:
+               entries = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK)
+                         >> IXGBE_VT_MSGINFO_SHIFT;
+               hash_list = (u16 *)&msgbuf[1];
+               retval = ixgbe_set_vf_multicasts(adapter, entries,
+                                                hash_list, vf);
+               break;
+       case IXGBE_VF_SET_LPE:
+               ixgbe_set_vf_lpe(adapter, msgbuf);
+               break;
+       case IXGBE_VF_SET_VLAN:
+               add = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK)
+                     >> IXGBE_VT_MSGINFO_SHIFT;
+               vid = (msgbuf[1] & IXGBE_VLVF_VLANID_MASK);
+               if (adapter->vfinfo[vf].pf_vlan) {
+                       e_warn(drv, "VF %d attempted to override "
+                              "administratively set VLAN configuration\n"
+                              "Reload the VF driver to resume operations\n",
+                              vf);
+                       retval = -1;
+               } else {
+                       retval = ixgbe_set_vf_vlan(adapter, add, vid, vf);
+               }
+               break;
+       case IXGBE_VF_SET_MACVLAN:
+               index = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK) >>
+                       IXGBE_VT_MSGINFO_SHIFT;
+               /*
+                * If the VF is allowed to set MAC filters then turn off
+                * anti-spoofing to avoid false positives.  An index
+                * greater than 0 will indicate the VF is setting a
+                * macvlan MAC filter.
+                */
+               if (index > 0 && adapter->antispoofing_enabled) {
+                       hw->mac.ops.set_mac_anti_spoofing(hw, false,
+                                                         adapter->num_vfs);
+                       hw->mac.ops.set_vlan_anti_spoofing(hw, false, vf);
+                       adapter->antispoofing_enabled = false;
+               }
+               retval = ixgbe_set_vf_macvlan(adapter, vf, index,
+                                             (unsigned char *)(&msgbuf[1]));
+               break;
+       default:
+               e_err(drv, "Unhandled Msg %8.8x\n", msgbuf[0]);
+               retval = IXGBE_ERR_MBX;
+               break;
+       }
+
+       /* notify the VF of the results of what it sent us */
+       if (retval)
+               msgbuf[0] |= IXGBE_VT_MSGTYPE_NACK;
+       else
+               msgbuf[0] |= IXGBE_VT_MSGTYPE_ACK;
+
+       msgbuf[0] |= IXGBE_VT_MSGTYPE_CTS;
+
+       ixgbe_write_mbx(hw, msgbuf, 1, vf);
+
+       return retval;
+}
+
+static void ixgbe_rcv_ack_from_vf(struct ixgbe_adapter *adapter, u32 vf)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 msg = IXGBE_VT_MSGTYPE_NACK;
+
+       /* if device isn't clear to send it shouldn't be reading either */
+       if (!adapter->vfinfo[vf].clear_to_send)
+               ixgbe_write_mbx(hw, &msg, 1, vf);
+}
+
+void ixgbe_msg_task(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 vf;
+
+       for (vf = 0; vf < adapter->num_vfs; vf++) {
+               /* process any reset requests */
+               if (!ixgbe_check_for_rst(hw, vf))
+                       ixgbe_vf_reset_event(adapter, vf);
+
+               /* process any messages pending */
+               if (!ixgbe_check_for_msg(hw, vf))
+                       ixgbe_rcv_msg_from_vf(adapter, vf);
+
+               /* process any acks */
+               if (!ixgbe_check_for_ack(hw, vf))
+                       ixgbe_rcv_ack_from_vf(adapter, vf);
+       }
+}
+
+void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       /* disable transmit and receive for all vfs */
+       IXGBE_WRITE_REG(hw, IXGBE_VFTE(0), 0);
+       IXGBE_WRITE_REG(hw, IXGBE_VFTE(1), 0);
+
+       IXGBE_WRITE_REG(hw, IXGBE_VFRE(0), 0);
+       IXGBE_WRITE_REG(hw, IXGBE_VFRE(1), 0);
+}
+
+void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 ping;
+       int i;
+
+       for (i = 0 ; i < adapter->num_vfs; i++) {
+               ping = IXGBE_PF_CONTROL_MSG;
+               if (adapter->vfinfo[i].clear_to_send)
+                       ping |= IXGBE_VT_MSGTYPE_CTS;
+               ixgbe_write_mbx(hw, &ping, 1, i);
+       }
+}
+
+int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       if (!is_valid_ether_addr(mac) || (vf >= adapter->num_vfs))
+               return -EINVAL;
+       adapter->vfinfo[vf].pf_set_mac = true;
+       dev_info(&adapter->pdev->dev, "setting MAC %pM on VF %d\n", mac, vf);
+       dev_info(&adapter->pdev->dev, "Reload the VF driver to make this"
+                                     " change effective.");
+       if (test_bit(__IXGBE_DOWN, &adapter->state)) {
+               dev_warn(&adapter->pdev->dev, "The VF MAC address has been set,"
+                        " but the PF device is not up.\n");
+               dev_warn(&adapter->pdev->dev, "Bring the PF device up before"
+                        " attempting to use the VF device.\n");
+       }
+       return ixgbe_set_vf_mac(adapter, vf, mac);
+}
+
+int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)
+{
+       int err = 0;
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       if ((vf >= adapter->num_vfs) || (vlan > 4095) || (qos > 7))
+               return -EINVAL;
+       if (vlan || qos) {
+               err = ixgbe_set_vf_vlan(adapter, true, vlan, vf);
+               if (err)
+                       goto out;
+               ixgbe_set_vmvir(adapter, vlan | (qos << VLAN_PRIO_SHIFT), vf);
+               ixgbe_set_vmolr(hw, vf, false);
+               if (adapter->antispoofing_enabled)
+                       hw->mac.ops.set_vlan_anti_spoofing(hw, true, vf);
+               adapter->vfinfo[vf].pf_vlan = vlan;
+               adapter->vfinfo[vf].pf_qos = qos;
+               dev_info(&adapter->pdev->dev,
+                        "Setting VLAN %d, QOS 0x%x on VF %d\n", vlan, qos, vf);
+               if (test_bit(__IXGBE_DOWN, &adapter->state)) {
+                       dev_warn(&adapter->pdev->dev,
+                                "The VF VLAN has been set,"
+                                " but the PF device is not up.\n");
+                       dev_warn(&adapter->pdev->dev,
+                                "Bring the PF device up before"
+                                " attempting to use the VF device.\n");
+               }
+       } else {
+               err = ixgbe_set_vf_vlan(adapter, false,
+                                       adapter->vfinfo[vf].pf_vlan, vf);
+               ixgbe_set_vmvir(adapter, vlan, vf);
+               ixgbe_set_vmolr(hw, vf, true);
+               hw->mac.ops.set_vlan_anti_spoofing(hw, false, vf);
+               adapter->vfinfo[vf].pf_vlan = 0;
+               adapter->vfinfo[vf].pf_qos = 0;
+       }
+out:
+       return err;
+}
+
+static int ixgbe_link_mbps(int internal_link_speed)
+{
+       switch (internal_link_speed) {
+       case IXGBE_LINK_SPEED_100_FULL:
+               return 100;
+       case IXGBE_LINK_SPEED_1GB_FULL:
+               return 1000;
+       case IXGBE_LINK_SPEED_10GB_FULL:
+               return 10000;
+       default:
+               return 0;
+       }
+}
+
+static void ixgbe_set_vf_rate_limit(struct ixgbe_hw *hw, int vf, int tx_rate,
+                                   int link_speed)
+{
+       int rf_dec, rf_int;
+       u32 bcnrc_val;
+
+       if (tx_rate != 0) {
+               /* Calculate the rate factor values to set */
+               rf_int = link_speed / tx_rate;
+               rf_dec = (link_speed - (rf_int * tx_rate));
+               rf_dec = (rf_dec * (1<<IXGBE_RTTBCNRC_RF_INT_SHIFT)) / tx_rate;
+
+               bcnrc_val = IXGBE_RTTBCNRC_RS_ENA;
+               bcnrc_val |= ((rf_int<<IXGBE_RTTBCNRC_RF_INT_SHIFT) &
+                              IXGBE_RTTBCNRC_RF_INT_MASK);
+               bcnrc_val |= (rf_dec & IXGBE_RTTBCNRC_RF_DEC_MASK);
+       } else {
+               bcnrc_val = 0;
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_RTTDQSEL, 2*vf); /* vf Y uses queue 2*Y */
+       /*
+        * Set global transmit compensation time to the MMW_SIZE in RTTBCNRM
+        * register. Typically MMW_SIZE=0x014 if 9728-byte jumbo is supported
+        * and 0x004 otherwise.
+        */
+       switch (hw->mac.type) {
+       case ixgbe_mac_82599EB:
+               IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRM, 0x4);
+               break;
+       case ixgbe_mac_X540:
+               IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRM, 0x14);
+               break;
+       default:
+               break;
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRC, bcnrc_val);
+}
+
+void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter)
+{
+       int actual_link_speed, i;
+       bool reset_rate = false;
+
+       /* VF Tx rate limit was not set */
+       if (adapter->vf_rate_link_speed == 0)
+               return;
+
+       actual_link_speed = ixgbe_link_mbps(adapter->link_speed);
+       if (actual_link_speed != adapter->vf_rate_link_speed) {
+               reset_rate = true;
+               adapter->vf_rate_link_speed = 0;
+               dev_info(&adapter->pdev->dev,
+                        "Link speed has been changed. VF Transmit rate "
+                        "is disabled\n");
+       }
+
+       for (i = 0; i < adapter->num_vfs; i++) {
+               if (reset_rate)
+                       adapter->vfinfo[i].tx_rate = 0;
+
+               ixgbe_set_vf_rate_limit(&adapter->hw, i,
+                                       adapter->vfinfo[i].tx_rate,
+                                       actual_link_speed);
+       }
+}
+
+int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       int actual_link_speed;
+
+       actual_link_speed = ixgbe_link_mbps(adapter->link_speed);
+       if ((vf >= adapter->num_vfs) || (!adapter->link_up) ||
+           (tx_rate > actual_link_speed) || (actual_link_speed != 10000) ||
+           ((tx_rate != 0) && (tx_rate <= 10)))
+           /* rate limit cannot be set to 10Mb or less in 10Gb adapters */
+               return -EINVAL;
+
+       adapter->vf_rate_link_speed = actual_link_speed;
+       adapter->vfinfo[vf].tx_rate = (u16)tx_rate;
+       ixgbe_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
+
+       return 0;
+}
+
+int ixgbe_ndo_get_vf_config(struct net_device *netdev,
+                           int vf, struct ifla_vf_info *ivi)
+{
+       struct ixgbe_adapter *adapter = netdev_priv(netdev);
+       if (vf >= adapter->num_vfs)
+               return -EINVAL;
+       ivi->vf = vf;
+       memcpy(&ivi->mac, adapter->vfinfo[vf].vf_mac_addresses, ETH_ALEN);
+       ivi->tx_rate = adapter->vfinfo[vf].tx_rate;
+       ivi->vlan = adapter->vfinfo[vf].pf_vlan;
+       ivi->qos = adapter->vfinfo[vf].pf_qos;
+       return 0;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
new file mode 100644 (file)
index 0000000..3417556
--- /dev/null
@@ -0,0 +1,46 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_SRIOV_H_
+#define _IXGBE_SRIOV_H_
+
+void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter);
+void ixgbe_msg_task(struct ixgbe_adapter *adapter);
+int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask);
+void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter);
+void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);
+void ixgbe_dump_registers(struct ixgbe_adapter *adapter);
+int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac);
+int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan,
+                          u8 qos);
+int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
+int ixgbe_ndo_get_vf_config(struct net_device *netdev,
+                           int vf, struct ifla_vf_info *ivi);
+void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);
+
+#endif /* _IXGBE_SRIOV_H_ */
+
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
new file mode 100644 (file)
index 0000000..e0d970e
--- /dev/null
@@ -0,0 +1,2877 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_TYPE_H_
+#define _IXGBE_TYPE_H_
+
+#include <linux/types.h>
+#include <linux/mdio.h>
+#include <linux/netdevice.h>
+
+/* Vendor ID */
+#define IXGBE_INTEL_VENDOR_ID   0x8086
+
+/* Device IDs */
+#define IXGBE_DEV_ID_82598               0x10B6
+#define IXGBE_DEV_ID_82598_BX            0x1508
+#define IXGBE_DEV_ID_82598AF_DUAL_PORT   0x10C6
+#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
+#define IXGBE_DEV_ID_82598EB_SFP_LOM     0x10DB
+#define IXGBE_DEV_ID_82598AT             0x10C8
+#define IXGBE_DEV_ID_82598AT2            0x150B
+#define IXGBE_DEV_ID_82598EB_CX4         0x10DD
+#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC
+#define IXGBE_DEV_ID_82598_DA_DUAL_PORT  0x10F1
+#define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM      0x10E1
+#define IXGBE_DEV_ID_82598EB_XF_LR       0x10F4
+#define IXGBE_DEV_ID_82599_KX4           0x10F7
+#define IXGBE_DEV_ID_82599_KX4_MEZZ      0x1514
+#define IXGBE_DEV_ID_82599_KR            0x1517
+#define IXGBE_DEV_ID_82599_T3_LOM        0x151C
+#define IXGBE_DEV_ID_82599_CX4           0x10F9
+#define IXGBE_DEV_ID_82599_SFP           0x10FB
+#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE       0x152a
+#define IXGBE_DEV_ID_82599_SFP_FCOE      0x1529
+#define IXGBE_SUBDEV_ID_82599_SFP        0x11A9
+#define IXGBE_DEV_ID_82599_SFP_EM        0x1507
+#define IXGBE_DEV_ID_82599_SFP_SF2       0x154D
+#define IXGBE_DEV_ID_82599_XAUI_LOM      0x10FC
+#define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8
+#define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ  0x000C
+#define IXGBE_DEV_ID_82599_LS            0x154F
+#define IXGBE_DEV_ID_X540T               0x1528
+
+/* General Registers */
+#define IXGBE_CTRL      0x00000
+#define IXGBE_STATUS    0x00008
+#define IXGBE_CTRL_EXT  0x00018
+#define IXGBE_ESDP      0x00020
+#define IXGBE_EODSDP    0x00028
+#define IXGBE_I2CCTL    0x00028
+#define IXGBE_LEDCTL    0x00200
+#define IXGBE_FRTIMER   0x00048
+#define IXGBE_TCPTIMER  0x0004C
+#define IXGBE_CORESPARE 0x00600
+#define IXGBE_EXVET     0x05078
+
+/* NVM Registers */
+#define IXGBE_EEC       0x10010
+#define IXGBE_EERD      0x10014
+#define IXGBE_EEWR      0x10018
+#define IXGBE_FLA       0x1001C
+#define IXGBE_EEMNGCTL  0x10110
+#define IXGBE_EEMNGDATA 0x10114
+#define IXGBE_FLMNGCTL  0x10118
+#define IXGBE_FLMNGDATA 0x1011C
+#define IXGBE_FLMNGCNT  0x10120
+#define IXGBE_FLOP      0x1013C
+#define IXGBE_GRC       0x10200
+
+/* General Receive Control */
+#define IXGBE_GRC_MNG  0x00000001 /* Manageability Enable */
+#define IXGBE_GRC_APME 0x00000002 /* APM enabled in EEPROM */
+
+#define IXGBE_VPDDIAG0  0x10204
+#define IXGBE_VPDDIAG1  0x10208
+
+/* I2CCTL Bit Masks */
+#define IXGBE_I2C_CLK_IN    0x00000001
+#define IXGBE_I2C_CLK_OUT   0x00000002
+#define IXGBE_I2C_DATA_IN   0x00000004
+#define IXGBE_I2C_DATA_OUT  0x00000008
+
+/* Interrupt Registers */
+#define IXGBE_EICR      0x00800
+#define IXGBE_EICS      0x00808
+#define IXGBE_EIMS      0x00880
+#define IXGBE_EIMC      0x00888
+#define IXGBE_EIAC      0x00810
+#define IXGBE_EIAM      0x00890
+#define IXGBE_EICS_EX(_i)   (0x00A90 + (_i) * 4)
+#define IXGBE_EIMS_EX(_i)   (0x00AA0 + (_i) * 4)
+#define IXGBE_EIMC_EX(_i)   (0x00AB0 + (_i) * 4)
+#define IXGBE_EIAM_EX(_i)   (0x00AD0 + (_i) * 4)
+/*
+ * 82598 EITR is 16 bits but set the limits based on the max
+ * supported by all ixgbe hardware.  82599 EITR is only 12 bits,
+ * with the lower 3 always zero.
+ */
+#define IXGBE_MAX_INT_RATE 488281
+#define IXGBE_MIN_INT_RATE 956
+#define IXGBE_MAX_EITR     0x00000FF8
+#define IXGBE_MIN_EITR     8
+#define IXGBE_EITR(_i)  (((_i) <= 23) ? (0x00820 + ((_i) * 4)) : \
+                         (0x012300 + (((_i) - 24) * 4)))
+#define IXGBE_EITR_ITR_INT_MASK 0x00000FF8
+#define IXGBE_EITR_LLI_MOD      0x00008000
+#define IXGBE_EITR_CNT_WDIS     0x80000000
+#define IXGBE_IVAR(_i)  (0x00900 + ((_i) * 4)) /* 24 at 0x900-0x960 */
+#define IXGBE_IVAR_MISC 0x00A00 /* misc MSI-X interrupt causes */
+#define IXGBE_EITRSEL   0x00894
+#define IXGBE_MSIXT     0x00000 /* MSI-X Table. 0x0000 - 0x01C */
+#define IXGBE_MSIXPBA   0x02000 /* MSI-X Pending bit array */
+#define IXGBE_PBACL(_i) (((_i) == 0) ? (0x11068) : (0x110C0 + ((_i) * 4)))
+#define IXGBE_GPIE      0x00898
+
+/* Flow Control Registers */
+#define IXGBE_FCADBUL   0x03210
+#define IXGBE_FCADBUH   0x03214
+#define IXGBE_FCAMACL   0x04328
+#define IXGBE_FCAMACH   0x0432C
+#define IXGBE_FCRTH_82599(_i) (0x03260 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_FCRTL_82599(_i) (0x03220 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_PFCTOP    0x03008
+#define IXGBE_FCTTV(_i) (0x03200 + ((_i) * 4)) /* 4 of these (0-3) */
+#define IXGBE_FCRTL(_i) (0x03220 + ((_i) * 8)) /* 8 of these (0-7) */
+#define IXGBE_FCRTH(_i) (0x03260 + ((_i) * 8)) /* 8 of these (0-7) */
+#define IXGBE_FCRTV     0x032A0
+#define IXGBE_FCCFG     0x03D00
+#define IXGBE_TFCS      0x0CE00
+
+/* Receive DMA Registers */
+#define IXGBE_RDBAL(_i) (((_i) < 64) ? (0x01000 + ((_i) * 0x40)) : \
+                         (0x0D000 + ((_i - 64) * 0x40)))
+#define IXGBE_RDBAH(_i) (((_i) < 64) ? (0x01004 + ((_i) * 0x40)) : \
+                         (0x0D004 + ((_i - 64) * 0x40)))
+#define IXGBE_RDLEN(_i) (((_i) < 64) ? (0x01008 + ((_i) * 0x40)) : \
+                         (0x0D008 + ((_i - 64) * 0x40)))
+#define IXGBE_RDH(_i)   (((_i) < 64) ? (0x01010 + ((_i) * 0x40)) : \
+                         (0x0D010 + ((_i - 64) * 0x40)))
+#define IXGBE_RDT(_i)   (((_i) < 64) ? (0x01018 + ((_i) * 0x40)) : \
+                         (0x0D018 + ((_i - 64) * 0x40)))
+#define IXGBE_RXDCTL(_i) (((_i) < 64) ? (0x01028 + ((_i) * 0x40)) : \
+                          (0x0D028 + ((_i - 64) * 0x40)))
+#define IXGBE_RSCCTL(_i) (((_i) < 64) ? (0x0102C + ((_i) * 0x40)) : \
+                          (0x0D02C + ((_i - 64) * 0x40)))
+#define IXGBE_RSCDBU     0x03028
+#define IXGBE_RDDCC      0x02F20
+#define IXGBE_RXMEMWRAP  0x03190
+#define IXGBE_STARCTRL   0x03024
+/*
+ * Split and Replication Receive Control Registers
+ * 00-15 : 0x02100 + n*4
+ * 16-64 : 0x01014 + n*0x40
+ * 64-127: 0x0D014 + (n-64)*0x40
+ */
+#define IXGBE_SRRCTL(_i) (((_i) <= 15) ? (0x02100 + ((_i) * 4)) : \
+                          (((_i) < 64) ? (0x01014 + ((_i) * 0x40)) : \
+                          (0x0D014 + ((_i - 64) * 0x40))))
+/*
+ * Rx DCA Control Register:
+ * 00-15 : 0x02200 + n*4
+ * 16-64 : 0x0100C + n*0x40
+ * 64-127: 0x0D00C + (n-64)*0x40
+ */
+#define IXGBE_DCA_RXCTRL(_i)    (((_i) <= 15) ? (0x02200 + ((_i) * 4)) : \
+                                 (((_i) < 64) ? (0x0100C + ((_i) * 0x40)) : \
+                                 (0x0D00C + ((_i - 64) * 0x40))))
+#define IXGBE_RDRXCTL           0x02F00
+#define IXGBE_RXPBSIZE(_i)      (0x03C00 + ((_i) * 4))
+                                             /* 8 of these 0x03C00 - 0x03C1C */
+#define IXGBE_RXCTRL    0x03000
+#define IXGBE_DROPEN    0x03D04
+#define IXGBE_RXPBSIZE_SHIFT 10
+
+/* Receive Registers */
+#define IXGBE_RXCSUM    0x05000
+#define IXGBE_RFCTL     0x05008
+#define IXGBE_DRECCCTL  0x02F08
+#define IXGBE_DRECCCTL_DISABLE 0
+/* Multicast Table Array - 128 entries */
+#define IXGBE_MTA(_i)   (0x05200 + ((_i) * 4))
+#define IXGBE_RAL(_i)   (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \
+                         (0x0A200 + ((_i) * 8)))
+#define IXGBE_RAH(_i)   (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \
+                         (0x0A204 + ((_i) * 8)))
+#define IXGBE_MPSAR_LO(_i) (0x0A600 + ((_i) * 8))
+#define IXGBE_MPSAR_HI(_i) (0x0A604 + ((_i) * 8))
+/* Packet split receive type */
+#define IXGBE_PSRTYPE(_i)    (((_i) <= 15) ? (0x05480 + ((_i) * 4)) : \
+                              (0x0EA00 + ((_i) * 4)))
+/* array of 4096 1-bit vlan filters */
+#define IXGBE_VFTA(_i)  (0x0A000 + ((_i) * 4))
+/*array of 4096 4-bit vlan vmdq indices */
+#define IXGBE_VFTAVIND(_j, _i)  (0x0A200 + ((_j) * 0x200) + ((_i) * 4))
+#define IXGBE_FCTRL     0x05080
+#define IXGBE_VLNCTRL   0x05088
+#define IXGBE_MCSTCTRL  0x05090
+#define IXGBE_MRQC      0x05818
+#define IXGBE_SAQF(_i)  (0x0E000 + ((_i) * 4)) /* Source Address Queue Filter */
+#define IXGBE_DAQF(_i)  (0x0E200 + ((_i) * 4)) /* Dest. Address Queue Filter */
+#define IXGBE_SDPQF(_i) (0x0E400 + ((_i) * 4)) /* Src Dest. Addr Queue Filter */
+#define IXGBE_FTQF(_i)  (0x0E600 + ((_i) * 4)) /* Five Tuple Queue Filter */
+#define IXGBE_ETQF(_i)  (0x05128 + ((_i) * 4)) /* EType Queue Filter */
+#define IXGBE_ETQS(_i)  (0x0EC00 + ((_i) * 4)) /* EType Queue Select */
+#define IXGBE_SYNQF     0x0EC30 /* SYN Packet Queue Filter */
+#define IXGBE_RQTC      0x0EC70
+#define IXGBE_MTQC      0x08120
+#define IXGBE_VLVF(_i)  (0x0F100 + ((_i) * 4))  /* 64 of these (0-63) */
+#define IXGBE_VLVFB(_i) (0x0F200 + ((_i) * 4))  /* 128 of these (0-127) */
+#define IXGBE_VMVIR(_i) (0x08000 + ((_i) * 4))  /* 64 of these (0-63) */
+#define IXGBE_VT_CTL         0x051B0
+#define IXGBE_PFMAILBOX(_i)  (0x04B00 + (4 * (_i))) /* 64 total */
+#define IXGBE_PFMBMEM(_i)    (0x13000 + (64 * (_i))) /* 64 Mailboxes, 16 DW each */
+#define IXGBE_PFMBICR(_i)    (0x00710 + (4 * (_i))) /* 4 total */
+#define IXGBE_PFMBIMR(_i)    (0x00720 + (4 * (_i))) /* 4 total */
+#define IXGBE_VFRE(_i)       (0x051E0 + ((_i) * 4))
+#define IXGBE_VFTE(_i)       (0x08110 + ((_i) * 4))
+#define IXGBE_VMECM(_i)      (0x08790 + ((_i) * 4))
+#define IXGBE_QDE            0x2F04
+#define IXGBE_VMTXSW(_i)     (0x05180 + ((_i) * 4)) /* 2 total */
+#define IXGBE_VMOLR(_i)      (0x0F000 + ((_i) * 4)) /* 64 total */
+#define IXGBE_UTA(_i)        (0x0F400 + ((_i) * 4))
+#define IXGBE_MRCTL(_i)      (0x0F600 + ((_i) * 4))
+#define IXGBE_VMRVLAN(_i)    (0x0F610 + ((_i) * 4))
+#define IXGBE_VMRVM(_i)      (0x0F630 + ((_i) * 4))
+#define IXGBE_L34T_IMIR(_i)  (0x0E800 + ((_i) * 4)) /*128 of these (0-127)*/
+#define IXGBE_RXFECCERR0         0x051B8
+#define IXGBE_LLITHRESH 0x0EC90
+#define IXGBE_IMIR(_i)  (0x05A80 + ((_i) * 4))  /* 8 of these (0-7) */
+#define IXGBE_IMIREXT(_i)       (0x05AA0 + ((_i) * 4))  /* 8 of these (0-7) */
+#define IXGBE_IMIRVP    0x05AC0
+#define IXGBE_VMD_CTL   0x0581C
+#define IXGBE_RETA(_i)  (0x05C00 + ((_i) * 4))  /* 32 of these (0-31) */
+#define IXGBE_RSSRK(_i) (0x05C80 + ((_i) * 4))  /* 10 of these (0-9) */
+
+/* Flow Director registers */
+#define IXGBE_FDIRCTRL  0x0EE00
+#define IXGBE_FDIRHKEY  0x0EE68
+#define IXGBE_FDIRSKEY  0x0EE6C
+#define IXGBE_FDIRDIP4M 0x0EE3C
+#define IXGBE_FDIRSIP4M 0x0EE40
+#define IXGBE_FDIRTCPM  0x0EE44
+#define IXGBE_FDIRUDPM  0x0EE48
+#define IXGBE_FDIRIP6M  0x0EE74
+#define IXGBE_FDIRM     0x0EE70
+
+/* Flow Director Stats registers */
+#define IXGBE_FDIRFREE  0x0EE38
+#define IXGBE_FDIRLEN   0x0EE4C
+#define IXGBE_FDIRUSTAT 0x0EE50
+#define IXGBE_FDIRFSTAT 0x0EE54
+#define IXGBE_FDIRMATCH 0x0EE58
+#define IXGBE_FDIRMISS  0x0EE5C
+
+/* Flow Director Programming registers */
+#define IXGBE_FDIRSIPv6(_i) (0x0EE0C + ((_i) * 4)) /* 3 of these (0-2) */
+#define IXGBE_FDIRIPSA      0x0EE18
+#define IXGBE_FDIRIPDA      0x0EE1C
+#define IXGBE_FDIRPORT      0x0EE20
+#define IXGBE_FDIRVLAN      0x0EE24
+#define IXGBE_FDIRHASH      0x0EE28
+#define IXGBE_FDIRCMD       0x0EE2C
+
+/* Transmit DMA registers */
+#define IXGBE_TDBAL(_i) (0x06000 + ((_i) * 0x40)) /* 32 of these (0-31)*/
+#define IXGBE_TDBAH(_i) (0x06004 + ((_i) * 0x40))
+#define IXGBE_TDLEN(_i) (0x06008 + ((_i) * 0x40))
+#define IXGBE_TDH(_i)   (0x06010 + ((_i) * 0x40))
+#define IXGBE_TDT(_i)   (0x06018 + ((_i) * 0x40))
+#define IXGBE_TXDCTL(_i) (0x06028 + ((_i) * 0x40))
+#define IXGBE_TDWBAL(_i) (0x06038 + ((_i) * 0x40))
+#define IXGBE_TDWBAH(_i) (0x0603C + ((_i) * 0x40))
+#define IXGBE_DTXCTL    0x07E00
+
+#define IXGBE_DMATXCTL      0x04A80
+#define IXGBE_PFVFSPOOF(_i) (0x08200 + ((_i) * 4)) /* 8 of these 0 - 7 */
+#define IXGBE_PFDTXGSWC     0x08220
+#define IXGBE_DTXMXSZRQ     0x08100
+#define IXGBE_DTXTCPFLGL    0x04A88
+#define IXGBE_DTXTCPFLGH    0x04A8C
+#define IXGBE_LBDRPEN       0x0CA00
+#define IXGBE_TXPBTHRESH(_i) (0x04950 + ((_i) * 4)) /* 8 of these 0 - 7 */
+
+#define IXGBE_DMATXCTL_TE       0x1 /* Transmit Enable */
+#define IXGBE_DMATXCTL_NS       0x2 /* No Snoop LSO hdr buffer */
+#define IXGBE_DMATXCTL_GDV      0x8 /* Global Double VLAN */
+#define IXGBE_DMATXCTL_VT_SHIFT 16  /* VLAN EtherType */
+
+#define IXGBE_PFDTXGSWC_VT_LBEN 0x1 /* Local L2 VT switch enable */
+
+/* Anti-spoofing defines */
+#define IXGBE_SPOOF_MACAS_MASK          0xFF
+#define IXGBE_SPOOF_VLANAS_MASK         0xFF00
+#define IXGBE_SPOOF_VLANAS_SHIFT        8
+#define IXGBE_PFVFSPOOF_REG_COUNT       8
+
+#define IXGBE_DCA_TXCTRL(_i)    (0x07200 + ((_i) * 4)) /* 16 of these (0-15) */
+/* Tx DCA Control register : 128 of these (0-127) */
+#define IXGBE_DCA_TXCTRL_82599(_i)  (0x0600C + ((_i) * 0x40))
+#define IXGBE_TIPG      0x0CB00
+#define IXGBE_TXPBSIZE(_i)      (0x0CC00 + ((_i) * 4)) /* 8 of these */
+#define IXGBE_MNGTXMAP  0x0CD10
+#define IXGBE_TIPG_FIBER_DEFAULT 3
+#define IXGBE_TXPBSIZE_SHIFT    10
+
+/* Wake up registers */
+#define IXGBE_WUC       0x05800
+#define IXGBE_WUFC      0x05808
+#define IXGBE_WUS       0x05810
+#define IXGBE_IPAV      0x05838
+#define IXGBE_IP4AT     0x05840 /* IPv4 table 0x5840-0x5858 */
+#define IXGBE_IP6AT     0x05880 /* IPv6 table 0x5880-0x588F */
+
+#define IXGBE_WUPL      0x05900
+#define IXGBE_WUPM      0x05A00 /* wake up pkt memory 0x5A00-0x5A7C */
+#define IXGBE_FHFT(_n)     (0x09000 + (_n * 0x100)) /* Flex host filter table */
+#define IXGBE_FHFT_EXT(_n) (0x09800 + (_n * 0x100)) /* Ext Flexible Host
+                                                     * Filter Table */
+
+#define IXGBE_FLEXIBLE_FILTER_COUNT_MAX         4
+#define IXGBE_EXT_FLEXIBLE_FILTER_COUNT_MAX     2
+
+/* Each Flexible Filter is at most 128 (0x80) bytes in length */
+#define IXGBE_FLEXIBLE_FILTER_SIZE_MAX  128
+#define IXGBE_FHFT_LENGTH_OFFSET        0xFC  /* Length byte in FHFT */
+#define IXGBE_FHFT_LENGTH_MASK          0x0FF /* Length in lower byte */
+
+/* Definitions for power management and wakeup registers */
+/* Wake Up Control */
+#define IXGBE_WUC_PME_EN     0x00000002 /* PME Enable */
+#define IXGBE_WUC_PME_STATUS 0x00000004 /* PME Status */
+#define IXGBE_WUC_WKEN       0x00000010 /* Enable PE_WAKE_N pin assertion  */
+
+/* Wake Up Filter Control */
+#define IXGBE_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
+#define IXGBE_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
+#define IXGBE_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
+#define IXGBE_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
+#define IXGBE_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
+#define IXGBE_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
+#define IXGBE_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
+#define IXGBE_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
+#define IXGBE_WUFC_MNG  0x00000100 /* Directed Mgmt Packet Wakeup Enable */
+
+#define IXGBE_WUFC_IGNORE_TCO   0x00008000 /* Ignore WakeOn TCO packets */
+#define IXGBE_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
+#define IXGBE_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
+#define IXGBE_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
+#define IXGBE_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
+#define IXGBE_WUFC_FLX4 0x00100000 /* Flexible Filter 4 Enable */
+#define IXGBE_WUFC_FLX5 0x00200000 /* Flexible Filter 5 Enable */
+#define IXGBE_WUFC_FLX_FILTERS     0x000F0000 /* Mask for 4 flex filters */
+#define IXGBE_WUFC_EXT_FLX_FILTERS 0x00300000 /* Mask for Ext. flex filters */
+#define IXGBE_WUFC_ALL_FILTERS     0x003F00FF /* Mask for all wakeup filters */
+#define IXGBE_WUFC_FLX_OFFSET      16 /* Offset to the Flexible Filters bits */
+
+/* Wake Up Status */
+#define IXGBE_WUS_LNKC  IXGBE_WUFC_LNKC
+#define IXGBE_WUS_MAG   IXGBE_WUFC_MAG
+#define IXGBE_WUS_EX    IXGBE_WUFC_EX
+#define IXGBE_WUS_MC    IXGBE_WUFC_MC
+#define IXGBE_WUS_BC    IXGBE_WUFC_BC
+#define IXGBE_WUS_ARP   IXGBE_WUFC_ARP
+#define IXGBE_WUS_IPV4  IXGBE_WUFC_IPV4
+#define IXGBE_WUS_IPV6  IXGBE_WUFC_IPV6
+#define IXGBE_WUS_MNG   IXGBE_WUFC_MNG
+#define IXGBE_WUS_FLX0  IXGBE_WUFC_FLX0
+#define IXGBE_WUS_FLX1  IXGBE_WUFC_FLX1
+#define IXGBE_WUS_FLX2  IXGBE_WUFC_FLX2
+#define IXGBE_WUS_FLX3  IXGBE_WUFC_FLX3
+#define IXGBE_WUS_FLX4  IXGBE_WUFC_FLX4
+#define IXGBE_WUS_FLX5  IXGBE_WUFC_FLX5
+#define IXGBE_WUS_FLX_FILTERS  IXGBE_WUFC_FLX_FILTERS
+
+/* Wake Up Packet Length */
+#define IXGBE_WUPL_LENGTH_MASK 0xFFFF
+
+/* DCB registers */
+#define IXGBE_RMCS      0x03D00
+#define IXGBE_DPMCS     0x07F40
+#define IXGBE_PDPMCS    0x0CD00
+#define IXGBE_RUPPBMR   0x050A0
+#define IXGBE_RT2CR(_i) (0x03C20 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_RT2SR(_i) (0x03C40 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_TDTQ2TCCR(_i)     (0x0602C + ((_i) * 0x40)) /* 8 of these (0-7) */
+#define IXGBE_TDTQ2TCSR(_i)     (0x0622C + ((_i) * 0x40)) /* 8 of these (0-7) */
+#define IXGBE_TDPT2TCCR(_i)     (0x0CD20 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_TDPT2TCSR(_i)     (0x0CD40 + ((_i) * 4)) /* 8 of these (0-7) */
+
+
+/* Security Control Registers */
+#define IXGBE_SECTXCTRL         0x08800
+#define IXGBE_SECTXSTAT         0x08804
+#define IXGBE_SECTXBUFFAF       0x08808
+#define IXGBE_SECTXMINIFG       0x08810
+#define IXGBE_SECRXCTRL         0x08D00
+#define IXGBE_SECRXSTAT         0x08D04
+
+/* Security Bit Fields and Masks */
+#define IXGBE_SECTXCTRL_SECTX_DIS       0x00000001
+#define IXGBE_SECTXCTRL_TX_DIS          0x00000002
+#define IXGBE_SECTXCTRL_STORE_FORWARD   0x00000004
+
+#define IXGBE_SECTXSTAT_SECTX_RDY       0x00000001
+#define IXGBE_SECTXSTAT_ECC_TXERR       0x00000002
+
+#define IXGBE_SECRXCTRL_SECRX_DIS       0x00000001
+#define IXGBE_SECRXCTRL_RX_DIS          0x00000002
+
+#define IXGBE_SECRXSTAT_SECRX_RDY       0x00000001
+#define IXGBE_SECRXSTAT_ECC_RXERR       0x00000002
+
+/* LinkSec (MacSec) Registers */
+#define IXGBE_LSECTXCAP         0x08A00
+#define IXGBE_LSECRXCAP         0x08F00
+#define IXGBE_LSECTXCTRL        0x08A04
+#define IXGBE_LSECTXSCL         0x08A08 /* SCI Low */
+#define IXGBE_LSECTXSCH         0x08A0C /* SCI High */
+#define IXGBE_LSECTXSA          0x08A10
+#define IXGBE_LSECTXPN0         0x08A14
+#define IXGBE_LSECTXPN1         0x08A18
+#define IXGBE_LSECTXKEY0(_n)    (0x08A1C + (4 * (_n))) /* 4 of these (0-3) */
+#define IXGBE_LSECTXKEY1(_n)    (0x08A2C + (4 * (_n))) /* 4 of these (0-3) */
+#define IXGBE_LSECRXCTRL        0x08F04
+#define IXGBE_LSECRXSCL         0x08F08
+#define IXGBE_LSECRXSCH         0x08F0C
+#define IXGBE_LSECRXSA(_i)      (0x08F10 + (4 * (_i))) /* 2 of these (0-1) */
+#define IXGBE_LSECRXPN(_i)      (0x08F18 + (4 * (_i))) /* 2 of these (0-1) */
+#define IXGBE_LSECRXKEY(_n, _m) (0x08F20 + ((0x10 * (_n)) + (4 * (_m))))
+#define IXGBE_LSECTXUT          0x08A3C /* OutPktsUntagged */
+#define IXGBE_LSECTXPKTE        0x08A40 /* OutPktsEncrypted */
+#define IXGBE_LSECTXPKTP        0x08A44 /* OutPktsProtected */
+#define IXGBE_LSECTXOCTE        0x08A48 /* OutOctetsEncrypted */
+#define IXGBE_LSECTXOCTP        0x08A4C /* OutOctetsProtected */
+#define IXGBE_LSECRXUT          0x08F40 /* InPktsUntagged/InPktsNoTag */
+#define IXGBE_LSECRXOCTD        0x08F44 /* InOctetsDecrypted */
+#define IXGBE_LSECRXOCTV        0x08F48 /* InOctetsValidated */
+#define IXGBE_LSECRXBAD         0x08F4C /* InPktsBadTag */
+#define IXGBE_LSECRXNOSCI       0x08F50 /* InPktsNoSci */
+#define IXGBE_LSECRXUNSCI       0x08F54 /* InPktsUnknownSci */
+#define IXGBE_LSECRXUNCH        0x08F58 /* InPktsUnchecked */
+#define IXGBE_LSECRXDELAY       0x08F5C /* InPktsDelayed */
+#define IXGBE_LSECRXLATE        0x08F60 /* InPktsLate */
+#define IXGBE_LSECRXOK(_n)      (0x08F64 + (0x04 * (_n))) /* InPktsOk */
+#define IXGBE_LSECRXINV(_n)     (0x08F6C + (0x04 * (_n))) /* InPktsInvalid */
+#define IXGBE_LSECRXNV(_n)      (0x08F74 + (0x04 * (_n))) /* InPktsNotValid */
+#define IXGBE_LSECRXUNSA        0x08F7C /* InPktsUnusedSa */
+#define IXGBE_LSECRXNUSA        0x08F80 /* InPktsNotUsingSa */
+
+/* LinkSec (MacSec) Bit Fields and Masks */
+#define IXGBE_LSECTXCAP_SUM_MASK        0x00FF0000
+#define IXGBE_LSECTXCAP_SUM_SHIFT       16
+#define IXGBE_LSECRXCAP_SUM_MASK        0x00FF0000
+#define IXGBE_LSECRXCAP_SUM_SHIFT       16
+
+#define IXGBE_LSECTXCTRL_EN_MASK        0x00000003
+#define IXGBE_LSECTXCTRL_DISABLE        0x0
+#define IXGBE_LSECTXCTRL_AUTH           0x1
+#define IXGBE_LSECTXCTRL_AUTH_ENCRYPT   0x2
+#define IXGBE_LSECTXCTRL_AISCI          0x00000020
+#define IXGBE_LSECTXCTRL_PNTHRSH_MASK   0xFFFFFF00
+#define IXGBE_LSECTXCTRL_RSV_MASK       0x000000D8
+
+#define IXGBE_LSECRXCTRL_EN_MASK        0x0000000C
+#define IXGBE_LSECRXCTRL_EN_SHIFT       2
+#define IXGBE_LSECRXCTRL_DISABLE        0x0
+#define IXGBE_LSECRXCTRL_CHECK          0x1
+#define IXGBE_LSECRXCTRL_STRICT         0x2
+#define IXGBE_LSECRXCTRL_DROP           0x3
+#define IXGBE_LSECRXCTRL_PLSH           0x00000040
+#define IXGBE_LSECRXCTRL_RP             0x00000080
+#define IXGBE_LSECRXCTRL_RSV_MASK       0xFFFFFF33
+
+/* IpSec Registers */
+#define IXGBE_IPSTXIDX          0x08900
+#define IXGBE_IPSTXSALT         0x08904
+#define IXGBE_IPSTXKEY(_i)      (0x08908 + (4 * (_i))) /* 4 of these (0-3) */
+#define IXGBE_IPSRXIDX          0x08E00
+#define IXGBE_IPSRXIPADDR(_i)   (0x08E04 + (4 * (_i))) /* 4 of these (0-3) */
+#define IXGBE_IPSRXSPI          0x08E14
+#define IXGBE_IPSRXIPIDX        0x08E18
+#define IXGBE_IPSRXKEY(_i)      (0x08E1C + (4 * (_i))) /* 4 of these (0-3) */
+#define IXGBE_IPSRXSALT         0x08E2C
+#define IXGBE_IPSRXMOD          0x08E30
+
+#define IXGBE_SECTXCTRL_STORE_FORWARD_ENABLE    0x4
+
+/* DCB registers */
+#define IXGBE_RTRPCS      0x02430
+#define IXGBE_RTTDCS      0x04900
+#define IXGBE_RTTDCS_ARBDIS     0x00000040 /* DCB arbiter disable */
+#define IXGBE_RTTPCS      0x0CD00
+#define IXGBE_RTRUP2TC    0x03020
+#define IXGBE_RTTUP2TC    0x0C800
+#define IXGBE_RTRPT4C(_i) (0x02140 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_TXLLQ(_i)   (0x082E0 + ((_i) * 4)) /* 4 of these (0-3) */
+#define IXGBE_RTRPT4S(_i) (0x02160 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_RTTDT2C(_i) (0x04910 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_RTTDT2S(_i) (0x04930 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_RTTPT2C(_i) (0x0CD20 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_RTTPT2S(_i) (0x0CD40 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_RTTDQSEL    0x04904
+#define IXGBE_RTTDT1C     0x04908
+#define IXGBE_RTTDT1S     0x0490C
+#define IXGBE_RTTDTECC    0x04990
+#define IXGBE_RTTDTECC_NO_BCN   0x00000100
+#define IXGBE_RTTBCNRC    0x04984
+#define IXGBE_RTTBCNRC_RS_ENA  0x80000000
+#define IXGBE_RTTBCNRC_RF_DEC_MASK     0x00003FFF
+#define IXGBE_RTTBCNRC_RF_INT_SHIFT    14
+#define IXGBE_RTTBCNRC_RF_INT_MASK     \
+       (IXGBE_RTTBCNRC_RF_DEC_MASK << IXGBE_RTTBCNRC_RF_INT_SHIFT)
+#define IXGBE_RTTBCNRM    0x04980
+
+/* FCoE DMA Context Registers */
+#define IXGBE_FCPTRL    0x02410 /* FC User Desc. PTR Low */
+#define IXGBE_FCPTRH    0x02414 /* FC USer Desc. PTR High */
+#define IXGBE_FCBUFF    0x02418 /* FC Buffer Control */
+#define IXGBE_FCDMARW   0x02420 /* FC Receive DMA RW */
+#define IXGBE_FCINVST0  0x03FC0 /* FC Invalid DMA Context Status Reg 0 */
+#define IXGBE_FCINVST(_i)       (IXGBE_FCINVST0 + ((_i) * 4))
+#define IXGBE_FCBUFF_VALID      (1 << 0)   /* DMA Context Valid */
+#define IXGBE_FCBUFF_BUFFSIZE   (3 << 3)   /* User Buffer Size */
+#define IXGBE_FCBUFF_WRCONTX    (1 << 7)   /* 0: Initiator, 1: Target */
+#define IXGBE_FCBUFF_BUFFCNT    0x0000ff00 /* Number of User Buffers */
+#define IXGBE_FCBUFF_OFFSET     0xffff0000 /* User Buffer Offset */
+#define IXGBE_FCBUFF_BUFFSIZE_SHIFT  3
+#define IXGBE_FCBUFF_BUFFCNT_SHIFT   8
+#define IXGBE_FCBUFF_OFFSET_SHIFT    16
+#define IXGBE_FCDMARW_WE        (1 << 14)   /* Write enable */
+#define IXGBE_FCDMARW_RE        (1 << 15)   /* Read enable */
+#define IXGBE_FCDMARW_FCOESEL   0x000001ff  /* FC X_ID: 11 bits */
+#define IXGBE_FCDMARW_LASTSIZE  0xffff0000  /* Last User Buffer Size */
+#define IXGBE_FCDMARW_LASTSIZE_SHIFT 16
+
+/* FCoE SOF/EOF */
+#define IXGBE_TEOFF     0x04A94 /* Tx FC EOF */
+#define IXGBE_TSOFF     0x04A98 /* Tx FC SOF */
+#define IXGBE_REOFF     0x05158 /* Rx FC EOF */
+#define IXGBE_RSOFF     0x051F8 /* Rx FC SOF */
+/* FCoE Filter Context Registers */
+#define IXGBE_FCFLT     0x05108 /* FC FLT Context */
+#define IXGBE_FCFLTRW   0x05110 /* FC Filter RW Control */
+#define IXGBE_FCPARAM   0x051d8 /* FC Offset Parameter */
+#define IXGBE_FCFLT_VALID       (1 << 0)   /* Filter Context Valid */
+#define IXGBE_FCFLT_FIRST       (1 << 1)   /* Filter First */
+#define IXGBE_FCFLT_SEQID       0x00ff0000 /* Sequence ID */
+#define IXGBE_FCFLT_SEQCNT      0xff000000 /* Sequence Count */
+#define IXGBE_FCFLTRW_RVALDT    (1 << 13)  /* Fast Re-Validation */
+#define IXGBE_FCFLTRW_WE        (1 << 14)  /* Write Enable */
+#define IXGBE_FCFLTRW_RE        (1 << 15)  /* Read Enable */
+/* FCoE Receive Control */
+#define IXGBE_FCRXCTRL  0x05100 /* FC Receive Control */
+#define IXGBE_FCRXCTRL_FCOELLI  (1 << 0)   /* Low latency interrupt */
+#define IXGBE_FCRXCTRL_SAVBAD   (1 << 1)   /* Save Bad Frames */
+#define IXGBE_FCRXCTRL_FRSTRDH  (1 << 2)   /* EN 1st Read Header */
+#define IXGBE_FCRXCTRL_LASTSEQH (1 << 3)   /* EN Last Header in Seq */
+#define IXGBE_FCRXCTRL_ALLH     (1 << 4)   /* EN All Headers */
+#define IXGBE_FCRXCTRL_FRSTSEQH (1 << 5)   /* EN 1st Seq. Header */
+#define IXGBE_FCRXCTRL_ICRC     (1 << 6)   /* Ignore Bad FC CRC */
+#define IXGBE_FCRXCTRL_FCCRCBO  (1 << 7)   /* FC CRC Byte Ordering */
+#define IXGBE_FCRXCTRL_FCOEVER  0x00000f00 /* FCoE Version: 4 bits */
+#define IXGBE_FCRXCTRL_FCOEVER_SHIFT 8
+/* FCoE Redirection */
+#define IXGBE_FCRECTL   0x0ED00 /* FC Redirection Control */
+#define IXGBE_FCRETA0   0x0ED10 /* FC Redirection Table 0 */
+#define IXGBE_FCRETA(_i)        (IXGBE_FCRETA0 + ((_i) * 4)) /* FCoE Redir */
+#define IXGBE_FCRECTL_ENA       0x1        /* FCoE Redir Table Enable */
+#define IXGBE_FCRETA_SIZE       8          /* Max entries in FCRETA */
+#define IXGBE_FCRETA_ENTRY_MASK 0x0000007f /* 7 bits for the queue index */
+
+/* Stats registers */
+#define IXGBE_CRCERRS   0x04000
+#define IXGBE_ILLERRC   0x04004
+#define IXGBE_ERRBC     0x04008
+#define IXGBE_MSPDC     0x04010
+#define IXGBE_MPC(_i)   (0x03FA0 + ((_i) * 4)) /* 8 of these 3FA0-3FBC*/
+#define IXGBE_MLFC      0x04034
+#define IXGBE_MRFC      0x04038
+#define IXGBE_RLEC      0x04040
+#define IXGBE_LXONTXC   0x03F60
+#define IXGBE_LXONRXC   0x0CF60
+#define IXGBE_LXOFFTXC  0x03F68
+#define IXGBE_LXOFFRXC  0x0CF68
+#define IXGBE_LXONRXCNT 0x041A4
+#define IXGBE_LXOFFRXCNT 0x041A8
+#define IXGBE_PXONRXCNT(_i)     (0x04140 + ((_i) * 4)) /* 8 of these */
+#define IXGBE_PXOFFRXCNT(_i)    (0x04160 + ((_i) * 4)) /* 8 of these */
+#define IXGBE_PXON2OFFCNT(_i)   (0x03240 + ((_i) * 4)) /* 8 of these */
+#define IXGBE_PXONTXC(_i)       (0x03F00 + ((_i) * 4)) /* 8 of these 3F00-3F1C*/
+#define IXGBE_PXONRXC(_i)       (0x0CF00 + ((_i) * 4)) /* 8 of these CF00-CF1C*/
+#define IXGBE_PXOFFTXC(_i)      (0x03F20 + ((_i) * 4)) /* 8 of these 3F20-3F3C*/
+#define IXGBE_PXOFFRXC(_i)      (0x0CF20 + ((_i) * 4)) /* 8 of these CF20-CF3C*/
+#define IXGBE_PRC64     0x0405C
+#define IXGBE_PRC127    0x04060
+#define IXGBE_PRC255    0x04064
+#define IXGBE_PRC511    0x04068
+#define IXGBE_PRC1023   0x0406C
+#define IXGBE_PRC1522   0x04070
+#define IXGBE_GPRC      0x04074
+#define IXGBE_BPRC      0x04078
+#define IXGBE_MPRC      0x0407C
+#define IXGBE_GPTC      0x04080
+#define IXGBE_GORCL     0x04088
+#define IXGBE_GORCH     0x0408C
+#define IXGBE_GOTCL     0x04090
+#define IXGBE_GOTCH     0x04094
+#define IXGBE_RNBC(_i)  (0x03FC0 + ((_i) * 4)) /* 8 of these 3FC0-3FDC*/
+#define IXGBE_RUC       0x040A4
+#define IXGBE_RFC       0x040A8
+#define IXGBE_ROC       0x040AC
+#define IXGBE_RJC       0x040B0
+#define IXGBE_MNGPRC    0x040B4
+#define IXGBE_MNGPDC    0x040B8
+#define IXGBE_MNGPTC    0x0CF90
+#define IXGBE_TORL      0x040C0
+#define IXGBE_TORH      0x040C4
+#define IXGBE_TPR       0x040D0
+#define IXGBE_TPT       0x040D4
+#define IXGBE_PTC64     0x040D8
+#define IXGBE_PTC127    0x040DC
+#define IXGBE_PTC255    0x040E0
+#define IXGBE_PTC511    0x040E4
+#define IXGBE_PTC1023   0x040E8
+#define IXGBE_PTC1522   0x040EC
+#define IXGBE_MPTC      0x040F0
+#define IXGBE_BPTC      0x040F4
+#define IXGBE_XEC       0x04120
+#define IXGBE_SSVPC     0x08780
+
+#define IXGBE_RQSMR(_i) (0x02300 + ((_i) * 4))
+#define IXGBE_TQSMR(_i) (((_i) <= 7) ? (0x07300 + ((_i) * 4)) : \
+                         (0x08600 + ((_i) * 4)))
+#define IXGBE_TQSM(_i)  (0x08600 + ((_i) * 4))
+
+#define IXGBE_QPRC(_i) (0x01030 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QPTC(_i) (0x06030 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QBRC(_i) (0x01034 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QBTC(_i) (0x06034 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QBRC_L(_i) (0x01034 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QBRC_H(_i) (0x01038 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QPRDC(_i) (0x01430 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QBTC_L(_i) (0x08700 + ((_i) * 0x8)) /* 16 of these */
+#define IXGBE_QBTC_H(_i) (0x08704 + ((_i) * 0x8)) /* 16 of these */
+#define IXGBE_FCCRC     0x05118 /* Count of Good Eth CRC w/ Bad FC CRC */
+#define IXGBE_FCOERPDC  0x0241C /* FCoE Rx Packets Dropped Count */
+#define IXGBE_FCLAST    0x02424 /* FCoE Last Error Count */
+#define IXGBE_FCOEPRC   0x02428 /* Number of FCoE Packets Received */
+#define IXGBE_FCOEDWRC  0x0242C /* Number of FCoE DWords Received */
+#define IXGBE_FCOEPTC   0x08784 /* Number of FCoE Packets Transmitted */
+#define IXGBE_FCOEDWTC  0x08788 /* Number of FCoE DWords Transmitted */
+#define IXGBE_O2BGPTC   0x041C4
+#define IXGBE_O2BSPC    0x087B0
+#define IXGBE_B2OSPC    0x041C0
+#define IXGBE_B2OGPRC   0x02F90
+#define IXGBE_PCRC8ECL  0x0E810
+#define IXGBE_PCRC8ECH  0x0E811
+#define IXGBE_PCRC8ECH_MASK     0x1F
+#define IXGBE_LDPCECL   0x0E820
+#define IXGBE_LDPCECH   0x0E821
+
+/* Management */
+#define IXGBE_MAVTV(_i) (0x05010 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_MFUTP(_i) (0x05030 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_MANC      0x05820
+#define IXGBE_MFVAL     0x05824
+#define IXGBE_MANC2H    0x05860
+#define IXGBE_MDEF(_i)  (0x05890 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_MIPAF     0x058B0
+#define IXGBE_MMAL(_i)  (0x05910 + ((_i) * 8)) /* 4 of these (0-3) */
+#define IXGBE_MMAH(_i)  (0x05914 + ((_i) * 8)) /* 4 of these (0-3) */
+#define IXGBE_FTFT      0x09400 /* 0x9400-0x97FC */
+#define IXGBE_METF(_i)  (0x05190 + ((_i) * 4)) /* 4 of these (0-3) */
+#define IXGBE_MDEF_EXT(_i) (0x05160 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_LSWFW     0x15014
+
+/* ARC Subsystem registers */
+#define IXGBE_HICR      0x15F00
+#define IXGBE_FWSTS     0x15F0C
+#define IXGBE_HSMC0R    0x15F04
+#define IXGBE_HSMC1R    0x15F08
+#define IXGBE_SWSR      0x15F10
+#define IXGBE_HFDR      0x15FE8
+#define IXGBE_FLEX_MNG  0x15800 /* 0x15800 - 0x15EFC */
+
+#define IXGBE_HICR_EN              0x01  /* Enable bit - RO */
+/* Driver sets this bit when done to put command in RAM */
+#define IXGBE_HICR_C               0x02
+#define IXGBE_HICR_SV              0x04  /* Status Validity */
+#define IXGBE_HICR_FW_RESET_ENABLE 0x40
+#define IXGBE_HICR_FW_RESET        0x80
+
+/* PCI-E registers */
+#define IXGBE_GCR       0x11000
+#define IXGBE_GTV       0x11004
+#define IXGBE_FUNCTAG   0x11008
+#define IXGBE_GLT       0x1100C
+#define IXGBE_GSCL_1    0x11010
+#define IXGBE_GSCL_2    0x11014
+#define IXGBE_GSCL_3    0x11018
+#define IXGBE_GSCL_4    0x1101C
+#define IXGBE_GSCN_0    0x11020
+#define IXGBE_GSCN_1    0x11024
+#define IXGBE_GSCN_2    0x11028
+#define IXGBE_GSCN_3    0x1102C
+#define IXGBE_FACTPS    0x10150
+#define IXGBE_PCIEANACTL  0x11040
+#define IXGBE_SWSM      0x10140
+#define IXGBE_FWSM      0x10148
+#define IXGBE_GSSR      0x10160
+#define IXGBE_MREVID    0x11064
+#define IXGBE_DCA_ID    0x11070
+#define IXGBE_DCA_CTRL  0x11074
+#define IXGBE_SWFW_SYNC IXGBE_GSSR
+
+/* PCIe registers 82599-specific */
+#define IXGBE_GCR_EXT           0x11050
+#define IXGBE_GSCL_5_82599      0x11030
+#define IXGBE_GSCL_6_82599      0x11034
+#define IXGBE_GSCL_7_82599      0x11038
+#define IXGBE_GSCL_8_82599      0x1103C
+#define IXGBE_PHYADR_82599      0x11040
+#define IXGBE_PHYDAT_82599      0x11044
+#define IXGBE_PHYCTL_82599      0x11048
+#define IXGBE_PBACLR_82599      0x11068
+#define IXGBE_CIAA_82599        0x11088
+#define IXGBE_CIAD_82599        0x1108C
+#define IXGBE_PICAUSE           0x110B0
+#define IXGBE_PIENA             0x110B8
+#define IXGBE_CDQ_MBR_82599     0x110B4
+#define IXGBE_PCIESPARE         0x110BC
+#define IXGBE_MISC_REG_82599    0x110F0
+#define IXGBE_ECC_CTRL_0_82599  0x11100
+#define IXGBE_ECC_CTRL_1_82599  0x11104
+#define IXGBE_ECC_STATUS_82599  0x110E0
+#define IXGBE_BAR_CTRL_82599    0x110F4
+
+/* PCI Express Control */
+#define IXGBE_GCR_CMPL_TMOUT_MASK       0x0000F000
+#define IXGBE_GCR_CMPL_TMOUT_10ms       0x00001000
+#define IXGBE_GCR_CMPL_TMOUT_RESEND     0x00010000
+#define IXGBE_GCR_CAP_VER2              0x00040000
+
+#define IXGBE_GCR_EXT_MSIX_EN           0x80000000
+#define IXGBE_GCR_EXT_VT_MODE_16        0x00000001
+#define IXGBE_GCR_EXT_VT_MODE_32        0x00000002
+#define IXGBE_GCR_EXT_VT_MODE_64        0x00000003
+#define IXGBE_GCR_EXT_SRIOV             (IXGBE_GCR_EXT_MSIX_EN | \
+                                         IXGBE_GCR_EXT_VT_MODE_64)
+
+/* Time Sync Registers */
+#define IXGBE_TSYNCRXCTL 0x05188 /* Rx Time Sync Control register - RW */
+#define IXGBE_TSYNCTXCTL 0x08C00 /* Tx Time Sync Control register - RW */
+#define IXGBE_RXSTMPL    0x051E8 /* Rx timestamp Low - RO */
+#define IXGBE_RXSTMPH    0x051A4 /* Rx timestamp High - RO */
+#define IXGBE_RXSATRL    0x051A0 /* Rx timestamp attribute low - RO */
+#define IXGBE_RXSATRH    0x051A8 /* Rx timestamp attribute high - RO */
+#define IXGBE_RXMTRL     0x05120 /* RX message type register low - RW */
+#define IXGBE_TXSTMPL    0x08C04 /* Tx timestamp value Low - RO */
+#define IXGBE_TXSTMPH    0x08C08 /* Tx timestamp value High - RO */
+#define IXGBE_SYSTIML    0x08C0C /* System time register Low - RO */
+#define IXGBE_SYSTIMH    0x08C10 /* System time register High - RO */
+#define IXGBE_TIMINCA    0x08C14 /* Increment attributes register - RW */
+#define IXGBE_TIMADJL    0x08C18 /* Time Adjustment Offset register Low - RW */
+#define IXGBE_TIMADJH    0x08C1C /* Time Adjustment Offset register High - RW */
+#define IXGBE_TSAUXC     0x08C20 /* TimeSync Auxiliary Control register - RW */
+#define IXGBE_TRGTTIML0  0x08C24 /* Target Time Register 0 Low - RW */
+#define IXGBE_TRGTTIMH0  0x08C28 /* Target Time Register 0 High - RW */
+#define IXGBE_TRGTTIML1  0x08C2C /* Target Time Register 1 Low - RW */
+#define IXGBE_TRGTTIMH1  0x08C30 /* Target Time Register 1 High - RW */
+#define IXGBE_FREQOUT0   0x08C34 /* Frequency Out 0 Control register - RW */
+#define IXGBE_FREQOUT1   0x08C38 /* Frequency Out 1 Control register - RW */
+#define IXGBE_AUXSTMPL0  0x08C3C /* Auxiliary Time Stamp 0 register Low - RO */
+#define IXGBE_AUXSTMPH0  0x08C40 /* Auxiliary Time Stamp 0 register High - RO */
+#define IXGBE_AUXSTMPL1  0x08C44 /* Auxiliary Time Stamp 1 register Low - RO */
+#define IXGBE_AUXSTMPH1  0x08C48 /* Auxiliary Time Stamp 1 register High - RO */
+
+/* Diagnostic Registers */
+#define IXGBE_RDSTATCTL   0x02C20
+#define IXGBE_RDSTAT(_i)  (0x02C00 + ((_i) * 4)) /* 0x02C00-0x02C1C */
+#define IXGBE_RDHMPN      0x02F08
+#define IXGBE_RIC_DW(_i)  (0x02F10 + ((_i) * 4))
+#define IXGBE_RDPROBE     0x02F20
+#define IXGBE_RDMAM       0x02F30
+#define IXGBE_RDMAD       0x02F34
+#define IXGBE_TDSTATCTL   0x07C20
+#define IXGBE_TDSTAT(_i)  (0x07C00 + ((_i) * 4)) /* 0x07C00 - 0x07C1C */
+#define IXGBE_TDHMPN      0x07F08
+#define IXGBE_TDHMPN2     0x082FC
+#define IXGBE_TXDESCIC    0x082CC
+#define IXGBE_TIC_DW(_i)  (0x07F10 + ((_i) * 4))
+#define IXGBE_TIC_DW2(_i) (0x082B0 + ((_i) * 4))
+#define IXGBE_TDPROBE     0x07F20
+#define IXGBE_TXBUFCTRL   0x0C600
+#define IXGBE_TXBUFDATA0  0x0C610
+#define IXGBE_TXBUFDATA1  0x0C614
+#define IXGBE_TXBUFDATA2  0x0C618
+#define IXGBE_TXBUFDATA3  0x0C61C
+#define IXGBE_RXBUFCTRL   0x03600
+#define IXGBE_RXBUFDATA0  0x03610
+#define IXGBE_RXBUFDATA1  0x03614
+#define IXGBE_RXBUFDATA2  0x03618
+#define IXGBE_RXBUFDATA3  0x0361C
+#define IXGBE_PCIE_DIAG(_i)     (0x11090 + ((_i) * 4)) /* 8 of these */
+#define IXGBE_RFVAL     0x050A4
+#define IXGBE_MDFTC1    0x042B8
+#define IXGBE_MDFTC2    0x042C0
+#define IXGBE_MDFTFIFO1 0x042C4
+#define IXGBE_MDFTFIFO2 0x042C8
+#define IXGBE_MDFTS     0x042CC
+#define IXGBE_RXDATAWRPTR(_i)   (0x03700 + ((_i) * 4)) /* 8 of these 3700-370C*/
+#define IXGBE_RXDESCWRPTR(_i)   (0x03710 + ((_i) * 4)) /* 8 of these 3710-371C*/
+#define IXGBE_RXDATARDPTR(_i)   (0x03720 + ((_i) * 4)) /* 8 of these 3720-372C*/
+#define IXGBE_RXDESCRDPTR(_i)   (0x03730 + ((_i) * 4)) /* 8 of these 3730-373C*/
+#define IXGBE_TXDATAWRPTR(_i)   (0x0C700 + ((_i) * 4)) /* 8 of these C700-C70C*/
+#define IXGBE_TXDESCWRPTR(_i)   (0x0C710 + ((_i) * 4)) /* 8 of these C710-C71C*/
+#define IXGBE_TXDATARDPTR(_i)   (0x0C720 + ((_i) * 4)) /* 8 of these C720-C72C*/
+#define IXGBE_TXDESCRDPTR(_i)   (0x0C730 + ((_i) * 4)) /* 8 of these C730-C73C*/
+#define IXGBE_PCIEECCCTL 0x1106C
+#define IXGBE_RXWRPTR(_i)       (0x03100 + ((_i) * 4)) /* 8 of these 3100-310C*/
+#define IXGBE_RXUSED(_i)        (0x03120 + ((_i) * 4)) /* 8 of these 3120-312C*/
+#define IXGBE_RXRDPTR(_i)       (0x03140 + ((_i) * 4)) /* 8 of these 3140-314C*/
+#define IXGBE_RXRDWRPTR(_i)     (0x03160 + ((_i) * 4)) /* 8 of these 3160-310C*/
+#define IXGBE_TXWRPTR(_i)       (0x0C100 + ((_i) * 4)) /* 8 of these C100-C10C*/
+#define IXGBE_TXUSED(_i)        (0x0C120 + ((_i) * 4)) /* 8 of these C120-C12C*/
+#define IXGBE_TXRDPTR(_i)       (0x0C140 + ((_i) * 4)) /* 8 of these C140-C14C*/
+#define IXGBE_TXRDWRPTR(_i)     (0x0C160 + ((_i) * 4)) /* 8 of these C160-C10C*/
+#define IXGBE_PCIEECCCTL0 0x11100
+#define IXGBE_PCIEECCCTL1 0x11104
+#define IXGBE_RXDBUECC  0x03F70
+#define IXGBE_TXDBUECC  0x0CF70
+#define IXGBE_RXDBUEST 0x03F74
+#define IXGBE_TXDBUEST 0x0CF74
+#define IXGBE_PBTXECC   0x0C300
+#define IXGBE_PBRXECC   0x03300
+#define IXGBE_GHECCR    0x110B0
+
+/* MAC Registers */
+#define IXGBE_PCS1GCFIG 0x04200
+#define IXGBE_PCS1GLCTL 0x04208
+#define IXGBE_PCS1GLSTA 0x0420C
+#define IXGBE_PCS1GDBG0 0x04210
+#define IXGBE_PCS1GDBG1 0x04214
+#define IXGBE_PCS1GANA  0x04218
+#define IXGBE_PCS1GANLP 0x0421C
+#define IXGBE_PCS1GANNP 0x04220
+#define IXGBE_PCS1GANLPNP 0x04224
+#define IXGBE_HLREG0    0x04240
+#define IXGBE_HLREG1    0x04244
+#define IXGBE_PAP       0x04248
+#define IXGBE_MACA      0x0424C
+#define IXGBE_APAE      0x04250
+#define IXGBE_ARD       0x04254
+#define IXGBE_AIS       0x04258
+#define IXGBE_MSCA      0x0425C
+#define IXGBE_MSRWD     0x04260
+#define IXGBE_MLADD     0x04264
+#define IXGBE_MHADD     0x04268
+#define IXGBE_MAXFRS    0x04268
+#define IXGBE_TREG      0x0426C
+#define IXGBE_PCSS1     0x04288
+#define IXGBE_PCSS2     0x0428C
+#define IXGBE_XPCSS     0x04290
+#define IXGBE_MFLCN     0x04294
+#define IXGBE_SERDESC   0x04298
+#define IXGBE_MACS      0x0429C
+#define IXGBE_AUTOC     0x042A0
+#define IXGBE_LINKS     0x042A4
+#define IXGBE_LINKS2    0x04324
+#define IXGBE_AUTOC2    0x042A8
+#define IXGBE_AUTOC3    0x042AC
+#define IXGBE_ANLP1     0x042B0
+#define IXGBE_ANLP2     0x042B4
+#define IXGBE_MACC      0x04330
+#define IXGBE_ATLASCTL  0x04800
+#define IXGBE_MMNGC     0x042D0
+#define IXGBE_ANLPNP1   0x042D4
+#define IXGBE_ANLPNP2   0x042D8
+#define IXGBE_KRPCSFC   0x042E0
+#define IXGBE_KRPCSS    0x042E4
+#define IXGBE_FECS1     0x042E8
+#define IXGBE_FECS2     0x042EC
+#define IXGBE_SMADARCTL 0x14F10
+#define IXGBE_MPVC      0x04318
+#define IXGBE_SGMIIC    0x04314
+
+/* Statistics Registers */
+#define IXGBE_RXNFGPC      0x041B0
+#define IXGBE_RXNFGBCL     0x041B4
+#define IXGBE_RXNFGBCH     0x041B8
+#define IXGBE_RXDGPC       0x02F50
+#define IXGBE_RXDGBCL      0x02F54
+#define IXGBE_RXDGBCH      0x02F58
+#define IXGBE_RXDDGPC      0x02F5C
+#define IXGBE_RXDDGBCL     0x02F60
+#define IXGBE_RXDDGBCH     0x02F64
+#define IXGBE_RXLPBKGPC    0x02F68
+#define IXGBE_RXLPBKGBCL   0x02F6C
+#define IXGBE_RXLPBKGBCH   0x02F70
+#define IXGBE_RXDLPBKGPC   0x02F74
+#define IXGBE_RXDLPBKGBCL  0x02F78
+#define IXGBE_RXDLPBKGBCH  0x02F7C
+#define IXGBE_TXDGPC       0x087A0
+#define IXGBE_TXDGBCL      0x087A4
+#define IXGBE_TXDGBCH      0x087A8
+
+#define IXGBE_RXDSTATCTRL 0x02F40
+
+/* Copper Pond 2 link timeout */
+#define IXGBE_VALIDATE_LINK_READY_TIMEOUT 50
+
+/* Omer CORECTL */
+#define IXGBE_CORECTL           0x014F00
+/* BARCTRL */
+#define IXGBE_BARCTRL               0x110F4
+#define IXGBE_BARCTRL_FLSIZE        0x0700
+#define IXGBE_BARCTRL_FLSIZE_SHIFT  8
+#define IXGBE_BARCTRL_CSRSIZE       0x2000
+
+/* RSCCTL Bit Masks */
+#define IXGBE_RSCCTL_RSCEN          0x01
+#define IXGBE_RSCCTL_MAXDESC_1      0x00
+#define IXGBE_RSCCTL_MAXDESC_4      0x04
+#define IXGBE_RSCCTL_MAXDESC_8      0x08
+#define IXGBE_RSCCTL_MAXDESC_16     0x0C
+
+/* RSCDBU Bit Masks */
+#define IXGBE_RSCDBU_RSCSMALDIS_MASK    0x0000007F
+#define IXGBE_RSCDBU_RSCACKDIS          0x00000080
+
+/* RDRXCTL Bit Masks */
+#define IXGBE_RDRXCTL_RDMTS_1_2     0x00000000 /* Rx Desc Min Threshold Size */
+#define IXGBE_RDRXCTL_CRCSTRIP      0x00000002 /* CRC Strip */
+#define IXGBE_RDRXCTL_MVMEN         0x00000020
+#define IXGBE_RDRXCTL_DMAIDONE      0x00000008 /* DMA init cycle done */
+#define IXGBE_RDRXCTL_AGGDIS        0x00010000 /* Aggregation disable */
+#define IXGBE_RDRXCTL_RSCFRSTSIZE   0x003E0000 /* RSC First packet size */
+#define IXGBE_RDRXCTL_RSCLLIDIS     0x00800000 /* Disable RSC compl on LLI */
+#define IXGBE_RDRXCTL_RSCACKC       0x02000000 /* must set 1 when RSC enabled */
+#define IXGBE_RDRXCTL_FCOE_WRFIX    0x04000000 /* must set 1 when RSC enabled */
+
+/* RQTC Bit Masks and Shifts */
+#define IXGBE_RQTC_SHIFT_TC(_i)     ((_i) * 4)
+#define IXGBE_RQTC_TC0_MASK         (0x7 << 0)
+#define IXGBE_RQTC_TC1_MASK         (0x7 << 4)
+#define IXGBE_RQTC_TC2_MASK         (0x7 << 8)
+#define IXGBE_RQTC_TC3_MASK         (0x7 << 12)
+#define IXGBE_RQTC_TC4_MASK         (0x7 << 16)
+#define IXGBE_RQTC_TC5_MASK         (0x7 << 20)
+#define IXGBE_RQTC_TC6_MASK         (0x7 << 24)
+#define IXGBE_RQTC_TC7_MASK         (0x7 << 28)
+
+/* PSRTYPE.RQPL Bit masks and shift */
+#define IXGBE_PSRTYPE_RQPL_MASK     0x7
+#define IXGBE_PSRTYPE_RQPL_SHIFT    29
+
+/* CTRL Bit Masks */
+#define IXGBE_CTRL_GIO_DIS      0x00000004 /* Global IO Master Disable bit */
+#define IXGBE_CTRL_LNK_RST      0x00000008 /* Link Reset. Resets everything. */
+#define IXGBE_CTRL_RST          0x04000000 /* Reset (SW) */
+
+/* FACTPS */
+#define IXGBE_FACTPS_LFS        0x40000000 /* LAN Function Select */
+
+/* MHADD Bit Masks */
+#define IXGBE_MHADD_MFS_MASK    0xFFFF0000
+#define IXGBE_MHADD_MFS_SHIFT   16
+
+/* Extended Device Control */
+#define IXGBE_CTRL_EXT_PFRSTD   0x00004000 /* Physical Function Reset Done */
+#define IXGBE_CTRL_EXT_NS_DIS   0x00010000 /* No Snoop disable */
+#define IXGBE_CTRL_EXT_RO_DIS   0x00020000 /* Relaxed Ordering disable */
+#define IXGBE_CTRL_EXT_DRV_LOAD 0x10000000 /* Driver loaded bit for FW */
+
+/* Direct Cache Access (DCA) definitions */
+#define IXGBE_DCA_CTRL_DCA_ENABLE  0x00000000 /* DCA Enable */
+#define IXGBE_DCA_CTRL_DCA_DISABLE 0x00000001 /* DCA Disable */
+
+#define IXGBE_DCA_CTRL_DCA_MODE_CB1 0x00 /* DCA Mode CB1 */
+#define IXGBE_DCA_CTRL_DCA_MODE_CB2 0x02 /* DCA Mode CB2 */
+
+#define IXGBE_DCA_RXCTRL_CPUID_MASK 0x0000001F /* Rx CPUID Mask */
+#define IXGBE_DCA_RXCTRL_CPUID_MASK_82599  0xFF000000 /* Rx CPUID Mask */
+#define IXGBE_DCA_RXCTRL_CPUID_SHIFT_82599 24 /* Rx CPUID Shift */
+#define IXGBE_DCA_RXCTRL_DESC_DCA_EN (1 << 5) /* DCA Rx Desc enable */
+#define IXGBE_DCA_RXCTRL_HEAD_DCA_EN (1 << 6) /* DCA Rx Desc header enable */
+#define IXGBE_DCA_RXCTRL_DATA_DCA_EN (1 << 7) /* DCA Rx Desc payload enable */
+#define IXGBE_DCA_RXCTRL_DESC_RRO_EN (1 << 9) /* DCA Rx rd Desc Relax Order */
+#define IXGBE_DCA_RXCTRL_DESC_WRO_EN (1 << 13) /* DCA Rx wr Desc Relax Order */
+#define IXGBE_DCA_RXCTRL_DESC_HSRO_EN (1 << 15) /* DCA Rx Split Header RO */
+
+#define IXGBE_DCA_TXCTRL_CPUID_MASK 0x0000001F /* Tx CPUID Mask */
+#define IXGBE_DCA_TXCTRL_CPUID_MASK_82599  0xFF000000 /* Tx CPUID Mask */
+#define IXGBE_DCA_TXCTRL_CPUID_SHIFT_82599 24 /* Tx CPUID Shift */
+#define IXGBE_DCA_TXCTRL_DESC_DCA_EN (1 << 5) /* DCA Tx Desc enable */
+#define IXGBE_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
+#define IXGBE_DCA_MAX_QUEUES_82598   16 /* DCA regs only on 16 queues */
+
+/* MSCA Bit Masks */
+#define IXGBE_MSCA_NP_ADDR_MASK      0x0000FFFF /* MDI Address (new protocol) */
+#define IXGBE_MSCA_NP_ADDR_SHIFT     0
+#define IXGBE_MSCA_DEV_TYPE_MASK     0x001F0000 /* Device Type (new protocol) */
+#define IXGBE_MSCA_DEV_TYPE_SHIFT    16 /* Register Address (old protocol */
+#define IXGBE_MSCA_PHY_ADDR_MASK     0x03E00000 /* PHY Address mask */
+#define IXGBE_MSCA_PHY_ADDR_SHIFT    21 /* PHY Address shift*/
+#define IXGBE_MSCA_OP_CODE_MASK      0x0C000000 /* OP CODE mask */
+#define IXGBE_MSCA_OP_CODE_SHIFT     26 /* OP CODE shift */
+#define IXGBE_MSCA_ADDR_CYCLE        0x00000000 /* OP CODE 00 (addr cycle) */
+#define IXGBE_MSCA_WRITE             0x04000000 /* OP CODE 01 (write) */
+#define IXGBE_MSCA_READ              0x0C000000 /* OP CODE 11 (read) */
+#define IXGBE_MSCA_READ_AUTOINC      0x08000000 /* OP CODE 10 (read, auto inc)*/
+#define IXGBE_MSCA_ST_CODE_MASK      0x30000000 /* ST Code mask */
+#define IXGBE_MSCA_ST_CODE_SHIFT     28 /* ST Code shift */
+#define IXGBE_MSCA_NEW_PROTOCOL      0x00000000 /* ST CODE 00 (new protocol) */
+#define IXGBE_MSCA_OLD_PROTOCOL      0x10000000 /* ST CODE 01 (old protocol) */
+#define IXGBE_MSCA_MDI_COMMAND       0x40000000 /* Initiate MDI command */
+#define IXGBE_MSCA_MDI_IN_PROG_EN    0x80000000 /* MDI in progress enable */
+
+/* MSRWD bit masks */
+#define IXGBE_MSRWD_WRITE_DATA_MASK     0x0000FFFF
+#define IXGBE_MSRWD_WRITE_DATA_SHIFT    0
+#define IXGBE_MSRWD_READ_DATA_MASK      0xFFFF0000
+#define IXGBE_MSRWD_READ_DATA_SHIFT     16
+
+/* Atlas registers */
+#define IXGBE_ATLAS_PDN_LPBK    0x24
+#define IXGBE_ATLAS_PDN_10G     0xB
+#define IXGBE_ATLAS_PDN_1G      0xC
+#define IXGBE_ATLAS_PDN_AN      0xD
+
+/* Atlas bit masks */
+#define IXGBE_ATLASCTL_WRITE_CMD        0x00010000
+#define IXGBE_ATLAS_PDN_TX_REG_EN       0x10
+#define IXGBE_ATLAS_PDN_TX_10G_QL_ALL   0xF0
+#define IXGBE_ATLAS_PDN_TX_1G_QL_ALL    0xF0
+#define IXGBE_ATLAS_PDN_TX_AN_QL_ALL    0xF0
+
+/* Omer bit masks */
+#define IXGBE_CORECTL_WRITE_CMD         0x00010000
+
+/* MDIO definitions */
+
+#define IXGBE_MDIO_COMMAND_TIMEOUT     100 /* PHY Timeout for 1 GB mode */
+
+#define IXGBE_MDIO_VENDOR_SPECIFIC_1_CONTROL      0x0    /* VS1 Control Reg */
+#define IXGBE_MDIO_VENDOR_SPECIFIC_1_STATUS       0x1    /* VS1 Status Reg */
+#define IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS  0x0008 /* 1 = Link Up */
+#define IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS 0x0010 /* 0 - 10G, 1 - 1G */
+#define IXGBE_MDIO_VENDOR_SPECIFIC_1_10G_SPEED    0x0018
+#define IXGBE_MDIO_VENDOR_SPECIFIC_1_1G_SPEED     0x0010
+
+#define IXGBE_MDIO_PMA_PMD_SDA_SCL_ADDR     0xC30A /* PHY_XS SDA/SCL Addr Reg */
+#define IXGBE_MDIO_PMA_PMD_SDA_SCL_DATA     0xC30B /* PHY_XS SDA/SCL Data Reg */
+#define IXGBE_MDIO_PMA_PMD_SDA_SCL_STAT     0xC30C /* PHY_XS SDA/SCL Status Reg */
+
+/* MII clause 22/28 definitions */
+#define IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG 0xC400 /* 1G Provisioning 1 */
+#define IXGBE_MII_AUTONEG_XNP_TX_REG             0x17   /* 1G XNP Transmit */
+#define IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX      0x4000 /* full duplex, bit:14*/
+#define IXGBE_MII_1GBASE_T_ADVERTISE             0x8000 /* full duplex, bit:15*/
+#define IXGBE_MII_AUTONEG_REG                    0x0
+
+#define IXGBE_PHY_REVISION_MASK        0xFFFFFFF0
+#define IXGBE_MAX_PHY_ADDR             32
+
+/* PHY IDs*/
+#define TN1010_PHY_ID    0x00A19410
+#define TNX_FW_REV       0xB
+#define X540_PHY_ID      0x01540200
+#define QT2022_PHY_ID    0x0043A400
+#define ATH_PHY_ID       0x03429050
+#define AQ_FW_REV        0x20
+
+/* PHY Types */
+#define IXGBE_M88E1145_E_PHY_ID  0x01410CD0
+
+/* Special PHY Init Routine */
+#define IXGBE_PHY_INIT_OFFSET_NL 0x002B
+#define IXGBE_PHY_INIT_END_NL    0xFFFF
+#define IXGBE_CONTROL_MASK_NL    0xF000
+#define IXGBE_DATA_MASK_NL       0x0FFF
+#define IXGBE_CONTROL_SHIFT_NL   12
+#define IXGBE_DELAY_NL           0
+#define IXGBE_DATA_NL            1
+#define IXGBE_CONTROL_NL         0x000F
+#define IXGBE_CONTROL_EOL_NL     0x0FFF
+#define IXGBE_CONTROL_SOL_NL     0x0000
+
+/* General purpose Interrupt Enable */
+#define IXGBE_SDP0_GPIEN         0x00000001 /* SDP0 */
+#define IXGBE_SDP1_GPIEN         0x00000002 /* SDP1 */
+#define IXGBE_SDP2_GPIEN         0x00000004 /* SDP2 */
+#define IXGBE_GPIE_MSIX_MODE     0x00000010 /* MSI-X mode */
+#define IXGBE_GPIE_OCD           0x00000020 /* Other Clear Disable */
+#define IXGBE_GPIE_EIMEN         0x00000040 /* Immediate Interrupt Enable */
+#define IXGBE_GPIE_EIAME         0x40000000
+#define IXGBE_GPIE_PBA_SUPPORT   0x80000000
+#define IXGBE_GPIE_RSC_DELAY_SHIFT 11
+#define IXGBE_GPIE_VTMODE_MASK   0x0000C000 /* VT Mode Mask */
+#define IXGBE_GPIE_VTMODE_16     0x00004000 /* 16 VFs 8 queues per VF */
+#define IXGBE_GPIE_VTMODE_32     0x00008000 /* 32 VFs 4 queues per VF */
+#define IXGBE_GPIE_VTMODE_64     0x0000C000 /* 64 VFs 2 queues per VF */
+
+/* Packet Buffer Initialization */
+#define IXGBE_TXPBSIZE_20KB     0x00005000 /* 20KB Packet Buffer */
+#define IXGBE_TXPBSIZE_40KB     0x0000A000 /* 40KB Packet Buffer */
+#define IXGBE_RXPBSIZE_48KB     0x0000C000 /* 48KB Packet Buffer */
+#define IXGBE_RXPBSIZE_64KB     0x00010000 /* 64KB Packet Buffer */
+#define IXGBE_RXPBSIZE_80KB     0x00014000 /* 80KB Packet Buffer */
+#define IXGBE_RXPBSIZE_128KB    0x00020000 /* 128KB Packet Buffer */
+#define IXGBE_RXPBSIZE_MAX      0x00080000 /* 512KB Packet Buffer*/
+#define IXGBE_TXPBSIZE_MAX      0x00028000 /* 160KB Packet Buffer*/
+
+#define IXGBE_TXPKT_SIZE_MAX    0xA        /* Max Tx Packet size  */
+#define IXGBE_MAX_PB           8
+
+/* Packet buffer allocation strategies */
+enum {
+       PBA_STRATEGY_EQUAL      = 0,    /* Distribute PB space equally */
+#define PBA_STRATEGY_EQUAL     PBA_STRATEGY_EQUAL
+       PBA_STRATEGY_WEIGHTED   = 1,    /* Weight front half of TCs */
+#define PBA_STRATEGY_WEIGHTED  PBA_STRATEGY_WEIGHTED
+};
+
+/* Transmit Flow Control status */
+#define IXGBE_TFCS_TXOFF         0x00000001
+#define IXGBE_TFCS_TXOFF0        0x00000100
+#define IXGBE_TFCS_TXOFF1        0x00000200
+#define IXGBE_TFCS_TXOFF2        0x00000400
+#define IXGBE_TFCS_TXOFF3        0x00000800
+#define IXGBE_TFCS_TXOFF4        0x00001000
+#define IXGBE_TFCS_TXOFF5        0x00002000
+#define IXGBE_TFCS_TXOFF6        0x00004000
+#define IXGBE_TFCS_TXOFF7        0x00008000
+
+/* TCP Timer */
+#define IXGBE_TCPTIMER_KS            0x00000100
+#define IXGBE_TCPTIMER_COUNT_ENABLE  0x00000200
+#define IXGBE_TCPTIMER_COUNT_FINISH  0x00000400
+#define IXGBE_TCPTIMER_LOOP          0x00000800
+#define IXGBE_TCPTIMER_DURATION_MASK 0x000000FF
+
+/* HLREG0 Bit Masks */
+#define IXGBE_HLREG0_TXCRCEN      0x00000001   /* bit  0 */
+#define IXGBE_HLREG0_RXCRCSTRP    0x00000002   /* bit  1 */
+#define IXGBE_HLREG0_JUMBOEN      0x00000004   /* bit  2 */
+#define IXGBE_HLREG0_TXPADEN      0x00000400   /* bit 10 */
+#define IXGBE_HLREG0_TXPAUSEEN    0x00001000   /* bit 12 */
+#define IXGBE_HLREG0_RXPAUSEEN    0x00004000   /* bit 14 */
+#define IXGBE_HLREG0_LPBK         0x00008000   /* bit 15 */
+#define IXGBE_HLREG0_MDCSPD       0x00010000   /* bit 16 */
+#define IXGBE_HLREG0_CONTMDC      0x00020000   /* bit 17 */
+#define IXGBE_HLREG0_CTRLFLTR     0x00040000   /* bit 18 */
+#define IXGBE_HLREG0_PREPEND      0x00F00000   /* bits 20-23 */
+#define IXGBE_HLREG0_PRIPAUSEEN   0x01000000   /* bit 24 */
+#define IXGBE_HLREG0_RXPAUSERECDA 0x06000000   /* bits 25-26 */
+#define IXGBE_HLREG0_RXLNGTHERREN 0x08000000   /* bit 27 */
+#define IXGBE_HLREG0_RXPADSTRIPEN 0x10000000   /* bit 28 */
+
+/* VMD_CTL bitmasks */
+#define IXGBE_VMD_CTL_VMDQ_EN     0x00000001
+#define IXGBE_VMD_CTL_VMDQ_FILTER 0x00000002
+
+/* VT_CTL bitmasks */
+#define IXGBE_VT_CTL_DIS_DEFPL  0x20000000 /* disable default pool */
+#define IXGBE_VT_CTL_REPLEN     0x40000000 /* replication enabled */
+#define IXGBE_VT_CTL_VT_ENABLE  0x00000001  /* Enable VT Mode */
+#define IXGBE_VT_CTL_POOL_SHIFT 7
+#define IXGBE_VT_CTL_POOL_MASK  (0x3F << IXGBE_VT_CTL_POOL_SHIFT)
+
+/* VMOLR bitmasks */
+#define IXGBE_VMOLR_AUPE        0x01000000 /* accept untagged packets */
+#define IXGBE_VMOLR_ROMPE       0x02000000 /* accept packets in MTA tbl */
+#define IXGBE_VMOLR_ROPE        0x04000000 /* accept packets in UC tbl */
+#define IXGBE_VMOLR_BAM         0x08000000 /* accept broadcast packets */
+#define IXGBE_VMOLR_MPE         0x10000000 /* multicast promiscuous */
+
+/* VFRE bitmask */
+#define IXGBE_VFRE_ENABLE_ALL   0xFFFFFFFF
+
+#define IXGBE_VF_INIT_TIMEOUT   200 /* Number of retries to clear RSTI */
+
+/* RDHMPN and TDHMPN bitmasks */
+#define IXGBE_RDHMPN_RDICADDR       0x007FF800
+#define IXGBE_RDHMPN_RDICRDREQ      0x00800000
+#define IXGBE_RDHMPN_RDICADDR_SHIFT 11
+#define IXGBE_TDHMPN_TDICADDR       0x003FF800
+#define IXGBE_TDHMPN_TDICRDREQ      0x00800000
+#define IXGBE_TDHMPN_TDICADDR_SHIFT 11
+
+#define IXGBE_RDMAM_MEM_SEL_SHIFT   13
+#define IXGBE_RDMAM_DWORD_SHIFT     9
+#define IXGBE_RDMAM_DESC_COMP_FIFO  1
+#define IXGBE_RDMAM_DFC_CMD_FIFO    2
+#define IXGBE_RDMAM_TCN_STATUS_RAM  4
+#define IXGBE_RDMAM_WB_COLL_FIFO    5
+#define IXGBE_RDMAM_QSC_CNT_RAM     6
+#define IXGBE_RDMAM_QSC_QUEUE_CNT   8
+#define IXGBE_RDMAM_QSC_QUEUE_RAM   0xA
+#define IXGBE_RDMAM_DESC_COM_FIFO_RANGE     135
+#define IXGBE_RDMAM_DESC_COM_FIFO_COUNT     4
+#define IXGBE_RDMAM_DFC_CMD_FIFO_RANGE      48
+#define IXGBE_RDMAM_DFC_CMD_FIFO_COUNT      7
+#define IXGBE_RDMAM_TCN_STATUS_RAM_RANGE    256
+#define IXGBE_RDMAM_TCN_STATUS_RAM_COUNT    9
+#define IXGBE_RDMAM_WB_COLL_FIFO_RANGE      8
+#define IXGBE_RDMAM_WB_COLL_FIFO_COUNT      4
+#define IXGBE_RDMAM_QSC_CNT_RAM_RANGE       64
+#define IXGBE_RDMAM_QSC_CNT_RAM_COUNT       4
+#define IXGBE_RDMAM_QSC_QUEUE_CNT_RANGE     32
+#define IXGBE_RDMAM_QSC_QUEUE_CNT_COUNT     4
+#define IXGBE_RDMAM_QSC_QUEUE_RAM_RANGE     128
+#define IXGBE_RDMAM_QSC_QUEUE_RAM_COUNT     8
+
+#define IXGBE_TXDESCIC_READY        0x80000000
+
+/* Receive Checksum Control */
+#define IXGBE_RXCSUM_IPPCSE     0x00001000   /* IP payload checksum enable */
+#define IXGBE_RXCSUM_PCSD       0x00002000   /* packet checksum disabled */
+
+/* FCRTL Bit Masks */
+#define IXGBE_FCRTL_XONE        0x80000000  /* XON enable */
+#define IXGBE_FCRTH_FCEN        0x80000000  /* Packet buffer fc enable */
+
+/* PAP bit masks*/
+#define IXGBE_PAP_TXPAUSECNT_MASK   0x0000FFFF /* Pause counter mask */
+
+/* RMCS Bit Masks */
+#define IXGBE_RMCS_RRM          0x00000002 /* Receive Recycle Mode enable */
+/* Receive Arbitration Control: 0 Round Robin, 1 DFP */
+#define IXGBE_RMCS_RAC          0x00000004
+#define IXGBE_RMCS_DFP          IXGBE_RMCS_RAC /* Deficit Fixed Priority ena */
+#define IXGBE_RMCS_TFCE_802_3X         0x00000008 /* Tx Priority FC ena */
+#define IXGBE_RMCS_TFCE_PRIORITY       0x00000010 /* Tx Priority FC ena */
+#define IXGBE_RMCS_ARBDIS       0x00000040 /* Arbitration disable bit */
+
+/* FCCFG Bit Masks */
+#define IXGBE_FCCFG_TFCE_802_3X         0x00000008 /* Tx link FC enable */
+#define IXGBE_FCCFG_TFCE_PRIORITY       0x00000010 /* Tx priority FC enable */
+
+/* Interrupt register bitmasks */
+
+/* Extended Interrupt Cause Read */
+#define IXGBE_EICR_RTX_QUEUE    0x0000FFFF /* RTx Queue Interrupt */
+#define IXGBE_EICR_FLOW_DIR     0x00010000 /* FDir Exception */
+#define IXGBE_EICR_RX_MISS      0x00020000 /* Packet Buffer Overrun */
+#define IXGBE_EICR_PCI          0x00040000 /* PCI Exception */
+#define IXGBE_EICR_MAILBOX      0x00080000 /* VF to PF Mailbox Interrupt */
+#define IXGBE_EICR_LSC          0x00100000 /* Link Status Change */
+#define IXGBE_EICR_LINKSEC      0x00200000 /* PN Threshold */
+#define IXGBE_EICR_MNG          0x00400000 /* Manageability Event Interrupt */
+#define IXGBE_EICR_GPI_SDP0     0x01000000 /* Gen Purpose Interrupt on SDP0 */
+#define IXGBE_EICR_GPI_SDP1     0x02000000 /* Gen Purpose Interrupt on SDP1 */
+#define IXGBE_EICR_GPI_SDP2     0x04000000 /* Gen Purpose Interrupt on SDP2 */
+#define IXGBE_EICR_ECC          0x10000000 /* ECC Error */
+#define IXGBE_EICR_PBUR         0x10000000 /* Packet Buffer Handler Error */
+#define IXGBE_EICR_DHER         0x20000000 /* Descriptor Handler Error */
+#define IXGBE_EICR_TCP_TIMER    0x40000000 /* TCP Timer */
+#define IXGBE_EICR_OTHER        0x80000000 /* Interrupt Cause Active */
+
+/* Extended Interrupt Cause Set */
+#define IXGBE_EICS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
+#define IXGBE_EICS_FLOW_DIR     IXGBE_EICR_FLOW_DIR  /* FDir Exception */
+#define IXGBE_EICS_RX_MISS      IXGBE_EICR_RX_MISS   /* Pkt Buffer Overrun */
+#define IXGBE_EICS_PCI          IXGBE_EICR_PCI       /* PCI Exception */
+#define IXGBE_EICS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
+#define IXGBE_EICS_LSC          IXGBE_EICR_LSC       /* Link Status Change */
+#define IXGBE_EICS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
+#define IXGBE_EICS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
+#define IXGBE_EICS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
+#define IXGBE_EICS_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
+#define IXGBE_EICS_ECC          IXGBE_EICR_ECC       /* ECC Error */
+#define IXGBE_EICS_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */
+#define IXGBE_EICS_DHER         IXGBE_EICR_DHER      /* Desc Handler Error */
+#define IXGBE_EICS_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */
+#define IXGBE_EICS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
+
+/* Extended Interrupt Mask Set */
+#define IXGBE_EIMS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
+#define IXGBE_EIMS_FLOW_DIR     IXGBE_EICR_FLOW_DIR  /* FDir Exception */
+#define IXGBE_EIMS_RX_MISS      IXGBE_EICR_RX_MISS   /* Packet Buffer Overrun */
+#define IXGBE_EIMS_PCI          IXGBE_EICR_PCI       /* PCI Exception */
+#define IXGBE_EIMS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
+#define IXGBE_EIMS_LSC          IXGBE_EICR_LSC       /* Link Status Change */
+#define IXGBE_EIMS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
+#define IXGBE_EIMS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
+#define IXGBE_EIMS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
+#define IXGBE_EIMS_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
+#define IXGBE_EIMS_ECC          IXGBE_EICR_ECC       /* ECC Error */
+#define IXGBE_EIMS_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */
+#define IXGBE_EIMS_DHER         IXGBE_EICR_DHER      /* Descr Handler Error */
+#define IXGBE_EIMS_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */
+#define IXGBE_EIMS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
+
+/* Extended Interrupt Mask Clear */
+#define IXGBE_EIMC_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
+#define IXGBE_EIMC_FLOW_DIR     IXGBE_EICR_FLOW_DIR  /* FDir Exception */
+#define IXGBE_EIMC_RX_MISS      IXGBE_EICR_RX_MISS   /* Packet Buffer Overrun */
+#define IXGBE_EIMC_PCI          IXGBE_EICR_PCI       /* PCI Exception */
+#define IXGBE_EIMC_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
+#define IXGBE_EIMC_LSC          IXGBE_EICR_LSC       /* Link Status Change */
+#define IXGBE_EIMC_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
+#define IXGBE_EIMC_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
+#define IXGBE_EIMC_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
+#define IXGBE_EIMC_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
+#define IXGBE_EIMC_ECC          IXGBE_EICR_ECC       /* ECC Error */
+#define IXGBE_EIMC_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */
+#define IXGBE_EIMC_DHER         IXGBE_EICR_DHER      /* Desc Handler Err */
+#define IXGBE_EIMC_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */
+#define IXGBE_EIMC_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
+
+#define IXGBE_EIMS_ENABLE_MASK ( \
+                                IXGBE_EIMS_RTX_QUEUE       | \
+                                IXGBE_EIMS_LSC             | \
+                                IXGBE_EIMS_TCP_TIMER       | \
+                                IXGBE_EIMS_OTHER)
+
+/* Immediate Interrupt Rx (A.K.A. Low Latency Interrupt) */
+#define IXGBE_IMIR_PORT_IM_EN     0x00010000  /* TCP port enable */
+#define IXGBE_IMIR_PORT_BP        0x00020000  /* TCP port check bypass */
+#define IXGBE_IMIREXT_SIZE_BP     0x00001000  /* Packet size bypass */
+#define IXGBE_IMIREXT_CTRL_URG    0x00002000  /* Check URG bit in header */
+#define IXGBE_IMIREXT_CTRL_ACK    0x00004000  /* Check ACK bit in header */
+#define IXGBE_IMIREXT_CTRL_PSH    0x00008000  /* Check PSH bit in header */
+#define IXGBE_IMIREXT_CTRL_RST    0x00010000  /* Check RST bit in header */
+#define IXGBE_IMIREXT_CTRL_SYN    0x00020000  /* Check SYN bit in header */
+#define IXGBE_IMIREXT_CTRL_FIN    0x00040000  /* Check FIN bit in header */
+#define IXGBE_IMIREXT_CTRL_BP     0x00080000  /* Bypass check of control bits */
+#define IXGBE_IMIR_SIZE_BP_82599  0x00001000 /* Packet size bypass */
+#define IXGBE_IMIR_CTRL_URG_82599 0x00002000 /* Check URG bit in header */
+#define IXGBE_IMIR_CTRL_ACK_82599 0x00004000 /* Check ACK bit in header */
+#define IXGBE_IMIR_CTRL_PSH_82599 0x00008000 /* Check PSH bit in header */
+#define IXGBE_IMIR_CTRL_RST_82599 0x00010000 /* Check RST bit in header */
+#define IXGBE_IMIR_CTRL_SYN_82599 0x00020000 /* Check SYN bit in header */
+#define IXGBE_IMIR_CTRL_FIN_82599 0x00040000 /* Check FIN bit in header */
+#define IXGBE_IMIR_CTRL_BP_82599  0x00080000 /* Bypass check of control bits */
+#define IXGBE_IMIR_LLI_EN_82599   0x00100000 /* Enables low latency Int */
+#define IXGBE_IMIR_RX_QUEUE_MASK_82599  0x0000007F /* Rx Queue Mask */
+#define IXGBE_IMIR_RX_QUEUE_SHIFT_82599 21 /* Rx Queue Shift */
+#define IXGBE_IMIRVP_PRIORITY_MASK      0x00000007 /* VLAN priority mask */
+#define IXGBE_IMIRVP_PRIORITY_EN        0x00000008 /* VLAN priority enable */
+
+#define IXGBE_MAX_FTQF_FILTERS          128
+#define IXGBE_FTQF_PROTOCOL_MASK        0x00000003
+#define IXGBE_FTQF_PROTOCOL_TCP         0x00000000
+#define IXGBE_FTQF_PROTOCOL_UDP         0x00000001
+#define IXGBE_FTQF_PROTOCOL_SCTP        2
+#define IXGBE_FTQF_PRIORITY_MASK        0x00000007
+#define IXGBE_FTQF_PRIORITY_SHIFT       2
+#define IXGBE_FTQF_POOL_MASK            0x0000003F
+#define IXGBE_FTQF_POOL_SHIFT           8
+#define IXGBE_FTQF_5TUPLE_MASK_MASK     0x0000001F
+#define IXGBE_FTQF_5TUPLE_MASK_SHIFT    25
+#define IXGBE_FTQF_SOURCE_ADDR_MASK     0x1E
+#define IXGBE_FTQF_DEST_ADDR_MASK       0x1D
+#define IXGBE_FTQF_SOURCE_PORT_MASK     0x1B
+#define IXGBE_FTQF_DEST_PORT_MASK       0x17
+#define IXGBE_FTQF_PROTOCOL_COMP_MASK   0x0F
+#define IXGBE_FTQF_POOL_MASK_EN         0x40000000
+#define IXGBE_FTQF_QUEUE_ENABLE         0x80000000
+
+/* Interrupt clear mask */
+#define IXGBE_IRQ_CLEAR_MASK    0xFFFFFFFF
+
+/* Interrupt Vector Allocation Registers */
+#define IXGBE_IVAR_REG_NUM      25
+#define IXGBE_IVAR_REG_NUM_82599       64
+#define IXGBE_IVAR_TXRX_ENTRY   96
+#define IXGBE_IVAR_RX_ENTRY     64
+#define IXGBE_IVAR_RX_QUEUE(_i)    (0 + (_i))
+#define IXGBE_IVAR_TX_QUEUE(_i)    (64 + (_i))
+#define IXGBE_IVAR_TX_ENTRY     32
+
+#define IXGBE_IVAR_TCP_TIMER_INDEX       96 /* 0 based index */
+#define IXGBE_IVAR_OTHER_CAUSES_INDEX    97 /* 0 based index */
+
+#define IXGBE_MSIX_VECTOR(_i)   (0 + (_i))
+
+#define IXGBE_IVAR_ALLOC_VAL    0x80 /* Interrupt Allocation valid */
+
+/* ETYPE Queue Filter/Select Bit Masks */
+#define IXGBE_MAX_ETQF_FILTERS  8
+#define IXGBE_ETQF_FCOE         0x08000000 /* bit 27 */
+#define IXGBE_ETQF_BCN          0x10000000 /* bit 28 */
+#define IXGBE_ETQF_1588         0x40000000 /* bit 30 */
+#define IXGBE_ETQF_FILTER_EN    0x80000000 /* bit 31 */
+#define IXGBE_ETQF_POOL_ENABLE   (1 << 26) /* bit 26 */
+
+#define IXGBE_ETQS_RX_QUEUE     0x007F0000 /* bits 22:16 */
+#define IXGBE_ETQS_RX_QUEUE_SHIFT       16
+#define IXGBE_ETQS_LLI          0x20000000 /* bit 29 */
+#define IXGBE_ETQS_QUEUE_EN     0x80000000 /* bit 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
+ *    FCoE (0x8906):         Filter 2
+ *    1588 (0x88f7):         Filter 3
+ *    FIP  (0x8914):         Filter 4
+ */
+#define IXGBE_ETQF_FILTER_EAPOL          0
+#define IXGBE_ETQF_FILTER_FCOE           2
+#define IXGBE_ETQF_FILTER_1588           3
+#define IXGBE_ETQF_FILTER_FIP            4
+/* VLAN Control Bit Masks */
+#define IXGBE_VLNCTRL_VET       0x0000FFFF  /* bits 0-15 */
+#define IXGBE_VLNCTRL_CFI       0x10000000  /* bit 28 */
+#define IXGBE_VLNCTRL_CFIEN     0x20000000  /* bit 29 */
+#define IXGBE_VLNCTRL_VFE       0x40000000  /* bit 30 */
+#define IXGBE_VLNCTRL_VME       0x80000000  /* bit 31 */
+
+/* VLAN pool filtering masks */
+#define IXGBE_VLVF_VIEN         0x80000000  /* filter is valid */
+#define IXGBE_VLVF_ENTRIES      64
+#define IXGBE_VLVF_VLANID_MASK  0x00000FFF
+
+/* Per VF Port VLAN insertion rules */
+#define IXGBE_VMVIR_VLANA_DEFAULT 0x40000000 /* Always use default VLAN */
+#define IXGBE_VMVIR_VLANA_NEVER   0x80000000 /* Never insert VLAN tag */
+
+#define IXGBE_ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.1q protocol */
+
+/* STATUS Bit Masks */
+#define IXGBE_STATUS_LAN_ID         0x0000000C /* LAN ID */
+#define IXGBE_STATUS_LAN_ID_SHIFT   2          /* LAN ID Shift*/
+#define IXGBE_STATUS_GIO            0x00080000 /* GIO Master Enable Status */
+
+#define IXGBE_STATUS_LAN_ID_0   0x00000000 /* LAN ID 0 */
+#define IXGBE_STATUS_LAN_ID_1   0x00000004 /* LAN ID 1 */
+
+/* ESDP Bit Masks */
+#define IXGBE_ESDP_SDP0 0x00000001 /* SDP0 Data Value */
+#define IXGBE_ESDP_SDP1 0x00000002 /* SDP1 Data Value */
+#define IXGBE_ESDP_SDP2 0x00000004 /* SDP2 Data Value */
+#define IXGBE_ESDP_SDP3 0x00000008 /* SDP3 Data Value */
+#define IXGBE_ESDP_SDP4 0x00000010 /* SDP4 Data Value */
+#define IXGBE_ESDP_SDP5 0x00000020 /* SDP5 Data Value */
+#define IXGBE_ESDP_SDP6 0x00000040 /* SDP6 Data Value */
+#define IXGBE_ESDP_SDP4_DIR     0x00000004 /* SDP4 IO direction */
+#define IXGBE_ESDP_SDP5_DIR     0x00002000 /* SDP5 IO direction */
+
+/* LEDCTL Bit Masks */
+#define IXGBE_LED_IVRT_BASE      0x00000040
+#define IXGBE_LED_BLINK_BASE     0x00000080
+#define IXGBE_LED_MODE_MASK_BASE 0x0000000F
+#define IXGBE_LED_OFFSET(_base, _i) (_base << (8 * (_i)))
+#define IXGBE_LED_MODE_SHIFT(_i) (8*(_i))
+#define IXGBE_LED_IVRT(_i)       IXGBE_LED_OFFSET(IXGBE_LED_IVRT_BASE, _i)
+#define IXGBE_LED_BLINK(_i)      IXGBE_LED_OFFSET(IXGBE_LED_BLINK_BASE, _i)
+#define IXGBE_LED_MODE_MASK(_i)  IXGBE_LED_OFFSET(IXGBE_LED_MODE_MASK_BASE, _i)
+
+/* LED modes */
+#define IXGBE_LED_LINK_UP       0x0
+#define IXGBE_LED_LINK_10G      0x1
+#define IXGBE_LED_MAC           0x2
+#define IXGBE_LED_FILTER        0x3
+#define IXGBE_LED_LINK_ACTIVE   0x4
+#define IXGBE_LED_LINK_1G       0x5
+#define IXGBE_LED_ON            0xE
+#define IXGBE_LED_OFF           0xF
+
+/* AUTOC Bit Masks */
+#define IXGBE_AUTOC_KX4_KX_SUPP_MASK 0xC0000000
+#define IXGBE_AUTOC_KX4_SUPP    0x80000000
+#define IXGBE_AUTOC_KX_SUPP     0x40000000
+#define IXGBE_AUTOC_PAUSE       0x30000000
+#define IXGBE_AUTOC_ASM_PAUSE   0x20000000
+#define IXGBE_AUTOC_SYM_PAUSE   0x10000000
+#define IXGBE_AUTOC_RF          0x08000000
+#define IXGBE_AUTOC_PD_TMR      0x06000000
+#define IXGBE_AUTOC_AN_RX_LOOSE 0x01000000
+#define IXGBE_AUTOC_AN_RX_DRIFT 0x00800000
+#define IXGBE_AUTOC_AN_RX_ALIGN 0x007C0000
+#define IXGBE_AUTOC_FECA        0x00040000
+#define IXGBE_AUTOC_FECR        0x00020000
+#define IXGBE_AUTOC_KR_SUPP     0x00010000
+#define IXGBE_AUTOC_AN_RESTART  0x00001000
+#define IXGBE_AUTOC_FLU         0x00000001
+#define IXGBE_AUTOC_LMS_SHIFT   13
+#define IXGBE_AUTOC_LMS_10G_SERIAL      (0x3 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_KX4_KX_KR       (0x4 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_SGMII_1G_100M   (0x5 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN (0x6 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII (0x7 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_MASK            (0x7 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_1G_LINK_NO_AN   (0x0 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_10G_LINK_NO_AN  (0x1 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_1G_AN           (0x2 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_KX4_AN          (0x4 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_KX4_AN_1G_AN    (0x6 << IXGBE_AUTOC_LMS_SHIFT)
+#define IXGBE_AUTOC_LMS_ATTACH_TYPE     (0x7 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
+
+#define IXGBE_AUTOC_1G_PMA_PMD_MASK    0x00000200
+#define IXGBE_AUTOC_1G_PMA_PMD_SHIFT   9
+#define IXGBE_AUTOC_10G_PMA_PMD_MASK   0x00000180
+#define IXGBE_AUTOC_10G_PMA_PMD_SHIFT  7
+#define IXGBE_AUTOC_10G_XAUI   (0x0 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC_10G_KX4    (0x1 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC_10G_CX4    (0x2 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC_1G_BX      (0x0 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC_1G_KX      (0x1 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC_1G_SFI     (0x0 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC_1G_KX_BX   (0x1 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
+
+#define IXGBE_AUTOC2_UPPER_MASK  0xFFFF0000
+#define IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK  0x00030000
+#define IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT 16
+#define IXGBE_AUTOC2_10G_KR  (0x0 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC2_10G_XFI (0x1 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
+#define IXGBE_AUTOC2_10G_SFI (0x2 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
+
+#define IXGBE_MACC_FLU       0x00000001
+#define IXGBE_MACC_FSV_10G   0x00030000
+#define IXGBE_MACC_FS        0x00040000
+#define IXGBE_MAC_RX2TX_LPBK 0x00000002
+
+/* LINKS Bit Masks */
+#define IXGBE_LINKS_KX_AN_COMP  0x80000000
+#define IXGBE_LINKS_UP          0x40000000
+#define IXGBE_LINKS_SPEED       0x20000000
+#define IXGBE_LINKS_MODE        0x18000000
+#define IXGBE_LINKS_RX_MODE     0x06000000
+#define IXGBE_LINKS_TX_MODE     0x01800000
+#define IXGBE_LINKS_XGXS_EN     0x00400000
+#define IXGBE_LINKS_SGMII_EN    0x02000000
+#define IXGBE_LINKS_PCS_1G_EN   0x00200000
+#define IXGBE_LINKS_1G_AN_EN    0x00100000
+#define IXGBE_LINKS_KX_AN_IDLE  0x00080000
+#define IXGBE_LINKS_1G_SYNC     0x00040000
+#define IXGBE_LINKS_10G_ALIGN   0x00020000
+#define IXGBE_LINKS_10G_LANE_SYNC 0x00017000
+#define IXGBE_LINKS_TL_FAULT    0x00001000
+#define IXGBE_LINKS_SIGNAL      0x00000F00
+
+#define IXGBE_LINKS_SPEED_82599     0x30000000
+#define IXGBE_LINKS_SPEED_10G_82599 0x30000000
+#define IXGBE_LINKS_SPEED_1G_82599  0x20000000
+#define IXGBE_LINKS_SPEED_100_82599 0x10000000
+#define IXGBE_LINK_UP_TIME      90 /* 9.0 Seconds */
+#define IXGBE_AUTO_NEG_TIME     45 /* 4.5 Seconds */
+
+#define IXGBE_LINKS2_AN_SUPPORTED   0x00000040
+
+/* PCS1GLSTA Bit Masks */
+#define IXGBE_PCS1GLSTA_LINK_OK         1
+#define IXGBE_PCS1GLSTA_SYNK_OK         0x10
+#define IXGBE_PCS1GLSTA_AN_COMPLETE     0x10000
+#define IXGBE_PCS1GLSTA_AN_PAGE_RX      0x20000
+#define IXGBE_PCS1GLSTA_AN_TIMED_OUT    0x40000
+#define IXGBE_PCS1GLSTA_AN_REMOTE_FAULT 0x80000
+#define IXGBE_PCS1GLSTA_AN_ERROR_RWS    0x100000
+
+#define IXGBE_PCS1GANA_SYM_PAUSE        0x80
+#define IXGBE_PCS1GANA_ASM_PAUSE        0x100
+
+/* PCS1GLCTL Bit Masks */
+#define IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN  0x00040000 /* PCS 1G autoneg to en */
+#define IXGBE_PCS1GLCTL_FLV_LINK_UP     1
+#define IXGBE_PCS1GLCTL_FORCE_LINK      0x20
+#define IXGBE_PCS1GLCTL_LOW_LINK_LATCH  0x40
+#define IXGBE_PCS1GLCTL_AN_ENABLE       0x10000
+#define IXGBE_PCS1GLCTL_AN_RESTART      0x20000
+
+/* ANLP1 Bit Masks */
+#define IXGBE_ANLP1_PAUSE               0x0C00
+#define IXGBE_ANLP1_SYM_PAUSE           0x0400
+#define IXGBE_ANLP1_ASM_PAUSE           0x0800
+#define IXGBE_ANLP1_AN_STATE_MASK       0x000f0000
+
+/* SW Semaphore Register bitmasks */
+#define IXGBE_SWSM_SMBI 0x00000001 /* Driver Semaphore bit */
+#define IXGBE_SWSM_SWESMBI 0x00000002 /* FW Semaphore bit */
+#define IXGBE_SWSM_WMNG 0x00000004 /* Wake MNG Clock */
+#define IXGBE_SWFW_REGSMP 0x80000000 /* Register Semaphore bit 31 */
+
+/* SW_FW_SYNC/GSSR definitions */
+#define IXGBE_GSSR_EEP_SM     0x0001
+#define IXGBE_GSSR_PHY0_SM    0x0002
+#define IXGBE_GSSR_PHY1_SM    0x0004
+#define IXGBE_GSSR_MAC_CSR_SM 0x0008
+#define IXGBE_GSSR_FLASH_SM   0x0010
+#define IXGBE_GSSR_SW_MNG_SM  0x0400
+
+/* FW Status register bitmask */
+#define IXGBE_FWSTS_FWRI    0x00000200 /* Firmware Reset Indication */
+
+/* EEC Register */
+#define IXGBE_EEC_SK        0x00000001 /* EEPROM Clock */
+#define IXGBE_EEC_CS        0x00000002 /* EEPROM Chip Select */
+#define IXGBE_EEC_DI        0x00000004 /* EEPROM Data In */
+#define IXGBE_EEC_DO        0x00000008 /* EEPROM Data Out */
+#define IXGBE_EEC_FWE_MASK  0x00000030 /* FLASH Write Enable */
+#define IXGBE_EEC_FWE_DIS   0x00000010 /* Disable FLASH writes */
+#define IXGBE_EEC_FWE_EN    0x00000020 /* Enable FLASH writes */
+#define IXGBE_EEC_FWE_SHIFT 4
+#define IXGBE_EEC_REQ       0x00000040 /* EEPROM Access Request */
+#define IXGBE_EEC_GNT       0x00000080 /* EEPROM Access Grant */
+#define IXGBE_EEC_PRES      0x00000100 /* EEPROM Present */
+#define IXGBE_EEC_ARD       0x00000200 /* EEPROM Auto Read Done */
+#define IXGBE_EEC_FLUP      0x00800000 /* Flash update command */
+#define IXGBE_EEC_SEC1VAL   0x02000000 /* Sector 1 Valid */
+#define IXGBE_EEC_FLUDONE   0x04000000 /* Flash update done */
+/* EEPROM Addressing bits based on type (0-small, 1-large) */
+#define IXGBE_EEC_ADDR_SIZE 0x00000400
+#define IXGBE_EEC_SIZE      0x00007800 /* EEPROM Size */
+#define IXGBE_EERD_MAX_ADDR 0x00003FFF /* EERD alows 14 bits for addr. */
+
+#define IXGBE_EEC_SIZE_SHIFT          11
+#define IXGBE_EEPROM_WORD_SIZE_SHIFT  6
+#define IXGBE_EEPROM_OPCODE_BITS      8
+
+/* Part Number String Length */
+#define IXGBE_PBANUM_LENGTH 11
+
+/* Checksum and EEPROM pointers */
+#define IXGBE_PBANUM_PTR_GUARD  0xFAFA
+#define IXGBE_EEPROM_CHECKSUM   0x3F
+#define IXGBE_EEPROM_SUM        0xBABA
+#define IXGBE_PCIE_ANALOG_PTR   0x03
+#define IXGBE_ATLAS0_CONFIG_PTR 0x04
+#define IXGBE_PHY_PTR           0x04
+#define IXGBE_ATLAS1_CONFIG_PTR 0x05
+#define IXGBE_OPTION_ROM_PTR    0x05
+#define IXGBE_PCIE_GENERAL_PTR  0x06
+#define IXGBE_PCIE_CONFIG0_PTR  0x07
+#define IXGBE_PCIE_CONFIG1_PTR  0x08
+#define IXGBE_CORE0_PTR         0x09
+#define IXGBE_CORE1_PTR         0x0A
+#define IXGBE_MAC0_PTR          0x0B
+#define IXGBE_MAC1_PTR          0x0C
+#define IXGBE_CSR0_CONFIG_PTR   0x0D
+#define IXGBE_CSR1_CONFIG_PTR   0x0E
+#define IXGBE_FW_PTR            0x0F
+#define IXGBE_PBANUM0_PTR       0x15
+#define IXGBE_PBANUM1_PTR       0x16
+#define IXGBE_FREE_SPACE_PTR    0X3E
+#define IXGBE_SAN_MAC_ADDR_PTR  0x28
+#define IXGBE_DEVICE_CAPS       0x2C
+#define IXGBE_SERIAL_NUMBER_MAC_ADDR 0x11
+#define IXGBE_PCIE_MSIX_82599_CAPS  0x72
+#define IXGBE_PCIE_MSIX_82598_CAPS  0x62
+
+/* MSI-X capability fields masks */
+#define IXGBE_PCIE_MSIX_TBL_SZ_MASK     0x7FF
+
+/* Legacy EEPROM word offsets */
+#define IXGBE_ISCSI_BOOT_CAPS           0x0033
+#define IXGBE_ISCSI_SETUP_PORT_0        0x0030
+#define IXGBE_ISCSI_SETUP_PORT_1        0x0034
+
+/* EEPROM Commands - SPI */
+#define IXGBE_EEPROM_MAX_RETRY_SPI      5000 /* Max wait 5ms for RDY signal */
+#define IXGBE_EEPROM_STATUS_RDY_SPI     0x01
+#define IXGBE_EEPROM_READ_OPCODE_SPI    0x03  /* EEPROM read opcode */
+#define IXGBE_EEPROM_WRITE_OPCODE_SPI   0x02  /* EEPROM write opcode */
+#define IXGBE_EEPROM_A8_OPCODE_SPI      0x08  /* opcode bit-3 = addr bit-8 */
+#define IXGBE_EEPROM_WREN_OPCODE_SPI    0x06  /* EEPROM set Write Ena latch */
+/* EEPROM reset Write Enable latch */
+#define IXGBE_EEPROM_WRDI_OPCODE_SPI    0x04
+#define IXGBE_EEPROM_RDSR_OPCODE_SPI    0x05  /* EEPROM read Status reg */
+#define IXGBE_EEPROM_WRSR_OPCODE_SPI    0x01  /* EEPROM write Status reg */
+#define IXGBE_EEPROM_ERASE4K_OPCODE_SPI 0x20  /* EEPROM ERASE 4KB */
+#define IXGBE_EEPROM_ERASE64K_OPCODE_SPI  0xD8  /* EEPROM ERASE 64KB */
+#define IXGBE_EEPROM_ERASE256_OPCODE_SPI  0xDB  /* EEPROM ERASE 256B */
+
+/* EEPROM Read Register */
+#define IXGBE_EEPROM_RW_REG_DATA   16 /* data offset in EEPROM read reg */
+#define IXGBE_EEPROM_RW_REG_DONE   2  /* Offset to READ done bit */
+#define IXGBE_EEPROM_RW_REG_START  1  /* First bit to start operation */
+#define IXGBE_EEPROM_RW_ADDR_SHIFT 2  /* Shift to the address bits */
+#define IXGBE_NVM_POLL_WRITE       1  /* Flag for polling for write complete */
+#define IXGBE_NVM_POLL_READ        0  /* Flag for polling for read complete */
+
+#define IXGBE_ETH_LENGTH_OF_ADDRESS   6
+
+#define IXGBE_EEPROM_PAGE_SIZE_MAX       128
+#define IXGBE_EEPROM_RD_BUFFER_MAX_COUNT 512 /* EEPROM words # read in burst */
+#define IXGBE_EEPROM_WR_BUFFER_MAX_COUNT 256 /* EEPROM words # wr in burst */
+
+#ifndef IXGBE_EEPROM_GRANT_ATTEMPTS
+#define IXGBE_EEPROM_GRANT_ATTEMPTS 1000 /* EEPROM # attempts to gain grant */
+#endif
+
+#ifndef IXGBE_EERD_EEWR_ATTEMPTS
+/* Number of 5 microseconds we wait for EERD read and
+ * EERW write to complete */
+#define IXGBE_EERD_EEWR_ATTEMPTS 100000
+#endif
+
+#ifndef IXGBE_FLUDONE_ATTEMPTS
+/* # attempts we wait for flush update to complete */
+#define IXGBE_FLUDONE_ATTEMPTS 20000
+#endif
+
+#define IXGBE_PCIE_CTRL2                 0x5   /* PCIe Control 2 Offset */
+#define IXGBE_PCIE_CTRL2_DUMMY_ENABLE    0x8   /* Dummy Function Enable */
+#define IXGBE_PCIE_CTRL2_LAN_DISABLE     0x2   /* LAN PCI Disable */
+#define IXGBE_PCIE_CTRL2_DISABLE_SELECT  0x1   /* LAN Disable Select */
+
+#define IXGBE_SAN_MAC_ADDR_PORT0_OFFSET  0x0
+#define IXGBE_SAN_MAC_ADDR_PORT1_OFFSET  0x3
+#define IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP  0x1
+#define IXGBE_DEVICE_CAPS_FCOE_OFFLOADS  0x2
+#define IXGBE_FW_LESM_PARAMETERS_PTR     0x2
+#define IXGBE_FW_LESM_STATE_1            0x1
+#define IXGBE_FW_LESM_STATE_ENABLED      0x8000 /* LESM Enable bit */
+#define IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR   0x4
+#define IXGBE_FW_PATCH_VERSION_4         0x7
+#define IXGBE_FCOE_IBA_CAPS_BLK_PTR         0x33 /* iSCSI/FCOE block */
+#define IXGBE_FCOE_IBA_CAPS_FCOE            0x20 /* FCOE flags */
+#define IXGBE_ISCSI_FCOE_BLK_PTR            0x17 /* iSCSI/FCOE block */
+#define IXGBE_ISCSI_FCOE_FLAGS_OFFSET       0x0  /* FCOE flags */
+#define IXGBE_ISCSI_FCOE_FLAGS_ENABLE       0x1  /* FCOE flags enable bit */
+#define IXGBE_ALT_SAN_MAC_ADDR_BLK_PTR      0x27 /* Alt. SAN MAC block */
+#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_OFFSET  0x0 /* Alt. SAN MAC capability */
+#define IXGBE_ALT_SAN_MAC_ADDR_PORT0_OFFSET 0x1 /* Alt. SAN MAC 0 offset */
+#define IXGBE_ALT_SAN_MAC_ADDR_PORT1_OFFSET 0x4 /* Alt. SAN MAC 1 offset */
+#define IXGBE_ALT_SAN_MAC_ADDR_WWNN_OFFSET  0x7 /* Alt. WWNN prefix offset */
+#define IXGBE_ALT_SAN_MAC_ADDR_WWPN_OFFSET  0x8 /* Alt. WWPN prefix offset */
+#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_SANMAC  0x0 /* Alt. SAN MAC exists */
+#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_ALTWWN  0x1 /* Alt. WWN base exists */
+
+/* PCI Bus Info */
+#define IXGBE_PCI_DEVICE_STATUS   0xAA
+#define IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING   0x0020
+#define IXGBE_PCI_LINK_STATUS     0xB2
+#define IXGBE_PCI_DEVICE_CONTROL2 0xC8
+#define IXGBE_PCI_LINK_WIDTH      0x3F0
+#define IXGBE_PCI_LINK_WIDTH_1    0x10
+#define IXGBE_PCI_LINK_WIDTH_2    0x20
+#define IXGBE_PCI_LINK_WIDTH_4    0x40
+#define IXGBE_PCI_LINK_WIDTH_8    0x80
+#define IXGBE_PCI_LINK_SPEED      0xF
+#define IXGBE_PCI_LINK_SPEED_2500 0x1
+#define IXGBE_PCI_LINK_SPEED_5000 0x2
+#define IXGBE_PCI_HEADER_TYPE_REGISTER  0x0E
+#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
+#define IXGBE_PCI_DEVICE_CONTROL2_16ms  0x0005
+
+/* Number of 100 microseconds we wait for PCI Express master disable */
+#define IXGBE_PCI_MASTER_DISABLE_TIMEOUT 800
+
+/* Check whether address is multicast.  This is little-endian specific check.*/
+#define IXGBE_IS_MULTICAST(Address) \
+                (bool)(((u8 *)(Address))[0] & ((u8)0x01))
+
+/* Check whether an address is broadcast. */
+#define IXGBE_IS_BROADCAST(Address)                      \
+                ((((u8 *)(Address))[0] == ((u8)0xff)) && \
+                (((u8 *)(Address))[1] == ((u8)0xff)))
+
+/* RAH */
+#define IXGBE_RAH_VIND_MASK     0x003C0000
+#define IXGBE_RAH_VIND_SHIFT    18
+#define IXGBE_RAH_AV            0x80000000
+#define IXGBE_CLEAR_VMDQ_ALL    0xFFFFFFFF
+
+/* Header split receive */
+#define IXGBE_RFCTL_ISCSI_DIS       0x00000001
+#define IXGBE_RFCTL_ISCSI_DWC_MASK  0x0000003E
+#define IXGBE_RFCTL_ISCSI_DWC_SHIFT 1
+#define IXGBE_RFCTL_NFSW_DIS        0x00000040
+#define IXGBE_RFCTL_NFSR_DIS        0x00000080
+#define IXGBE_RFCTL_NFS_VER_MASK    0x00000300
+#define IXGBE_RFCTL_NFS_VER_SHIFT   8
+#define IXGBE_RFCTL_NFS_VER_2       0
+#define IXGBE_RFCTL_NFS_VER_3       1
+#define IXGBE_RFCTL_NFS_VER_4       2
+#define IXGBE_RFCTL_IPV6_DIS        0x00000400
+#define IXGBE_RFCTL_IPV6_XSUM_DIS   0x00000800
+#define IXGBE_RFCTL_IPFRSP_DIS      0x00004000
+#define IXGBE_RFCTL_IPV6_EX_DIS     0x00010000
+#define IXGBE_RFCTL_NEW_IPV6_EXT_DIS 0x00020000
+
+/* Transmit Config masks */
+#define IXGBE_TXDCTL_ENABLE     0x02000000 /* Enable specific Tx Queue */
+#define IXGBE_TXDCTL_SWFLSH     0x04000000 /* Tx Desc. write-back flushing */
+#define IXGBE_TXDCTL_WTHRESH_SHIFT      16 /* shift to WTHRESH bits */
+/* Enable short packet padding to 64 bytes */
+#define IXGBE_TX_PAD_ENABLE     0x00000400
+#define IXGBE_JUMBO_FRAME_ENABLE 0x00000004  /* Allow jumbo frames */
+/* This allows for 16K packets + 4k for vlan */
+#define IXGBE_MAX_FRAME_SZ      0x40040000
+
+#define IXGBE_TDWBAL_HEAD_WB_ENABLE   0x1      /* Tx head write-back enable */
+#define IXGBE_TDWBAL_SEQNUM_WB_ENABLE 0x2      /* Tx seq# write-back enable */
+
+/* Receive Config masks */
+#define IXGBE_RXCTRL_RXEN       0x00000001  /* Enable Receiver */
+#define IXGBE_RXCTRL_DMBYPS     0x00000002  /* Descriptor Monitor Bypass */
+#define IXGBE_RXDCTL_ENABLE     0x02000000  /* Enable specific Rx Queue */
+#define IXGBE_RXDCTL_RLPMLMASK  0x00003FFF  /* Only supported on the X540 */
+#define IXGBE_RXDCTL_RLPML_EN   0x00008000
+#define IXGBE_RXDCTL_VME        0x40000000  /* VLAN mode enable */
+
+#define IXGBE_FCTRL_SBP 0x00000002 /* Store Bad Packet */
+#define IXGBE_FCTRL_MPE 0x00000100 /* Multicast Promiscuous Ena*/
+#define IXGBE_FCTRL_UPE 0x00000200 /* Unicast Promiscuous Ena */
+#define IXGBE_FCTRL_BAM 0x00000400 /* Broadcast Accept Mode */
+#define IXGBE_FCTRL_PMCF 0x00001000 /* Pass MAC Control Frames */
+#define IXGBE_FCTRL_DPF 0x00002000 /* Discard Pause Frame */
+/* Receive Priority Flow Control Enable */
+#define IXGBE_FCTRL_RPFCE 0x00004000
+#define IXGBE_FCTRL_RFCE 0x00008000 /* Receive Flow Control Ena */
+#define IXGBE_MFLCN_PMCF        0x00000001 /* Pass MAC Control Frames */
+#define IXGBE_MFLCN_DPF         0x00000002 /* Discard Pause Frame */
+#define IXGBE_MFLCN_RPFCE       0x00000004 /* Receive Priority FC Enable */
+#define IXGBE_MFLCN_RFCE        0x00000008 /* Receive FC Enable */
+
+#define IXGBE_MFLCN_RPFCE_SHIFT                 4
+
+/* Multiple Receive Queue Control */
+#define IXGBE_MRQC_RSSEN                 0x00000001  /* RSS Enable */
+#define IXGBE_MRQC_MRQE_MASK                    0xF /* Bits 3:0 */
+#define IXGBE_MRQC_RT8TCEN               0x00000002 /* 8 TC no RSS */
+#define IXGBE_MRQC_RT4TCEN               0x00000003 /* 4 TC no RSS */
+#define IXGBE_MRQC_RTRSS8TCEN            0x00000004 /* 8 TC w/ RSS */
+#define IXGBE_MRQC_RTRSS4TCEN            0x00000005 /* 4 TC w/ RSS */
+#define IXGBE_MRQC_VMDQEN                0x00000008 /* VMDq2 64 pools no RSS */
+#define IXGBE_MRQC_VMDQRSS32EN           0x0000000A /* VMDq2 32 pools w/ RSS */
+#define IXGBE_MRQC_VMDQRSS64EN           0x0000000B /* VMDq2 64 pools w/ RSS */
+#define IXGBE_MRQC_VMDQRT8TCEN           0x0000000C /* VMDq2/RT 16 pool 8 TC */
+#define IXGBE_MRQC_VMDQRT4TCEN           0x0000000D /* VMDq2/RT 32 pool 4 TC */
+#define IXGBE_MRQC_RSS_FIELD_MASK        0xFFFF0000
+#define IXGBE_MRQC_RSS_FIELD_IPV4_TCP    0x00010000
+#define IXGBE_MRQC_RSS_FIELD_IPV4        0x00020000
+#define IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP 0x00040000
+#define IXGBE_MRQC_RSS_FIELD_IPV6_EX     0x00080000
+#define IXGBE_MRQC_RSS_FIELD_IPV6        0x00100000
+#define IXGBE_MRQC_RSS_FIELD_IPV6_TCP    0x00200000
+#define IXGBE_MRQC_RSS_FIELD_IPV4_UDP    0x00400000
+#define IXGBE_MRQC_RSS_FIELD_IPV6_UDP    0x00800000
+#define IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP 0x01000000
+#define IXGBE_MRQC_L3L4TXSWEN            0x00008000
+
+/* Queue Drop Enable */
+#define IXGBE_QDE_ENABLE     0x00000001
+#define IXGBE_QDE_IDX_MASK   0x00007F00
+#define IXGBE_QDE_IDX_SHIFT           8
+
+#define IXGBE_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
+#define IXGBE_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
+#define IXGBE_TXD_CMD_EOP    0x01000000 /* End of Packet */
+#define IXGBE_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
+#define IXGBE_TXD_CMD_IC     0x04000000 /* Insert Checksum */
+#define IXGBE_TXD_CMD_RS     0x08000000 /* Report Status */
+#define IXGBE_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
+#define IXGBE_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
+#define IXGBE_TXD_STAT_DD    0x00000001 /* Descriptor Done */
+
+#define IXGBE_RXDADV_IPSEC_STATUS_SECP                  0x00020000
+#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_PROTOCOL       0x08000000
+#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_LENGTH         0x10000000
+#define IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED            0x18000000
+#define IXGBE_RXDADV_IPSEC_ERROR_BIT_MASK               0x18000000
+/* Multiple Transmit Queue Command Register */
+#define IXGBE_MTQC_RT_ENA       0x1 /* DCB Enable */
+#define IXGBE_MTQC_VT_ENA       0x2 /* VMDQ2 Enable */
+#define IXGBE_MTQC_64Q_1PB      0x0 /* 64 queues 1 pack buffer */
+#define IXGBE_MTQC_32VF         0x8 /* 4 TX Queues per pool w/32VF's */
+#define IXGBE_MTQC_64VF         0x4 /* 2 TX Queues per pool w/64VF's */
+#define IXGBE_MTQC_8TC_8TQ      0xC /* 8 TC if RT_ENA or 8 TQ if VT_ENA */
+#define IXGBE_MTQC_4TC_4TQ     0x8 /* 4 TC if RT_ENA or 4 TQ if VT_ENA */
+
+/* Receive Descriptor bit definitions */
+#define IXGBE_RXD_STAT_DD       0x01    /* Descriptor Done */
+#define IXGBE_RXD_STAT_EOP      0x02    /* End of Packet */
+#define IXGBE_RXD_STAT_FLM      0x04    /* FDir Match */
+#define IXGBE_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
+#define IXGBE_RXDADV_NEXTP_MASK   0x000FFFF0 /* Next Descriptor Index */
+#define IXGBE_RXDADV_NEXTP_SHIFT  0x00000004
+#define IXGBE_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */
+#define IXGBE_RXD_STAT_L4CS     0x20    /* L4 xsum calculated */
+#define IXGBE_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
+#define IXGBE_RXD_STAT_PIF      0x80    /* passed in-exact filter */
+#define IXGBE_RXD_STAT_CRCV     0x100   /* Speculative CRC Valid */
+#define IXGBE_RXD_STAT_VEXT     0x200   /* 1st VLAN found */
+#define IXGBE_RXD_STAT_UDPV     0x400   /* Valid UDP checksum */
+#define IXGBE_RXD_STAT_DYNINT   0x800   /* Pkt caused INT via DYNINT */
+#define IXGBE_RXD_STAT_LLINT    0x800   /* Pkt caused Low Latency Interrupt */
+#define IXGBE_RXD_STAT_TS       0x10000 /* Time Stamp */
+#define IXGBE_RXD_STAT_SECP     0x20000 /* Security Processing */
+#define IXGBE_RXD_STAT_LB       0x40000 /* Loopback Status */
+#define IXGBE_RXD_STAT_ACK      0x8000  /* ACK Packet indication */
+#define IXGBE_RXD_ERR_CE        0x01    /* CRC Error */
+#define IXGBE_RXD_ERR_LE        0x02    /* Length Error */
+#define IXGBE_RXD_ERR_PE        0x08    /* Packet Error */
+#define IXGBE_RXD_ERR_OSE       0x10    /* Oversize Error */
+#define IXGBE_RXD_ERR_USE       0x20    /* Undersize Error */
+#define IXGBE_RXD_ERR_TCPE      0x40    /* TCP/UDP Checksum Error */
+#define IXGBE_RXD_ERR_IPE       0x80    /* IP Checksum Error */
+#define IXGBE_RXDADV_ERR_MASK           0xfff00000 /* RDESC.ERRORS mask */
+#define IXGBE_RXDADV_ERR_SHIFT          20         /* RDESC.ERRORS shift */
+#define IXGBE_RXDADV_ERR_FCEOFE         0x80000000 /* FCoEFe/IPE */
+#define IXGBE_RXDADV_ERR_FCERR          0x00700000 /* FCERR/FDIRERR */
+#define IXGBE_RXDADV_ERR_FDIR_LEN       0x00100000 /* FDIR Length error */
+#define IXGBE_RXDADV_ERR_FDIR_DROP      0x00200000 /* FDIR Drop error */
+#define IXGBE_RXDADV_ERR_FDIR_COLL      0x00400000 /* FDIR Collision error */
+#define IXGBE_RXDADV_ERR_HBO    0x00800000 /*Header Buffer Overflow */
+#define IXGBE_RXDADV_ERR_CE     0x01000000 /* CRC Error */
+#define IXGBE_RXDADV_ERR_LE     0x02000000 /* Length Error */
+#define IXGBE_RXDADV_ERR_PE     0x08000000 /* Packet Error */
+#define IXGBE_RXDADV_ERR_OSE    0x10000000 /* Oversize Error */
+#define IXGBE_RXDADV_ERR_USE    0x20000000 /* Undersize Error */
+#define IXGBE_RXDADV_ERR_TCPE   0x40000000 /* TCP/UDP Checksum Error */
+#define IXGBE_RXDADV_ERR_IPE    0x80000000 /* IP Checksum Error */
+#define IXGBE_RXD_VLAN_ID_MASK  0x0FFF  /* VLAN ID is in lower 12 bits */
+#define IXGBE_RXD_PRI_MASK      0xE000  /* Priority is in upper 3 bits */
+#define IXGBE_RXD_PRI_SHIFT     13
+#define IXGBE_RXD_CFI_MASK      0x1000  /* CFI is bit 12 */
+#define IXGBE_RXD_CFI_SHIFT     12
+
+#define IXGBE_RXDADV_STAT_DD            IXGBE_RXD_STAT_DD  /* Done */
+#define IXGBE_RXDADV_STAT_EOP           IXGBE_RXD_STAT_EOP /* End of Packet */
+#define IXGBE_RXDADV_STAT_FLM           IXGBE_RXD_STAT_FLM /* FDir Match */
+#define IXGBE_RXDADV_STAT_VP            IXGBE_RXD_STAT_VP  /* IEEE VLAN Pkt */
+#define IXGBE_RXDADV_STAT_MASK          0x000fffff /* Stat/NEXTP: bit 0-19 */
+#define IXGBE_RXDADV_STAT_FCEOFS        0x00000040 /* FCoE EOF/SOF Stat */
+#define IXGBE_RXDADV_STAT_FCSTAT        0x00000030 /* FCoE Pkt Stat */
+#define IXGBE_RXDADV_STAT_FCSTAT_NOMTCH 0x00000000 /* 00: No Ctxt Match */
+#define IXGBE_RXDADV_STAT_FCSTAT_NODDP  0x00000010 /* 01: Ctxt w/o DDP */
+#define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
+#define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
+
+/* PSRTYPE bit definitions */
+#define IXGBE_PSRTYPE_TCPHDR    0x00000010
+#define IXGBE_PSRTYPE_UDPHDR    0x00000020
+#define IXGBE_PSRTYPE_IPV4HDR   0x00000100
+#define IXGBE_PSRTYPE_IPV6HDR   0x00000200
+#define IXGBE_PSRTYPE_L2HDR     0x00001000
+
+/* SRRCTL bit definitions */
+#define IXGBE_SRRCTL_BSIZEPKT_SHIFT     10     /* so many KBs */
+#define IXGBE_SRRCTL_RDMTS_SHIFT        22
+#define IXGBE_SRRCTL_RDMTS_MASK         0x01C00000
+#define IXGBE_SRRCTL_DROP_EN            0x10000000
+#define IXGBE_SRRCTL_BSIZEPKT_MASK      0x0000007F
+#define IXGBE_SRRCTL_BSIZEHDR_MASK      0x00003F00
+#define IXGBE_SRRCTL_DESCTYPE_LEGACY    0x00000000
+#define IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000
+#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT  0x04000000
+#define IXGBE_SRRCTL_DESCTYPE_HDR_REPLICATION_LARGE_PKT 0x08000000
+#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS 0x0A000000
+#define IXGBE_SRRCTL_DESCTYPE_MASK      0x0E000000
+
+#define IXGBE_RXDPS_HDRSTAT_HDRSP       0x00008000
+#define IXGBE_RXDPS_HDRSTAT_HDRLEN_MASK 0x000003FF
+
+#define IXGBE_RXDADV_RSSTYPE_MASK       0x0000000F
+#define IXGBE_RXDADV_PKTTYPE_MASK       0x0000FFF0
+#define IXGBE_RXDADV_PKTTYPE_MASK_EX    0x0001FFF0
+#define IXGBE_RXDADV_HDRBUFLEN_MASK     0x00007FE0
+#define IXGBE_RXDADV_RSCCNT_MASK        0x001E0000
+#define IXGBE_RXDADV_RSCCNT_SHIFT       17
+#define IXGBE_RXDADV_HDRBUFLEN_SHIFT    5
+#define IXGBE_RXDADV_SPLITHEADER_EN     0x00001000
+#define IXGBE_RXDADV_SPH                0x8000
+
+/* RSS Hash results */
+#define IXGBE_RXDADV_RSSTYPE_NONE       0x00000000
+#define IXGBE_RXDADV_RSSTYPE_IPV4_TCP   0x00000001
+#define IXGBE_RXDADV_RSSTYPE_IPV4       0x00000002
+#define IXGBE_RXDADV_RSSTYPE_IPV6_TCP   0x00000003
+#define IXGBE_RXDADV_RSSTYPE_IPV6_EX    0x00000004
+#define IXGBE_RXDADV_RSSTYPE_IPV6       0x00000005
+#define IXGBE_RXDADV_RSSTYPE_IPV6_TCP_EX 0x00000006
+#define IXGBE_RXDADV_RSSTYPE_IPV4_UDP   0x00000007
+#define IXGBE_RXDADV_RSSTYPE_IPV6_UDP   0x00000008
+#define IXGBE_RXDADV_RSSTYPE_IPV6_UDP_EX 0x00000009
+
+/* RSS Packet Types as indicated in the receive descriptor. */
+#define IXGBE_RXDADV_PKTTYPE_NONE       0x00000000
+#define IXGBE_RXDADV_PKTTYPE_IPV4       0x00000010 /* IPv4 hdr present */
+#define IXGBE_RXDADV_PKTTYPE_IPV4_EX    0x00000020 /* IPv4 hdr + extensions */
+#define IXGBE_RXDADV_PKTTYPE_IPV6       0x00000040 /* IPv6 hdr present */
+#define IXGBE_RXDADV_PKTTYPE_IPV6_EX    0x00000080 /* IPv6 hdr + extensions */
+#define IXGBE_RXDADV_PKTTYPE_TCP        0x00000100 /* TCP hdr present */
+#define IXGBE_RXDADV_PKTTYPE_UDP        0x00000200 /* UDP hdr present */
+#define IXGBE_RXDADV_PKTTYPE_SCTP       0x00000400 /* SCTP hdr present */
+#define IXGBE_RXDADV_PKTTYPE_NFS        0x00000800 /* NFS hdr present */
+#define IXGBE_RXDADV_PKTTYPE_IPSEC_ESP  0x00001000 /* IPSec ESP */
+#define IXGBE_RXDADV_PKTTYPE_IPSEC_AH   0x00002000 /* IPSec AH */
+#define IXGBE_RXDADV_PKTTYPE_LINKSEC    0x00004000 /* LinkSec Encap */
+#define IXGBE_RXDADV_PKTTYPE_ETQF       0x00008000 /* PKTTYPE is ETQF index */
+#define IXGBE_RXDADV_PKTTYPE_ETQF_MASK  0x00000070 /* ETQF has 8 indices */
+#define IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT 4          /* Right-shift 4 bits */
+
+/* Security Processing bit Indication */
+#define IXGBE_RXDADV_LNKSEC_STATUS_SECP         0x00020000
+#define IXGBE_RXDADV_LNKSEC_ERROR_NO_SA_MATCH   0x08000000
+#define IXGBE_RXDADV_LNKSEC_ERROR_REPLAY_ERROR  0x10000000
+#define IXGBE_RXDADV_LNKSEC_ERROR_BIT_MASK      0x18000000
+#define IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG       0x18000000
+
+/* Masks to determine if packets should be dropped due to frame errors */
+#define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \
+                                      IXGBE_RXD_ERR_CE | \
+                                      IXGBE_RXD_ERR_LE | \
+                                      IXGBE_RXD_ERR_PE | \
+                                      IXGBE_RXD_ERR_OSE | \
+                                      IXGBE_RXD_ERR_USE)
+
+#define IXGBE_RXDADV_ERR_FRAME_ERR_MASK ( \
+                                      IXGBE_RXDADV_ERR_CE | \
+                                      IXGBE_RXDADV_ERR_LE | \
+                                      IXGBE_RXDADV_ERR_PE | \
+                                      IXGBE_RXDADV_ERR_OSE | \
+                                      IXGBE_RXDADV_ERR_USE)
+
+/* Multicast bit mask */
+#define IXGBE_MCSTCTRL_MFE      0x4
+
+/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
+#define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8
+#define IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE  8
+#define IXGBE_REQ_TX_BUFFER_GRANULARITY   1024
+
+/* Vlan-specific macros */
+#define IXGBE_RX_DESC_SPECIAL_VLAN_MASK  0x0FFF /* VLAN ID in lower 12 bits */
+#define IXGBE_RX_DESC_SPECIAL_PRI_MASK   0xE000 /* Priority in upper 3 bits */
+#define IXGBE_RX_DESC_SPECIAL_PRI_SHIFT  0x000D /* Priority in upper 3 of 16 */
+#define IXGBE_TX_DESC_SPECIAL_PRI_SHIFT  IXGBE_RX_DESC_SPECIAL_PRI_SHIFT
+
+/* SR-IOV specific macros */
+#define IXGBE_MBVFICR_INDEX(vf_number)   (vf_number >> 4)
+#define IXGBE_MBVFICR(_i)                (0x00710 + (_i * 4))
+#define IXGBE_VFLRE(_i)                  (((_i & 1) ? 0x001C0 : 0x00600))
+#define IXGBE_VFLREC(_i)                 (0x00700 + (_i * 4))
+
+enum ixgbe_fdir_pballoc_type {
+       IXGBE_FDIR_PBALLOC_NONE = 0,
+       IXGBE_FDIR_PBALLOC_64K  = 1,
+       IXGBE_FDIR_PBALLOC_128K = 2,
+       IXGBE_FDIR_PBALLOC_256K = 3,
+};
+#define IXGBE_FDIR_PBALLOC_SIZE_SHIFT           16
+
+/* Flow Director register values */
+#define IXGBE_FDIRCTRL_PBALLOC_64K              0x00000001
+#define IXGBE_FDIRCTRL_PBALLOC_128K             0x00000002
+#define IXGBE_FDIRCTRL_PBALLOC_256K             0x00000003
+#define IXGBE_FDIRCTRL_INIT_DONE                0x00000008
+#define IXGBE_FDIRCTRL_PERFECT_MATCH            0x00000010
+#define IXGBE_FDIRCTRL_REPORT_STATUS            0x00000020
+#define IXGBE_FDIRCTRL_REPORT_STATUS_ALWAYS     0x00000080
+#define IXGBE_FDIRCTRL_DROP_Q_SHIFT             8
+#define IXGBE_FDIRCTRL_FLEX_SHIFT               16
+#define IXGBE_FDIRCTRL_SEARCHLIM                0x00800000
+#define IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT         24
+#define IXGBE_FDIRCTRL_FULL_THRESH_MASK         0xF0000000
+#define IXGBE_FDIRCTRL_FULL_THRESH_SHIFT        28
+
+#define IXGBE_FDIRTCPM_DPORTM_SHIFT             16
+#define IXGBE_FDIRUDPM_DPORTM_SHIFT             16
+#define IXGBE_FDIRIP6M_DIPM_SHIFT               16
+#define IXGBE_FDIRM_VLANID                      0x00000001
+#define IXGBE_FDIRM_VLANP                       0x00000002
+#define IXGBE_FDIRM_POOL                        0x00000004
+#define IXGBE_FDIRM_L4P                         0x00000008
+#define IXGBE_FDIRM_FLEX                        0x00000010
+#define IXGBE_FDIRM_DIPv6                       0x00000020
+
+#define IXGBE_FDIRFREE_FREE_MASK                0xFFFF
+#define IXGBE_FDIRFREE_FREE_SHIFT               0
+#define IXGBE_FDIRFREE_COLL_MASK                0x7FFF0000
+#define IXGBE_FDIRFREE_COLL_SHIFT               16
+#define IXGBE_FDIRLEN_MAXLEN_MASK               0x3F
+#define IXGBE_FDIRLEN_MAXLEN_SHIFT              0
+#define IXGBE_FDIRLEN_MAXHASH_MASK              0x7FFF0000
+#define IXGBE_FDIRLEN_MAXHASH_SHIFT             16
+#define IXGBE_FDIRUSTAT_ADD_MASK                0xFFFF
+#define IXGBE_FDIRUSTAT_ADD_SHIFT               0
+#define IXGBE_FDIRUSTAT_REMOVE_MASK             0xFFFF0000
+#define IXGBE_FDIRUSTAT_REMOVE_SHIFT            16
+#define IXGBE_FDIRFSTAT_FADD_MASK               0x00FF
+#define IXGBE_FDIRFSTAT_FADD_SHIFT              0
+#define IXGBE_FDIRFSTAT_FREMOVE_MASK            0xFF00
+#define IXGBE_FDIRFSTAT_FREMOVE_SHIFT           8
+#define IXGBE_FDIRPORT_DESTINATION_SHIFT        16
+#define IXGBE_FDIRVLAN_FLEX_SHIFT               16
+#define IXGBE_FDIRHASH_BUCKET_VALID_SHIFT       15
+#define IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT       16
+
+#define IXGBE_FDIRCMD_CMD_MASK                  0x00000003
+#define IXGBE_FDIRCMD_CMD_ADD_FLOW              0x00000001
+#define IXGBE_FDIRCMD_CMD_REMOVE_FLOW           0x00000002
+#define IXGBE_FDIRCMD_CMD_QUERY_REM_FILT        0x00000003
+#define IXGBE_FDIRCMD_FILTER_VALID              0x00000004
+#define IXGBE_FDIRCMD_FILTER_UPDATE             0x00000008
+#define IXGBE_FDIRCMD_IPv6DMATCH                0x00000010
+#define IXGBE_FDIRCMD_L4TYPE_UDP                0x00000020
+#define IXGBE_FDIRCMD_L4TYPE_TCP                0x00000040
+#define IXGBE_FDIRCMD_L4TYPE_SCTP               0x00000060
+#define IXGBE_FDIRCMD_IPV6                      0x00000080
+#define IXGBE_FDIRCMD_CLEARHT                   0x00000100
+#define IXGBE_FDIRCMD_DROP                      0x00000200
+#define IXGBE_FDIRCMD_INT                       0x00000400
+#define IXGBE_FDIRCMD_LAST                      0x00000800
+#define IXGBE_FDIRCMD_COLLISION                 0x00001000
+#define IXGBE_FDIRCMD_QUEUE_EN                  0x00008000
+#define IXGBE_FDIRCMD_FLOW_TYPE_SHIFT           5
+#define IXGBE_FDIRCMD_RX_QUEUE_SHIFT            16
+#define IXGBE_FDIRCMD_VT_POOL_SHIFT             24
+#define IXGBE_FDIR_INIT_DONE_POLL               10
+#define IXGBE_FDIRCMD_CMD_POLL                  10
+
+#define IXGBE_FDIR_DROP_QUEUE                   127
+
+/* Manageablility Host Interface defines */
+#define IXGBE_HI_MAX_BLOCK_BYTE_LENGTH       1792 /* Num of bytes in range */
+#define IXGBE_HI_MAX_BLOCK_DWORD_LENGTH      448 /* Num of dwords in range */
+#define IXGBE_HI_COMMAND_TIMEOUT             500 /* Process HI command limit */
+
+/* CEM Support */
+#define FW_CEM_HDR_LEN                0x4
+#define FW_CEM_CMD_DRIVER_INFO        0xDD
+#define FW_CEM_CMD_DRIVER_INFO_LEN    0x5
+#define FW_CEM_CMD_RESERVED           0x0
+#define FW_CEM_UNUSED_VER             0x0
+#define FW_CEM_MAX_RETRIES            3
+#define FW_CEM_RESP_STATUS_SUCCESS    0x1
+
+/* Host Interface Command Structures */
+struct ixgbe_hic_hdr {
+       u8 cmd;
+       u8 buf_len;
+       union {
+               u8 cmd_resv;
+               u8 ret_status;
+       } cmd_or_resp;
+       u8 checksum;
+};
+
+struct ixgbe_hic_drv_info {
+       struct ixgbe_hic_hdr hdr;
+       u8 port_num;
+       u8 ver_sub;
+       u8 ver_build;
+       u8 ver_min;
+       u8 ver_maj;
+       u8 pad; /* end spacing to ensure length is mult. of dword */
+       u16 pad2; /* end spacing to ensure length is mult. of dword2 */
+};
+
+/* Transmit Descriptor - Advanced */
+union ixgbe_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;
+};
+
+/* Receive Descriptor - Advanced */
+union ixgbe_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, Pkt type */
+                                       __le16 hdr_info; /* Splithdr, hdrlen */
+                               } 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 */
+};
+
+/* Context descriptors */
+struct ixgbe_adv_tx_context_desc {
+       __le32 vlan_macip_lens;
+       __le32 seqnum_seed;
+       __le32 type_tucmd_mlhl;
+       __le32 mss_l4len_idx;
+};
+
+/* Adv Transmit Descriptor Config Masks */
+#define IXGBE_ADVTXD_DTALEN_MASK      0x0000FFFF /* Data buf length(bytes) */
+#define IXGBE_ADVTXD_MAC_LINKSEC      0x00040000 /* Insert LinkSec */
+#define IXGBE_ADVTXD_IPSEC_SA_INDEX_MASK   0x000003FF /* IPSec SA index */
+#define IXGBE_ADVTXD_IPSEC_ESP_LEN_MASK    0x000001FF /* IPSec ESP length */
+#define IXGBE_ADVTXD_DTYP_MASK  0x00F00000 /* DTYP mask */
+#define IXGBE_ADVTXD_DTYP_CTXT  0x00200000 /* Advanced Context Desc */
+#define IXGBE_ADVTXD_DTYP_DATA  0x00300000 /* Advanced Data Descriptor */
+#define IXGBE_ADVTXD_DCMD_EOP   IXGBE_TXD_CMD_EOP  /* End of Packet */
+#define IXGBE_ADVTXD_DCMD_IFCS  IXGBE_TXD_CMD_IFCS /* Insert FCS */
+#define IXGBE_ADVTXD_DCMD_RS    IXGBE_TXD_CMD_RS   /* Report Status */
+#define IXGBE_ADVTXD_DCMD_DDTYP_ISCSI 0x10000000    /* DDP hdr type or iSCSI */
+#define IXGBE_ADVTXD_DCMD_DEXT  IXGBE_TXD_CMD_DEXT /* Desc ext (1=Adv) */
+#define IXGBE_ADVTXD_DCMD_VLE   IXGBE_TXD_CMD_VLE  /* VLAN pkt enable */
+#define IXGBE_ADVTXD_DCMD_TSE   0x80000000 /* TCP Seg enable */
+#define IXGBE_ADVTXD_STAT_DD    IXGBE_TXD_STAT_DD  /* Descriptor Done */
+#define IXGBE_ADVTXD_STAT_SN_CRC      0x00000002 /* NXTSEQ/SEED pres in WB */
+#define IXGBE_ADVTXD_STAT_RSV   0x0000000C /* STA Reserved */
+#define IXGBE_ADVTXD_IDX_SHIFT  4 /* Adv desc Index shift */
+#define IXGBE_ADVTXD_CC         0x00000080 /* Check Context */
+#define IXGBE_ADVTXD_POPTS_SHIFT      8  /* Adv desc POPTS shift */
+#define IXGBE_ADVTXD_POPTS_IXSM (IXGBE_TXD_POPTS_IXSM << \
+                                 IXGBE_ADVTXD_POPTS_SHIFT)
+#define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM << \
+                                 IXGBE_ADVTXD_POPTS_SHIFT)
+#define IXGBE_ADVTXD_POPTS_ISCO_1ST  0x00000000 /* 1st TSO of iSCSI PDU */
+#define IXGBE_ADVTXD_POPTS_ISCO_MDL  0x00000800 /* Middle TSO of iSCSI PDU */
+#define IXGBE_ADVTXD_POPTS_ISCO_LAST 0x00001000 /* Last TSO of iSCSI PDU */
+#define IXGBE_ADVTXD_POPTS_ISCO_FULL 0x00001800 /* 1st&Last TSO-full iSCSI PDU */
+#define IXGBE_ADVTXD_POPTS_RSV       0x00002000 /* POPTS Reserved */
+#define IXGBE_ADVTXD_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
+#define IXGBE_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
+#define IXGBE_ADVTXD_VLAN_SHIFT      16  /* Adv ctxt vlan tag shift */
+#define IXGBE_ADVTXD_TUCMD_IPV4      0x00000400  /* IP Packet Type: 1=IPv4 */
+#define IXGBE_ADVTXD_TUCMD_IPV6      0x00000000  /* IP Packet Type: 0=IPv6 */
+#define IXGBE_ADVTXD_TUCMD_L4T_UDP   0x00000000  /* L4 Packet TYPE of UDP */
+#define IXGBE_ADVTXD_TUCMD_L4T_TCP   0x00000800  /* L4 Packet TYPE of TCP */
+#define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */
+#define IXGBE_ADVTXD_TUCMD_MKRREQ    0x00002000 /*Req requires Markers and CRC*/
+#define IXGBE_ADVTXD_POPTS_IPSEC      0x00000400 /* IPSec offload request */
+#define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000 /* IPSec Type ESP */
+#define IXGBE_ADVTXD_TUCMD_IPSEC_ENCRYPT_EN 0x00004000/* ESP Encrypt Enable */
+#define IXGBE_ADVTXT_TUCMD_FCOE      0x00008000       /* FCoE Frame Type */
+#define IXGBE_ADVTXD_FCOEF_EOF_MASK  (0x3 << 10)      /* FC EOF index */
+#define IXGBE_ADVTXD_FCOEF_SOF       ((1 << 2) << 10) /* FC SOF index */
+#define IXGBE_ADVTXD_FCOEF_PARINC    ((1 << 3) << 10) /* Rel_Off in F_CTL */
+#define IXGBE_ADVTXD_FCOEF_ORIE      ((1 << 4) << 10) /* Orientation: End */
+#define IXGBE_ADVTXD_FCOEF_ORIS      ((1 << 5) << 10) /* Orientation: Start */
+#define IXGBE_ADVTXD_FCOEF_EOF_N     (0x0 << 10)      /* 00: EOFn */
+#define IXGBE_ADVTXD_FCOEF_EOF_T     (0x1 << 10)      /* 01: EOFt */
+#define IXGBE_ADVTXD_FCOEF_EOF_NI    (0x2 << 10)      /* 10: EOFni */
+#define IXGBE_ADVTXD_FCOEF_EOF_A     (0x3 << 10)      /* 11: EOFa */
+#define IXGBE_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
+#define IXGBE_ADVTXD_MSS_SHIFT       16  /* Adv ctxt MSS shift */
+
+/* Autonegotiation advertised speeds */
+typedef u32 ixgbe_autoneg_advertised;
+/* Link speed */
+typedef u32 ixgbe_link_speed;
+#define IXGBE_LINK_SPEED_UNKNOWN   0
+#define IXGBE_LINK_SPEED_100_FULL  0x0008
+#define IXGBE_LINK_SPEED_1GB_FULL  0x0020
+#define IXGBE_LINK_SPEED_10GB_FULL 0x0080
+#define IXGBE_LINK_SPEED_82598_AUTONEG (IXGBE_LINK_SPEED_1GB_FULL | \
+                                        IXGBE_LINK_SPEED_10GB_FULL)
+#define IXGBE_LINK_SPEED_82599_AUTONEG (IXGBE_LINK_SPEED_100_FULL | \
+                                        IXGBE_LINK_SPEED_1GB_FULL | \
+                                        IXGBE_LINK_SPEED_10GB_FULL)
+
+
+/* Physical layer type */
+typedef u32 ixgbe_physical_layer;
+#define IXGBE_PHYSICAL_LAYER_UNKNOWN      0
+#define IXGBE_PHYSICAL_LAYER_10GBASE_T    0x0001
+#define IXGBE_PHYSICAL_LAYER_1000BASE_T   0x0002
+#define IXGBE_PHYSICAL_LAYER_100BASE_TX   0x0004
+#define IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU  0x0008
+#define IXGBE_PHYSICAL_LAYER_10GBASE_LR   0x0010
+#define IXGBE_PHYSICAL_LAYER_10GBASE_LRM  0x0020
+#define IXGBE_PHYSICAL_LAYER_10GBASE_SR   0x0040
+#define IXGBE_PHYSICAL_LAYER_10GBASE_KX4  0x0080
+#define IXGBE_PHYSICAL_LAYER_10GBASE_CX4  0x0100
+#define IXGBE_PHYSICAL_LAYER_1000BASE_KX  0x0200
+#define IXGBE_PHYSICAL_LAYER_1000BASE_BX  0x0400
+#define IXGBE_PHYSICAL_LAYER_10GBASE_KR   0x0800
+#define IXGBE_PHYSICAL_LAYER_10GBASE_XAUI 0x1000
+#define IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA 0x2000
+
+/* Flow Control Macros */
+#define PAUSE_RTT      8
+#define PAUSE_MTU(MTU) ((MTU + 1024 - 1) / 1024)
+
+#define FC_HIGH_WATER(MTU) ((((PAUSE_RTT + PAUSE_MTU(MTU)) * 144) + 99) / 100 +\
+                               PAUSE_MTU(MTU))
+#define FC_LOW_WATER(MTU)  (2 * (2 * PAUSE_MTU(MTU) + PAUSE_RTT))
+
+/* Software ATR hash keys */
+#define IXGBE_ATR_BUCKET_HASH_KEY    0x3DAD14E2
+#define IXGBE_ATR_SIGNATURE_HASH_KEY 0x174D3614
+
+/* Software ATR input stream values and masks */
+#define IXGBE_ATR_HASH_MASK     0x7fff
+#define IXGBE_ATR_L4TYPE_MASK      0x3
+#define IXGBE_ATR_L4TYPE_UDP       0x1
+#define IXGBE_ATR_L4TYPE_TCP       0x2
+#define IXGBE_ATR_L4TYPE_SCTP      0x3
+#define IXGBE_ATR_L4TYPE_IPV6_MASK 0x4
+enum ixgbe_atr_flow_type {
+       IXGBE_ATR_FLOW_TYPE_IPV4   = 0x0,
+       IXGBE_ATR_FLOW_TYPE_UDPV4  = 0x1,
+       IXGBE_ATR_FLOW_TYPE_TCPV4  = 0x2,
+       IXGBE_ATR_FLOW_TYPE_SCTPV4 = 0x3,
+       IXGBE_ATR_FLOW_TYPE_IPV6   = 0x4,
+       IXGBE_ATR_FLOW_TYPE_UDPV6  = 0x5,
+       IXGBE_ATR_FLOW_TYPE_TCPV6  = 0x6,
+       IXGBE_ATR_FLOW_TYPE_SCTPV6 = 0x7,
+};
+
+/* Flow Director ATR input struct. */
+union ixgbe_atr_input {
+       /*
+        * Byte layout in order, all values with MSB first:
+        *
+        * vm_pool    - 1 byte
+        * flow_type  - 1 byte
+        * vlan_id    - 2 bytes
+        * src_ip     - 16 bytes
+        * dst_ip     - 16 bytes
+        * src_port   - 2 bytes
+        * dst_port   - 2 bytes
+        * flex_bytes - 2 bytes
+        * bkt_hash   - 2 bytes
+        */
+       struct {
+               u8     vm_pool;
+               u8     flow_type;
+               __be16 vlan_id;
+               __be32 dst_ip[4];
+               __be32 src_ip[4];
+               __be16 src_port;
+               __be16 dst_port;
+               __be16 flex_bytes;
+               __be16 bkt_hash;
+       } formatted;
+       __be32 dword_stream[11];
+};
+
+/* Flow Director compressed ATR hash input struct */
+union ixgbe_atr_hash_dword {
+       struct {
+               u8 vm_pool;
+               u8 flow_type;
+               __be16 vlan_id;
+       } formatted;
+       __be32 ip;
+       struct {
+               __be16 src;
+               __be16 dst;
+       } port;
+       __be16 flex_bytes;
+       __be32 dword;
+};
+
+enum ixgbe_eeprom_type {
+       ixgbe_eeprom_uninitialized = 0,
+       ixgbe_eeprom_spi,
+       ixgbe_flash,
+       ixgbe_eeprom_none /* No NVM support */
+};
+
+enum ixgbe_mac_type {
+       ixgbe_mac_unknown = 0,
+       ixgbe_mac_82598EB,
+       ixgbe_mac_82599EB,
+       ixgbe_mac_X540,
+       ixgbe_num_macs
+};
+
+enum ixgbe_phy_type {
+       ixgbe_phy_unknown = 0,
+       ixgbe_phy_none,
+       ixgbe_phy_tn,
+       ixgbe_phy_aq,
+       ixgbe_phy_cu_unknown,
+       ixgbe_phy_qt,
+       ixgbe_phy_xaui,
+       ixgbe_phy_nl,
+       ixgbe_phy_sfp_passive_tyco,
+       ixgbe_phy_sfp_passive_unknown,
+       ixgbe_phy_sfp_active_unknown,
+       ixgbe_phy_sfp_avago,
+       ixgbe_phy_sfp_ftl,
+       ixgbe_phy_sfp_ftl_active,
+       ixgbe_phy_sfp_unknown,
+       ixgbe_phy_sfp_intel,
+       ixgbe_phy_sfp_unsupported,
+       ixgbe_phy_generic
+};
+
+/*
+ * SFP+ module type IDs:
+ *
+ * ID   Module Type
+ * =============
+ * 0    SFP_DA_CU
+ * 1    SFP_SR
+ * 2    SFP_LR
+ * 3    SFP_DA_CU_CORE0 - 82599-specific
+ * 4    SFP_DA_CU_CORE1 - 82599-specific
+ * 5    SFP_SR/LR_CORE0 - 82599-specific
+ * 6    SFP_SR/LR_CORE1 - 82599-specific
+ */
+enum ixgbe_sfp_type {
+       ixgbe_sfp_type_da_cu = 0,
+       ixgbe_sfp_type_sr = 1,
+       ixgbe_sfp_type_lr = 2,
+       ixgbe_sfp_type_da_cu_core0 = 3,
+       ixgbe_sfp_type_da_cu_core1 = 4,
+       ixgbe_sfp_type_srlr_core0 = 5,
+       ixgbe_sfp_type_srlr_core1 = 6,
+       ixgbe_sfp_type_da_act_lmt_core0 = 7,
+       ixgbe_sfp_type_da_act_lmt_core1 = 8,
+       ixgbe_sfp_type_1g_cu_core0 = 9,
+       ixgbe_sfp_type_1g_cu_core1 = 10,
+       ixgbe_sfp_type_not_present = 0xFFFE,
+       ixgbe_sfp_type_unknown = 0xFFFF
+};
+
+enum ixgbe_media_type {
+       ixgbe_media_type_unknown = 0,
+       ixgbe_media_type_fiber,
+       ixgbe_media_type_fiber_lco,
+       ixgbe_media_type_copper,
+       ixgbe_media_type_backplane,
+       ixgbe_media_type_cx4,
+       ixgbe_media_type_virtual
+};
+
+/* Flow Control Settings */
+enum ixgbe_fc_mode {
+       ixgbe_fc_none = 0,
+       ixgbe_fc_rx_pause,
+       ixgbe_fc_tx_pause,
+       ixgbe_fc_full,
+#ifdef CONFIG_DCB
+       ixgbe_fc_pfc,
+#endif
+       ixgbe_fc_default
+};
+
+/* Smart Speed Settings */
+#define IXGBE_SMARTSPEED_MAX_RETRIES   3
+enum ixgbe_smart_speed {
+       ixgbe_smart_speed_auto = 0,
+       ixgbe_smart_speed_on,
+       ixgbe_smart_speed_off
+};
+
+/* PCI bus types */
+enum ixgbe_bus_type {
+       ixgbe_bus_type_unknown = 0,
+       ixgbe_bus_type_pci,
+       ixgbe_bus_type_pcix,
+       ixgbe_bus_type_pci_express,
+       ixgbe_bus_type_reserved
+};
+
+/* PCI bus speeds */
+enum ixgbe_bus_speed {
+       ixgbe_bus_speed_unknown = 0,
+       ixgbe_bus_speed_33      = 33,
+       ixgbe_bus_speed_66      = 66,
+       ixgbe_bus_speed_100     = 100,
+       ixgbe_bus_speed_120     = 120,
+       ixgbe_bus_speed_133     = 133,
+       ixgbe_bus_speed_2500    = 2500,
+       ixgbe_bus_speed_5000    = 5000,
+       ixgbe_bus_speed_reserved
+};
+
+/* PCI bus widths */
+enum ixgbe_bus_width {
+       ixgbe_bus_width_unknown = 0,
+       ixgbe_bus_width_pcie_x1 = 1,
+       ixgbe_bus_width_pcie_x2 = 2,
+       ixgbe_bus_width_pcie_x4 = 4,
+       ixgbe_bus_width_pcie_x8 = 8,
+       ixgbe_bus_width_32      = 32,
+       ixgbe_bus_width_64      = 64,
+       ixgbe_bus_width_reserved
+};
+
+struct ixgbe_addr_filter_info {
+       u32 num_mc_addrs;
+       u32 rar_used_count;
+       u32 mta_in_use;
+       u32 overflow_promisc;
+       bool uc_set_promisc;
+       bool user_set_promisc;
+};
+
+/* Bus parameters */
+struct ixgbe_bus_info {
+       enum ixgbe_bus_speed speed;
+       enum ixgbe_bus_width width;
+       enum ixgbe_bus_type type;
+
+       u16 func;
+       u16 lan_id;
+};
+
+/* Flow control parameters */
+struct ixgbe_fc_info {
+       u32 high_water; /* Flow Control High-water */
+       u32 low_water; /* Flow Control Low-water */
+       u16 pause_time; /* Flow Control Pause timer */
+       bool send_xon; /* Flow control send XON */
+       bool strict_ieee; /* Strict IEEE mode */
+       bool disable_fc_autoneg; /* Do not autonegotiate FC */
+       bool fc_was_autonegged; /* Is current_mode the result of autonegging? */
+       enum ixgbe_fc_mode current_mode; /* FC mode in effect */
+       enum ixgbe_fc_mode requested_mode; /* FC mode requested by caller */
+};
+
+/* Statistics counters collected by the MAC */
+struct ixgbe_hw_stats {
+       u64 crcerrs;
+       u64 illerrc;
+       u64 errbc;
+       u64 mspdc;
+       u64 mpctotal;
+       u64 mpc[8];
+       u64 mlfc;
+       u64 mrfc;
+       u64 rlec;
+       u64 lxontxc;
+       u64 lxonrxc;
+       u64 lxofftxc;
+       u64 lxoffrxc;
+       u64 pxontxc[8];
+       u64 pxonrxc[8];
+       u64 pxofftxc[8];
+       u64 pxoffrxc[8];
+       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[8];
+       u64 ruc;
+       u64 rfc;
+       u64 roc;
+       u64 rjc;
+       u64 mngprc;
+       u64 mngpdc;
+       u64 mngptc;
+       u64 tor;
+       u64 tpr;
+       u64 tpt;
+       u64 ptc64;
+       u64 ptc127;
+       u64 ptc255;
+       u64 ptc511;
+       u64 ptc1023;
+       u64 ptc1522;
+       u64 mptc;
+       u64 bptc;
+       u64 xec;
+       u64 rqsmr[16];
+       u64 tqsmr[8];
+       u64 qprc[16];
+       u64 qptc[16];
+       u64 qbrc[16];
+       u64 qbtc[16];
+       u64 qprdc[16];
+       u64 pxon2offc[8];
+       u64 fdirustat_add;
+       u64 fdirustat_remove;
+       u64 fdirfstat_fadd;
+       u64 fdirfstat_fremove;
+       u64 fdirmatch;
+       u64 fdirmiss;
+       u64 fccrc;
+       u64 fcoerpdc;
+       u64 fcoeprc;
+       u64 fcoeptc;
+       u64 fcoedwrc;
+       u64 fcoedwtc;
+       u64 b2ospc;
+       u64 b2ogprc;
+       u64 o2bgptc;
+       u64 o2bspc;
+};
+
+/* forward declaration */
+struct ixgbe_hw;
+
+/* iterator type for walking multicast address lists */
+typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr,
+                                  u32 *vmdq);
+
+/* Function pointer table */
+struct ixgbe_eeprom_operations {
+       s32 (*init_params)(struct ixgbe_hw *);
+       s32 (*read)(struct ixgbe_hw *, u16, u16 *);
+       s32 (*read_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
+       s32 (*write)(struct ixgbe_hw *, u16, u16);
+       s32 (*write_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
+       s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
+       s32 (*update_checksum)(struct ixgbe_hw *);
+       u16 (*calc_checksum)(struct ixgbe_hw *);
+};
+
+struct ixgbe_mac_operations {
+       s32 (*init_hw)(struct ixgbe_hw *);
+       s32 (*reset_hw)(struct ixgbe_hw *);
+       s32 (*start_hw)(struct ixgbe_hw *);
+       s32 (*clear_hw_cntrs)(struct ixgbe_hw *);
+       enum ixgbe_media_type (*get_media_type)(struct ixgbe_hw *);
+       u32 (*get_supported_physical_layer)(struct ixgbe_hw *);
+       s32 (*get_mac_addr)(struct ixgbe_hw *, u8 *);
+       s32 (*get_san_mac_addr)(struct ixgbe_hw *, u8 *);
+       s32 (*get_device_caps)(struct ixgbe_hw *, u16 *);
+       s32 (*get_wwn_prefix)(struct ixgbe_hw *, u16 *, u16 *);
+       s32 (*stop_adapter)(struct ixgbe_hw *);
+       s32 (*get_bus_info)(struct ixgbe_hw *);
+       void (*set_lan_id)(struct ixgbe_hw *);
+       s32 (*read_analog_reg8)(struct ixgbe_hw*, u32, u8*);
+       s32 (*write_analog_reg8)(struct ixgbe_hw*, u32, u8);
+       s32 (*setup_sfp)(struct ixgbe_hw *);
+       s32 (*enable_rx_dma)(struct ixgbe_hw *, u32);
+       s32 (*acquire_swfw_sync)(struct ixgbe_hw *, u16);
+       void (*release_swfw_sync)(struct ixgbe_hw *, u16);
+
+       /* Link */
+       void (*disable_tx_laser)(struct ixgbe_hw *);
+       void (*enable_tx_laser)(struct ixgbe_hw *);
+       void (*flap_tx_laser)(struct ixgbe_hw *);
+       s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool, bool);
+       s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool);
+       s32 (*get_link_capabilities)(struct ixgbe_hw *, ixgbe_link_speed *,
+                                    bool *);
+
+       /* Packet Buffer Manipulation */
+       void (*set_rxpba)(struct ixgbe_hw *, int, u32, int);
+
+       /* LED */
+       s32 (*led_on)(struct ixgbe_hw *, u32);
+       s32 (*led_off)(struct ixgbe_hw *, u32);
+       s32 (*blink_led_start)(struct ixgbe_hw *, u32);
+       s32 (*blink_led_stop)(struct ixgbe_hw *, u32);
+
+       /* RAR, Multicast, VLAN */
+       s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32, u32);
+       s32 (*clear_rar)(struct ixgbe_hw *, u32);
+       s32 (*set_vmdq)(struct ixgbe_hw *, u32, u32);
+       s32 (*clear_vmdq)(struct ixgbe_hw *, u32, u32);
+       s32 (*init_rx_addrs)(struct ixgbe_hw *);
+       s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
+       s32 (*enable_mc)(struct ixgbe_hw *);
+       s32 (*disable_mc)(struct ixgbe_hw *);
+       s32 (*clear_vfta)(struct ixgbe_hw *);
+       s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
+       s32 (*init_uta_tables)(struct ixgbe_hw *);
+       void (*set_mac_anti_spoofing)(struct ixgbe_hw *, bool, int);
+       void (*set_vlan_anti_spoofing)(struct ixgbe_hw *, bool, int);
+
+       /* Flow Control */
+       s32 (*fc_enable)(struct ixgbe_hw *, s32);
+
+       /* Manageability interface */
+       s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
+};
+
+struct ixgbe_phy_operations {
+       s32 (*identify)(struct ixgbe_hw *);
+       s32 (*identify_sfp)(struct ixgbe_hw *);
+       s32 (*init)(struct ixgbe_hw *);
+       s32 (*reset)(struct ixgbe_hw *);
+       s32 (*read_reg)(struct ixgbe_hw *, u32, u32, u16 *);
+       s32 (*write_reg)(struct ixgbe_hw *, u32, u32, u16);
+       s32 (*setup_link)(struct ixgbe_hw *);
+       s32 (*setup_link_speed)(struct ixgbe_hw *, ixgbe_link_speed, bool,
+                               bool);
+       s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *);
+       s32 (*get_firmware_version)(struct ixgbe_hw *, u16 *);
+       s32 (*read_i2c_byte)(struct ixgbe_hw *, u8, u8, u8 *);
+       s32 (*write_i2c_byte)(struct ixgbe_hw *, u8, u8, u8);
+       s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *);
+       s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
+       s32 (*check_overtemp)(struct ixgbe_hw *);
+};
+
+struct ixgbe_eeprom_info {
+       struct ixgbe_eeprom_operations  ops;
+       enum ixgbe_eeprom_type          type;
+       u32                             semaphore_delay;
+       u16                             word_size;
+       u16                             address_bits;
+       u16                             word_page_size;
+};
+
+#define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED      0x01
+struct ixgbe_mac_info {
+       struct ixgbe_mac_operations     ops;
+       enum ixgbe_mac_type             type;
+       u8                              addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
+       u8                              perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
+       u8                              san_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
+       /* prefix for World Wide Node Name (WWNN) */
+       u16                             wwnn_prefix;
+       /* prefix for World Wide Port Name (WWPN) */
+       u16                             wwpn_prefix;
+#define IXGBE_MAX_MTA                  128
+       u32                             mta_shadow[IXGBE_MAX_MTA];
+       s32                             mc_filter_type;
+       u32                             mcft_size;
+       u32                             vft_size;
+       u32                             num_rar_entries;
+       u32                             rar_highwater;
+       u32                             rx_pb_size;
+       u32                             max_tx_queues;
+       u32                             max_rx_queues;
+       u32                             max_msix_vectors;
+       u32                             orig_autoc;
+       u32                             orig_autoc2;
+       bool                            orig_link_settings_stored;
+       bool                            autotry_restart;
+       u8                              flags;
+};
+
+struct ixgbe_phy_info {
+       struct ixgbe_phy_operations     ops;
+       struct mdio_if_info             mdio;
+       enum ixgbe_phy_type             type;
+       u32                             id;
+       enum ixgbe_sfp_type             sfp_type;
+       bool                            sfp_setup_needed;
+       u32                             revision;
+       enum ixgbe_media_type           media_type;
+       bool                            reset_disable;
+       ixgbe_autoneg_advertised        autoneg_advertised;
+       enum ixgbe_smart_speed          smart_speed;
+       bool                            smart_speed_active;
+       bool                            multispeed_fiber;
+       bool                            reset_if_overtemp;
+};
+
+#include "ixgbe_mbx.h"
+
+struct ixgbe_mbx_operations {
+       s32 (*init_params)(struct ixgbe_hw *hw);
+       s32 (*read)(struct ixgbe_hw *, u32 *, u16,  u16);
+       s32 (*write)(struct ixgbe_hw *, u32 *, u16, u16);
+       s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16,  u16);
+       s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16, u16);
+       s32 (*check_for_msg)(struct ixgbe_hw *, u16);
+       s32 (*check_for_ack)(struct ixgbe_hw *, u16);
+       s32 (*check_for_rst)(struct ixgbe_hw *, u16);
+};
+
+struct ixgbe_mbx_stats {
+       u32 msgs_tx;
+       u32 msgs_rx;
+
+       u32 acks;
+       u32 reqs;
+       u32 rsts;
+};
+
+struct ixgbe_mbx_info {
+       struct ixgbe_mbx_operations ops;
+       struct ixgbe_mbx_stats stats;
+       u32 timeout;
+       u32 usec_delay;
+       u32 v2p_mailbox;
+       u16 size;
+};
+
+struct ixgbe_hw {
+       u8 __iomem                      *hw_addr;
+       void                            *back;
+       struct ixgbe_mac_info           mac;
+       struct ixgbe_addr_filter_info   addr_ctrl;
+       struct ixgbe_fc_info            fc;
+       struct ixgbe_phy_info           phy;
+       struct ixgbe_eeprom_info        eeprom;
+       struct ixgbe_bus_info           bus;
+       struct ixgbe_mbx_info           mbx;
+       u16                             device_id;
+       u16                             vendor_id;
+       u16                             subsystem_device_id;
+       u16                             subsystem_vendor_id;
+       u8                              revision_id;
+       bool                            adapter_stopped;
+       bool                            force_full_reset;
+};
+
+struct ixgbe_info {
+       enum ixgbe_mac_type             mac;
+       s32                             (*get_invariants)(struct ixgbe_hw *);
+       struct ixgbe_mac_operations     *mac_ops;
+       struct ixgbe_eeprom_operations  *eeprom_ops;
+       struct ixgbe_phy_operations     *phy_ops;
+       struct ixgbe_mbx_operations     *mbx_ops;
+};
+
+
+/* Error Codes */
+#define IXGBE_ERR_EEPROM                        -1
+#define IXGBE_ERR_EEPROM_CHECKSUM               -2
+#define IXGBE_ERR_PHY                           -3
+#define IXGBE_ERR_CONFIG                        -4
+#define IXGBE_ERR_PARAM                         -5
+#define IXGBE_ERR_MAC_TYPE                      -6
+#define IXGBE_ERR_UNKNOWN_PHY                   -7
+#define IXGBE_ERR_LINK_SETUP                    -8
+#define IXGBE_ERR_ADAPTER_STOPPED               -9
+#define IXGBE_ERR_INVALID_MAC_ADDR              -10
+#define IXGBE_ERR_DEVICE_NOT_SUPPORTED          -11
+#define IXGBE_ERR_MASTER_REQUESTS_PENDING       -12
+#define IXGBE_ERR_INVALID_LINK_SETTINGS         -13
+#define IXGBE_ERR_AUTONEG_NOT_COMPLETE          -14
+#define IXGBE_ERR_RESET_FAILED                  -15
+#define IXGBE_ERR_SWFW_SYNC                     -16
+#define IXGBE_ERR_PHY_ADDR_INVALID              -17
+#define IXGBE_ERR_I2C                           -18
+#define IXGBE_ERR_SFP_NOT_SUPPORTED             -19
+#define IXGBE_ERR_SFP_NOT_PRESENT               -20
+#define IXGBE_ERR_SFP_NO_INIT_SEQ_PRESENT       -21
+#define IXGBE_ERR_NO_SAN_ADDR_PTR               -22
+#define IXGBE_ERR_FDIR_REINIT_FAILED            -23
+#define IXGBE_ERR_EEPROM_VERSION                -24
+#define IXGBE_ERR_NO_SPACE                      -25
+#define IXGBE_ERR_OVERTEMP                      -26
+#define IXGBE_ERR_FC_NOT_NEGOTIATED             -27
+#define IXGBE_ERR_FC_NOT_SUPPORTED              -28
+#define IXGBE_ERR_FLOW_CONTROL                  -29
+#define IXGBE_ERR_SFP_SETUP_NOT_COMPLETE        -30
+#define IXGBE_ERR_PBA_SECTION                   -31
+#define IXGBE_ERR_INVALID_ARGUMENT              -32
+#define IXGBE_ERR_HOST_INTERFACE_COMMAND        -33
+#define IXGBE_NOT_IMPLEMENTED                   0x7FFFFFFF
+
+#endif /* _IXGBE_TYPE_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
new file mode 100644 (file)
index 0000000..2696c78
--- /dev/null
@@ -0,0 +1,941 @@
+/*******************************************************************************
+
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2011 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
+
+*******************************************************************************/
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+
+#include "ixgbe.h"
+#include "ixgbe_phy.h"
+
+#define IXGBE_X540_MAX_TX_QUEUES 128
+#define IXGBE_X540_MAX_RX_QUEUES 128
+#define IXGBE_X540_RAR_ENTRIES   128
+#define IXGBE_X540_MC_TBL_SIZE   128
+#define IXGBE_X540_VFT_TBL_SIZE  128
+#define IXGBE_X540_RX_PB_SIZE   384
+
+static s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw);
+static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw);
+static s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
+static void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
+static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw);
+static void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw);
+
+static enum ixgbe_media_type ixgbe_get_media_type_X540(struct ixgbe_hw *hw)
+{
+       return ixgbe_media_type_copper;
+}
+
+static s32 ixgbe_get_invariants_X540(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mac_info *mac = &hw->mac;
+
+       /* Call PHY identify routine to get the phy type */
+       ixgbe_identify_phy_generic(hw);
+
+       mac->mcft_size = IXGBE_X540_MC_TBL_SIZE;
+       mac->vft_size = IXGBE_X540_VFT_TBL_SIZE;
+       mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES;
+       mac->max_rx_queues = IXGBE_X540_MAX_RX_QUEUES;
+       mac->max_tx_queues = IXGBE_X540_MAX_TX_QUEUES;
+       mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
+
+       return 0;
+}
+
+/**
+ *  ixgbe_setup_mac_link_X540 - Set the auto advertised capabilitires
+ *  @hw: pointer to hardware structure
+ *  @speed: new link speed
+ *  @autoneg: true if autonegotiation enabled
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
+ **/
+static s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw,
+                                     ixgbe_link_speed speed, bool autoneg,
+                                     bool autoneg_wait_to_complete)
+{
+       return hw->phy.ops.setup_link_speed(hw, speed, autoneg,
+                                           autoneg_wait_to_complete);
+}
+
+/**
+ *  ixgbe_reset_hw_X540 - Perform hardware reset
+ *  @hw: pointer to hardware structure
+ *
+ *  Resets the hardware by resetting the transmit and receive units, masks
+ *  and clears all interrupts, perform a PHY reset, and perform a link (MAC)
+ *  reset.
+ **/
+static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
+{
+       ixgbe_link_speed link_speed;
+       s32 status = 0;
+       u32 ctrl;
+       u32 ctrl_ext;
+       u32 reset_bit;
+       u32 i;
+       u32 autoc;
+       u32 autoc2;
+       bool link_up = false;
+
+       /* Call adapter stop to disable tx/rx and clear interrupts */
+       hw->mac.ops.stop_adapter(hw);
+
+       /*
+        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
+        * access and verify no pending requests before reset
+        */
+       ixgbe_disable_pcie_master(hw);
+
+mac_reset_top:
+       /*
+        * Issue global reset to the MAC.  Needs to be SW reset if link is up.
+        * If link reset is used when link is up, it might reset the PHY when
+        * mng is using it.  If link is down or the flag to force full link
+        * reset is set, then perform link reset.
+        */
+       if (hw->force_full_reset) {
+               reset_bit = IXGBE_CTRL_LNK_RST;
+       } else {
+               hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
+               if (!link_up)
+                       reset_bit = IXGBE_CTRL_LNK_RST;
+               else
+                       reset_bit = IXGBE_CTRL_RST;
+       }
+
+       ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
+       IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | reset_bit));
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Poll for reset bit to self-clear indicating reset is complete */
+       for (i = 0; i < 10; i++) {
+               udelay(1);
+               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
+               if (!(ctrl & reset_bit))
+                       break;
+       }
+       if (ctrl & reset_bit) {
+               status = IXGBE_ERR_RESET_FAILED;
+               hw_dbg(hw, "Reset polling failed to complete.\n");
+       }
+
+       /*
+        * Double resets are required for recovery from certain error
+        * conditions.  Between resets, it is necessary to stall to allow time
+        * for any pending HW events to complete.  We use 1usec since that is
+        * what is needed for ixgbe_disable_pcie_master().  The second reset
+        * then clears out any effects of those events.
+        */
+       if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
+               hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+               udelay(1);
+               goto mac_reset_top;
+       }
+
+       /* Clear PF Reset Done bit so PF/VF Mail Ops can work */
+       ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
+       ctrl_ext |= IXGBE_CTRL_EXT_PFRSTD;
+       IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);
+       IXGBE_WRITE_FLUSH(hw);
+
+       msleep(50);
+
+       /* Set the Rx packet buffer size. */
+       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0), 384 << IXGBE_RXPBSIZE_SHIFT);
+
+       /* Store the permanent mac address */
+       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
+
+       /*
+        * Store the original AUTOC/AUTOC2 values if they have not been
+        * stored off yet.  Otherwise restore the stored original
+        * values since the reset operation sets back to defaults.
+        */
+       autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+       autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
+       if (hw->mac.orig_link_settings_stored == false) {
+               hw->mac.orig_autoc = autoc;
+               hw->mac.orig_autoc2 = autoc2;
+               hw->mac.orig_link_settings_stored = true;
+       } else {
+               if (autoc != hw->mac.orig_autoc)
+                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (hw->mac.orig_autoc |
+                                       IXGBE_AUTOC_AN_RESTART));
+
+               if ((autoc2 & IXGBE_AUTOC2_UPPER_MASK) !=
+                   (hw->mac.orig_autoc2 & IXGBE_AUTOC2_UPPER_MASK)) {
+                       autoc2 &= ~IXGBE_AUTOC2_UPPER_MASK;
+                       autoc2 |= (hw->mac.orig_autoc2 &
+                                  IXGBE_AUTOC2_UPPER_MASK);
+                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC2, autoc2);
+               }
+       }
+
+       /*
+        * Store MAC address from RAR0, clear receive address registers, and
+        * clear the multicast table.  Also reset num_rar_entries to 128,
+        * since we modify this value when programming the SAN MAC address.
+        */
+       hw->mac.num_rar_entries = IXGBE_X540_MAX_TX_QUEUES;
+       hw->mac.ops.init_rx_addrs(hw);
+
+       /* Store the permanent mac address */
+       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
+
+       /* Store the permanent SAN mac address */
+       hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
+
+       /* Add the SAN MAC address to the RAR only if it's a valid address */
+       if (ixgbe_validate_mac_addr(hw->mac.san_addr) == 0) {
+               hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,
+                                   hw->mac.san_addr, 0, IXGBE_RAH_AV);
+
+               /* Reserve the last RAR for the SAN MAC address */
+               hw->mac.num_rar_entries--;
+       }
+
+       /* Store the alternative WWNN/WWPN prefix */
+       hw->mac.ops.get_wwn_prefix(hw, &hw->mac.wwnn_prefix,
+                                  &hw->mac.wwpn_prefix);
+
+       return status;
+}
+
+/**
+ *  ixgbe_start_hw_X540 - Prepare hardware for Tx/Rx
+ *  @hw: pointer to hardware structure
+ *
+ *  Starts the hardware using the generic start_hw function
+ *  and the generation start_hw function.
+ *  Then performs revision-specific operations, if any.
+ **/
+static s32 ixgbe_start_hw_X540(struct ixgbe_hw *hw)
+{
+       s32 ret_val = 0;
+
+       ret_val = ixgbe_start_hw_generic(hw);
+       if (ret_val != 0)
+               goto out;
+
+       ret_val = ixgbe_start_hw_gen2(hw);
+       hw->mac.rx_pb_size = IXGBE_X540_RX_PB_SIZE;
+out:
+       return ret_val;
+}
+
+/**
+ *  ixgbe_get_supported_physical_layer_X540 - Returns physical layer type
+ *  @hw: pointer to hardware structure
+ *
+ *  Determines physical layer capabilities of the current configuration.
+ **/
+static u32 ixgbe_get_supported_physical_layer_X540(struct ixgbe_hw *hw)
+{
+       u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
+       u16 ext_ability = 0;
+
+       hw->phy.ops.identify(hw);
+
+       hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
+                            &ext_ability);
+       if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
+               physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
+       if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
+               physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
+       if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
+               physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
+
+       return physical_layer;
+}
+
+/**
+ *  ixgbe_init_eeprom_params_X540 - Initialize EEPROM params
+ *  @hw: pointer to hardware structure
+ *
+ *  Initializes the EEPROM parameters ixgbe_eeprom_info within the
+ *  ixgbe_hw struct in order to set up EEPROM access.
+ **/
+static s32 ixgbe_init_eeprom_params_X540(struct ixgbe_hw *hw)
+{
+       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
+       u32 eec;
+       u16 eeprom_size;
+
+       if (eeprom->type == ixgbe_eeprom_uninitialized) {
+               eeprom->semaphore_delay = 10;
+               eeprom->type = ixgbe_flash;
+
+               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
+               eeprom_size = (u16)((eec & IXGBE_EEC_SIZE) >>
+                                   IXGBE_EEC_SIZE_SHIFT);
+               eeprom->word_size = 1 << (eeprom_size +
+                                         IXGBE_EEPROM_WORD_SIZE_SHIFT);
+
+               hw_dbg(hw, "Eeprom params: type = %d, size = %d\n",
+                      eeprom->type, eeprom->word_size);
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbe_read_eerd_X540- Read EEPROM word using EERD
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to read
+ *  @data: word read from the EEPROM
+ *
+ *  Reads a 16 bit word from the EEPROM using the EERD register.
+ **/
+static s32 ixgbe_read_eerd_X540(struct ixgbe_hw *hw, u16 offset, u16 *data)
+{
+       s32 status = 0;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
+           0)
+               status = ixgbe_read_eerd_generic(hw, offset, data);
+       else
+               status = IXGBE_ERR_SWFW_SYNC;
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       return status;
+}
+
+/**
+ *  ixgbe_read_eerd_buffer_X540 - Read EEPROM word(s) using EERD
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to read
+ *  @words: number of words
+ *  @data: word(s) read from the EEPROM
+ *
+ *  Reads a 16 bit word(s) from the EEPROM using the EERD register.
+ **/
+static s32 ixgbe_read_eerd_buffer_X540(struct ixgbe_hw *hw,
+                                      u16 offset, u16 words, u16 *data)
+{
+       s32 status = 0;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
+           0)
+               status = ixgbe_read_eerd_buffer_generic(hw, offset,
+                                                       words, data);
+       else
+               status = IXGBE_ERR_SWFW_SYNC;
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       return status;
+}
+
+/**
+ *  ixgbe_write_eewr_X540 - Write EEPROM word using EEWR
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to write
+ *  @data: word write to the EEPROM
+ *
+ *  Write a 16 bit word to the EEPROM using the EEWR register.
+ **/
+static s32 ixgbe_write_eewr_X540(struct ixgbe_hw *hw, u16 offset, u16 data)
+{
+       s32 status = 0;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0)
+               status = ixgbe_write_eewr_generic(hw, offset, data);
+       else
+               status = IXGBE_ERR_SWFW_SYNC;
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       return status;
+}
+
+/**
+ *  ixgbe_write_eewr_buffer_X540 - Write EEPROM word(s) using EEWR
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to write
+ *  @words: number of words
+ *  @data: word(s) write to the EEPROM
+ *
+ *  Write a 16 bit word(s) to the EEPROM using the EEWR register.
+ **/
+static s32 ixgbe_write_eewr_buffer_X540(struct ixgbe_hw *hw,
+                                       u16 offset, u16 words, u16 *data)
+{
+       s32 status = 0;
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
+           0)
+               status = ixgbe_write_eewr_buffer_generic(hw, offset,
+                                                        words, data);
+       else
+               status = IXGBE_ERR_SWFW_SYNC;
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+       return status;
+}
+
+/**
+ *  ixgbe_calc_eeprom_checksum_X540 - Calculates and returns the checksum
+ *
+ *  This function does not use synchronization for EERD and EEWR. It can
+ *  be used internally by function which utilize ixgbe_acquire_swfw_sync_X540.
+ *
+ *  @hw: pointer to hardware structure
+ **/
+static u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
+{
+       u16 i;
+       u16 j;
+       u16 checksum = 0;
+       u16 length = 0;
+       u16 pointer = 0;
+       u16 word = 0;
+
+       /*
+        * Do not use hw->eeprom.ops.read because we do not want to take
+        * the synchronization semaphores here. Instead use
+        * ixgbe_read_eerd_generic
+        */
+
+       /* Include 0x0-0x3F in the checksum */
+       for (i = 0; i < IXGBE_EEPROM_CHECKSUM; i++) {
+               if (ixgbe_read_eerd_generic(hw, i, &word) != 0) {
+                       hw_dbg(hw, "EEPROM read failed\n");
+                       break;
+               }
+               checksum += word;
+       }
+
+       /*
+        * Include all data from pointers 0x3, 0x6-0xE.  This excludes the
+        * FW, PHY module, and PCIe Expansion/Option ROM pointers.
+        */
+       for (i = IXGBE_PCIE_ANALOG_PTR; i < IXGBE_FW_PTR; i++) {
+               if (i == IXGBE_PHY_PTR || i == IXGBE_OPTION_ROM_PTR)
+                       continue;
+
+               if (ixgbe_read_eerd_generic(hw, i, &pointer) != 0) {
+                       hw_dbg(hw, "EEPROM read failed\n");
+                       break;
+               }
+
+               /* Skip pointer section if the pointer is invalid. */
+               if (pointer == 0xFFFF || pointer == 0 ||
+                   pointer >= hw->eeprom.word_size)
+                       continue;
+
+               if (ixgbe_read_eerd_generic(hw, pointer, &length) != 0) {
+                       hw_dbg(hw, "EEPROM read failed\n");
+                       break;
+               }
+
+               /* Skip pointer section if length is invalid. */
+               if (length == 0xFFFF || length == 0 ||
+                   (pointer + length) >= hw->eeprom.word_size)
+                       continue;
+
+               for (j = pointer+1; j <= pointer+length; j++) {
+                       if (ixgbe_read_eerd_generic(hw, j, &word) != 0) {
+                               hw_dbg(hw, "EEPROM read failed\n");
+                               break;
+                       }
+                       checksum += word;
+               }
+       }
+
+       checksum = (u16)IXGBE_EEPROM_SUM - checksum;
+
+       return checksum;
+}
+
+/**
+ *  ixgbe_validate_eeprom_checksum_X540 - Validate EEPROM checksum
+ *  @hw: pointer to hardware structure
+ *  @checksum_val: calculated checksum
+ *
+ *  Performs checksum calculation and validates the EEPROM checksum.  If the
+ *  caller does not need checksum_val, the value can be NULL.
+ **/
+static s32 ixgbe_validate_eeprom_checksum_X540(struct ixgbe_hw *hw,
+                                              u16 *checksum_val)
+{
+       s32 status;
+       u16 checksum;
+       u16 read_checksum = 0;
+
+       /*
+        * Read the first word from the EEPROM. If this times out or fails, do
+        * not continue or we could be in for a very long wait while every
+        * EEPROM read fails
+        */
+       status = hw->eeprom.ops.read(hw, 0, &checksum);
+
+       if (status != 0) {
+               hw_dbg(hw, "EEPROM read failed\n");
+               goto out;
+       }
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0) {
+               checksum = hw->eeprom.ops.calc_checksum(hw);
+
+               /*
+                * Do not use hw->eeprom.ops.read because we do not want to take
+                * the synchronization semaphores twice here.
+                */
+               ixgbe_read_eerd_generic(hw, IXGBE_EEPROM_CHECKSUM,
+                                       &read_checksum);
+
+               /*
+                * Verify read checksum from EEPROM is the same as
+                * calculated checksum
+                */
+               if (read_checksum != checksum)
+                       status = IXGBE_ERR_EEPROM_CHECKSUM;
+
+               /* If the user cares, return the calculated checksum */
+               if (checksum_val)
+                       *checksum_val = checksum;
+       } else {
+               status = IXGBE_ERR_SWFW_SYNC;
+       }
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+out:
+       return status;
+}
+
+/**
+ * ixgbe_update_eeprom_checksum_X540 - Updates the EEPROM checksum and flash
+ * @hw: pointer to hardware structure
+ *
+ * After writing EEPROM to shadow RAM using EEWR register, software calculates
+ * checksum and updates the EEPROM and instructs the hardware to update
+ * the flash.
+ **/
+static s32 ixgbe_update_eeprom_checksum_X540(struct ixgbe_hw *hw)
+{
+       s32 status;
+       u16 checksum;
+
+       /*
+        * Read the first word from the EEPROM. If this times out or fails, do
+        * not continue or we could be in for a very long wait while every
+        * EEPROM read fails
+        */
+       status = hw->eeprom.ops.read(hw, 0, &checksum);
+
+       if (status != 0)
+               hw_dbg(hw, "EEPROM read failed\n");
+
+       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0) {
+               checksum = hw->eeprom.ops.calc_checksum(hw);
+
+               /*
+                * Do not use hw->eeprom.ops.write because we do not want to
+                * take the synchronization semaphores twice here.
+                */
+               status = ixgbe_write_eewr_generic(hw, IXGBE_EEPROM_CHECKSUM,
+                                                 checksum);
+
+       if (status == 0)
+               status = ixgbe_update_flash_X540(hw);
+       else
+               status = IXGBE_ERR_SWFW_SYNC;
+       }
+
+       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+
+       return status;
+}
+
+/**
+ * ixgbe_update_flash_X540 - Instruct HW to copy EEPROM to Flash device
+ * @hw: pointer to hardware structure
+ *
+ * Set FLUP (bit 23) of the EEC register to instruct Hardware to copy
+ * EEPROM from shadow RAM to the flash device.
+ **/
+static s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw)
+{
+       u32 flup;
+       s32 status = IXGBE_ERR_EEPROM;
+
+       status = ixgbe_poll_flash_update_done_X540(hw);
+       if (status == IXGBE_ERR_EEPROM) {
+               hw_dbg(hw, "Flash update time out\n");
+               goto out;
+       }
+
+       flup = IXGBE_READ_REG(hw, IXGBE_EEC) | IXGBE_EEC_FLUP;
+       IXGBE_WRITE_REG(hw, IXGBE_EEC, flup);
+
+       status = ixgbe_poll_flash_update_done_X540(hw);
+       if (status == 0)
+               hw_dbg(hw, "Flash update complete\n");
+       else
+               hw_dbg(hw, "Flash update time out\n");
+
+       if (hw->revision_id == 0) {
+               flup = IXGBE_READ_REG(hw, IXGBE_EEC);
+
+               if (flup & IXGBE_EEC_SEC1VAL) {
+                       flup |= IXGBE_EEC_FLUP;
+                       IXGBE_WRITE_REG(hw, IXGBE_EEC, flup);
+               }
+
+               status = ixgbe_poll_flash_update_done_X540(hw);
+               if (status == 0)
+                       hw_dbg(hw, "Flash update complete\n");
+               else
+                       hw_dbg(hw, "Flash update time out\n");
+       }
+out:
+       return status;
+}
+
+/**
+ * ixgbe_poll_flash_update_done_X540 - Poll flash update status
+ * @hw: pointer to hardware structure
+ *
+ * Polls the FLUDONE (bit 26) of the EEC Register to determine when the
+ * flash update is done.
+ **/
+static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw)
+{
+       u32 i;
+       u32 reg;
+       s32 status = IXGBE_ERR_EEPROM;
+
+       for (i = 0; i < IXGBE_FLUDONE_ATTEMPTS; i++) {
+               reg = IXGBE_READ_REG(hw, IXGBE_EEC);
+               if (reg & IXGBE_EEC_FLUDONE) {
+                       status = 0;
+                       break;
+               }
+               udelay(5);
+       }
+       return status;
+}
+
+/**
+ * ixgbe_acquire_swfw_sync_X540 - Acquire SWFW semaphore
+ * @hw: pointer to hardware structure
+ * @mask: Mask to specify which semaphore to acquire
+ *
+ * Acquires the SWFW semaphore thought the SW_FW_SYNC register for
+ * the specified function (CSR, PHY0, PHY1, NVM, Flash)
+ **/
+static s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
+{
+       u32 swfw_sync;
+       u32 swmask = mask;
+       u32 fwmask = mask << 5;
+       u32 hwmask = 0;
+       u32 timeout = 200;
+       u32 i;
+
+       if (swmask == IXGBE_GSSR_EEP_SM)
+               hwmask = IXGBE_GSSR_FLASH_SM;
+
+       for (i = 0; i < timeout; i++) {
+               /*
+                * SW NVM semaphore bit is used for access to all
+                * SW_FW_SYNC bits (not just NVM)
+                */
+               if (ixgbe_get_swfw_sync_semaphore(hw))
+                       return IXGBE_ERR_SWFW_SYNC;
+
+               swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
+               if (!(swfw_sync & (fwmask | swmask | hwmask))) {
+                       swfw_sync |= swmask;
+                       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
+                       ixgbe_release_swfw_sync_semaphore(hw);
+                       break;
+               } else {
+                       /*
+                        * Firmware currently using resource (fwmask),
+                        * hardware currently using resource (hwmask),
+                        * or other software thread currently using
+                        * resource (swmask)
+                        */
+                       ixgbe_release_swfw_sync_semaphore(hw);
+                       usleep_range(5000, 10000);
+               }
+       }
+
+       /*
+        * If the resource is not released by the FW/HW the SW can assume that
+        * the FW/HW malfunctions. In that case the SW should sets the
+        * SW bit(s) of the requested resource(s) while ignoring the
+        * corresponding FW/HW bits in the SW_FW_SYNC register.
+        */
+       if (i >= timeout) {
+               swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
+               if (swfw_sync & (fwmask | hwmask)) {
+                       if (ixgbe_get_swfw_sync_semaphore(hw))
+                               return IXGBE_ERR_SWFW_SYNC;
+
+                       swfw_sync |= swmask;
+                       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
+                       ixgbe_release_swfw_sync_semaphore(hw);
+               }
+       }
+
+       usleep_range(5000, 10000);
+       return 0;
+}
+
+/**
+ * ixgbe_release_swfw_sync_X540 - Release SWFW semaphore
+ * @hw: pointer to hardware structure
+ * @mask: Mask to specify which semaphore to release
+ *
+ * Releases the SWFW semaphore through the SW_FW_SYNC register
+ * for the specified function (CSR, PHY0, PHY1, EVM, Flash)
+ **/
+static void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
+{
+       u32 swfw_sync;
+       u32 swmask = mask;
+
+       ixgbe_get_swfw_sync_semaphore(hw);
+
+       swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
+       swfw_sync &= ~swmask;
+       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
+
+       ixgbe_release_swfw_sync_semaphore(hw);
+       usleep_range(5000, 10000);
+}
+
+/**
+ * ixgbe_get_nvm_semaphore - Get hardware semaphore
+ * @hw: pointer to hardware structure
+ *
+ * Sets the hardware semaphores so SW/FW can gain control of shared resources
+ **/
+static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
+{
+       s32 status = IXGBE_ERR_EEPROM;
+       u32 timeout = 2000;
+       u32 i;
+       u32 swsm;
+
+       /* Get SMBI software semaphore between device drivers first */
+       for (i = 0; i < timeout; i++) {
+               /*
+                * If the SMBI bit is 0 when we read it, then the bit will be
+                * set and we have the semaphore
+                */
+               swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
+               if (!(swsm & IXGBE_SWSM_SMBI)) {
+                       status = 0;
+                       break;
+               }
+               udelay(50);
+       }
+
+       /* Now get the semaphore between SW/FW through the REGSMP bit */
+       if (status) {
+               for (i = 0; i < timeout; i++) {
+                       swsm = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
+                       if (!(swsm & IXGBE_SWFW_REGSMP))
+                               break;
+
+                       udelay(50);
+               }
+       } else {
+               hw_dbg(hw, "Software semaphore SMBI between device drivers "
+                          "not granted.\n");
+       }
+
+       return status;
+}
+
+/**
+ * ixgbe_release_nvm_semaphore - Release hardware semaphore
+ * @hw: pointer to hardware structure
+ *
+ * This function clears hardware semaphore bits.
+ **/
+static void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw)
+{
+        u32 swsm;
+
+       /* Release both semaphores by writing 0 to the bits REGSMP and SMBI */
+
+       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
+       swsm &= ~IXGBE_SWSM_SMBI;
+       IXGBE_WRITE_REG(hw, IXGBE_SWSM, swsm);
+
+       swsm = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
+       swsm &= ~IXGBE_SWFW_REGSMP;
+       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swsm);
+
+       IXGBE_WRITE_FLUSH(hw);
+}
+
+/**
+ * ixgbe_blink_led_start_X540 - Blink LED based on index.
+ * @hw: pointer to hardware structure
+ * @index: led number to blink
+ *
+ * Devices that implement the version 2 interface:
+ *   X540
+ **/
+static s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index)
+{
+       u32 macc_reg;
+       u32 ledctl_reg;
+
+       /*
+        * In order for the blink bit in the LED control register
+        * to work, link and speed must be forced in the MAC. We
+        * will reverse this when we stop the blinking.
+        */
+       macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);
+       macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS;
+       IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
+
+       /* Set the LED to LINK_UP + BLINK. */
+       ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+       ledctl_reg &= ~IXGBE_LED_MODE_MASK(index);
+       ledctl_reg |= IXGBE_LED_BLINK(index);
+       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, ledctl_reg);
+       IXGBE_WRITE_FLUSH(hw);
+
+       return 0;
+}
+
+/**
+ * ixgbe_blink_led_stop_X540 - Stop blinking LED based on index.
+ * @hw: pointer to hardware structure
+ * @index: led number to stop blinking
+ *
+ * Devices that implement the version 2 interface:
+ *   X540
+ **/
+static s32 ixgbe_blink_led_stop_X540(struct ixgbe_hw *hw, u32 index)
+{
+       u32 macc_reg;
+       u32 ledctl_reg;
+
+       /* Restore the LED to its default value. */
+       ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+       ledctl_reg &= ~IXGBE_LED_MODE_MASK(index);
+       ledctl_reg |= IXGBE_LED_LINK_ACTIVE << IXGBE_LED_MODE_SHIFT(index);
+       ledctl_reg &= ~IXGBE_LED_BLINK(index);
+       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, ledctl_reg);
+
+       /* Unforce link and speed in the MAC. */
+       macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);
+       macc_reg &= ~(IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS);
+       IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
+       IXGBE_WRITE_FLUSH(hw);
+
+       return 0;
+}
+static struct ixgbe_mac_operations mac_ops_X540 = {
+       .init_hw                = &ixgbe_init_hw_generic,
+       .reset_hw               = &ixgbe_reset_hw_X540,
+       .start_hw               = &ixgbe_start_hw_X540,
+       .clear_hw_cntrs         = &ixgbe_clear_hw_cntrs_generic,
+       .get_media_type         = &ixgbe_get_media_type_X540,
+       .get_supported_physical_layer =
+                                  &ixgbe_get_supported_physical_layer_X540,
+       .enable_rx_dma          = &ixgbe_enable_rx_dma_generic,
+       .get_mac_addr           = &ixgbe_get_mac_addr_generic,
+       .get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,
+       .get_device_caps        = &ixgbe_get_device_caps_generic,
+       .get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,
+       .stop_adapter           = &ixgbe_stop_adapter_generic,
+       .get_bus_info           = &ixgbe_get_bus_info_generic,
+       .set_lan_id             = &ixgbe_set_lan_id_multi_port_pcie,
+       .read_analog_reg8       = NULL,
+       .write_analog_reg8      = NULL,
+       .setup_link             = &ixgbe_setup_mac_link_X540,
+       .set_rxpba              = &ixgbe_set_rxpba_generic,
+       .check_link             = &ixgbe_check_mac_link_generic,
+       .get_link_capabilities  = &ixgbe_get_copper_link_capabilities_generic,
+       .led_on                 = &ixgbe_led_on_generic,
+       .led_off                = &ixgbe_led_off_generic,
+       .blink_led_start        = &ixgbe_blink_led_start_X540,
+       .blink_led_stop         = &ixgbe_blink_led_stop_X540,
+       .set_rar                = &ixgbe_set_rar_generic,
+       .clear_rar              = &ixgbe_clear_rar_generic,
+       .set_vmdq               = &ixgbe_set_vmdq_generic,
+       .clear_vmdq             = &ixgbe_clear_vmdq_generic,
+       .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
+       .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
+       .enable_mc              = &ixgbe_enable_mc_generic,
+       .disable_mc             = &ixgbe_disable_mc_generic,
+       .clear_vfta             = &ixgbe_clear_vfta_generic,
+       .set_vfta               = &ixgbe_set_vfta_generic,
+       .fc_enable              = &ixgbe_fc_enable_generic,
+       .set_fw_drv_ver         = &ixgbe_set_fw_drv_ver_generic,
+       .init_uta_tables        = &ixgbe_init_uta_tables_generic,
+       .setup_sfp              = NULL,
+       .set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,
+       .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
+       .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync_X540,
+       .release_swfw_sync      = &ixgbe_release_swfw_sync_X540,
+};
+
+static struct ixgbe_eeprom_operations eeprom_ops_X540 = {
+       .init_params            = &ixgbe_init_eeprom_params_X540,
+       .read                   = &ixgbe_read_eerd_X540,
+       .read_buffer            = &ixgbe_read_eerd_buffer_X540,
+       .write                  = &ixgbe_write_eewr_X540,
+       .write_buffer           = &ixgbe_write_eewr_buffer_X540,
+       .calc_checksum          = &ixgbe_calc_eeprom_checksum_X540,
+       .validate_checksum      = &ixgbe_validate_eeprom_checksum_X540,
+       .update_checksum        = &ixgbe_update_eeprom_checksum_X540,
+};
+
+static struct ixgbe_phy_operations phy_ops_X540 = {
+       .identify               = &ixgbe_identify_phy_generic,
+       .identify_sfp           = &ixgbe_identify_sfp_module_generic,
+       .init                   = NULL,
+       .reset                  = NULL,
+       .read_reg               = &ixgbe_read_phy_reg_generic,
+       .write_reg              = &ixgbe_write_phy_reg_generic,
+       .setup_link             = &ixgbe_setup_phy_link_generic,
+       .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
+       .read_i2c_byte          = &ixgbe_read_i2c_byte_generic,
+       .write_i2c_byte         = &ixgbe_write_i2c_byte_generic,
+       .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,
+       .write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,
+       .check_overtemp         = &ixgbe_tn_check_overtemp,
+};
+
+struct ixgbe_info ixgbe_X540_info = {
+       .mac                    = ixgbe_mac_X540,
+       .get_invariants         = &ixgbe_get_invariants_X540,
+       .mac_ops                = &mac_ops_X540,
+       .eeprom_ops             = &eeprom_ops_X540,
+       .phy_ops                = &phy_ops_X540,
+       .mbx_ops                = &mbx_ops_generic,
+};
diff --git a/drivers/net/ethernet/intel/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile
new file mode 100644 (file)
index 0000000..1f35d22
--- /dev/null
@@ -0,0 +1,38 @@
+################################################################################
+#
+# Intel 82599 Virtual Function driver
+# Copyright(c) 1999 - 2010 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
+#
+################################################################################
+
+#
+# Makefile for the Intel(R) 82599 VF ethernet driver
+#
+
+obj-$(CONFIG_IXGBEVF) += ixgbevf.o
+
+ixgbevf-objs := vf.o \
+                mbx.o \
+                ethtool.o \
+                ixgbevf_main.o
+
diff --git a/drivers/net/ethernet/intel/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h
new file mode 100644 (file)
index 0000000..78abb6f
--- /dev/null
@@ -0,0 +1,297 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#ifndef _IXGBEVF_DEFINES_H_
+#define _IXGBEVF_DEFINES_H_
+
+/* Device IDs */
+#define IXGBE_DEV_ID_82599_VF           0x10ED
+#define IXGBE_DEV_ID_X540_VF            0x1515
+
+#define IXGBE_VF_IRQ_CLEAR_MASK         7
+#define IXGBE_VF_MAX_TX_QUEUES          1
+#define IXGBE_VF_MAX_RX_QUEUES          1
+#define IXGBE_ETH_LENGTH_OF_ADDRESS     6
+
+/* Link speed */
+typedef u32 ixgbe_link_speed;
+#define IXGBE_LINK_SPEED_1GB_FULL       0x0020
+#define IXGBE_LINK_SPEED_10GB_FULL      0x0080
+
+#define IXGBE_CTRL_RST              0x04000000 /* Reset (SW) */
+#define IXGBE_RXDCTL_ENABLE         0x02000000 /* Enable specific Rx Queue */
+#define IXGBE_TXDCTL_ENABLE         0x02000000 /* Enable specific Tx Queue */
+#define IXGBE_LINKS_UP              0x40000000
+#define IXGBE_LINKS_SPEED_82599     0x30000000
+#define IXGBE_LINKS_SPEED_10G_82599 0x30000000
+#define IXGBE_LINKS_SPEED_1G_82599  0x20000000
+
+/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
+#define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8
+#define IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE  8
+#define IXGBE_REQ_TX_BUFFER_GRANULARITY   1024
+
+/* Interrupt Vector Allocation Registers */
+#define IXGBE_IVAR_ALLOC_VAL    0x80 /* Interrupt Allocation valid */
+
+#define IXGBE_VF_INIT_TIMEOUT   200 /* Number of retries to clear RSTI */
+
+/* Receive Config masks */
+#define IXGBE_RXCTRL_RXEN       0x00000001  /* Enable Receiver */
+#define IXGBE_RXCTRL_DMBYPS     0x00000002  /* Descriptor Monitor Bypass */
+#define IXGBE_RXDCTL_ENABLE     0x02000000  /* Enable specific Rx Queue */
+#define IXGBE_RXDCTL_VME        0x40000000  /* VLAN mode enable */
+#define IXGBE_RXDCTL_RLPMLMASK  0x00003FFF  /* Only supported on the X540 */
+#define IXGBE_RXDCTL_RLPML_EN   0x00008000
+
+/* DCA Control */
+#define IXGBE_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
+
+/* PSRTYPE bit definitions */
+#define IXGBE_PSRTYPE_TCPHDR    0x00000010
+#define IXGBE_PSRTYPE_UDPHDR    0x00000020
+#define IXGBE_PSRTYPE_IPV4HDR   0x00000100
+#define IXGBE_PSRTYPE_IPV6HDR   0x00000200
+#define IXGBE_PSRTYPE_L2HDR     0x00001000
+
+/* SRRCTL bit definitions */
+#define IXGBE_SRRCTL_BSIZEPKT_SHIFT     10     /* so many KBs */
+#define IXGBE_SRRCTL_RDMTS_SHIFT        22
+#define IXGBE_SRRCTL_RDMTS_MASK         0x01C00000
+#define IXGBE_SRRCTL_DROP_EN            0x10000000
+#define IXGBE_SRRCTL_BSIZEPKT_MASK      0x0000007F
+#define IXGBE_SRRCTL_BSIZEHDR_MASK      0x00003F00
+#define IXGBE_SRRCTL_DESCTYPE_LEGACY    0x00000000
+#define IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000
+#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT  0x04000000
+#define IXGBE_SRRCTL_DESCTYPE_HDR_REPLICATION_LARGE_PKT 0x08000000
+#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS 0x0A000000
+#define IXGBE_SRRCTL_DESCTYPE_MASK      0x0E000000
+
+/* Receive Descriptor bit definitions */
+#define IXGBE_RXD_STAT_DD         0x01    /* Descriptor Done */
+#define IXGBE_RXD_STAT_EOP        0x02    /* End of Packet */
+#define IXGBE_RXD_STAT_FLM        0x04    /* FDir Match */
+#define IXGBE_RXD_STAT_VP         0x08    /* IEEE VLAN Packet */
+#define IXGBE_RXDADV_NEXTP_MASK   0x000FFFF0 /* Next Descriptor Index */
+#define IXGBE_RXDADV_NEXTP_SHIFT  0x00000004
+#define IXGBE_RXD_STAT_UDPCS      0x10    /* UDP xsum calculated */
+#define IXGBE_RXD_STAT_L4CS       0x20    /* L4 xsum calculated */
+#define IXGBE_RXD_STAT_IPCS       0x40    /* IP xsum calculated */
+#define IXGBE_RXD_STAT_PIF        0x80    /* passed in-exact filter */
+#define IXGBE_RXD_STAT_CRCV       0x100   /* Speculative CRC Valid */
+#define IXGBE_RXD_STAT_VEXT       0x200   /* 1st VLAN found */
+#define IXGBE_RXD_STAT_UDPV       0x400   /* Valid UDP checksum */
+#define IXGBE_RXD_STAT_DYNINT     0x800   /* Pkt caused INT via DYNINT */
+#define IXGBE_RXD_STAT_TS         0x10000 /* Time Stamp */
+#define IXGBE_RXD_STAT_SECP       0x20000 /* Security Processing */
+#define IXGBE_RXD_STAT_LB         0x40000 /* Loopback Status */
+#define IXGBE_RXD_STAT_ACK        0x8000  /* ACK Packet indication */
+#define IXGBE_RXD_ERR_CE          0x01    /* CRC Error */
+#define IXGBE_RXD_ERR_LE          0x02    /* Length Error */
+#define IXGBE_RXD_ERR_PE          0x08    /* Packet Error */
+#define IXGBE_RXD_ERR_OSE         0x10    /* Oversize Error */
+#define IXGBE_RXD_ERR_USE         0x20    /* Undersize Error */
+#define IXGBE_RXD_ERR_TCPE        0x40    /* TCP/UDP Checksum Error */
+#define IXGBE_RXD_ERR_IPE         0x80    /* IP Checksum Error */
+#define IXGBE_RXDADV_ERR_MASK     0xFFF00000 /* RDESC.ERRORS mask */
+#define IXGBE_RXDADV_ERR_SHIFT    20         /* RDESC.ERRORS shift */
+#define IXGBE_RXDADV_ERR_HBO      0x00800000 /*Header Buffer Overflow */
+#define IXGBE_RXDADV_ERR_CE       0x01000000 /* CRC Error */
+#define IXGBE_RXDADV_ERR_LE       0x02000000 /* Length Error */
+#define IXGBE_RXDADV_ERR_PE       0x08000000 /* Packet Error */
+#define IXGBE_RXDADV_ERR_OSE      0x10000000 /* Oversize Error */
+#define IXGBE_RXDADV_ERR_USE      0x20000000 /* Undersize Error */
+#define IXGBE_RXDADV_ERR_TCPE     0x40000000 /* TCP/UDP Checksum Error */
+#define IXGBE_RXDADV_ERR_IPE      0x80000000 /* IP Checksum Error */
+#define IXGBE_RXD_VLAN_ID_MASK    0x0FFF  /* VLAN ID is in lower 12 bits */
+#define IXGBE_RXD_PRI_MASK        0xE000  /* Priority is in upper 3 bits */
+#define IXGBE_RXD_PRI_SHIFT       13
+#define IXGBE_RXD_CFI_MASK        0x1000  /* CFI is bit 12 */
+#define IXGBE_RXD_CFI_SHIFT       12
+
+#define IXGBE_RXDADV_STAT_DD            IXGBE_RXD_STAT_DD  /* Done */
+#define IXGBE_RXDADV_STAT_EOP           IXGBE_RXD_STAT_EOP /* End of Packet */
+#define IXGBE_RXDADV_STAT_FLM           IXGBE_RXD_STAT_FLM /* FDir Match */
+#define IXGBE_RXDADV_STAT_VP            IXGBE_RXD_STAT_VP  /* IEEE VLAN Pkt */
+#define IXGBE_RXDADV_STAT_MASK          0x000FFFFF /* Stat/NEXTP: bit 0-19 */
+#define IXGBE_RXDADV_STAT_FCEOFS        0x00000040 /* FCoE EOF/SOF Stat */
+#define IXGBE_RXDADV_STAT_FCSTAT        0x00000030 /* FCoE Pkt Stat */
+#define IXGBE_RXDADV_STAT_FCSTAT_NOMTCH 0x00000000 /* 00: No Ctxt Match */
+#define IXGBE_RXDADV_STAT_FCSTAT_NODDP  0x00000010 /* 01: Ctxt w/o DDP */
+#define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
+#define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
+
+#define IXGBE_RXDADV_RSSTYPE_MASK       0x0000000F
+#define IXGBE_RXDADV_PKTTYPE_MASK       0x0000FFF0
+#define IXGBE_RXDADV_PKTTYPE_MASK_EX    0x0001FFF0
+#define IXGBE_RXDADV_HDRBUFLEN_MASK     0x00007FE0
+#define IXGBE_RXDADV_RSCCNT_MASK        0x001E0000
+#define IXGBE_RXDADV_RSCCNT_SHIFT       17
+#define IXGBE_RXDADV_HDRBUFLEN_SHIFT    5
+#define IXGBE_RXDADV_SPLITHEADER_EN     0x00001000
+#define IXGBE_RXDADV_SPH                0x8000
+
+#define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \
+                                     IXGBE_RXD_ERR_CE |  \
+                                     IXGBE_RXD_ERR_LE |  \
+                                     IXGBE_RXD_ERR_PE |  \
+                                     IXGBE_RXD_ERR_OSE | \
+                                     IXGBE_RXD_ERR_USE)
+
+#define IXGBE_RXDADV_ERR_FRAME_ERR_MASK ( \
+                                        IXGBE_RXDADV_ERR_CE |  \
+                                        IXGBE_RXDADV_ERR_LE |  \
+                                        IXGBE_RXDADV_ERR_PE |  \
+                                        IXGBE_RXDADV_ERR_OSE | \
+                                        IXGBE_RXDADV_ERR_USE)
+
+#define IXGBE_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
+#define IXGBE_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
+#define IXGBE_TXD_CMD_EOP    0x01000000 /* End of Packet */
+#define IXGBE_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
+#define IXGBE_TXD_CMD_IC     0x04000000 /* Insert Checksum */
+#define IXGBE_TXD_CMD_RS     0x08000000 /* Report Status */
+#define IXGBE_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
+#define IXGBE_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
+#define IXGBE_TXD_STAT_DD    0x00000001 /* Descriptor Done */
+
+/* Transmit Descriptor - Advanced */
+union ixgbe_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;
+};
+
+/* Receive Descriptor - Advanced */
+union ixgbe_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, Pkt type */
+                                       __le16 hdr_info; /* Splithdr, hdrlen */
+                               } 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 */
+};
+
+/* Context descriptors */
+struct ixgbe_adv_tx_context_desc {
+       __le32 vlan_macip_lens;
+       __le32 seqnum_seed;
+       __le32 type_tucmd_mlhl;
+       __le32 mss_l4len_idx;
+};
+
+/* Adv Transmit Descriptor Config Masks */
+#define IXGBE_ADVTXD_DTYP_MASK  0x00F00000 /* DTYP mask */
+#define IXGBE_ADVTXD_DTYP_CTXT  0x00200000 /* Advanced Context Desc */
+#define IXGBE_ADVTXD_DTYP_DATA  0x00300000 /* Advanced Data Descriptor */
+#define IXGBE_ADVTXD_DCMD_EOP   IXGBE_TXD_CMD_EOP  /* End of Packet */
+#define IXGBE_ADVTXD_DCMD_IFCS  IXGBE_TXD_CMD_IFCS /* Insert FCS */
+#define IXGBE_ADVTXD_DCMD_RS    IXGBE_TXD_CMD_RS   /* Report Status */
+#define IXGBE_ADVTXD_DCMD_DEXT  IXGBE_TXD_CMD_DEXT /* Desc ext (1=Adv) */
+#define IXGBE_ADVTXD_DCMD_VLE   IXGBE_TXD_CMD_VLE  /* VLAN pkt enable */
+#define IXGBE_ADVTXD_DCMD_TSE   0x80000000 /* TCP Seg enable */
+#define IXGBE_ADVTXD_STAT_DD    IXGBE_TXD_STAT_DD  /* Descriptor Done */
+#define IXGBE_ADVTXD_TUCMD_IPV4      0x00000400  /* IP Packet Type: 1=IPv4 */
+#define IXGBE_ADVTXD_TUCMD_IPV6      0x00000000  /* IP Packet Type: 0=IPv6 */
+#define IXGBE_ADVTXD_TUCMD_L4T_UDP   0x00000000  /* L4 Packet TYPE of UDP */
+#define IXGBE_ADVTXD_TUCMD_L4T_TCP   0x00000800  /* L4 Packet TYPE of TCP */
+#define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */
+#define IXGBE_ADVTXD_IDX_SHIFT  4 /* Adv desc Index shift */
+#define IXGBE_ADVTXD_POPTS_SHIFT      8  /* Adv desc POPTS shift */
+#define IXGBE_ADVTXD_POPTS_IXSM (IXGBE_TXD_POPTS_IXSM << \
+                                IXGBE_ADVTXD_POPTS_SHIFT)
+#define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM << \
+                                IXGBE_ADVTXD_POPTS_SHIFT)
+#define IXGBE_ADVTXD_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
+#define IXGBE_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
+#define IXGBE_ADVTXD_VLAN_SHIFT      16  /* Adv ctxt vlan tag shift */
+#define IXGBE_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
+#define IXGBE_ADVTXD_MSS_SHIFT       16  /* Adv ctxt MSS shift */
+
+/* Interrupt register bitmasks */
+
+/* Extended Interrupt Cause Read */
+#define IXGBE_EICR_RTX_QUEUE    0x0000FFFF /* RTx Queue Interrupt */
+#define IXGBE_EICR_MAILBOX      0x00080000 /* VF to PF Mailbox Interrupt */
+#define IXGBE_EICR_OTHER        0x80000000 /* Interrupt Cause Active */
+
+/* Extended Interrupt Cause Set */
+#define IXGBE_EICS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
+#define IXGBE_EICS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
+#define IXGBE_EICS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
+
+/* Extended Interrupt Mask Set */
+#define IXGBE_EIMS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
+#define IXGBE_EIMS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
+#define IXGBE_EIMS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
+
+/* Extended Interrupt Mask Clear */
+#define IXGBE_EIMC_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
+#define IXGBE_EIMC_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
+#define IXGBE_EIMC_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
+
+#define IXGBE_EIMS_ENABLE_MASK ( \
+                               IXGBE_EIMS_RTX_QUEUE       | \
+                               IXGBE_EIMS_MAILBOX         | \
+                               IXGBE_EIMS_OTHER)
+
+#define IXGBE_EITR_CNT_WDIS     0x80000000
+
+/* Error Codes */
+#define IXGBE_ERR_INVALID_MAC_ADDR              -1
+#define IXGBE_ERR_RESET_FAILED                  -2
+
+#endif /* _IXGBEVF_DEFINES_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
new file mode 100644 (file)
index 0000000..deee375
--- /dev/null
@@ -0,0 +1,742 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function 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:
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+/* ethtool support for ixgbevf */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/vmalloc.h>
+#include <linux/if_vlan.h>
+#include <linux/uaccess.h>
+
+#include "ixgbevf.h"
+
+#define IXGBE_ALL_RAR_ENTRIES 16
+
+#ifdef ETHTOOL_GSTATS
+struct ixgbe_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int sizeof_stat;
+       int stat_offset;
+       int base_stat_offset;
+       int saved_reset_offset;
+};
+
+#define IXGBEVF_STAT(m, b, r)  sizeof(((struct ixgbevf_adapter *)0)->m), \
+                           offsetof(struct ixgbevf_adapter, m),         \
+                           offsetof(struct ixgbevf_adapter, b),         \
+                           offsetof(struct ixgbevf_adapter, r)
+static struct ixgbe_stats ixgbe_gstrings_stats[] = {
+       {"rx_packets", IXGBEVF_STAT(stats.vfgprc, stats.base_vfgprc,
+                                   stats.saved_reset_vfgprc)},
+       {"tx_packets", IXGBEVF_STAT(stats.vfgptc, stats.base_vfgptc,
+                                   stats.saved_reset_vfgptc)},
+       {"rx_bytes", IXGBEVF_STAT(stats.vfgorc, stats.base_vfgorc,
+                                 stats.saved_reset_vfgorc)},
+       {"tx_bytes", IXGBEVF_STAT(stats.vfgotc, stats.base_vfgotc,
+                                 stats.saved_reset_vfgotc)},
+       {"tx_busy", IXGBEVF_STAT(tx_busy, zero_base, zero_base)},
+       {"multicast", IXGBEVF_STAT(stats.vfmprc, stats.base_vfmprc,
+                                  stats.saved_reset_vfmprc)},
+       {"rx_csum_offload_good", IXGBEVF_STAT(hw_csum_rx_good, zero_base,
+                                             zero_base)},
+       {"rx_csum_offload_errors", IXGBEVF_STAT(hw_csum_rx_error, zero_base,
+                                               zero_base)},
+       {"tx_csum_offload_ctxt", IXGBEVF_STAT(hw_csum_tx_good, zero_base,
+                                             zero_base)},
+       {"rx_header_split", IXGBEVF_STAT(rx_hdr_split, zero_base, zero_base)},
+};
+
+#define IXGBE_QUEUE_STATS_LEN 0
+#define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)
+
+#define IXGBEVF_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN)
+#endif /* ETHTOOL_GSTATS */
+#ifdef ETHTOOL_TEST
+static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = {
+       "Register test  (offline)",
+       "Link test   (on/offline)"
+};
+#define IXGBE_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN)
+#endif /* ETHTOOL_TEST */
+
+static int ixgbevf_get_settings(struct net_device *netdev,
+                               struct ethtool_cmd *ecmd)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 link_speed = 0;
+       bool link_up;
+
+       ecmd->supported = SUPPORTED_10000baseT_Full;
+       ecmd->autoneg = AUTONEG_DISABLE;
+       ecmd->transceiver = XCVR_DUMMY1;
+       ecmd->port = -1;
+
+       hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
+
+       if (link_up) {
+               ethtool_cmd_speed_set(
+                       ecmd,
+                       (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
+                       SPEED_10000 : SPEED_1000);
+               ecmd->duplex = DUPLEX_FULL;
+       } else {
+               ethtool_cmd_speed_set(ecmd, -1);
+               ecmd->duplex = -1;
+       }
+
+       return 0;
+}
+
+static u32 ixgbevf_get_rx_csum(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       return adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED;
+}
+
+static int ixgbevf_set_rx_csum(struct net_device *netdev, u32 data)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       if (data)
+               adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
+       else
+               adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;
+
+       if (netif_running(netdev)) {
+               if (!adapter->dev_closed)
+                       ixgbevf_reinit_locked(adapter);
+       } else {
+               ixgbevf_reset(adapter);
+       }
+
+       return 0;
+}
+
+static int ixgbevf_set_tso(struct net_device *netdev, u32 data)
+{
+       if (data) {
+               netdev->features |= NETIF_F_TSO;
+               netdev->features |= NETIF_F_TSO6;
+       } else {
+               netif_tx_stop_all_queues(netdev);
+               netdev->features &= ~NETIF_F_TSO;
+               netdev->features &= ~NETIF_F_TSO6;
+               netif_tx_start_all_queues(netdev);
+       }
+       return 0;
+}
+
+static u32 ixgbevf_get_msglevel(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       return adapter->msg_enable;
+}
+
+static void ixgbevf_set_msglevel(struct net_device *netdev, u32 data)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       adapter->msg_enable = data;
+}
+
+#define IXGBE_GET_STAT(_A_, _R_) (_A_->stats._R_)
+
+static char *ixgbevf_reg_names[] = {
+       "IXGBE_VFCTRL",
+       "IXGBE_VFSTATUS",
+       "IXGBE_VFLINKS",
+       "IXGBE_VFRXMEMWRAP",
+       "IXGBE_VFFRTIMER",
+       "IXGBE_VTEICR",
+       "IXGBE_VTEICS",
+       "IXGBE_VTEIMS",
+       "IXGBE_VTEIMC",
+       "IXGBE_VTEIAC",
+       "IXGBE_VTEIAM",
+       "IXGBE_VTEITR",
+       "IXGBE_VTIVAR",
+       "IXGBE_VTIVAR_MISC",
+       "IXGBE_VFRDBAL0",
+       "IXGBE_VFRDBAL1",
+       "IXGBE_VFRDBAH0",
+       "IXGBE_VFRDBAH1",
+       "IXGBE_VFRDLEN0",
+       "IXGBE_VFRDLEN1",
+       "IXGBE_VFRDH0",
+       "IXGBE_VFRDH1",
+       "IXGBE_VFRDT0",
+       "IXGBE_VFRDT1",
+       "IXGBE_VFRXDCTL0",
+       "IXGBE_VFRXDCTL1",
+       "IXGBE_VFSRRCTL0",
+       "IXGBE_VFSRRCTL1",
+       "IXGBE_VFPSRTYPE",
+       "IXGBE_VFTDBAL0",
+       "IXGBE_VFTDBAL1",
+       "IXGBE_VFTDBAH0",
+       "IXGBE_VFTDBAH1",
+       "IXGBE_VFTDLEN0",
+       "IXGBE_VFTDLEN1",
+       "IXGBE_VFTDH0",
+       "IXGBE_VFTDH1",
+       "IXGBE_VFTDT0",
+       "IXGBE_VFTDT1",
+       "IXGBE_VFTXDCTL0",
+       "IXGBE_VFTXDCTL1",
+       "IXGBE_VFTDWBAL0",
+       "IXGBE_VFTDWBAL1",
+       "IXGBE_VFTDWBAH0",
+       "IXGBE_VFTDWBAH1"
+};
+
+
+static int ixgbevf_get_regs_len(struct net_device *netdev)
+{
+       return (ARRAY_SIZE(ixgbevf_reg_names)) * sizeof(u32);
+}
+
+static void ixgbevf_get_regs(struct net_device *netdev,
+                            struct ethtool_regs *regs,
+                            void *p)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 *regs_buff = p;
+       u32 regs_len = ixgbevf_get_regs_len(netdev);
+       u8 i;
+
+       memset(p, 0, regs_len);
+
+       regs->version = (1 << 24) | hw->revision_id << 16 | hw->device_id;
+
+       /* General Registers */
+       regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_VFCTRL);
+       regs_buff[1] = IXGBE_READ_REG(hw, IXGBE_VFSTATUS);
+       regs_buff[2] = IXGBE_READ_REG(hw, IXGBE_VFLINKS);
+       regs_buff[3] = IXGBE_READ_REG(hw, IXGBE_VFRXMEMWRAP);
+       regs_buff[4] = IXGBE_READ_REG(hw, IXGBE_VFFRTIMER);
+
+       /* Interrupt */
+       /* don't read EICR because it can clear interrupt causes, instead
+        * read EICS which is a shadow but doesn't clear EICR */
+       regs_buff[5] = IXGBE_READ_REG(hw, IXGBE_VTEICS);
+       regs_buff[6] = IXGBE_READ_REG(hw, IXGBE_VTEICS);
+       regs_buff[7] = IXGBE_READ_REG(hw, IXGBE_VTEIMS);
+       regs_buff[8] = IXGBE_READ_REG(hw, IXGBE_VTEIMC);
+       regs_buff[9] = IXGBE_READ_REG(hw, IXGBE_VTEIAC);
+       regs_buff[10] = IXGBE_READ_REG(hw, IXGBE_VTEIAM);
+       regs_buff[11] = IXGBE_READ_REG(hw, IXGBE_VTEITR(0));
+       regs_buff[12] = IXGBE_READ_REG(hw, IXGBE_VTIVAR(0));
+       regs_buff[13] = IXGBE_READ_REG(hw, IXGBE_VTIVAR_MISC);
+
+       /* Receive DMA */
+       for (i = 0; i < 2; i++)
+               regs_buff[14 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDBAL(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[16 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDBAH(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[18 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDLEN(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[20 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDH(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[22 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDT(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[24 + i] = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[26 + i] = IXGBE_READ_REG(hw, IXGBE_VFSRRCTL(i));
+
+       /* Receive */
+       regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_VFPSRTYPE);
+
+       /* Transmit */
+       for (i = 0; i < 2; i++)
+               regs_buff[29 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDBAL(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[31 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDBAH(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[33 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDLEN(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDH(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[37 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDT(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[39 + i] = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[41 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDWBAL(i));
+       for (i = 0; i < 2; i++)
+               regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDWBAH(i));
+
+       for (i = 0; i < ARRAY_SIZE(ixgbevf_reg_names); i++)
+               hw_dbg(hw, "%s\t%8.8x\n", ixgbevf_reg_names[i], regs_buff[i]);
+}
+
+static void ixgbevf_get_drvinfo(struct net_device *netdev,
+                               struct ethtool_drvinfo *drvinfo)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+       strlcpy(drvinfo->driver, ixgbevf_driver_name, 32);
+       strlcpy(drvinfo->version, ixgbevf_driver_version, 32);
+
+       strlcpy(drvinfo->fw_version, "N/A", 4);
+       strlcpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
+}
+
+static void ixgbevf_get_ringparam(struct net_device *netdev,
+                                 struct ethtool_ringparam *ring)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbevf_ring *tx_ring = adapter->tx_ring;
+       struct ixgbevf_ring *rx_ring = adapter->rx_ring;
+
+       ring->rx_max_pending = IXGBEVF_MAX_RXD;
+       ring->tx_max_pending = IXGBEVF_MAX_TXD;
+       ring->rx_mini_max_pending = 0;
+       ring->rx_jumbo_max_pending = 0;
+       ring->rx_pending = rx_ring->count;
+       ring->tx_pending = tx_ring->count;
+       ring->rx_mini_pending = 0;
+       ring->rx_jumbo_pending = 0;
+}
+
+static int ixgbevf_set_ringparam(struct net_device *netdev,
+                                struct ethtool_ringparam *ring)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbevf_ring *tx_ring = NULL, *rx_ring = NULL;
+       int i, err = 0;
+       u32 new_rx_count, new_tx_count;
+
+       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
+               return -EINVAL;
+
+       new_rx_count = max(ring->rx_pending, (u32)IXGBEVF_MIN_RXD);
+       new_rx_count = min(new_rx_count, (u32)IXGBEVF_MAX_RXD);
+       new_rx_count = ALIGN(new_rx_count, IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE);
+
+       new_tx_count = max(ring->tx_pending, (u32)IXGBEVF_MIN_TXD);
+       new_tx_count = min(new_tx_count, (u32)IXGBEVF_MAX_TXD);
+       new_tx_count = ALIGN(new_tx_count, IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE);
+
+       if ((new_tx_count == adapter->tx_ring->count) &&
+           (new_rx_count == adapter->rx_ring->count)) {
+               /* nothing to do */
+               return 0;
+       }
+
+       while (test_and_set_bit(__IXGBEVF_RESETTING, &adapter->state))
+               msleep(1);
+
+       /*
+        * If the adapter isn't up and running then just set the
+        * new parameters and scurry for the exits.
+        */
+       if (!netif_running(adapter->netdev)) {
+               for (i = 0; i < adapter->num_tx_queues; i++)
+                       adapter->tx_ring[i].count = new_tx_count;
+               for (i = 0; i < adapter->num_rx_queues; i++)
+                       adapter->rx_ring[i].count = new_rx_count;
+               adapter->tx_ring_count = new_tx_count;
+               adapter->rx_ring_count = new_rx_count;
+               goto clear_reset;
+       }
+
+       tx_ring = kcalloc(adapter->num_tx_queues,
+                         sizeof(struct ixgbevf_ring), GFP_KERNEL);
+       if (!tx_ring) {
+               err = -ENOMEM;
+               goto clear_reset;
+       }
+
+       rx_ring = kcalloc(adapter->num_rx_queues,
+                         sizeof(struct ixgbevf_ring), GFP_KERNEL);
+       if (!rx_ring) {
+               err = -ENOMEM;
+               goto err_rx_setup;
+       }
+
+       ixgbevf_down(adapter);
+
+       memcpy(tx_ring, adapter->tx_ring,
+              adapter->num_tx_queues * sizeof(struct ixgbevf_ring));
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               tx_ring[i].count = new_tx_count;
+               err = ixgbevf_setup_tx_resources(adapter, &tx_ring[i]);
+               if (err) {
+                       while (i) {
+                               i--;
+                               ixgbevf_free_tx_resources(adapter,
+                                                         &tx_ring[i]);
+                       }
+                       goto err_tx_ring_setup;
+               }
+               tx_ring[i].v_idx = adapter->tx_ring[i].v_idx;
+       }
+
+       memcpy(rx_ring, adapter->rx_ring,
+              adapter->num_rx_queues * sizeof(struct ixgbevf_ring));
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               rx_ring[i].count = new_rx_count;
+               err = ixgbevf_setup_rx_resources(adapter, &rx_ring[i]);
+               if (err) {
+                       while (i) {
+                               i--;
+                               ixgbevf_free_rx_resources(adapter,
+                                                         &rx_ring[i]);
+                       }
+                               goto err_rx_ring_setup;
+               }
+               rx_ring[i].v_idx = adapter->rx_ring[i].v_idx;
+       }
+
+       /*
+        * Only switch to new rings if all the prior allocations
+        * and ring setups have succeeded.
+        */
+       kfree(adapter->tx_ring);
+       adapter->tx_ring = tx_ring;
+       adapter->tx_ring_count = new_tx_count;
+
+       kfree(adapter->rx_ring);
+       adapter->rx_ring = rx_ring;
+       adapter->rx_ring_count = new_rx_count;
+
+       /* success! */
+       ixgbevf_up(adapter);
+
+       goto clear_reset;
+
+err_rx_ring_setup:
+       for(i = 0; i < adapter->num_tx_queues; i++)
+               ixgbevf_free_tx_resources(adapter, &tx_ring[i]);
+
+err_tx_ring_setup:
+       kfree(rx_ring);
+
+err_rx_setup:
+       kfree(tx_ring);
+
+clear_reset:
+       clear_bit(__IXGBEVF_RESETTING, &adapter->state);
+       return err;
+}
+
+static int ixgbevf_get_sset_count(struct net_device *dev, int stringset)
+{
+       switch (stringset) {
+       case ETH_SS_TEST:
+              return IXGBE_TEST_LEN;
+       case ETH_SS_STATS:
+              return IXGBE_GLOBAL_STATS_LEN;
+       default:
+              return -EINVAL;
+       }
+}
+
+static void ixgbevf_get_ethtool_stats(struct net_device *netdev,
+                                     struct ethtool_stats *stats, u64 *data)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       int i;
+
+       ixgbevf_update_stats(adapter);
+       for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
+               char *p = (char *)adapter +
+                       ixgbe_gstrings_stats[i].stat_offset;
+               char *b = (char *)adapter +
+                       ixgbe_gstrings_stats[i].base_stat_offset;
+               char *r = (char *)adapter +
+                       ixgbe_gstrings_stats[i].saved_reset_offset;
+               data[i] = ((ixgbe_gstrings_stats[i].sizeof_stat ==
+                           sizeof(u64)) ? *(u64 *)p : *(u32 *)p) -
+                         ((ixgbe_gstrings_stats[i].sizeof_stat ==
+                           sizeof(u64)) ? *(u64 *)b : *(u32 *)b) +
+                         ((ixgbe_gstrings_stats[i].sizeof_stat ==
+                           sizeof(u64)) ? *(u64 *)r : *(u32 *)r);
+       }
+}
+
+static void ixgbevf_get_strings(struct net_device *netdev, u32 stringset,
+                               u8 *data)
+{
+       char *p = (char *)data;
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_TEST:
+               memcpy(data, *ixgbe_gstrings_test,
+                      IXGBE_TEST_LEN * ETH_GSTRING_LEN);
+               break;
+       case ETH_SS_STATS:
+               for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
+                       memcpy(p, ixgbe_gstrings_stats[i].stat_string,
+                              ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+               break;
+       }
+}
+
+static int ixgbevf_link_test(struct ixgbevf_adapter *adapter, u64 *data)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       bool link_up;
+       u32 link_speed = 0;
+       *data = 0;
+
+       hw->mac.ops.check_link(hw, &link_speed, &link_up, true);
+       if (!link_up)
+               *data = 1;
+
+       return *data;
+}
+
+/* ethtool register test data */
+struct ixgbevf_reg_test {
+       u16 reg;
+       u8  array_len;
+       u8  test_type;
+       u32 mask;
+       u32 write;
+};
+
+/* In the hardware, registers are laid out either singly, in arrays
+ * spaced 0x40 bytes apart, or in contiguous tables.  We assume
+ * most tests take place on arrays or single registers (handled
+ * as a single-element array) and special-case the tables.
+ * Table tests are always pattern tests.
+ *
+ * We also make provision for some required setup steps by specifying
+ * registers to be written without any read-back testing.
+ */
+
+#define PATTERN_TEST   1
+#define SET_READ_TEST  2
+#define WRITE_NO_TEST  3
+#define TABLE32_TEST   4
+#define TABLE64_TEST_LO        5
+#define TABLE64_TEST_HI        6
+
+/* default VF register test */
+static const struct ixgbevf_reg_test reg_test_vf[] = {
+       { IXGBE_VFRDBAL(0), 2, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFF80 },
+       { IXGBE_VFRDBAH(0), 2, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_VFRDLEN(0), 2, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
+       { IXGBE_VFRXDCTL(0), 2, WRITE_NO_TEST, 0, IXGBE_RXDCTL_ENABLE },
+       { IXGBE_VFRDT(0), 2, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
+       { IXGBE_VFRXDCTL(0), 2, WRITE_NO_TEST, 0, 0 },
+       { IXGBE_VFTDBAL(0), 2, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
+       { IXGBE_VFTDBAH(0), 2, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
+       { IXGBE_VFTDLEN(0), 2, PATTERN_TEST, 0x000FFF80, 0x000FFF80 },
+       { 0, 0, 0, 0 }
+};
+
+static const u32 register_test_patterns[] = {
+       0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF
+};
+
+#define REG_PATTERN_TEST(R, M, W)                                             \
+{                                                                             \
+       u32 pat, val, before;                                                 \
+       for (pat = 0; pat < ARRAY_SIZE(register_test_patterns); pat++) {      \
+               before = readl(adapter->hw.hw_addr + R);                      \
+               writel((register_test_patterns[pat] & W),                     \
+                      (adapter->hw.hw_addr + R));                            \
+               val = readl(adapter->hw.hw_addr + R);                         \
+               if (val != (register_test_patterns[pat] & W & M)) {           \
+                       hw_dbg(&adapter->hw,                                  \
+                       "pattern test reg %04X failed: got "                  \
+                       "0x%08X expected 0x%08X\n",                           \
+                       R, val, (register_test_patterns[pat] & W & M));       \
+                       *data = R;                                            \
+                       writel(before, adapter->hw.hw_addr + R);              \
+                       return 1;                                             \
+               }                                                             \
+               writel(before, adapter->hw.hw_addr + R);                      \
+       }                                                                     \
+}
+
+#define REG_SET_AND_CHECK(R, M, W)                                            \
+{                                                                             \
+       u32 val, before;                                                      \
+       before = readl(adapter->hw.hw_addr + R);                              \
+       writel((W & M), (adapter->hw.hw_addr + R));                           \
+       val = readl(adapter->hw.hw_addr + R);                                 \
+       if ((W & M) != (val & M)) {                                           \
+               printk(KERN_ERR "set/check reg %04X test failed: got 0x%08X " \
+                                "expected 0x%08X\n", R, (val & M), (W & M)); \
+               *data = R;                                                    \
+               writel(before, (adapter->hw.hw_addr + R));                    \
+               return 1;                                                     \
+       }                                                                     \
+       writel(before, (adapter->hw.hw_addr + R));                            \
+}
+
+static int ixgbevf_reg_test(struct ixgbevf_adapter *adapter, u64 *data)
+{
+       const struct ixgbevf_reg_test *test;
+       u32 i;
+
+       test = reg_test_vf;
+
+       /*
+        * Perform the register test, looping through the test table
+        * until we either fail or reach the null entry.
+        */
+       while (test->reg) {
+               for (i = 0; i < test->array_len; i++) {
+                       switch (test->test_type) {
+                       case PATTERN_TEST:
+                               REG_PATTERN_TEST(test->reg + (i * 0x40),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case SET_READ_TEST:
+                               REG_SET_AND_CHECK(test->reg + (i * 0x40),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case WRITE_NO_TEST:
+                               writel(test->write,
+                                      (adapter->hw.hw_addr + test->reg)
+                                      + (i * 0x40));
+                               break;
+                       case TABLE32_TEST:
+                               REG_PATTERN_TEST(test->reg + (i * 4),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case TABLE64_TEST_LO:
+                               REG_PATTERN_TEST(test->reg + (i * 8),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       case TABLE64_TEST_HI:
+                               REG_PATTERN_TEST((test->reg + 4) + (i * 8),
+                                               test->mask,
+                                               test->write);
+                               break;
+                       }
+               }
+               test++;
+       }
+
+       *data = 0;
+       return *data;
+}
+
+static void ixgbevf_diag_test(struct net_device *netdev,
+                             struct ethtool_test *eth_test, u64 *data)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       bool if_running = netif_running(netdev);
+
+       set_bit(__IXGBEVF_TESTING, &adapter->state);
+       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
+               /* Offline tests */
+
+               hw_dbg(&adapter->hw, "offline testing starting\n");
+
+               /* Link test performed before hardware reset so autoneg doesn't
+                * interfere with test result */
+               if (ixgbevf_link_test(adapter, &data[1]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               if (if_running)
+                       /* indicate we're in test mode */
+                       dev_close(netdev);
+               else
+                       ixgbevf_reset(adapter);
+
+               hw_dbg(&adapter->hw, "register testing starting\n");
+               if (ixgbevf_reg_test(adapter, &data[0]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               ixgbevf_reset(adapter);
+
+               clear_bit(__IXGBEVF_TESTING, &adapter->state);
+               if (if_running)
+                       dev_open(netdev);
+       } else {
+               hw_dbg(&adapter->hw, "online testing starting\n");
+               /* Online tests */
+               if (ixgbevf_link_test(adapter, &data[1]))
+                       eth_test->flags |= ETH_TEST_FL_FAILED;
+
+               /* Online tests aren't run; pass by default */
+               data[0] = 0;
+
+               clear_bit(__IXGBEVF_TESTING, &adapter->state);
+       }
+       msleep_interruptible(4 * 1000);
+}
+
+static int ixgbevf_nway_reset(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+       if (netif_running(netdev)) {
+               if (!adapter->dev_closed)
+                       ixgbevf_reinit_locked(adapter);
+       }
+
+       return 0;
+}
+
+static struct ethtool_ops ixgbevf_ethtool_ops = {
+       .get_settings           = ixgbevf_get_settings,
+       .get_drvinfo            = ixgbevf_get_drvinfo,
+       .get_regs_len           = ixgbevf_get_regs_len,
+       .get_regs               = ixgbevf_get_regs,
+       .nway_reset             = ixgbevf_nway_reset,
+       .get_link               = ethtool_op_get_link,
+       .get_ringparam          = ixgbevf_get_ringparam,
+       .set_ringparam          = ixgbevf_set_ringparam,
+       .get_rx_csum            = ixgbevf_get_rx_csum,
+       .set_rx_csum            = ixgbevf_set_rx_csum,
+       .get_tx_csum            = ethtool_op_get_tx_csum,
+       .set_tx_csum            = ethtool_op_set_tx_ipv6_csum,
+       .get_sg                 = ethtool_op_get_sg,
+       .set_sg                 = ethtool_op_set_sg,
+       .get_msglevel           = ixgbevf_get_msglevel,
+       .set_msglevel           = ixgbevf_set_msglevel,
+       .get_tso                = ethtool_op_get_tso,
+       .set_tso                = ixgbevf_set_tso,
+       .self_test              = ixgbevf_diag_test,
+       .get_sset_count         = ixgbevf_get_sset_count,
+       .get_strings            = ixgbevf_get_strings,
+       .get_ethtool_stats      = ixgbevf_get_ethtool_stats,
+};
+
+void ixgbevf_set_ethtool_ops(struct net_device *netdev)
+{
+       SET_ETHTOOL_OPS(netdev, &ixgbevf_ethtool_ops);
+}
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
new file mode 100644 (file)
index 0000000..8857df4
--- /dev/null
@@ -0,0 +1,318 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#ifndef _IXGBEVF_H_
+#define _IXGBEVF_H_
+
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/timer.h>
+#include <linux/io.h>
+#include <linux/netdevice.h>
+#include <linux/if_vlan.h>
+
+#include "vf.h"
+
+/* wrapper around a pointer to a socket buffer,
+ * so a DMA handle can be stored along with the buffer */
+struct ixgbevf_tx_buffer {
+       struct sk_buff *skb;
+       dma_addr_t dma;
+       unsigned long time_stamp;
+       u16 length;
+       u16 next_to_watch;
+       u16 mapped_as_page;
+};
+
+struct ixgbevf_rx_buffer {
+       struct sk_buff *skb;
+       dma_addr_t dma;
+       struct page *page;
+       dma_addr_t page_dma;
+       unsigned int page_offset;
+};
+
+struct ixgbevf_ring {
+       struct ixgbevf_adapter *adapter;  /* backlink */
+       void *desc;                     /* descriptor ring memory */
+       dma_addr_t dma;                 /* phys. address of descriptor ring */
+       unsigned int size;              /* length in bytes */
+       unsigned int count;             /* amount of descriptors */
+       unsigned int next_to_use;
+       unsigned int next_to_clean;
+
+       int queue_index; /* needed for multiqueue queue management */
+       union {
+               struct ixgbevf_tx_buffer *tx_buffer_info;
+               struct ixgbevf_rx_buffer *rx_buffer_info;
+       };
+
+       u16 head;
+       u16 tail;
+
+       unsigned int total_bytes;
+       unsigned int total_packets;
+
+       u16 reg_idx; /* holds the special value that gets the hardware register
+                     * offset associated with this ring, which is different
+                     * for DCB and RSS modes */
+
+#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+       /* cpu for tx queue */
+       int cpu;
+#endif
+
+       u64 v_idx; /* maps directly to the index for this ring in the hardware
+                   * vector array, can also be used for finding the bit in EICR
+                   * and friends that represents the vector for this ring */
+
+       u16 work_limit;                /* max work per interrupt */
+       u16 rx_buf_len;
+};
+
+enum ixgbevf_ring_f_enum {
+       RING_F_NONE = 0,
+       RING_F_ARRAY_SIZE      /* must be last in enum set */
+};
+
+struct ixgbevf_ring_feature {
+       int indices;
+       int mask;
+};
+
+/* How many Rx Buffers do we bundle into one write to the hardware ? */
+#define IXGBEVF_RX_BUFFER_WRITE        16      /* Must be power of 2 */
+
+#define MAX_RX_QUEUES 1
+#define MAX_TX_QUEUES 1
+
+#define IXGBEVF_DEFAULT_TXD   1024
+#define IXGBEVF_DEFAULT_RXD   512
+#define IXGBEVF_MAX_TXD       4096
+#define IXGBEVF_MIN_TXD       64
+#define IXGBEVF_MAX_RXD       4096
+#define IXGBEVF_MIN_RXD       64
+
+/* Supported Rx Buffer Sizes */
+#define IXGBEVF_RXBUFFER_64    64     /* Used for packet split */
+#define IXGBEVF_RXBUFFER_128   128    /* Used for packet split */
+#define IXGBEVF_RXBUFFER_256   256    /* Used for packet split */
+#define IXGBEVF_RXBUFFER_2048  2048
+#define IXGBEVF_MAX_RXBUFFER   16384  /* largest size for single descriptor */
+
+#define IXGBEVF_RX_HDR_SIZE IXGBEVF_RXBUFFER_256
+
+#define MAXIMUM_ETHERNET_VLAN_SIZE (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN)
+
+#define IXGBE_TX_FLAGS_CSUM            (u32)(1)
+#define IXGBE_TX_FLAGS_VLAN            (u32)(1 << 1)
+#define IXGBE_TX_FLAGS_TSO             (u32)(1 << 2)
+#define IXGBE_TX_FLAGS_IPV4            (u32)(1 << 3)
+#define IXGBE_TX_FLAGS_FCOE            (u32)(1 << 4)
+#define IXGBE_TX_FLAGS_FSO             (u32)(1 << 5)
+#define IXGBE_TX_FLAGS_VLAN_MASK       0xffff0000
+#define IXGBE_TX_FLAGS_VLAN_PRIO_MASK  0x0000e000
+#define IXGBE_TX_FLAGS_VLAN_SHIFT      16
+
+/* MAX_MSIX_Q_VECTORS of these are allocated,
+ * but we only use one per queue-specific vector.
+ */
+struct ixgbevf_q_vector {
+       struct ixgbevf_adapter *adapter;
+       struct napi_struct napi;
+       DECLARE_BITMAP(rxr_idx, MAX_RX_QUEUES); /* Rx ring indices */
+       DECLARE_BITMAP(txr_idx, MAX_TX_QUEUES); /* Tx ring indices */
+       u8 rxr_count;     /* Rx ring count assigned to this vector */
+       u8 txr_count;     /* Tx ring count assigned to this vector */
+       u8 tx_itr;
+       u8 rx_itr;
+       u32 eitr;
+       int v_idx;        /* vector index in list */
+};
+
+/* Helper macros to switch between ints/sec and what the register uses.
+ * And yes, it's the same math going both ways.  The lowest value
+ * supported by all of the ixgbe hardware is 8.
+ */
+#define EITR_INTS_PER_SEC_TO_REG(_eitr) \
+       ((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8)
+#define EITR_REG_TO_INTS_PER_SEC EITR_INTS_PER_SEC_TO_REG
+
+#define IXGBE_DESC_UNUSED(R) \
+       ((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
+       (R)->next_to_clean - (R)->next_to_use - 1)
+
+#define IXGBE_RX_DESC_ADV(R, i)            \
+       (&(((union ixgbe_adv_rx_desc *)((R).desc))[i]))
+#define IXGBE_TX_DESC_ADV(R, i)            \
+       (&(((union ixgbe_adv_tx_desc *)((R).desc))[i]))
+#define IXGBE_TX_CTXTDESC_ADV(R, i)        \
+       (&(((struct ixgbe_adv_tx_context_desc *)((R).desc))[i]))
+
+#define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
+
+#define OTHER_VECTOR 1
+#define NON_Q_VECTORS (OTHER_VECTOR)
+
+#define MAX_MSIX_Q_VECTORS 2
+#define MAX_MSIX_COUNT 2
+
+#define MIN_MSIX_Q_VECTORS 2
+#define MIN_MSIX_COUNT (MIN_MSIX_Q_VECTORS + NON_Q_VECTORS)
+
+/* board specific private data structure */
+struct ixgbevf_adapter {
+       struct timer_list watchdog_timer;
+       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
+       u16 bd_number;
+       struct work_struct reset_task;
+       struct ixgbevf_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
+       char name[MAX_MSIX_COUNT][IFNAMSIZ + 9];
+
+       /* Interrupt Throttle Rate */
+       u32 itr_setting;
+       u16 eitr_low;
+       u16 eitr_high;
+
+       /* TX */
+       struct ixgbevf_ring *tx_ring;   /* One per active queue */
+       int num_tx_queues;
+       u64 restart_queue;
+       u64 hw_csum_tx_good;
+       u64 lsc_int;
+       u64 hw_tso_ctxt;
+       u64 hw_tso6_ctxt;
+       u32 tx_timeout_count;
+
+       /* RX */
+       struct ixgbevf_ring *rx_ring;   /* One per active queue */
+       int num_rx_queues;
+       int num_rx_pools;               /* == num_rx_queues in 82598 */
+       int num_rx_queues_per_pool;     /* 1 if 82598, can be many if 82599 */
+       u64 hw_csum_rx_error;
+       u64 hw_rx_no_dma_resources;
+       u64 hw_csum_rx_good;
+       u64 non_eop_descs;
+       int num_msix_vectors;
+       int max_msix_q_vectors;         /* true count of q_vectors for device */
+       struct ixgbevf_ring_feature ring_feature[RING_F_ARRAY_SIZE];
+       struct msix_entry *msix_entries;
+
+       u64 rx_hdr_split;
+       u32 alloc_rx_page_failed;
+       u32 alloc_rx_buff_failed;
+
+       /* Some features need tri-state capability,
+        * thus the additional *_CAPABLE flags.
+        */
+       u32 flags;
+#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1)
+#define IXGBE_FLAG_RX_1BUF_CAPABLE              (u32)(1 << 1)
+#define IXGBE_FLAG_RX_PS_CAPABLE                (u32)(1 << 2)
+#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 << 3)
+#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 << 4)
+#define IXGBE_FLAG_IMIR_ENABLED                 (u32)(1 << 5)
+#define IXGBE_FLAG_MQ_CAPABLE                   (u32)(1 << 6)
+#define IXGBE_FLAG_NEED_LINK_UPDATE             (u32)(1 << 7)
+#define IXGBE_FLAG_IN_WATCHDOG_TASK             (u32)(1 << 8)
+       /* OS defined structs */
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+
+       /* structs defined in ixgbe_vf.h */
+       struct ixgbe_hw hw;
+       u16 msg_enable;
+       struct ixgbevf_hw_stats stats;
+       u64 zero_base;
+       /* Interrupt Throttle Rate */
+       u32 eitr_param;
+
+       unsigned long state;
+       u32 *config_space;
+       u64 tx_busy;
+       unsigned int tx_ring_count;
+       unsigned int rx_ring_count;
+
+       u32 link_speed;
+       bool link_up;
+       unsigned long link_check_timeout;
+
+       struct work_struct watchdog_task;
+       bool netdev_registered;
+       bool dev_closed;
+};
+
+enum ixbgevf_state_t {
+       __IXGBEVF_TESTING,
+       __IXGBEVF_RESETTING,
+       __IXGBEVF_DOWN
+};
+
+enum ixgbevf_boards {
+       board_82599_vf,
+       board_X540_vf,
+};
+
+extern struct ixgbevf_info ixgbevf_82599_vf_info;
+extern struct ixgbevf_info ixgbevf_X540_vf_info;
+extern struct ixgbe_mbx_operations ixgbevf_mbx_ops;
+
+/* needed by ethtool.c */
+extern char ixgbevf_driver_name[];
+extern const char ixgbevf_driver_version[];
+
+extern int ixgbevf_up(struct ixgbevf_adapter *adapter);
+extern void ixgbevf_down(struct ixgbevf_adapter *adapter);
+extern void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter);
+extern void ixgbevf_reset(struct ixgbevf_adapter *adapter);
+extern void ixgbevf_set_ethtool_ops(struct net_device *netdev);
+extern int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *,
+                                     struct ixgbevf_ring *);
+extern int ixgbevf_setup_tx_resources(struct ixgbevf_adapter *,
+                                     struct ixgbevf_ring *);
+extern void ixgbevf_free_rx_resources(struct ixgbevf_adapter *,
+                                     struct ixgbevf_ring *);
+extern void ixgbevf_free_tx_resources(struct ixgbevf_adapter *,
+                                     struct ixgbevf_ring *);
+extern void ixgbevf_update_stats(struct ixgbevf_adapter *adapter);
+
+#ifdef ETHTOOL_OPS_COMPAT
+extern int ethtool_ioctl(struct ifreq *ifr);
+
+#endif
+extern void ixgbe_napi_add_all(struct ixgbevf_adapter *adapter);
+extern void ixgbe_napi_del_all(struct ixgbevf_adapter *adapter);
+
+#ifdef DEBUG
+extern char *ixgbevf_get_hw_dev_name(struct ixgbe_hw *hw);
+#define hw_dbg(hw, format, arg...) \
+       printk(KERN_DEBUG "%s: " format, ixgbevf_get_hw_dev_name(hw), ##arg)
+#else
+#define hw_dbg(hw, format, arg...) do {} while (0)
+#endif
+
+#endif /* _IXGBEVF_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
new file mode 100644 (file)
index 0000000..3b880a2
--- /dev/null
@@ -0,0 +1,3523 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+
+/******************************************************************************
+ Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code
+******************************************************************************/
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+#include <linux/string.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/ipv6.h>
+#include <linux/slab.h>
+#include <net/checksum.h>
+#include <net/ip6_checksum.h>
+#include <linux/ethtool.h>
+#include <linux/if_vlan.h>
+#include <linux/prefetch.h>
+
+#include "ixgbevf.h"
+
+char ixgbevf_driver_name[] = "ixgbevf";
+static const char ixgbevf_driver_string[] =
+       "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
+
+#define DRV_VERSION "2.1.0-k"
+const char ixgbevf_driver_version[] = DRV_VERSION;
+static char ixgbevf_copyright[] =
+       "Copyright (c) 2009 - 2010 Intel Corporation.";
+
+static const struct ixgbevf_info *ixgbevf_info_tbl[] = {
+       [board_82599_vf] = &ixgbevf_82599_vf_info,
+       [board_X540_vf]  = &ixgbevf_X540_vf_info,
+};
+
+/* ixgbevf_pci_tbl - PCI Device ID Table
+ *
+ * Wildcard entries (PCI_ANY_ID) should come last
+ * Last entry must be all 0s
+ *
+ * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
+ *   Class, Class Mask, private data (not used) }
+ */
+static struct pci_device_id ixgbevf_pci_tbl[] = {
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF),
+       board_82599_vf},
+       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF),
+       board_X540_vf},
+
+       /* required last entry */
+       {0, }
+};
+MODULE_DEVICE_TABLE(pci, ixgbevf_pci_tbl);
+
+MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
+MODULE_DESCRIPTION("Intel(R) 82599 Virtual Function Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+#define DEFAULT_DEBUG_LEVEL_SHIFT 3
+
+/* forward decls */
+static void ixgbevf_set_itr_msix(struct ixgbevf_q_vector *q_vector);
+static void ixgbevf_write_eitr(struct ixgbevf_adapter *adapter, int v_idx,
+                              u32 itr_reg);
+
+static inline void ixgbevf_release_rx_desc(struct ixgbe_hw *hw,
+                                          struct ixgbevf_ring *rx_ring,
+                                          u32 val)
+{
+       /*
+        * Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64).
+        */
+       wmb();
+       IXGBE_WRITE_REG(hw, IXGBE_VFRDT(rx_ring->reg_idx), val);
+}
+
+/*
+ * ixgbevf_set_ivar - set IVAR registers - maps interrupt causes to vectors
+ * @adapter: pointer to adapter struct
+ * @direction: 0 for Rx, 1 for Tx, -1 for other causes
+ * @queue: queue to map the corresponding interrupt to
+ * @msix_vector: the vector to map to the corresponding queue
+ *
+ */
+static void ixgbevf_set_ivar(struct ixgbevf_adapter *adapter, s8 direction,
+                            u8 queue, u8 msix_vector)
+{
+       u32 ivar, index;
+       struct ixgbe_hw *hw = &adapter->hw;
+       if (direction == -1) {
+               /* other causes */
+               msix_vector |= IXGBE_IVAR_ALLOC_VAL;
+               ivar = IXGBE_READ_REG(hw, IXGBE_VTIVAR_MISC);
+               ivar &= ~0xFF;
+               ivar |= msix_vector;
+               IXGBE_WRITE_REG(hw, IXGBE_VTIVAR_MISC, ivar);
+       } else {
+               /* tx or rx causes */
+               msix_vector |= IXGBE_IVAR_ALLOC_VAL;
+               index = ((16 * (queue & 1)) + (8 * direction));
+               ivar = IXGBE_READ_REG(hw, IXGBE_VTIVAR(queue >> 1));
+               ivar &= ~(0xFF << index);
+               ivar |= (msix_vector << index);
+               IXGBE_WRITE_REG(hw, IXGBE_VTIVAR(queue >> 1), ivar);
+       }
+}
+
+static void ixgbevf_unmap_and_free_tx_resource(struct ixgbevf_adapter *adapter,
+                                              struct ixgbevf_tx_buffer
+                                              *tx_buffer_info)
+{
+       if (tx_buffer_info->dma) {
+               if (tx_buffer_info->mapped_as_page)
+                       dma_unmap_page(&adapter->pdev->dev,
+                                      tx_buffer_info->dma,
+                                      tx_buffer_info->length,
+                                      DMA_TO_DEVICE);
+               else
+                       dma_unmap_single(&adapter->pdev->dev,
+                                        tx_buffer_info->dma,
+                                        tx_buffer_info->length,
+                                        DMA_TO_DEVICE);
+               tx_buffer_info->dma = 0;
+       }
+       if (tx_buffer_info->skb) {
+               dev_kfree_skb_any(tx_buffer_info->skb);
+               tx_buffer_info->skb = NULL;
+       }
+       tx_buffer_info->time_stamp = 0;
+       /* tx_buffer_info must be completely set up in the transmit path */
+}
+
+#define IXGBE_MAX_TXD_PWR      14
+#define IXGBE_MAX_DATA_PER_TXD (1 << IXGBE_MAX_TXD_PWR)
+
+/* Tx Descriptors needed, worst case */
+#define TXD_USE_COUNT(S) (((S) >> IXGBE_MAX_TXD_PWR) + \
+                        (((S) & (IXGBE_MAX_DATA_PER_TXD - 1)) ? 1 : 0))
+#ifdef MAX_SKB_FRAGS
+#define DESC_NEEDED (TXD_USE_COUNT(IXGBE_MAX_DATA_PER_TXD) /* skb->data */ + \
+       MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1)      /* for context */
+#else
+#define DESC_NEEDED TXD_USE_COUNT(IXGBE_MAX_DATA_PER_TXD)
+#endif
+
+static void ixgbevf_tx_timeout(struct net_device *netdev);
+
+/**
+ * ixgbevf_clean_tx_irq - Reclaim resources after transmit completes
+ * @adapter: board private structure
+ * @tx_ring: tx ring to clean
+ **/
+static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter,
+                                struct ixgbevf_ring *tx_ring)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       union ixgbe_adv_tx_desc *tx_desc, *eop_desc;
+       struct ixgbevf_tx_buffer *tx_buffer_info;
+       unsigned int i, eop, count = 0;
+       unsigned int total_bytes = 0, total_packets = 0;
+
+       i = tx_ring->next_to_clean;
+       eop = tx_ring->tx_buffer_info[i].next_to_watch;
+       eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
+
+       while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
+              (count < tx_ring->work_limit)) {
+               bool cleaned = false;
+               rmb(); /* read buffer_info after eop_desc */
+               for ( ; !cleaned; count++) {
+                       struct sk_buff *skb;
+                       tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, i);
+                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
+                       cleaned = (i == eop);
+                       skb = tx_buffer_info->skb;
+
+                       if (cleaned && skb) {
+                               unsigned int segs, bytecount;
+
+                               /* gso_segs is currently only valid for tcp */
+                               segs = skb_shinfo(skb)->gso_segs ?: 1;
+                               /* multiply data chunks by size of headers */
+                               bytecount = ((segs - 1) * skb_headlen(skb)) +
+                                           skb->len;
+                               total_packets += segs;
+                               total_bytes += bytecount;
+                       }
+
+                       ixgbevf_unmap_and_free_tx_resource(adapter,
+                                                          tx_buffer_info);
+
+                       tx_desc->wb.status = 0;
+
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+
+               eop = tx_ring->tx_buffer_info[i].next_to_watch;
+               eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
+       }
+
+       tx_ring->next_to_clean = i;
+
+#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
+       if (unlikely(count && netif_carrier_ok(netdev) &&
+                    (IXGBE_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD))) {
+               /* Make sure that anybody stopping the queue after this
+                * sees the new next_to_clean.
+                */
+               smp_mb();
+#ifdef HAVE_TX_MQ
+               if (__netif_subqueue_stopped(netdev, tx_ring->queue_index) &&
+                   !test_bit(__IXGBEVF_DOWN, &adapter->state)) {
+                       netif_wake_subqueue(netdev, tx_ring->queue_index);
+                       ++adapter->restart_queue;
+               }
+#else
+               if (netif_queue_stopped(netdev) &&
+                   !test_bit(__IXGBEVF_DOWN, &adapter->state)) {
+                       netif_wake_queue(netdev);
+                       ++adapter->restart_queue;
+               }
+#endif
+       }
+
+       /* re-arm the interrupt */
+       if ((count >= tx_ring->work_limit) &&
+           (!test_bit(__IXGBEVF_DOWN, &adapter->state))) {
+               IXGBE_WRITE_REG(hw, IXGBE_VTEICS, tx_ring->v_idx);
+       }
+
+       tx_ring->total_bytes += total_bytes;
+       tx_ring->total_packets += total_packets;
+
+       netdev->stats.tx_bytes += total_bytes;
+       netdev->stats.tx_packets += total_packets;
+
+       return count < tx_ring->work_limit;
+}
+
+/**
+ * ixgbevf_receive_skb - Send a completed packet up the stack
+ * @q_vector: structure containing interrupt and ring information
+ * @skb: packet to send up
+ * @status: hardware indication of status of receive
+ * @rx_ring: rx descriptor ring (for a specific queue) to setup
+ * @rx_desc: rx descriptor
+ **/
+static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
+                               struct sk_buff *skb, u8 status,
+                               struct ixgbevf_ring *ring,
+                               union ixgbe_adv_rx_desc *rx_desc)
+{
+       struct ixgbevf_adapter *adapter = q_vector->adapter;
+       bool is_vlan = (status & IXGBE_RXD_STAT_VP);
+
+       if (is_vlan) {
+               u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
+
+               __vlan_hwaccel_put_tag(skb, tag);
+       }
+
+       if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))
+                       napi_gro_receive(&q_vector->napi, skb);
+       else
+                       netif_rx(skb);
+}
+
+/**
+ * ixgbevf_rx_checksum - indicate in skb if hw indicated a good cksum
+ * @adapter: address of board private structure
+ * @status_err: hardware indication of status of receive
+ * @skb: skb currently being received and modified
+ **/
+static inline void ixgbevf_rx_checksum(struct ixgbevf_adapter *adapter,
+                                      u32 status_err, struct sk_buff *skb)
+{
+       skb_checksum_none_assert(skb);
+
+       /* Rx csum disabled */
+       if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED))
+               return;
+
+       /* if IP and error */
+       if ((status_err & IXGBE_RXD_STAT_IPCS) &&
+           (status_err & IXGBE_RXDADV_ERR_IPE)) {
+               adapter->hw_csum_rx_error++;
+               return;
+       }
+
+       if (!(status_err & IXGBE_RXD_STAT_L4CS))
+               return;
+
+       if (status_err & IXGBE_RXDADV_ERR_TCPE) {
+               adapter->hw_csum_rx_error++;
+               return;
+       }
+
+       /* It must be a TCP or UDP packet with a valid checksum */
+       skb->ip_summed = CHECKSUM_UNNECESSARY;
+       adapter->hw_csum_rx_good++;
+}
+
+/**
+ * ixgbevf_alloc_rx_buffers - Replace used receive buffers; packet split
+ * @adapter: address of board private structure
+ **/
+static void ixgbevf_alloc_rx_buffers(struct ixgbevf_adapter *adapter,
+                                    struct ixgbevf_ring *rx_ring,
+                                    int cleaned_count)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       union ixgbe_adv_rx_desc *rx_desc;
+       struct ixgbevf_rx_buffer *bi;
+       struct sk_buff *skb;
+       unsigned int i;
+       unsigned int bufsz = rx_ring->rx_buf_len + NET_IP_ALIGN;
+
+       i = rx_ring->next_to_use;
+       bi = &rx_ring->rx_buffer_info[i];
+
+       while (cleaned_count--) {
+               rx_desc = IXGBE_RX_DESC_ADV(*rx_ring, i);
+
+               if (!bi->page_dma &&
+                   (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED)) {
+                       if (!bi->page) {
+                               bi->page = netdev_alloc_page(adapter->netdev);
+                               if (!bi->page) {
+                                       adapter->alloc_rx_page_failed++;
+                                       goto no_buffers;
+                               }
+                               bi->page_offset = 0;
+                       } else {
+                               /* use a half page if we're re-using */
+                               bi->page_offset ^= (PAGE_SIZE / 2);
+                       }
+
+                       bi->page_dma = dma_map_page(&pdev->dev, bi->page,
+                                                   bi->page_offset,
+                                                   (PAGE_SIZE / 2),
+                                                   DMA_FROM_DEVICE);
+               }
+
+               skb = bi->skb;
+               if (!skb) {
+                       skb = netdev_alloc_skb(adapter->netdev,
+                                                              bufsz);
+
+                       if (!skb) {
+                               adapter->alloc_rx_buff_failed++;
+                               goto no_buffers;
+                       }
+
+                       /*
+                        * Make buffer alignment 2 beyond a 16 byte boundary
+                        * this will result in a 16 byte aligned IP header after
+                        * the 14 byte MAC header is removed
+                        */
+                       skb_reserve(skb, NET_IP_ALIGN);
+
+                       bi->skb = skb;
+               }
+               if (!bi->dma) {
+                       bi->dma = dma_map_single(&pdev->dev, skb->data,
+                                                rx_ring->rx_buf_len,
+                                                DMA_FROM_DEVICE);
+               }
+               /* Refresh the desc even if buffer_addrs didn't change because
+                * each write-back erases this info. */
+               if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+                       rx_desc->read.pkt_addr = cpu_to_le64(bi->page_dma);
+                       rx_desc->read.hdr_addr = cpu_to_le64(bi->dma);
+               } else {
+                       rx_desc->read.pkt_addr = cpu_to_le64(bi->dma);
+               }
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+               bi = &rx_ring->rx_buffer_info[i];
+       }
+
+no_buffers:
+       if (rx_ring->next_to_use != i) {
+               rx_ring->next_to_use = i;
+               if (i-- == 0)
+                       i = (rx_ring->count - 1);
+
+               ixgbevf_release_rx_desc(&adapter->hw, rx_ring, i);
+       }
+}
+
+static inline void ixgbevf_irq_enable_queues(struct ixgbevf_adapter *adapter,
+                                            u64 qmask)
+{
+       u32 mask;
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       mask = (qmask & 0xFFFFFFFF);
+       IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, mask);
+}
+
+static inline u16 ixgbevf_get_hdr_info(union ixgbe_adv_rx_desc *rx_desc)
+{
+       return rx_desc->wb.lower.lo_dword.hs_rss.hdr_info;
+}
+
+static inline u16 ixgbevf_get_pkt_info(union ixgbe_adv_rx_desc *rx_desc)
+{
+       return rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
+}
+
+static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector,
+                                struct ixgbevf_ring *rx_ring,
+                                int *work_done, int work_to_do)
+{
+       struct ixgbevf_adapter *adapter = q_vector->adapter;
+       struct pci_dev *pdev = adapter->pdev;
+       union ixgbe_adv_rx_desc *rx_desc, *next_rxd;
+       struct ixgbevf_rx_buffer *rx_buffer_info, *next_buffer;
+       struct sk_buff *skb;
+       unsigned int i;
+       u32 len, staterr;
+       u16 hdr_info;
+       bool cleaned = false;
+       int cleaned_count = 0;
+       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+
+       i = rx_ring->next_to_clean;
+       rx_desc = IXGBE_RX_DESC_ADV(*rx_ring, i);
+       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+       rx_buffer_info = &rx_ring->rx_buffer_info[i];
+
+       while (staterr & IXGBE_RXD_STAT_DD) {
+               u32 upper_len = 0;
+               if (*work_done >= work_to_do)
+                       break;
+               (*work_done)++;
+
+               rmb(); /* read descriptor and rx_buffer_info after status DD */
+               if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+                       hdr_info = le16_to_cpu(ixgbevf_get_hdr_info(rx_desc));
+                       len = (hdr_info & IXGBE_RXDADV_HDRBUFLEN_MASK) >>
+                              IXGBE_RXDADV_HDRBUFLEN_SHIFT;
+                       if (hdr_info & IXGBE_RXDADV_SPH)
+                               adapter->rx_hdr_split++;
+                       if (len > IXGBEVF_RX_HDR_SIZE)
+                               len = IXGBEVF_RX_HDR_SIZE;
+                       upper_len = le16_to_cpu(rx_desc->wb.upper.length);
+               } else {
+                       len = le16_to_cpu(rx_desc->wb.upper.length);
+               }
+               cleaned = true;
+               skb = rx_buffer_info->skb;
+               prefetch(skb->data - NET_IP_ALIGN);
+               rx_buffer_info->skb = NULL;
+
+               if (rx_buffer_info->dma) {
+                       dma_unmap_single(&pdev->dev, rx_buffer_info->dma,
+                                        rx_ring->rx_buf_len,
+                                        DMA_FROM_DEVICE);
+                       rx_buffer_info->dma = 0;
+                       skb_put(skb, len);
+               }
+
+               if (upper_len) {
+                       dma_unmap_page(&pdev->dev, rx_buffer_info->page_dma,
+                                      PAGE_SIZE / 2, DMA_FROM_DEVICE);
+                       rx_buffer_info->page_dma = 0;
+                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
+                                          rx_buffer_info->page,
+                                          rx_buffer_info->page_offset,
+                                          upper_len);
+
+                       if ((rx_ring->rx_buf_len > (PAGE_SIZE / 2)) ||
+                           (page_count(rx_buffer_info->page) != 1))
+                               rx_buffer_info->page = NULL;
+                       else
+                               get_page(rx_buffer_info->page);
+
+                       skb->len += upper_len;
+                       skb->data_len += upper_len;
+                       skb->truesize += upper_len;
+               }
+
+               i++;
+               if (i == rx_ring->count)
+                       i = 0;
+
+               next_rxd = IXGBE_RX_DESC_ADV(*rx_ring, i);
+               prefetch(next_rxd);
+               cleaned_count++;
+
+               next_buffer = &rx_ring->rx_buffer_info[i];
+
+               if (!(staterr & IXGBE_RXD_STAT_EOP)) {
+                       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+                               rx_buffer_info->skb = next_buffer->skb;
+                               rx_buffer_info->dma = next_buffer->dma;
+                               next_buffer->skb = skb;
+                               next_buffer->dma = 0;
+                       } else {
+                               skb->next = next_buffer->skb;
+                               skb->next->prev = skb;
+                       }
+                       adapter->non_eop_descs++;
+                       goto next_desc;
+               }
+
+               /* ERR_MASK will only have valid bits if EOP set */
+               if (unlikely(staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK)) {
+                       dev_kfree_skb_irq(skb);
+                       goto next_desc;
+               }
+
+               ixgbevf_rx_checksum(adapter, staterr, skb);
+
+               /* probably a little skewed due to removing CRC */
+               total_rx_bytes += skb->len;
+               total_rx_packets++;
+
+               /*
+                * Work around issue of some types of VM to VM loop back
+                * packets not getting split correctly
+                */
+               if (staterr & IXGBE_RXD_STAT_LB) {
+                       u32 header_fixup_len = skb_headlen(skb);
+                       if (header_fixup_len < 14)
+                               skb_push(skb, header_fixup_len);
+               }
+               skb->protocol = eth_type_trans(skb, adapter->netdev);
+
+               ixgbevf_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc);
+
+next_desc:
+               rx_desc->wb.upper.status_error = 0;
+
+               /* return some buffers to hardware, one at a time is too slow */
+               if (cleaned_count >= IXGBEVF_RX_BUFFER_WRITE) {
+                       ixgbevf_alloc_rx_buffers(adapter, rx_ring,
+                                                cleaned_count);
+                       cleaned_count = 0;
+               }
+
+               /* use prefetched values */
+               rx_desc = next_rxd;
+               rx_buffer_info = &rx_ring->rx_buffer_info[i];
+
+               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
+       }
+
+       rx_ring->next_to_clean = i;
+       cleaned_count = IXGBE_DESC_UNUSED(rx_ring);
+
+       if (cleaned_count)
+               ixgbevf_alloc_rx_buffers(adapter, rx_ring, cleaned_count);
+
+       rx_ring->total_packets += total_rx_packets;
+       rx_ring->total_bytes += total_rx_bytes;
+       adapter->netdev->stats.rx_bytes += total_rx_bytes;
+       adapter->netdev->stats.rx_packets += total_rx_packets;
+
+       return cleaned;
+}
+
+/**
+ * ixgbevf_clean_rxonly - msix (aka one shot) rx clean routine
+ * @napi: napi struct with our devices info in it
+ * @budget: amount of work driver is allowed to do this pass, in packets
+ *
+ * This function is optimized for cleaning one queue only on a single
+ * q_vector!!!
+ **/
+static int ixgbevf_clean_rxonly(struct napi_struct *napi, int budget)
+{
+       struct ixgbevf_q_vector *q_vector =
+               container_of(napi, struct ixgbevf_q_vector, napi);
+       struct ixgbevf_adapter *adapter = q_vector->adapter;
+       struct ixgbevf_ring *rx_ring = NULL;
+       int work_done = 0;
+       long r_idx;
+
+       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+       rx_ring = &(adapter->rx_ring[r_idx]);
+
+       ixgbevf_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
+
+       /* If all Rx work done, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               if (adapter->itr_setting & 1)
+                       ixgbevf_set_itr_msix(q_vector);
+               if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
+                       ixgbevf_irq_enable_queues(adapter, rx_ring->v_idx);
+       }
+
+       return work_done;
+}
+
+/**
+ * ixgbevf_clean_rxonly_many - msix (aka one shot) rx clean routine
+ * @napi: napi struct with our devices info in it
+ * @budget: amount of work driver is allowed to do this pass, in packets
+ *
+ * This function will clean more than one rx queue associated with a
+ * q_vector.
+ **/
+static int ixgbevf_clean_rxonly_many(struct napi_struct *napi, int budget)
+{
+       struct ixgbevf_q_vector *q_vector =
+               container_of(napi, struct ixgbevf_q_vector, napi);
+       struct ixgbevf_adapter *adapter = q_vector->adapter;
+       struct ixgbevf_ring *rx_ring = NULL;
+       int work_done = 0, i;
+       long r_idx;
+       u64 enable_mask = 0;
+
+       /* attempt to distribute budget to each queue fairly, but don't allow
+        * the budget to go below 1 because we'll exit polling */
+       budget /= (q_vector->rxr_count ?: 1);
+       budget = max(budget, 1);
+       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+       for (i = 0; i < q_vector->rxr_count; i++) {
+               rx_ring = &(adapter->rx_ring[r_idx]);
+               ixgbevf_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
+               enable_mask |= rx_ring->v_idx;
+               r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
+                                     r_idx + 1);
+       }
+
+#ifndef HAVE_NETDEV_NAPI_LIST
+       if (!netif_running(adapter->netdev))
+               work_done = 0;
+
+#endif
+       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+       rx_ring = &(adapter->rx_ring[r_idx]);
+
+       /* If all Rx work done, exit the polling mode */
+       if (work_done < budget) {
+               napi_complete(napi);
+               if (adapter->itr_setting & 1)
+                       ixgbevf_set_itr_msix(q_vector);
+               if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
+                       ixgbevf_irq_enable_queues(adapter, enable_mask);
+       }
+
+       return work_done;
+}
+
+
+/**
+ * ixgbevf_configure_msix - Configure MSI-X hardware
+ * @adapter: board private structure
+ *
+ * ixgbevf_configure_msix sets up the hardware to properly generate MSI-X
+ * interrupts.
+ **/
+static void ixgbevf_configure_msix(struct ixgbevf_adapter *adapter)
+{
+       struct ixgbevf_q_vector *q_vector;
+       struct ixgbe_hw *hw = &adapter->hw;
+       int i, j, q_vectors, v_idx, r_idx;
+       u32 mask;
+
+       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       /*
+        * Populate the IVAR table and set the ITR values to the
+        * corresponding register.
+        */
+       for (v_idx = 0; v_idx < q_vectors; v_idx++) {
+               q_vector = adapter->q_vector[v_idx];
+               /* XXX for_each_set_bit(...) */
+               r_idx = find_first_bit(q_vector->rxr_idx,
+                                      adapter->num_rx_queues);
+
+               for (i = 0; i < q_vector->rxr_count; i++) {
+                       j = adapter->rx_ring[r_idx].reg_idx;
+                       ixgbevf_set_ivar(adapter, 0, j, v_idx);
+                       r_idx = find_next_bit(q_vector->rxr_idx,
+                                             adapter->num_rx_queues,
+                                             r_idx + 1);
+               }
+               r_idx = find_first_bit(q_vector->txr_idx,
+                                      adapter->num_tx_queues);
+
+               for (i = 0; i < q_vector->txr_count; i++) {
+                       j = adapter->tx_ring[r_idx].reg_idx;
+                       ixgbevf_set_ivar(adapter, 1, j, v_idx);
+                       r_idx = find_next_bit(q_vector->txr_idx,
+                                             adapter->num_tx_queues,
+                                             r_idx + 1);
+               }
+
+               /* if this is a tx only vector halve the interrupt rate */
+               if (q_vector->txr_count && !q_vector->rxr_count)
+                       q_vector->eitr = (adapter->eitr_param >> 1);
+               else if (q_vector->rxr_count)
+                       /* rx only */
+                       q_vector->eitr = adapter->eitr_param;
+
+               ixgbevf_write_eitr(adapter, v_idx, q_vector->eitr);
+       }
+
+       ixgbevf_set_ivar(adapter, -1, 1, v_idx);
+
+       /* set up to autoclear timer, and the vectors */
+       mask = IXGBE_EIMS_ENABLE_MASK;
+       mask &= ~IXGBE_EIMS_OTHER;
+       IXGBE_WRITE_REG(hw, IXGBE_VTEIAC, mask);
+}
+
+enum latency_range {
+       lowest_latency = 0,
+       low_latency = 1,
+       bulk_latency = 2,
+       latency_invalid = 255
+};
+
+/**
+ * ixgbevf_update_itr - update the dynamic ITR value based on statistics
+ * @adapter: pointer to adapter
+ * @eitr: eitr setting (ints per sec) to give last timeslice
+ * @itr_setting: current throttle rate in ints/second
+ * @packets: the number of packets during this measurement interval
+ * @bytes: the number of bytes during this measurement interval
+ *
+ *      Stores a new ITR value based on packets and byte
+ *      counts during the last interrupt.  The advantage of per interrupt
+ *      computation is faster updates and more accurate ITR for the current
+ *      traffic pattern.  Constants in this function were computed
+ *      based on theoretical maximum wire speed and thresholds were set based
+ *      on testing data as well as attempting to minimize response time
+ *      while increasing bulk throughput.
+ **/
+static u8 ixgbevf_update_itr(struct ixgbevf_adapter *adapter,
+                            u32 eitr, u8 itr_setting,
+                            int packets, int bytes)
+{
+       unsigned int retval = itr_setting;
+       u32 timepassed_us;
+       u64 bytes_perint;
+
+       if (packets == 0)
+               goto update_itr_done;
+
+
+       /* simple throttlerate management
+        *    0-20MB/s lowest (100000 ints/s)
+        *   20-100MB/s low   (20000 ints/s)
+        *  100-1249MB/s bulk (8000 ints/s)
+        */
+       /* what was last interrupt timeslice? */
+       timepassed_us = 1000000/eitr;
+       bytes_perint = bytes / timepassed_us; /* bytes/usec */
+
+       switch (itr_setting) {
+       case lowest_latency:
+               if (bytes_perint > adapter->eitr_low)
+                       retval = low_latency;
+               break;
+       case low_latency:
+               if (bytes_perint > adapter->eitr_high)
+                       retval = bulk_latency;
+               else if (bytes_perint <= adapter->eitr_low)
+                       retval = lowest_latency;
+               break;
+       case bulk_latency:
+               if (bytes_perint <= adapter->eitr_high)
+                       retval = low_latency;
+               break;
+       }
+
+update_itr_done:
+       return retval;
+}
+
+/**
+ * ixgbevf_write_eitr - write VTEITR register in hardware specific way
+ * @adapter: pointer to adapter struct
+ * @v_idx: vector index into q_vector array
+ * @itr_reg: new value to be written in *register* format, not ints/s
+ *
+ * This function is made to be called by ethtool and by the driver
+ * when it needs to update VTEITR registers at runtime.  Hardware
+ * specific quirks/differences are taken care of here.
+ */
+static void ixgbevf_write_eitr(struct ixgbevf_adapter *adapter, int v_idx,
+                              u32 itr_reg)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       itr_reg = EITR_INTS_PER_SEC_TO_REG(itr_reg);
+
+       /*
+        * set the WDIS bit to not clear the timer bits and cause an
+        * immediate assertion of the interrupt
+        */
+       itr_reg |= IXGBE_EITR_CNT_WDIS;
+
+       IXGBE_WRITE_REG(hw, IXGBE_VTEITR(v_idx), itr_reg);
+}
+
+static void ixgbevf_set_itr_msix(struct ixgbevf_q_vector *q_vector)
+{
+       struct ixgbevf_adapter *adapter = q_vector->adapter;
+       u32 new_itr;
+       u8 current_itr, ret_itr;
+       int i, r_idx, v_idx = q_vector->v_idx;
+       struct ixgbevf_ring *rx_ring, *tx_ring;
+
+       r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
+       for (i = 0; i < q_vector->txr_count; i++) {
+               tx_ring = &(adapter->tx_ring[r_idx]);
+               ret_itr = ixgbevf_update_itr(adapter, q_vector->eitr,
+                                            q_vector->tx_itr,
+                                            tx_ring->total_packets,
+                                            tx_ring->total_bytes);
+               /* if the result for this queue would decrease interrupt
+                * rate for this vector then use that result */
+               q_vector->tx_itr = ((q_vector->tx_itr > ret_itr) ?
+                                   q_vector->tx_itr - 1 : ret_itr);
+               r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
+                                     r_idx + 1);
+       }
+
+       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+       for (i = 0; i < q_vector->rxr_count; i++) {
+               rx_ring = &(adapter->rx_ring[r_idx]);
+               ret_itr = ixgbevf_update_itr(adapter, q_vector->eitr,
+                                            q_vector->rx_itr,
+                                            rx_ring->total_packets,
+                                            rx_ring->total_bytes);
+               /* if the result for this queue would decrease interrupt
+                * rate for this vector then use that result */
+               q_vector->rx_itr = ((q_vector->rx_itr > ret_itr) ?
+                                   q_vector->rx_itr - 1 : ret_itr);
+               r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
+                                     r_idx + 1);
+       }
+
+       current_itr = max(q_vector->rx_itr, q_vector->tx_itr);
+
+       switch (current_itr) {
+       /* counts and packets in update_itr are dependent on these numbers */
+       case lowest_latency:
+               new_itr = 100000;
+               break;
+       case low_latency:
+               new_itr = 20000; /* aka hwitr = ~200 */
+               break;
+       case bulk_latency:
+       default:
+               new_itr = 8000;
+               break;
+       }
+
+       if (new_itr != q_vector->eitr) {
+               u32 itr_reg;
+
+               /* save the algorithm value here, not the smoothed one */
+               q_vector->eitr = new_itr;
+               /* do an exponential smoothing */
+               new_itr = ((q_vector->eitr * 90)/100) + ((new_itr * 10)/100);
+               itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr);
+               ixgbevf_write_eitr(adapter, v_idx, itr_reg);
+       }
+}
+
+static irqreturn_t ixgbevf_msix_mbx(int irq, void *data)
+{
+       struct net_device *netdev = data;
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 eicr;
+       u32 msg;
+
+       eicr = IXGBE_READ_REG(hw, IXGBE_VTEICS);
+       IXGBE_WRITE_REG(hw, IXGBE_VTEICR, eicr);
+
+       if (!hw->mbx.ops.check_for_ack(hw)) {
+               /*
+                * checking for the ack clears the PFACK bit.  Place
+                * it back in the v2p_mailbox cache so that anyone
+                * polling for an ack will not miss it.  Also
+                * avoid the read below because the code to read
+                * the mailbox will also clear the ack bit.  This was
+                * causing lost acks.  Just cache the bit and exit
+                * the IRQ handler.
+                */
+               hw->mbx.v2p_mailbox |= IXGBE_VFMAILBOX_PFACK;
+               goto out;
+       }
+
+       /* Not an ack interrupt, go ahead and read the message */
+       hw->mbx.ops.read(hw, &msg, 1);
+
+       if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG)
+               mod_timer(&adapter->watchdog_timer,
+                         round_jiffies(jiffies + 1));
+
+out:
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t ixgbevf_msix_clean_tx(int irq, void *data)
+{
+       struct ixgbevf_q_vector *q_vector = data;
+       struct ixgbevf_adapter  *adapter = q_vector->adapter;
+       struct ixgbevf_ring     *tx_ring;
+       int i, r_idx;
+
+       if (!q_vector->txr_count)
+               return IRQ_HANDLED;
+
+       r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
+       for (i = 0; i < q_vector->txr_count; i++) {
+               tx_ring = &(adapter->tx_ring[r_idx]);
+               tx_ring->total_bytes = 0;
+               tx_ring->total_packets = 0;
+               ixgbevf_clean_tx_irq(adapter, tx_ring);
+               r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
+                                     r_idx + 1);
+       }
+
+       if (adapter->itr_setting & 1)
+               ixgbevf_set_itr_msix(q_vector);
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * ixgbevf_msix_clean_rx - single unshared vector rx clean (all queues)
+ * @irq: unused
+ * @data: pointer to our q_vector struct for this interrupt vector
+ **/
+static irqreturn_t ixgbevf_msix_clean_rx(int irq, void *data)
+{
+       struct ixgbevf_q_vector *q_vector = data;
+       struct ixgbevf_adapter  *adapter = q_vector->adapter;
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct ixgbevf_ring  *rx_ring;
+       int r_idx;
+       int i;
+
+       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+       for (i = 0; i < q_vector->rxr_count; i++) {
+               rx_ring = &(adapter->rx_ring[r_idx]);
+               rx_ring->total_bytes = 0;
+               rx_ring->total_packets = 0;
+               r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
+                                     r_idx + 1);
+       }
+
+       if (!q_vector->rxr_count)
+               return IRQ_HANDLED;
+
+       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+       rx_ring = &(adapter->rx_ring[r_idx]);
+       /* disable interrupts on this vector only */
+       IXGBE_WRITE_REG(hw, IXGBE_VTEIMC, rx_ring->v_idx);
+       napi_schedule(&q_vector->napi);
+
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t ixgbevf_msix_clean_many(int irq, void *data)
+{
+       ixgbevf_msix_clean_rx(irq, data);
+       ixgbevf_msix_clean_tx(irq, data);
+
+       return IRQ_HANDLED;
+}
+
+static inline void map_vector_to_rxq(struct ixgbevf_adapter *a, int v_idx,
+                                    int r_idx)
+{
+       struct ixgbevf_q_vector *q_vector = a->q_vector[v_idx];
+
+       set_bit(r_idx, q_vector->rxr_idx);
+       q_vector->rxr_count++;
+       a->rx_ring[r_idx].v_idx = 1 << v_idx;
+}
+
+static inline void map_vector_to_txq(struct ixgbevf_adapter *a, int v_idx,
+                                    int t_idx)
+{
+       struct ixgbevf_q_vector *q_vector = a->q_vector[v_idx];
+
+       set_bit(t_idx, q_vector->txr_idx);
+       q_vector->txr_count++;
+       a->tx_ring[t_idx].v_idx = 1 << v_idx;
+}
+
+/**
+ * ixgbevf_map_rings_to_vectors - Maps descriptor rings to vectors
+ * @adapter: board private structure to initialize
+ *
+ * This function maps descriptor rings to the queue-specific vectors
+ * we were allotted through the MSI-X enabling code.  Ideally, we'd have
+ * one vector per ring/queue, but on a constrained vector budget, we
+ * group the rings as "efficiently" as possible.  You would add new
+ * mapping configurations in here.
+ **/
+static int ixgbevf_map_rings_to_vectors(struct ixgbevf_adapter *adapter)
+{
+       int q_vectors;
+       int v_start = 0;
+       int rxr_idx = 0, txr_idx = 0;
+       int rxr_remaining = adapter->num_rx_queues;
+       int txr_remaining = adapter->num_tx_queues;
+       int i, j;
+       int rqpv, tqpv;
+       int err = 0;
+
+       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       /*
+        * The ideal configuration...
+        * We have enough vectors to map one per queue.
+        */
+       if (q_vectors == adapter->num_rx_queues + adapter->num_tx_queues) {
+               for (; rxr_idx < rxr_remaining; v_start++, rxr_idx++)
+                       map_vector_to_rxq(adapter, v_start, rxr_idx);
+
+               for (; txr_idx < txr_remaining; v_start++, txr_idx++)
+                       map_vector_to_txq(adapter, v_start, txr_idx);
+               goto out;
+       }
+
+       /*
+        * If we don't have enough vectors for a 1-to-1
+        * mapping, we'll have to group them so there are
+        * multiple queues per vector.
+        */
+       /* Re-adjusting *qpv takes care of the remainder. */
+       for (i = v_start; i < q_vectors; i++) {
+               rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors - i);
+               for (j = 0; j < rqpv; j++) {
+                       map_vector_to_rxq(adapter, i, rxr_idx);
+                       rxr_idx++;
+                       rxr_remaining--;
+               }
+       }
+       for (i = v_start; i < q_vectors; i++) {
+               tqpv = DIV_ROUND_UP(txr_remaining, q_vectors - i);
+               for (j = 0; j < tqpv; j++) {
+                       map_vector_to_txq(adapter, i, txr_idx);
+                       txr_idx++;
+                       txr_remaining--;
+               }
+       }
+
+out:
+       return err;
+}
+
+/**
+ * ixgbevf_request_msix_irqs - Initialize MSI-X interrupts
+ * @adapter: board private structure
+ *
+ * ixgbevf_request_msix_irqs allocates MSI-X vectors and requests
+ * interrupts from the kernel.
+ **/
+static int ixgbevf_request_msix_irqs(struct ixgbevf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       irqreturn_t (*handler)(int, void *);
+       int i, vector, q_vectors, err;
+       int ri = 0, ti = 0;
+
+       /* Decrement for Other and TCP Timer vectors */
+       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+#define SET_HANDLER(_v) (((_v)->rxr_count && (_v)->txr_count)          \
+                                         ? &ixgbevf_msix_clean_many : \
+                         (_v)->rxr_count ? &ixgbevf_msix_clean_rx   : \
+                         (_v)->txr_count ? &ixgbevf_msix_clean_tx   : \
+                         NULL)
+       for (vector = 0; vector < q_vectors; vector++) {
+               handler = SET_HANDLER(adapter->q_vector[vector]);
+
+               if (handler == &ixgbevf_msix_clean_rx) {
+                       sprintf(adapter->name[vector], "%s-%s-%d",
+                               netdev->name, "rx", ri++);
+               } else if (handler == &ixgbevf_msix_clean_tx) {
+                       sprintf(adapter->name[vector], "%s-%s-%d",
+                               netdev->name, "tx", ti++);
+               } else if (handler == &ixgbevf_msix_clean_many) {
+                       sprintf(adapter->name[vector], "%s-%s-%d",
+                               netdev->name, "TxRx", vector);
+               } else {
+                       /* skip this unused q_vector */
+                       continue;
+               }
+               err = request_irq(adapter->msix_entries[vector].vector,
+                                 handler, 0, adapter->name[vector],
+                                 adapter->q_vector[vector]);
+               if (err) {
+                       hw_dbg(&adapter->hw,
+                              "request_irq failed for MSIX interrupt "
+                              "Error: %d\n", err);
+                       goto free_queue_irqs;
+               }
+       }
+
+       sprintf(adapter->name[vector], "%s:mbx", netdev->name);
+       err = request_irq(adapter->msix_entries[vector].vector,
+                         &ixgbevf_msix_mbx, 0, adapter->name[vector], netdev);
+       if (err) {
+               hw_dbg(&adapter->hw,
+                      "request_irq for msix_mbx failed: %d\n", err);
+               goto free_queue_irqs;
+       }
+
+       return 0;
+
+free_queue_irqs:
+       for (i = vector - 1; i >= 0; i--)
+               free_irq(adapter->msix_entries[--vector].vector,
+                        &(adapter->q_vector[i]));
+       pci_disable_msix(adapter->pdev);
+       kfree(adapter->msix_entries);
+       adapter->msix_entries = NULL;
+       return err;
+}
+
+static inline void ixgbevf_reset_q_vectors(struct ixgbevf_adapter *adapter)
+{
+       int i, q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       for (i = 0; i < q_vectors; i++) {
+               struct ixgbevf_q_vector *q_vector = adapter->q_vector[i];
+               bitmap_zero(q_vector->rxr_idx, MAX_RX_QUEUES);
+               bitmap_zero(q_vector->txr_idx, MAX_TX_QUEUES);
+               q_vector->rxr_count = 0;
+               q_vector->txr_count = 0;
+               q_vector->eitr = adapter->eitr_param;
+       }
+}
+
+/**
+ * ixgbevf_request_irq - initialize interrupts
+ * @adapter: board private structure
+ *
+ * Attempts to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
+static int ixgbevf_request_irq(struct ixgbevf_adapter *adapter)
+{
+       int err = 0;
+
+       err = ixgbevf_request_msix_irqs(adapter);
+
+       if (err)
+               hw_dbg(&adapter->hw,
+                      "request_irq failed, Error %d\n", err);
+
+       return err;
+}
+
+static void ixgbevf_free_irq(struct ixgbevf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int i, q_vectors;
+
+       q_vectors = adapter->num_msix_vectors;
+
+       i = q_vectors - 1;
+
+       free_irq(adapter->msix_entries[i].vector, netdev);
+       i--;
+
+       for (; i >= 0; i--) {
+               free_irq(adapter->msix_entries[i].vector,
+                        adapter->q_vector[i]);
+       }
+
+       ixgbevf_reset_q_vectors(adapter);
+}
+
+/**
+ * ixgbevf_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ **/
+static inline void ixgbevf_irq_disable(struct ixgbevf_adapter *adapter)
+{
+       int i;
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       IXGBE_WRITE_REG(hw, IXGBE_VTEIMC, ~0);
+
+       IXGBE_WRITE_FLUSH(hw);
+
+       for (i = 0; i < adapter->num_msix_vectors; i++)
+               synchronize_irq(adapter->msix_entries[i].vector);
+}
+
+/**
+ * ixgbevf_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ **/
+static inline void ixgbevf_irq_enable(struct ixgbevf_adapter *adapter,
+                                     bool queues, bool flush)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 mask;
+       u64 qmask;
+
+       mask = (IXGBE_EIMS_ENABLE_MASK & ~IXGBE_EIMS_RTX_QUEUE);
+       qmask = ~0;
+
+       IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, mask);
+
+       if (queues)
+               ixgbevf_irq_enable_queues(adapter, qmask);
+
+       if (flush)
+               IXGBE_WRITE_FLUSH(hw);
+}
+
+/**
+ * ixgbevf_configure_tx - Configure 82599 VF Transmit Unit after Reset
+ * @adapter: board private structure
+ *
+ * Configure the Tx unit of the MAC after a reset.
+ **/
+static void ixgbevf_configure_tx(struct ixgbevf_adapter *adapter)
+{
+       u64 tdba;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 i, j, tdlen, txctrl;
+
+       /* Setup the HW Tx Head and Tail descriptor pointers */
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               struct ixgbevf_ring *ring = &adapter->tx_ring[i];
+               j = ring->reg_idx;
+               tdba = ring->dma;
+               tdlen = ring->count * sizeof(union ixgbe_adv_tx_desc);
+               IXGBE_WRITE_REG(hw, IXGBE_VFTDBAL(j),
+                               (tdba & DMA_BIT_MASK(32)));
+               IXGBE_WRITE_REG(hw, IXGBE_VFTDBAH(j), (tdba >> 32));
+               IXGBE_WRITE_REG(hw, IXGBE_VFTDLEN(j), tdlen);
+               IXGBE_WRITE_REG(hw, IXGBE_VFTDH(j), 0);
+               IXGBE_WRITE_REG(hw, IXGBE_VFTDT(j), 0);
+               adapter->tx_ring[i].head = IXGBE_VFTDH(j);
+               adapter->tx_ring[i].tail = IXGBE_VFTDT(j);
+               /* Disable Tx Head Writeback RO bit, since this hoses
+                * bookkeeping if things aren't delivered in order.
+                */
+               txctrl = IXGBE_READ_REG(hw, IXGBE_VFDCA_TXCTRL(j));
+               txctrl &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
+               IXGBE_WRITE_REG(hw, IXGBE_VFDCA_TXCTRL(j), txctrl);
+       }
+}
+
+#define IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT        2
+
+static void ixgbevf_configure_srrctl(struct ixgbevf_adapter *adapter, int index)
+{
+       struct ixgbevf_ring *rx_ring;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 srrctl;
+
+       rx_ring = &adapter->rx_ring[index];
+
+       srrctl = IXGBE_SRRCTL_DROP_EN;
+
+       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+               u16 bufsz = IXGBEVF_RXBUFFER_2048;
+               /* grow the amount we can receive on large page machines */
+               if (bufsz < (PAGE_SIZE / 2))
+                       bufsz = (PAGE_SIZE / 2);
+               /* cap the bufsz at our largest descriptor size */
+               bufsz = min((u16)IXGBEVF_MAX_RXBUFFER, bufsz);
+
+               srrctl |= bufsz >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+               srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
+               srrctl |= ((IXGBEVF_RX_HDR_SIZE <<
+                          IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) &
+                          IXGBE_SRRCTL_BSIZEHDR_MASK);
+       } else {
+               srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF;
+
+               if (rx_ring->rx_buf_len == MAXIMUM_ETHERNET_VLAN_SIZE)
+                       srrctl |= IXGBEVF_RXBUFFER_2048 >>
+                               IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+               else
+                       srrctl |= rx_ring->rx_buf_len >>
+                               IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+       }
+       IXGBE_WRITE_REG(hw, IXGBE_VFSRRCTL(index), srrctl);
+}
+
+/**
+ * ixgbevf_configure_rx - Configure 82599 VF Receive Unit after Reset
+ * @adapter: board private structure
+ *
+ * Configure the Rx unit of the MAC after a reset.
+ **/
+static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
+{
+       u64 rdba;
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+       int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+       int i, j;
+       u32 rdlen;
+       int rx_buf_len;
+
+       /* Decide whether to use packet split mode or not */
+       if (netdev->mtu > ETH_DATA_LEN) {
+               if (adapter->flags & IXGBE_FLAG_RX_PS_CAPABLE)
+                       adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+               else
+                       adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+       } else {
+               if (adapter->flags & IXGBE_FLAG_RX_1BUF_CAPABLE)
+                       adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+               else
+                       adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+       }
+
+       /* Set the RX buffer length according to the mode */
+       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+               /* PSRTYPE must be initialized in 82599 */
+               u32 psrtype = IXGBE_PSRTYPE_TCPHDR |
+                       IXGBE_PSRTYPE_UDPHDR |
+                       IXGBE_PSRTYPE_IPV4HDR |
+                       IXGBE_PSRTYPE_IPV6HDR |
+                       IXGBE_PSRTYPE_L2HDR;
+               IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, psrtype);
+               rx_buf_len = IXGBEVF_RX_HDR_SIZE;
+       } else {
+               IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, 0);
+               if (netdev->mtu <= ETH_DATA_LEN)
+                       rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+               else
+                       rx_buf_len = ALIGN(max_frame, 1024);
+       }
+
+       rdlen = adapter->rx_ring[0].count * sizeof(union ixgbe_adv_rx_desc);
+       /* Setup the HW Rx Head and Tail Descriptor Pointers and
+        * the Base and Length of the Rx Descriptor Ring */
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               rdba = adapter->rx_ring[i].dma;
+               j = adapter->rx_ring[i].reg_idx;
+               IXGBE_WRITE_REG(hw, IXGBE_VFRDBAL(j),
+                               (rdba & DMA_BIT_MASK(32)));
+               IXGBE_WRITE_REG(hw, IXGBE_VFRDBAH(j), (rdba >> 32));
+               IXGBE_WRITE_REG(hw, IXGBE_VFRDLEN(j), rdlen);
+               IXGBE_WRITE_REG(hw, IXGBE_VFRDH(j), 0);
+               IXGBE_WRITE_REG(hw, IXGBE_VFRDT(j), 0);
+               adapter->rx_ring[i].head = IXGBE_VFRDH(j);
+               adapter->rx_ring[i].tail = IXGBE_VFRDT(j);
+               adapter->rx_ring[i].rx_buf_len = rx_buf_len;
+
+               ixgbevf_configure_srrctl(adapter, j);
+       }
+}
+
+static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       /* add VID to filter table */
+       if (hw->mac.ops.set_vfta)
+               hw->mac.ops.set_vfta(hw, vid, 0, true);
+       set_bit(vid, adapter->active_vlans);
+}
+
+static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       /* remove VID from filter table */
+       if (hw->mac.ops.set_vfta)
+               hw->mac.ops.set_vfta(hw, vid, 0, false);
+       clear_bit(vid, adapter->active_vlans);
+}
+
+static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)
+{
+       u16 vid;
+
+       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+               ixgbevf_vlan_rx_add_vid(adapter->netdev, vid);
+}
+
+static int ixgbevf_write_uc_addr_list(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       int count = 0;
+
+       if ((netdev_uc_count(netdev)) > 10) {
+               printk(KERN_ERR "Too many unicast filters - No Space\n");
+               return -ENOSPC;
+       }
+
+       if (!netdev_uc_empty(netdev)) {
+               struct netdev_hw_addr *ha;
+               netdev_for_each_uc_addr(ha, netdev) {
+                       hw->mac.ops.set_uc_addr(hw, ++count, ha->addr);
+                       udelay(200);
+               }
+       } else {
+               /*
+                * If the list is empty then send message to PF driver to
+                * clear all macvlans on this VF.
+                */
+               hw->mac.ops.set_uc_addr(hw, 0, NULL);
+       }
+
+       return count;
+}
+
+/**
+ * ixgbevf_set_rx_mode - Multicast set
+ * @netdev: network interface device structure
+ *
+ * The set_rx_method entry point is called whenever the multicast address
+ * list or the network interface flags are updated.  This routine is
+ * responsible for configuring the hardware for proper multicast mode.
+ **/
+static void ixgbevf_set_rx_mode(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       /* reprogram multicast list */
+       if (hw->mac.ops.update_mc_addr_list)
+               hw->mac.ops.update_mc_addr_list(hw, netdev);
+
+       ixgbevf_write_uc_addr_list(netdev);
+}
+
+static void ixgbevf_napi_enable_all(struct ixgbevf_adapter *adapter)
+{
+       int q_idx;
+       struct ixgbevf_q_vector *q_vector;
+       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
+               struct napi_struct *napi;
+               q_vector = adapter->q_vector[q_idx];
+               if (!q_vector->rxr_count)
+                       continue;
+               napi = &q_vector->napi;
+               if (q_vector->rxr_count > 1)
+                       napi->poll = &ixgbevf_clean_rxonly_many;
+
+               napi_enable(napi);
+       }
+}
+
+static void ixgbevf_napi_disable_all(struct ixgbevf_adapter *adapter)
+{
+       int q_idx;
+       struct ixgbevf_q_vector *q_vector;
+       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+
+       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
+               q_vector = adapter->q_vector[q_idx];
+               if (!q_vector->rxr_count)
+                       continue;
+               napi_disable(&q_vector->napi);
+       }
+}
+
+static void ixgbevf_configure(struct ixgbevf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       int i;
+
+       ixgbevf_set_rx_mode(netdev);
+
+       ixgbevf_restore_vlan(adapter);
+
+       ixgbevf_configure_tx(adapter);
+       ixgbevf_configure_rx(adapter);
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               struct ixgbevf_ring *ring = &adapter->rx_ring[i];
+               ixgbevf_alloc_rx_buffers(adapter, ring, ring->count);
+               ring->next_to_use = ring->count - 1;
+               writel(ring->next_to_use, adapter->hw.hw_addr + ring->tail);
+       }
+}
+
+#define IXGBE_MAX_RX_DESC_POLL 10
+static inline void ixgbevf_rx_desc_queue_enable(struct ixgbevf_adapter *adapter,
+                                               int rxr)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       int j = adapter->rx_ring[rxr].reg_idx;
+       int k;
+
+       for (k = 0; k < IXGBE_MAX_RX_DESC_POLL; k++) {
+               if (IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j)) & IXGBE_RXDCTL_ENABLE)
+                       break;
+               else
+                       msleep(1);
+       }
+       if (k >= IXGBE_MAX_RX_DESC_POLL) {
+               hw_dbg(hw, "RXDCTL.ENABLE on Rx queue %d "
+                      "not set within the polling period\n", rxr);
+       }
+
+       ixgbevf_release_rx_desc(&adapter->hw, &adapter->rx_ring[rxr],
+                               (adapter->rx_ring[rxr].count - 1));
+}
+
+static void ixgbevf_save_reset_stats(struct ixgbevf_adapter *adapter)
+{
+       /* Only save pre-reset stats if there are some */
+       if (adapter->stats.vfgprc || adapter->stats.vfgptc) {
+               adapter->stats.saved_reset_vfgprc += adapter->stats.vfgprc -
+                       adapter->stats.base_vfgprc;
+               adapter->stats.saved_reset_vfgptc += adapter->stats.vfgptc -
+                       adapter->stats.base_vfgptc;
+               adapter->stats.saved_reset_vfgorc += adapter->stats.vfgorc -
+                       adapter->stats.base_vfgorc;
+               adapter->stats.saved_reset_vfgotc += adapter->stats.vfgotc -
+                       adapter->stats.base_vfgotc;
+               adapter->stats.saved_reset_vfmprc += adapter->stats.vfmprc -
+                       adapter->stats.base_vfmprc;
+       }
+}
+
+static void ixgbevf_init_last_counter_stats(struct ixgbevf_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       adapter->stats.last_vfgprc = IXGBE_READ_REG(hw, IXGBE_VFGPRC);
+       adapter->stats.last_vfgorc = IXGBE_READ_REG(hw, IXGBE_VFGORC_LSB);
+       adapter->stats.last_vfgorc |=
+               (((u64)(IXGBE_READ_REG(hw, IXGBE_VFGORC_MSB))) << 32);
+       adapter->stats.last_vfgptc = IXGBE_READ_REG(hw, IXGBE_VFGPTC);
+       adapter->stats.last_vfgotc = IXGBE_READ_REG(hw, IXGBE_VFGOTC_LSB);
+       adapter->stats.last_vfgotc |=
+               (((u64)(IXGBE_READ_REG(hw, IXGBE_VFGOTC_MSB))) << 32);
+       adapter->stats.last_vfmprc = IXGBE_READ_REG(hw, IXGBE_VFMPRC);
+
+       adapter->stats.base_vfgprc = adapter->stats.last_vfgprc;
+       adapter->stats.base_vfgorc = adapter->stats.last_vfgorc;
+       adapter->stats.base_vfgptc = adapter->stats.last_vfgptc;
+       adapter->stats.base_vfgotc = adapter->stats.last_vfgotc;
+       adapter->stats.base_vfmprc = adapter->stats.last_vfmprc;
+}
+
+static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       int i, j = 0;
+       int num_rx_rings = adapter->num_rx_queues;
+       u32 txdctl, rxdctl;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               j = adapter->tx_ring[i].reg_idx;
+               txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j));
+               /* enable WTHRESH=8 descriptors, to encourage burst writeback */
+               txdctl |= (8 << 16);
+               IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j), txdctl);
+       }
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               j = adapter->tx_ring[i].reg_idx;
+               txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j));
+               txdctl |= IXGBE_TXDCTL_ENABLE;
+               IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j), txdctl);
+       }
+
+       for (i = 0; i < num_rx_rings; i++) {
+               j = adapter->rx_ring[i].reg_idx;
+               rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j));
+               rxdctl |= IXGBE_RXDCTL_ENABLE | IXGBE_RXDCTL_VME;
+               if (hw->mac.type == ixgbe_mac_X540_vf) {
+                       rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
+                       rxdctl |= ((netdev->mtu + ETH_HLEN + ETH_FCS_LEN) |
+                                  IXGBE_RXDCTL_RLPML_EN);
+               }
+               IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(j), rxdctl);
+               ixgbevf_rx_desc_queue_enable(adapter, i);
+       }
+
+       ixgbevf_configure_msix(adapter);
+
+       if (hw->mac.ops.set_rar) {
+               if (is_valid_ether_addr(hw->mac.addr))
+                       hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0);
+               else
+                       hw->mac.ops.set_rar(hw, 0, hw->mac.perm_addr, 0);
+       }
+
+       clear_bit(__IXGBEVF_DOWN, &adapter->state);
+       ixgbevf_napi_enable_all(adapter);
+
+       /* enable transmits */
+       netif_tx_start_all_queues(netdev);
+
+       ixgbevf_save_reset_stats(adapter);
+       ixgbevf_init_last_counter_stats(adapter);
+
+       /* bring the link up in the watchdog, this could race with our first
+        * link up interrupt but shouldn't be a problem */
+       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
+       adapter->link_check_timeout = jiffies;
+       mod_timer(&adapter->watchdog_timer, jiffies);
+       return 0;
+}
+
+int ixgbevf_up(struct ixgbevf_adapter *adapter)
+{
+       int err;
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       ixgbevf_configure(adapter);
+
+       err = ixgbevf_up_complete(adapter);
+
+       /* clear any pending interrupts, may auto mask */
+       IXGBE_READ_REG(hw, IXGBE_VTEICR);
+
+       ixgbevf_irq_enable(adapter, true, true);
+
+       return err;
+}
+
+/**
+ * ixgbevf_clean_rx_ring - Free Rx Buffers per Queue
+ * @adapter: board private structure
+ * @rx_ring: ring to free buffers from
+ **/
+static void ixgbevf_clean_rx_ring(struct ixgbevf_adapter *adapter,
+                                 struct ixgbevf_ring *rx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       unsigned long size;
+       unsigned int i;
+
+       if (!rx_ring->rx_buffer_info)
+               return;
+
+       /* Free all the Rx ring sk_buffs */
+       for (i = 0; i < rx_ring->count; i++) {
+               struct ixgbevf_rx_buffer *rx_buffer_info;
+
+               rx_buffer_info = &rx_ring->rx_buffer_info[i];
+               if (rx_buffer_info->dma) {
+                       dma_unmap_single(&pdev->dev, rx_buffer_info->dma,
+                                        rx_ring->rx_buf_len,
+                                        DMA_FROM_DEVICE);
+                       rx_buffer_info->dma = 0;
+               }
+               if (rx_buffer_info->skb) {
+                       struct sk_buff *skb = rx_buffer_info->skb;
+                       rx_buffer_info->skb = NULL;
+                       do {
+                               struct sk_buff *this = skb;
+                               skb = skb->prev;
+                               dev_kfree_skb(this);
+                       } while (skb);
+               }
+               if (!rx_buffer_info->page)
+                       continue;
+               dma_unmap_page(&pdev->dev, rx_buffer_info->page_dma,
+                              PAGE_SIZE / 2, DMA_FROM_DEVICE);
+               rx_buffer_info->page_dma = 0;
+               put_page(rx_buffer_info->page);
+               rx_buffer_info->page = NULL;
+               rx_buffer_info->page_offset = 0;
+       }
+
+       size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count;
+       memset(rx_ring->rx_buffer_info, 0, size);
+
+       /* Zero out the descriptor ring */
+       memset(rx_ring->desc, 0, rx_ring->size);
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       if (rx_ring->head)
+               writel(0, adapter->hw.hw_addr + rx_ring->head);
+       if (rx_ring->tail)
+               writel(0, adapter->hw.hw_addr + rx_ring->tail);
+}
+
+/**
+ * ixgbevf_clean_tx_ring - Free Tx Buffers
+ * @adapter: board private structure
+ * @tx_ring: ring to be cleaned
+ **/
+static void ixgbevf_clean_tx_ring(struct ixgbevf_adapter *adapter,
+                                 struct ixgbevf_ring *tx_ring)
+{
+       struct ixgbevf_tx_buffer *tx_buffer_info;
+       unsigned long size;
+       unsigned int i;
+
+       if (!tx_ring->tx_buffer_info)
+               return;
+
+       /* Free all the Tx ring sk_buffs */
+
+       for (i = 0; i < tx_ring->count; i++) {
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               ixgbevf_unmap_and_free_tx_resource(adapter, tx_buffer_info);
+       }
+
+       size = sizeof(struct ixgbevf_tx_buffer) * tx_ring->count;
+       memset(tx_ring->tx_buffer_info, 0, size);
+
+       memset(tx_ring->desc, 0, tx_ring->size);
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+
+       if (tx_ring->head)
+               writel(0, adapter->hw.hw_addr + tx_ring->head);
+       if (tx_ring->tail)
+               writel(0, adapter->hw.hw_addr + tx_ring->tail);
+}
+
+/**
+ * ixgbevf_clean_all_rx_rings - Free Rx Buffers for all queues
+ * @adapter: board private structure
+ **/
+static void ixgbevf_clean_all_rx_rings(struct ixgbevf_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               ixgbevf_clean_rx_ring(adapter, &adapter->rx_ring[i]);
+}
+
+/**
+ * ixgbevf_clean_all_tx_rings - Free Tx Buffers for all queues
+ * @adapter: board private structure
+ **/
+static void ixgbevf_clean_all_tx_rings(struct ixgbevf_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               ixgbevf_clean_tx_ring(adapter, &adapter->tx_ring[i]);
+}
+
+void ixgbevf_down(struct ixgbevf_adapter *adapter)
+{
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 txdctl;
+       int i, j;
+
+       /* signal that we are down to the interrupt handler */
+       set_bit(__IXGBEVF_DOWN, &adapter->state);
+       /* disable receives */
+
+       netif_tx_disable(netdev);
+
+       msleep(10);
+
+       netif_tx_stop_all_queues(netdev);
+
+       ixgbevf_irq_disable(adapter);
+
+       ixgbevf_napi_disable_all(adapter);
+
+       del_timer_sync(&adapter->watchdog_timer);
+       /* can't call flush scheduled work here because it can deadlock
+        * if linkwatch_event tries to acquire the rtnl_lock which we are
+        * holding */
+       while (adapter->flags & IXGBE_FLAG_IN_WATCHDOG_TASK)
+               msleep(1);
+
+       /* disable transmits in the hardware now that interrupts are off */
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               j = adapter->tx_ring[i].reg_idx;
+               txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j));
+               IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j),
+                               (txdctl & ~IXGBE_TXDCTL_ENABLE));
+       }
+
+       netif_carrier_off(netdev);
+
+       if (!pci_channel_offline(adapter->pdev))
+               ixgbevf_reset(adapter);
+
+       ixgbevf_clean_all_tx_rings(adapter);
+       ixgbevf_clean_all_rx_rings(adapter);
+}
+
+void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       WARN_ON(in_interrupt());
+
+       while (test_and_set_bit(__IXGBEVF_RESETTING, &adapter->state))
+               msleep(1);
+
+       /*
+        * Check if PF is up before re-init.  If not then skip until
+        * later when the PF is up and ready to service requests from
+        * the VF via mailbox.  If the VF is up and running then the
+        * watchdog task will continue to schedule reset tasks until
+        * the PF is up and running.
+        */
+       if (!hw->mac.ops.reset_hw(hw)) {
+               ixgbevf_down(adapter);
+               ixgbevf_up(adapter);
+       }
+
+       clear_bit(__IXGBEVF_RESETTING, &adapter->state);
+}
+
+void ixgbevf_reset(struct ixgbevf_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct net_device *netdev = adapter->netdev;
+
+       if (hw->mac.ops.reset_hw(hw))
+               hw_dbg(hw, "PF still resetting\n");
+       else
+               hw->mac.ops.init_hw(hw);
+
+       if (is_valid_ether_addr(adapter->hw.mac.addr)) {
+               memcpy(netdev->dev_addr, adapter->hw.mac.addr,
+                      netdev->addr_len);
+               memcpy(netdev->perm_addr, adapter->hw.mac.addr,
+                      netdev->addr_len);
+       }
+}
+
+static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
+                                        int vectors)
+{
+       int err, vector_threshold;
+
+       /* We'll want at least 3 (vector_threshold):
+        * 1) TxQ[0] Cleanup
+        * 2) RxQ[0] Cleanup
+        * 3) Other (Link Status Change, etc.)
+        */
+       vector_threshold = MIN_MSIX_COUNT;
+
+       /* The more we get, the more we will assign to Tx/Rx Cleanup
+        * for the separate queues...where Rx Cleanup >= Tx Cleanup.
+        * Right now, we simply care about how many we'll get; we'll
+        * set them up later while requesting irq's.
+        */
+       while (vectors >= vector_threshold) {
+               err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
+                                     vectors);
+               if (!err) /* Success in acquiring all requested vectors. */
+                       break;
+               else if (err < 0)
+                       vectors = 0; /* Nasty failure, quit now */
+               else /* err == number of vectors we should try again with */
+                       vectors = err;
+       }
+
+       if (vectors < vector_threshold) {
+               /* Can't allocate enough MSI-X interrupts?  Oh well.
+                * This just means we'll go with either a single MSI
+                * vector or fall back to legacy interrupts.
+                */
+               hw_dbg(&adapter->hw,
+                      "Unable to allocate MSI-X interrupts\n");
+               kfree(adapter->msix_entries);
+               adapter->msix_entries = NULL;
+       } else {
+               /*
+                * Adjust for only the vectors we'll use, which is minimum
+                * of max_msix_q_vectors + NON_Q_VECTORS, or the number of
+                * vectors we were allocated.
+                */
+               adapter->num_msix_vectors = vectors;
+       }
+}
+
+/*
+ * ixgbevf_set_num_queues: Allocate queues for device, feature dependent
+ * @adapter: board private structure to initialize
+ *
+ * This is the top level queue allocation routine.  The order here is very
+ * important, starting with the "most" number of features turned on at once,
+ * and ending with the smallest set of features.  This way large combinations
+ * can be allocated if they're turned on, and smaller combinations are the
+ * fallthrough conditions.
+ *
+ **/
+static void ixgbevf_set_num_queues(struct ixgbevf_adapter *adapter)
+{
+       /* Start with base case */
+       adapter->num_rx_queues = 1;
+       adapter->num_tx_queues = 1;
+       adapter->num_rx_pools = adapter->num_rx_queues;
+       adapter->num_rx_queues_per_pool = 1;
+}
+
+/**
+ * ixgbevf_alloc_queues - Allocate memory for all rings
+ * @adapter: board private structure to initialize
+ *
+ * We allocate one ring per queue at run-time since we don't know the
+ * number of queues at compile-time.  The polling_netdev array is
+ * intended for Multiqueue, but should work fine with a single queue.
+ **/
+static int ixgbevf_alloc_queues(struct ixgbevf_adapter *adapter)
+{
+       int i;
+
+       adapter->tx_ring = kcalloc(adapter->num_tx_queues,
+                                  sizeof(struct ixgbevf_ring), GFP_KERNEL);
+       if (!adapter->tx_ring)
+               goto err_tx_ring_allocation;
+
+       adapter->rx_ring = kcalloc(adapter->num_rx_queues,
+                                  sizeof(struct ixgbevf_ring), GFP_KERNEL);
+       if (!adapter->rx_ring)
+               goto err_rx_ring_allocation;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               adapter->tx_ring[i].count = adapter->tx_ring_count;
+               adapter->tx_ring[i].queue_index = i;
+               adapter->tx_ring[i].reg_idx = i;
+       }
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               adapter->rx_ring[i].count = adapter->rx_ring_count;
+               adapter->rx_ring[i].queue_index = i;
+               adapter->rx_ring[i].reg_idx = i;
+       }
+
+       return 0;
+
+err_rx_ring_allocation:
+       kfree(adapter->tx_ring);
+err_tx_ring_allocation:
+       return -ENOMEM;
+}
+
+/**
+ * ixgbevf_set_interrupt_capability - set MSI-X or FAIL if not supported
+ * @adapter: board private structure to initialize
+ *
+ * Attempt to configure the interrupts using the best available
+ * capabilities of the hardware and the kernel.
+ **/
+static int ixgbevf_set_interrupt_capability(struct ixgbevf_adapter *adapter)
+{
+       int err = 0;
+       int vector, v_budget;
+
+       /*
+        * It's easy to be greedy for MSI-X vectors, but it really
+        * doesn't do us much good if we have a lot more vectors
+        * than CPU's.  So let's be conservative and only ask for
+        * (roughly) twice the number of vectors as there are CPU's.
+        */
+       v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues,
+                      (int)(num_online_cpus() * 2)) + NON_Q_VECTORS;
+
+       /* A failure in MSI-X entry allocation isn't fatal, but it does
+        * mean we disable MSI-X capabilities of the adapter. */
+       adapter->msix_entries = kcalloc(v_budget,
+                                       sizeof(struct msix_entry), GFP_KERNEL);
+       if (!adapter->msix_entries) {
+               err = -ENOMEM;
+               goto out;
+       }
+
+       for (vector = 0; vector < v_budget; vector++)
+               adapter->msix_entries[vector].entry = vector;
+
+       ixgbevf_acquire_msix_vectors(adapter, v_budget);
+
+out:
+       return err;
+}
+
+/**
+ * ixgbevf_alloc_q_vectors - Allocate memory for interrupt vectors
+ * @adapter: board private structure to initialize
+ *
+ * We allocate one q_vector per queue interrupt.  If allocation fails we
+ * return -ENOMEM.
+ **/
+static int ixgbevf_alloc_q_vectors(struct ixgbevf_adapter *adapter)
+{
+       int q_idx, num_q_vectors;
+       struct ixgbevf_q_vector *q_vector;
+       int napi_vectors;
+       int (*poll)(struct napi_struct *, int);
+
+       num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+       napi_vectors = adapter->num_rx_queues;
+       poll = &ixgbevf_clean_rxonly;
+
+       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
+               q_vector = kzalloc(sizeof(struct ixgbevf_q_vector), GFP_KERNEL);
+               if (!q_vector)
+                       goto err_out;
+               q_vector->adapter = adapter;
+               q_vector->v_idx = q_idx;
+               q_vector->eitr = adapter->eitr_param;
+               if (q_idx < napi_vectors)
+                       netif_napi_add(adapter->netdev, &q_vector->napi,
+                                      (*poll), 64);
+               adapter->q_vector[q_idx] = q_vector;
+       }
+
+       return 0;
+
+err_out:
+       while (q_idx) {
+               q_idx--;
+               q_vector = adapter->q_vector[q_idx];
+               netif_napi_del(&q_vector->napi);
+               kfree(q_vector);
+               adapter->q_vector[q_idx] = NULL;
+       }
+       return -ENOMEM;
+}
+
+/**
+ * ixgbevf_free_q_vectors - Free memory allocated for interrupt vectors
+ * @adapter: board private structure to initialize
+ *
+ * This function frees the memory allocated to the q_vectors.  In addition if
+ * NAPI is enabled it will delete any references to the NAPI struct prior
+ * to freeing the q_vector.
+ **/
+static void ixgbevf_free_q_vectors(struct ixgbevf_adapter *adapter)
+{
+       int q_idx, num_q_vectors;
+       int napi_vectors;
+
+       num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+       napi_vectors = adapter->num_rx_queues;
+
+       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
+               struct ixgbevf_q_vector *q_vector = adapter->q_vector[q_idx];
+
+               adapter->q_vector[q_idx] = NULL;
+               if (q_idx < napi_vectors)
+                       netif_napi_del(&q_vector->napi);
+               kfree(q_vector);
+       }
+}
+
+/**
+ * ixgbevf_reset_interrupt_capability - Reset MSIX setup
+ * @adapter: board private structure
+ *
+ **/
+static void ixgbevf_reset_interrupt_capability(struct ixgbevf_adapter *adapter)
+{
+       pci_disable_msix(adapter->pdev);
+       kfree(adapter->msix_entries);
+       adapter->msix_entries = NULL;
+}
+
+/**
+ * ixgbevf_init_interrupt_scheme - Determine if MSIX is supported and init
+ * @adapter: board private structure to initialize
+ *
+ **/
+static int ixgbevf_init_interrupt_scheme(struct ixgbevf_adapter *adapter)
+{
+       int err;
+
+       /* Number of supported queues */
+       ixgbevf_set_num_queues(adapter);
+
+       err = ixgbevf_set_interrupt_capability(adapter);
+       if (err) {
+               hw_dbg(&adapter->hw,
+                      "Unable to setup interrupt capabilities\n");
+               goto err_set_interrupt;
+       }
+
+       err = ixgbevf_alloc_q_vectors(adapter);
+       if (err) {
+               hw_dbg(&adapter->hw, "Unable to allocate memory for queue "
+                      "vectors\n");
+               goto err_alloc_q_vectors;
+       }
+
+       err = ixgbevf_alloc_queues(adapter);
+       if (err) {
+               printk(KERN_ERR "Unable to allocate memory for queues\n");
+               goto err_alloc_queues;
+       }
+
+       hw_dbg(&adapter->hw, "Multiqueue %s: Rx Queue count = %u, "
+              "Tx Queue count = %u\n",
+              (adapter->num_rx_queues > 1) ? "Enabled" :
+              "Disabled", adapter->num_rx_queues, adapter->num_tx_queues);
+
+       set_bit(__IXGBEVF_DOWN, &adapter->state);
+
+       return 0;
+err_alloc_queues:
+       ixgbevf_free_q_vectors(adapter);
+err_alloc_q_vectors:
+       ixgbevf_reset_interrupt_capability(adapter);
+err_set_interrupt:
+       return err;
+}
+
+/**
+ * ixgbevf_sw_init - Initialize general software structures
+ * (struct ixgbevf_adapter)
+ * @adapter: board private structure to initialize
+ *
+ * ixgbevf_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 __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct pci_dev *pdev = adapter->pdev;
+       int err;
+
+       /* PCI config space info */
+
+       hw->vendor_id = pdev->vendor;
+       hw->device_id = pdev->device;
+       hw->revision_id = pdev->revision;
+       hw->subsystem_vendor_id = pdev->subsystem_vendor;
+       hw->subsystem_device_id = pdev->subsystem_device;
+
+       hw->mbx.ops.init_params(hw);
+       hw->mac.max_tx_queues = MAX_TX_QUEUES;
+       hw->mac.max_rx_queues = MAX_RX_QUEUES;
+       err = hw->mac.ops.reset_hw(hw);
+       if (err) {
+               dev_info(&pdev->dev,
+                        "PF still in reset state, assigning new address\n");
+               dev_hw_addr_random(adapter->netdev, hw->mac.addr);
+       } else {
+               err = hw->mac.ops.init_hw(hw);
+               if (err) {
+                       printk(KERN_ERR "init_shared_code failed: %d\n", err);
+                       goto out;
+               }
+       }
+
+       /* Enable dynamic interrupt throttling rates */
+       adapter->eitr_param = 20000;
+       adapter->itr_setting = 1;
+
+       /* set defaults for eitr in MegaBytes */
+       adapter->eitr_low = 10;
+       adapter->eitr_high = 20;
+
+       /* set default ring sizes */
+       adapter->tx_ring_count = IXGBEVF_DEFAULT_TXD;
+       adapter->rx_ring_count = IXGBEVF_DEFAULT_RXD;
+
+       /* enable rx csum by default */
+       adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
+
+       set_bit(__IXGBEVF_DOWN, &adapter->state);
+
+out:
+       return err;
+}
+
+#define UPDATE_VF_COUNTER_32bit(reg, last_counter, counter)    \
+       {                                                       \
+               u32 current_counter = IXGBE_READ_REG(hw, reg);  \
+               if (current_counter < last_counter)             \
+                       counter += 0x100000000LL;               \
+               last_counter = current_counter;                 \
+               counter &= 0xFFFFFFFF00000000LL;                \
+               counter |= current_counter;                     \
+       }
+
+#define UPDATE_VF_COUNTER_36bit(reg_lsb, reg_msb, last_counter, counter) \
+       {                                                                \
+               u64 current_counter_lsb = IXGBE_READ_REG(hw, reg_lsb);   \
+               u64 current_counter_msb = IXGBE_READ_REG(hw, reg_msb);   \
+               u64 current_counter = (current_counter_msb << 32) |      \
+                       current_counter_lsb;                             \
+               if (current_counter < last_counter)                      \
+                       counter += 0x1000000000LL;                       \
+               last_counter = current_counter;                          \
+               counter &= 0xFFFFFFF000000000LL;                         \
+               counter |= current_counter;                              \
+       }
+/**
+ * ixgbevf_update_stats - Update the board statistics counters.
+ * @adapter: board private structure
+ **/
+void ixgbevf_update_stats(struct ixgbevf_adapter *adapter)
+{
+       struct ixgbe_hw *hw = &adapter->hw;
+
+       UPDATE_VF_COUNTER_32bit(IXGBE_VFGPRC, adapter->stats.last_vfgprc,
+                               adapter->stats.vfgprc);
+       UPDATE_VF_COUNTER_32bit(IXGBE_VFGPTC, adapter->stats.last_vfgptc,
+                               adapter->stats.vfgptc);
+       UPDATE_VF_COUNTER_36bit(IXGBE_VFGORC_LSB, IXGBE_VFGORC_MSB,
+                               adapter->stats.last_vfgorc,
+                               adapter->stats.vfgorc);
+       UPDATE_VF_COUNTER_36bit(IXGBE_VFGOTC_LSB, IXGBE_VFGOTC_MSB,
+                               adapter->stats.last_vfgotc,
+                               adapter->stats.vfgotc);
+       UPDATE_VF_COUNTER_32bit(IXGBE_VFMPRC, adapter->stats.last_vfmprc,
+                               adapter->stats.vfmprc);
+
+       /* Fill out the OS statistics structure */
+       adapter->netdev->stats.multicast = adapter->stats.vfmprc -
+               adapter->stats.base_vfmprc;
+}
+
+/**
+ * ixgbevf_watchdog - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+static void ixgbevf_watchdog(unsigned long data)
+{
+       struct ixgbevf_adapter *adapter = (struct ixgbevf_adapter *)data;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u64 eics = 0;
+       int i;
+
+       /*
+        * Do the watchdog outside of interrupt context due to the lovely
+        * delays that some of the newer hardware requires
+        */
+
+       if (test_bit(__IXGBEVF_DOWN, &adapter->state))
+               goto watchdog_short_circuit;
+
+       /* get one bit for every active tx/rx interrupt vector */
+       for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) {
+               struct ixgbevf_q_vector *qv = adapter->q_vector[i];
+               if (qv->rxr_count || qv->txr_count)
+                       eics |= (1 << i);
+       }
+
+       IXGBE_WRITE_REG(hw, IXGBE_VTEICS, (u32)eics);
+
+watchdog_short_circuit:
+       schedule_work(&adapter->watchdog_task);
+}
+
+/**
+ * ixgbevf_tx_timeout - Respond to a Tx Hang
+ * @netdev: network interface device structure
+ **/
+static void ixgbevf_tx_timeout(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+       /* Do the reset outside of interrupt context */
+       schedule_work(&adapter->reset_task);
+}
+
+static void ixgbevf_reset_task(struct work_struct *work)
+{
+       struct ixgbevf_adapter *adapter;
+       adapter = container_of(work, struct ixgbevf_adapter, reset_task);
+
+       /* If we're already down or resetting, just bail */
+       if (test_bit(__IXGBEVF_DOWN, &adapter->state) ||
+           test_bit(__IXGBEVF_RESETTING, &adapter->state))
+               return;
+
+       adapter->tx_timeout_count++;
+
+       ixgbevf_reinit_locked(adapter);
+}
+
+/**
+ * ixgbevf_watchdog_task - worker thread to bring link up
+ * @work: pointer to work_struct containing our data
+ **/
+static void ixgbevf_watchdog_task(struct work_struct *work)
+{
+       struct ixgbevf_adapter *adapter = container_of(work,
+                                                      struct ixgbevf_adapter,
+                                                      watchdog_task);
+       struct net_device *netdev = adapter->netdev;
+       struct ixgbe_hw *hw = &adapter->hw;
+       u32 link_speed = adapter->link_speed;
+       bool link_up = adapter->link_up;
+
+       adapter->flags |= IXGBE_FLAG_IN_WATCHDOG_TASK;
+
+       /*
+        * Always check the link on the watchdog because we have
+        * no LSC interrupt
+        */
+       if (hw->mac.ops.check_link) {
+               if ((hw->mac.ops.check_link(hw, &link_speed,
+                                           &link_up, false)) != 0) {
+                       adapter->link_up = link_up;
+                       adapter->link_speed = link_speed;
+                       netif_carrier_off(netdev);
+                       netif_tx_stop_all_queues(netdev);
+                       schedule_work(&adapter->reset_task);
+                       goto pf_has_reset;
+               }
+       } else {
+               /* always assume link is up, if no check link
+                * function */
+               link_speed = IXGBE_LINK_SPEED_10GB_FULL;
+               link_up = true;
+       }
+       adapter->link_up = link_up;
+       adapter->link_speed = link_speed;
+
+       if (link_up) {
+               if (!netif_carrier_ok(netdev)) {
+                       hw_dbg(&adapter->hw, "NIC Link is Up, %u Gbps\n",
+                              (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
+                              10 : 1);
+                       netif_carrier_on(netdev);
+                       netif_tx_wake_all_queues(netdev);
+               }
+       } else {
+               adapter->link_up = false;
+               adapter->link_speed = 0;
+               if (netif_carrier_ok(netdev)) {
+                       hw_dbg(&adapter->hw, "NIC Link is Down\n");
+                       netif_carrier_off(netdev);
+                       netif_tx_stop_all_queues(netdev);
+               }
+       }
+
+       ixgbevf_update_stats(adapter);
+
+pf_has_reset:
+       /* Reset the timer */
+       if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
+               mod_timer(&adapter->watchdog_timer,
+                         round_jiffies(jiffies + (2 * HZ)));
+
+       adapter->flags &= ~IXGBE_FLAG_IN_WATCHDOG_TASK;
+}
+
+/**
+ * ixgbevf_free_tx_resources - Free Tx Resources per Queue
+ * @adapter: board private structure
+ * @tx_ring: Tx descriptor ring for a specific queue
+ *
+ * Free all transmit software resources
+ **/
+void ixgbevf_free_tx_resources(struct ixgbevf_adapter *adapter,
+                              struct ixgbevf_ring *tx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+
+       ixgbevf_clean_tx_ring(adapter, tx_ring);
+
+       vfree(tx_ring->tx_buffer_info);
+       tx_ring->tx_buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
+                         tx_ring->dma);
+
+       tx_ring->desc = NULL;
+}
+
+/**
+ * ixgbevf_free_all_tx_resources - Free Tx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all transmit software resources
+ **/
+static void ixgbevf_free_all_tx_resources(struct ixgbevf_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_tx_queues; i++)
+               if (adapter->tx_ring[i].desc)
+                       ixgbevf_free_tx_resources(adapter,
+                                                 &adapter->tx_ring[i]);
+
+}
+
+/**
+ * ixgbevf_setup_tx_resources - allocate Tx resources (Descriptors)
+ * @adapter: board private structure
+ * @tx_ring:    tx descriptor ring (for a specific queue) to setup
+ *
+ * Return 0 on success, negative on failure
+ **/
+int ixgbevf_setup_tx_resources(struct ixgbevf_adapter *adapter,
+                              struct ixgbevf_ring *tx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int size;
+
+       size = sizeof(struct ixgbevf_tx_buffer) * tx_ring->count;
+       tx_ring->tx_buffer_info = vzalloc(size);
+       if (!tx_ring->tx_buffer_info)
+               goto err;
+
+       /* round up to nearest 4K */
+       tx_ring->size = tx_ring->count * sizeof(union ixgbe_adv_tx_desc);
+       tx_ring->size = ALIGN(tx_ring->size, 4096);
+
+       tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
+                                          &tx_ring->dma, GFP_KERNEL);
+       if (!tx_ring->desc)
+               goto err;
+
+       tx_ring->next_to_use = 0;
+       tx_ring->next_to_clean = 0;
+       tx_ring->work_limit = tx_ring->count;
+       return 0;
+
+err:
+       vfree(tx_ring->tx_buffer_info);
+       tx_ring->tx_buffer_info = NULL;
+       hw_dbg(&adapter->hw, "Unable to allocate memory for the transmit "
+              "descriptor ring\n");
+       return -ENOMEM;
+}
+
+/**
+ * ixgbevf_setup_all_tx_resources - allocate all queues Tx resources
+ * @adapter: board private structure
+ *
+ * If this function returns with an error, then it's possible one or
+ * more of the rings is populated (while the rest are not).  It is the
+ * callers duty to clean those orphaned rings.
+ *
+ * Return 0 on success, negative on failure
+ **/
+static int ixgbevf_setup_all_tx_resources(struct ixgbevf_adapter *adapter)
+{
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               err = ixgbevf_setup_tx_resources(adapter, &adapter->tx_ring[i]);
+               if (!err)
+                       continue;
+               hw_dbg(&adapter->hw,
+                      "Allocation for Tx Queue %u failed\n", i);
+               break;
+       }
+
+       return err;
+}
+
+/**
+ * ixgbevf_setup_rx_resources - allocate Rx resources (Descriptors)
+ * @adapter: board private structure
+ * @rx_ring:    rx descriptor ring (for a specific queue) to setup
+ *
+ * Returns 0 on success, negative on failure
+ **/
+int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
+                              struct ixgbevf_ring *rx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       int size;
+
+       size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count;
+       rx_ring->rx_buffer_info = vzalloc(size);
+       if (!rx_ring->rx_buffer_info) {
+               hw_dbg(&adapter->hw,
+                      "Unable to vmalloc buffer memory for "
+                      "the receive descriptor ring\n");
+               goto alloc_failed;
+       }
+
+       /* Round up to nearest 4K */
+       rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
+       rx_ring->size = ALIGN(rx_ring->size, 4096);
+
+       rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
+                                          &rx_ring->dma, GFP_KERNEL);
+
+       if (!rx_ring->desc) {
+               hw_dbg(&adapter->hw,
+                      "Unable to allocate memory for "
+                      "the receive descriptor ring\n");
+               vfree(rx_ring->rx_buffer_info);
+               rx_ring->rx_buffer_info = NULL;
+               goto alloc_failed;
+       }
+
+       rx_ring->next_to_clean = 0;
+       rx_ring->next_to_use = 0;
+
+       return 0;
+alloc_failed:
+       return -ENOMEM;
+}
+
+/**
+ * ixgbevf_setup_all_rx_resources - allocate all queues Rx resources
+ * @adapter: board private structure
+ *
+ * If this function returns with an error, then it's possible one or
+ * more of the rings is populated (while the rest are not).  It is the
+ * callers duty to clean those orphaned rings.
+ *
+ * Return 0 on success, negative on failure
+ **/
+static int ixgbevf_setup_all_rx_resources(struct ixgbevf_adapter *adapter)
+{
+       int i, err = 0;
+
+       for (i = 0; i < adapter->num_rx_queues; i++) {
+               err = ixgbevf_setup_rx_resources(adapter, &adapter->rx_ring[i]);
+               if (!err)
+                       continue;
+               hw_dbg(&adapter->hw,
+                      "Allocation for Rx Queue %u failed\n", i);
+               break;
+       }
+       return err;
+}
+
+/**
+ * ixgbevf_free_rx_resources - Free Rx Resources
+ * @adapter: board private structure
+ * @rx_ring: ring to clean the resources from
+ *
+ * Free all receive software resources
+ **/
+void ixgbevf_free_rx_resources(struct ixgbevf_adapter *adapter,
+                              struct ixgbevf_ring *rx_ring)
+{
+       struct pci_dev *pdev = adapter->pdev;
+
+       ixgbevf_clean_rx_ring(adapter, rx_ring);
+
+       vfree(rx_ring->rx_buffer_info);
+       rx_ring->rx_buffer_info = NULL;
+
+       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
+                         rx_ring->dma);
+
+       rx_ring->desc = NULL;
+}
+
+/**
+ * ixgbevf_free_all_rx_resources - Free Rx Resources for All Queues
+ * @adapter: board private structure
+ *
+ * Free all receive software resources
+ **/
+static void ixgbevf_free_all_rx_resources(struct ixgbevf_adapter *adapter)
+{
+       int i;
+
+       for (i = 0; i < adapter->num_rx_queues; i++)
+               if (adapter->rx_ring[i].desc)
+                       ixgbevf_free_rx_resources(adapter,
+                                                 &adapter->rx_ring[i]);
+}
+
+/**
+ * ixgbevf_open - Called when a network interface is made active
+ * @netdev: network interface device structure
+ *
+ * Returns 0 on success, negative value on failure
+ *
+ * The open entry point is called when a network interface is made
+ * active by the system (IFF_UP).  At this point all resources needed
+ * for transmit and receive operations are allocated, the interrupt
+ * handler is registered with the OS, the watchdog timer is started,
+ * and the stack is notified that the interface is ready.
+ **/
+static int ixgbevf_open(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       int err;
+
+       /* disallow open during test */
+       if (test_bit(__IXGBEVF_TESTING, &adapter->state))
+               return -EBUSY;
+
+       if (hw->adapter_stopped) {
+               ixgbevf_reset(adapter);
+               /* if adapter is still stopped then PF isn't up and
+                * the vf can't start. */
+               if (hw->adapter_stopped) {
+                       err = IXGBE_ERR_MBX;
+                       printk(KERN_ERR "Unable to start - perhaps the PF"
+                              " Driver isn't up yet\n");
+                       goto err_setup_reset;
+               }
+       }
+
+       /* allocate transmit descriptors */
+       err = ixgbevf_setup_all_tx_resources(adapter);
+       if (err)
+               goto err_setup_tx;
+
+       /* allocate receive descriptors */
+       err = ixgbevf_setup_all_rx_resources(adapter);
+       if (err)
+               goto err_setup_rx;
+
+       ixgbevf_configure(adapter);
+
+       /*
+        * Map the Tx/Rx rings to the vectors we were allotted.
+        * if request_irq will be called in this function map_rings
+        * must be called *before* up_complete
+        */
+       ixgbevf_map_rings_to_vectors(adapter);
+
+       err = ixgbevf_up_complete(adapter);
+       if (err)
+               goto err_up;
+
+       /* clear any pending interrupts, may auto mask */
+       IXGBE_READ_REG(hw, IXGBE_VTEICR);
+       err = ixgbevf_request_irq(adapter);
+       if (err)
+               goto err_req_irq;
+
+       ixgbevf_irq_enable(adapter, true, true);
+
+       return 0;
+
+err_req_irq:
+       ixgbevf_down(adapter);
+err_up:
+       ixgbevf_free_irq(adapter);
+err_setup_rx:
+       ixgbevf_free_all_rx_resources(adapter);
+err_setup_tx:
+       ixgbevf_free_all_tx_resources(adapter);
+       ixgbevf_reset(adapter);
+
+err_setup_reset:
+
+       return err;
+}
+
+/**
+ * ixgbevf_close - Disables a network interface
+ * @netdev: network interface device structure
+ *
+ * Returns 0, this is not allowed to fail
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ **/
+static int ixgbevf_close(struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+       ixgbevf_down(adapter);
+       ixgbevf_free_irq(adapter);
+
+       ixgbevf_free_all_tx_resources(adapter);
+       ixgbevf_free_all_rx_resources(adapter);
+
+       return 0;
+}
+
+static int ixgbevf_tso(struct ixgbevf_adapter *adapter,
+                      struct ixgbevf_ring *tx_ring,
+                      struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
+{
+       struct ixgbe_adv_tx_context_desc *context_desc;
+       unsigned int i;
+       int err;
+       struct ixgbevf_tx_buffer *tx_buffer_info;
+       u32 vlan_macip_lens = 0, type_tucmd_mlhl;
+       u32 mss_l4len_idx, l4len;
+
+       if (skb_is_gso(skb)) {
+               if (skb_header_cloned(skb)) {
+                       err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+                       if (err)
+                               return err;
+               }
+               l4len = tcp_hdrlen(skb);
+               *hdr_len += l4len;
+
+               if (skb->protocol == htons(ETH_P_IP)) {
+                       struct iphdr *iph = ip_hdr(skb);
+                       iph->tot_len = 0;
+                       iph->check = 0;
+                       tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
+                                                                iph->daddr, 0,
+                                                                IPPROTO_TCP,
+                                                                0);
+                       adapter->hw_tso_ctxt++;
+               } else if (skb_is_gso_v6(skb)) {
+                       ipv6_hdr(skb)->payload_len = 0;
+                       tcp_hdr(skb)->check =
+                           ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                            &ipv6_hdr(skb)->daddr,
+                                            0, IPPROTO_TCP, 0);
+                       adapter->hw_tso6_ctxt++;
+               }
+
+               i = tx_ring->next_to_use;
+
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               context_desc = IXGBE_TX_CTXTDESC_ADV(*tx_ring, i);
+
+               /* VLAN MACLEN IPLEN */
+               if (tx_flags & IXGBE_TX_FLAGS_VLAN)
+                       vlan_macip_lens |=
+                               (tx_flags & IXGBE_TX_FLAGS_VLAN_MASK);
+               vlan_macip_lens |= ((skb_network_offset(skb)) <<
+                                   IXGBE_ADVTXD_MACLEN_SHIFT);
+               *hdr_len += skb_network_offset(skb);
+               vlan_macip_lens |=
+                       (skb_transport_header(skb) - skb_network_header(skb));
+               *hdr_len +=
+                       (skb_transport_header(skb) - skb_network_header(skb));
+               context_desc->vlan_macip_lens = cpu_to_le32(vlan_macip_lens);
+               context_desc->seqnum_seed = 0;
+
+               /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
+               type_tucmd_mlhl = (IXGBE_TXD_CMD_DEXT |
+                                   IXGBE_ADVTXD_DTYP_CTXT);
+
+               if (skb->protocol == htons(ETH_P_IP))
+                       type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
+               type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
+               context_desc->type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);
+
+               /* MSS L4LEN IDX */
+               mss_l4len_idx =
+                       (skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT);
+               mss_l4len_idx |= (l4len << IXGBE_ADVTXD_L4LEN_SHIFT);
+               /* use index 1 for TSO */
+               mss_l4len_idx |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
+               context_desc->mss_l4len_idx = cpu_to_le32(mss_l4len_idx);
+
+               tx_buffer_info->time_stamp = jiffies;
+               tx_buffer_info->next_to_watch = i;
+
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+               tx_ring->next_to_use = i;
+
+               return true;
+       }
+
+       return false;
+}
+
+static bool ixgbevf_tx_csum(struct ixgbevf_adapter *adapter,
+                           struct ixgbevf_ring *tx_ring,
+                           struct sk_buff *skb, u32 tx_flags)
+{
+       struct ixgbe_adv_tx_context_desc *context_desc;
+       unsigned int i;
+       struct ixgbevf_tx_buffer *tx_buffer_info;
+       u32 vlan_macip_lens = 0, type_tucmd_mlhl = 0;
+
+       if (skb->ip_summed == CHECKSUM_PARTIAL ||
+           (tx_flags & IXGBE_TX_FLAGS_VLAN)) {
+               i = tx_ring->next_to_use;
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               context_desc = IXGBE_TX_CTXTDESC_ADV(*tx_ring, i);
+
+               if (tx_flags & IXGBE_TX_FLAGS_VLAN)
+                       vlan_macip_lens |= (tx_flags &
+                                           IXGBE_TX_FLAGS_VLAN_MASK);
+               vlan_macip_lens |= (skb_network_offset(skb) <<
+                                   IXGBE_ADVTXD_MACLEN_SHIFT);
+               if (skb->ip_summed == CHECKSUM_PARTIAL)
+                       vlan_macip_lens |= (skb_transport_header(skb) -
+                                           skb_network_header(skb));
+
+               context_desc->vlan_macip_lens = cpu_to_le32(vlan_macip_lens);
+               context_desc->seqnum_seed = 0;
+
+               type_tucmd_mlhl |= (IXGBE_TXD_CMD_DEXT |
+                                   IXGBE_ADVTXD_DTYP_CTXT);
+
+               if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                       switch (skb->protocol) {
+                       case __constant_htons(ETH_P_IP):
+                               type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
+                               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                                       type_tucmd_mlhl |=
+                                           IXGBE_ADVTXD_TUCMD_L4T_TCP;
+                               break;
+                       case __constant_htons(ETH_P_IPV6):
+                               /* XXX what about other V6 headers?? */
+                               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                                       type_tucmd_mlhl |=
+                                               IXGBE_ADVTXD_TUCMD_L4T_TCP;
+                               break;
+                       default:
+                               if (unlikely(net_ratelimit())) {
+                                       printk(KERN_WARNING
+                                              "partial checksum but "
+                                              "proto=%x!\n",
+                                              skb->protocol);
+                               }
+                               break;
+                       }
+               }
+
+               context_desc->type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);
+               /* use index zero for tx checksum offload */
+               context_desc->mss_l4len_idx = 0;
+
+               tx_buffer_info->time_stamp = jiffies;
+               tx_buffer_info->next_to_watch = i;
+
+               adapter->hw_csum_tx_good++;
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+               tx_ring->next_to_use = i;
+
+               return true;
+       }
+
+       return false;
+}
+
+static int ixgbevf_tx_map(struct ixgbevf_adapter *adapter,
+                         struct ixgbevf_ring *tx_ring,
+                         struct sk_buff *skb, u32 tx_flags,
+                         unsigned int first)
+{
+       struct pci_dev *pdev = adapter->pdev;
+       struct ixgbevf_tx_buffer *tx_buffer_info;
+       unsigned int len;
+       unsigned int total = skb->len;
+       unsigned int offset = 0, size;
+       int count = 0;
+       unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
+       unsigned int f;
+       int i;
+
+       i = tx_ring->next_to_use;
+
+       len = min(skb_headlen(skb), total);
+       while (len) {
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               size = min(len, (unsigned int)IXGBE_MAX_DATA_PER_TXD);
+
+               tx_buffer_info->length = size;
+               tx_buffer_info->mapped_as_page = false;
+               tx_buffer_info->dma = dma_map_single(&adapter->pdev->dev,
+                                                    skb->data + offset,
+                                                    size, DMA_TO_DEVICE);
+               if (dma_mapping_error(&pdev->dev, tx_buffer_info->dma))
+                       goto dma_error;
+               tx_buffer_info->time_stamp = jiffies;
+               tx_buffer_info->next_to_watch = i;
+
+               len -= size;
+               total -= size;
+               offset += size;
+               count++;
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+       }
+
+       for (f = 0; f < nr_frags; f++) {
+               struct skb_frag_struct *frag;
+
+               frag = &skb_shinfo(skb)->frags[f];
+               len = min((unsigned int)frag->size, total);
+               offset = frag->page_offset;
+
+               while (len) {
+                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
+                       size = min(len, (unsigned int)IXGBE_MAX_DATA_PER_TXD);
+
+                       tx_buffer_info->length = size;
+                       tx_buffer_info->dma = dma_map_page(&adapter->pdev->dev,
+                                                          frag->page,
+                                                          offset,
+                                                          size,
+                                                          DMA_TO_DEVICE);
+                       tx_buffer_info->mapped_as_page = true;
+                       if (dma_mapping_error(&pdev->dev, tx_buffer_info->dma))
+                               goto dma_error;
+                       tx_buffer_info->time_stamp = jiffies;
+                       tx_buffer_info->next_to_watch = i;
+
+                       len -= size;
+                       total -= size;
+                       offset += size;
+                       count++;
+                       i++;
+                       if (i == tx_ring->count)
+                               i = 0;
+               }
+               if (total == 0)
+                       break;
+       }
+
+       if (i == 0)
+               i = tx_ring->count - 1;
+       else
+               i = i - 1;
+       tx_ring->tx_buffer_info[i].skb = skb;
+       tx_ring->tx_buffer_info[first].next_to_watch = i;
+
+       return count;
+
+dma_error:
+       dev_err(&pdev->dev, "TX DMA map failed\n");
+
+       /* clear timestamp and dma mappings for failed tx_buffer_info map */
+       tx_buffer_info->dma = 0;
+       tx_buffer_info->time_stamp = 0;
+       tx_buffer_info->next_to_watch = 0;
+       count--;
+
+       /* clear timestamp and dma mappings for remaining portion of packet */
+       while (count >= 0) {
+               count--;
+               i--;
+               if (i < 0)
+                       i += tx_ring->count;
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               ixgbevf_unmap_and_free_tx_resource(adapter, tx_buffer_info);
+       }
+
+       return count;
+}
+
+static void ixgbevf_tx_queue(struct ixgbevf_adapter *adapter,
+                            struct ixgbevf_ring *tx_ring, int tx_flags,
+                            int count, u32 paylen, u8 hdr_len)
+{
+       union ixgbe_adv_tx_desc *tx_desc = NULL;
+       struct ixgbevf_tx_buffer *tx_buffer_info;
+       u32 olinfo_status = 0, cmd_type_len = 0;
+       unsigned int i;
+
+       u32 txd_cmd = IXGBE_TXD_CMD_EOP | IXGBE_TXD_CMD_RS | IXGBE_TXD_CMD_IFCS;
+
+       cmd_type_len |= IXGBE_ADVTXD_DTYP_DATA;
+
+       cmd_type_len |= IXGBE_ADVTXD_DCMD_IFCS | IXGBE_ADVTXD_DCMD_DEXT;
+
+       if (tx_flags & IXGBE_TX_FLAGS_VLAN)
+               cmd_type_len |= IXGBE_ADVTXD_DCMD_VLE;
+
+       if (tx_flags & IXGBE_TX_FLAGS_TSO) {
+               cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
+
+               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
+                       IXGBE_ADVTXD_POPTS_SHIFT;
+
+               /* use index 1 context for tso */
+               olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
+               if (tx_flags & IXGBE_TX_FLAGS_IPV4)
+                       olinfo_status |= IXGBE_TXD_POPTS_IXSM <<
+                               IXGBE_ADVTXD_POPTS_SHIFT;
+
+       } else if (tx_flags & IXGBE_TX_FLAGS_CSUM)
+               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
+                       IXGBE_ADVTXD_POPTS_SHIFT;
+
+       olinfo_status |= ((paylen - hdr_len) << IXGBE_ADVTXD_PAYLEN_SHIFT);
+
+       i = tx_ring->next_to_use;
+       while (count--) {
+               tx_buffer_info = &tx_ring->tx_buffer_info[i];
+               tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, i);
+               tx_desc->read.buffer_addr = cpu_to_le64(tx_buffer_info->dma);
+               tx_desc->read.cmd_type_len =
+                       cpu_to_le32(cmd_type_len | tx_buffer_info->length);
+               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
+               i++;
+               if (i == tx_ring->count)
+                       i = 0;
+       }
+
+       tx_desc->read.cmd_type_len |= cpu_to_le32(txd_cmd);
+
+       /*
+        * Force memory writes to complete before letting h/w
+        * know there are new descriptors to fetch.  (Only
+        * applicable for weak-ordered memory model archs,
+        * such as IA-64).
+        */
+       wmb();
+
+       tx_ring->next_to_use = i;
+       writel(i, adapter->hw.hw_addr + tx_ring->tail);
+}
+
+static int __ixgbevf_maybe_stop_tx(struct net_device *netdev,
+                                  struct ixgbevf_ring *tx_ring, int size)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+       netif_stop_subqueue(netdev, tx_ring->queue_index);
+       /* Herbert's original patch had:
+        *  smp_mb__after_netif_stop_queue();
+        * but since that doesn't exist yet, just open code it. */
+       smp_mb();
+
+       /* We need to check again in a case another CPU has just
+        * made room available. */
+       if (likely(IXGBE_DESC_UNUSED(tx_ring) < size))
+               return -EBUSY;
+
+       /* A reprieve! - use start_queue because it doesn't call schedule */
+       netif_start_subqueue(netdev, tx_ring->queue_index);
+       ++adapter->restart_queue;
+       return 0;
+}
+
+static int ixgbevf_maybe_stop_tx(struct net_device *netdev,
+                                struct ixgbevf_ring *tx_ring, int size)
+{
+       if (likely(IXGBE_DESC_UNUSED(tx_ring) >= size))
+               return 0;
+       return __ixgbevf_maybe_stop_tx(netdev, tx_ring, size);
+}
+
+static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbevf_ring *tx_ring;
+       unsigned int first;
+       unsigned int tx_flags = 0;
+       u8 hdr_len = 0;
+       int r_idx = 0, tso;
+       int count = 0;
+
+       unsigned int f;
+
+       tx_ring = &adapter->tx_ring[r_idx];
+
+       if (vlan_tx_tag_present(skb)) {
+               tx_flags |= vlan_tx_tag_get(skb);
+               tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
+               tx_flags |= IXGBE_TX_FLAGS_VLAN;
+       }
+
+       /* four things can cause us to need a context descriptor */
+       if (skb_is_gso(skb) ||
+           (skb->ip_summed == CHECKSUM_PARTIAL) ||
+           (tx_flags & IXGBE_TX_FLAGS_VLAN))
+               count++;
+
+       count += TXD_USE_COUNT(skb_headlen(skb));
+       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
+               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);
+
+       if (ixgbevf_maybe_stop_tx(netdev, tx_ring, count)) {
+               adapter->tx_busy++;
+               return NETDEV_TX_BUSY;
+       }
+
+       first = tx_ring->next_to_use;
+
+       if (skb->protocol == htons(ETH_P_IP))
+               tx_flags |= IXGBE_TX_FLAGS_IPV4;
+       tso = ixgbevf_tso(adapter, tx_ring, skb, tx_flags, &hdr_len);
+       if (tso < 0) {
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
+       }
+
+       if (tso)
+               tx_flags |= IXGBE_TX_FLAGS_TSO;
+       else if (ixgbevf_tx_csum(adapter, tx_ring, skb, tx_flags) &&
+                (skb->ip_summed == CHECKSUM_PARTIAL))
+               tx_flags |= IXGBE_TX_FLAGS_CSUM;
+
+       ixgbevf_tx_queue(adapter, tx_ring, tx_flags,
+                        ixgbevf_tx_map(adapter, tx_ring, skb, tx_flags, first),
+                        skb->len, hdr_len);
+
+       ixgbevf_maybe_stop_tx(netdev, tx_ring, DESC_NEEDED);
+
+       return NETDEV_TX_OK;
+}
+
+/**
+ * ixgbevf_set_mac - Change the Ethernet Address of the NIC
+ * @netdev: network interface device structure
+ * @p: pointer to an address structure
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int ixgbevf_set_mac(struct net_device *netdev, void *p)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       struct sockaddr *addr = p;
+
+       if (!is_valid_ether_addr(addr->sa_data))
+               return -EADDRNOTAVAIL;
+
+       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
+
+       if (hw->mac.ops.set_rar)
+               hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0);
+
+       return 0;
+}
+
+/**
+ * ixgbevf_change_mtu - Change the Maximum Transfer Unit
+ * @netdev: network interface device structure
+ * @new_mtu: new value for maximum frame size
+ *
+ * Returns 0 on success, negative on failure
+ **/
+static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
+{
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+       struct ixgbe_hw *hw = &adapter->hw;
+       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+       int max_possible_frame = MAXIMUM_ETHERNET_VLAN_SIZE;
+       u32 msg[2];
+
+       if (adapter->hw.mac.type == ixgbe_mac_X540_vf)
+               max_possible_frame = IXGBE_MAX_JUMBO_FRAME_SIZE;
+
+       /* MTU < 68 is an error and causes problems on some kernels */
+       if ((new_mtu < 68) || (max_frame > max_possible_frame))
+               return -EINVAL;
+
+       hw_dbg(&adapter->hw, "changing MTU from %d to %d\n",
+              netdev->mtu, new_mtu);
+       /* must set new MTU before calling down or up */
+       netdev->mtu = new_mtu;
+
+       msg[0] = IXGBE_VF_SET_LPE;
+       msg[1] = max_frame;
+       hw->mbx.ops.write_posted(hw, msg, 2);
+
+       if (netif_running(netdev))
+               ixgbevf_reinit_locked(adapter);
+
+       return 0;
+}
+
+static void ixgbevf_shutdown(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+       netif_device_detach(netdev);
+
+       if (netif_running(netdev)) {
+               ixgbevf_down(adapter);
+               ixgbevf_free_irq(adapter);
+               ixgbevf_free_all_tx_resources(adapter);
+               ixgbevf_free_all_rx_resources(adapter);
+       }
+
+#ifdef CONFIG_PM
+       pci_save_state(pdev);
+#endif
+
+       pci_disable_device(pdev);
+}
+
+static const struct net_device_ops ixgbe_netdev_ops = {
+       .ndo_open               = ixgbevf_open,
+       .ndo_stop               = ixgbevf_close,
+       .ndo_start_xmit         = ixgbevf_xmit_frame,
+       .ndo_set_rx_mode        = ixgbevf_set_rx_mode,
+       .ndo_set_multicast_list = ixgbevf_set_rx_mode,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = ixgbevf_set_mac,
+       .ndo_change_mtu         = ixgbevf_change_mtu,
+       .ndo_tx_timeout         = ixgbevf_tx_timeout,
+       .ndo_vlan_rx_add_vid    = ixgbevf_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = ixgbevf_vlan_rx_kill_vid,
+};
+
+static void ixgbevf_assign_netdev_ops(struct net_device *dev)
+{
+       dev->netdev_ops = &ixgbe_netdev_ops;
+       ixgbevf_set_ethtool_ops(dev);
+       dev->watchdog_timeo = 5 * HZ;
+}
+
+/**
+ * ixgbevf_probe - Device Initialization Routine
+ * @pdev: PCI device information struct
+ * @ent: entry in ixgbevf_pci_tbl
+ *
+ * Returns 0 on success, negative on failure
+ *
+ * ixgbevf_probe initializes an adapter identified by a pci_dev structure.
+ * The OS initialization, configuring of the adapter private structure,
+ * and a hardware reset occur.
+ **/
+static int __devinit ixgbevf_probe(struct pci_dev *pdev,
+                                  const struct pci_device_id *ent)
+{
+       struct net_device *netdev;
+       struct ixgbevf_adapter *adapter = NULL;
+       struct ixgbe_hw *hw = NULL;
+       const struct ixgbevf_info *ii = ixgbevf_info_tbl[ent->driver_data];
+       static int cards_found;
+       int err, pci_using_dac;
+
+       err = pci_enable_device(pdev);
+       if (err)
+               return err;
+
+       if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
+           !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+               pci_using_dac = 1;
+       } else {
+               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+               if (err) {
+                       err = dma_set_coherent_mask(&pdev->dev,
+                                                   DMA_BIT_MASK(32));
+                       if (err) {
+                               dev_err(&pdev->dev, "No usable DMA "
+                                       "configuration, aborting\n");
+                               goto err_dma;
+                       }
+               }
+               pci_using_dac = 0;
+       }
+
+       err = pci_request_regions(pdev, ixgbevf_driver_name);
+       if (err) {
+               dev_err(&pdev->dev, "pci_request_regions failed 0x%x\n", err);
+               goto err_pci_reg;
+       }
+
+       pci_set_master(pdev);
+
+#ifdef HAVE_TX_MQ
+       netdev = alloc_etherdev_mq(sizeof(struct ixgbevf_adapter),
+                                  MAX_TX_QUEUES);
+#else
+       netdev = alloc_etherdev(sizeof(struct ixgbevf_adapter));
+#endif
+       if (!netdev) {
+               err = -ENOMEM;
+               goto err_alloc_etherdev;
+       }
+
+       SET_NETDEV_DEV(netdev, &pdev->dev);
+
+       pci_set_drvdata(pdev, netdev);
+       adapter = netdev_priv(netdev);
+
+       adapter->netdev = netdev;
+       adapter->pdev = pdev;
+       hw = &adapter->hw;
+       hw->back = adapter;
+       adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;
+
+       /*
+        * call save state here in standalone driver because it relies on
+        * adapter struct to exist, and needs to call netdev_priv
+        */
+       pci_save_state(pdev);
+
+       hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
+                             pci_resource_len(pdev, 0));
+       if (!hw->hw_addr) {
+               err = -EIO;
+               goto err_ioremap;
+       }
+
+       ixgbevf_assign_netdev_ops(netdev);
+
+       adapter->bd_number = cards_found;
+
+       /* Setup hw api */
+       memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
+       hw->mac.type  = ii->mac;
+
+       memcpy(&hw->mbx.ops, &ixgbevf_mbx_ops,
+              sizeof(struct ixgbe_mbx_operations));
+
+       adapter->flags &= ~IXGBE_FLAG_RX_PS_CAPABLE;
+       adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+       adapter->flags |= IXGBE_FLAG_RX_1BUF_CAPABLE;
+
+       /* setup the private structure */
+       err = ixgbevf_sw_init(adapter);
+
+       netdev->features = NETIF_F_SG |
+                          NETIF_F_IP_CSUM |
+                          NETIF_F_HW_VLAN_TX |
+                          NETIF_F_HW_VLAN_RX |
+                          NETIF_F_HW_VLAN_FILTER;
+
+       netdev->features |= NETIF_F_IPV6_CSUM;
+       netdev->features |= NETIF_F_TSO;
+       netdev->features |= NETIF_F_TSO6;
+       netdev->features |= NETIF_F_GRO;
+       netdev->vlan_features |= NETIF_F_TSO;
+       netdev->vlan_features |= NETIF_F_TSO6;
+       netdev->vlan_features |= NETIF_F_IP_CSUM;
+       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
+       netdev->vlan_features |= NETIF_F_SG;
+
+       if (pci_using_dac)
+               netdev->features |= NETIF_F_HIGHDMA;
+
+       /* The HW MAC address was set and/or determined in sw_init */
+       memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
+       memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
+
+       if (!is_valid_ether_addr(netdev->dev_addr)) {
+               printk(KERN_ERR "invalid MAC address\n");
+               err = -EIO;
+               goto err_sw_init;
+       }
+
+       init_timer(&adapter->watchdog_timer);
+       adapter->watchdog_timer.function = ixgbevf_watchdog;
+       adapter->watchdog_timer.data = (unsigned long)adapter;
+
+       INIT_WORK(&adapter->reset_task, ixgbevf_reset_task);
+       INIT_WORK(&adapter->watchdog_task, ixgbevf_watchdog_task);
+
+       err = ixgbevf_init_interrupt_scheme(adapter);
+       if (err)
+               goto err_sw_init;
+
+       /* pick up the PCI bus settings for reporting later */
+       if (hw->mac.ops.get_bus_info)
+               hw->mac.ops.get_bus_info(hw);
+
+       strcpy(netdev->name, "eth%d");
+
+       err = register_netdev(netdev);
+       if (err)
+               goto err_register;
+
+       adapter->netdev_registered = true;
+
+       netif_carrier_off(netdev);
+
+       ixgbevf_init_last_counter_stats(adapter);
+
+       /* print the MAC address */
+       hw_dbg(hw, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
+              netdev->dev_addr[0],
+              netdev->dev_addr[1],
+              netdev->dev_addr[2],
+              netdev->dev_addr[3],
+              netdev->dev_addr[4],
+              netdev->dev_addr[5]);
+
+       hw_dbg(hw, "MAC: %d\n", hw->mac.type);
+
+       hw_dbg(hw, "LRO is disabled\n");
+
+       hw_dbg(hw, "Intel(R) 82599 Virtual Function\n");
+       cards_found++;
+       return 0;
+
+err_register:
+err_sw_init:
+       ixgbevf_reset_interrupt_capability(adapter);
+       iounmap(hw->hw_addr);
+err_ioremap:
+       free_netdev(netdev);
+err_alloc_etherdev:
+       pci_release_regions(pdev);
+err_pci_reg:
+err_dma:
+       pci_disable_device(pdev);
+       return err;
+}
+
+/**
+ * ixgbevf_remove - Device Removal Routine
+ * @pdev: PCI device information struct
+ *
+ * ixgbevf_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.  The could be caused by a
+ * Hot-Plug event, or because the driver is going to be removed from
+ * memory.
+ **/
+static void __devexit ixgbevf_remove(struct pci_dev *pdev)
+{
+       struct net_device *netdev = pci_get_drvdata(pdev);
+       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+       set_bit(__IXGBEVF_DOWN, &adapter->state);
+
+       del_timer_sync(&adapter->watchdog_timer);
+
+       cancel_work_sync(&adapter->reset_task);
+       cancel_work_sync(&adapter->watchdog_task);
+
+       if (adapter->netdev_registered) {
+               unregister_netdev(netdev);
+               adapter->netdev_registered = false;
+       }
+
+       ixgbevf_reset_interrupt_capability(adapter);
+
+       iounmap(adapter->hw.hw_addr);
+       pci_release_regions(pdev);
+
+       hw_dbg(&adapter->hw, "Remove complete\n");
+
+       kfree(adapter->tx_ring);
+       kfree(adapter->rx_ring);
+
+       free_netdev(netdev);
+
+       pci_disable_device(pdev);
+}
+
+static struct pci_driver ixgbevf_driver = {
+       .name     = ixgbevf_driver_name,
+       .id_table = ixgbevf_pci_tbl,
+       .probe    = ixgbevf_probe,
+       .remove   = __devexit_p(ixgbevf_remove),
+       .shutdown = ixgbevf_shutdown,
+};
+
+/**
+ * ixgbevf_init_module - Driver Registration Routine
+ *
+ * ixgbevf_init_module is the first routine called when the driver is
+ * loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init ixgbevf_init_module(void)
+{
+       int ret;
+       printk(KERN_INFO "ixgbevf: %s - version %s\n", ixgbevf_driver_string,
+              ixgbevf_driver_version);
+
+       printk(KERN_INFO "%s\n", ixgbevf_copyright);
+
+       ret = pci_register_driver(&ixgbevf_driver);
+       return ret;
+}
+
+module_init(ixgbevf_init_module);
+
+/**
+ * ixgbevf_exit_module - Driver Exit Cleanup Routine
+ *
+ * ixgbevf_exit_module is called just before the driver is removed
+ * from memory.
+ **/
+static void __exit ixgbevf_exit_module(void)
+{
+       pci_unregister_driver(&ixgbevf_driver);
+}
+
+#ifdef DEBUG
+/**
+ * ixgbevf_get_hw_dev_name - return device name string
+ * used by hardware layer to print debugging information
+ **/
+char *ixgbevf_get_hw_dev_name(struct ixgbe_hw *hw)
+{
+       struct ixgbevf_adapter *adapter = hw->back;
+       return adapter->netdev->name;
+}
+
+#endif
+module_exit(ixgbevf_exit_module);
+
+/* ixgbevf_main.c */
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c
new file mode 100644 (file)
index 0000000..7a88331
--- /dev/null
@@ -0,0 +1,341 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#include "mbx.h"
+
+/**
+ *  ixgbevf_poll_for_msg - Wait for message notification
+ *  @hw: pointer to the HW structure
+ *
+ *  returns 0 if it successfully received a message notification
+ **/
+static s32 ixgbevf_poll_for_msg(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       while (countdown && mbx->ops.check_for_msg(hw)) {
+               countdown--;
+               udelay(mbx->udelay);
+       }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
+
+       return countdown ? 0 : IXGBE_ERR_MBX;
+}
+
+/**
+ *  ixgbevf_poll_for_ack - Wait for message acknowledgement
+ *  @hw: pointer to the HW structure
+ *
+ *  returns 0 if it successfully received a message acknowledgement
+ **/
+static s32 ixgbevf_poll_for_ack(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       int countdown = mbx->timeout;
+
+       while (countdown && mbx->ops.check_for_ack(hw)) {
+               countdown--;
+               udelay(mbx->udelay);
+       }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
+
+       return countdown ? 0 : IXGBE_ERR_MBX;
+}
+
+/**
+ *  ixgbevf_read_posted_mbx - Wait for message notification and receive message
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns 0 if it successfully received a message notification and
+ *  copied it into the receive buffer.
+ **/
+static s32 ixgbevf_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       ret_val = ixgbevf_poll_for_msg(hw);
+
+       /* if ack received read message, otherwise we timed out */
+       if (!ret_val)
+               ret_val = mbx->ops.read(hw, msg, size);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_write_posted_mbx - Write a message to the mailbox, wait for ack
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns 0 if it successfully copied message into the buffer and
+ *  received an ack to that message within delay * timeout period
+ **/
+static s32 ixgbevf_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       s32 ret_val;
+
+       /* send msg */
+       ret_val = mbx->ops.write(hw, msg, size);
+
+       /* if msg sent wait until we receive an ack */
+       if (!ret_val)
+               ret_val = ixgbevf_poll_for_ack(hw);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_read_v2p_mailbox - read v2p mailbox
+ *  @hw: pointer to the HW structure
+ *
+ *  This function is used to read the v2p mailbox without losing the read to
+ *  clear status bits.
+ **/
+static u32 ixgbevf_read_v2p_mailbox(struct ixgbe_hw *hw)
+{
+       u32 v2p_mailbox = IXGBE_READ_REG(hw, IXGBE_VFMAILBOX);
+
+       v2p_mailbox |= hw->mbx.v2p_mailbox;
+       hw->mbx.v2p_mailbox |= v2p_mailbox & IXGBE_VFMAILBOX_R2C_BITS;
+
+       return v2p_mailbox;
+}
+
+/**
+ *  ixgbevf_check_for_bit_vf - Determine if a status bit was set
+ *  @hw: pointer to the HW structure
+ *  @mask: bitmask for bits to be tested and cleared
+ *
+ *  This function is used to check for the read to clear bits within
+ *  the V2P mailbox.
+ **/
+static s32 ixgbevf_check_for_bit_vf(struct ixgbe_hw *hw, u32 mask)
+{
+       u32 v2p_mailbox = ixgbevf_read_v2p_mailbox(hw);
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (v2p_mailbox & mask)
+               ret_val = 0;
+
+       hw->mbx.v2p_mailbox &= ~mask;
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_check_for_msg_vf - checks to see if the PF has sent mail
+ *  @hw: pointer to the HW structure
+ *
+ *  returns 0 if the PF has set the Status bit or else ERR_MBX
+ **/
+static s32 ixgbevf_check_for_msg_vf(struct ixgbe_hw *hw)
+{
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (!ixgbevf_check_for_bit_vf(hw, IXGBE_VFMAILBOX_PFSTS)) {
+               ret_val = 0;
+               hw->mbx.stats.reqs++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_check_for_ack_vf - checks to see if the PF has ACK'd
+ *  @hw: pointer to the HW structure
+ *
+ *  returns 0 if the PF has set the ACK bit or else ERR_MBX
+ **/
+static s32 ixgbevf_check_for_ack_vf(struct ixgbe_hw *hw)
+{
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (!ixgbevf_check_for_bit_vf(hw, IXGBE_VFMAILBOX_PFACK)) {
+               ret_val = 0;
+               hw->mbx.stats.acks++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_check_for_rst_vf - checks to see if the PF has reset
+ *  @hw: pointer to the HW structure
+ *
+ *  returns true if the PF has set the reset done bit or else false
+ **/
+static s32 ixgbevf_check_for_rst_vf(struct ixgbe_hw *hw)
+{
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       if (!ixgbevf_check_for_bit_vf(hw, (IXGBE_VFMAILBOX_RSTD |
+                                        IXGBE_VFMAILBOX_RSTI))) {
+               ret_val = 0;
+               hw->mbx.stats.rsts++;
+       }
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_obtain_mbx_lock_vf - obtain mailbox lock
+ *  @hw: pointer to the HW structure
+ *
+ *  return 0 if we obtained the mailbox lock
+ **/
+static s32 ixgbevf_obtain_mbx_lock_vf(struct ixgbe_hw *hw)
+{
+       s32 ret_val = IXGBE_ERR_MBX;
+
+       /* Take ownership of the buffer */
+       IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_VFU);
+
+       /* reserve mailbox for vf use */
+       if (ixgbevf_read_v2p_mailbox(hw) & IXGBE_VFMAILBOX_VFU)
+               ret_val = 0;
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_write_mbx_vf - Write a message to the mailbox
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns 0 if it successfully copied message into the buffer
+ **/
+static s32 ixgbevf_write_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size)
+{
+       s32 ret_val;
+       u16 i;
+
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       ret_val = ixgbevf_obtain_mbx_lock_vf(hw);
+       if (ret_val)
+               goto out_no_write;
+
+       /* flush msg and acks as we are overwriting the message buffer */
+       ixgbevf_check_for_msg_vf(hw);
+       ixgbevf_check_for_ack_vf(hw);
+
+       /* copy the caller specified message to the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_VFMBMEM, i, msg[i]);
+
+       /* update stats */
+       hw->mbx.stats.msgs_tx++;
+
+       /* Drop VFU and interrupt the PF to tell it a message has been sent */
+       IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_REQ);
+
+out_no_write:
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_read_mbx_vf - Reads a message from the inbox intended for vf
+ *  @hw: pointer to the HW structure
+ *  @msg: The message buffer
+ *  @size: Length of buffer
+ *
+ *  returns 0 if it successfuly read message from buffer
+ **/
+static s32 ixgbevf_read_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size)
+{
+       s32 ret_val = 0;
+       u16 i;
+
+       /* lock the mailbox to prevent pf/vf race condition */
+       ret_val = ixgbevf_obtain_mbx_lock_vf(hw);
+       if (ret_val)
+               goto out_no_read;
+
+       /* copy the message from the mailbox memory buffer */
+       for (i = 0; i < size; i++)
+               msg[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_VFMBMEM, i);
+
+       /* Acknowledge receipt and release mailbox, then we're done */
+       IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_ACK);
+
+       /* update stats */
+       hw->mbx.stats.msgs_rx++;
+
+out_no_read:
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_init_mbx_params_vf - set initial values for vf mailbox
+ *  @hw: pointer to the HW structure
+ *
+ *  Initializes the hw->mbx struct to correct values for vf mailbox
+ */
+static s32 ixgbevf_init_mbx_params_vf(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+
+       /* start mailbox as timed out and let the reset_hw call set the timeout
+        * value to begin communications */
+       mbx->timeout = 0;
+       mbx->udelay = IXGBE_VF_MBX_INIT_DELAY;
+
+       mbx->size = IXGBE_VFMAILBOX_SIZE;
+
+       mbx->stats.msgs_tx = 0;
+       mbx->stats.msgs_rx = 0;
+       mbx->stats.reqs = 0;
+       mbx->stats.acks = 0;
+       mbx->stats.rsts = 0;
+
+       return 0;
+}
+
+struct ixgbe_mbx_operations ixgbevf_mbx_ops = {
+       .init_params   = ixgbevf_init_mbx_params_vf,
+       .read          = ixgbevf_read_mbx_vf,
+       .write         = ixgbevf_write_mbx_vf,
+       .read_posted   = ixgbevf_read_posted_mbx,
+       .write_posted  = ixgbevf_write_posted_mbx,
+       .check_for_msg = ixgbevf_check_for_msg_vf,
+       .check_for_ack = ixgbevf_check_for_ack_vf,
+       .check_for_rst = ixgbevf_check_for_rst_vf,
+};
+
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h
new file mode 100644 (file)
index 0000000..ea393eb
--- /dev/null
@@ -0,0 +1,99 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#ifndef _IXGBE_MBX_H_
+#define _IXGBE_MBX_H_
+
+#include "vf.h"
+
+#define IXGBE_VFMAILBOX_SIZE        16 /* 16 32 bit words - 64 bytes */
+#define IXGBE_ERR_MBX               -100
+
+#define IXGBE_VFMAILBOX             0x002FC
+#define IXGBE_VFMBMEM               0x00200
+
+/* Define mailbox register bits */
+#define IXGBE_VFMAILBOX_REQ      0x00000001 /* Request for PF Ready bit */
+#define IXGBE_VFMAILBOX_ACK      0x00000002 /* Ack PF message received */
+#define IXGBE_VFMAILBOX_VFU      0x00000004 /* VF owns the mailbox buffer */
+#define IXGBE_VFMAILBOX_PFU      0x00000008 /* PF owns the mailbox buffer */
+#define IXGBE_VFMAILBOX_PFSTS    0x00000010 /* PF wrote a message in the MB */
+#define IXGBE_VFMAILBOX_PFACK    0x00000020 /* PF ack the previous VF msg */
+#define IXGBE_VFMAILBOX_RSTI     0x00000040 /* PF has reset indication */
+#define IXGBE_VFMAILBOX_RSTD     0x00000080 /* PF has indicated reset done */
+#define IXGBE_VFMAILBOX_R2C_BITS 0x000000B0 /* All read to clear bits */
+
+#define IXGBE_PFMAILBOX(x)          (0x04B00 + (4 * x))
+#define IXGBE_PFMBMEM(vfn)          (0x13000 + (64 * vfn))
+
+#define IXGBE_PFMAILBOX_STS   0x00000001 /* Initiate message send to VF */
+#define IXGBE_PFMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
+#define IXGBE_PFMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
+#define IXGBE_PFMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
+#define IXGBE_PFMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
+
+#define IXGBE_MBVFICR_VFREQ_MASK 0x0000FFFF /* bits for VF messages */
+#define IXGBE_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
+#define IXGBE_MBVFICR_VFACK_MASK 0xFFFF0000 /* bits for VF acks */
+#define IXGBE_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
+
+
+/* If it's a IXGBE_VF_* msg then it originates in the VF and is sent to the
+ * PF.  The reverse is true if it is IXGBE_PF_*.
+ * Message ACK's are the value or'd with 0xF0000000
+ */
+#define IXGBE_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
+                                              * this are the ACK */
+#define IXGBE_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
+                                              * this are the NACK */
+#define IXGBE_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
+                                              *  clear to send requests */
+#define IXGBE_VT_MSGINFO_SHIFT    16
+/* bits 23:16 are used for exra info for certain messages */
+#define IXGBE_VT_MSGINFO_MASK     (0xFF << IXGBE_VT_MSGINFO_SHIFT)
+
+#define IXGBE_VF_RESET            0x01 /* VF requests reset */
+#define IXGBE_VF_SET_MAC_ADDR     0x02 /* VF requests PF to set MAC addr */
+#define IXGBE_VF_SET_MULTICAST    0x03 /* VF requests PF to set MC addr */
+#define IXGBE_VF_SET_VLAN         0x04 /* VF requests PF to set VLAN */
+#define IXGBE_VF_SET_LPE          0x05 /* VF requests PF to set VMOLR.LPE */
+#define IXGBE_VF_SET_MACVLAN      0x06 /* VF requests PF for unicast filter */
+
+/* length of permanent address message returned from PF */
+#define IXGBE_VF_PERMADDR_MSG_LEN 4
+/* word in permanent address message with the current multicast type */
+#define IXGBE_VF_MC_TYPE_WORD     3
+
+#define IXGBE_PF_CONTROL_MSG      0x0100 /* PF control message */
+
+#define IXGBE_VF_MBX_INIT_TIMEOUT 2000 /* number of retries on mailbox */
+#define IXGBE_VF_MBX_INIT_DELAY   500  /* microseconds between retries */
+
+/* forward declaration of the HW struct */
+struct ixgbe_hw;
+
+#endif /* _IXGBE_MBX_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h
new file mode 100644 (file)
index 0000000..189200e
--- /dev/null
@@ -0,0 +1,85 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#ifndef _IXGBEVF_REGS_H_
+#define _IXGBEVF_REGS_H_
+
+#define IXGBE_VFCTRL           0x00000
+#define IXGBE_VFSTATUS         0x00008
+#define IXGBE_VFLINKS          0x00010
+#define IXGBE_VFFRTIMER        0x00048
+#define IXGBE_VFRXMEMWRAP      0x03190
+#define IXGBE_VTEICR           0x00100
+#define IXGBE_VTEICS           0x00104
+#define IXGBE_VTEIMS           0x00108
+#define IXGBE_VTEIMC           0x0010C
+#define IXGBE_VTEIAC           0x00110
+#define IXGBE_VTEIAM           0x00114
+#define IXGBE_VTEITR(x)        (0x00820 + (4 * x))
+#define IXGBE_VTIVAR(x)        (0x00120 + (4 * x))
+#define IXGBE_VTIVAR_MISC      0x00140
+#define IXGBE_VTRSCINT(x)      (0x00180 + (4 * x))
+#define IXGBE_VFRDBAL(x)       (0x01000 + (0x40 * x))
+#define IXGBE_VFRDBAH(x)       (0x01004 + (0x40 * x))
+#define IXGBE_VFRDLEN(x)       (0x01008 + (0x40 * x))
+#define IXGBE_VFRDH(x)         (0x01010 + (0x40 * x))
+#define IXGBE_VFRDT(x)         (0x01018 + (0x40 * x))
+#define IXGBE_VFRXDCTL(x)      (0x01028 + (0x40 * x))
+#define IXGBE_VFSRRCTL(x)      (0x01014 + (0x40 * x))
+#define IXGBE_VFRSCCTL(x)      (0x0102C + (0x40 * x))
+#define IXGBE_VFPSRTYPE        0x00300
+#define IXGBE_VFTDBAL(x)       (0x02000 + (0x40 * x))
+#define IXGBE_VFTDBAH(x)       (0x02004 + (0x40 * x))
+#define IXGBE_VFTDLEN(x)       (0x02008 + (0x40 * x))
+#define IXGBE_VFTDH(x)         (0x02010 + (0x40 * x))
+#define IXGBE_VFTDT(x)         (0x02018 + (0x40 * x))
+#define IXGBE_VFTXDCTL(x)      (0x02028 + (0x40 * x))
+#define IXGBE_VFTDWBAL(x)      (0x02038 + (0x40 * x))
+#define IXGBE_VFTDWBAH(x)      (0x0203C + (0x40 * x))
+#define IXGBE_VFDCA_RXCTRL(x)  (0x0100C + (0x40 * x))
+#define IXGBE_VFDCA_TXCTRL(x)  (0x0200c + (0x40 * x))
+#define IXGBE_VFGPRC           0x0101C
+#define IXGBE_VFGPTC           0x0201C
+#define IXGBE_VFGORC_LSB       0x01020
+#define IXGBE_VFGORC_MSB       0x01024
+#define IXGBE_VFGOTC_LSB       0x02020
+#define IXGBE_VFGOTC_MSB       0x02024
+#define IXGBE_VFMPRC           0x01034
+
+#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
+
+#define IXGBE_READ_REG(a, reg) readl((a)->hw_addr + (reg))
+
+#define IXGBE_WRITE_REG_ARRAY(a, reg, offset, value) ( \
+    writel((value), ((a)->hw_addr + (reg) + ((offset) << 2))))
+
+#define IXGBE_READ_REG_ARRAY(a, reg, offset) ( \
+    readl((a)->hw_addr + (reg) + ((offset) << 2)))
+
+#define IXGBE_WRITE_FLUSH(a) (IXGBE_READ_REG(a, IXGBE_VFSTATUS))
+
+#endif /* _IXGBEVF_REGS_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
new file mode 100644 (file)
index 0000000..aa3682e
--- /dev/null
@@ -0,0 +1,426 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#include "vf.h"
+
+/**
+ *  ixgbevf_start_hw_vf - Prepare hardware for Tx/Rx
+ *  @hw: pointer to hardware structure
+ *
+ *  Starts the hardware by filling the bus info structure and media type, clears
+ *  all on chip counters, initializes receive address registers, multicast
+ *  table, VLAN filter table, calls routine to set up link and flow control
+ *  settings, and leaves transmit and receive units disabled and uninitialized
+ **/
+static s32 ixgbevf_start_hw_vf(struct ixgbe_hw *hw)
+{
+       /* Clear adapter stopped flag */
+       hw->adapter_stopped = false;
+
+       return 0;
+}
+
+/**
+ *  ixgbevf_init_hw_vf - virtual function hardware initialization
+ *  @hw: pointer to hardware structure
+ *
+ *  Initialize the hardware by resetting the hardware and then starting
+ *  the hardware
+ **/
+static s32 ixgbevf_init_hw_vf(struct ixgbe_hw *hw)
+{
+       s32 status = hw->mac.ops.start_hw(hw);
+
+       hw->mac.ops.get_mac_addr(hw, hw->mac.addr);
+
+       return status;
+}
+
+/**
+ *  ixgbevf_reset_hw_vf - Performs hardware reset
+ *  @hw: pointer to hardware structure
+ *
+ *  Resets the hardware by reseting the transmit and receive units, masks and
+ *  clears all interrupts.
+ **/
+static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       u32 timeout = IXGBE_VF_INIT_TIMEOUT;
+       s32 ret_val = IXGBE_ERR_INVALID_MAC_ADDR;
+       u32 msgbuf[IXGBE_VF_PERMADDR_MSG_LEN];
+       u8 *addr = (u8 *)(&msgbuf[1]);
+
+       /* Call adapter stop to disable tx/rx and clear interrupts */
+       hw->mac.ops.stop_adapter(hw);
+
+       IXGBE_WRITE_REG(hw, IXGBE_VFCTRL, IXGBE_CTRL_RST);
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* we cannot reset while the RSTI / RSTD bits are asserted */
+       while (!mbx->ops.check_for_rst(hw) && timeout) {
+               timeout--;
+               udelay(5);
+       }
+
+       if (!timeout)
+               return IXGBE_ERR_RESET_FAILED;
+
+       /* mailbox timeout can now become active */
+       mbx->timeout = IXGBE_VF_MBX_INIT_TIMEOUT;
+
+       msgbuf[0] = IXGBE_VF_RESET;
+       mbx->ops.write_posted(hw, msgbuf, 1);
+
+       msleep(10);
+
+       /* set our "perm_addr" based on info provided by PF */
+       /* also set up the mc_filter_type which is piggy backed
+        * on the mac address in word 3 */
+       ret_val = mbx->ops.read_posted(hw, msgbuf, IXGBE_VF_PERMADDR_MSG_LEN);
+       if (ret_val)
+               return ret_val;
+
+       if (msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK))
+               return IXGBE_ERR_INVALID_MAC_ADDR;
+
+       memcpy(hw->mac.perm_addr, addr, IXGBE_ETH_LENGTH_OF_ADDRESS);
+       hw->mac.mc_filter_type = msgbuf[IXGBE_VF_MC_TYPE_WORD];
+
+       return 0;
+}
+
+/**
+ *  ixgbevf_stop_hw_vf - Generic stop Tx/Rx units
+ *  @hw: pointer to hardware structure
+ *
+ *  Sets the adapter_stopped flag within ixgbe_hw struct. Clears interrupts,
+ *  disables transmit and receive units. The adapter_stopped flag is used by
+ *  the shared code and drivers to determine if the adapter is in a stopped
+ *  state and should not touch the hardware.
+ **/
+static s32 ixgbevf_stop_hw_vf(struct ixgbe_hw *hw)
+{
+       u32 number_of_queues;
+       u32 reg_val;
+       u16 i;
+
+       /*
+        * Set the adapter_stopped flag so other driver functions stop touching
+        * the hardware
+        */
+       hw->adapter_stopped = true;
+
+       /* Disable the receive unit by stopped each queue */
+       number_of_queues = hw->mac.max_rx_queues;
+       for (i = 0; i < number_of_queues; i++) {
+               reg_val = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));
+               if (reg_val & IXGBE_RXDCTL_ENABLE) {
+                       reg_val &= ~IXGBE_RXDCTL_ENABLE;
+                       IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(i), reg_val);
+               }
+       }
+
+       IXGBE_WRITE_FLUSH(hw);
+
+       /* Clear interrupt mask to stop from interrupts being generated */
+       IXGBE_WRITE_REG(hw, IXGBE_VTEIMC, IXGBE_VF_IRQ_CLEAR_MASK);
+
+       /* Clear any pending interrupts */
+       IXGBE_READ_REG(hw, IXGBE_VTEICR);
+
+       /* Disable the transmit unit.  Each queue must be disabled. */
+       number_of_queues = hw->mac.max_tx_queues;
+       for (i = 0; i < number_of_queues; i++) {
+               reg_val = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(i));
+               if (reg_val & IXGBE_TXDCTL_ENABLE) {
+                       reg_val &= ~IXGBE_TXDCTL_ENABLE;
+                       IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(i), reg_val);
+               }
+       }
+
+       return 0;
+}
+
+/**
+ *  ixgbevf_mta_vector - Determines bit-vector in multicast table to set
+ *  @hw: pointer to hardware structure
+ *  @mc_addr: the multicast address
+ *
+ *  Extracts the 12 bits, from a multicast address, to determine which
+ *  bit-vector to set in the multicast table. The hardware uses 12 bits, from
+ *  incoming rx multicast addresses, to determine the bit-vector to check in
+ *  the MTA. Which of the 4 combination, of 12-bits, the hardware uses is set
+ *  by the MO field of the MCSTCTRL. The MO field is set during initialization
+ *  to mc_filter_type.
+ **/
+static s32 ixgbevf_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)
+{
+       u32 vector = 0;
+
+       switch (hw->mac.mc_filter_type) {
+       case 0:   /* use bits [47:36] of the address */
+               vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
+               break;
+       case 1:   /* use bits [46:35] of the address */
+               vector = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
+               break;
+       case 2:   /* use bits [45:34] of the address */
+               vector = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
+               break;
+       case 3:   /* use bits [43:32] of the address */
+               vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
+               break;
+       default:  /* Invalid mc_filter_type */
+               break;
+       }
+
+       /* vector can only be 12-bits or boundary will be exceeded */
+       vector &= 0xFFF;
+       return vector;
+}
+
+/**
+ *  ixgbevf_get_mac_addr_vf - Read device MAC address
+ *  @hw: pointer to the HW structure
+ *  @mac_addr: pointer to storage for retrieved MAC address
+ **/
+static s32 ixgbevf_get_mac_addr_vf(struct ixgbe_hw *hw, u8 *mac_addr)
+{
+       memcpy(mac_addr, hw->mac.perm_addr, IXGBE_ETH_LENGTH_OF_ADDRESS);
+
+       return 0;
+}
+
+static s32 ixgbevf_set_uc_addr_vf(struct ixgbe_hw *hw, u32 index, u8 *addr)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[3];
+       u8 *msg_addr = (u8 *)(&msgbuf[1]);
+       s32 ret_val;
+
+       memset(msgbuf, 0, sizeof(msgbuf));
+       /*
+        * If index is one then this is the start of a new list and needs
+        * indication to the PF so it can do it's own list management.
+        * If it is zero then that tells the PF to just clear all of
+        * this VF's macvlans and there is no new list.
+        */
+       msgbuf[0] |= index << IXGBE_VT_MSGINFO_SHIFT;
+       msgbuf[0] |= IXGBE_VF_SET_MACVLAN;
+       if (addr)
+               memcpy(msg_addr, addr, 6);
+       ret_val = mbx->ops.write_posted(hw, msgbuf, 3);
+
+       if (!ret_val)
+               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
+
+       msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS;
+
+       if (!ret_val)
+               if (msgbuf[0] ==
+                   (IXGBE_VF_SET_MACVLAN | IXGBE_VT_MSGTYPE_NACK))
+                       ret_val = -ENOMEM;
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_set_rar_vf - set device MAC address
+ *  @hw: pointer to hardware structure
+ *  @index: Receive address register to write
+ *  @addr: Address to put into receive address register
+ *  @vmdq: Unused in this implementation
+ **/
+static s32 ixgbevf_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr,
+                             u32 vmdq)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[3];
+       u8 *msg_addr = (u8 *)(&msgbuf[1]);
+       s32 ret_val;
+
+       memset(msgbuf, 0, sizeof(msgbuf));
+       msgbuf[0] = IXGBE_VF_SET_MAC_ADDR;
+       memcpy(msg_addr, addr, 6);
+       ret_val = mbx->ops.write_posted(hw, msgbuf, 3);
+
+       if (!ret_val)
+               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
+
+       msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS;
+
+       /* if nacked the address was rejected, use "perm_addr" */
+       if (!ret_val &&
+           (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK)))
+               ixgbevf_get_mac_addr_vf(hw, hw->mac.addr);
+
+       return ret_val;
+}
+
+/**
+ *  ixgbevf_update_mc_addr_list_vf - Update Multicast addresses
+ *  @hw: pointer to the HW structure
+ *  @netdev: pointer to net device structure
+ *
+ *  Updates the Multicast Table Array.
+ **/
+static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw,
+                                         struct net_device *netdev)
+{
+       struct netdev_hw_addr *ha;
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[IXGBE_VFMAILBOX_SIZE];
+       u16 *vector_list = (u16 *)&msgbuf[1];
+       u32 cnt, i;
+
+       /* Each entry in the list uses 1 16 bit word.  We have 30
+        * 16 bit words available in our HW msg buffer (minus 1 for the
+        * msg type).  That's 30 hash values if we pack 'em right.  If
+        * there are more than 30 MC addresses to add then punt the
+        * extras for now and then add code to handle more than 30 later.
+        * It would be unusual for a server to request that many multi-cast
+        * addresses except for in large enterprise network environments.
+        */
+
+       cnt = netdev_mc_count(netdev);
+       if (cnt > 30)
+               cnt = 30;
+       msgbuf[0] = IXGBE_VF_SET_MULTICAST;
+       msgbuf[0] |= cnt << IXGBE_VT_MSGINFO_SHIFT;
+
+       i = 0;
+       netdev_for_each_mc_addr(ha, netdev) {
+               if (i == cnt)
+                       break;
+               vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);
+       }
+
+       mbx->ops.write_posted(hw, msgbuf, IXGBE_VFMAILBOX_SIZE);
+
+       return 0;
+}
+
+/**
+ *  ixgbevf_set_vfta_vf - Set/Unset vlan filter table address
+ *  @hw: pointer to the HW structure
+ *  @vlan: 12 bit VLAN ID
+ *  @vind: unused by VF drivers
+ *  @vlan_on: if true then set bit, else clear bit
+ **/
+static s32 ixgbevf_set_vfta_vf(struct ixgbe_hw *hw, u32 vlan, u32 vind,
+                              bool vlan_on)
+{
+       struct ixgbe_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[2];
+
+       msgbuf[0] = IXGBE_VF_SET_VLAN;
+       msgbuf[1] = vlan;
+       /* Setting the 8 bit field MSG INFO to TRUE indicates "add" */
+       msgbuf[0] |= vlan_on << IXGBE_VT_MSGINFO_SHIFT;
+
+       return mbx->ops.write_posted(hw, msgbuf, 2);
+}
+
+/**
+ *  ixgbevf_setup_mac_link_vf - Setup MAC link settings
+ *  @hw: pointer to hardware structure
+ *  @speed: Unused in this implementation
+ *  @autoneg: Unused in this implementation
+ *  @autoneg_wait_to_complete: Unused in this implementation
+ *
+ *  Do nothing and return success.  VF drivers are not allowed to change
+ *  global settings.  Maintained for driver compatibility.
+ **/
+static s32 ixgbevf_setup_mac_link_vf(struct ixgbe_hw *hw,
+                                    ixgbe_link_speed speed, bool autoneg,
+                                    bool autoneg_wait_to_complete)
+{
+       return 0;
+}
+
+/**
+ *  ixgbevf_check_mac_link_vf - Get link/speed status
+ *  @hw: pointer to hardware structure
+ *  @speed: pointer to link speed
+ *  @link_up: true is link is up, false otherwise
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
+ *
+ *  Reads the links register to determine if link is up and the current speed
+ **/
+static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw,
+                                    ixgbe_link_speed *speed,
+                                    bool *link_up,
+                                    bool autoneg_wait_to_complete)
+{
+       u32 links_reg;
+
+       if (!(hw->mbx.ops.check_for_rst(hw))) {
+               *link_up = false;
+               *speed = 0;
+               return -1;
+       }
+
+       links_reg = IXGBE_READ_REG(hw, IXGBE_VFLINKS);
+
+       if (links_reg & IXGBE_LINKS_UP)
+               *link_up = true;
+       else
+               *link_up = false;
+
+       if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
+           IXGBE_LINKS_SPEED_10G_82599)
+               *speed = IXGBE_LINK_SPEED_10GB_FULL;
+       else
+               *speed = IXGBE_LINK_SPEED_1GB_FULL;
+
+       return 0;
+}
+
+static struct ixgbe_mac_operations ixgbevf_mac_ops = {
+       .init_hw             = ixgbevf_init_hw_vf,
+       .reset_hw            = ixgbevf_reset_hw_vf,
+       .start_hw            = ixgbevf_start_hw_vf,
+       .get_mac_addr        = ixgbevf_get_mac_addr_vf,
+       .stop_adapter        = ixgbevf_stop_hw_vf,
+       .setup_link          = ixgbevf_setup_mac_link_vf,
+       .check_link          = ixgbevf_check_mac_link_vf,
+       .set_rar             = ixgbevf_set_rar_vf,
+       .update_mc_addr_list = ixgbevf_update_mc_addr_list_vf,
+       .set_uc_addr         = ixgbevf_set_uc_addr_vf,
+       .set_vfta            = ixgbevf_set_vfta_vf,
+};
+
+struct ixgbevf_info ixgbevf_82599_vf_info = {
+       .mac = ixgbe_mac_82599_vf,
+       .mac_ops = &ixgbevf_mac_ops,
+};
+
+struct ixgbevf_info ixgbevf_X540_vf_info = {
+       .mac = ixgbe_mac_X540_vf,
+       .mac_ops = &ixgbevf_mac_ops,
+};
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
new file mode 100644 (file)
index 0000000..10306b4
--- /dev/null
@@ -0,0 +1,174 @@
+/*******************************************************************************
+
+  Intel 82599 Virtual Function driver
+  Copyright(c) 1999 - 2010 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
+
+*******************************************************************************/
+
+#ifndef __IXGBE_VF_H__
+#define __IXGBE_VF_H__
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/if_ether.h>
+#include <linux/netdevice.h>
+
+#include "defines.h"
+#include "regs.h"
+#include "mbx.h"
+
+struct ixgbe_hw;
+
+/* iterator type for walking multicast address lists */
+typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr,
+                                 u32 *vmdq);
+struct ixgbe_mac_operations {
+       s32 (*init_hw)(struct ixgbe_hw *);
+       s32 (*reset_hw)(struct ixgbe_hw *);
+       s32 (*start_hw)(struct ixgbe_hw *);
+       s32 (*clear_hw_cntrs)(struct ixgbe_hw *);
+       enum ixgbe_media_type (*get_media_type)(struct ixgbe_hw *);
+       u32 (*get_supported_physical_layer)(struct ixgbe_hw *);
+       s32 (*get_mac_addr)(struct ixgbe_hw *, u8 *);
+       s32 (*stop_adapter)(struct ixgbe_hw *);
+       s32 (*get_bus_info)(struct ixgbe_hw *);
+
+       /* Link */
+       s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool, bool);
+       s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool);
+       s32 (*get_link_capabilities)(struct ixgbe_hw *, ixgbe_link_speed *,
+                                    bool *);
+
+       /* RAR, Multicast, VLAN */
+       s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32);
+       s32 (*set_uc_addr)(struct ixgbe_hw *, u32, u8 *);
+       s32 (*init_rx_addrs)(struct ixgbe_hw *);
+       s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
+       s32 (*enable_mc)(struct ixgbe_hw *);
+       s32 (*disable_mc)(struct ixgbe_hw *);
+       s32 (*clear_vfta)(struct ixgbe_hw *);
+       s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
+};
+
+enum ixgbe_mac_type {
+       ixgbe_mac_unknown = 0,
+       ixgbe_mac_82599_vf,
+       ixgbe_mac_X540_vf,
+       ixgbe_num_macs
+};
+
+struct ixgbe_mac_info {
+       struct ixgbe_mac_operations ops;
+       u8 addr[6];
+       u8 perm_addr[6];
+
+       enum ixgbe_mac_type type;
+
+       s32  mc_filter_type;
+
+       bool get_link_status;
+       u32  max_tx_queues;
+       u32  max_rx_queues;
+       u32  max_msix_vectors;
+};
+
+struct ixgbe_mbx_operations {
+       s32 (*init_params)(struct ixgbe_hw *hw);
+       s32 (*read)(struct ixgbe_hw *, u32 *, u16);
+       s32 (*write)(struct ixgbe_hw *, u32 *, u16);
+       s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16);
+       s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16);
+       s32 (*check_for_msg)(struct ixgbe_hw *);
+       s32 (*check_for_ack)(struct ixgbe_hw *);
+       s32 (*check_for_rst)(struct ixgbe_hw *);
+};
+
+struct ixgbe_mbx_stats {
+       u32 msgs_tx;
+       u32 msgs_rx;
+
+       u32 acks;
+       u32 reqs;
+       u32 rsts;
+};
+
+struct ixgbe_mbx_info {
+       struct ixgbe_mbx_operations ops;
+       struct ixgbe_mbx_stats stats;
+       u32 timeout;
+       u32 udelay;
+       u32 v2p_mailbox;
+       u16 size;
+};
+
+struct ixgbe_hw {
+       void *back;
+
+       u8 __iomem *hw_addr;
+
+       struct ixgbe_mac_info mac;
+       struct ixgbe_mbx_info mbx;
+
+       u16 device_id;
+       u16 subsystem_vendor_id;
+       u16 subsystem_device_id;
+       u16 vendor_id;
+
+       u8  revision_id;
+       bool adapter_stopped;
+};
+
+struct ixgbevf_hw_stats {
+       u64 base_vfgprc;
+       u64 base_vfgptc;
+       u64 base_vfgorc;
+       u64 base_vfgotc;
+       u64 base_vfmprc;
+
+       u64 last_vfgprc;
+       u64 last_vfgptc;
+       u64 last_vfgorc;
+       u64 last_vfgotc;
+       u64 last_vfmprc;
+
+       u64 vfgprc;
+       u64 vfgptc;
+       u64 vfgorc;
+       u64 vfgotc;
+       u64 vfmprc;
+
+       u64 saved_reset_vfgprc;
+       u64 saved_reset_vfgptc;
+       u64 saved_reset_vfgorc;
+       u64 saved_reset_vfgotc;
+       u64 saved_reset_vfmprc;
+};
+
+struct ixgbevf_info {
+       enum ixgbe_mac_type             mac;
+       struct ixgbe_mac_operations     *mac_ops;
+};
+
+#endif /* __IXGBE_VF_H__ */
+
diff --git a/drivers/net/igb/Makefile b/drivers/net/igb/Makefile
deleted file mode 100644 (file)
index c6e4621..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#
-# Intel 82575 PCI-Express Ethernet Linux driver
-# Copyright(c) 1999 - 2011 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
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) 82575 PCI-Express ethernet driver
-#
-
-obj-$(CONFIG_IGB) += igb.o
-
-igb-objs := igb_main.o igb_ethtool.o e1000_82575.o \
-           e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o
-
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
deleted file mode 100644 (file)
index c0857bd..0000000
+++ /dev/null
@@ -1,2084 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-/* e1000_82575
- * e1000_82576
- */
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-#include "e1000_mac.h"
-#include "e1000_82575.h"
-
-static s32  igb_get_invariants_82575(struct e1000_hw *);
-static s32  igb_acquire_phy_82575(struct e1000_hw *);
-static void igb_release_phy_82575(struct e1000_hw *);
-static s32  igb_acquire_nvm_82575(struct e1000_hw *);
-static void igb_release_nvm_82575(struct e1000_hw *);
-static s32  igb_check_for_link_82575(struct e1000_hw *);
-static s32  igb_get_cfg_done_82575(struct e1000_hw *);
-static s32  igb_init_hw_82575(struct e1000_hw *);
-static s32  igb_phy_hw_reset_sgmii_82575(struct e1000_hw *);
-static s32  igb_read_phy_reg_sgmii_82575(struct e1000_hw *, u32, u16 *);
-static s32  igb_read_phy_reg_82580(struct e1000_hw *, u32, u16 *);
-static s32  igb_write_phy_reg_82580(struct e1000_hw *, u32, u16);
-static s32  igb_reset_hw_82575(struct e1000_hw *);
-static s32  igb_reset_hw_82580(struct e1000_hw *);
-static s32  igb_set_d0_lplu_state_82575(struct e1000_hw *, bool);
-static s32  igb_setup_copper_link_82575(struct e1000_hw *);
-static s32  igb_setup_serdes_link_82575(struct e1000_hw *);
-static s32  igb_write_phy_reg_sgmii_82575(struct e1000_hw *, u32, u16);
-static void igb_clear_hw_cntrs_82575(struct e1000_hw *);
-static s32  igb_acquire_swfw_sync_82575(struct e1000_hw *, u16);
-static s32  igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *, u16 *,
-                                                u16 *);
-static s32  igb_get_phy_id_82575(struct e1000_hw *);
-static void igb_release_swfw_sync_82575(struct e1000_hw *, u16);
-static bool igb_sgmii_active_82575(struct e1000_hw *);
-static s32  igb_reset_init_script_82575(struct e1000_hw *);
-static s32  igb_read_mac_addr_82575(struct e1000_hw *);
-static s32  igb_set_pcie_completion_timeout(struct e1000_hw *hw);
-static s32  igb_reset_mdicnfg_82580(struct e1000_hw *hw);
-static s32  igb_validate_nvm_checksum_82580(struct e1000_hw *hw);
-static s32  igb_update_nvm_checksum_82580(struct e1000_hw *hw);
-static s32  igb_update_nvm_checksum_with_offset(struct e1000_hw *hw,
-                                               u16 offset);
-static s32 igb_validate_nvm_checksum_with_offset(struct e1000_hw *hw,
-                                               u16 offset);
-static s32 igb_validate_nvm_checksum_i350(struct e1000_hw *hw);
-static s32 igb_update_nvm_checksum_i350(struct e1000_hw *hw);
-static const u16 e1000_82580_rxpbs_table[] =
-       { 36, 72, 144, 1, 2, 4, 8, 16,
-         35, 70, 140 };
-#define E1000_82580_RXPBS_TABLE_SIZE \
-       (sizeof(e1000_82580_rxpbs_table)/sizeof(u16))
-
-/**
- *  igb_sgmii_uses_mdio_82575 - Determine if I2C pins are for external MDIO
- *  @hw: pointer to the HW structure
- *
- *  Called to determine if the I2C pins are being used for I2C or as an
- *  external MDIO interface since the two options are mutually exclusive.
- **/
-static bool igb_sgmii_uses_mdio_82575(struct e1000_hw *hw)
-{
-       u32 reg = 0;
-       bool ext_mdio = false;
-
-       switch (hw->mac.type) {
-       case e1000_82575:
-       case e1000_82576:
-               reg = rd32(E1000_MDIC);
-               ext_mdio = !!(reg & E1000_MDIC_DEST);
-               break;
-       case e1000_82580:
-       case e1000_i350:
-               reg = rd32(E1000_MDICNFG);
-               ext_mdio = !!(reg & E1000_MDICNFG_EXT_MDIO);
-               break;
-       default:
-               break;
-       }
-       return ext_mdio;
-}
-
-static s32 igb_get_invariants_82575(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_dev_spec_82575 * dev_spec = &hw->dev_spec._82575;
-       u32 eecd;
-       s32 ret_val;
-       u16 size;
-       u32 ctrl_ext = 0;
-
-       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_NS:
-       case E1000_DEV_ID_82576_NS_SERDES:
-       case E1000_DEV_ID_82576_FIBER:
-       case E1000_DEV_ID_82576_SERDES:
-       case E1000_DEV_ID_82576_QUAD_COPPER:
-       case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
-       case E1000_DEV_ID_82576_SERDES_QUAD:
-               mac->type = e1000_82576;
-               break;
-       case E1000_DEV_ID_82580_COPPER:
-       case E1000_DEV_ID_82580_FIBER:
-       case E1000_DEV_ID_82580_QUAD_FIBER:
-       case E1000_DEV_ID_82580_SERDES:
-       case E1000_DEV_ID_82580_SGMII:
-       case E1000_DEV_ID_82580_COPPER_DUAL:
-       case E1000_DEV_ID_DH89XXCC_SGMII:
-       case E1000_DEV_ID_DH89XXCC_SERDES:
-       case E1000_DEV_ID_DH89XXCC_BACKPLANE:
-       case E1000_DEV_ID_DH89XXCC_SFP:
-               mac->type = e1000_82580;
-               break;
-       case E1000_DEV_ID_I350_COPPER:
-       case E1000_DEV_ID_I350_FIBER:
-       case E1000_DEV_ID_I350_SERDES:
-       case E1000_DEV_ID_I350_SGMII:
-               mac->type = e1000_i350;
-               break;
-       default:
-               return -E1000_ERR_MAC_INIT;
-               break;
-       }
-
-       /* 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.
-        */
-       phy->media_type = e1000_media_type_copper;
-       dev_spec->sgmii_active = false;
-
-       ctrl_ext = rd32(E1000_CTRL_EXT);
-       switch (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK) {
-       case E1000_CTRL_EXT_LINK_MODE_SGMII:
-               dev_spec->sgmii_active = true;
-               break;
-       case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX:
-       case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES:
-               hw->phy.media_type = e1000_media_type_internal_serdes;
-               break;
-       default:
-               break;
-       }
-
-       /* Set mta register count */
-       mac->mta_reg_count = 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;
-       if (mac->type == e1000_82580)
-               mac->rar_entry_count = E1000_RAR_ENTRIES_82580;
-       if (mac->type == e1000_i350)
-               mac->rar_entry_count = E1000_RAR_ENTRIES_I350;
-       /* reset */
-       if (mac->type >= e1000_82580)
-               mac->ops.reset_hw = igb_reset_hw_82580;
-       else
-               mac->ops.reset_hw = igb_reset_hw_82575;
-       /* Set if part includes ASF firmware */
-       mac->asf_firmware_present = true;
-       /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid =
-               (rd32(E1000_FWSM) & E1000_FWSM_MODE_MASK)
-                       ? true : false;
-       /* enable EEE on i350 parts */
-       if (mac->type == e1000_i350)
-               dev_spec->eee_disable = false;
-       else
-               dev_spec->eee_disable = true;
-       /* 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;
-
-       /* NVM initialization */
-       eecd = rd32(E1000_EECD);
-
-       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;
-
-       /*
-        * Check for invalid size
-        */
-       if ((hw->mac.type == e1000_82576) && (size > 15)) {
-               printk("igb: The NVM size is not valid, "
-                       "defaulting to 32K.\n");
-               size = 15;
-       }
-       nvm->word_size = 1 << size;
-       if (nvm->word_size == (1 << 15))
-               nvm->page_size = 128;
-
-       /* NVM Function Pointers */
-       nvm->ops.acquire = igb_acquire_nvm_82575;
-       if (nvm->word_size < (1 << 15))
-               nvm->ops.read = igb_read_nvm_eerd;
-       else
-               nvm->ops.read = igb_read_nvm_spi;
-
-       nvm->ops.release = igb_release_nvm_82575;
-       switch (hw->mac.type) {
-       case e1000_82580:
-               nvm->ops.validate = igb_validate_nvm_checksum_82580;
-               nvm->ops.update = igb_update_nvm_checksum_82580;
-               break;
-       case e1000_i350:
-               nvm->ops.validate = igb_validate_nvm_checksum_i350;
-               nvm->ops.update = igb_update_nvm_checksum_i350;
-               break;
-       default:
-               nvm->ops.validate = igb_validate_nvm_checksum;
-               nvm->ops.update = igb_update_nvm_checksum;
-       }
-       nvm->ops.write = igb_write_nvm_spi;
-
-       /* if part supports SR-IOV then initialize mailbox parameters */
-       switch (mac->type) {
-       case e1000_82576:
-       case e1000_i350:
-               igb_init_mbx_params_pf(hw);
-               break;
-       default:
-               break;
-       }
-
-       /* setup PHY parameters */
-       if (phy->media_type != e1000_media_type_copper) {
-               phy->type = e1000_phy_none;
-               return 0;
-       }
-
-       phy->autoneg_mask        = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us      = 100;
-
-       ctrl_ext = rd32(E1000_CTRL_EXT);
-
-       /* PHY function pointers */
-       if (igb_sgmii_active_82575(hw)) {
-               phy->ops.reset      = igb_phy_hw_reset_sgmii_82575;
-               ctrl_ext |= E1000_CTRL_I2C_ENA;
-       } else {
-               phy->ops.reset      = igb_phy_hw_reset;
-               ctrl_ext &= ~E1000_CTRL_I2C_ENA;
-       }
-
-       wr32(E1000_CTRL_EXT, ctrl_ext);
-       igb_reset_mdicnfg_82580(hw);
-
-       if (igb_sgmii_active_82575(hw) && !igb_sgmii_uses_mdio_82575(hw)) {
-               phy->ops.read_reg   = igb_read_phy_reg_sgmii_82575;
-               phy->ops.write_reg  = igb_write_phy_reg_sgmii_82575;
-       } else if (hw->mac.type >= e1000_82580) {
-               phy->ops.read_reg   = igb_read_phy_reg_82580;
-               phy->ops.write_reg  = igb_write_phy_reg_82580;
-       } else {
-               phy->ops.read_reg   = igb_read_phy_reg_igp;
-               phy->ops.write_reg  = igb_write_phy_reg_igp;
-       }
-
-       /* set lan id */
-       hw->bus.func = (rd32(E1000_STATUS) & E1000_STATUS_FUNC_MASK) >>
-                      E1000_STATUS_FUNC_SHIFT;
-
-       /* Set phy->phy_addr and phy->id. */
-       ret_val = igb_get_phy_id_82575(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* Verify phy id and set remaining function pointers */
-       switch (phy->id) {
-       case I347AT4_E_PHY_ID:
-       case M88E1112_E_PHY_ID:
-       case M88E1111_I_PHY_ID:
-               phy->type                   = e1000_phy_m88;
-               phy->ops.get_phy_info       = igb_get_phy_info_m88;
-
-               if (phy->id == I347AT4_E_PHY_ID ||
-                   phy->id == M88E1112_E_PHY_ID)
-                       phy->ops.get_cable_length = igb_get_cable_length_m88_gen2;
-               else
-                       phy->ops.get_cable_length = igb_get_cable_length_m88;
-
-               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
-               break;
-       case IGP03E1000_E_PHY_ID:
-               phy->type                   = e1000_phy_igp_3;
-               phy->ops.get_phy_info       = igb_get_phy_info_igp;
-               phy->ops.get_cable_length   = igb_get_cable_length_igp_2;
-               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_igp;
-               phy->ops.set_d0_lplu_state  = igb_set_d0_lplu_state_82575;
-               phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state;
-               break;
-       case I82580_I_PHY_ID:
-       case I350_I_PHY_ID:
-               phy->type                   = e1000_phy_82580;
-               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_82580;
-               phy->ops.get_cable_length   = igb_get_cable_length_82580;
-               phy->ops.get_phy_info       = igb_get_phy_info_82580;
-               break;
-       default:
-               return -E1000_ERR_PHY;
-       }
-
-       return 0;
-}
-
-/**
- *  igb_acquire_phy_82575 - Acquire rights to access PHY
- *  @hw: pointer to the HW structure
- *
- *  Acquire access rights to the correct PHY.  This is a
- *  function pointer entry point called by the api module.
- **/
-static s32 igb_acquire_phy_82575(struct e1000_hw *hw)
-{
-       u16 mask = E1000_SWFW_PHY0_SM;
-
-       if (hw->bus.func == E1000_FUNC_1)
-               mask = E1000_SWFW_PHY1_SM;
-       else if (hw->bus.func == E1000_FUNC_2)
-               mask = E1000_SWFW_PHY2_SM;
-       else if (hw->bus.func == E1000_FUNC_3)
-               mask = E1000_SWFW_PHY3_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.  This is a
- *  function pointer entry point called by the api module.
- **/
-static void igb_release_phy_82575(struct e1000_hw *hw)
-{
-       u16 mask = E1000_SWFW_PHY0_SM;
-
-       if (hw->bus.func == E1000_FUNC_1)
-               mask = E1000_SWFW_PHY1_SM;
-       else if (hw->bus.func == E1000_FUNC_2)
-               mask = E1000_SWFW_PHY2_SM;
-       else if (hw->bus.func == E1000_FUNC_3)
-               mask = E1000_SWFW_PHY3_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;
-
-       if (offset > E1000_MAX_SGMII_PHY_REG_ADDR) {
-               hw_dbg("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;
-
-
-       if (offset > E1000_MAX_SGMII_PHY_REG_ADDR) {
-               hw_dbg("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 = 0;
-       u16 phy_id;
-       u32 ctrl_ext;
-       u32 mdic;
-
-       /*
-        * 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;
-       }
-
-       if (igb_sgmii_uses_mdio_82575(hw)) {
-               switch (hw->mac.type) {
-               case e1000_82575:
-               case e1000_82576:
-                       mdic = rd32(E1000_MDIC);
-                       mdic &= E1000_MDIC_PHY_MASK;
-                       phy->addr = mdic >> E1000_MDIC_PHY_SHIFT;
-                       break;
-               case e1000_82580:
-               case e1000_i350:
-                       mdic = rd32(E1000_MDICNFG);
-                       mdic &= E1000_MDICNFG_PHY_MASK;
-                       phy->addr = mdic >> E1000_MDICNFG_PHY_SHIFT;
-                       break;
-               default:
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-                       break;
-               }
-               ret_val = igb_get_phy_id(hw);
-               goto out;
-       }
-
-       /* Power on sgmii phy if it is disabled */
-       ctrl_ext = rd32(E1000_CTRL_EXT);
-       wr32(E1000_CTRL_EXT, ctrl_ext & ~E1000_CTRL_EXT_SDP3_DATA);
-       wrfl();
-       msleep(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 == 0) {
-                       hw_dbg("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 {
-                       hw_dbg("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;
-               goto out;
-       } else {
-               ret_val = igb_get_phy_id(hw);
-       }
-
-       /* restore previous sfp cage power state */
-       wr32(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;
-
-       /*
-        * This isn't a true "hard" reset, but is the only reset
-        * available to us at this time.
-        */
-
-       hw_dbg("Soft resetting SGMII attached PHY...\n");
-
-       /*
-        * 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 = igb_phy_sw_reset(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;
-       u16 data;
-
-       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;
-
-       ret_val = igb_acquire_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_acquire_nvm(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)
-{
-       igb_release_nvm(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 = 0;
-       s32 i = 0, timeout = 200; /* FIXME: find real value to use here */
-
-       while (i < timeout) {
-               if (igb_get_hw_semaphore(hw)) {
-                       ret_val = -E1000_ERR_SWFW_SYNC;
-                       goto out;
-               }
-
-               swfw_sync = rd32(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(hw);
-               mdelay(5);
-               i++;
-       }
-
-       if (i == timeout) {
-               hw_dbg("Driver can't access resource, SW_FW_SYNC timeout.\n");
-               ret_val = -E1000_ERR_SWFW_SYNC;
-               goto out;
-       }
-
-       swfw_sync |= swmask;
-       wr32(E1000_SW_FW_SYNC, swfw_sync);
-
-       igb_put_hw_semaphore(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;
-
-       while (igb_get_hw_semaphore(hw) != 0);
-       /* Empty */
-
-       swfw_sync = rd32(E1000_SW_FW_SYNC);
-       swfw_sync &= ~mask;
-       wr32(E1000_SW_FW_SYNC, swfw_sync);
-
-       igb_put_hw_semaphore(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
- *  0.  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 = 0;
-       u32 mask = E1000_NVM_CFG_DONE_PORT_0;
-
-       if (hw->bus.func == 1)
-               mask = E1000_NVM_CFG_DONE_PORT_1;
-       else if (hw->bus.func == E1000_FUNC_2)
-               mask = E1000_NVM_CFG_DONE_PORT_2;
-       else if (hw->bus.func == E1000_FUNC_3)
-               mask = E1000_NVM_CFG_DONE_PORT_3;
-
-       while (timeout) {
-               if (rd32(E1000_EEMNGCTL) & mask)
-                       break;
-               msleep(1);
-               timeout--;
-       }
-       if (!timeout)
-               hw_dbg("MNG configuration cycle has not completed.\n");
-
-       /* If EEPROM is not marked present, init the PHY manually */
-       if (((rd32(E1000_EECD) & E1000_EECD_PRES) == 0) &&
-           (hw->phy.type == e1000_phy_igp_3))
-               igb_phy_init_script_igp3(hw);
-
-       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;
-
-       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(hw);
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_power_up_serdes_link_82575 - Power up the serdes link after shutdown
- *  @hw: pointer to the HW structure
- **/
-void igb_power_up_serdes_link_82575(struct e1000_hw *hw)
-{
-       u32 reg;
-
-
-       if ((hw->phy.media_type != e1000_media_type_internal_serdes) &&
-           !igb_sgmii_active_82575(hw))
-               return;
-
-       /* Enable PCS to turn on link */
-       reg = rd32(E1000_PCS_CFG0);
-       reg |= E1000_PCS_CFG_PCS_EN;
-       wr32(E1000_PCS_CFG0, reg);
-
-       /* Power up the laser */
-       reg = rd32(E1000_CTRL_EXT);
-       reg &= ~E1000_CTRL_EXT_SDP3_DATA;
-       wr32(E1000_CTRL_EXT, reg);
-
-       /* flush the write to verify completion */
-       wrfl();
-       msleep(1);
-}
-
-/**
- *  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;
-
-       /* 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 = rd32(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 0;
-}
-
-/**
- *  igb_shutdown_serdes_link_82575 - Remove link during power down
- *  @hw: pointer to the HW structure
- *
- *  In the case of fiber serdes, shut down optics and PCS on driver unload
- *  when management pass thru is not enabled.
- **/
-void igb_shutdown_serdes_link_82575(struct e1000_hw *hw)
-{
-       u32 reg;
-
-       if (hw->phy.media_type != e1000_media_type_internal_serdes &&
-           igb_sgmii_active_82575(hw))
-               return;
-
-       if (!igb_enable_mng_pass_thru(hw)) {
-               /* Disable PCS to turn off link */
-               reg = rd32(E1000_PCS_CFG0);
-               reg &= ~E1000_PCS_CFG_PCS_EN;
-               wr32(E1000_PCS_CFG0, reg);
-
-               /* shutdown the laser */
-               reg = rd32(E1000_CTRL_EXT);
-               reg |= E1000_CTRL_EXT_SDP3_DATA;
-               wr32(E1000_CTRL_EXT, reg);
-
-               /* flush the write to verify completion */
-               wrfl();
-               msleep(1);
-       }
-}
-
-/**
- *  igb_reset_hw_82575 - 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 the api module.
- **/
-static s32 igb_reset_hw_82575(struct e1000_hw *hw)
-{
-       u32 ctrl, icr;
-       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 = igb_disable_pcie_master(hw);
-       if (ret_val)
-               hw_dbg("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) {
-               hw_dbg("PCI-E Set completion timeout has failed.\n");
-       }
-
-       hw_dbg("Masking off all interrupts\n");
-       wr32(E1000_IMC, 0xffffffff);
-
-       wr32(E1000_RCTL, 0);
-       wr32(E1000_TCTL, E1000_TCTL_PSP);
-       wrfl();
-
-       msleep(10);
-
-       ctrl = rd32(E1000_CTRL);
-
-       hw_dbg("Issuing a global reset to MAC\n");
-       wr32(E1000_CTRL, ctrl | E1000_CTRL_RST);
-
-       ret_val = igb_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.
-                */
-               hw_dbg("Auto Read Done did not complete\n");
-       }
-
-       /* If EEPROM is not present, run manual init scripts */
-       if ((rd32(E1000_EECD) & E1000_EECD_PRES) == 0)
-               igb_reset_init_script_82575(hw);
-
-       /* Clear any pending interrupt events. */
-       wr32(E1000_IMC, 0xffffffff);
-       icr = rd32(E1000_ICR);
-
-       /* Install any alternate MAC address into RAR0 */
-       ret_val = igb_check_alt_mac_addr(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;
-
-       /* Initialize identification LED */
-       ret_val = igb_id_led_init(hw);
-       if (ret_val) {
-               hw_dbg("Error initializing identification LED\n");
-               /* This is not fatal and we should not stop init due to this */
-       }
-
-       /* Disabling VLAN filtering */
-       hw_dbg("Initializing the IEEE VLAN\n");
-       igb_clear_vfta(hw);
-
-       /* Setup the receive address */
-       igb_init_rx_addrs(hw, rar_count);
-
-       /* Zero out the Multicast HASH table */
-       hw_dbg("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++)
-               array_wr32(E1000_MTA, i, 0);
-
-       /* Zero out the Unicast HASH table */
-       hw_dbg("Zeroing the UTA\n");
-       for (i = 0; i < mac->uta_reg_count; i++)
-               array_wr32(E1000_UTA, i, 0);
-
-       /* Setup link and flow control */
-       ret_val = igb_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;
-
-       ctrl = rd32(E1000_CTRL);
-       ctrl |= E1000_CTRL_SLU;
-       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       wr32(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) {
-               /* allow time for SFP cage time to power up phy */
-               msleep(300);
-
-               ret_val = hw->phy.ops.reset(hw);
-               if (ret_val) {
-                       hw_dbg("Error resetting the PHY.\n");
-                       goto out;
-               }
-       }
-       switch (hw->phy.type) {
-       case e1000_phy_m88:
-               if (hw->phy.id == I347AT4_E_PHY_ID ||
-                   hw->phy.id == M88E1112_E_PHY_ID)
-                       ret_val = igb_copper_link_setup_m88_gen2(hw);
-               else
-                       ret_val = igb_copper_link_setup_m88(hw);
-               break;
-       case e1000_phy_igp_3:
-               ret_val = igb_copper_link_setup_igp(hw);
-               break;
-       case e1000_phy_82580:
-               ret_val = igb_copper_link_setup_82580(hw);
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               break;
-       }
-
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_setup_copper_link(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_ext, ctrl_reg, reg;
-       bool pcs_autoneg;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       if ((hw->phy.media_type != e1000_media_type_internal_serdes) &&
-           !igb_sgmii_active_82575(hw))
-               return ret_val;
-
-
-       /*
-        * 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.
-        */
-       wr32(E1000_SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
-
-       /* power on the sfp cage if present */
-       ctrl_ext = rd32(E1000_CTRL_EXT);
-       ctrl_ext &= ~E1000_CTRL_EXT_SDP3_DATA;
-       wr32(E1000_CTRL_EXT, ctrl_ext);
-
-       ctrl_reg = rd32(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 = rd32(E1000_CONNSW);
-               reg |= E1000_CONNSW_ENRGSRC;
-               wr32(E1000_CONNSW, reg);
-       }
-
-       reg = rd32(E1000_PCS_LCTL);
-
-       /* default pcs_autoneg to the same setting as mac autoneg */
-       pcs_autoneg = hw->mac.autoneg;
-
-       switch (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK) {
-       case E1000_CTRL_EXT_LINK_MODE_SGMII:
-               /* sgmii mode lets the phy handle forcing speed/duplex */
-               pcs_autoneg = true;
-               /* autoneg time out should be disabled for SGMII mode */
-               reg &= ~(E1000_PCS_LCTL_AN_TIMEOUT);
-               break;
-       case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX:
-               /* disable PCS autoneg and support parallel detect only */
-               pcs_autoneg = false;
-       default:
-               if (hw->mac.type == e1000_82575 ||
-                   hw->mac.type == e1000_82576) {
-                       ret_val = hw->nvm.ops.read(hw, NVM_COMPAT, 1, &data);
-                       if (ret_val) {
-                               printk(KERN_DEBUG "NVM Read Error\n\n");
-                               return ret_val;
-                       }
-
-                       if (data & E1000_EEPROM_PCS_AUTONEG_DISABLE_BIT)
-                               pcs_autoneg = false;
-               }
-
-               /*
-                * non-SGMII modes only supports a speed of 1000/Full for the
-                * link so it is best to just force the MAC and let the pcs
-                * link either autoneg or be forced to 1000/Full
-                */
-               ctrl_reg |= E1000_CTRL_SPD_1000 | E1000_CTRL_FRCSPD |
-                           E1000_CTRL_FD | E1000_CTRL_FRCDPX;
-
-               /* set speed of 1000/Full if speed/duplex is forced */
-               reg |= E1000_PCS_LCTL_FSV_1000 | E1000_PCS_LCTL_FDV_FULL;
-               break;
-       }
-
-       wr32(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;
-
-       if (pcs_autoneg) {
-               /* Set PCS register for autoneg */
-               reg |= E1000_PCS_LCTL_AN_ENABLE | /* Enable Autoneg */
-                      E1000_PCS_LCTL_AN_RESTART; /* Restart autoneg */
-               hw_dbg("Configuring Autoneg:PCS_LCTL=0x%08X\n", reg);
-       } else {
-               /* Set PCS register for forced link */
-               reg |= E1000_PCS_LCTL_FSD;        /* Force Speed */
-
-               hw_dbg("Configuring Forced Link:PCS_LCTL=0x%08X\n", reg);
-       }
-
-       wr32(E1000_PCS_LCTL, reg);
-
-       if (!igb_sgmii_active_82575(hw))
-               igb_force_mac_fc(hw);
-
-       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)
-{
-       if (hw->mac.type == e1000_82575) {
-               hw_dbg("Running reset init script for 82575\n");
-               /* SerDes configuration via SERDESCTRL */
-               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x00, 0x0C);
-               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x01, 0x78);
-               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x1B, 0x23);
-               igb_write_8bit_ctrl_reg(hw, E1000_SCTL, 0x23, 0x15);
-
-               /* CCM configuration via CCMCTL register */
-               igb_write_8bit_ctrl_reg(hw, E1000_CCMCTL, 0x14, 0x00);
-               igb_write_8bit_ctrl_reg(hw, E1000_CCMCTL, 0x10, 0x00);
-
-               /* PCIe lanes configuration */
-               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x00, 0xEC);
-               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x61, 0xDF);
-               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x34, 0x05);
-               igb_write_8bit_ctrl_reg(hw, E1000_GIOCTL, 0x2F, 0x81);
-
-               /* PCIe PLL Configuration */
-               igb_write_8bit_ctrl_reg(hw, E1000_SCCTL, 0x02, 0x47);
-               igb_write_8bit_ctrl_reg(hw, E1000_SCCTL, 0x14, 0x00);
-               igb_write_8bit_ctrl_reg(hw, E1000_SCCTL, 0x10, 0x00);
-       }
-
-       return 0;
-}
-
-/**
- *  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 = 0;
-
-       /*
-        * 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(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_read_mac_addr(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.
- **/
-void igb_power_down_phy_copper_82575(struct e1000_hw *hw)
-{
-       /* If the management interface is not enabled, then power down */
-       if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw)))
-               igb_power_down_phy_copper(hw);
-}
-
-/**
- *  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)
-{
-       igb_clear_hw_cntrs_base(hw);
-
-       rd32(E1000_PRC64);
-       rd32(E1000_PRC127);
-       rd32(E1000_PRC255);
-       rd32(E1000_PRC511);
-       rd32(E1000_PRC1023);
-       rd32(E1000_PRC1522);
-       rd32(E1000_PTC64);
-       rd32(E1000_PTC127);
-       rd32(E1000_PTC255);
-       rd32(E1000_PTC511);
-       rd32(E1000_PTC1023);
-       rd32(E1000_PTC1522);
-
-       rd32(E1000_ALGNERRC);
-       rd32(E1000_RXERRC);
-       rd32(E1000_TNCRS);
-       rd32(E1000_CEXTERR);
-       rd32(E1000_TSCTC);
-       rd32(E1000_TSCTFC);
-
-       rd32(E1000_MGTPRC);
-       rd32(E1000_MGTPDC);
-       rd32(E1000_MGTPTC);
-
-       rd32(E1000_IAC);
-       rd32(E1000_ICRXOC);
-
-       rd32(E1000_ICRXPTC);
-       rd32(E1000_ICRXATC);
-       rd32(E1000_ICTXPTC);
-       rd32(E1000_ICTXATC);
-       rd32(E1000_ICTXQEC);
-       rd32(E1000_ICTXQMTC);
-       rd32(E1000_ICRXDMTC);
-
-       rd32(E1000_CBTMPC);
-       rd32(E1000_HTDPMC);
-       rd32(E1000_CBRMPC);
-       rd32(E1000_RPTHC);
-       rd32(E1000_HGPTC);
-       rd32(E1000_HTCBDPC);
-       rd32(E1000_HGORCL);
-       rd32(E1000_HGORCH);
-       rd32(E1000_HGOTCL);
-       rd32(E1000_HGOTCH);
-       rd32(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))
-               rd32(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;
-
-       if (hw->mac.type != e1000_82575 ||
-           !(rd32(E1000_MANC) & E1000_MANC_RCV_TCO_EN))
-               return;
-
-       /* Disable all RX queues */
-       for (i = 0; i < 4; i++) {
-               rxdctl[i] = rd32(E1000_RXDCTL(i));
-               wr32(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++) {
-               msleep(1);
-               rx_enabled = 0;
-               for (i = 0; i < 4; i++)
-                       rx_enabled |= rd32(E1000_RXDCTL(i));
-               if (!(rx_enabled & E1000_RXDCTL_QUEUE_ENABLE))
-                       break;
-       }
-
-       if (ms_wait == 10)
-               hw_dbg("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 = rd32(E1000_RFCTL);
-       wr32(E1000_RFCTL, rfctl & ~E1000_RFCTL_LEF);
-
-       rlpml = rd32(E1000_RLPML);
-       wr32(E1000_RLPML, 0);
-
-       rctl = rd32(E1000_RCTL);
-       temp_rctl = rctl & ~(E1000_RCTL_EN | E1000_RCTL_SBP);
-       temp_rctl |= E1000_RCTL_LPE;
-
-       wr32(E1000_RCTL, temp_rctl);
-       wr32(E1000_RCTL, temp_rctl | E1000_RCTL_EN);
-       wrfl();
-       msleep(2);
-
-       /* Enable RX queues that were previously enabled and restore our
-        * previous state
-        */
-       for (i = 0; i < 4; i++)
-               wr32(E1000_RXDCTL(i), rxdctl[i]);
-       wr32(E1000_RCTL, rctl);
-       wrfl();
-
-       wr32(E1000_RLPML, rlpml);
-       wr32(E1000_RFCTL, rfctl);
-
-       /* Flush receive errors generated by workaround */
-       rd32(E1000_ROC);
-       rd32(E1000_RNBC);
-       rd32(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 = rd32(E1000_GCR);
-       s32 ret_val = 0;
-       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;
-
-       wr32(E1000_GCR, gcr);
-       return ret_val;
-}
-
-/**
- *  igb_vmdq_set_anti_spoofing_pf - enable or disable anti-spoofing
- *  @hw: pointer to the hardware struct
- *  @enable: state to enter, either enabled or disabled
- *  @pf: Physical Function pool - do not set anti-spoofing for the PF
- *
- *  enables/disables L2 switch anti-spoofing functionality.
- **/
-void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *hw, bool enable, int pf)
-{
-       u32 dtxswc;
-
-       switch (hw->mac.type) {
-       case e1000_82576:
-       case e1000_i350:
-               dtxswc = rd32(E1000_DTXSWC);
-               if (enable) {
-                       dtxswc |= (E1000_DTXSWC_MAC_SPOOF_MASK |
-                                  E1000_DTXSWC_VLAN_SPOOF_MASK);
-                       /* The PF can spoof - it has to in order to
-                        * support emulation mode NICs */
-                       dtxswc ^= (1 << pf | 1 << (pf + MAX_NUM_VFS));
-               } else {
-                       dtxswc &= ~(E1000_DTXSWC_MAC_SPOOF_MASK |
-                                   E1000_DTXSWC_VLAN_SPOOF_MASK);
-               }
-               wr32(E1000_DTXSWC, dtxswc);
-               break;
-       default:
-               break;
-       }
-}
-
-/**
- *  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 = rd32(E1000_DTXSWC);
-
-       if (enable)
-               dtxswc |= E1000_DTXSWC_VMDQ_LOOPBACK_EN;
-       else
-               dtxswc &= ~E1000_DTXSWC_VMDQ_LOOPBACK_EN;
-
-       wr32(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 = rd32(E1000_VT_CTL);
-
-       if (enable)
-               vt_ctl |= E1000_VT_CTL_VM_REPL_EN;
-       else
-               vt_ctl &= ~E1000_VT_CTL_VM_REPL_EN;
-
-       wr32(E1000_VT_CTL, vt_ctl);
-}
-
-/**
- *  igb_read_phy_reg_82580 - Read 82580 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.
- **/
-static s32 igb_read_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val;
-
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_read_phy_reg_mdic(hw, offset, data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_phy_reg_82580 - Write 82580 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.
- **/
-static s32 igb_write_phy_reg_82580(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val;
-
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_write_phy_reg_mdic(hw, offset, data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits
- *  @hw: pointer to the HW structure
- *
- *  This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on
- *  the values found in the EEPROM.  This addresses an issue in which these
- *  bits are not restored from EEPROM after reset.
- **/
-static s32 igb_reset_mdicnfg_82580(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u32 mdicnfg;
-       u16 nvm_data = 0;
-
-       if (hw->mac.type != e1000_82580)
-               goto out;
-       if (!igb_sgmii_active_82575(hw))
-               goto out;
-
-       ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
-                                  NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
-                                  &nvm_data);
-       if (ret_val) {
-               hw_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       mdicnfg = rd32(E1000_MDICNFG);
-       if (nvm_data & NVM_WORD24_EXT_MDIO)
-               mdicnfg |= E1000_MDICNFG_EXT_MDIO;
-       if (nvm_data & NVM_WORD24_COM_MDIO)
-               mdicnfg |= E1000_MDICNFG_COM_MDIO;
-       wr32(E1000_MDICNFG, mdicnfg);
-out:
-       return ret_val;
-}
-
-/**
- *  igb_reset_hw_82580 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets function or entire device (all ports, etc.)
- *  to a known state.
- **/
-static s32 igb_reset_hw_82580(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       /* BH SW mailbox bit in SW_FW_SYNC */
-       u16 swmbsw_mask = E1000_SW_SYNCH_MB;
-       u32 ctrl, icr;
-       bool global_device_reset = hw->dev_spec._82575.global_device_reset;
-
-
-       hw->dev_spec._82575.global_device_reset = false;
-
-       /* Get current control state. */
-       ctrl = rd32(E1000_CTRL);
-
-       /*
-        * 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(hw);
-       if (ret_val)
-               hw_dbg("PCI-E Master disable polling has failed.\n");
-
-       hw_dbg("Masking off all interrupts\n");
-       wr32(E1000_IMC, 0xffffffff);
-       wr32(E1000_RCTL, 0);
-       wr32(E1000_TCTL, E1000_TCTL_PSP);
-       wrfl();
-
-       msleep(10);
-
-       /* Determine whether or not a global dev reset is requested */
-       if (global_device_reset &&
-               igb_acquire_swfw_sync_82575(hw, swmbsw_mask))
-                       global_device_reset = false;
-
-       if (global_device_reset &&
-               !(rd32(E1000_STATUS) & E1000_STAT_DEV_RST_SET))
-               ctrl |= E1000_CTRL_DEV_RST;
-       else
-               ctrl |= E1000_CTRL_RST;
-
-       wr32(E1000_CTRL, ctrl);
-       wrfl();
-
-       /* Add delay to insure DEV_RST has time to complete */
-       if (global_device_reset)
-               msleep(5);
-
-       ret_val = igb_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.
-                */
-               hw_dbg("Auto Read Done did not complete\n");
-       }
-
-       /* If EEPROM is not present, run manual init scripts */
-       if ((rd32(E1000_EECD) & E1000_EECD_PRES) == 0)
-               igb_reset_init_script_82575(hw);
-
-       /* clear global device reset status bit */
-       wr32(E1000_STATUS, E1000_STAT_DEV_RST_SET);
-
-       /* Clear any pending interrupt events. */
-       wr32(E1000_IMC, 0xffffffff);
-       icr = rd32(E1000_ICR);
-
-       ret_val = igb_reset_mdicnfg_82580(hw);
-       if (ret_val)
-               hw_dbg("Could not reset MDICNFG based on EEPROM\n");
-
-       /* Install any alternate MAC address into RAR0 */
-       ret_val = igb_check_alt_mac_addr(hw);
-
-       /* Release semaphore */
-       if (global_device_reset)
-               igb_release_swfw_sync_82575(hw, swmbsw_mask);
-
-       return ret_val;
-}
-
-/**
- *  igb_rxpbs_adjust_82580 - adjust RXPBS value to reflect actual RX PBA size
- *  @data: data received by reading RXPBS register
- *
- *  The 82580 uses a table based approach for packet buffer allocation sizes.
- *  This function converts the retrieved value into the correct table value
- *     0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7
- *  0x0 36  72 144   1   2   4   8  16
- *  0x8 35  70 140 rsv rsv rsv rsv rsv
- */
-u16 igb_rxpbs_adjust_82580(u32 data)
-{
-       u16 ret_val = 0;
-
-       if (data < E1000_82580_RXPBS_TABLE_SIZE)
-               ret_val = e1000_82580_rxpbs_table[data];
-
-       return ret_val;
-}
-
-/**
- *  igb_validate_nvm_checksum_with_offset - Validate EEPROM
- *  checksum
- *  @hw: pointer to the HW structure
- *  @offset: offset in words of the checksum protected region
- *
- *  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_with_offset(struct e1000_hw *hw, u16 offset)
-{
-       s32 ret_val = 0;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       for (i = offset; i < ((NVM_CHECKSUM_REG + offset) + 1); i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       hw_dbg("NVM Read Error\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-
-       if (checksum != (u16) NVM_SUM) {
-               hw_dbg("NVM Checksum Invalid\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_update_nvm_checksum_with_offset - Update EEPROM
- *  checksum
- *  @hw: pointer to the HW structure
- *  @offset: offset in words of the checksum protected region
- *
- *  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_with_offset(struct e1000_hw *hw, u16 offset)
-{
-       s32 ret_val;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       for (i = offset; i < (NVM_CHECKSUM_REG + offset); i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       hw_dbg("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 + offset), 1,
-                               &checksum);
-       if (ret_val)
-               hw_dbg("NVM Write Error while updating checksum.\n");
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_validate_nvm_checksum_82580 - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Calculates the EEPROM section checksum by reading/adding each word of
- *  the EEPROM and then verifies that the sum of the EEPROM is
- *  equal to 0xBABA.
- **/
-static s32 igb_validate_nvm_checksum_82580(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 eeprom_regions_count = 1;
-       u16 j, nvm_data;
-       u16 nvm_offset;
-
-       ret_val = hw->nvm.ops.read(hw, NVM_COMPATIBILITY_REG_3, 1, &nvm_data);
-       if (ret_val) {
-               hw_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       if (nvm_data & NVM_COMPATIBILITY_BIT_MASK) {
-               /* if checksums compatibility bit is set validate checksums
-                * for all 4 ports. */
-               eeprom_regions_count = 4;
-       }
-
-       for (j = 0; j < eeprom_regions_count; j++) {
-               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
-               ret_val = igb_validate_nvm_checksum_with_offset(hw,
-                                                               nvm_offset);
-               if (ret_val != 0)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_update_nvm_checksum_82580 - Update EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the EEPROM section checksums for all 4 ports 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 igb_update_nvm_checksum_82580(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 j, nvm_data;
-       u16 nvm_offset;
-
-       ret_val = hw->nvm.ops.read(hw, NVM_COMPATIBILITY_REG_3, 1, &nvm_data);
-       if (ret_val) {
-               hw_dbg("NVM Read Error while updating checksum"
-                       " compatibility bit.\n");
-               goto out;
-       }
-
-       if ((nvm_data & NVM_COMPATIBILITY_BIT_MASK) == 0) {
-               /* set compatibility bit to validate checksums appropriately */
-               nvm_data = nvm_data | NVM_COMPATIBILITY_BIT_MASK;
-               ret_val = hw->nvm.ops.write(hw, NVM_COMPATIBILITY_REG_3, 1,
-                                       &nvm_data);
-               if (ret_val) {
-                       hw_dbg("NVM Write Error while updating checksum"
-                               " compatibility bit.\n");
-                       goto out;
-               }
-       }
-
-       for (j = 0; j < 4; j++) {
-               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
-               ret_val = igb_update_nvm_checksum_with_offset(hw, nvm_offset);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_validate_nvm_checksum_i350 - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Calculates the EEPROM section checksum by reading/adding each word of
- *  the EEPROM and then verifies that the sum of the EEPROM is
- *  equal to 0xBABA.
- **/
-static s32 igb_validate_nvm_checksum_i350(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 j;
-       u16 nvm_offset;
-
-       for (j = 0; j < 4; j++) {
-               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
-               ret_val = igb_validate_nvm_checksum_with_offset(hw,
-                                                               nvm_offset);
-               if (ret_val != 0)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_update_nvm_checksum_i350 - Update EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the EEPROM section checksums for all 4 ports 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 igb_update_nvm_checksum_i350(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 j;
-       u16 nvm_offset;
-
-       for (j = 0; j < 4; j++) {
-               nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
-               ret_val = igb_update_nvm_checksum_with_offset(hw, nvm_offset);
-               if (ret_val != 0)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_set_eee_i350 - Enable/disable EEE support
- *  @hw: pointer to the HW structure
- *
- *  Enable/disable EEE based on setting in dev_spec structure.
- *
- **/
-s32 igb_set_eee_i350(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u32 ipcnfg, eeer, ctrl_ext;
-
-       ctrl_ext = rd32(E1000_CTRL_EXT);
-       if ((hw->mac.type != e1000_i350) ||
-           (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK))
-               goto out;
-       ipcnfg = rd32(E1000_IPCNFG);
-       eeer = rd32(E1000_EEER);
-
-       /* enable or disable per user setting */
-       if (!(hw->dev_spec._82575.eee_disable)) {
-               ipcnfg |= (E1000_IPCNFG_EEE_1G_AN |
-                       E1000_IPCNFG_EEE_100M_AN);
-               eeer |= (E1000_EEER_TX_LPI_EN |
-                       E1000_EEER_RX_LPI_EN |
-                       E1000_EEER_LPI_FC);
-
-       } else {
-               ipcnfg &= ~(E1000_IPCNFG_EEE_1G_AN |
-                       E1000_IPCNFG_EEE_100M_AN);
-               eeer &= ~(E1000_EEER_TX_LPI_EN |
-                       E1000_EEER_RX_LPI_EN |
-                       E1000_EEER_LPI_FC);
-       }
-       wr32(E1000_IPCNFG, ipcnfg);
-       wr32(E1000_EEER, eeer);
-out:
-
-       return ret_val;
-}
-
-static struct e1000_mac_operations e1000_mac_ops_82575 = {
-       .init_hw              = igb_init_hw_82575,
-       .check_for_link       = igb_check_for_link_82575,
-       .rar_set              = igb_rar_set,
-       .read_mac_addr        = igb_read_mac_addr_82575,
-       .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
-};
-
-static struct e1000_phy_operations e1000_phy_ops_82575 = {
-       .acquire              = igb_acquire_phy_82575,
-       .get_cfg_done         = igb_get_cfg_done_82575,
-       .release              = igb_release_phy_82575,
-};
-
-static struct e1000_nvm_operations e1000_nvm_ops_82575 = {
-       .acquire              = igb_acquire_nvm_82575,
-       .read                 = igb_read_nvm_eerd,
-       .release              = igb_release_nvm_82575,
-       .write                = igb_write_nvm_spi,
-};
-
-const struct e1000_info e1000_82575_info = {
-       .get_invariants = igb_get_invariants_82575,
-       .mac_ops = &e1000_mac_ops_82575,
-       .phy_ops = &e1000_phy_ops_82575,
-       .nvm_ops = &e1000_nvm_ops_82575,
-};
-
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/igb/e1000_82575.h
deleted file mode 100644 (file)
index 786e110..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_82575_H_
-#define _E1000_82575_H_
-
-extern void igb_shutdown_serdes_link_82575(struct e1000_hw *hw);
-extern void igb_power_up_serdes_link_82575(struct e1000_hw *hw);
-extern void igb_power_down_phy_copper_82575(struct e1000_hw *hw);
-extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);
-
-#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))
-
-#define E1000_RAR_ENTRIES_82575        16
-#define E1000_RAR_ENTRIES_82576        24
-#define E1000_RAR_ENTRIES_82580        24
-#define E1000_RAR_ENTRIES_I350         32
-
-#define E1000_SW_SYNCH_MB              0x00000100
-#define E1000_STAT_DEV_RST_SET         0x00100000
-#define E1000_CTRL_DEV_RST             0x20000000
-
-/* SRRCTL bit definitions */
-#define E1000_SRRCTL_BSIZEPKT_SHIFT                     10 /* Shift _right_ */
-#define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT                 2  /* Shift _left_ */
-#define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF                0x02000000
-#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS          0x0A000000
-#define E1000_SRRCTL_DROP_EN                            0x80000000
-#define E1000_SRRCTL_TIMESTAMP                          0x40000000
-
-#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_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)
-
-/* Immediate Interrupt Rx (A.K.A. Low Latency Interrupt) */
-#define E1000_IMIREXT_SIZE_BP     0x00001000  /* Packet size bypass */
-#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 {
-                       struct {
-                               __le16 pkt_info;   /* RSS type, Packet type */
-                               __le16 hdr_info;   /* Split Header,
-                                                   * header buffer length */
-                       } 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_HDRBUFLEN_MASK      0x7FE0
-#define E1000_RXDADV_HDRBUFLEN_SHIFT     5
-#define E1000_RXDADV_STAT_TS             0x10000 /* Pkt was time stamped */
-#define E1000_RXDADV_STAT_TSIP           0x08000 /* timestamp in packet */
-
-/* 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_MAC_TSTAMP   0x00080000 /* IEEE1588 Timestamp packet */
-#define E1000_ADVTXD_DTYP_CTXT    0x00200000 /* Advanced Context Descriptor */
-#define E1000_ADVTXD_DTYP_DATA    0x00300000 /* Advanced Data Descriptor */
-#define E1000_ADVTXD_DCMD_IFCS    0x02000000 /* Insert FCS (Ethernet CRC) */
-#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_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_TUCMD_IPV4    0x00000400  /* IP Packet Type: 1=IPv4 */
-#define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800  /* L4 Packet TYPE of TCP */
-#define E1000_ADVTXD_TUCMD_L4T_SCTP 0x00001000 /* L4 packet TYPE of SCTP */
-/* IPSec Encrypt Enable for ESP */
-#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 */
-/* Adv ctxt IPSec ESP len mask */
-
-/* Additional Transmit Descriptor Control definitions */
-#define E1000_TXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Tx Queue */
-/* Tx Queue Arbitration Priority 0=low, 1=high */
-
-/* Additional Receive Descriptor Control definitions */
-#define E1000_RXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Rx Queue */
-
-/* Direct Cache Access (DCA) definitions */
-#define E1000_DCA_CTRL_DCA_MODE_DISABLE 0x01 /* DCA Disable */
-#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 */
-
-/* Additional DCA related definitions, note change in position of CPUID */
-#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 24 /* Tx CPUID now in the last byte */
-#define E1000_DCA_RXCTRL_CPUID_SHIFT 24 /* Rx CPUID now in the last byte */
-
-/* ETQF register bit definitions */
-#define E1000_ETQF_FILTER_ENABLE   (1 << 26)
-#define E1000_ETQF_1588            (1 << 30)
-
-/* FTQF register bit definitions */
-#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_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_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_VMVIR_VLANA_DEFAULT      0x40000000 /* Always use default VLAN */
-#define E1000_VMVIR_VLANA_NEVER        0x80000000 /* Never insert VLAN tag */
-
-#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 E1000_EEPROM_PCS_AUTONEG_DISABLE_BIT   (1 << 14)
-
-#define ALL_QUEUES   0xFFFF
-
-/* RX packet buffer size defines */
-#define E1000_RXPBS_SIZE_MASK_82576  0x0000007F
-void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *, bool, int);
-void igb_vmdq_set_loopback_pf(struct e1000_hw *, bool);
-void igb_vmdq_set_replication_pf(struct e1000_hw *, bool);
-u16 igb_rxpbs_adjust_82580(u32 data);
-s32 igb_set_eee_i350(struct e1000_hw *);
-
-#endif
diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h
deleted file mode 100644 (file)
index 7b8ddd8..0000000
+++ /dev/null
@@ -1,834 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#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_PME_EN     0x00000002 /* PME Enable */
-
-/* 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 */
-
-/* Extended Device Control */
-#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Defineable Pin 3 */
-/* Physical Func Reset Done Indication */
-#define E1000_CTRL_EXT_PFRSTD    0x00004000
-#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_1000BASE_KX  0x00400000
-#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
-#define E1000_CTRL_EXT_LINK_MODE_GMII   0x00000000
-#define E1000_CTRL_EXT_EIAME          0x01000000
-#define E1000_CTRL_EXT_IRCA           0x00000001
-/* Interrupt delay cancellation */
-/* Driver loaded bit for FW */
-#define E1000_CTRL_EXT_DRV_LOAD       0x10000000
-/* Interrupt acknowledge Auto-mask */
-/* Clear Interrupt timers after IMS clear */
-/* packet buffer parity error detection enabled */
-/* descriptor FIFO parity error detection enable */
-#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
-#define E1000_I2CCMD_REG_ADDR_SHIFT   16
-#define E1000_I2CCMD_PHY_ADDR_SHIFT   24
-#define E1000_I2CCMD_OPCODE_READ      0x08000000
-#define E1000_I2CCMD_OPCODE_WRITE     0x00000000
-#define E1000_I2CCMD_READY            0x20000000
-#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_TS       0x10000 /* Pkt was time stamped */
-
-#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
-
-/* 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_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              0x00100000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
-
-
-/* Management Control */
-#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-#define E1000_MANC_EN_BMC2OS     0x10000000 /* OSBMC is Enabled or not */
-/* Enable Neighbor Discovery Filtering */
-#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets 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
-
-/* Receive Control */
-#define E1000_RCTL_EN             0x00000002    /* enable */
-#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
-#define E1000_RCTL_UPE            0x00000008    /* unicast promiscuous enable */
-#define E1000_RCTL_MPE            0x00000010    /* multicast promiscuous enab */
-#define E1000_RCTL_LPE            0x00000020    /* long packet enable */
-#define E1000_RCTL_LBM_MAC        0x00000040    /* MAC loopback mode */
-#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */
-#define E1000_RCTL_RDMTS_HALF     0x00000000    /* rx desc min threshold size */
-#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
-#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */
-#define E1000_RCTL_SZ_512         0x00020000    /* rx buffer size 512 */
-#define E1000_RCTL_SZ_256         0x00030000    /* rx buffer size 256 */
-#define E1000_RCTL_VFE            0x00040000    /* vlan filter enable */
-#define E1000_RCTL_CFIEN          0x00080000    /* canonical form enable */
-#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
-
-/*
- * 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   0x1
-#define E1000_SWFW_PHY0_SM  0x2
-#define E1000_SWFW_PHY1_SM  0x4
-#define E1000_SWFW_PHY2_SM  0x20
-#define E1000_SWFW_PHY3_SM  0x40
-
-/* FACTPS Definitions */
-/* Device Control */
-#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master requests */
-#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
-#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_100  0x00000100  /* Force 100Mb */
-#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
-#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
-#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
-/* Defined polarity of Dock/Undock indication in SDP[0] */
-/* Reset both PHY ports, through PHYRST_N pin */
-/* 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_SWDPIO0  0x00400000  /* SWDPIN 0 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_VME      0x40000000  /* IEEE VLAN mode enable */
-#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
-/* Initiate an interrupt to manageability engine */
-#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_CONNSW_ENRGSRC             0x4
-#define E1000_PCS_CFG_PCS_EN             8
-#define E1000_PCS_LCTL_FLV_LINK_UP       1
-#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_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_ENABLE_SERDES_LOOPBACK     0x0410
-
-#define E1000_PCS_LSTS_LINK_OK           1
-#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
-
-/* 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_1     0x00000004      /* Function 1 */
-#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
-#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
-/* Change in Dock/Undock state. Clear on write '0'. */
-/* Status of Master requests. */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000
-/* BMC external code execution disabled */
-
-/* Constants used to intrepret the masked PCI-X bus speed. */
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-
-#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_SHIFT      0
-#define E1000_LEDCTL_LED0_BLINK           0x00000080
-
-#define E1000_LEDCTL_MODE_LED_ON        0xE
-#define E1000_LEDCTL_MODE_LED_OFF       0xF
-
-/* Transmit Descriptor bit definitions */
-#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_RS     0x08000000 /* Report Status */
-#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-/* Extended desc bits for Linksec and timesync */
-
-/* Transmit Control */
-#define E1000_TCTL_EN     0x00000002    /* enable tx */
-#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_RTLC   0x01000000    /* Re-transmit on late collision */
-
-/* DMA Coalescing register fields */
-#define E1000_DMACR_DMACWT_MASK         0x00003FFF /* DMA Coalescing
-                                                       * Watchdog Timer */
-#define E1000_DMACR_DMACTHR_MASK        0x00FF0000 /* DMA Coalescing Receive
-                                                       * Threshold */
-#define E1000_DMACR_DMACTHR_SHIFT       16
-#define E1000_DMACR_DMAC_LX_MASK        0x30000000 /* Lx when no PCIe
-                                                       * transactions */
-#define E1000_DMACR_DMAC_LX_SHIFT       28
-#define E1000_DMACR_DMAC_EN             0x80000000 /* Enable DMA Coalescing */
-
-#define E1000_DMCTXTH_DMCTTHR_MASK      0x00000FFF /* DMA Coalescing Transmit
-                                                       * Threshold */
-
-#define E1000_DMCTLX_TTLX_MASK          0x00000FFF /* Time to LX request */
-
-#define E1000_DMCRTRH_UTRESH_MASK       0x0007FFFF /* Receive Traffic Rate
-                                                       * Threshold */
-#define E1000_DMCRTRH_LRPRCW            0x80000000 /* Rcv packet rate in
-                                                       * current window */
-
-#define E1000_DMCCNT_CCOUNT_MASK        0x01FFFFFF /* DMA Coal Rcv Traffic
-                                                       * Current Cnt */
-
-#define E1000_FCRTC_RTH_COAL_MASK       0x0003FFF0 /* Flow ctrl Rcv Threshold
-                                                       * High val */
-#define E1000_FCRTC_RTH_COAL_SHIFT      4
-#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision */
-
-/* SerDes Control */
-#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
-
-/* Receive Checksum Control */
-#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
-#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
-#define E1000_RXCSUM_CRCOFL    0x00000800   /* CRC32 offload enable */
-#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
-
-/* Header split receive */
-#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
-
-/* Ethertype field values */
-#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
-
-#define MAX_JUMBO_FRAME_SIZE    0x3F00
-
-/* PBA constants */
-#define E1000_PBA_34K 0x0022
-#define E1000_PBA_64K 0x0040    /* 64KB */
-
-/* SW Semaphore Register */
-#define E1000_SWSM_SMBI         0x00000001 /* Driver Semaphore bit */
-#define E1000_SWSM_SWESMBI      0x00000002 /* FW Semaphore bit */
-
-/* Interrupt Cause Read */
-#define E1000_ICR_TXDW          0x00000001 /* Transmit desc written back */
-#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_RXT0          0x00000080 /* rx timer intr (ring 0) */
-#define E1000_ICR_VMMB          0x00000100 /* VM MB event */
-#define E1000_ICR_DRSTA         0x40000000 /* Device Reset Asserted */
-/* If this bit asserted, the driver should claim the interrupt */
-#define E1000_ICR_INT_ASSERTED  0x80000000
-/* LAN connected device generates an interrupt */
-#define E1000_ICR_DOUTSYNC      0x10000000 /* NIC DMA out of sync */
-
-/* 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_OTHER        0x80000000 /* Interrupt Cause Active */
-/* TCP Timer */
-
-/*
- * 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    |    \
-    E1000_IMS_DOUTSYNC)
-
-/* Interrupt Mask Set */
-#define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Transmit desc written back */
-#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_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_IMS_DRSTA     E1000_ICR_DRSTA     /* Device Reset Asserted */
-#define E1000_IMS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
-
-/* Extended Interrupt Mask Set */
-#define E1000_EIMS_OTHER        E1000_EICR_OTHER   /* Interrupt Cause Active */
-
-/* Interrupt Cause Set */
-#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_ICS_DRSTA     E1000_ICR_DRSTA     /* Device Reset Aserted */
-
-/* Extended Interrupt Cause Set */
-
-/* Transmit Descriptor Control */
-/* Enable the counting of descriptors still to be processed. */
-
-/* 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_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_RESET   9
-#define E1000_ERR_MASTER_REQUESTS_PENDING 10
-#define E1000_BLK_PHY_RESET   12
-#define E1000_ERR_SWFW_SYNC 13
-#define E1000_NOT_IMPLEMENTED 14
-#define E1000_ERR_MBX      15
-#define E1000_ERR_INVALID_ARGUMENT  16
-#define E1000_ERR_NO_SPACE          17
-#define E1000_ERR_NVM_PBA_SECTION   18
-
-/* Loop limit on how long we wait for auto-negotiation to complete */
-#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. */
-/* Number of milliseconds for NVM auto read done after MAC reset. */
-#define AUTO_READ_DONE_TIMEOUT      10
-
-/* Flow Control */
-#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
-
-#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
-
-#define E1000_MDICNFG_EXT_MDIO    0x80000000      /* MDI ext/int destination */
-#define E1000_MDICNFG_COM_MDIO    0x40000000      /* MDI shared w/ lan 0 */
-#define E1000_MDICNFG_PHY_MASK    0x03E00000
-#define E1000_MDICNFG_PHY_SHIFT   21
-
-/* PCI Express Control */
-#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
-
-/* mPHY Address Control and Data Registers */
-#define E1000_MPHY_ADDR_CTL          0x0024 /* mPHY Address Control Register */
-#define E1000_MPHY_ADDR_CTL_OFFSET_MASK 0xFFFF0000
-#define E1000_MPHY_DATA                 0x0E10 /* mPHY Data Register */
-
-/* mPHY PCS CLK Register */
-#define E1000_MPHY_PCS_CLK_REG_OFFSET  0x0004 /* mPHY PCS CLK AFE CSR Offset */
-/* mPHY Near End Digital Loopback Override Bit */
-#define E1000_MPHY_PCS_CLK_REG_DIGINELBEN 0x10
-
-/* PHY Control Register */
-#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-#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_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-
-/* Autoneg Advertisement Register */
-#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_PAUSE            0x0400   /* Pause operation desired */
-#define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
-
-/* Link Partner Ability Register (Base Page) */
-#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-
-/* Autoneg Expansion Register */
-
-/* 1000BASE-T Control Register */
-#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-#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 */
-
-/* 1000BASE-T Status Register */
-#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-
-
-/* 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_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
-#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-
-/* 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_REQ       0x00000040 /* NVM Access Request */
-#define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */
-#define E1000_EECD_PRES      0x00000100 /* NVM Present */
-/* NVM Addressing bits based on type 0=small, 1=large */
-#define E1000_EECD_ADDR_BITS 0x00000400
-#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
-
-/* Offset to data in NVM read/write registers */
-#define E1000_NVM_RW_REG_DATA   16
-#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_READ     0    /* Flag for polling for read complete */
-
-/* NVM Word Offsets */
-#define NVM_COMPAT                 0x0003
-#define NVM_ID_LED_SETTINGS        0x0004 /* SERDES output amplitude */
-#define NVM_INIT_CONTROL2_REG      0x000F
-#define NVM_INIT_CONTROL3_PORT_B   0x0014
-#define NVM_INIT_CONTROL3_PORT_A   0x0024
-#define NVM_ALT_MAC_ADDR_PTR       0x0037
-#define NVM_CHECKSUM_REG           0x003F
-#define NVM_COMPATIBILITY_REG_3    0x0003
-#define NVM_COMPATIBILITY_BIT_MASK 0x8000
-
-#define E1000_NVM_CFG_DONE_PORT_0  0x040000 /* MNG config cycle done */
-#define E1000_NVM_CFG_DONE_PORT_1  0x080000 /* ...for second port */
-#define E1000_NVM_CFG_DONE_PORT_2  0x100000 /* ...for third port */
-#define E1000_NVM_CFG_DONE_PORT_3  0x200000 /* ...for fourth port */
-
-#define NVM_82580_LAN_FUNC_OFFSET(a) (a ? (0x40 + (0x40 * a)) : 0)
-
-/* Mask bits for fields in Word 0x24 of the NVM */
-#define NVM_WORD24_COM_MDIO         0x0008 /* MDIO interface shared */
-#define NVM_WORD24_EXT_MDIO         0x0004 /* MDIO accesses routed external */
-
-/* Mask bits for fields in Word 0x0f of the NVM */
-#define NVM_WORD0F_PAUSE_MASK       0x3000
-#define NVM_WORD0F_ASM_DIR          0x2000
-
-/* Mask bits for fields in Word 0x1a of the NVM */
-
-/* length of string needed to store part num */
-#define E1000_PBANUM_LENGTH         11
-
-/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
-#define NVM_SUM                    0xBABA
-
-#define NVM_PBA_OFFSET_0           8
-#define NVM_PBA_OFFSET_1           9
-#define NVM_PBA_PTR_GUARD          0xFAFA
-#define NVM_WORD_SIZE_BASE_SHIFT   6
-
-/* NVM Commands - Microwire */
-
-/* NVM Commands - SPI */
-#define NVM_MAX_RETRY_SPI          5000 /* Max wait of 5ms, for RDY signal */
-#define NVM_WRITE_OPCODE_SPI       0x02 /* NVM write opcode */
-#define NVM_READ_OPCODE_SPI        0x03 /* NVM read 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_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
-
-/* SPI NVM Status Register */
-#define NVM_STATUS_RDY_SPI         0x01
-
-/* 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 PCIE_DEVICE_CONTROL2         0x28
-#define PCIE_DEVICE_CONTROL2_16ms    0x0005
-
-#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 M88E1111_I_PHY_ID    0x01410CC0
-#define M88E1112_E_PHY_ID    0x01410C90
-#define I347AT4_E_PHY_ID     0x01410DC0
-#define IGP03E1000_E_PHY_ID  0x02A80390
-#define I82580_I_PHY_ID      0x015403A0
-#define I350_I_PHY_ID        0x015403B0
-#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_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
-
-#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
-#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
-
-/* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
-/* 1=CLK125 low, 0=CLK125 toggling */
-#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
- */
-/* 1=5-bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
-#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Transmit */
-
-/* M88E1000 PHY Specific Status Register */
-#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_SPEED              0xC000 /* Speed, bits 14:15 */
-#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
-
-#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-
-/* M88E1000 Extended PHY Specific Control Register */
-/*
- * 1 = Lost lock detect enabled.
- * Will assert lost lock and bring
- * link down if idle not seen
- * within 1ms in 1000BASE-T
- */
-/*
- * 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
-/*
- * 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_1X    0x0100
-#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
-
-/* Intel i347-AT4 Registers */
-
-#define I347AT4_PCDL                   0x10 /* PHY Cable Diagnostics Length */
-#define I347AT4_PCDC                   0x15 /* PHY Cable Diagnostics Control */
-#define I347AT4_PAGE_SELECT            0x16
-
-/* i347-AT4 Extended PHY Specific Control Register */
-
-/*
- *  Number of times we will attempt to autonegotiate before downshifting if we
- *  are the master
- */
-#define I347AT4_PSCR_DOWNSHIFT_ENABLE 0x0800
-#define I347AT4_PSCR_DOWNSHIFT_MASK   0x7000
-#define I347AT4_PSCR_DOWNSHIFT_1X     0x0000
-#define I347AT4_PSCR_DOWNSHIFT_2X     0x1000
-#define I347AT4_PSCR_DOWNSHIFT_3X     0x2000
-#define I347AT4_PSCR_DOWNSHIFT_4X     0x3000
-#define I347AT4_PSCR_DOWNSHIFT_5X     0x4000
-#define I347AT4_PSCR_DOWNSHIFT_6X     0x5000
-#define I347AT4_PSCR_DOWNSHIFT_7X     0x6000
-#define I347AT4_PSCR_DOWNSHIFT_8X     0x7000
-
-/* i347-AT4 PHY Cable Diagnostics Control */
-#define I347AT4_PCDC_CABLE_LENGTH_UNIT 0x0400 /* 0=cm 1=meters */
-
-/* Marvell 1112 only registers */
-#define M88E1112_VCT_DSP_DISTANCE       0x001A
-
-/* M88EC018 Rev 2 specific DownShift settings */
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
-
-/* 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
-#define E1000_MDIC_DEST      0x80000000
-
-/* Thermal Sensor */
-#define E1000_THSTAT_PWR_DOWN       0x00000001 /* Power Down Event */
-#define E1000_THSTAT_LINK_THROTTLE  0x00000002 /* Link Speed Throttle Event */
-
-/* Energy Efficient Ethernet */
-#define E1000_IPCNFG_EEE_1G_AN       0x00000008  /* EEE Enable 1G AN */
-#define E1000_IPCNFG_EEE_100M_AN     0x00000004  /* EEE Enable 100M AN */
-#define E1000_EEER_TX_LPI_EN         0x00010000  /* EEE Tx LPI Enable */
-#define E1000_EEER_RX_LPI_EN         0x00020000  /* EEE Rx LPI Enable */
-#define E1000_EEER_LPI_FC            0x00040000  /* EEE Enable on FC */
-
-/* SerDes Control */
-#define E1000_GEN_CTL_READY             0x80000000
-#define E1000_GEN_CTL_ADDRESS_SHIFT     8
-#define E1000_GEN_POLL_TIMEOUT          640
-
-#define E1000_VFTA_ENTRY_SHIFT               5
-#define E1000_VFTA_ENTRY_MASK                0x7F
-#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F
-
-/* DMA Coalescing register fields */
-#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision based
-                                                      on DMA coal */
-
-/* Tx Rate-Scheduler Config fields */
-#define E1000_RTTBCNRC_RS_ENA          0x80000000
-#define E1000_RTTBCNRC_RF_DEC_MASK     0x00003FFF
-#define E1000_RTTBCNRC_RF_INT_SHIFT    14
-#define E1000_RTTBCNRC_RF_INT_MASK     \
-       (E1000_RTTBCNRC_RF_DEC_MASK << E1000_RTTBCNRC_RF_INT_SHIFT)
-
-#endif
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
deleted file mode 100644 (file)
index 4519a13..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_HW_H_
-#define _E1000_HW_H_
-
-#include <linux/types.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/netdevice.h>
-
-#include "e1000_regs.h"
-#include "e1000_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_QUAD_COPPER_ET2    0x1526
-#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_DEV_ID_82580_COPPER             0x150E
-#define E1000_DEV_ID_82580_FIBER              0x150F
-#define E1000_DEV_ID_82580_SERDES             0x1510
-#define E1000_DEV_ID_82580_SGMII              0x1511
-#define E1000_DEV_ID_82580_COPPER_DUAL        0x1516
-#define E1000_DEV_ID_82580_QUAD_FIBER         0x1527
-#define E1000_DEV_ID_DH89XXCC_SGMII           0x0438
-#define E1000_DEV_ID_DH89XXCC_SERDES          0x043A
-#define E1000_DEV_ID_DH89XXCC_BACKPLANE       0x043C
-#define E1000_DEV_ID_DH89XXCC_SFP             0x0440
-#define E1000_DEV_ID_I350_COPPER              0x1521
-#define E1000_DEV_ID_I350_FIBER               0x1522
-#define E1000_DEV_ID_I350_SERDES              0x1523
-#define E1000_DEV_ID_I350_SGMII               0x1524
-
-#define E1000_REVISION_2 2
-#define E1000_REVISION_4 4
-
-#define E1000_FUNC_0     0
-#define E1000_FUNC_1     1
-#define E1000_FUNC_2     2
-#define E1000_FUNC_3     3
-
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN2   6
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN3   9
-
-enum e1000_mac_type {
-       e1000_undefined = 0,
-       e1000_82575,
-       e1000_82576,
-       e1000_82580,
-       e1000_i350,
-       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_internal_serdes = 2,
-       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_82580,
-};
-
-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
-};
-
-/* 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;
-       u64 o2bgptc;
-       u64 o2bspc;
-       u64 b2ospc;
-       u64 b2ogprc;
-};
-
-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_mbx.h"
-
-struct e1000_mac_operations {
-       s32  (*check_for_link)(struct e1000_hw *);
-       s32  (*reset_hw)(struct e1000_hw *);
-       s32  (*init_hw)(struct e1000_hw *);
-       bool (*check_mng_mode)(struct e1000_hw *);
-       s32  (*setup_physical_interface)(struct e1000_hw *);
-       void (*rar_set)(struct e1000_hw *, u8 *, u32);
-       s32  (*read_mac_addr)(struct e1000_hw *);
-       s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
-};
-
-struct e1000_phy_operations {
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*check_polarity)(struct e1000_hw *);
-       s32  (*check_reset_block)(struct e1000_hw *);
-       s32  (*force_speed_duplex)(struct e1000_hw *);
-       s32  (*get_cfg_done)(struct e1000_hw *hw);
-       s32  (*get_cable_length)(struct e1000_hw *);
-       s32  (*get_phy_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);
-};
-
-struct e1000_nvm_operations {
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
-       void (*release)(struct e1000_hw *);
-       s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
-       s32  (*update)(struct e1000_hw *);
-       s32  (*validate)(struct e1000_hw *);
-};
-
-struct e1000_info {
-       s32 (*get_invariants)(struct e1000_hw *);
-       struct e1000_mac_operations *mac_ops;
-       struct e1000_phy_operations *phy_ops;
-       struct e1000_nvm_operations *nvm_ops;
-};
-
-extern const struct e1000_info e1000_82575_info;
-
-struct e1000_mac_info {
-       struct e1000_mac_operations ops;
-
-       u8 addr[6];
-       u8 perm_addr[6];
-
-       enum e1000_mac_type type;
-
-       u32 ledctl_default;
-       u32 ledctl_mode1;
-       u32 ledctl_mode2;
-       u32 mc_filter_type;
-       u32 txcw;
-
-       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 disable_hw_init_bits;
-       bool get_link_status;
-       bool ifs_params_forced;
-       bool in_ifs_mode;
-       bool report_tx_early;
-       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;
-
-       u32 snoop;
-
-       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; /* Type of flow control */
-       enum e1000_fc_mode requested_mode;
-};
-
-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;
-       bool eee_disable;
-};
-
-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;
-       } dev_spec;
-
-       u16 device_id;
-       u16 subsystem_vendor_id;
-       u16 subsystem_device_id;
-       u16 vendor_id;
-
-       u8  revision_id;
-};
-
-extern struct net_device *igb_get_hw_dev(struct e1000_hw *hw);
-#define hw_dbg(format, arg...) \
-       netdev_dbg(igb_get_hw_dev(hw), format, ##arg)
-
-/* 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 /* _E1000_HW_H_ */
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c
deleted file mode 100644 (file)
index 2b5ef76..0000000
+++ /dev/null
@@ -1,1421 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#include <linux/if_ether.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-
-#include "e1000_mac.h"
-
-#include "igb.h"
-
-static s32 igb_set_default_fc(struct e1000_hw *hw);
-static s32 igb_set_fc_watermarks(struct e1000_hw *hw);
-
-/**
- *  igb_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 igb_get_bus_info_pcie(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-       s32 ret_val;
-       u32 reg;
-       u16 pcie_link_status;
-
-       bus->type = e1000_bus_type_pci_express;
-
-       ret_val = igb_read_pcie_cap_reg(hw,
-                                       PCI_EXP_LNKSTA,
-                                       &pcie_link_status);
-       if (ret_val) {
-               bus->width = e1000_bus_width_unknown;
-               bus->speed = e1000_bus_speed_unknown;
-       } else {
-               switch (pcie_link_status & PCI_EXP_LNKSTA_CLS) {
-               case PCI_EXP_LNKSTA_CLS_2_5GB:
-                       bus->speed = e1000_bus_speed_2500;
-                       break;
-               case PCI_EXP_LNKSTA_CLS_5_0GB:
-                       bus->speed = e1000_bus_speed_5000;
-                       break;
-               default:
-                       bus->speed = e1000_bus_speed_unknown;
-                       break;
-               }
-
-               bus->width = (enum e1000_bus_width)((pcie_link_status &
-                                                    PCI_EXP_LNKSTA_NLW) >>
-                                                    PCI_EXP_LNKSTA_NLW_SHIFT);
-       }
-
-       reg = rd32(E1000_STATUS);
-       bus->func = (reg & E1000_STATUS_FUNC_MASK) >> E1000_STATUS_FUNC_SHIFT;
-
-       return 0;
-}
-
-/**
- *  igb_clear_vfta - 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(struct e1000_hw *hw)
-{
-       u32 offset;
-
-       for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-               array_wr32(E1000_VFTA, offset, 0);
-               wrfl();
-       }
-}
-
-/**
- *  igb_write_vfta - 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.
- **/
-static void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       array_wr32(E1000_VFTA, offset, value);
-       wrfl();
-}
-
-/**
- *  igb_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 igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
-{
-       u32 i;
-       u8 mac_addr[ETH_ALEN] = {0};
-
-       /* Setup the receive address */
-       hw_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 */
-       hw_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);
-}
-
-/**
- *  igb_vfta_set - enable or disable vlan in VLAN filter table
- *  @hw: pointer to the HW structure
- *  @vid: VLAN id to add or remove
- *  @add: if true add filter, if false remove
- *
- *  Sets or clears a bit in the VLAN filter table array based on VLAN id
- *  and if we are adding or removing the filter
- **/
-s32 igb_vfta_set(struct e1000_hw *hw, u32 vid, bool add)
-{
-       u32 index = (vid >> E1000_VFTA_ENTRY_SHIFT) & E1000_VFTA_ENTRY_MASK;
-       u32 mask = 1 << (vid & E1000_VFTA_ENTRY_BIT_SHIFT_MASK);
-       u32 vfta = array_rd32(E1000_VFTA, index);
-       s32 ret_val = 0;
-
-       /* bit was set/cleared before we started */
-       if ((!!(vfta & mask)) == add) {
-               ret_val = -E1000_ERR_CONFIG;
-       } else {
-               if (add)
-                       vfta |= mask;
-               else
-                       vfta &= ~mask;
-       }
-
-       igb_write_vfta(hw, index, vfta);
-
-       return ret_val;
-}
-
-/**
- *  igb_check_alt_mac_addr - 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 fopund it is saved in the hw struct and
- *  prgrammed into RAR0 and the cuntion returns success, otherwise the
- *  function returns an error.
- **/
-s32 igb_check_alt_mac_addr(struct e1000_hw *hw)
-{
-       u32 i;
-       s32 ret_val = 0;
-       u16 offset, nvm_alt_mac_addr_offset, nvm_data;
-       u8 alt_mac_addr[ETH_ALEN];
-
-       ret_val = hw->nvm.ops.read(hw, NVM_ALT_MAC_ADDR_PTR, 1,
-                                &nvm_alt_mac_addr_offset);
-       if (ret_val) {
-               hw_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_ALEN; i += 2) {
-               offset = nvm_alt_mac_addr_offset + (i >> 1);
-               ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data);
-               if (ret_val) {
-                       hw_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 (is_multicast_ether_addr(alt_mac_addr)) {
-               hw_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;
-}
-
-/**
- *  igb_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 igb_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.
-        */
-       wr32(E1000_RAL(index), rar_low);
-       wrfl();
-       wr32(E1000_RAH(index), rar_high);
-       wrfl();
-}
-
-/**
- *  igb_mta_set - 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(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 = array_rd32(E1000_MTA, hash_reg);
-
-       mta |= (1 << hash_bit);
-
-       array_wr32(E1000_MTA, hash_reg, mta);
-       wrfl();
-}
-
-/**
- *  igb_hash_mc_addr - 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()
- **/
-static u32 igb_hash_mc_addr(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;
-}
-
-/**
- *  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 entire 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)
-{
-       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 = igb_hash_mc_addr(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_ALEN);
-       }
-
-       /* replace the entire MTA table */
-       for (i = hw->mac.mta_reg_count - 1; i >= 0; i--)
-               array_wr32(E1000_MTA, i, hw->mac.mta_shadow[i]);
-       wrfl();
-}
-
-/**
- *  igb_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 igb_clear_hw_cntrs_base(struct e1000_hw *hw)
-{
-       rd32(E1000_CRCERRS);
-       rd32(E1000_SYMERRS);
-       rd32(E1000_MPC);
-       rd32(E1000_SCC);
-       rd32(E1000_ECOL);
-       rd32(E1000_MCC);
-       rd32(E1000_LATECOL);
-       rd32(E1000_COLC);
-       rd32(E1000_DC);
-       rd32(E1000_SEC);
-       rd32(E1000_RLEC);
-       rd32(E1000_XONRXC);
-       rd32(E1000_XONTXC);
-       rd32(E1000_XOFFRXC);
-       rd32(E1000_XOFFTXC);
-       rd32(E1000_FCRUC);
-       rd32(E1000_GPRC);
-       rd32(E1000_BPRC);
-       rd32(E1000_MPRC);
-       rd32(E1000_GPTC);
-       rd32(E1000_GORCL);
-       rd32(E1000_GORCH);
-       rd32(E1000_GOTCL);
-       rd32(E1000_GOTCH);
-       rd32(E1000_RNBC);
-       rd32(E1000_RUC);
-       rd32(E1000_RFC);
-       rd32(E1000_ROC);
-       rd32(E1000_RJC);
-       rd32(E1000_TORL);
-       rd32(E1000_TORH);
-       rd32(E1000_TOTL);
-       rd32(E1000_TOTH);
-       rd32(E1000_TPR);
-       rd32(E1000_TPT);
-       rd32(E1000_MPTC);
-       rd32(E1000_BPTC);
-}
-
-/**
- *  igb_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 igb_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 = 0;
-               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(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(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(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(hw);
-       if (ret_val)
-               hw_dbg("Error configuring flow control\n");
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_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 igb_setup_link(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-
-       /*
-        * In the case of the phy reset being blocked, we already have a link.
-        * We do not need to set it up again.
-        */
-       if (igb_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(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * We want to save off the original Flow Control configuration just
-        * in case we get disconnected and then reconnected into a different
-        * hub or switch with different Flow Control capabilities.
-        */
-       hw->fc.current_mode = hw->fc.requested_mode;
-
-       hw_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.
-        */
-       hw_dbg("Initializing the Flow Control address, type and timer regs\n");
-       wr32(E1000_FCT, FLOW_CONTROL_TYPE);
-       wr32(E1000_FCAH, FLOW_CONTROL_ADDRESS_HIGH);
-       wr32(E1000_FCAL, FLOW_CONTROL_ADDRESS_LOW);
-
-       wr32(E1000_FCTTV, hw->fc.pause_time);
-
-       ret_val = igb_set_fc_watermarks(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  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. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void igb_config_collision_dist(struct e1000_hw *hw)
-{
-       u32 tctl;
-
-       tctl = rd32(E1000_TCTL);
-
-       tctl &= ~E1000_TCTL_COLD;
-       tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT;
-
-       wr32(E1000_TCTL, tctl);
-       wrfl();
-}
-
-/**
- *  igb_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
- *  tansmission as well.
- **/
-static s32 igb_set_fc_watermarks(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       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;
-       }
-       wr32(E1000_FCRTL, fcrtl);
-       wr32(E1000_FCRTH, fcrth);
-
-       return ret_val;
-}
-
-/**
- *  igb_set_default_fc - 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(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       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 = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
-
-       if (ret_val) {
-               hw_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;
-}
-
-/**
- *  igb_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 igb_force_mac_fc(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = 0;
-
-       ctrl = rd32(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.
-        */
-       hw_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:
-               hw_dbg("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       wr32(E1000_CTRL, ctrl);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_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 igb_config_fc_after_link_up(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = 0;
-       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_internal_serdes)
-                       ret_val = igb_force_mac_fc(hw);
-       } else {
-               if (hw->phy.media_type == e1000_media_type_copper)
-                       ret_val = igb_force_mac_fc(hw);
-       }
-
-       if (ret_val) {
-               hw_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 = 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)) {
-                       hw_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 = 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;
-                               hw_dbg("Flow Control = FULL.\r\n");
-                       } else {
-                               hw->fc.current_mode = e1000_fc_rx_pause;
-                               hw_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;
-                       hw_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;
-                       hw_dbg("Flow Control = RX PAUSE frames only.\r\n");
-               }
-               /*
-                * Per the IEEE spec, at this point flow control should be
-                * disabled.  However, we want to consider that we could
-                * be connected to a legacy switch that doesn't advertise
-                * desired flow control, but can be forced on the link
-                * partner.  So if we advertised no flow control, that is
-                * what we will resolve to.  If we advertised some kind of
-                * receive capability (Rx Pause Only or Full Flow Control)
-                * and the link partner advertised none, we will configure
-                * ourselves to enable Rx Flow Control only.  We can do
-                * this safely for two reasons:  If the link partner really
-                * didn't want flow control enabled, and we enable Rx, no
-                * harm done since we won't be receiving any PAUSE frames
-                * anyway.  If the intent on the link partner was to have
-                * flow control enabled, then by us enabling RX only, we
-                * can at least receive pause frames and process them.
-                * This is a good idea because in most cases, since we are
-                * predominantly a server NIC, more times than not we will
-                * be asked to delay transmission of packets than asking
-                * our link partner to pause transmission of frames.
-                */
-               else if ((hw->fc.requested_mode == e1000_fc_none ||
-                         hw->fc.requested_mode == e1000_fc_tx_pause) ||
-                        hw->fc.strict_ieee) {
-                       hw->fc.current_mode = e1000_fc_none;
-                       hw_dbg("Flow Control = NONE.\r\n");
-               } else {
-                       hw->fc.current_mode = e1000_fc_rx_pause;
-                       hw_dbg("Flow Control = RX PAUSE frames only.\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 = hw->mac.ops.get_speed_and_duplex(hw, &speed, &duplex);
-               if (ret_val) {
-                       hw_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 = igb_force_mac_fc(hw);
-               if (ret_val) {
-                       hw_dbg("Error forcing flow control settings\n");
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_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 igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
-                                     u16 *duplex)
-{
-       u32 status;
-
-       status = rd32(E1000_STATUS);
-       if (status & E1000_STATUS_SPEED_1000) {
-               *speed = SPEED_1000;
-               hw_dbg("1000 Mbs, ");
-       } else if (status & E1000_STATUS_SPEED_100) {
-               *speed = SPEED_100;
-               hw_dbg("100 Mbs, ");
-       } else {
-               *speed = SPEED_10;
-               hw_dbg("10 Mbs, ");
-       }
-
-       if (status & E1000_STATUS_FD) {
-               *duplex = FULL_DUPLEX;
-               hw_dbg("Full Duplex\n");
-       } else {
-               *duplex = HALF_DUPLEX;
-               hw_dbg("Half Duplex\n");
-       }
-
-       return 0;
-}
-
-/**
- *  igb_get_hw_semaphore - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore to access the PHY or NVM
- **/
-s32 igb_get_hw_semaphore(struct e1000_hw *hw)
-{
-       u32 swsm;
-       s32 ret_val = 0;
-       s32 timeout = hw->nvm.word_size + 1;
-       s32 i = 0;
-
-       /* Get the SW semaphore */
-       while (i < timeout) {
-               swsm = rd32(E1000_SWSM);
-               if (!(swsm & E1000_SWSM_SMBI))
-                       break;
-
-               udelay(50);
-               i++;
-       }
-
-       if (i == timeout) {
-               hw_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 = rd32(E1000_SWSM);
-               wr32(E1000_SWSM, swsm | E1000_SWSM_SWESMBI);
-
-               /* Semaphore acquired if bit latched */
-               if (rd32(E1000_SWSM) & E1000_SWSM_SWESMBI)
-                       break;
-
-               udelay(50);
-       }
-
-       if (i == timeout) {
-               /* Release semaphores */
-               igb_put_hw_semaphore(hw);
-               hw_dbg("Driver can't access the NVM\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_put_hw_semaphore - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- **/
-void igb_put_hw_semaphore(struct e1000_hw *hw)
-{
-       u32 swsm;
-
-       swsm = rd32(E1000_SWSM);
-
-       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
-
-       wr32(E1000_SWSM, swsm);
-}
-
-/**
- *  igb_get_auto_rd_done - Check for auto read completion
- *  @hw: pointer to the HW structure
- *
- *  Check EEPROM for Auto Read done bit.
- **/
-s32 igb_get_auto_rd_done(struct e1000_hw *hw)
-{
-       s32 i = 0;
-       s32 ret_val = 0;
-
-
-       while (i < AUTO_READ_DONE_TIMEOUT) {
-               if (rd32(E1000_EECD) & E1000_EECD_AUTO_RD)
-                       break;
-               msleep(1);
-               i++;
-       }
-
-       if (i == AUTO_READ_DONE_TIMEOUT) {
-               hw_dbg("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 - 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(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       ret_val = hw->nvm.ops.read(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               hw_dbg("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_id_led_init -
- *  @hw: pointer to the HW structure
- *
- **/
-s32 igb_id_led_init(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;
-
-       ret_val = igb_valid_led_default(hw, &data);
-       if (ret_val)
-               goto out;
-
-       mac->ledctl_default = rd32(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;
-}
-
-/**
- *  igb_cleanup_led - 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(struct e1000_hw *hw)
-{
-       wr32(E1000_LEDCTL, hw->mac.ledctl_default);
-       return 0;
-}
-
-/**
- *  igb_blink_led - Blink LED
- *  @hw: pointer to the HW structure
- *
- *  Blink the led's which are set to be on.
- **/
-s32 igb_blink_led(struct e1000_hw *hw)
-{
-       u32 ledctl_blink = 0;
-       u32 i;
-
-       /*
-        * 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));
-
-       wr32(E1000_LEDCTL, ledctl_blink);
-
-       return 0;
-}
-
-/**
- *  igb_led_off - Turn LED off
- *  @hw: pointer to the HW structure
- *
- *  Turn LED off.
- **/
-s32 igb_led_off(struct e1000_hw *hw)
-{
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               wr32(E1000_LEDCTL, hw->mac.ledctl_mode1);
-               break;
-       default:
-               break;
-       }
-
-       return 0;
-}
-
-/**
- *  igb_disable_pcie_master - Disables PCI-express master access
- *  @hw: pointer to the HW structure
- *
- *  Returns 0 (0) if successful, else returns -10
- *  (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not casued
- *  the master requests to be disabled.
- *
- *  Disables PCI-Express master access and verifies there are no pending
- *  requests.
- **/
-s32 igb_disable_pcie_master(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 timeout = MASTER_DISABLE_TIMEOUT;
-       s32 ret_val = 0;
-
-       if (hw->bus.type != e1000_bus_type_pci_express)
-               goto out;
-
-       ctrl = rd32(E1000_CTRL);
-       ctrl |= E1000_CTRL_GIO_MASTER_DISABLE;
-       wr32(E1000_CTRL, ctrl);
-
-       while (timeout) {
-               if (!(rd32(E1000_STATUS) &
-                     E1000_STATUS_GIO_MASTER_ENABLE))
-                       break;
-               udelay(100);
-               timeout--;
-       }
-
-       if (!timeout) {
-               hw_dbg("Master requests are pending.\n");
-               ret_val = -E1000_ERR_MASTER_REQUESTS_PENDING;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_validate_mdi_setting - Verify MDI/MDIx settings
- *  @hw: pointer to the HW structure
- *
- *  Verify that when not using auto-negotitation that MDI/MDIx is correctly
- *  set, which is forced to MDI mode only.
- **/
-s32 igb_validate_mdi_setting(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-
-       if (!hw->mac.autoneg && (hw->phy.mdix == 0 || hw->phy.mdix == 3)) {
-               hw_dbg("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 - 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(struct e1000_hw *hw, u32 reg,
-                             u32 offset, u8 data)
-{
-       u32 i, regvalue = 0;
-       s32 ret_val = 0;
-
-       /* Set up the address and data */
-       regvalue = ((u32)data) | (offset << E1000_GEN_CTL_ADDRESS_SHIFT);
-       wr32(reg, regvalue);
-
-       /* Poll the ready bit to see if the MDI read completed */
-       for (i = 0; i < E1000_GEN_POLL_TIMEOUT; i++) {
-               udelay(5);
-               regvalue = rd32(reg);
-               if (regvalue & E1000_GEN_CTL_READY)
-                       break;
-       }
-       if (!(regvalue & E1000_GEN_CTL_READY)) {
-               hw_dbg("Reg %08x did not indicate ready\n", reg);
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_enable_mng_pass_thru - Enable processing of ARP's
- *  @hw: pointer to the HW structure
- *
- *  Verifies the hardware needs to leave interface enabled so that frames can
- *  be directed to and from the management interface.
- **/
-bool igb_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 = rd32(E1000_MANC);
-
-       if (!(manc & E1000_MANC_RCV_TCO_EN))
-               goto out;
-
-       if (hw->mac.arc_subsystem_valid) {
-               fwsm = rd32(E1000_FWSM);
-               factps = rd32(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;
-}
diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/igb/e1000_mac.h
deleted file mode 100644 (file)
index 4927f61..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_MAC_H_
-#define _E1000_MAC_H_
-
-#include "e1000_hw.h"
-
-#include "e1000_phy.h"
-#include "e1000_nvm.h"
-#include "e1000_defines.h"
-
-/*
- * Functions that should not be called directly from drivers but can be used
- * by other files in this 'shared code'
- */
-s32  igb_blink_led(struct e1000_hw *hw);
-s32  igb_check_for_copper_link(struct e1000_hw *hw);
-s32  igb_cleanup_led(struct e1000_hw *hw);
-s32  igb_config_fc_after_link_up(struct e1000_hw *hw);
-s32  igb_disable_pcie_master(struct e1000_hw *hw);
-s32  igb_force_mac_fc(struct e1000_hw *hw);
-s32  igb_get_auto_rd_done(struct e1000_hw *hw);
-s32  igb_get_bus_info_pcie(struct e1000_hw *hw);
-s32  igb_get_hw_semaphore(struct e1000_hw *hw);
-s32  igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
-                                      u16 *duplex);
-s32  igb_id_led_init(struct e1000_hw *hw);
-s32  igb_led_off(struct e1000_hw *hw);
-void igb_update_mc_addr_list(struct e1000_hw *hw,
-                            u8 *mc_addr_list, u32 mc_addr_count);
-s32  igb_setup_link(struct e1000_hw *hw);
-s32  igb_validate_mdi_setting(struct e1000_hw *hw);
-s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,
-                              u32 offset, u8 data);
-
-void igb_clear_hw_cntrs_base(struct e1000_hw *hw);
-void igb_clear_vfta(struct e1000_hw *hw);
-s32  igb_vfta_set(struct e1000_hw *hw, u32 vid, bool add);
-void igb_config_collision_dist(struct e1000_hw *hw);
-void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
-void igb_mta_set(struct e1000_hw *hw, u32 hash_value);
-void igb_put_hw_semaphore(struct e1000_hw *hw);
-void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
-s32  igb_check_alt_mac_addr(struct e1000_hw *hw);
-
-bool igb_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_DHCP_COOKIE_STATUS_VLAN    0x2
-
-extern void e1000_init_function_pointers_82575(struct e1000_hw *hw);
-
-#endif
diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/igb/e1000_mbx.c
deleted file mode 100644 (file)
index 74f2f11..0000000
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#include "e1000_mbx.h"
-
-/**
- *  igb_read_mbx - Reads a message from the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to read
- *
- *  returns SUCCESS if it successfuly read message from buffer
- **/
-s32 igb_read_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       /* limit read to size of mailbox */
-       if (size > mbx->size)
-               size = mbx->size;
-
-       if (mbx->ops.read)
-               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  igb_write_mbx - Write a message to the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully copied message into the buffer
- **/
-s32 igb_write_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = 0;
-
-       if (size > mbx->size)
-               ret_val = -E1000_ERR_MBX;
-
-       else if (mbx->ops.write)
-               ret_val = mbx->ops.write(hw, msg, size, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  igb_check_for_msg - checks to see if someone sent us mail
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to check
- *
- *  returns SUCCESS if the Status bit was found or else ERR_MBX
- **/
-s32 igb_check_for_msg(struct e1000_hw *hw, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (mbx->ops.check_for_msg)
-               ret_val = mbx->ops.check_for_msg(hw, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  igb_check_for_ack - checks to see if someone sent us ACK
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to check
- *
- *  returns SUCCESS if the Status bit was found or else ERR_MBX
- **/
-s32 igb_check_for_ack(struct e1000_hw *hw, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (mbx->ops.check_for_ack)
-               ret_val = mbx->ops.check_for_ack(hw, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  igb_check_for_rst - checks to see if other side has reset
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to check
- *
- *  returns SUCCESS if the Status bit was found or else ERR_MBX
- **/
-s32 igb_check_for_rst(struct e1000_hw *hw, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (mbx->ops.check_for_rst)
-               ret_val = mbx->ops.check_for_rst(hw, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  igb_poll_for_msg - Wait for message notification
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully received a message notification
- **/
-static s32 igb_poll_for_msg(struct e1000_hw *hw, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       if (!countdown || !mbx->ops.check_for_msg)
-               goto out;
-
-       while (countdown && mbx->ops.check_for_msg(hw, mbx_id)) {
-               countdown--;
-               if (!countdown)
-                       break;
-               udelay(mbx->usec_delay);
-       }
-
-       /* if we failed, all future posted messages fail until reset */
-       if (!countdown)
-               mbx->timeout = 0;
-out:
-       return countdown ? 0 : -E1000_ERR_MBX;
-}
-
-/**
- *  igb_poll_for_ack - Wait for message acknowledgement
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully received a message acknowledgement
- **/
-static s32 igb_poll_for_ack(struct e1000_hw *hw, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       if (!countdown || !mbx->ops.check_for_ack)
-               goto out;
-
-       while (countdown && mbx->ops.check_for_ack(hw, mbx_id)) {
-               countdown--;
-               if (!countdown)
-                       break;
-               udelay(mbx->usec_delay);
-       }
-
-       /* if we failed, all future posted messages fail until reset */
-       if (!countdown)
-               mbx->timeout = 0;
-out:
-       return countdown ? 0 : -E1000_ERR_MBX;
-}
-
-/**
- *  igb_read_posted_mbx - Wait for message notification and receive message
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully received a message notification and
- *  copied it into the receive buffer.
- **/
-static s32 igb_read_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (!mbx->ops.read)
-               goto out;
-
-       ret_val = igb_poll_for_msg(hw, mbx_id);
-
-       if (!ret_val)
-               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_posted_mbx - Write a message to the mailbox, wait for ack
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully copied message into the buffer and
- *  received an ack to that message within delay * timeout period
- **/
-static s32 igb_write_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       /* exit if either we can't write or there isn't a defined timeout */
-       if (!mbx->ops.write || !mbx->timeout)
-               goto out;
-
-       /* send msg */
-       ret_val = mbx->ops.write(hw, msg, size, mbx_id);
-
-       /* if msg sent wait until we receive an ack */
-       if (!ret_val)
-               ret_val = igb_poll_for_ack(hw, mbx_id);
-out:
-       return ret_val;
-}
-
-static s32 igb_check_for_bit_pf(struct e1000_hw *hw, u32 mask)
-{
-       u32 mbvficr = rd32(E1000_MBVFICR);
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (mbvficr & mask) {
-               ret_val = 0;
-               wr32(E1000_MBVFICR, mask);
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_check_for_msg_pf - checks to see if the VF has sent mail
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
- **/
-static s32 igb_check_for_msg_pf(struct e1000_hw *hw, u16 vf_number)
-{
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (!igb_check_for_bit_pf(hw, E1000_MBVFICR_VFREQ_VF1 << vf_number)) {
-               ret_val = 0;
-               hw->mbx.stats.reqs++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_check_for_ack_pf - checks to see if the VF has ACKed
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
- **/
-static s32 igb_check_for_ack_pf(struct e1000_hw *hw, u16 vf_number)
-{
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (!igb_check_for_bit_pf(hw, E1000_MBVFICR_VFACK_VF1 << vf_number)) {
-               ret_val = 0;
-               hw->mbx.stats.acks++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_check_for_rst_pf - checks to see if the VF has reset
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
- **/
-static s32 igb_check_for_rst_pf(struct e1000_hw *hw, u16 vf_number)
-{
-       u32 vflre = rd32(E1000_VFLRE);
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (vflre & (1 << vf_number)) {
-               ret_val = 0;
-               wr32(E1000_VFLRE, (1 << vf_number));
-               hw->mbx.stats.rsts++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_obtain_mbx_lock_pf - obtain mailbox lock
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  return SUCCESS if we obtained the mailbox lock
- **/
-static s32 igb_obtain_mbx_lock_pf(struct e1000_hw *hw, u16 vf_number)
-{
-       s32 ret_val = -E1000_ERR_MBX;
-       u32 p2v_mailbox;
-
-
-       /* Take ownership of the buffer */
-       wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_PFU);
-
-       /* reserve mailbox for vf use */
-       p2v_mailbox = rd32(E1000_P2VMAILBOX(vf_number));
-       if (p2v_mailbox & E1000_P2VMAILBOX_PFU)
-               ret_val = 0;
-
-       return ret_val;
-}
-
-/**
- *  igb_write_mbx_pf - Places a message in the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if it successfully copied message into the buffer
- **/
-static s32 igb_write_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
-                              u16 vf_number)
-{
-       s32 ret_val;
-       u16 i;
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       ret_val = igb_obtain_mbx_lock_pf(hw, vf_number);
-       if (ret_val)
-               goto out_no_write;
-
-       /* flush msg and acks as we are overwriting the message buffer */
-       igb_check_for_msg_pf(hw, vf_number);
-       igb_check_for_ack_pf(hw, vf_number);
-
-       /* copy the caller specified message to the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               array_wr32(E1000_VMBMEM(vf_number), i, msg[i]);
-
-       /* Interrupt VF to tell it a message has been sent and release buffer*/
-       wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_STS);
-
-       /* update stats */
-       hw->mbx.stats.msgs_tx++;
-
-out_no_write:
-       return ret_val;
-
-}
-
-/**
- *  igb_read_mbx_pf - Read a message from the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @vf_number: the VF index
- *
- *  This function copies a message from the mailbox buffer to the caller's
- *  memory buffer.  The presumption is that the caller knows that there was
- *  a message due to a VF request so no polling for message is needed.
- **/
-static s32 igb_read_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
-                             u16 vf_number)
-{
-       s32 ret_val;
-       u16 i;
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       ret_val = igb_obtain_mbx_lock_pf(hw, vf_number);
-       if (ret_val)
-               goto out_no_read;
-
-       /* copy the message to the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               msg[i] = array_rd32(E1000_VMBMEM(vf_number), i);
-
-       /* Acknowledge the message and release buffer */
-       wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_ACK);
-
-       /* update stats */
-       hw->mbx.stats.msgs_rx++;
-
-out_no_read:
-       return ret_val;
-}
-
-/**
- *  e1000_init_mbx_params_pf - set initial values for pf mailbox
- *  @hw: pointer to the HW structure
- *
- *  Initializes the hw->mbx struct to correct values for pf mailbox
- */
-s32 igb_init_mbx_params_pf(struct e1000_hw *hw)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-
-       mbx->timeout = 0;
-       mbx->usec_delay = 0;
-
-       mbx->size = E1000_VFMAILBOX_SIZE;
-
-       mbx->ops.read = igb_read_mbx_pf;
-       mbx->ops.write = igb_write_mbx_pf;
-       mbx->ops.read_posted = igb_read_posted_mbx;
-       mbx->ops.write_posted = igb_write_posted_mbx;
-       mbx->ops.check_for_msg = igb_check_for_msg_pf;
-       mbx->ops.check_for_ack = igb_check_for_ack_pf;
-       mbx->ops.check_for_rst = igb_check_for_rst_pf;
-
-       mbx->stats.msgs_tx = 0;
-       mbx->stats.msgs_rx = 0;
-       mbx->stats.reqs = 0;
-       mbx->stats.acks = 0;
-       mbx->stats.rsts = 0;
-
-       return 0;
-}
-
diff --git a/drivers/net/igb/e1000_mbx.h b/drivers/net/igb/e1000_mbx.h
deleted file mode 100644 (file)
index eddb0f8..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_MBX_H_
-#define _E1000_MBX_H_
-
-#include "e1000_hw.h"
-
-#define E1000_P2VMAILBOX_STS   0x00000001 /* Initiate message send to VF */
-#define E1000_P2VMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
-#define E1000_P2VMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
-#define E1000_P2VMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
-#define E1000_P2VMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
-
-#define E1000_MBVFICR_VFREQ_MASK 0x000000FF /* bits for VF messages */
-#define E1000_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
-#define E1000_MBVFICR_VFACK_MASK 0x00FF0000 /* bits for VF acks */
-#define E1000_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
-
-#define E1000_VFMAILBOX_SIZE   16 /* 16 32 bit words - 64 bytes */
-
-/* If it's a E1000_VF_* msg then it originates in the VF and is sent to the
- * PF.  The reverse is true if it is E1000_PF_*.
- * Message ACK's are the value or'd with 0xF0000000
- */
-#define E1000_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
-                                               * this are the ACK */
-#define E1000_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
-                                               * this are the NACK */
-#define E1000_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
-                                                 clear to send requests */
-#define E1000_VT_MSGINFO_SHIFT    16
-/* bits 23:16 are used for exra info for certain messages */
-#define E1000_VT_MSGINFO_MASK     (0xFF << E1000_VT_MSGINFO_SHIFT)
-
-#define E1000_VF_RESET            0x01 /* VF requests reset */
-#define E1000_VF_SET_MAC_ADDR     0x02 /* VF requests to set MAC addr */
-#define E1000_VF_SET_MULTICAST    0x03 /* VF requests to set MC addr */
-#define E1000_VF_SET_VLAN         0x04 /* VF requests to set VLAN */
-#define E1000_VF_SET_LPE          0x05 /* VF requests to set VMOLR.LPE */
-#define E1000_VF_SET_PROMISC      0x06 /*VF requests to clear VMOLR.ROPE/MPME*/
-#define E1000_VF_SET_PROMISC_MULTICAST    (0x02 << E1000_VT_MSGINFO_SHIFT)
-
-#define E1000_PF_CONTROL_MSG      0x0100 /* PF control message */
-
-s32 igb_read_mbx(struct e1000_hw *, u32 *, u16, u16);
-s32 igb_write_mbx(struct e1000_hw *, u32 *, u16, u16);
-s32 igb_check_for_msg(struct e1000_hw *, u16);
-s32 igb_check_for_ack(struct e1000_hw *, u16);
-s32 igb_check_for_rst(struct e1000_hw *, u16);
-s32 igb_init_mbx_params_pf(struct e1000_hw *);
-
-#endif /* _E1000_MBX_H_ */
diff --git a/drivers/net/igb/e1000_nvm.c b/drivers/net/igb/e1000_nvm.c
deleted file mode 100644 (file)
index 4040712..0000000
+++ /dev/null
@@ -1,713 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#include <linux/if_ether.h>
-#include <linux/delay.h>
-
-#include "e1000_mac.h"
-#include "e1000_nvm.h"
-
-/**
- *  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;
-       wr32(E1000_EECD, *eecd);
-       wrfl();
-       udelay(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;
-       wr32(E1000_EECD, *eecd);
-       wrfl();
-       udelay(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 = rd32(E1000_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;
-
-               wr32(E1000_EECD, eecd);
-               wrfl();
-
-               udelay(nvm->delay_usec);
-
-               igb_raise_eec_clk(hw, &eecd);
-               igb_lower_eec_clk(hw, &eecd);
-
-               mask >>= 1;
-       } while (mask);
-
-       eecd &= ~E1000_EECD_DI;
-       wr32(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;
-
-       eecd = rd32(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 = rd32(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'.
- **/
-static 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;
-
-       for (i = 0; i < attempts; i++) {
-               if (ee_reg == E1000_NVM_POLL_READ)
-                       reg = rd32(E1000_EERD);
-               else
-                       reg = rd32(E1000_EEWR);
-
-               if (reg & E1000_NVM_RW_REG_DONE) {
-                       ret_val = 0;
-                       break;
-               }
-
-               udelay(5);
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_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 igb_acquire_nvm(struct e1000_hw *hw)
-{
-       u32 eecd = rd32(E1000_EECD);
-       s32 timeout = E1000_NVM_GRANT_ATTEMPTS;
-       s32 ret_val = 0;
-
-
-       wr32(E1000_EECD, eecd | E1000_EECD_REQ);
-       eecd = rd32(E1000_EECD);
-
-       while (timeout) {
-               if (eecd & E1000_EECD_GNT)
-                       break;
-               udelay(5);
-               eecd = rd32(E1000_EECD);
-               timeout--;
-       }
-
-       if (!timeout) {
-               eecd &= ~E1000_EECD_REQ;
-               wr32(E1000_EECD, eecd);
-               hw_dbg("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 = rd32(E1000_EECD);
-
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               /* Toggle CS to flush commands */
-               eecd |= E1000_EECD_CS;
-               wr32(E1000_EECD, eecd);
-               wrfl();
-               udelay(nvm->delay_usec);
-               eecd &= ~E1000_EECD_CS;
-               wr32(E1000_EECD, eecd);
-               wrfl();
-               udelay(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.
- **/
-static void e1000_stop_nvm(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       eecd = rd32(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 - 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(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       e1000_stop_nvm(hw);
-
-       eecd = rd32(E1000_EECD);
-       eecd &= ~E1000_EECD_REQ;
-       wr32(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 = rd32(E1000_EECD);
-       s32 ret_val = 0;
-       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);
-               wr32(E1000_EECD, eecd);
-               wrfl();
-               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) {
-                       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;
-
-                       udelay(5);
-                       igb_standby_nvm(hw);
-                       timeout--;
-               }
-
-               if (!timeout) {
-                       hw_dbg("SPI NVM Status error\n");
-                       ret_val = -E1000_ERR_NVM;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_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 igb_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;
-
-       /*
-        * 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)) {
-               hw_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;
-
-       ret_val = igb_ready_nvm_eeprom(hw);
-       if (ret_val)
-               goto release;
-
-       igb_standby_nvm(hw);
-
-       if ((nvm->address_bits == 8) && (offset >= 128))
-               read_opcode |= NVM_A8_OPCODE_SPI;
-
-       /* Send the READ command (opcode + addr) */
-       igb_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);
-       igb_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 = igb_shift_in_eec_bits(hw, 16);
-               data[i] = (word_in >> 8) | (word_in << 8);
-       }
-
-release:
-       nvm->ops.release(hw);
-
-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 = 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)) {
-               hw_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;
-
-               wr32(E1000_EERD, eerd);
-               ret_val = igb_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
-               if (ret_val)
-                       break;
-
-               data[i] = (rd32(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 likley 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;
-
-       /*
-        * 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)) {
-               hw_dbg("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       ret_val = hw->nvm.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       msleep(10);
-
-       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;
-                       }
-               }
-       }
-
-       msleep(10);
-release:
-       hw->nvm.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_part_string - Read device part number
- *  @hw: pointer to the HW structure
- *  @part_num: pointer to device part number
- *  @part_num_size: size of part number buffer
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in part_num.
- **/
-s32 igb_read_part_string(struct e1000_hw *hw, u8 *part_num, u32 part_num_size)
-{
-       s32 ret_val;
-       u16 nvm_data;
-       u16 pointer;
-       u16 offset;
-       u16 length;
-
-       if (part_num == NULL) {
-               hw_dbg("PBA string buffer was null\n");
-               ret_val = E1000_ERR_INVALID_ARGUMENT;
-               goto out;
-       }
-
-       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
-       if (ret_val) {
-               hw_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_1, 1, &pointer);
-       if (ret_val) {
-               hw_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       /*
-        * if nvm_data is not ptr guard the PBA must be in legacy format which
-        * means pointer is actually our second data word for the PBA number
-        * and we can decode it into an ascii string
-        */
-       if (nvm_data != NVM_PBA_PTR_GUARD) {
-               hw_dbg("NVM PBA number is not stored as string\n");
-
-               /* we will need 11 characters to store the PBA */
-               if (part_num_size < 11) {
-                       hw_dbg("PBA string buffer too small\n");
-                       return E1000_ERR_NO_SPACE;
-               }
-
-               /* extract hex string from data and pointer */
-               part_num[0] = (nvm_data >> 12) & 0xF;
-               part_num[1] = (nvm_data >> 8) & 0xF;
-               part_num[2] = (nvm_data >> 4) & 0xF;
-               part_num[3] = nvm_data & 0xF;
-               part_num[4] = (pointer >> 12) & 0xF;
-               part_num[5] = (pointer >> 8) & 0xF;
-               part_num[6] = '-';
-               part_num[7] = 0;
-               part_num[8] = (pointer >> 4) & 0xF;
-               part_num[9] = pointer & 0xF;
-
-               /* put a null character on the end of our string */
-               part_num[10] = '\0';
-
-               /* switch all the data but the '-' to hex char */
-               for (offset = 0; offset < 10; offset++) {
-                       if (part_num[offset] < 0xA)
-                               part_num[offset] += '0';
-                       else if (part_num[offset] < 0x10)
-                               part_num[offset] += 'A' - 0xA;
-               }
-
-               goto out;
-       }
-
-       ret_val = hw->nvm.ops.read(hw, pointer, 1, &length);
-       if (ret_val) {
-               hw_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       if (length == 0xFFFF || length == 0) {
-               hw_dbg("NVM PBA number section invalid length\n");
-               ret_val = E1000_ERR_NVM_PBA_SECTION;
-               goto out;
-       }
-       /* check if part_num buffer is big enough */
-       if (part_num_size < (((u32)length * 2) - 1)) {
-               hw_dbg("PBA string buffer too small\n");
-               ret_val = E1000_ERR_NO_SPACE;
-               goto out;
-       }
-
-       /* trim pba length from start of string */
-       pointer++;
-       length--;
-
-       for (offset = 0; offset < length; offset++) {
-               ret_val = hw->nvm.ops.read(hw, pointer + offset, 1, &nvm_data);
-               if (ret_val) {
-                       hw_dbg("NVM Read Error\n");
-                       goto out;
-               }
-               part_num[offset * 2] = (u8)(nvm_data >> 8);
-               part_num[(offset * 2) + 1] = (u8)(nvm_data & 0xFF);
-       }
-       part_num[offset * 2] = '\0';
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_mac_addr - 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(struct e1000_hw *hw)
-{
-       u32 rar_high;
-       u32 rar_low;
-       u16 i;
-
-       rar_high = rd32(E1000_RAH(0));
-       rar_low = rd32(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_ALEN; i++)
-               hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-       return 0;
-}
-
-/**
- *  igb_validate_nvm_checksum - 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(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       hw_dbg("NVM Read Error\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-
-       if (checksum != (u16) NVM_SUM) {
-               hw_dbg("NVM Checksum Invalid\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_update_nvm_checksum - 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(struct e1000_hw *hw)
-{
-       s32  ret_val;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       for (i = 0; i < NVM_CHECKSUM_REG; i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       hw_dbg("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)
-               hw_dbg("NVM Write Error while updating checksum.\n");
-
-out:
-       return ret_val;
-}
-
diff --git a/drivers/net/igb/e1000_nvm.h b/drivers/net/igb/e1000_nvm.h
deleted file mode 100644 (file)
index a2a7ca9..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_NVM_H_
-#define _E1000_NVM_H_
-
-s32  igb_acquire_nvm(struct e1000_hw *hw);
-void igb_release_nvm(struct e1000_hw *hw);
-s32  igb_read_mac_addr(struct e1000_hw *hw);
-s32  igb_read_part_num(struct e1000_hw *hw, u32 *part_num);
-s32  igb_read_part_string(struct e1000_hw *hw, u8 *part_num,
-                          u32 part_num_size);
-s32  igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
-s32  igb_read_nvm_spi(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_validate_nvm_checksum(struct e1000_hw *hw);
-s32  igb_update_nvm_checksum(struct e1000_hw *hw);
-
-#endif
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c
deleted file mode 100644 (file)
index e662554..0000000
+++ /dev/null
@@ -1,2341 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#include <linux/if_ether.h>
-#include <linux/delay.h>
-
-#include "e1000_mac.h"
-#include "e1000_phy.h"
-
-static s32  igb_phy_setup_autoneg(struct e1000_hw *hw);
-static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw,
-                                              u16 *phy_ctrl);
-static s32  igb_wait_autoneg(struct e1000_hw *hw);
-
-/* 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]))
-
-/**
- *  igb_check_reset_block - 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 0, otherwise
- *  return E1000_BLK_PHY_RESET (12).
- **/
-s32 igb_check_reset_block(struct e1000_hw *hw)
-{
-       u32 manc;
-
-       manc = rd32(E1000_MANC);
-
-       return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-              E1000_BLK_PHY_RESET : 0;
-}
-
-/**
- *  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 = 0;
-       u16 phy_id;
-
-       ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-       if (ret_val)
-               goto out;
-
-       phy->id = (u32)(phy_id << 16);
-       udelay(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 - Reset PHY DSP
- *  @hw: pointer to the HW structure
- *
- *  Reset the digital signal processor.
- **/
-static s32 igb_phy_reset_dsp(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-
-       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 regsiter 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 = 0;
-
-       if (offset > MAX_PHY_REG_ADDRESS) {
-               hw_dbg("PHY Address %d is out of range\n", offset);
-               ret_val = -E1000_ERR_PARAM;
-               goto out;
-       }
-
-       /*
-        * 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));
-
-       wr32(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++) {
-               udelay(50);
-               mdic = rd32(E1000_MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               hw_dbg("MDI Read did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               hw_dbg("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 = 0;
-
-       if (offset > MAX_PHY_REG_ADDRESS) {
-               hw_dbg("PHY Address %d is out of range\n", offset);
-               ret_val = -E1000_ERR_PARAM;
-               goto out;
-       }
-
-       /*
-        * 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));
-
-       wr32(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++) {
-               udelay(50);
-               mdic = rd32(E1000_MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               hw_dbg("MDI Write did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               hw_dbg("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;
-
-
-       /*
-        * 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));
-
-       wr32(E1000_I2CCMD, i2ccmd);
-
-       /* Poll the ready bit to see if the I2C read completed */
-       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
-               udelay(50);
-               i2ccmd = rd32(E1000_I2CCMD);
-               if (i2ccmd & E1000_I2CCMD_READY)
-                       break;
-       }
-       if (!(i2ccmd & E1000_I2CCMD_READY)) {
-               hw_dbg("I2CCMD Read did not complete\n");
-               return -E1000_ERR_PHY;
-       }
-       if (i2ccmd & E1000_I2CCMD_ERROR) {
-               hw_dbg("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 0;
-}
-
-/**
- *  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;
-
-
-       /* 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);
-
-       wr32(E1000_I2CCMD, i2ccmd);
-
-       /* Poll the ready bit to see if the I2C read completed */
-       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
-               udelay(50);
-               i2ccmd = rd32(E1000_I2CCMD);
-               if (i2ccmd & E1000_I2CCMD_READY)
-                       break;
-       }
-       if (!(i2ccmd & E1000_I2CCMD_READY)) {
-               hw_dbg("I2CCMD Write did not complete\n");
-               return -E1000_ERR_PHY;
-       }
-       if (i2ccmd & E1000_I2CCMD_ERROR) {
-               hw_dbg("I2CCMD Error bit set\n");
-               return -E1000_ERR_PHY;
-       }
-
-       return 0;
-}
-
-/**
- *  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, 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_igp(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val = 0;
-
-       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) {
-                       hw->phy.ops.release(hw);
-                       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_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 igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val = 0;
-
-       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) {
-                       hw->phy.ops.release(hw);
-                       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_copper_link_setup_82580 - Setup 82580 PHY for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up Carrier-sense on Transmit and downshift values.
- **/
-s32 igb_copper_link_setup_82580(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-
-
-       if (phy->reset_disable) {
-               ret_val = 0;
-               goto out;
-       }
-
-       if (phy->type == e1000_phy_82580) {
-               ret_val = hw->phy.ops.reset(hw);
-               if (ret_val) {
-                       hw_dbg("Error resetting the PHY.\n");
-                       goto out;
-               }
-       }
-
-       /* Enable CRS on TX. This must be set for half-duplex operation. */
-       ret_val = phy->ops.read_reg(hw, I82580_CFG_REG, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= I82580_CFG_ASSERT_CRS_ON_TX;
-
-       /* Enable downshift */
-       phy_data |= I82580_CFG_ENABLE_DOWNSHIFT;
-
-       ret_val = phy->ops.write_reg(hw, I82580_CFG_REG, phy_data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  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;
-
-       if (phy->reset_disable) {
-               ret_val = 0;
-               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 = igb_phy_sw_reset(hw);
-       if (ret_val) {
-               hw_dbg("Error committing the PHY changes\n");
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_copper_link_setup_m88_gen2 - Setup m88 PHY's for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up MDI/MDI-X and polarity for i347-AT4, m88e1322 and m88e1112 PHY's.
- *  Also enables and sets the downshift parameters.
- **/
-s32 igb_copper_link_setup_m88_gen2(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-
-       if (phy->reset_disable) {
-               ret_val = 0;
-               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;
-
-       /*
-        * 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:
-               /* M88E1112 does not support this mode) */
-               if (phy->id != M88E1112_E_PHY_ID) {
-                       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 and setting it to X6 */
-       phy_data &= ~I347AT4_PSCR_DOWNSHIFT_MASK;
-       phy_data |= I347AT4_PSCR_DOWNSHIFT_6X;
-       phy_data |= I347AT4_PSCR_DOWNSHIFT_ENABLE;
-
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /* Commit the changes. */
-       ret_val = igb_phy_sw_reset(hw);
-       if (ret_val) {
-               hw_dbg("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;
-
-       if (phy->reset_disable) {
-               ret_val = 0;
-               goto out;
-       }
-
-       ret_val = phy->ops.reset(hw);
-       if (ret_val) {
-               hw_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 */
-               if (phy->ops.set_d3_lplu_state)
-                       ret_val = phy->ops.set_d3_lplu_state(hw, false);
-               if (ret_val) {
-                       hw_dbg("Error Disabling LPLU D3\n");
-                       goto out;
-               }
-       }
-
-       /* disable lplu d0 during driver init */
-       ret_val = phy->ops.set_d0_lplu_state(hw, false);
-       if (ret_val) {
-               hw_dbg("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.
- **/
-static s32 igb_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;
-
-       hw_dbg("Reconfiguring auto-neg advertisement params\n");
-       ret_val = igb_phy_setup_autoneg(hw);
-       if (ret_val) {
-               hw_dbg("Error Setting up Auto-Negotiation\n");
-               goto out;
-       }
-       hw_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 = 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 = igb_wait_autoneg(hw);
-               if (ret_val) {
-                       hw_dbg("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;
-
-       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);
-
-       hw_dbg("autoneg_advertised %x\n", phy->autoneg_advertised);
-
-       /* Do we want to advertise 10 Mb Half Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_10_HALF) {
-               hw_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) {
-               hw_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) {
-               hw_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) {
-               hw_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)
-               hw_dbg("Advertise 1000mb Half duplex request denied!\n");
-
-       /* Do we want to advertise 1000 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_1000_FULL) {
-               hw_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 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:
-               hw_dbg("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;
-
-       hw_dbg("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 - 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(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       bool link;
-
-
-       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 {
-               /*
-                * PHY will be set to 10H, 10F, 100H or 100F
-                * depending on user settings.
-                */
-               hw_dbg("Forcing Speed and Duplex\n");
-               ret_val = hw->phy.ops.force_speed_duplex(hw);
-               if (ret_val) {
-                       hw_dbg("Error Forcing Speed and Duplex\n");
-                       goto out;
-               }
-       }
-
-       /*
-        * Check link status. Wait up to 100 microseconds for link to become
-        * valid.
-        */
-       ret_val = igb_phy_has_link(hw,
-                                  COPPER_LINK_UP_LIMIT,
-                                  10,
-                                  &link);
-       if (ret_val)
-               goto out;
-
-       if (link) {
-               hw_dbg("Valid link established!!!\n");
-               igb_config_collision_dist(hw);
-               ret_val = igb_config_fc_after_link_up(hw);
-       } else {
-               hw_dbg("Unable to establish link!!!\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  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;
-
-       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;
-
-       hw_dbg("IGP PSCR: %X\n", phy_data);
-
-       udelay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               hw_dbg("Waiting for forced speed/duplex link on IGP phy.\n");
-
-               ret_val = igb_phy_has_link(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link)
-                       hw_dbg("Link taking longer than expected.\n");
-
-               /* Try once more */
-               ret_val = igb_phy_has_link(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  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;
-
-       /*
-        * 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;
-
-       hw_dbg("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 = igb_phy_sw_reset(hw);
-       if (ret_val)
-               goto out;
-
-       if (phy->autoneg_wait_to_complete) {
-               hw_dbg("Waiting for forced speed/duplex link on M88 phy.\n");
-
-               ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT, 100000, &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link) {
-                       if (hw->phy.type != e1000_phy_m88 ||
-                           hw->phy.id == I347AT4_E_PHY_ID ||
-                           hw->phy.id == M88E1112_E_PHY_ID) {
-                               hw_dbg("Link taking longer than expected.\n");
-                       } else {
-
-                               /*
-                                * 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(hw);
-                               if (ret_val)
-                                       goto out;
-                       }
-               }
-
-               /* Try once more */
-               ret_val = igb_phy_has_link(hw, PHY_FORCE_LIMIT,
-                                          100000, &link);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (hw->phy.type != e1000_phy_m88 ||
-           hw->phy.id == I347AT4_E_PHY_ID ||
-           hw->phy.id == M88E1112_E_PHY_ID)
-               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;
-}
-
-/**
- *  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.
- **/
-static void igb_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 = rd32(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;
-               hw_dbg("Half Duplex\n");
-       } else {
-               ctrl |= E1000_CTRL_FD;
-               *phy_ctrl |= MII_CR_FULL_DUPLEX;
-               hw_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);
-               hw_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);
-               hw_dbg("Forcing 10mb\n");
-       }
-
-       igb_config_collision_dist(hw);
-
-       wr32(E1000_CTRL, ctrl);
-}
-
-/**
- *  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.
- **/
-s32 igb_set_d3_lplu_state(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = 0;
-       u16 data;
-
-       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 - 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(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:
-               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 = 0;
-               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.
- **/
-static s32 igb_check_polarity_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       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).
- **/
-static s32 igb_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 = 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_wait_autoneg - Wait for auto-neg compeletion
- *  @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.
- **/
-static s32 igb_wait_autoneg(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 i, phy_status;
-
-       /* 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;
-               msleep(100);
-       }
-
-       /*
-        * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
-        * has completed.
-        */
-       return ret_val;
-}
-
-/**
- *  igb_phy_has_link - 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(struct e1000_hw *hw, u32 iterations,
-                              u32 usec_interval, bool *success)
-{
-       s32 ret_val = 0;
-       u16 i, phy_status;
-
-       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.
-                        */
-                       udelay(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)
-                       mdelay(usec_interval/1000);
-               else
-                       udelay(usec_interval);
-       }
-
-       *success = (i < iterations) ? true : false;
-
-       return ret_val;
-}
-
-/**
- *  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;
-
-       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;
-}
-
-s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, phy_data2, index, default_page, is_cm;
-
-       switch (hw->phy.id) {
-       case I347AT4_E_PHY_ID:
-               /* Remember the original page select and set it to 7 */
-               ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
-                                           &default_page);
-               if (ret_val)
-                       goto out;
-
-               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0x07);
-               if (ret_val)
-                       goto out;
-
-               /* Get cable length from PHY Cable Diagnostics Control Reg */
-               ret_val = phy->ops.read_reg(hw, (I347AT4_PCDL + phy->addr),
-                                           &phy_data);
-               if (ret_val)
-                       goto out;
-
-               /* Check if the unit of cable length is meters or cm */
-               ret_val = phy->ops.read_reg(hw, I347AT4_PCDC, &phy_data2);
-               if (ret_val)
-                       goto out;
-
-               is_cm = !(phy_data & I347AT4_PCDC_CABLE_LENGTH_UNIT);
-
-               /* Populate the phy structure with cable length in meters */
-               phy->min_cable_length = phy_data / (is_cm ? 100 : 1);
-               phy->max_cable_length = phy_data / (is_cm ? 100 : 1);
-               phy->cable_length = phy_data / (is_cm ? 100 : 1);
-
-               /* Reset the page selec to its original value */
-               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT,
-                                            default_page);
-               if (ret_val)
-                       goto out;
-               break;
-       case M88E1112_E_PHY_ID:
-               /* Remember the original page select and set it to 5 */
-               ret_val = phy->ops.read_reg(hw, I347AT4_PAGE_SELECT,
-                                           &default_page);
-               if (ret_val)
-                       goto out;
-
-               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0x05);
-               if (ret_val)
-                       goto out;
-
-               ret_val = phy->ops.read_reg(hw, M88E1112_VCT_DSP_DISTANCE,
-                                           &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;
-
-               /* Reset the page select to its original value */
-               ret_val = phy->ops.write_reg(hw, I347AT4_PAGE_SELECT,
-                                            default_page);
-               if (ret_val)
-                       goto out;
-
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-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 = 0;
-       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;
-       static const 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 = 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;
-}
-
-/**
- *  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;
-
-       if (phy->media_type != e1000_media_type_copper) {
-               hw_dbg("Phy info is only valid for copper media\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = igb_phy_has_link(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               hw_dbg("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) {
-               ret_val = phy->ops.get_cable_length(hw);
-               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;
-}
-
-/**
- *  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;
-
-       ret_val = igb_phy_has_link(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               hw_dbg("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) {
-               ret_val = 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 {
-               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 - 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(struct e1000_hw *hw)
-{
-       s32 ret_val = 0;
-       u16 phy_ctrl;
-
-       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;
-
-       udelay(1);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_phy_hw_reset - 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 relase the semaphore (if necessary).
- **/
-s32 igb_phy_hw_reset(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32  ret_val;
-       u32 ctrl;
-
-       ret_val = igb_check_reset_block(hw);
-       if (ret_val) {
-               ret_val = 0;
-               goto out;
-       }
-
-       ret_val = phy->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ctrl = rd32(E1000_CTRL);
-       wr32(E1000_CTRL, ctrl | E1000_CTRL_PHY_RST);
-       wrfl();
-
-       udelay(phy->reset_delay_us);
-
-       wr32(E1000_CTRL, ctrl);
-       wrfl();
-
-       udelay(150);
-
-       phy->ops.release(hw);
-
-       ret_val = phy->ops.get_cfg_done(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  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)
-{
-       hw_dbg("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 Giga 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 0;
-}
-
-/**
- * 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, 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 - Power down copper PHY
- * @hw: pointer to the HW structure
- *
- * Power down PHY to save power when interface is down and wake on lan
- * is not enabled.
- **/
-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);
-       msleep(1);
-}
-
-/**
- *  igb_check_polarity_82580 - 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.
- **/
-static s32 igb_check_polarity_82580(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-
-       ret_val = phy->ops.read_reg(hw, I82580_PHY_STATUS_2, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & I82580_PHY_STATUS2_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-/**
- *  igb_phy_force_speed_duplex_82580 - Force speed/duplex for I82580 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_82580(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-
-       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.  82580 requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = phy->ops.read_reg(hw, I82580_PHY_CTRL_2, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~I82580_PHY_CTRL2_AUTO_MDIX;
-       phy_data &= ~I82580_PHY_CTRL2_FORCE_MDI_MDIX;
-
-       ret_val = phy->ops.write_reg(hw, I82580_PHY_CTRL_2, phy_data);
-       if (ret_val)
-               goto out;
-
-       hw_dbg("I82580_PHY_CTRL_2: %X\n", phy_data);
-
-       udelay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               hw_dbg("Waiting for forced speed/duplex link on 82580 phy\n");
-
-               ret_val = igb_phy_has_link(hw,
-                                          PHY_FORCE_LIMIT,
-                                          100000,
-                                          &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link)
-                       hw_dbg("Link taking longer than expected.\n");
-
-               /* Try once more */
-               ret_val = igb_phy_has_link(hw,
-                                          PHY_FORCE_LIMIT,
-                                          100000,
-                                          &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_get_phy_info_82580 - Retrieve I82580 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_82580(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-
-       ret_val = igb_phy_has_link(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               hw_dbg("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_82580(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, I82580_PHY_STATUS_2, &data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (data & I82580_PHY_STATUS2_MDIX) ? true : false;
-
-       if ((data & I82580_PHY_STATUS2_SPEED_MASK) ==
-           I82580_PHY_STATUS2_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 {
-               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_cable_length_82580 - Determine cable length for 82580 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 igb_get_cable_length_82580(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, length;
-
-
-       ret_val = phy->ops.read_reg(hw, I82580_PHY_DIAG_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       length = (phy_data & I82580_DSTATUS_CABLE_LENGTH) >>
-                I82580_DSTATUS_CABLE_LENGTH_SHIFT;
-
-       if (length == E1000_CABLE_LENGTH_UNDEFINED)
-               ret_val = -E1000_ERR_PHY;
-
-       phy->cable_length = length;
-
-out:
-       return ret_val;
-}
diff --git a/drivers/net/igb/e1000_phy.h b/drivers/net/igb/e1000_phy.h
deleted file mode 100644 (file)
index 8510797..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_PHY_H_
-#define _E1000_PHY_H_
-
-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
-};
-
-s32  igb_check_downshift(struct e1000_hw *hw);
-s32  igb_check_reset_block(struct e1000_hw *hw);
-s32  igb_copper_link_setup_igp(struct e1000_hw *hw);
-s32  igb_copper_link_setup_m88(struct e1000_hw *hw);
-s32  igb_copper_link_setup_m88_gen2(struct e1000_hw *hw);
-s32  igb_phy_force_speed_duplex_igp(struct e1000_hw *hw);
-s32  igb_phy_force_speed_duplex_m88(struct e1000_hw *hw);
-s32  igb_get_cable_length_m88(struct e1000_hw *hw);
-s32  igb_get_cable_length_m88_gen2(struct e1000_hw *hw);
-s32  igb_get_cable_length_igp_2(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(struct e1000_hw *hw);
-s32  igb_phy_hw_reset(struct e1000_hw *hw);
-s32  igb_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_set_d3_lplu_state(struct e1000_hw *hw, bool active);
-s32  igb_setup_copper_link(struct e1000_hw *hw);
-s32  igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_phy_has_link(struct e1000_hw *hw, u32 iterations,
-                               u32 usec_interval, bool *success);
-void igb_power_up_phy_copper(struct e1000_hw *hw);
-void igb_power_down_phy_copper(struct e1000_hw *hw);
-s32  igb_phy_init_script_igp3(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);
-s32  igb_copper_link_setup_82580(struct e1000_hw *hw);
-s32  igb_get_phy_info_82580(struct e1000_hw *hw);
-s32  igb_phy_force_speed_duplex_82580(struct e1000_hw *hw);
-s32  igb_get_cable_length_82580(struct e1000_hw *hw);
-
-/* 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 IGP02E1000_PHY_POWER_MGMT         0x19 /* Power Management */
-#define IGP01E1000_PHY_PAGE_SELECT        0x1F /* Page Select */
-#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
-
-#define I82580_ADDR_REG                   16
-#define I82580_CFG_REG                    22
-#define I82580_CFG_ASSERT_CRS_ON_TX       (1 << 15)
-#define I82580_CFG_ENABLE_DOWNSHIFT       (3 << 10) /* auto downshift 100/10 */
-#define I82580_CTRL_REG                   23
-#define I82580_CTRL_DOWNSHIFT_MASK        (7 << 10)
-
-/* 82580 specific PHY registers */
-#define I82580_PHY_CTRL_2            18
-#define I82580_PHY_LBK_CTRL          19
-#define I82580_PHY_STATUS_2          26
-#define I82580_PHY_DIAG_STATUS       31
-
-/* I82580 PHY Status 2 */
-#define I82580_PHY_STATUS2_REV_POLARITY   0x0400
-#define I82580_PHY_STATUS2_MDIX           0x0800
-#define I82580_PHY_STATUS2_SPEED_MASK     0x0300
-#define I82580_PHY_STATUS2_SPEED_1000MBPS 0x0200
-#define I82580_PHY_STATUS2_SPEED_100MBPS  0x0100
-
-/* I82580 PHY Control 2 */
-#define I82580_PHY_CTRL2_AUTO_MDIX        0x0400
-#define I82580_PHY_CTRL2_FORCE_MDI_MDIX   0x0200
-
-/* I82580 PHY Diagnostics Status */
-#define I82580_DSTATUS_CABLE_LENGTH       0x03FC
-#define I82580_DSTATUS_CABLE_LENGTH_SHIFT 2
-/* Enable flexible speed on link-up */
-#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 E1000_CABLE_LENGTH_UNDEFINED      0xFF
-
-#endif
diff --git a/drivers/net/igb/e1000_regs.h b/drivers/net/igb/e1000_regs.h
deleted file mode 100644 (file)
index 0990f6d..0000000
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#ifndef _E1000_REGS_H_
-#define _E1000_REGS_H_
-
-#define E1000_CTRL     0x00000  /* Device Control - 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_MDIC     0x00020  /* MDI Control - RW */
-#define E1000_MDICNFG  0x00E04  /* MDI Config - 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_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_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_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
-#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
-#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
-#define E1000_PBS      0x01008  /* Packet Buffer Size */
-#define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */
-#define E1000_EEWR     0x0102C  /* EEPROM Write Register - RW */
-#define E1000_I2CCMD   0x01028  /* SFPI2C Command Register - RW */
-#define E1000_FRTIMER  0x01048  /* Free Running Timer - RW */
-#define E1000_TCPTIMER 0x0104C  /* TCP Timer - RW */
-#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
-#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
-#define E1000_FCRTV    0x02460  /* Flow Control Refresh Timer Value - RW */
-
-/* IEEE 1588 TIMESYNCH */
-#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 */
-#define E1000_TSAUXC     0x0B640 /* Timesync Auxiliary Control register */
-#define E1000_SYSTIMR    0x0B6F8 /* System time register Residue */
-
-/* Filtering Registers */
-#define E1000_SAQF(_n) (0x5980 + 4 * (_n))
-#define E1000_DAQF(_n) (0x59A0 + 4 * (_n))
-#define E1000_SPQF(_n) (0x59C0 + 4 * (_n))
-#define E1000_FTQF(_n) (0x59E0 + 4 * (_n))
-#define E1000_SAQF0 E1000_SAQF(0)
-#define E1000_DAQF0 E1000_DAQF(0)
-#define E1000_SPQF0 E1000_SPQF(0)
-#define E1000_FTQF0 E1000_FTQF(0)
-#define E1000_SYNQF(_n) (0x055FC + (4 * (_n))) /* SYN Packet Queue Fltr */
-#define E1000_ETQF(_n)  (0x05CB0 + (4 * (_n))) /* EType Queue Fltr */
-
-#define E1000_RQDPC(_n) (0x0C030 + ((_n) * 0x40))
-
-/* DMA Coalescing registers */
-#define E1000_DMACR             0x02508 /* Control Register */
-#define E1000_DMCTXTH           0x03550 /* Transmit Threshold */
-#define E1000_DMCTLX            0x02514 /* Time to Lx Request */
-#define E1000_DMCRTRH           0x05DD0 /* Receive Packet Rate Threshold */
-#define E1000_DMCCNT            0x05DD4 /* Current Rx Count */
-#define E1000_FCRTC             0x02170 /* Flow Control Rx high watermark */
-#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
-
-/* TX Rate Limit Registers */
-#define E1000_RTTDQSEL 0x3604  /* Tx Desc Plane Queue Select - WO */
-#define E1000_RTTBCNRC 0x36B0  /* Tx BCN Rate-Scheduler Config - WO */
-
-/* Split and Replication RX Control - RW */
-#define E1000_RXPBS    0x02404  /* Rx Packet Buffer Size - 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_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_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_TDFPC    0x03430  /* TX Data FIFO Packet Count - RW */
-#define E1000_DTXCTL   0x03590  /* DMA TX Control - 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 */
-/* Interrupt Cause Rx Packet Timer Expire Count */
-#define E1000_ICRXPTC  0x04104
-/* Interrupt Cause Rx Absolute Timer Expire Count */
-#define E1000_ICRXATC  0x04108
-/* Interrupt Cause Tx Packet Timer Expire Count */
-#define E1000_ICTXPTC  0x0410C
-/* Interrupt Cause Tx Absolute Timer Expire Count */
-#define E1000_ICTXATC  0x04110
-/* Interrupt Cause Tx Queue Empty Count */
-#define E1000_ICTXQEC  0x04118
-/* Interrupt Cause Tx Queue Minimum Threshold Count */
-#define E1000_ICTXQMTC 0x0411C
-/* Interrupt Cause Rx Descriptor Minimum Threshold Count */
-#define E1000_ICRXDMTC 0x04120
-#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_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_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_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_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_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
-#define E1000_VT_CTL   0x0581C  /* VMDq Control - RW */
-#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_WUPL     0x05900  /* Wakeup Packet Length - 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_FACTPS    0x05B30 /* Function Active and Power State to MNG */
-#define E1000_SWSM      0x05B50 /* SW Semaphore */
-#define E1000_FWSM      0x05B54 /* FW Semaphore */
-#define E1000_DCA_CTRL  0x05B74 /* DCA Control - RW */
-
-/* RSS registers */
-#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 */
-/* MSI-X Allocation Register (_i) - RW */
-#define E1000_MSIXBM(_i)    (0x01600 + ((_i) * 4))
-/* Redirection Table - RW Array */
-#define E1000_RETA(_i)  (0x05C00 + ((_i) * 4))
-#define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW Array */
-
-/* VT Registers */
-#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_WVBR      0x03554 /* VM Wrong Behavior - RWS */
-#define E1000_RPLOLR    0x05AF0 /* Replication Offload - RW */
-#define E1000_UTA       0x0A000 /* Unicast Table Array - RW */
-#define E1000_IOVTCL    0x05BBC /* IOV Control Register */
-/* These act per VF so an array friendly macro is used */
-#define E1000_P2VMAILBOX(_n)   (0x00C00 + (4 * (_n)))
-#define E1000_VMBMEM(_n)       (0x00800 + (64 * (_n)))
-#define E1000_VMOLR(_n)        (0x05AD0 + (4 * (_n)))
-#define E1000_VLVF(_n)         (0x05D00 + (4 * (_n))) /* VLAN Virtual Machine
-                                                       * Filter - RW */
-#define E1000_VMVIR(_n)        (0x03700 + (4 * (_n)))
-
-#define wr32(reg, value) (writel(value, hw->hw_addr + reg))
-#define rd32(reg) (readl(hw->hw_addr + reg))
-#define wrfl() ((void)rd32(E1000_STATUS))
-
-#define array_wr32(reg, offset, value) \
-       (writel(value, hw->hw_addr + reg + ((offset) << 2)))
-#define array_rd32(reg, offset) \
-       (readl(hw->hw_addr + reg + ((offset) << 2)))
-
-/* DMA Coalescing registers */
-#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
-
-/* Energy Efficient Ethernet "EEE" register */
-#define E1000_IPCNFG  0x0E38  /* Internal PHY Configuration */
-#define E1000_EEER    0x0E30  /* Energy Efficient Ethernet */
-
-/* Thermal Sensor Register */
-#define E1000_THSTAT    0x08110 /* Thermal Sensor Status */
-
-/* OS2BMC Registers */
-#define E1000_B2OSPC    0x08FE0 /* BMC2OS packets sent by BMC */
-#define E1000_B2OGPRC   0x04158 /* BMC2OS packets received by host */
-#define E1000_O2BGPTC   0x08FE4 /* OS2BMC packets received by BMC */
-#define E1000_O2BSPC    0x0415C /* OS2BMC packets transmitted by host */
-
-#endif
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
deleted file mode 100644 (file)
index 265e151..0000000
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _IGB_H_
-#define _IGB_H_
-
-#include "e1000_mac.h"
-#include "e1000_82575.h"
-
-#include <linux/clocksource.h>
-#include <linux/timecompare.h>
-#include <linux/net_tstamp.h>
-#include <linux/bitops.h>
-#include <linux/if_vlan.h>
-
-struct igb_adapter;
-
-/* ((1000000000ns / (6000ints/s * 1024ns)) << 2 = 648 */
-#define IGB_START_ITR 648
-
-/* 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_DEFAULT_ITR                    3 /* dynamic */
-#define IGB_MAX_ITR_USECS              10000
-#define IGB_MIN_ITR_USECS                 10
-#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
-
-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 vlans_enabled;
-       u32 flags;
-       unsigned long last_nack;
-       u16 pf_vlan; /* When set, guest VLAN config not allowed. */
-       u16 pf_qos;
-       u16 tx_rate;
-};
-
-#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 */
-#define IGB_VF_FLAG_PF_SET_MAC     0x00000008 /* PF has set MAC address */
-
-/* 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                     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) ? 1 : 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_64    64     /* Used for packet split */
-#define IGB_RXBUFFER_128   128    /* Used for packet split */
-#define IGB_RXBUFFER_1024  1024
-#define IGB_RXBUFFER_2048  2048
-#define IGB_RXBUFFER_16384 16384
-
-#define MAX_STD_JUMBO_FRAME_SIZE 9234
-
-/* How many Tx Descriptors do we need to call netif_wake_queue ? */
-#define IGB_TX_QUEUE_WAKE      16
-/* 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;
-       union {
-               /* TX */
-               struct {
-                       unsigned long time_stamp;
-                       u16 length;
-                       u16 next_to_watch;
-                       unsigned int bytecount;
-                       u16 gso_segs;
-                       u8 tx_flags;
-                       u8 mapped_as_page;
-               };
-               /* RX */
-               struct {
-                       struct page *page;
-                       dma_addr_t page_dma;
-                       u16 page_offset;
-               };
-       };
-};
-
-struct igb_tx_queue_stats {
-       u64 packets;
-       u64 bytes;
-       u64 restart_queue;
-       u64 restart_queue2;
-};
-
-struct igb_rx_queue_stats {
-       u64 packets;
-       u64 bytes;
-       u64 drops;
-       u64 csum_err;
-       u64 alloc_failed;
-};
-
-struct igb_q_vector {
-       struct igb_adapter *adapter; /* backlink */
-       struct igb_ring *rx_ring;
-       struct igb_ring *tx_ring;
-       struct napi_struct napi;
-
-       u32 eims_value;
-       u16 cpu;
-
-       u16 itr_val;
-       u8 set_itr;
-       void __iomem *itr_register;
-
-       char name[IFNAMSIZ + 9];
-};
-
-struct igb_ring {
-       struct igb_q_vector *q_vector; /* backlink to q_vector */
-       struct net_device *netdev;     /* back pointer to net_device */
-       struct device *dev;            /* device pointer 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;
-
-       u32 flags;
-
-       union {
-               /* TX */
-               struct {
-                       struct igb_tx_queue_stats tx_stats;
-                       struct u64_stats_sync tx_syncp;
-                       struct u64_stats_sync tx_syncp2;
-                       bool detect_tx_hung;
-               };
-               /* RX */
-               struct {
-                       struct igb_rx_queue_stats rx_stats;
-                       struct u64_stats_sync rx_syncp;
-                       u32 rx_buffer_len;
-               };
-       };
-};
-
-#define IGB_RING_FLAG_RX_CSUM        0x00000001 /* RX CSUM enabled */
-#define IGB_RING_FLAG_RX_SCTP_CSUM   0x00000002 /* SCTP CSUM offload enabled */
-
-#define IGB_RING_FLAG_TX_CTX_IDX     0x00000001 /* HW requires context index */
-
-#define IGB_ADVTXD_DCMD (E1000_TXD_CMD_EOP | E1000_TXD_CMD_RS)
-
-#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]))
-
-/* igb_desc_unused - calculate if we have unused descriptors */
-static inline int igb_desc_unused(struct igb_ring *ring)
-{
-       if (ring->next_to_clean > ring->next_to_use)
-               return ring->next_to_clean - ring->next_to_use - 1;
-
-       return ring->count + ring->next_to_clean - ring->next_to_use - 1;
-}
-
-/* board specific private data structure */
-struct igb_adapter {
-       struct timer_list watchdog_timer;
-       struct timer_list phy_info_timer;
-       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-       u16 mng_vlan_id;
-       u32 bd_number;
-       u32 wol;
-       u32 en_mng_pt;
-       u16 link_speed;
-       u16 link_duplex;
-
-       /* Interrupt Throttle Rate */
-       u32 rx_itr_setting;
-       u32 tx_itr_setting;
-       u16 tx_itr;
-       u16 rx_itr;
-
-       struct work_struct reset_task;
-       struct work_struct watchdog_task;
-       bool fc_autoneg;
-       u8  tx_timeout_factor;
-       struct timer_list blink_timer;
-       unsigned long led_status;
-
-       /* TX */
-       struct igb_ring *tx_ring[16];
-       u32 tx_timeout_count;
-
-       /* RX */
-       struct igb_ring *rx_ring[16];
-       int num_tx_queues;
-       int num_rx_queues;
-
-       u32 max_frame_size;
-       u32 min_frame_size;
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-       struct cyclecounter cycles;
-       struct timecounter clock;
-       struct timecompare compare;
-       struct hwtstamp_config hwtstamp_config;
-
-       spinlock_t stats64_lock;
-       struct rtnl_link_stats64 stats64;
-
-       /* 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;
-
-       u32 test_icr;
-       struct igb_ring test_tx_ring;
-       struct igb_ring test_rx_ring;
-
-       int msg_enable;
-
-       unsigned int num_q_vectors;
-       struct igb_q_vector *q_vector[MAX_Q_VECTORS];
-       struct msix_entry *msix_entries;
-       u32 eims_enable_mask;
-       u32 eims_other;
-
-       /* to not mess up cache alignment, always add to the bottom */
-       unsigned long state;
-       unsigned int flags;
-       u32 eeprom_wol;
-
-       struct igb_ring *multi_tx_table[IGB_ABS_MAX_TX_QUEUES];
-       u16 tx_ring_count;
-       u16 rx_ring_count;
-       unsigned int vfs_allocated_count;
-       struct vf_data_storage *vf_data;
-       int vf_rate_link_speed;
-       u32 rss_queues;
-       u32 wvbr;
-};
-
-#define IGB_FLAG_HAS_MSI           (1 << 0)
-#define IGB_FLAG_DCA_ENABLED       (1 << 1)
-#define IGB_FLAG_QUAD_PORT_A       (1 << 2)
-#define IGB_FLAG_QUEUE_PAIRS       (1 << 3)
-#define IGB_FLAG_DMAC              (1 << 4)
-
-/* DMA Coalescing defines */
-#define IGB_MIN_TXPBSIZE           20408
-#define IGB_TX_BUF_4096            4096
-#define IGB_DMCTLX_DCFLUSH_DIS     0x80000000  /* Disable DMA Coal Flush */
-
-#define IGB_82576_TSYNC_SHIFT 19
-#define IGB_82580_TSYNC_SHIFT 24
-#define IGB_TS_HDR_LEN        16
-enum e1000_state_t {
-       __IGB_TESTING,
-       __IGB_RESETTING,
-       __IGB_DOWN
-};
-
-enum igb_boards {
-       board_82575,
-};
-
-extern char igb_driver_name[];
-extern char igb_driver_version[];
-
-extern int igb_up(struct igb_adapter *);
-extern void igb_down(struct igb_adapter *);
-extern void igb_reinit_locked(struct igb_adapter *);
-extern void igb_reset(struct igb_adapter *);
-extern int igb_set_spd_dplx(struct igb_adapter *, u32, u8);
-extern int igb_setup_tx_resources(struct igb_ring *);
-extern int igb_setup_rx_resources(struct igb_ring *);
-extern void igb_free_tx_resources(struct igb_ring *);
-extern void igb_free_rx_resources(struct igb_ring *);
-extern void igb_configure_tx_ring(struct igb_adapter *, struct igb_ring *);
-extern void igb_configure_rx_ring(struct igb_adapter *, struct igb_ring *);
-extern void igb_setup_tctl(struct igb_adapter *);
-extern void igb_setup_rctl(struct igb_adapter *);
-extern netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *, struct igb_ring *);
-extern void igb_unmap_and_free_tx_resource(struct igb_ring *,
-                                          struct igb_buffer *);
-extern void igb_alloc_rx_buffers_adv(struct igb_ring *, int);
-extern void igb_update_stats(struct igb_adapter *, struct rtnl_link_stats64 *);
-extern bool igb_has_link(struct igb_adapter *adapter);
-extern void igb_set_ethtool_ops(struct net_device *);
-extern void igb_power_up_link(struct igb_adapter *);
-
-static inline s32 igb_reset_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.reset)
-               return hw->phy.ops.reset(hw);
-
-       return 0;
-}
-
-static inline 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 0;
-}
-
-static inline 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 0;
-}
-
-static inline s32 igb_get_phy_info(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_phy_info)
-               return hw->phy.ops.get_phy_info(hw);
-
-       return 0;
-}
-
-#endif /* _IGB_H_ */
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
deleted file mode 100644 (file)
index 414b022..0000000
+++ /dev/null
@@ -1,2201 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-/* ethtool support for igb */
-
-#include <linux/vmalloc.h>
-#include <linux/netdevice.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/ethtool.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-
-#include "igb.h"
-
-struct igb_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int sizeof_stat;
-       int stat_offset;
-};
-
-#define IGB_STAT(_name, _stat) { \
-       .stat_string = _name, \
-       .sizeof_stat = FIELD_SIZEOF(struct igb_adapter, _stat), \
-       .stat_offset = offsetof(struct igb_adapter, _stat) \
-}
-static const struct igb_stats igb_gstrings_stats[] = {
-       IGB_STAT("rx_packets", stats.gprc),
-       IGB_STAT("tx_packets", stats.gptc),
-       IGB_STAT("rx_bytes", stats.gorc),
-       IGB_STAT("tx_bytes", stats.gotc),
-       IGB_STAT("rx_broadcast", stats.bprc),
-       IGB_STAT("tx_broadcast", stats.bptc),
-       IGB_STAT("rx_multicast", stats.mprc),
-       IGB_STAT("tx_multicast", stats.mptc),
-       IGB_STAT("multicast", stats.mprc),
-       IGB_STAT("collisions", stats.colc),
-       IGB_STAT("rx_crc_errors", stats.crcerrs),
-       IGB_STAT("rx_no_buffer_count", stats.rnbc),
-       IGB_STAT("rx_missed_errors", stats.mpc),
-       IGB_STAT("tx_aborted_errors", stats.ecol),
-       IGB_STAT("tx_carrier_errors", stats.tncrs),
-       IGB_STAT("tx_window_errors", stats.latecol),
-       IGB_STAT("tx_abort_late_coll", stats.latecol),
-       IGB_STAT("tx_deferred_ok", stats.dc),
-       IGB_STAT("tx_single_coll_ok", stats.scc),
-       IGB_STAT("tx_multi_coll_ok", stats.mcc),
-       IGB_STAT("tx_timeout_count", tx_timeout_count),
-       IGB_STAT("rx_long_length_errors", stats.roc),
-       IGB_STAT("rx_short_length_errors", stats.ruc),
-       IGB_STAT("rx_align_errors", stats.algnerrc),
-       IGB_STAT("tx_tcp_seg_good", stats.tsctc),
-       IGB_STAT("tx_tcp_seg_failed", stats.tsctfc),
-       IGB_STAT("rx_flow_control_xon", stats.xonrxc),
-       IGB_STAT("rx_flow_control_xoff", stats.xoffrxc),
-       IGB_STAT("tx_flow_control_xon", stats.xontxc),
-       IGB_STAT("tx_flow_control_xoff", stats.xofftxc),
-       IGB_STAT("rx_long_byte_count", stats.gorc),
-       IGB_STAT("tx_dma_out_of_sync", stats.doosync),
-       IGB_STAT("tx_smbus", stats.mgptc),
-       IGB_STAT("rx_smbus", stats.mgprc),
-       IGB_STAT("dropped_smbus", stats.mgpdc),
-       IGB_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),
-       IGB_STAT("os2bmc_tx_by_bmc", stats.b2ospc),
-       IGB_STAT("os2bmc_tx_by_host", stats.o2bspc),
-       IGB_STAT("os2bmc_rx_by_host", stats.b2ogprc),
-};
-
-#define IGB_NETDEV_STAT(_net_stat) { \
-       .stat_string = __stringify(_net_stat), \
-       .sizeof_stat = FIELD_SIZEOF(struct rtnl_link_stats64, _net_stat), \
-       .stat_offset = offsetof(struct rtnl_link_stats64, _net_stat) \
-}
-static const struct igb_stats igb_gstrings_net_stats[] = {
-       IGB_NETDEV_STAT(rx_errors),
-       IGB_NETDEV_STAT(tx_errors),
-       IGB_NETDEV_STAT(tx_dropped),
-       IGB_NETDEV_STAT(rx_length_errors),
-       IGB_NETDEV_STAT(rx_over_errors),
-       IGB_NETDEV_STAT(rx_frame_errors),
-       IGB_NETDEV_STAT(rx_fifo_errors),
-       IGB_NETDEV_STAT(tx_fifo_errors),
-       IGB_NETDEV_STAT(tx_heartbeat_errors)
-};
-
-#define IGB_GLOBAL_STATS_LEN   \
-       (sizeof(igb_gstrings_stats) / sizeof(struct igb_stats))
-#define IGB_NETDEV_STATS_LEN   \
-       (sizeof(igb_gstrings_net_stats) / sizeof(struct igb_stats))
-#define IGB_RX_QUEUE_STATS_LEN \
-       (sizeof(struct igb_rx_queue_stats) / sizeof(u64))
-
-#define IGB_TX_QUEUE_STATS_LEN 3 /* packets, bytes, restart_queue */
-
-#define IGB_QUEUE_STATS_LEN \
-       ((((struct igb_adapter *)netdev_priv(netdev))->num_rx_queues * \
-         IGB_RX_QUEUE_STATS_LEN) + \
-        (((struct igb_adapter *)netdev_priv(netdev))->num_tx_queues * \
-         IGB_TX_QUEUE_STATS_LEN))
-#define IGB_STATS_LEN \
-       (IGB_GLOBAL_STATS_LEN + IGB_NETDEV_STATS_LEN + IGB_QUEUE_STATS_LEN)
-
-static const char igb_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Register test  (offline)", "Eeprom test    (offline)",
-       "Interrupt test (offline)", "Loopback test  (offline)",
-       "Link test   (on/offline)"
-};
-#define IGB_TEST_LEN (sizeof(igb_gstrings_test) / ETH_GSTRING_LEN)
-
-static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 status;
-
-       if (hw->phy.media_type == e1000_media_type_copper) {
-
-               ecmd->supported = (SUPPORTED_10baseT_Half |
-                                  SUPPORTED_10baseT_Full |
-                                  SUPPORTED_100baseT_Half |
-                                  SUPPORTED_100baseT_Full |
-                                  SUPPORTED_1000baseT_Full|
-                                  SUPPORTED_Autoneg |
-                                  SUPPORTED_TP);
-               ecmd->advertising = ADVERTISED_TP;
-
-               if (hw->mac.autoneg == 1) {
-                       ecmd->advertising |= ADVERTISED_Autoneg;
-                       /* the e1000 autoneg seems to match ethtool nicely */
-                       ecmd->advertising |= hw->phy.autoneg_advertised;
-               }
-
-               ecmd->port = PORT_TP;
-               ecmd->phy_address = hw->phy.addr;
-       } else {
-               ecmd->supported   = (SUPPORTED_1000baseT_Full |
-                                    SUPPORTED_FIBRE |
-                                    SUPPORTED_Autoneg);
-
-               ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg);
-
-               ecmd->port = PORT_FIBRE;
-       }
-
-       ecmd->transceiver = XCVR_INTERNAL;
-
-       status = rd32(E1000_STATUS);
-
-       if (status & E1000_STATUS_LU) {
-
-               if ((status & E1000_STATUS_SPEED_1000) ||
-                   hw->phy.media_type != e1000_media_type_copper)
-                       ethtool_cmd_speed_set(ecmd, SPEED_1000);
-               else if (status & E1000_STATUS_SPEED_100)
-                       ethtool_cmd_speed_set(ecmd, SPEED_100);
-               else
-                       ethtool_cmd_speed_set(ecmd, SPEED_10);
-
-               if ((status & E1000_STATUS_FD) ||
-                   hw->phy.media_type != e1000_media_type_copper)
-                       ecmd->duplex = DUPLEX_FULL;
-               else
-                       ecmd->duplex = DUPLEX_HALF;
-       } else {
-               ethtool_cmd_speed_set(ecmd, -1);
-               ecmd->duplex = -1;
-       }
-
-       ecmd->autoneg = hw->mac.autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;
-       return 0;
-}
-
-static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* When SoL/IDER sessions are active, autoneg/speed/duplex
-        * cannot be changed */
-       if (igb_check_reset_block(hw)) {
-               dev_err(&adapter->pdev->dev, "Cannot change link "
-                       "characteristics when SoL/IDER is active.\n");
-               return -EINVAL;
-       }
-
-       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
-               msleep(1);
-
-       if (ecmd->autoneg == AUTONEG_ENABLE) {
-               hw->mac.autoneg = 1;
-               hw->phy.autoneg_advertised = ecmd->advertising |
-                                            ADVERTISED_TP |
-                                            ADVERTISED_Autoneg;
-               ecmd->advertising = hw->phy.autoneg_advertised;
-               if (adapter->fc_autoneg)
-                       hw->fc.requested_mode = e1000_fc_default;
-       } else {
-               u32 speed = ethtool_cmd_speed(ecmd);
-               if (igb_set_spd_dplx(adapter, speed, ecmd->duplex)) {
-                       clear_bit(__IGB_RESETTING, &adapter->state);
-                       return -EINVAL;
-               }
-       }
-
-       /* reset the link */
-       if (netif_running(adapter->netdev)) {
-               igb_down(adapter);
-               igb_up(adapter);
-       } else
-               igb_reset(adapter);
-
-       clear_bit(__IGB_RESETTING, &adapter->state);
-       return 0;
-}
-
-static u32 igb_get_link(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-
-       /*
-        * If the link is not reported up to netdev, interrupts are disabled,
-        * and so the physical link state may have changed since we last
-        * looked. Set get_link_status to make sure that the true link
-        * state is interrogated, rather than pulling a cached and possibly
-        * stale link state from the driver.
-        */
-       if (!netif_carrier_ok(netdev))
-               mac->get_link_status = 1;
-
-       return igb_has_link(adapter);
-}
-
-static void igb_get_pauseparam(struct net_device *netdev,
-                              struct ethtool_pauseparam *pause)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       pause->autoneg =
-               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
-
-       if (hw->fc.current_mode == e1000_fc_rx_pause)
-               pause->rx_pause = 1;
-       else if (hw->fc.current_mode == e1000_fc_tx_pause)
-               pause->tx_pause = 1;
-       else if (hw->fc.current_mode == e1000_fc_full) {
-               pause->rx_pause = 1;
-               pause->tx_pause = 1;
-       }
-}
-
-static int igb_set_pauseparam(struct net_device *netdev,
-                             struct ethtool_pauseparam *pause)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int retval = 0;
-
-       adapter->fc_autoneg = pause->autoneg;
-
-       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
-               msleep(1);
-
-       if (adapter->fc_autoneg == AUTONEG_ENABLE) {
-               hw->fc.requested_mode = e1000_fc_default;
-               if (netif_running(adapter->netdev)) {
-                       igb_down(adapter);
-                       igb_up(adapter);
-               } else {
-                       igb_reset(adapter);
-               }
-       } else {
-               if (pause->rx_pause && pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_full;
-               else if (pause->rx_pause && !pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_rx_pause;
-               else if (!pause->rx_pause && pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_tx_pause;
-               else if (!pause->rx_pause && !pause->tx_pause)
-                       hw->fc.requested_mode = e1000_fc_none;
-
-               hw->fc.current_mode = hw->fc.requested_mode;
-
-               retval = ((hw->phy.media_type == e1000_media_type_copper) ?
-                         igb_force_mac_fc(hw) : igb_setup_link(hw));
-       }
-
-       clear_bit(__IGB_RESETTING, &adapter->state);
-       return retval;
-}
-
-static u32 igb_get_msglevel(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void igb_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-
-static int igb_get_regs_len(struct net_device *netdev)
-{
-#define IGB_REGS_LEN 551
-       return IGB_REGS_LEN * sizeof(u32);
-}
-
-static void igb_get_regs(struct net_device *netdev,
-                        struct ethtool_regs *regs, void *p)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 *regs_buff = p;
-       u8 i;
-
-       memset(p, 0, IGB_REGS_LEN * sizeof(u32));
-
-       regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;
-
-       /* General Registers */
-       regs_buff[0] = rd32(E1000_CTRL);
-       regs_buff[1] = rd32(E1000_STATUS);
-       regs_buff[2] = rd32(E1000_CTRL_EXT);
-       regs_buff[3] = rd32(E1000_MDIC);
-       regs_buff[4] = rd32(E1000_SCTL);
-       regs_buff[5] = rd32(E1000_CONNSW);
-       regs_buff[6] = rd32(E1000_VET);
-       regs_buff[7] = rd32(E1000_LEDCTL);
-       regs_buff[8] = rd32(E1000_PBA);
-       regs_buff[9] = rd32(E1000_PBS);
-       regs_buff[10] = rd32(E1000_FRTIMER);
-       regs_buff[11] = rd32(E1000_TCPTIMER);
-
-       /* NVM Register */
-       regs_buff[12] = rd32(E1000_EECD);
-
-       /* Interrupt */
-       /* Reading EICS for EICR because they read the
-        * same but EICS does not clear on read */
-       regs_buff[13] = rd32(E1000_EICS);
-       regs_buff[14] = rd32(E1000_EICS);
-       regs_buff[15] = rd32(E1000_EIMS);
-       regs_buff[16] = rd32(E1000_EIMC);
-       regs_buff[17] = rd32(E1000_EIAC);
-       regs_buff[18] = rd32(E1000_EIAM);
-       /* Reading ICS for ICR because they read the
-        * same but ICS does not clear on read */
-       regs_buff[19] = rd32(E1000_ICS);
-       regs_buff[20] = rd32(E1000_ICS);
-       regs_buff[21] = rd32(E1000_IMS);
-       regs_buff[22] = rd32(E1000_IMC);
-       regs_buff[23] = rd32(E1000_IAC);
-       regs_buff[24] = rd32(E1000_IAM);
-       regs_buff[25] = rd32(E1000_IMIRVP);
-
-       /* Flow Control */
-       regs_buff[26] = rd32(E1000_FCAL);
-       regs_buff[27] = rd32(E1000_FCAH);
-       regs_buff[28] = rd32(E1000_FCTTV);
-       regs_buff[29] = rd32(E1000_FCRTL);
-       regs_buff[30] = rd32(E1000_FCRTH);
-       regs_buff[31] = rd32(E1000_FCRTV);
-
-       /* Receive */
-       regs_buff[32] = rd32(E1000_RCTL);
-       regs_buff[33] = rd32(E1000_RXCSUM);
-       regs_buff[34] = rd32(E1000_RLPML);
-       regs_buff[35] = rd32(E1000_RFCTL);
-       regs_buff[36] = rd32(E1000_MRQC);
-       regs_buff[37] = rd32(E1000_VT_CTL);
-
-       /* Transmit */
-       regs_buff[38] = rd32(E1000_TCTL);
-       regs_buff[39] = rd32(E1000_TCTL_EXT);
-       regs_buff[40] = rd32(E1000_TIPG);
-       regs_buff[41] = rd32(E1000_DTXCTL);
-
-       /* Wake Up */
-       regs_buff[42] = rd32(E1000_WUC);
-       regs_buff[43] = rd32(E1000_WUFC);
-       regs_buff[44] = rd32(E1000_WUS);
-       regs_buff[45] = rd32(E1000_IPAV);
-       regs_buff[46] = rd32(E1000_WUPL);
-
-       /* MAC */
-       regs_buff[47] = rd32(E1000_PCS_CFG0);
-       regs_buff[48] = rd32(E1000_PCS_LCTL);
-       regs_buff[49] = rd32(E1000_PCS_LSTAT);
-       regs_buff[50] = rd32(E1000_PCS_ANADV);
-       regs_buff[51] = rd32(E1000_PCS_LPAB);
-       regs_buff[52] = rd32(E1000_PCS_NPTX);
-       regs_buff[53] = rd32(E1000_PCS_LPABNP);
-
-       /* Statistics */
-       regs_buff[54] = adapter->stats.crcerrs;
-       regs_buff[55] = adapter->stats.algnerrc;
-       regs_buff[56] = adapter->stats.symerrs;
-       regs_buff[57] = adapter->stats.rxerrc;
-       regs_buff[58] = adapter->stats.mpc;
-       regs_buff[59] = adapter->stats.scc;
-       regs_buff[60] = adapter->stats.ecol;
-       regs_buff[61] = adapter->stats.mcc;
-       regs_buff[62] = adapter->stats.latecol;
-       regs_buff[63] = adapter->stats.colc;
-       regs_buff[64] = adapter->stats.dc;
-       regs_buff[65] = adapter->stats.tncrs;
-       regs_buff[66] = adapter->stats.sec;
-       regs_buff[67] = adapter->stats.htdpmc;
-       regs_buff[68] = adapter->stats.rlec;
-       regs_buff[69] = adapter->stats.xonrxc;
-       regs_buff[70] = adapter->stats.xontxc;
-       regs_buff[71] = adapter->stats.xoffrxc;
-       regs_buff[72] = adapter->stats.xofftxc;
-       regs_buff[73] = adapter->stats.fcruc;
-       regs_buff[74] = adapter->stats.prc64;
-       regs_buff[75] = adapter->stats.prc127;
-       regs_buff[76] = adapter->stats.prc255;
-       regs_buff[77] = adapter->stats.prc511;
-       regs_buff[78] = adapter->stats.prc1023;
-       regs_buff[79] = adapter->stats.prc1522;
-       regs_buff[80] = adapter->stats.gprc;
-       regs_buff[81] = adapter->stats.bprc;
-       regs_buff[82] = adapter->stats.mprc;
-       regs_buff[83] = adapter->stats.gptc;
-       regs_buff[84] = adapter->stats.gorc;
-       regs_buff[86] = adapter->stats.gotc;
-       regs_buff[88] = adapter->stats.rnbc;
-       regs_buff[89] = adapter->stats.ruc;
-       regs_buff[90] = adapter->stats.rfc;
-       regs_buff[91] = adapter->stats.roc;
-       regs_buff[92] = adapter->stats.rjc;
-       regs_buff[93] = adapter->stats.mgprc;
-       regs_buff[94] = adapter->stats.mgpdc;
-       regs_buff[95] = adapter->stats.mgptc;
-       regs_buff[96] = adapter->stats.tor;
-       regs_buff[98] = adapter->stats.tot;
-       regs_buff[100] = adapter->stats.tpr;
-       regs_buff[101] = adapter->stats.tpt;
-       regs_buff[102] = adapter->stats.ptc64;
-       regs_buff[103] = adapter->stats.ptc127;
-       regs_buff[104] = adapter->stats.ptc255;
-       regs_buff[105] = adapter->stats.ptc511;
-       regs_buff[106] = adapter->stats.ptc1023;
-       regs_buff[107] = adapter->stats.ptc1522;
-       regs_buff[108] = adapter->stats.mptc;
-       regs_buff[109] = adapter->stats.bptc;
-       regs_buff[110] = adapter->stats.tsctc;
-       regs_buff[111] = adapter->stats.iac;
-       regs_buff[112] = adapter->stats.rpthc;
-       regs_buff[113] = adapter->stats.hgptc;
-       regs_buff[114] = adapter->stats.hgorc;
-       regs_buff[116] = adapter->stats.hgotc;
-       regs_buff[118] = adapter->stats.lenerrs;
-       regs_buff[119] = adapter->stats.scvpc;
-       regs_buff[120] = adapter->stats.hrmpc;
-
-       for (i = 0; i < 4; i++)
-               regs_buff[121 + i] = rd32(E1000_SRRCTL(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[125 + i] = rd32(E1000_PSRTYPE(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[129 + i] = rd32(E1000_RDBAL(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[133 + i] = rd32(E1000_RDBAH(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[137 + i] = rd32(E1000_RDLEN(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[141 + i] = rd32(E1000_RDH(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[145 + i] = rd32(E1000_RDT(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[149 + i] = rd32(E1000_RXDCTL(i));
-
-       for (i = 0; i < 10; i++)
-               regs_buff[153 + i] = rd32(E1000_EITR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[163 + i] = rd32(E1000_IMIR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[171 + i] = rd32(E1000_IMIREXT(i));
-       for (i = 0; i < 16; i++)
-               regs_buff[179 + i] = rd32(E1000_RAL(i));
-       for (i = 0; i < 16; i++)
-               regs_buff[195 + i] = rd32(E1000_RAH(i));
-
-       for (i = 0; i < 4; i++)
-               regs_buff[211 + i] = rd32(E1000_TDBAL(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[215 + i] = rd32(E1000_TDBAH(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[219 + i] = rd32(E1000_TDLEN(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[223 + i] = rd32(E1000_TDH(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[227 + i] = rd32(E1000_TDT(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[231 + i] = rd32(E1000_TXDCTL(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[235 + i] = rd32(E1000_TDWBAL(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[239 + i] = rd32(E1000_TDWBAH(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[243 + i] = rd32(E1000_DCA_TXCTRL(i));
-
-       for (i = 0; i < 4; i++)
-               regs_buff[247 + i] = rd32(E1000_IP4AT_REG(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[251 + i] = rd32(E1000_IP6AT_REG(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[255 + i] = rd32(E1000_WUPM_REG(i));
-       for (i = 0; i < 128; i++)
-               regs_buff[287 + i] = rd32(E1000_FFMT_REG(i));
-       for (i = 0; i < 128; i++)
-               regs_buff[415 + i] = rd32(E1000_FFVT_REG(i));
-       for (i = 0; i < 4; i++)
-               regs_buff[543 + i] = rd32(E1000_FFLT_REG(i));
-
-       regs_buff[547] = rd32(E1000_TDFH);
-       regs_buff[548] = rd32(E1000_TDFT);
-       regs_buff[549] = rd32(E1000_TDFHS);
-       regs_buff[550] = rd32(E1000_TDFPC);
-       regs_buff[551] = adapter->stats.o2bgptc;
-       regs_buff[552] = adapter->stats.b2ospc;
-       regs_buff[553] = adapter->stats.o2bspc;
-       regs_buff[554] = adapter->stats.b2ogprc;
-}
-
-static int igb_get_eeprom_len(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       return adapter->hw.nvm.word_size * 2;
-}
-
-static int igb_get_eeprom(struct net_device *netdev,
-                         struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       int first_word, last_word;
-       int ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EINVAL;
-
-       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-
-       eeprom_buff = kmalloc(sizeof(u16) *
-                       (last_word - first_word + 1), GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       if (hw->nvm.type == e1000_nvm_eeprom_spi)
-               ret_val = hw->nvm.ops.read(hw, first_word,
-                                           last_word - first_word + 1,
-                                           eeprom_buff);
-       else {
-               for (i = 0; i < last_word - first_word + 1; i++) {
-                       ret_val = hw->nvm.ops.read(hw, first_word + i, 1,
-                                                   &eeprom_buff[i]);
-                       if (ret_val)
-                               break;
-               }
-       }
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < last_word - first_word + 1; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
-                       eeprom->len);
-       kfree(eeprom_buff);
-
-       return ret_val;
-}
-
-static int igb_set_eeprom(struct net_device *netdev,
-                         struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       void *ptr;
-       int max_len, first_word, last_word, ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EOPNOTSUPP;
-
-       if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
-               return -EFAULT;
-
-       max_len = hw->nvm.word_size * 2;
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       ptr = (void *)eeprom_buff;
-
-       if (eeprom->offset & 1) {
-               /* need read/modify/write of first changed EEPROM word */
-               /* only the second byte of the word is being modified */
-               ret_val = hw->nvm.ops.read(hw, first_word, 1,
-                                           &eeprom_buff[0]);
-               ptr++;
-       }
-       if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) {
-               /* need read/modify/write of last changed EEPROM word */
-               /* only the first byte of the word is being modified */
-               ret_val = hw->nvm.ops.read(hw, last_word, 1,
-                                  &eeprom_buff[last_word - first_word]);
-       }
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < last_word - first_word + 1; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(ptr, bytes, eeprom->len);
-
-       for (i = 0; i < last_word - first_word + 1; i++)
-               eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
-
-       ret_val = hw->nvm.ops.write(hw, first_word,
-                                    last_word - first_word + 1, eeprom_buff);
-
-       /* Update the checksum over the first part of the EEPROM if needed
-        * and flush shadow RAM for 82573 controllers */
-       if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG)))
-               hw->nvm.ops.update(hw);
-
-       kfree(eeprom_buff);
-       return ret_val;
-}
-
-static void igb_get_drvinfo(struct net_device *netdev,
-                           struct ethtool_drvinfo *drvinfo)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       char firmware_version[32];
-       u16 eeprom_data;
-
-       strncpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver) - 1);
-       strncpy(drvinfo->version, igb_driver_version,
-               sizeof(drvinfo->version) - 1);
-
-       /* EEPROM image version # is reported as firmware version # for
-        * 82575 controllers */
-       adapter->hw.nvm.ops.read(&adapter->hw, 5, 1, &eeprom_data);
-       sprintf(firmware_version, "%d.%d-%d",
-               (eeprom_data & 0xF000) >> 12,
-               (eeprom_data & 0x0FF0) >> 4,
-               eeprom_data & 0x000F);
-
-       strncpy(drvinfo->fw_version, firmware_version,
-               sizeof(drvinfo->fw_version) - 1);
-       strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
-               sizeof(drvinfo->bus_info) - 1);
-       drvinfo->n_stats = IGB_STATS_LEN;
-       drvinfo->testinfo_len = IGB_TEST_LEN;
-       drvinfo->regdump_len = igb_get_regs_len(netdev);
-       drvinfo->eedump_len = igb_get_eeprom_len(netdev);
-}
-
-static void igb_get_ringparam(struct net_device *netdev,
-                             struct ethtool_ringparam *ring)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       ring->rx_max_pending = IGB_MAX_RXD;
-       ring->tx_max_pending = IGB_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = adapter->rx_ring_count;
-       ring->tx_pending = adapter->tx_ring_count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int igb_set_ringparam(struct net_device *netdev,
-                            struct ethtool_ringparam *ring)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct igb_ring *temp_ring;
-       int i, err = 0;
-       u16 new_rx_count, new_tx_count;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       new_rx_count = min_t(u32, ring->rx_pending, IGB_MAX_RXD);
-       new_rx_count = max_t(u16, new_rx_count, IGB_MIN_RXD);
-       new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       new_tx_count = min_t(u32, ring->tx_pending, IGB_MAX_TXD);
-       new_tx_count = max_t(u16, new_tx_count, IGB_MIN_TXD);
-       new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       if ((new_tx_count == adapter->tx_ring_count) &&
-           (new_rx_count == adapter->rx_ring_count)) {
-               /* nothing to do */
-               return 0;
-       }
-
-       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
-               msleep(1);
-
-       if (!netif_running(adapter->netdev)) {
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       adapter->tx_ring[i]->count = new_tx_count;
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       adapter->rx_ring[i]->count = new_rx_count;
-               adapter->tx_ring_count = new_tx_count;
-               adapter->rx_ring_count = new_rx_count;
-               goto clear_reset;
-       }
-
-       if (adapter->num_tx_queues > adapter->num_rx_queues)
-               temp_ring = vmalloc(adapter->num_tx_queues * sizeof(struct igb_ring));
-       else
-               temp_ring = vmalloc(adapter->num_rx_queues * sizeof(struct igb_ring));
-
-       if (!temp_ring) {
-               err = -ENOMEM;
-               goto clear_reset;
-       }
-
-       igb_down(adapter);
-
-       /*
-        * We can't just free everything and then setup again,
-        * because the ISRs in MSI-X mode get passed pointers
-        * to the tx and rx ring structs.
-        */
-       if (new_tx_count != adapter->tx_ring_count) {
-               for (i = 0; i < adapter->num_tx_queues; i++) {
-                       memcpy(&temp_ring[i], adapter->tx_ring[i],
-                              sizeof(struct igb_ring));
-
-                       temp_ring[i].count = new_tx_count;
-                       err = igb_setup_tx_resources(&temp_ring[i]);
-                       if (err) {
-                               while (i) {
-                                       i--;
-                                       igb_free_tx_resources(&temp_ring[i]);
-                               }
-                               goto err_setup;
-                       }
-               }
-
-               for (i = 0; i < adapter->num_tx_queues; i++) {
-                       igb_free_tx_resources(adapter->tx_ring[i]);
-
-                       memcpy(adapter->tx_ring[i], &temp_ring[i],
-                              sizeof(struct igb_ring));
-               }
-
-               adapter->tx_ring_count = new_tx_count;
-       }
-
-       if (new_rx_count != adapter->rx_ring_count) {
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       memcpy(&temp_ring[i], adapter->rx_ring[i],
-                              sizeof(struct igb_ring));
-
-                       temp_ring[i].count = new_rx_count;
-                       err = igb_setup_rx_resources(&temp_ring[i]);
-                       if (err) {
-                               while (i) {
-                                       i--;
-                                       igb_free_rx_resources(&temp_ring[i]);
-                               }
-                               goto err_setup;
-                       }
-
-               }
-
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       igb_free_rx_resources(adapter->rx_ring[i]);
-
-                       memcpy(adapter->rx_ring[i], &temp_ring[i],
-                              sizeof(struct igb_ring));
-               }
-
-               adapter->rx_ring_count = new_rx_count;
-       }
-err_setup:
-       igb_up(adapter);
-       vfree(temp_ring);
-clear_reset:
-       clear_bit(__IGB_RESETTING, &adapter->state);
-       return err;
-}
-
-/* ethtool register test data */
-struct igb_reg_test {
-       u16 reg;
-       u16 reg_offset;
-       u16 array_len;
-       u16 test_type;
-       u32 mask;
-       u32 write;
-};
-
-/* In the hardware, registers are laid out either singly, in arrays
- * spaced 0x100 bytes apart, or in contiguous tables.  We assume
- * most tests take place on arrays or single registers (handled
- * as a single-element array) and special-case the tables.
- * Table tests are always pattern tests.
- *
- * We also make provision for some required setup steps by specifying
- * registers to be written without any read-back testing.
- */
-
-#define PATTERN_TEST   1
-#define SET_READ_TEST  2
-#define WRITE_NO_TEST  3
-#define TABLE32_TEST   4
-#define TABLE64_TEST_LO        5
-#define TABLE64_TEST_HI        6
-
-/* i350 reg test */
-static struct igb_reg_test reg_test_i350[] = {
-       { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_FCAH,      0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_FCT,       0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_VET,       0x100, 1,  PATTERN_TEST, 0xFFFF0000, 0xFFFF0000 },
-       { E1000_RDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_RDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       { E1000_RDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_RDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       /* RDH is read-only for i350, only test RDT. */
-       { E1000_RDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_RDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_FCRTH,     0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
-       { E1000_FCTTV,     0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_TIPG,      0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
-       { E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       { E1000_TDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_TDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_TDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       { E1000_TDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_TDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },
-       { E1000_TCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_RA,        0, 16, TABLE64_TEST_LO,
-                                               0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RA,        0, 16, TABLE64_TEST_HI,
-                                               0xC3FFFFFF, 0xFFFFFFFF },
-       { E1000_RA2,       0, 16, TABLE64_TEST_LO,
-                                               0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RA2,       0, 16, TABLE64_TEST_HI,
-                                               0xC3FFFFFF, 0xFFFFFFFF },
-       { E1000_MTA,       0, 128, TABLE32_TEST,
-                                               0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
-};
-
-/* 82580 reg test */
-static struct igb_reg_test reg_test_82580[] = {
-       { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_FCAH,      0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_FCT,       0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_VET,       0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_RDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       { E1000_RDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_RDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       /* RDH is read-only for 82580, only test RDT. */
-       { E1000_RDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_RDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_FCRTH,     0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
-       { E1000_FCTTV,     0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_TIPG,      0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
-       { E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       { E1000_TDBAL(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_TDBAH(4),  0x40,  4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_TDLEN(4),  0x40,  4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       { E1000_TDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_TDT(4),    0x40,  4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },
-       { E1000_TCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_RA,        0, 16, TABLE64_TEST_LO,
-                                               0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RA,        0, 16, TABLE64_TEST_HI,
-                                               0x83FFFFFF, 0xFFFFFFFF },
-       { E1000_RA2,       0, 8, TABLE64_TEST_LO,
-                                               0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RA2,       0, 8, TABLE64_TEST_HI,
-                                               0x83FFFFFF, 0xFFFFFFFF },
-       { E1000_MTA,       0, 128, TABLE32_TEST,
-                                               0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
-};
-
-/* 82576 reg test */
-static struct igb_reg_test reg_test_82576[] = {
-       { E1000_FCAL,      0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_FCAH,      0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_FCT,       0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_VET,       0x100, 1,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDBAL(0),  0x100, 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_RDBAH(0),  0x100, 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDLEN(0),  0x100, 4, PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       { E1000_RDBAL(4),  0x40, 12, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_RDBAH(4),  0x40, 12, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDLEN(4),  0x40, 12, PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       /* Enable all RX queues before testing. */
-       { E1000_RXDCTL(0), 0x100, 4,  WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
-       { E1000_RXDCTL(4), 0x40, 12,  WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
-       /* RDH is read-only for 82576, only test RDT. */
-       { E1000_RDT(0),    0x100, 4,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_RDT(4),    0x40, 12,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_RXDCTL(0), 0x100, 4,  WRITE_NO_TEST, 0, 0 },
-       { E1000_RXDCTL(4), 0x40, 12,  WRITE_NO_TEST, 0, 0 },
-       { E1000_FCRTH,     0x100, 1,  PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
-       { E1000_FCTTV,     0x100, 1,  PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_TIPG,      0x100, 1,  PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
-       { E1000_TDBAL(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_TDBAH(0),  0x100, 4,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_TDLEN(0),  0x100, 4,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       { E1000_TDBAL(4),  0x40, 12,  PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_TDBAH(4),  0x40, 12,  PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_TDLEN(4),  0x40, 12,  PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0x003FFFFB },
-       { E1000_RCTL,      0x100, 1,  SET_READ_TEST, 0x04CFB0FE, 0xFFFFFFFF },
-       { E1000_TCTL,      0x100, 1,  SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_RA,        0, 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RA,        0, 16, TABLE64_TEST_HI, 0x83FFFFFF, 0xFFFFFFFF },
-       { E1000_RA2,       0, 8, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RA2,       0, 8, TABLE64_TEST_HI, 0x83FFFFFF, 0xFFFFFFFF },
-       { E1000_MTA,       0, 128,TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
-};
-
-/* 82575 register test */
-static struct igb_reg_test reg_test_82575[] = {
-       { E1000_FCAL,      0x100, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_FCAH,      0x100, 1, PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_FCT,       0x100, 1, PATTERN_TEST, 0x0000FFFF, 0xFFFFFFFF },
-       { E1000_VET,       0x100, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDBAL(0),  0x100, 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_RDBAH(0),  0x100, 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RDLEN(0),  0x100, 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       /* Enable all four RX queues before testing. */
-       { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
-       /* RDH is read-only for 82575, only test RDT. */
-       { E1000_RDT(0),    0x100, 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0, 0 },
-       { E1000_FCRTH,     0x100, 1, PATTERN_TEST, 0x0000FFF0, 0x0000FFF0 },
-       { E1000_FCTTV,     0x100, 1, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { E1000_TIPG,      0x100, 1, PATTERN_TEST, 0x3FFFFFFF, 0x3FFFFFFF },
-       { E1000_TDBAL(0),  0x100, 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { E1000_TDBAH(0),  0x100, 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_TDLEN(0),  0x100, 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       { E1000_RCTL,      0x100, 1, SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_RCTL,      0x100, 1, SET_READ_TEST, 0x04CFB3FE, 0x003FFFFB },
-       { E1000_RCTL,      0x100, 1, SET_READ_TEST, 0x04CFB3FE, 0xFFFFFFFF },
-       { E1000_TCTL,      0x100, 1, SET_READ_TEST, 0xFFFFFFFF, 0x00000000 },
-       { E1000_TXCW,      0x100, 1, PATTERN_TEST, 0xC000FFFF, 0x0000FFFF },
-       { E1000_RA,        0, 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
-       { E1000_RA,        0, 16, TABLE64_TEST_HI, 0x800FFFFF, 0xFFFFFFFF },
-       { E1000_MTA,       0, 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
-};
-
-static bool reg_pattern_test(struct igb_adapter *adapter, u64 *data,
-                            int reg, u32 mask, u32 write)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 pat, val;
-       static const u32 _test[] =
-               {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
-       for (pat = 0; pat < ARRAY_SIZE(_test); pat++) {
-               wr32(reg, (_test[pat] & write));
-               val = rd32(reg) & mask;
-               if (val != (_test[pat] & write & mask)) {
-                       dev_err(&adapter->pdev->dev, "pattern test reg %04X "
-                               "failed: got 0x%08X expected 0x%08X\n",
-                               reg, val, (_test[pat] & write & mask));
-                       *data = reg;
-                       return 1;
-               }
-       }
-
-       return 0;
-}
-
-static bool reg_set_and_check(struct igb_adapter *adapter, u64 *data,
-                             int reg, u32 mask, u32 write)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 val;
-       wr32(reg, write & mask);
-       val = rd32(reg);
-       if ((write & mask) != (val & mask)) {
-               dev_err(&adapter->pdev->dev, "set/check reg %04X test failed:"
-                       " got 0x%08X expected 0x%08X\n", reg,
-                       (val & mask), (write & mask));
-               *data = reg;
-               return 1;
-       }
-
-       return 0;
-}
-
-#define REG_PATTERN_TEST(reg, mask, write) \
-       do { \
-               if (reg_pattern_test(adapter, data, reg, mask, write)) \
-                       return 1; \
-       } while (0)
-
-#define REG_SET_AND_CHECK(reg, mask, write) \
-       do { \
-               if (reg_set_and_check(adapter, data, reg, mask, write)) \
-                       return 1; \
-       } while (0)
-
-static int igb_reg_test(struct igb_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct igb_reg_test *test;
-       u32 value, before, after;
-       u32 i, toggle;
-
-       switch (adapter->hw.mac.type) {
-       case e1000_i350:
-               test = reg_test_i350;
-               toggle = 0x7FEFF3FF;
-               break;
-       case e1000_82580:
-               test = reg_test_82580;
-               toggle = 0x7FEFF3FF;
-               break;
-       case e1000_82576:
-               test = reg_test_82576;
-               toggle = 0x7FFFF3FF;
-               break;
-       default:
-               test = reg_test_82575;
-               toggle = 0x7FFFF3FF;
-               break;
-       }
-
-       /* Because the status register is such a special case,
-        * we handle it separately from the rest of the register
-        * tests.  Some bits are read-only, some toggle, and some
-        * are writable on newer MACs.
-        */
-       before = rd32(E1000_STATUS);
-       value = (rd32(E1000_STATUS) & toggle);
-       wr32(E1000_STATUS, toggle);
-       after = rd32(E1000_STATUS) & toggle;
-       if (value != after) {
-               dev_err(&adapter->pdev->dev, "failed STATUS register test "
-                       "got: 0x%08X expected: 0x%08X\n", after, value);
-               *data = 1;
-               return 1;
-       }
-       /* restore previous status */
-       wr32(E1000_STATUS, before);
-
-       /* Perform the remainder of the register test, looping through
-        * the test table until we either fail or reach the null entry.
-        */
-       while (test->reg) {
-               for (i = 0; i < test->array_len; i++) {
-                       switch (test->test_type) {
-                       case PATTERN_TEST:
-                               REG_PATTERN_TEST(test->reg +
-                                               (i * test->reg_offset),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case SET_READ_TEST:
-                               REG_SET_AND_CHECK(test->reg +
-                                               (i * test->reg_offset),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case WRITE_NO_TEST:
-                               writel(test->write,
-                                   (adapter->hw.hw_addr + test->reg)
-                                       + (i * test->reg_offset));
-                               break;
-                       case TABLE32_TEST:
-                               REG_PATTERN_TEST(test->reg + (i * 4),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case TABLE64_TEST_LO:
-                               REG_PATTERN_TEST(test->reg + (i * 8),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case TABLE64_TEST_HI:
-                               REG_PATTERN_TEST((test->reg + 4) + (i * 8),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       }
-               }
-               test++;
-       }
-
-       *data = 0;
-       return 0;
-}
-
-static int igb_eeprom_test(struct igb_adapter *adapter, u64 *data)
-{
-       u16 temp;
-       u16 checksum = 0;
-       u16 i;
-
-       *data = 0;
-       /* Read and add up the contents of the EEPROM */
-       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-               if ((adapter->hw.nvm.ops.read(&adapter->hw, i, 1, &temp)) < 0) {
-                       *data = 1;
-                       break;
-               }
-               checksum += temp;
-       }
-
-       /* If Checksum is not Correct return error else test passed */
-       if ((checksum != (u16) NVM_SUM) && !(*data))
-               *data = 2;
-
-       return *data;
-}
-
-static irqreturn_t igb_test_intr(int irq, void *data)
-{
-       struct igb_adapter *adapter = (struct igb_adapter *) data;
-       struct e1000_hw *hw = &adapter->hw;
-
-       adapter->test_icr |= rd32(E1000_ICR);
-
-       return IRQ_HANDLED;
-}
-
-static int igb_intr_test(struct igb_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 mask, ics_mask, i = 0, shared_int = true;
-       u32 irq = adapter->pdev->irq;
-
-       *data = 0;
-
-       /* Hook up test interrupt handler just for this test */
-       if (adapter->msix_entries) {
-               if (request_irq(adapter->msix_entries[0].vector,
-                               igb_test_intr, 0, netdev->name, adapter)) {
-                       *data = 1;
-                       return -1;
-               }
-       } else if (adapter->flags & IGB_FLAG_HAS_MSI) {
-               shared_int = false;
-               if (request_irq(irq,
-                               igb_test_intr, 0, netdev->name, adapter)) {
-                       *data = 1;
-                       return -1;
-               }
-       } else if (!request_irq(irq, igb_test_intr, IRQF_PROBE_SHARED,
-                               netdev->name, adapter)) {
-               shared_int = false;
-       } else if (request_irq(irq, igb_test_intr, IRQF_SHARED,
-                netdev->name, adapter)) {
-               *data = 1;
-               return -1;
-       }
-       dev_info(&adapter->pdev->dev, "testing %s interrupt\n",
-               (shared_int ? "shared" : "unshared"));
-
-       /* Disable all the interrupts */
-       wr32(E1000_IMC, ~0);
-       wrfl();
-       msleep(10);
-
-       /* Define all writable bits for ICS */
-       switch (hw->mac.type) {
-       case e1000_82575:
-               ics_mask = 0x37F47EDD;
-               break;
-       case e1000_82576:
-               ics_mask = 0x77D4FBFD;
-               break;
-       case e1000_82580:
-               ics_mask = 0x77DCFED5;
-               break;
-       case e1000_i350:
-               ics_mask = 0x77DCFED5;
-               break;
-       default:
-               ics_mask = 0x7FFFFFFF;
-               break;
-       }
-
-       /* Test each interrupt */
-       for (; i < 31; i++) {
-               /* Interrupt to test */
-               mask = 1 << i;
-
-               if (!(mask & ics_mask))
-                       continue;
-
-               if (!shared_int) {
-                       /* Disable the interrupt to be reported in
-                        * the cause register and then force the same
-                        * interrupt and see if one gets posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-
-                       /* Flush any pending interrupts */
-                       wr32(E1000_ICR, ~0);
-
-                       wr32(E1000_IMC, mask);
-                       wr32(E1000_ICS, mask);
-                       wrfl();
-                       msleep(10);
-
-                       if (adapter->test_icr & mask) {
-                               *data = 3;
-                               break;
-                       }
-               }
-
-               /* Enable the interrupt to be reported in
-                * the cause register and then force the same
-                * interrupt and see if one gets posted.  If
-                * an interrupt was not posted to the bus, the
-                * test failed.
-                */
-               adapter->test_icr = 0;
-
-               /* Flush any pending interrupts */
-               wr32(E1000_ICR, ~0);
-
-               wr32(E1000_IMS, mask);
-               wr32(E1000_ICS, mask);
-               wrfl();
-               msleep(10);
-
-               if (!(adapter->test_icr & mask)) {
-                       *data = 4;
-                       break;
-               }
-
-               if (!shared_int) {
-                       /* Disable the other interrupts to be reported in
-                        * the cause register and then force the other
-                        * interrupts and see if any get posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-
-                       /* Flush any pending interrupts */
-                       wr32(E1000_ICR, ~0);
-
-                       wr32(E1000_IMC, ~mask);
-                       wr32(E1000_ICS, ~mask);
-                       wrfl();
-                       msleep(10);
-
-                       if (adapter->test_icr & mask) {
-                               *data = 5;
-                               break;
-                       }
-               }
-       }
-
-       /* Disable all the interrupts */
-       wr32(E1000_IMC, ~0);
-       wrfl();
-       msleep(10);
-
-       /* Unhook test interrupt handler */
-       if (adapter->msix_entries)
-               free_irq(adapter->msix_entries[0].vector, adapter);
-       else
-               free_irq(irq, adapter);
-
-       return *data;
-}
-
-static void igb_free_desc_rings(struct igb_adapter *adapter)
-{
-       igb_free_tx_resources(&adapter->test_tx_ring);
-       igb_free_rx_resources(&adapter->test_rx_ring);
-}
-
-static int igb_setup_desc_rings(struct igb_adapter *adapter)
-{
-       struct igb_ring *tx_ring = &adapter->test_tx_ring;
-       struct igb_ring *rx_ring = &adapter->test_rx_ring;
-       struct e1000_hw *hw = &adapter->hw;
-       int ret_val;
-
-       /* Setup Tx descriptor ring and Tx buffers */
-       tx_ring->count = IGB_DEFAULT_TXD;
-       tx_ring->dev = &adapter->pdev->dev;
-       tx_ring->netdev = adapter->netdev;
-       tx_ring->reg_idx = adapter->vfs_allocated_count;
-
-       if (igb_setup_tx_resources(tx_ring)) {
-               ret_val = 1;
-               goto err_nomem;
-       }
-
-       igb_setup_tctl(adapter);
-       igb_configure_tx_ring(adapter, tx_ring);
-
-       /* Setup Rx descriptor ring and Rx buffers */
-       rx_ring->count = IGB_DEFAULT_RXD;
-       rx_ring->dev = &adapter->pdev->dev;
-       rx_ring->netdev = adapter->netdev;
-       rx_ring->rx_buffer_len = IGB_RXBUFFER_2048;
-       rx_ring->reg_idx = adapter->vfs_allocated_count;
-
-       if (igb_setup_rx_resources(rx_ring)) {
-               ret_val = 3;
-               goto err_nomem;
-       }
-
-       /* set the default queue to queue 0 of PF */
-       wr32(E1000_MRQC, adapter->vfs_allocated_count << 3);
-
-       /* enable receive ring */
-       igb_setup_rctl(adapter);
-       igb_configure_rx_ring(adapter, rx_ring);
-
-       igb_alloc_rx_buffers_adv(rx_ring, igb_desc_unused(rx_ring));
-
-       return 0;
-
-err_nomem:
-       igb_free_desc_rings(adapter);
-       return ret_val;
-}
-
-static void igb_phy_disable_receiver(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
-       igb_write_phy_reg(hw, 29, 0x001F);
-       igb_write_phy_reg(hw, 30, 0x8FFC);
-       igb_write_phy_reg(hw, 29, 0x001A);
-       igb_write_phy_reg(hw, 30, 0x8FF0);
-}
-
-static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_reg = 0;
-
-       hw->mac.autoneg = false;
-
-       if (hw->phy.type == e1000_phy_m88) {
-               /* Auto-MDI/MDIX Off */
-               igb_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, 0x0808);
-               /* reset to update Auto-MDI/MDIX */
-               igb_write_phy_reg(hw, PHY_CONTROL, 0x9140);
-               /* autoneg off */
-               igb_write_phy_reg(hw, PHY_CONTROL, 0x8140);
-       } else if (hw->phy.type == e1000_phy_82580) {
-               /* enable MII loopback */
-               igb_write_phy_reg(hw, I82580_PHY_LBK_CTRL, 0x8041);
-       }
-
-       ctrl_reg = rd32(E1000_CTRL);
-
-       /* force 1000, set loopback */
-       igb_write_phy_reg(hw, PHY_CONTROL, 0x4140);
-
-       /* Now set up the MAC to the same speed/duplex as the PHY. */
-       ctrl_reg = rd32(E1000_CTRL);
-       ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
-       ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
-                    E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
-                    E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
-                    E1000_CTRL_FD |     /* Force Duplex to FULL */
-                    E1000_CTRL_SLU);    /* Set link up enable bit */
-
-       if (hw->phy.type == e1000_phy_m88)
-               ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
-
-       wr32(E1000_CTRL, ctrl_reg);
-
-       /* Disable the receiver on the PHY so when a cable is plugged in, the
-        * PHY does not begin to autoneg when a cable is reconnected to the NIC.
-        */
-       if (hw->phy.type == e1000_phy_m88)
-               igb_phy_disable_receiver(adapter);
-
-       udelay(500);
-
-       return 0;
-}
-
-static int igb_set_phy_loopback(struct igb_adapter *adapter)
-{
-       return igb_integrated_phy_loopback(adapter);
-}
-
-static int igb_setup_loopback_test(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 reg;
-
-       reg = rd32(E1000_CTRL_EXT);
-
-       /* use CTRL_EXT to identify link type as SGMII can appear as copper */
-       if (reg & E1000_CTRL_EXT_LINK_MODE_MASK) {
-               if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||
-               (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||
-               (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||
-               (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) {
-
-                       /* Enable DH89xxCC MPHY for near end loopback */
-                       reg = rd32(E1000_MPHY_ADDR_CTL);
-                       reg = (reg & E1000_MPHY_ADDR_CTL_OFFSET_MASK) |
-                       E1000_MPHY_PCS_CLK_REG_OFFSET;
-                       wr32(E1000_MPHY_ADDR_CTL, reg);
-
-                       reg = rd32(E1000_MPHY_DATA);
-                       reg |= E1000_MPHY_PCS_CLK_REG_DIGINELBEN;
-                       wr32(E1000_MPHY_DATA, reg);
-               }
-
-               reg = rd32(E1000_RCTL);
-               reg |= E1000_RCTL_LBM_TCVR;
-               wr32(E1000_RCTL, reg);
-
-               wr32(E1000_SCTL, E1000_ENABLE_SERDES_LOOPBACK);
-
-               reg = rd32(E1000_CTRL);
-               reg &= ~(E1000_CTRL_RFCE |
-                        E1000_CTRL_TFCE |
-                        E1000_CTRL_LRST);
-               reg |= E1000_CTRL_SLU |
-                      E1000_CTRL_FD;
-               wr32(E1000_CTRL, reg);
-
-               /* Unset switch control to serdes energy detect */
-               reg = rd32(E1000_CONNSW);
-               reg &= ~E1000_CONNSW_ENRGSRC;
-               wr32(E1000_CONNSW, reg);
-
-               /* Set PCS register for forced speed */
-               reg = rd32(E1000_PCS_LCTL);
-               reg &= ~E1000_PCS_LCTL_AN_ENABLE;     /* Disable Autoneg*/
-               reg |= E1000_PCS_LCTL_FLV_LINK_UP |   /* Force link up */
-                      E1000_PCS_LCTL_FSV_1000 |      /* Force 1000    */
-                      E1000_PCS_LCTL_FDV_FULL |      /* SerDes Full duplex */
-                      E1000_PCS_LCTL_FSD |           /* Force Speed */
-                      E1000_PCS_LCTL_FORCE_LINK;     /* Force Link */
-               wr32(E1000_PCS_LCTL, reg);
-
-               return 0;
-       }
-
-       return igb_set_phy_loopback(adapter);
-}
-
-static void igb_loopback_cleanup(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-       u16 phy_reg;
-
-       if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||
-       (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||
-       (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||
-       (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) {
-               u32 reg;
-
-               /* Disable near end loopback on DH89xxCC */
-               reg = rd32(E1000_MPHY_ADDR_CTL);
-               reg = (reg & E1000_MPHY_ADDR_CTL_OFFSET_MASK) |
-               E1000_MPHY_PCS_CLK_REG_OFFSET;
-               wr32(E1000_MPHY_ADDR_CTL, reg);
-
-               reg = rd32(E1000_MPHY_DATA);
-               reg &= ~E1000_MPHY_PCS_CLK_REG_DIGINELBEN;
-               wr32(E1000_MPHY_DATA, reg);
-       }
-
-       rctl = rd32(E1000_RCTL);
-       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
-       wr32(E1000_RCTL, rctl);
-
-       hw->mac.autoneg = true;
-       igb_read_phy_reg(hw, PHY_CONTROL, &phy_reg);
-       if (phy_reg & MII_CR_LOOPBACK) {
-               phy_reg &= ~MII_CR_LOOPBACK;
-               igb_write_phy_reg(hw, PHY_CONTROL, phy_reg);
-               igb_phy_sw_reset(hw);
-       }
-}
-
-static void igb_create_lbtest_frame(struct sk_buff *skb,
-                                   unsigned int frame_size)
-{
-       memset(skb->data, 0xFF, frame_size);
-       frame_size /= 2;
-       memset(&skb->data[frame_size], 0xAA, frame_size - 1);
-       memset(&skb->data[frame_size + 10], 0xBE, 1);
-       memset(&skb->data[frame_size + 12], 0xAF, 1);
-}
-
-static int igb_check_lbtest_frame(struct sk_buff *skb, unsigned int frame_size)
-{
-       frame_size /= 2;
-       if (*(skb->data + 3) == 0xFF) {
-               if ((*(skb->data + frame_size + 10) == 0xBE) &&
-                  (*(skb->data + frame_size + 12) == 0xAF)) {
-                       return 0;
-               }
-       }
-       return 13;
-}
-
-static int igb_clean_test_rings(struct igb_ring *rx_ring,
-                                struct igb_ring *tx_ring,
-                                unsigned int size)
-{
-       union e1000_adv_rx_desc *rx_desc;
-       struct igb_buffer *buffer_info;
-       int rx_ntc, tx_ntc, count = 0;
-       u32 staterr;
-
-       /* initialize next to clean and descriptor values */
-       rx_ntc = rx_ring->next_to_clean;
-       tx_ntc = tx_ring->next_to_clean;
-       rx_desc = E1000_RX_DESC_ADV(*rx_ring, rx_ntc);
-       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-
-       while (staterr & E1000_RXD_STAT_DD) {
-               /* check rx buffer */
-               buffer_info = &rx_ring->buffer_info[rx_ntc];
-
-               /* unmap rx buffer, will be remapped by alloc_rx_buffers */
-               dma_unmap_single(rx_ring->dev,
-                                buffer_info->dma,
-                                rx_ring->rx_buffer_len,
-                                DMA_FROM_DEVICE);
-               buffer_info->dma = 0;
-
-               /* verify contents of skb */
-               if (!igb_check_lbtest_frame(buffer_info->skb, size))
-                       count++;
-
-               /* unmap buffer on tx side */
-               buffer_info = &tx_ring->buffer_info[tx_ntc];
-               igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
-
-               /* increment rx/tx next to clean counters */
-               rx_ntc++;
-               if (rx_ntc == rx_ring->count)
-                       rx_ntc = 0;
-               tx_ntc++;
-               if (tx_ntc == tx_ring->count)
-                       tx_ntc = 0;
-
-               /* fetch next descriptor */
-               rx_desc = E1000_RX_DESC_ADV(*rx_ring, rx_ntc);
-               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-       }
-
-       /* re-map buffers to ring, store next to clean values */
-       igb_alloc_rx_buffers_adv(rx_ring, count);
-       rx_ring->next_to_clean = rx_ntc;
-       tx_ring->next_to_clean = tx_ntc;
-
-       return count;
-}
-
-static int igb_run_loopback_test(struct igb_adapter *adapter)
-{
-       struct igb_ring *tx_ring = &adapter->test_tx_ring;
-       struct igb_ring *rx_ring = &adapter->test_rx_ring;
-       int i, j, lc, good_cnt, ret_val = 0;
-       unsigned int size = 1024;
-       netdev_tx_t tx_ret_val;
-       struct sk_buff *skb;
-
-       /* allocate test skb */
-       skb = alloc_skb(size, GFP_KERNEL);
-       if (!skb)
-               return 11;
-
-       /* place data into test skb */
-       igb_create_lbtest_frame(skb, size);
-       skb_put(skb, size);
-
-       /*
-        * Calculate the loop count based on the largest descriptor ring
-        * The idea is to wrap the largest ring a number of times using 64
-        * send/receive pairs during each loop
-        */
-
-       if (rx_ring->count <= tx_ring->count)
-               lc = ((tx_ring->count / 64) * 2) + 1;
-       else
-               lc = ((rx_ring->count / 64) * 2) + 1;
-
-       for (j = 0; j <= lc; j++) { /* loop count loop */
-               /* reset count of good packets */
-               good_cnt = 0;
-
-               /* place 64 packets on the transmit queue*/
-               for (i = 0; i < 64; i++) {
-                       skb_get(skb);
-                       tx_ret_val = igb_xmit_frame_ring_adv(skb, tx_ring);
-                       if (tx_ret_val == NETDEV_TX_OK)
-                               good_cnt++;
-               }
-
-               if (good_cnt != 64) {
-                       ret_val = 12;
-                       break;
-               }
-
-               /* allow 200 milliseconds for packets to go from tx to rx */
-               msleep(200);
-
-               good_cnt = igb_clean_test_rings(rx_ring, tx_ring, size);
-               if (good_cnt != 64) {
-                       ret_val = 13;
-                       break;
-               }
-       } /* end loop count loop */
-
-       /* free the original skb */
-       kfree_skb(skb);
-
-       return ret_val;
-}
-
-static int igb_loopback_test(struct igb_adapter *adapter, u64 *data)
-{
-       /* PHY loopback cannot be performed if SoL/IDER
-        * sessions are active */
-       if (igb_check_reset_block(&adapter->hw)) {
-               dev_err(&adapter->pdev->dev,
-                       "Cannot do PHY loopback test "
-                       "when SoL/IDER is active.\n");
-               *data = 0;
-               goto out;
-       }
-       *data = igb_setup_desc_rings(adapter);
-       if (*data)
-               goto out;
-       *data = igb_setup_loopback_test(adapter);
-       if (*data)
-               goto err_loopback;
-       *data = igb_run_loopback_test(adapter);
-       igb_loopback_cleanup(adapter);
-
-err_loopback:
-       igb_free_desc_rings(adapter);
-out:
-       return *data;
-}
-
-static int igb_link_test(struct igb_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       *data = 0;
-       if (hw->phy.media_type == e1000_media_type_internal_serdes) {
-               int i = 0;
-               hw->mac.serdes_has_link = false;
-
-               /* On some blade server designs, link establishment
-                * could take as long as 2-3 minutes */
-               do {
-                       hw->mac.ops.check_for_link(&adapter->hw);
-                       if (hw->mac.serdes_has_link)
-                               return *data;
-                       msleep(20);
-               } while (i++ < 3750);
-
-               *data = 1;
-       } else {
-               hw->mac.ops.check_for_link(&adapter->hw);
-               if (hw->mac.autoneg)
-                       msleep(4000);
-
-               if (!(rd32(E1000_STATUS) & E1000_STATUS_LU))
-                       *data = 1;
-       }
-       return *data;
-}
-
-static void igb_diag_test(struct net_device *netdev,
-                         struct ethtool_test *eth_test, u64 *data)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       u16 autoneg_advertised;
-       u8 forced_speed_duplex, autoneg;
-       bool if_running = netif_running(netdev);
-
-       set_bit(__IGB_TESTING, &adapter->state);
-       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
-               /* Offline tests */
-
-               /* save speed, duplex, autoneg settings */
-               autoneg_advertised = adapter->hw.phy.autoneg_advertised;
-               forced_speed_duplex = adapter->hw.mac.forced_speed_duplex;
-               autoneg = adapter->hw.mac.autoneg;
-
-               dev_info(&adapter->pdev->dev, "offline testing starting\n");
-
-               /* power up link for link test */
-               igb_power_up_link(adapter);
-
-               /* Link test performed before hardware reset so autoneg doesn't
-                * interfere with test result */
-               if (igb_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               if (if_running)
-                       /* indicate we're in test mode */
-                       dev_close(netdev);
-               else
-                       igb_reset(adapter);
-
-               if (igb_reg_test(adapter, &data[0]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               igb_reset(adapter);
-               if (igb_eeprom_test(adapter, &data[1]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               igb_reset(adapter);
-               if (igb_intr_test(adapter, &data[2]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               igb_reset(adapter);
-               /* power up link for loopback test */
-               igb_power_up_link(adapter);
-               if (igb_loopback_test(adapter, &data[3]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* restore speed, duplex, autoneg settings */
-               adapter->hw.phy.autoneg_advertised = autoneg_advertised;
-               adapter->hw.mac.forced_speed_duplex = forced_speed_duplex;
-               adapter->hw.mac.autoneg = autoneg;
-
-               /* force this routine to wait until autoneg complete/timeout */
-               adapter->hw.phy.autoneg_wait_to_complete = true;
-               igb_reset(adapter);
-               adapter->hw.phy.autoneg_wait_to_complete = false;
-
-               clear_bit(__IGB_TESTING, &adapter->state);
-               if (if_running)
-                       dev_open(netdev);
-       } else {
-               dev_info(&adapter->pdev->dev, "online testing starting\n");
-
-               /* PHY is powered down when interface is down */
-               if (if_running && igb_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-               else
-                       data[4] = 0;
-
-               /* Online tests aren't run; pass by default */
-               data[0] = 0;
-               data[1] = 0;
-               data[2] = 0;
-               data[3] = 0;
-
-               clear_bit(__IGB_TESTING, &adapter->state);
-       }
-       msleep_interruptible(4 * 1000);
-}
-
-static int igb_wol_exclusion(struct igb_adapter *adapter,
-                            struct ethtool_wolinfo *wol)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int retval = 1; /* fail by default */
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82575GB_QUAD_COPPER:
-               /* WoL not supported */
-               wol->supported = 0;
-               break;
-       case E1000_DEV_ID_82575EB_FIBER_SERDES:
-       case E1000_DEV_ID_82576_FIBER:
-       case E1000_DEV_ID_82576_SERDES:
-               /* Wake events not supported on port B */
-               if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1) {
-                       wol->supported = 0;
-                       break;
-               }
-               /* return success for non excluded adapter ports */
-               retval = 0;
-               break;
-       case E1000_DEV_ID_82576_QUAD_COPPER:
-       case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
-               /* quad port adapters only support WoL on port A */
-               if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {
-                       wol->supported = 0;
-                       break;
-               }
-               /* return success for non excluded adapter ports */
-               retval = 0;
-               break;
-       default:
-               /* dual port cards only support WoL on port A from now on
-                * unless it was enabled in the eeprom for port B
-                * so exclude FUNC_1 ports from having WoL enabled */
-               if ((rd32(E1000_STATUS) & E1000_STATUS_FUNC_MASK) &&
-                   !adapter->eeprom_wol) {
-                       wol->supported = 0;
-                       break;
-               }
-
-               retval = 0;
-       }
-
-       return retval;
-}
-
-static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       wol->supported = WAKE_UCAST | WAKE_MCAST |
-                        WAKE_BCAST | WAKE_MAGIC |
-                        WAKE_PHY;
-       wol->wolopts = 0;
-
-       /* this function will set ->supported = 0 and return 1 if wol is not
-        * supported by this hardware */
-       if (igb_wol_exclusion(adapter, wol) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return;
-
-       /* apply any specific unsupported masks here */
-       switch (adapter->hw.device_id) {
-       default:
-               break;
-       }
-
-       if (adapter->wol & E1000_WUFC_EX)
-               wol->wolopts |= WAKE_UCAST;
-       if (adapter->wol & E1000_WUFC_MC)
-               wol->wolopts |= WAKE_MCAST;
-       if (adapter->wol & E1000_WUFC_BC)
-               wol->wolopts |= WAKE_BCAST;
-       if (adapter->wol & E1000_WUFC_MAG)
-               wol->wolopts |= WAKE_MAGIC;
-       if (adapter->wol & E1000_WUFC_LNKC)
-               wol->wolopts |= WAKE_PHY;
-}
-
-static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE))
-               return -EOPNOTSUPP;
-
-       if (igb_wol_exclusion(adapter, wol) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return wol->wolopts ? -EOPNOTSUPP : 0;
-
-       /* these settings will always override what we currently have */
-       adapter->wol = 0;
-
-       if (wol->wolopts & WAKE_UCAST)
-               adapter->wol |= E1000_WUFC_EX;
-       if (wol->wolopts & WAKE_MCAST)
-               adapter->wol |= E1000_WUFC_MC;
-       if (wol->wolopts & WAKE_BCAST)
-               adapter->wol |= E1000_WUFC_BC;
-       if (wol->wolopts & WAKE_MAGIC)
-               adapter->wol |= E1000_WUFC_MAG;
-       if (wol->wolopts & WAKE_PHY)
-               adapter->wol |= E1000_WUFC_LNKC;
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       return 0;
-}
-
-/* bit defines for adapter->led_status */
-#define IGB_LED_ON             0
-
-static int igb_set_phys_id(struct net_device *netdev,
-                          enum ethtool_phys_id_state state)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       switch (state) {
-       case ETHTOOL_ID_ACTIVE:
-               igb_blink_led(hw);
-               return 2;
-       case ETHTOOL_ID_ON:
-               igb_blink_led(hw);
-               break;
-       case ETHTOOL_ID_OFF:
-               igb_led_off(hw);
-               break;
-       case ETHTOOL_ID_INACTIVE:
-               igb_led_off(hw);
-               clear_bit(IGB_LED_ON, &adapter->led_status);
-               igb_cleanup_led(hw);
-               break;
-       }
-
-       return 0;
-}
-
-static int igb_set_coalesce(struct net_device *netdev,
-                           struct ethtool_coalesce *ec)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       int i;
-
-       if ((ec->rx_coalesce_usecs > IGB_MAX_ITR_USECS) ||
-           ((ec->rx_coalesce_usecs > 3) &&
-            (ec->rx_coalesce_usecs < IGB_MIN_ITR_USECS)) ||
-           (ec->rx_coalesce_usecs == 2))
-               return -EINVAL;
-
-       if ((ec->tx_coalesce_usecs > IGB_MAX_ITR_USECS) ||
-           ((ec->tx_coalesce_usecs > 3) &&
-            (ec->tx_coalesce_usecs < IGB_MIN_ITR_USECS)) ||
-           (ec->tx_coalesce_usecs == 2))
-               return -EINVAL;
-
-       if ((adapter->flags & IGB_FLAG_QUEUE_PAIRS) && ec->tx_coalesce_usecs)
-               return -EINVAL;
-
-       /* If ITR is disabled, disable DMAC */
-       if (ec->rx_coalesce_usecs == 0) {
-               if (adapter->flags & IGB_FLAG_DMAC)
-                       adapter->flags &= ~IGB_FLAG_DMAC;
-       }
-
-       /* convert to rate of irq's per second */
-       if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3)
-               adapter->rx_itr_setting = ec->rx_coalesce_usecs;
-       else
-               adapter->rx_itr_setting = ec->rx_coalesce_usecs << 2;
-
-       /* convert to rate of irq's per second */
-       if (adapter->flags & IGB_FLAG_QUEUE_PAIRS)
-               adapter->tx_itr_setting = adapter->rx_itr_setting;
-       else if (ec->tx_coalesce_usecs && ec->tx_coalesce_usecs <= 3)
-               adapter->tx_itr_setting = ec->tx_coalesce_usecs;
-       else
-               adapter->tx_itr_setting = ec->tx_coalesce_usecs << 2;
-
-       for (i = 0; i < adapter->num_q_vectors; i++) {
-               struct igb_q_vector *q_vector = adapter->q_vector[i];
-               if (q_vector->rx_ring)
-                       q_vector->itr_val = adapter->rx_itr_setting;
-               else
-                       q_vector->itr_val = adapter->tx_itr_setting;
-               if (q_vector->itr_val && q_vector->itr_val <= 3)
-                       q_vector->itr_val = IGB_START_ITR;
-               q_vector->set_itr = 1;
-       }
-
-       return 0;
-}
-
-static int igb_get_coalesce(struct net_device *netdev,
-                           struct ethtool_coalesce *ec)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       if (adapter->rx_itr_setting <= 3)
-               ec->rx_coalesce_usecs = adapter->rx_itr_setting;
-       else
-               ec->rx_coalesce_usecs = adapter->rx_itr_setting >> 2;
-
-       if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS)) {
-               if (adapter->tx_itr_setting <= 3)
-                       ec->tx_coalesce_usecs = adapter->tx_itr_setting;
-               else
-                       ec->tx_coalesce_usecs = adapter->tx_itr_setting >> 2;
-       }
-
-       return 0;
-}
-
-static int igb_nway_reset(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       if (netif_running(netdev))
-               igb_reinit_locked(adapter);
-       return 0;
-}
-
-static int igb_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_STATS:
-               return IGB_STATS_LEN;
-       case ETH_SS_TEST:
-               return IGB_TEST_LEN;
-       default:
-               return -ENOTSUPP;
-       }
-}
-
-static void igb_get_ethtool_stats(struct net_device *netdev,
-                                 struct ethtool_stats *stats, u64 *data)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct rtnl_link_stats64 *net_stats = &adapter->stats64;
-       unsigned int start;
-       struct igb_ring *ring;
-       int i, j;
-       char *p;
-
-       spin_lock(&adapter->stats64_lock);
-       igb_update_stats(adapter, net_stats);
-
-       for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) {
-               p = (char *)adapter + igb_gstrings_stats[i].stat_offset;
-               data[i] = (igb_gstrings_stats[i].sizeof_stat ==
-                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-       }
-       for (j = 0; j < IGB_NETDEV_STATS_LEN; j++, i++) {
-               p = (char *)net_stats + igb_gstrings_net_stats[j].stat_offset;
-               data[i] = (igb_gstrings_net_stats[j].sizeof_stat ==
-                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-       }
-       for (j = 0; j < adapter->num_tx_queues; j++) {
-               u64     restart2;
-
-               ring = adapter->tx_ring[j];
-               do {
-                       start = u64_stats_fetch_begin_bh(&ring->tx_syncp);
-                       data[i]   = ring->tx_stats.packets;
-                       data[i+1] = ring->tx_stats.bytes;
-                       data[i+2] = ring->tx_stats.restart_queue;
-               } while (u64_stats_fetch_retry_bh(&ring->tx_syncp, start));
-               do {
-                       start = u64_stats_fetch_begin_bh(&ring->tx_syncp2);
-                       restart2  = ring->tx_stats.restart_queue2;
-               } while (u64_stats_fetch_retry_bh(&ring->tx_syncp2, start));
-               data[i+2] += restart2;
-
-               i += IGB_TX_QUEUE_STATS_LEN;
-       }
-       for (j = 0; j < adapter->num_rx_queues; j++) {
-               ring = adapter->rx_ring[j];
-               do {
-                       start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
-                       data[i]   = ring->rx_stats.packets;
-                       data[i+1] = ring->rx_stats.bytes;
-                       data[i+2] = ring->rx_stats.drops;
-                       data[i+3] = ring->rx_stats.csum_err;
-                       data[i+4] = ring->rx_stats.alloc_failed;
-               } while (u64_stats_fetch_retry_bh(&ring->rx_syncp, start));
-               i += IGB_RX_QUEUE_STATS_LEN;
-       }
-       spin_unlock(&adapter->stats64_lock);
-}
-
-static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       u8 *p = data;
-       int i;
-
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *igb_gstrings_test,
-                       IGB_TEST_LEN*ETH_GSTRING_LEN);
-               break;
-       case ETH_SS_STATS:
-               for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, igb_gstrings_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-               for (i = 0; i < IGB_NETDEV_STATS_LEN; i++) {
-                       memcpy(p, igb_gstrings_net_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-               for (i = 0; i < adapter->num_tx_queues; i++) {
-                       sprintf(p, "tx_queue_%u_packets", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "tx_queue_%u_bytes", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "tx_queue_%u_restart", i);
-                       p += ETH_GSTRING_LEN;
-               }
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       sprintf(p, "rx_queue_%u_packets", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_bytes", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_drops", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_csum_err", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_alloc_failed", i);
-                       p += ETH_GSTRING_LEN;
-               }
-/*             BUG_ON(p - data != IGB_STATS_LEN * ETH_GSTRING_LEN); */
-               break;
-       }
-}
-
-static const struct ethtool_ops igb_ethtool_ops = {
-       .get_settings           = igb_get_settings,
-       .set_settings           = igb_set_settings,
-       .get_drvinfo            = igb_get_drvinfo,
-       .get_regs_len           = igb_get_regs_len,
-       .get_regs               = igb_get_regs,
-       .get_wol                = igb_get_wol,
-       .set_wol                = igb_set_wol,
-       .get_msglevel           = igb_get_msglevel,
-       .set_msglevel           = igb_set_msglevel,
-       .nway_reset             = igb_nway_reset,
-       .get_link               = igb_get_link,
-       .get_eeprom_len         = igb_get_eeprom_len,
-       .get_eeprom             = igb_get_eeprom,
-       .set_eeprom             = igb_set_eeprom,
-       .get_ringparam          = igb_get_ringparam,
-       .set_ringparam          = igb_set_ringparam,
-       .get_pauseparam         = igb_get_pauseparam,
-       .set_pauseparam         = igb_set_pauseparam,
-       .self_test              = igb_diag_test,
-       .get_strings            = igb_get_strings,
-       .set_phys_id            = igb_set_phys_id,
-       .get_sset_count         = igb_get_sset_count,
-       .get_ethtool_stats      = igb_get_ethtool_stats,
-       .get_coalesce           = igb_get_coalesce,
-       .set_coalesce           = igb_set_coalesce,
-};
-
-void igb_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &igb_ethtool_ops);
-}
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
deleted file mode 100644 (file)
index 40d4c40..0000000
+++ /dev/null
@@ -1,6890 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 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
-
-*******************************************************************************/
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/bitops.h>
-#include <linux/vmalloc.h>
-#include <linux/pagemap.h>
-#include <linux/netdevice.h>
-#include <linux/ipv6.h>
-#include <linux/slab.h>
-#include <net/checksum.h>
-#include <net/ip6_checksum.h>
-#include <linux/net_tstamp.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-#include <linux/pci.h>
-#include <linux/pci-aspm.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/aer.h>
-#include <linux/prefetch.h>
-#ifdef CONFIG_IGB_DCA
-#include <linux/dca.h>
-#endif
-#include "igb.h"
-
-#define MAJ 3
-#define MIN 0
-#define BUILD 6
-#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
-__stringify(BUILD) "-k"
-char igb_driver_name[] = "igb";
-char igb_driver_version[] = DRV_VERSION;
-static const char igb_driver_string[] =
-                               "Intel(R) Gigabit Ethernet Network Driver";
-static const char igb_copyright[] = "Copyright (c) 2007-2011 Intel Corporation.";
-
-static const struct e1000_info *igb_info_tbl[] = {
-       [board_82575] = &e1000_82575_info,
-};
-
-static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_COPPER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_FIBER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SERDES), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SGMII), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_FIBER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_QUAD_FIBER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SERDES), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SGMII), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_BACKPLANE), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SFP), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER_ET2), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 },
-       /* required last entry */
-       {0, }
-};
-
-MODULE_DEVICE_TABLE(pci, igb_pci_tbl);
-
-void igb_reset(struct igb_adapter *);
-static int igb_setup_all_tx_resources(struct igb_adapter *);
-static int igb_setup_all_rx_resources(struct igb_adapter *);
-static void igb_free_all_tx_resources(struct igb_adapter *);
-static void igb_free_all_rx_resources(struct igb_adapter *);
-static void igb_setup_mrqc(struct igb_adapter *);
-static int igb_probe(struct pci_dev *, const struct pci_device_id *);
-static void __devexit igb_remove(struct pci_dev *pdev);
-static void igb_init_hw_timer(struct igb_adapter *adapter);
-static int igb_sw_init(struct igb_adapter *);
-static int igb_open(struct net_device *);
-static int igb_close(struct net_device *);
-static void igb_configure_tx(struct igb_adapter *);
-static void igb_configure_rx(struct igb_adapter *);
-static void igb_clean_all_tx_rings(struct igb_adapter *);
-static void igb_clean_all_rx_rings(struct igb_adapter *);
-static void igb_clean_tx_ring(struct igb_ring *);
-static void igb_clean_rx_ring(struct igb_ring *);
-static void igb_set_rx_mode(struct net_device *);
-static void igb_update_phy_info(unsigned long);
-static void igb_watchdog(unsigned long);
-static void igb_watchdog_task(struct work_struct *);
-static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb, struct net_device *);
-static struct rtnl_link_stats64 *igb_get_stats64(struct net_device *dev,
-                                                struct rtnl_link_stats64 *stats);
-static int igb_change_mtu(struct net_device *, int);
-static int igb_set_mac(struct net_device *, void *);
-static void igb_set_uta(struct igb_adapter *adapter);
-static irqreturn_t igb_intr(int irq, void *);
-static irqreturn_t igb_intr_msi(int irq, void *);
-static irqreturn_t igb_msix_other(int irq, void *);
-static irqreturn_t igb_msix_ring(int irq, void *);
-#ifdef CONFIG_IGB_DCA
-static void igb_update_dca(struct igb_q_vector *);
-static void igb_setup_dca(struct igb_adapter *);
-#endif /* CONFIG_IGB_DCA */
-static bool igb_clean_tx_irq(struct igb_q_vector *);
-static int igb_poll(struct napi_struct *, int);
-static bool igb_clean_rx_irq_adv(struct igb_q_vector *, int *, int);
-static int igb_ioctl(struct net_device *, struct ifreq *, int cmd);
-static void igb_tx_timeout(struct net_device *);
-static void igb_reset_task(struct work_struct *);
-static void igb_vlan_mode(struct net_device *netdev, u32 features);
-static void igb_vlan_rx_add_vid(struct net_device *, u16);
-static void igb_vlan_rx_kill_vid(struct net_device *, u16);
-static void igb_restore_vlan(struct igb_adapter *);
-static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
-static void igb_ping_all_vfs(struct igb_adapter *);
-static void igb_msg_task(struct igb_adapter *);
-static void igb_vmm_control(struct igb_adapter *);
-static int igb_set_vf_mac(struct igb_adapter *, int, unsigned char *);
-static void igb_restore_vf_multicasts(struct igb_adapter *adapter);
-static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
-static int igb_ndo_set_vf_vlan(struct net_device *netdev,
-                              int vf, u16 vlan, u8 qos);
-static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
-static int igb_ndo_get_vf_config(struct net_device *netdev, int vf,
-                                struct ifla_vf_info *ivi);
-static void igb_check_vf_rate_limit(struct igb_adapter *);
-
-#ifdef CONFIG_PM
-static int igb_suspend(struct pci_dev *, pm_message_t);
-static int igb_resume(struct pci_dev *);
-#endif
-static void igb_shutdown(struct pci_dev *);
-#ifdef CONFIG_IGB_DCA
-static int igb_notify_dca(struct notifier_block *, unsigned long, void *);
-static struct notifier_block dca_notifier = {
-       .notifier_call  = igb_notify_dca,
-       .next           = NULL,
-       .priority       = 0
-};
-#endif
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/* for netdump / net console */
-static void igb_netpoll(struct net_device *);
-#endif
-#ifdef CONFIG_PCI_IOV
-static unsigned int max_vfs = 0;
-module_param(max_vfs, uint, 0);
-MODULE_PARM_DESC(max_vfs, "Maximum number of virtual functions to allocate "
-                 "per physical function");
-#endif /* CONFIG_PCI_IOV */
-
-static pci_ers_result_t igb_io_error_detected(struct pci_dev *,
-                    pci_channel_state_t);
-static pci_ers_result_t igb_io_slot_reset(struct pci_dev *);
-static void igb_io_resume(struct pci_dev *);
-
-static struct pci_error_handlers igb_err_handler = {
-       .error_detected = igb_io_error_detected,
-       .slot_reset = igb_io_slot_reset,
-       .resume = igb_io_resume,
-};
-
-
-static struct pci_driver igb_driver = {
-       .name     = igb_driver_name,
-       .id_table = igb_pci_tbl,
-       .probe    = igb_probe,
-       .remove   = __devexit_p(igb_remove),
-#ifdef CONFIG_PM
-       /* Power Management Hooks */
-       .suspend  = igb_suspend,
-       .resume   = igb_resume,
-#endif
-       .shutdown = igb_shutdown,
-       .err_handler = &igb_err_handler
-};
-
-MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
-MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-struct igb_reg_info {
-       u32 ofs;
-       char *name;
-};
-
-static const struct igb_reg_info igb_reg_info_tbl[] = {
-
-       /* General Registers */
-       {E1000_CTRL, "CTRL"},
-       {E1000_STATUS, "STATUS"},
-       {E1000_CTRL_EXT, "CTRL_EXT"},
-
-       /* Interrupt Registers */
-       {E1000_ICR, "ICR"},
-
-       /* RX Registers */
-       {E1000_RCTL, "RCTL"},
-       {E1000_RDLEN(0), "RDLEN"},
-       {E1000_RDH(0), "RDH"},
-       {E1000_RDT(0), "RDT"},
-       {E1000_RXDCTL(0), "RXDCTL"},
-       {E1000_RDBAL(0), "RDBAL"},
-       {E1000_RDBAH(0), "RDBAH"},
-
-       /* TX Registers */
-       {E1000_TCTL, "TCTL"},
-       {E1000_TDBAL(0), "TDBAL"},
-       {E1000_TDBAH(0), "TDBAH"},
-       {E1000_TDLEN(0), "TDLEN"},
-       {E1000_TDH(0), "TDH"},
-       {E1000_TDT(0), "TDT"},
-       {E1000_TXDCTL(0), "TXDCTL"},
-       {E1000_TDFH, "TDFH"},
-       {E1000_TDFT, "TDFT"},
-       {E1000_TDFHS, "TDFHS"},
-       {E1000_TDFPC, "TDFPC"},
-
-       /* List Terminator */
-       {}
-};
-
-/*
- * igb_regdump - register printout routine
- */
-static void igb_regdump(struct e1000_hw *hw, struct igb_reg_info *reginfo)
-{
-       int n = 0;
-       char rname[16];
-       u32 regs[8];
-
-       switch (reginfo->ofs) {
-       case E1000_RDLEN(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_RDLEN(n));
-               break;
-       case E1000_RDH(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_RDH(n));
-               break;
-       case E1000_RDT(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_RDT(n));
-               break;
-       case E1000_RXDCTL(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_RXDCTL(n));
-               break;
-       case E1000_RDBAL(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_RDBAL(n));
-               break;
-       case E1000_RDBAH(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_RDBAH(n));
-               break;
-       case E1000_TDBAL(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_RDBAL(n));
-               break;
-       case E1000_TDBAH(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_TDBAH(n));
-               break;
-       case E1000_TDLEN(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_TDLEN(n));
-               break;
-       case E1000_TDH(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_TDH(n));
-               break;
-       case E1000_TDT(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_TDT(n));
-               break;
-       case E1000_TXDCTL(0):
-               for (n = 0; n < 4; n++)
-                       regs[n] = rd32(E1000_TXDCTL(n));
-               break;
-       default:
-               printk(KERN_INFO "%-15s %08x\n",
-                       reginfo->name, rd32(reginfo->ofs));
-               return;
-       }
-
-       snprintf(rname, 16, "%s%s", reginfo->name, "[0-3]");
-       printk(KERN_INFO "%-15s ", rname);
-       for (n = 0; n < 4; n++)
-               printk(KERN_CONT "%08x ", regs[n]);
-       printk(KERN_CONT "\n");
-}
-
-/*
- * igb_dump - Print registers, tx-rings and rx-rings
- */
-static void igb_dump(struct igb_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct igb_reg_info *reginfo;
-       int n = 0;
-       struct igb_ring *tx_ring;
-       union e1000_adv_tx_desc *tx_desc;
-       struct my_u0 { u64 a; u64 b; } *u0;
-       struct igb_buffer *buffer_info;
-       struct igb_ring *rx_ring;
-       union e1000_adv_rx_desc *rx_desc;
-       u32 staterr;
-       int i = 0;
-
-       if (!netif_msg_hw(adapter))
-               return;
-
-       /* Print netdevice Info */
-       if (netdev) {
-               dev_info(&adapter->pdev->dev, "Net device Info\n");
-               printk(KERN_INFO "Device Name     state            "
-                       "trans_start      last_rx\n");
-               printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",
-               netdev->name,
-               netdev->state,
-               netdev->trans_start,
-               netdev->last_rx);
-       }
-
-       /* Print Registers */
-       dev_info(&adapter->pdev->dev, "Register Dump\n");
-       printk(KERN_INFO " Register Name   Value\n");
-       for (reginfo = (struct igb_reg_info *)igb_reg_info_tbl;
-            reginfo->name; reginfo++) {
-               igb_regdump(hw, reginfo);
-       }
-
-       /* Print TX Ring Summary */
-       if (!netdev || !netif_running(netdev))
-               goto exit;
-
-       dev_info(&adapter->pdev->dev, "TX Rings Summary\n");
-       printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma  ]"
-               " leng ntw timestamp\n");
-       for (n = 0; n < adapter->num_tx_queues; n++) {
-               tx_ring = adapter->tx_ring[n];
-               buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
-               printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",
-                          n, tx_ring->next_to_use, tx_ring->next_to_clean,
-                          (u64)buffer_info->dma,
-                          buffer_info->length,
-                          buffer_info->next_to_watch,
-                          (u64)buffer_info->time_stamp);
-       }
-
-       /* Print TX Rings */
-       if (!netif_msg_tx_done(adapter))
-               goto rx_ring_summary;
-
-       dev_info(&adapter->pdev->dev, "TX Rings Dump\n");
-
-       /* Transmit Descriptor Formats
-        *
-        * Advanced Transmit Descriptor
-        *   +--------------------------------------------------------------+
-        * 0 |         Buffer Address [63:0]                                |
-        *   +--------------------------------------------------------------+
-        * 8 | PAYLEN  | PORTS  |CC|IDX | STA | DCMD  |DTYP|MAC|RSV| DTALEN |
-        *   +--------------------------------------------------------------+
-        *   63      46 45    40 39 38 36 35 32 31   24             15       0
-        */
-
-       for (n = 0; n < adapter->num_tx_queues; n++) {
-               tx_ring = adapter->tx_ring[n];
-               printk(KERN_INFO "------------------------------------\n");
-               printk(KERN_INFO "TX QUEUE INDEX = %d\n", tx_ring->queue_index);
-               printk(KERN_INFO "------------------------------------\n");
-               printk(KERN_INFO "T [desc]     [address 63:0  ] "
-                       "[PlPOCIStDDM Ln] [bi->dma       ] "
-                       "leng  ntw timestamp        bi->skb\n");
-
-               for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
-                       tx_desc = E1000_TX_DESC_ADV(*tx_ring, i);
-                       buffer_info = &tx_ring->buffer_info[i];
-                       u0 = (struct my_u0 *)tx_desc;
-                       printk(KERN_INFO "T [0x%03X]    %016llX %016llX %016llX"
-                               " %04X  %3X %016llX %p", i,
-                               le64_to_cpu(u0->a),
-                               le64_to_cpu(u0->b),
-                               (u64)buffer_info->dma,
-                               buffer_info->length,
-                               buffer_info->next_to_watch,
-                               (u64)buffer_info->time_stamp,
-                               buffer_info->skb);
-                       if (i == tx_ring->next_to_use &&
-                               i == tx_ring->next_to_clean)
-                               printk(KERN_CONT " NTC/U\n");
-                       else if (i == tx_ring->next_to_use)
-                               printk(KERN_CONT " NTU\n");
-                       else if (i == tx_ring->next_to_clean)
-                               printk(KERN_CONT " NTC\n");
-                       else
-                               printk(KERN_CONT "\n");
-
-                       if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
-                               print_hex_dump(KERN_INFO, "",
-                                       DUMP_PREFIX_ADDRESS,
-                                       16, 1, phys_to_virt(buffer_info->dma),
-                                       buffer_info->length, true);
-               }
-       }
-
-       /* Print RX Rings Summary */
-rx_ring_summary:
-       dev_info(&adapter->pdev->dev, "RX Rings Summary\n");
-       printk(KERN_INFO "Queue [NTU] [NTC]\n");
-       for (n = 0; n < adapter->num_rx_queues; n++) {
-               rx_ring = adapter->rx_ring[n];
-               printk(KERN_INFO " %5d %5X %5X\n", n,
-                          rx_ring->next_to_use, rx_ring->next_to_clean);
-       }
-
-       /* Print RX Rings */
-       if (!netif_msg_rx_status(adapter))
-               goto exit;
-
-       dev_info(&adapter->pdev->dev, "RX Rings Dump\n");
-
-       /* Advanced Receive Descriptor (Read) Format
-        *    63                                           1        0
-        *    +-----------------------------------------------------+
-        *  0 |       Packet Buffer Address [63:1]           |A0/NSE|
-        *    +----------------------------------------------+------+
-        *  8 |       Header Buffer Address [63:1]           |  DD  |
-        *    +-----------------------------------------------------+
-        *
-        *
-        * Advanced Receive Descriptor (Write-Back) Format
-        *
-        *   63       48 47    32 31  30      21 20 17 16   4 3     0
-        *   +------------------------------------------------------+
-        * 0 | Packet     IP     |SPH| HDR_LEN   | RSV|Packet|  RSS |
-        *   | Checksum   Ident  |   |           |    | Type | Type |
-        *   +------------------------------------------------------+
-        * 8 | VLAN Tag | Length | Extended Error | Extended Status |
-        *   +------------------------------------------------------+
-        *   63       48 47    32 31            20 19               0
-        */
-
-       for (n = 0; n < adapter->num_rx_queues; n++) {
-               rx_ring = adapter->rx_ring[n];
-               printk(KERN_INFO "------------------------------------\n");
-               printk(KERN_INFO "RX QUEUE INDEX = %d\n", rx_ring->queue_index);
-               printk(KERN_INFO "------------------------------------\n");
-               printk(KERN_INFO "R  [desc]      [ PktBuf     A0] "
-                       "[  HeadBuf   DD] [bi->dma       ] [bi->skb] "
-                       "<-- Adv Rx Read format\n");
-               printk(KERN_INFO "RWB[desc]      [PcsmIpSHl PtRs] "
-                       "[vl er S cks ln] ---------------- [bi->skb] "
-                       "<-- Adv Rx Write-Back format\n");
-
-               for (i = 0; i < rx_ring->count; i++) {
-                       buffer_info = &rx_ring->buffer_info[i];
-                       rx_desc = E1000_RX_DESC_ADV(*rx_ring, i);
-                       u0 = (struct my_u0 *)rx_desc;
-                       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-                       if (staterr & E1000_RXD_STAT_DD) {
-                               /* Descriptor Done */
-                               printk(KERN_INFO "RWB[0x%03X]     %016llX "
-                                       "%016llX ---------------- %p", i,
-                                       le64_to_cpu(u0->a),
-                                       le64_to_cpu(u0->b),
-                                       buffer_info->skb);
-                       } else {
-                               printk(KERN_INFO "R  [0x%03X]     %016llX "
-                                       "%016llX %016llX %p", i,
-                                       le64_to_cpu(u0->a),
-                                       le64_to_cpu(u0->b),
-                                       (u64)buffer_info->dma,
-                                       buffer_info->skb);
-
-                               if (netif_msg_pktdata(adapter)) {
-                                       print_hex_dump(KERN_INFO, "",
-                                               DUMP_PREFIX_ADDRESS,
-                                               16, 1,
-                                               phys_to_virt(buffer_info->dma),
-                                               rx_ring->rx_buffer_len, true);
-                                       if (rx_ring->rx_buffer_len
-                                               < IGB_RXBUFFER_1024)
-                                               print_hex_dump(KERN_INFO, "",
-                                                 DUMP_PREFIX_ADDRESS,
-                                                 16, 1,
-                                                 phys_to_virt(
-                                                   buffer_info->page_dma +
-                                                   buffer_info->page_offset),
-                                                 PAGE_SIZE/2, true);
-                               }
-                       }
-
-                       if (i == rx_ring->next_to_use)
-                               printk(KERN_CONT " NTU\n");
-                       else if (i == rx_ring->next_to_clean)
-                               printk(KERN_CONT " NTC\n");
-                       else
-                               printk(KERN_CONT "\n");
-
-               }
-       }
-
-exit:
-       return;
-}
-
-
-/**
- * igb_read_clock - read raw cycle counter (to be used by time counter)
- */
-static cycle_t igb_read_clock(const struct cyclecounter *tc)
-{
-       struct igb_adapter *adapter =
-               container_of(tc, struct igb_adapter, cycles);
-       struct e1000_hw *hw = &adapter->hw;
-       u64 stamp = 0;
-       int shift = 0;
-
-       /*
-        * The timestamp latches on lowest register read. For the 82580
-        * the lowest register is SYSTIMR instead of SYSTIML.  However we never
-        * adjusted TIMINCA so SYSTIMR will just read as all 0s so ignore it.
-        */
-       if (hw->mac.type == e1000_82580) {
-               stamp = rd32(E1000_SYSTIMR) >> 8;
-               shift = IGB_82580_TSYNC_SHIFT;
-       }
-
-       stamp |= (u64)rd32(E1000_SYSTIML) << shift;
-       stamp |= (u64)rd32(E1000_SYSTIMH) << (shift + 32);
-       return stamp;
-}
-
-/**
- * igb_get_hw_dev - return device
- * used by hardware layer to print debugging information
- **/
-struct net_device *igb_get_hw_dev(struct e1000_hw *hw)
-{
-       struct igb_adapter *adapter = hw->back;
-       return adapter->netdev;
-}
-
-/**
- * igb_init_module - Driver Registration Routine
- *
- * igb_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-static int __init igb_init_module(void)
-{
-       int ret;
-       printk(KERN_INFO "%s - version %s\n",
-              igb_driver_string, igb_driver_version);
-
-       printk(KERN_INFO "%s\n", igb_copyright);
-
-#ifdef CONFIG_IGB_DCA
-       dca_register_notify(&dca_notifier);
-#endif
-       ret = pci_register_driver(&igb_driver);
-       return ret;
-}
-
-module_init(igb_init_module);
-
-/**
- * igb_exit_module - Driver Exit Cleanup Routine
- *
- * igb_exit_module is called just before the driver is removed
- * from memory.
- **/
-static void __exit igb_exit_module(void)
-{
-#ifdef CONFIG_IGB_DCA
-       dca_unregister_notify(&dca_notifier);
-#endif
-       pci_unregister_driver(&igb_driver);
-}
-
-module_exit(igb_exit_module);
-
-#define Q_IDX_82576(i) (((i & 0x1) << 3) + (i >> 1))
-/**
- * igb_cache_ring_register - Descriptor ring to register mapping
- * @adapter: board private structure to initialize
- *
- * Once we know the feature-set enabled for the device, we'll cache
- * the register offset the descriptor ring is assigned to.
- **/
-static void igb_cache_ring_register(struct igb_adapter *adapter)
-{
-       int i = 0, j = 0;
-       u32 rbase_offset = adapter->vfs_allocated_count;
-
-       switch (adapter->hw.mac.type) {
-       case e1000_82576:
-               /* The queues are allocated for virtualization such that VF 0
-                * is allocated queues 0 and 8, VF 1 queues 1 and 9, etc.
-                * In order to avoid collision we start at the first free queue
-                * and continue consuming queues in the same sequence
-                */
-               if (adapter->vfs_allocated_count) {
-                       for (; i < adapter->rss_queues; i++)
-                               adapter->rx_ring[i]->reg_idx = rbase_offset +
-                                                              Q_IDX_82576(i);
-               }
-       case e1000_82575:
-       case e1000_82580:
-       case e1000_i350:
-       default:
-               for (; i < adapter->num_rx_queues; i++)
-                       adapter->rx_ring[i]->reg_idx = rbase_offset + i;
-               for (; j < adapter->num_tx_queues; j++)
-                       adapter->tx_ring[j]->reg_idx = rbase_offset + j;
-               break;
-       }
-}
-
-static void igb_free_queues(struct igb_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               kfree(adapter->tx_ring[i]);
-               adapter->tx_ring[i] = NULL;
-       }
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               kfree(adapter->rx_ring[i]);
-               adapter->rx_ring[i] = NULL;
-       }
-       adapter->num_rx_queues = 0;
-       adapter->num_tx_queues = 0;
-}
-
-/**
- * igb_alloc_queues - Allocate memory for all rings
- * @adapter: board private structure to initialize
- *
- * We allocate one ring per queue at run-time since we don't know the
- * number of queues at compile-time.
- **/
-static int igb_alloc_queues(struct igb_adapter *adapter)
-{
-       struct igb_ring *ring;
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               ring = kzalloc(sizeof(struct igb_ring), GFP_KERNEL);
-               if (!ring)
-                       goto err;
-               ring->count = adapter->tx_ring_count;
-               ring->queue_index = i;
-               ring->dev = &adapter->pdev->dev;
-               ring->netdev = adapter->netdev;
-               /* For 82575, context index must be unique per ring. */
-               if (adapter->hw.mac.type == e1000_82575)
-                       ring->flags = IGB_RING_FLAG_TX_CTX_IDX;
-               adapter->tx_ring[i] = ring;
-       }
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               ring = kzalloc(sizeof(struct igb_ring), GFP_KERNEL);
-               if (!ring)
-                       goto err;
-               ring->count = adapter->rx_ring_count;
-               ring->queue_index = i;
-               ring->dev = &adapter->pdev->dev;
-               ring->netdev = adapter->netdev;
-               ring->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-               ring->flags = IGB_RING_FLAG_RX_CSUM; /* enable rx checksum */
-               /* set flag indicating ring supports SCTP checksum offload */
-               if (adapter->hw.mac.type >= e1000_82576)
-                       ring->flags |= IGB_RING_FLAG_RX_SCTP_CSUM;
-               adapter->rx_ring[i] = ring;
-       }
-
-       igb_cache_ring_register(adapter);
-
-       return 0;
-
-err:
-       igb_free_queues(adapter);
-
-       return -ENOMEM;
-}
-
-#define IGB_N0_QUEUE -1
-static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)
-{
-       u32 msixbm = 0;
-       struct igb_adapter *adapter = q_vector->adapter;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ivar, index;
-       int rx_queue = IGB_N0_QUEUE;
-       int tx_queue = IGB_N0_QUEUE;
-
-       if (q_vector->rx_ring)
-               rx_queue = q_vector->rx_ring->reg_idx;
-       if (q_vector->tx_ring)
-               tx_queue = q_vector->tx_ring->reg_idx;
-
-       switch (hw->mac.type) {
-       case e1000_82575:
-               /* The 82575 assigns vectors using a bitmask, which matches the
-                  bitmask for the EICR/EIMS/EIMC registers.  To assign one
-                  or more queues to a vector, we write the appropriate bits
-                  into the MSIXBM register for that vector. */
-               if (rx_queue > IGB_N0_QUEUE)
-                       msixbm = E1000_EICR_RX_QUEUE0 << rx_queue;
-               if (tx_queue > IGB_N0_QUEUE)
-                       msixbm |= E1000_EICR_TX_QUEUE0 << tx_queue;
-               if (!adapter->msix_entries && msix_vector == 0)
-                       msixbm |= E1000_EIMS_OTHER;
-               array_wr32(E1000_MSIXBM(0), msix_vector, msixbm);
-               q_vector->eims_value = msixbm;
-               break;
-       case e1000_82576:
-               /* 82576 uses a table-based method for assigning vectors.
-                  Each queue has a single entry in the table to which we write
-                  a vector number along with a "valid" bit.  Sadly, the layout
-                  of the table is somewhat counterintuitive. */
-               if (rx_queue > IGB_N0_QUEUE) {
-                       index = (rx_queue & 0x7);
-                       ivar = array_rd32(E1000_IVAR0, index);
-                       if (rx_queue < 8) {
-                               /* vector goes into low byte of register */
-                               ivar = ivar & 0xFFFFFF00;
-                               ivar |= msix_vector | E1000_IVAR_VALID;
-                       } else {
-                               /* vector goes into third byte of register */
-                               ivar = ivar & 0xFF00FFFF;
-                               ivar |= (msix_vector | E1000_IVAR_VALID) << 16;
-                       }
-                       array_wr32(E1000_IVAR0, index, ivar);
-               }
-               if (tx_queue > IGB_N0_QUEUE) {
-                       index = (tx_queue & 0x7);
-                       ivar = array_rd32(E1000_IVAR0, index);
-                       if (tx_queue < 8) {
-                               /* vector goes into second byte of register */
-                               ivar = ivar & 0xFFFF00FF;
-                               ivar |= (msix_vector | E1000_IVAR_VALID) << 8;
-                       } else {
-                               /* vector goes into high byte of register */
-                               ivar = ivar & 0x00FFFFFF;
-                               ivar |= (msix_vector | E1000_IVAR_VALID) << 24;
-                       }
-                       array_wr32(E1000_IVAR0, index, ivar);
-               }
-               q_vector->eims_value = 1 << msix_vector;
-               break;
-       case e1000_82580:
-       case e1000_i350:
-               /* 82580 uses the same table-based approach as 82576 but has fewer
-                  entries as a result we carry over for queues greater than 4. */
-               if (rx_queue > IGB_N0_QUEUE) {
-                       index = (rx_queue >> 1);
-                       ivar = array_rd32(E1000_IVAR0, index);
-                       if (rx_queue & 0x1) {
-                               /* vector goes into third byte of register */
-                               ivar = ivar & 0xFF00FFFF;
-                               ivar |= (msix_vector | E1000_IVAR_VALID) << 16;
-                       } else {
-                               /* vector goes into low byte of register */
-                               ivar = ivar & 0xFFFFFF00;
-                               ivar |= msix_vector | E1000_IVAR_VALID;
-                       }
-                       array_wr32(E1000_IVAR0, index, ivar);
-               }
-               if (tx_queue > IGB_N0_QUEUE) {
-                       index = (tx_queue >> 1);
-                       ivar = array_rd32(E1000_IVAR0, index);
-                       if (tx_queue & 0x1) {
-                               /* vector goes into high byte of register */
-                               ivar = ivar & 0x00FFFFFF;
-                               ivar |= (msix_vector | E1000_IVAR_VALID) << 24;
-                       } else {
-                               /* vector goes into second byte of register */
-                               ivar = ivar & 0xFFFF00FF;
-                               ivar |= (msix_vector | E1000_IVAR_VALID) << 8;
-                       }
-                       array_wr32(E1000_IVAR0, index, ivar);
-               }
-               q_vector->eims_value = 1 << msix_vector;
-               break;
-       default:
-               BUG();
-               break;
-       }
-
-       /* add q_vector eims value to global eims_enable_mask */
-       adapter->eims_enable_mask |= q_vector->eims_value;
-
-       /* configure q_vector to set itr on first interrupt */
-       q_vector->set_itr = 1;
-}
-
-/**
- * igb_configure_msix - Configure MSI-X hardware
- *
- * igb_configure_msix sets up the hardware to properly
- * generate MSI-X interrupts.
- **/
-static void igb_configure_msix(struct igb_adapter *adapter)
-{
-       u32 tmp;
-       int i, vector = 0;
-       struct e1000_hw *hw = &adapter->hw;
-
-       adapter->eims_enable_mask = 0;
-
-       /* set vector for other causes, i.e. link changes */
-       switch (hw->mac.type) {
-       case e1000_82575:
-               tmp = rd32(E1000_CTRL_EXT);
-               /* enable MSI-X PBA support*/
-               tmp |= E1000_CTRL_EXT_PBA_CLR;
-
-               /* Auto-Mask interrupts upon ICR read. */
-               tmp |= E1000_CTRL_EXT_EIAME;
-               tmp |= E1000_CTRL_EXT_IRCA;
-
-               wr32(E1000_CTRL_EXT, tmp);
-
-               /* enable msix_other interrupt */
-               array_wr32(E1000_MSIXBM(0), vector++,
-                                     E1000_EIMS_OTHER);
-               adapter->eims_other = E1000_EIMS_OTHER;
-
-               break;
-
-       case e1000_82576:
-       case e1000_82580:
-       case e1000_i350:
-               /* Turn on MSI-X capability first, or our settings
-                * won't stick.  And it will take days to debug. */
-               wr32(E1000_GPIE, E1000_GPIE_MSIX_MODE |
-                               E1000_GPIE_PBA | E1000_GPIE_EIAME |
-                               E1000_GPIE_NSICR);
-
-               /* enable msix_other interrupt */
-               adapter->eims_other = 1 << vector;
-               tmp = (vector++ | E1000_IVAR_VALID) << 8;
-
-               wr32(E1000_IVAR_MISC, tmp);
-               break;
-       default:
-               /* do nothing, since nothing else supports MSI-X */
-               break;
-       } /* switch (hw->mac.type) */
-
-       adapter->eims_enable_mask |= adapter->eims_other;
-
-       for (i = 0; i < adapter->num_q_vectors; i++)
-               igb_assign_vector(adapter->q_vector[i], vector++);
-
-       wrfl();
-}
-
-/**
- * igb_request_msix - Initialize MSI-X interrupts
- *
- * igb_request_msix allocates MSI-X vectors and requests interrupts from the
- * kernel.
- **/
-static int igb_request_msix(struct igb_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       int i, err = 0, vector = 0;
-
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         igb_msix_other, 0, netdev->name, adapter);
-       if (err)
-               goto out;
-       vector++;
-
-       for (i = 0; i < adapter->num_q_vectors; i++) {
-               struct igb_q_vector *q_vector = adapter->q_vector[i];
-
-               q_vector->itr_register = hw->hw_addr + E1000_EITR(vector);
-
-               if (q_vector->rx_ring && q_vector->tx_ring)
-                       sprintf(q_vector->name, "%s-TxRx-%u", netdev->name,
-                               q_vector->rx_ring->queue_index);
-               else if (q_vector->tx_ring)
-                       sprintf(q_vector->name, "%s-tx-%u", netdev->name,
-                               q_vector->tx_ring->queue_index);
-               else if (q_vector->rx_ring)
-                       sprintf(q_vector->name, "%s-rx-%u", netdev->name,
-                               q_vector->rx_ring->queue_index);
-               else
-                       sprintf(q_vector->name, "%s-unused", netdev->name);
-
-               err = request_irq(adapter->msix_entries[vector].vector,
-                                 igb_msix_ring, 0, q_vector->name,
-                                 q_vector);
-               if (err)
-                       goto out;
-               vector++;
-       }
-
-       igb_configure_msix(adapter);
-       return 0;
-out:
-       return err;
-}
-
-static void igb_reset_interrupt_capability(struct igb_adapter *adapter)
-{
-       if (adapter->msix_entries) {
-               pci_disable_msix(adapter->pdev);
-               kfree(adapter->msix_entries);
-               adapter->msix_entries = NULL;
-       } else if (adapter->flags & IGB_FLAG_HAS_MSI) {
-               pci_disable_msi(adapter->pdev);
-       }
-}
-
-/**
- * igb_free_q_vectors - Free memory allocated for interrupt vectors
- * @adapter: board private structure to initialize
- *
- * This function frees the memory allocated to the q_vectors.  In addition if
- * NAPI is enabled it will delete any references to the NAPI struct prior
- * to freeing the q_vector.
- **/
-static void igb_free_q_vectors(struct igb_adapter *adapter)
-{
-       int v_idx;
-
-       for (v_idx = 0; v_idx < adapter->num_q_vectors; v_idx++) {
-               struct igb_q_vector *q_vector = adapter->q_vector[v_idx];
-               adapter->q_vector[v_idx] = NULL;
-               if (!q_vector)
-                       continue;
-               netif_napi_del(&q_vector->napi);
-               kfree(q_vector);
-       }
-       adapter->num_q_vectors = 0;
-}
-
-/**
- * igb_clear_interrupt_scheme - reset the device to a state of no interrupts
- *
- * This function resets the device so that it has 0 rx queues, tx queues, and
- * MSI-X interrupts allocated.
- */
-static void igb_clear_interrupt_scheme(struct igb_adapter *adapter)
-{
-       igb_free_queues(adapter);
-       igb_free_q_vectors(adapter);
-       igb_reset_interrupt_capability(adapter);
-}
-
-/**
- * igb_set_interrupt_capability - set MSI or MSI-X if supported
- *
- * Attempt to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-static int igb_set_interrupt_capability(struct igb_adapter *adapter)
-{
-       int err;
-       int numvecs, i;
-
-       /* Number of supported queues. */
-       adapter->num_rx_queues = adapter->rss_queues;
-       if (adapter->vfs_allocated_count)
-               adapter->num_tx_queues = 1;
-       else
-               adapter->num_tx_queues = adapter->rss_queues;
-
-       /* start with one vector for every rx queue */
-       numvecs = adapter->num_rx_queues;
-
-       /* if tx handler is separate add 1 for every tx queue */
-       if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS))
-               numvecs += adapter->num_tx_queues;
-
-       /* store the number of vectors reserved for queues */
-       adapter->num_q_vectors = numvecs;
-
-       /* add 1 vector for link status interrupts */
-       numvecs++;
-       adapter->msix_entries = kcalloc(numvecs, sizeof(struct msix_entry),
-                                       GFP_KERNEL);
-       if (!adapter->msix_entries)
-               goto msi_only;
-
-       for (i = 0; i < numvecs; i++)
-               adapter->msix_entries[i].entry = i;
-
-       err = pci_enable_msix(adapter->pdev,
-                             adapter->msix_entries,
-                             numvecs);
-       if (err == 0)
-               goto out;
-
-       igb_reset_interrupt_capability(adapter);
-
-       /* If we can't do MSI-X, try MSI */
-msi_only:
-#ifdef CONFIG_PCI_IOV
-       /* disable SR-IOV for non MSI-X configurations */
-       if (adapter->vf_data) {
-               struct e1000_hw *hw = &adapter->hw;
-               /* disable iov and allow time for transactions to clear */
-               pci_disable_sriov(adapter->pdev);
-               msleep(500);
-
-               kfree(adapter->vf_data);
-               adapter->vf_data = NULL;
-               wr32(E1000_IOVCTL, E1000_IOVCTL_REUSE_VFQ);
-               wrfl();
-               msleep(100);
-               dev_info(&adapter->pdev->dev, "IOV Disabled\n");
-       }
-#endif
-       adapter->vfs_allocated_count = 0;
-       adapter->rss_queues = 1;
-       adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
-       adapter->num_rx_queues = 1;
-       adapter->num_tx_queues = 1;
-       adapter->num_q_vectors = 1;
-       if (!pci_enable_msi(adapter->pdev))
-               adapter->flags |= IGB_FLAG_HAS_MSI;
-out:
-       /* Notify the stack of the (possibly) reduced queue counts. */
-       netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
-       return netif_set_real_num_rx_queues(adapter->netdev,
-                                           adapter->num_rx_queues);
-}
-
-/**
- * igb_alloc_q_vectors - Allocate memory for interrupt vectors
- * @adapter: board private structure to initialize
- *
- * We allocate one q_vector per queue interrupt.  If allocation fails we
- * return -ENOMEM.
- **/
-static int igb_alloc_q_vectors(struct igb_adapter *adapter)
-{
-       struct igb_q_vector *q_vector;
-       struct e1000_hw *hw = &adapter->hw;
-       int v_idx;
-
-       for (v_idx = 0; v_idx < adapter->num_q_vectors; v_idx++) {
-               q_vector = kzalloc(sizeof(struct igb_q_vector), GFP_KERNEL);
-               if (!q_vector)
-                       goto err_out;
-               q_vector->adapter = adapter;
-               q_vector->itr_register = hw->hw_addr + E1000_EITR(0);
-               q_vector->itr_val = IGB_START_ITR;
-               netif_napi_add(adapter->netdev, &q_vector->napi, igb_poll, 64);
-               adapter->q_vector[v_idx] = q_vector;
-       }
-       return 0;
-
-err_out:
-       igb_free_q_vectors(adapter);
-       return -ENOMEM;
-}
-
-static void igb_map_rx_ring_to_vector(struct igb_adapter *adapter,
-                                      int ring_idx, int v_idx)
-{
-       struct igb_q_vector *q_vector = adapter->q_vector[v_idx];
-
-       q_vector->rx_ring = adapter->rx_ring[ring_idx];
-       q_vector->rx_ring->q_vector = q_vector;
-       q_vector->itr_val = adapter->rx_itr_setting;
-       if (q_vector->itr_val && q_vector->itr_val <= 3)
-               q_vector->itr_val = IGB_START_ITR;
-}
-
-static void igb_map_tx_ring_to_vector(struct igb_adapter *adapter,
-                                      int ring_idx, int v_idx)
-{
-       struct igb_q_vector *q_vector = adapter->q_vector[v_idx];
-
-       q_vector->tx_ring = adapter->tx_ring[ring_idx];
-       q_vector->tx_ring->q_vector = q_vector;
-       q_vector->itr_val = adapter->tx_itr_setting;
-       if (q_vector->itr_val && q_vector->itr_val <= 3)
-               q_vector->itr_val = IGB_START_ITR;
-}
-
-/**
- * igb_map_ring_to_vector - maps allocated queues to vectors
- *
- * This function maps the recently allocated queues to vectors.
- **/
-static int igb_map_ring_to_vector(struct igb_adapter *adapter)
-{
-       int i;
-       int v_idx = 0;
-
-       if ((adapter->num_q_vectors < adapter->num_rx_queues) ||
-           (adapter->num_q_vectors < adapter->num_tx_queues))
-               return -ENOMEM;
-
-       if (adapter->num_q_vectors >=
-           (adapter->num_rx_queues + adapter->num_tx_queues)) {
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       igb_map_rx_ring_to_vector(adapter, i, v_idx++);
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       igb_map_tx_ring_to_vector(adapter, i, v_idx++);
-       } else {
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       if (i < adapter->num_tx_queues)
-                               igb_map_tx_ring_to_vector(adapter, i, v_idx);
-                       igb_map_rx_ring_to_vector(adapter, i, v_idx++);
-               }
-               for (; i < adapter->num_tx_queues; i++)
-                       igb_map_tx_ring_to_vector(adapter, i, v_idx++);
-       }
-       return 0;
-}
-
-/**
- * igb_init_interrupt_scheme - initialize interrupts, allocate queues/vectors
- *
- * This function initializes the interrupts and allocates all of the queues.
- **/
-static int igb_init_interrupt_scheme(struct igb_adapter *adapter)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int err;
-
-       err = igb_set_interrupt_capability(adapter);
-       if (err)
-               return err;
-
-       err = igb_alloc_q_vectors(adapter);
-       if (err) {
-               dev_err(&pdev->dev, "Unable to allocate memory for vectors\n");
-               goto err_alloc_q_vectors;
-       }
-
-       err = igb_alloc_queues(adapter);
-       if (err) {
-               dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
-               goto err_alloc_queues;
-       }
-
-       err = igb_map_ring_to_vector(adapter);
-       if (err) {
-               dev_err(&pdev->dev, "Invalid q_vector to ring mapping\n");
-               goto err_map_queues;
-       }
-
-
-       return 0;
-err_map_queues:
-       igb_free_queues(adapter);
-err_alloc_queues:
-       igb_free_q_vectors(adapter);
-err_alloc_q_vectors:
-       igb_reset_interrupt_capability(adapter);
-       return err;
-}
-
-/**
- * igb_request_irq - initialize interrupts
- *
- * Attempts to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-static int igb_request_irq(struct igb_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       int err = 0;
-
-       if (adapter->msix_entries) {
-               err = igb_request_msix(adapter);
-               if (!err)
-                       goto request_done;
-               /* fall back to MSI */
-               igb_clear_interrupt_scheme(adapter);
-               if (!pci_enable_msi(adapter->pdev))
-                       adapter->flags |= IGB_FLAG_HAS_MSI;
-               igb_free_all_tx_resources(adapter);
-               igb_free_all_rx_resources(adapter);
-               adapter->num_tx_queues = 1;
-               adapter->num_rx_queues = 1;
-               adapter->num_q_vectors = 1;
-               err = igb_alloc_q_vectors(adapter);
-               if (err) {
-                       dev_err(&pdev->dev,
-                               "Unable to allocate memory for vectors\n");
-                       goto request_done;
-               }
-               err = igb_alloc_queues(adapter);
-               if (err) {
-                       dev_err(&pdev->dev,
-                               "Unable to allocate memory for queues\n");
-                       igb_free_q_vectors(adapter);
-                       goto request_done;
-               }
-               igb_setup_all_tx_resources(adapter);
-               igb_setup_all_rx_resources(adapter);
-       } else {
-               igb_assign_vector(adapter->q_vector[0], 0);
-       }
-
-       if (adapter->flags & IGB_FLAG_HAS_MSI) {
-               err = request_irq(adapter->pdev->irq, igb_intr_msi, 0,
-                                 netdev->name, adapter);
-               if (!err)
-                       goto request_done;
-
-               /* fall back to legacy interrupts */
-               igb_reset_interrupt_capability(adapter);
-               adapter->flags &= ~IGB_FLAG_HAS_MSI;
-       }
-
-       err = request_irq(adapter->pdev->irq, igb_intr, IRQF_SHARED,
-                         netdev->name, adapter);
-
-       if (err)
-               dev_err(&adapter->pdev->dev, "Error %d getting interrupt\n",
-                       err);
-
-request_done:
-       return err;
-}
-
-static void igb_free_irq(struct igb_adapter *adapter)
-{
-       if (adapter->msix_entries) {
-               int vector = 0, i;
-
-               free_irq(adapter->msix_entries[vector++].vector, adapter);
-
-               for (i = 0; i < adapter->num_q_vectors; i++) {
-                       struct igb_q_vector *q_vector = adapter->q_vector[i];
-                       free_irq(adapter->msix_entries[vector++].vector,
-                                q_vector);
-               }
-       } else {
-               free_irq(adapter->pdev->irq, adapter);
-       }
-}
-
-/**
- * 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;
-
-       /*
-        * we need to be careful when disabling interrupts.  The VFs are also
-        * mapped into these registers and so clearing the bits can cause
-        * issues on the VF drivers so we only need to clear what we set
-        */
-       if (adapter->msix_entries) {
-               u32 regval = rd32(E1000_EIAM);
-               wr32(E1000_EIAM, regval & ~adapter->eims_enable_mask);
-               wr32(E1000_EIMC, adapter->eims_enable_mask);
-               regval = rd32(E1000_EIAC);
-               wr32(E1000_EIAC, regval & ~adapter->eims_enable_mask);
-       }
-
-       wr32(E1000_IAM, 0);
-       wr32(E1000_IMC, ~0);
-       wrfl();
-       if (adapter->msix_entries) {
-               int i;
-               for (i = 0; i < adapter->num_q_vectors; i++)
-                       synchronize_irq(adapter->msix_entries[i].vector);
-       } else {
-               synchronize_irq(adapter->pdev->irq);
-       }
-}
-
-/**
- * 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;
-
-       if (adapter->msix_entries) {
-               u32 ims = E1000_IMS_LSC | E1000_IMS_DOUTSYNC;
-               u32 regval = rd32(E1000_EIAC);
-               wr32(E1000_EIAC, regval | adapter->eims_enable_mask);
-               regval = rd32(E1000_EIAM);
-               wr32(E1000_EIAM, regval | adapter->eims_enable_mask);
-               wr32(E1000_EIMS, adapter->eims_enable_mask);
-               if (adapter->vfs_allocated_count) {
-                       wr32(E1000_MBVFIMR, 0xFF);
-                       ims |= E1000_IMS_VMMB;
-               }
-               if (adapter->hw.mac.type == e1000_82580)
-                       ims |= E1000_IMS_DRSTA;
-
-               wr32(E1000_IMS, ims);
-       } else {
-               wr32(E1000_IMS, IMS_ENABLE_MASK |
-                               E1000_IMS_DRSTA);
-               wr32(E1000_IAM, IMS_ENABLE_MASK |
-                               E1000_IMS_DRSTA);
-       }
-}
-
-static void igb_update_mng_vlan(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 vid = adapter->hw.mng_cookie.vlan_id;
-       u16 old_vid = adapter->mng_vlan_id;
-
-       if (hw->mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN) {
-               /* add VID to filter table */
-               igb_vfta_set(hw, vid, true);
-               adapter->mng_vlan_id = vid;
-       } else {
-               adapter->mng_vlan_id = IGB_MNG_VLAN_NONE;
-       }
-
-       if ((old_vid != (u16)IGB_MNG_VLAN_NONE) &&
-           (vid != old_vid) &&
-           !test_bit(old_vid, adapter->active_vlans)) {
-               /* remove VID from filter table */
-               igb_vfta_set(hw, old_vid, false);
-       }
-}
-
-/**
- * igb_release_hw_control - release control of the h/w to f/w
- * @adapter: address of board private structure
- *
- * igb_release_hw_control resets CTRL_EXT:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that the
- * driver is no longer loaded.
- *
- **/
-static void igb_release_hw_control(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_ext;
-
-       /* Let firmware take over control of h/w */
-       ctrl_ext = rd32(E1000_CTRL_EXT);
-       wr32(E1000_CTRL_EXT,
-                       ctrl_ext & ~E1000_CTRL_EXT_DRV_LOAD);
-}
-
-/**
- * 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.
- *
- **/
-static 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 = rd32(E1000_CTRL_EXT);
-       wr32(E1000_CTRL_EXT,
-                       ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
-}
-
-/**
- * igb_configure - configure the hardware for RX and TX
- * @adapter: private board structure
- **/
-static void igb_configure(struct igb_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int i;
-
-       igb_get_hw_control(adapter);
-       igb_set_rx_mode(netdev);
-
-       igb_restore_vlan(adapter);
-
-       igb_setup_tctl(adapter);
-       igb_setup_mrqc(adapter);
-       igb_setup_rctl(adapter);
-
-       igb_configure_tx(adapter);
-       igb_configure_rx(adapter);
-
-       igb_rx_fifo_flush_82575(&adapter->hw);
-
-       /* call igb_desc_unused which always leaves
-        * at least 1 descriptor unused to make sure
-        * next_to_use != next_to_clean */
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct igb_ring *ring = adapter->rx_ring[i];
-               igb_alloc_rx_buffers_adv(ring, igb_desc_unused(ring));
-       }
-}
-
-/**
- * igb_power_up_link - Power up the phy/serdes link
- * @adapter: address of board private structure
- **/
-void igb_power_up_link(struct igb_adapter *adapter)
-{
-       if (adapter->hw.phy.media_type == e1000_media_type_copper)
-               igb_power_up_phy_copper(&adapter->hw);
-       else
-               igb_power_up_serdes_link_82575(&adapter->hw);
-}
-
-/**
- * igb_power_down_link - Power down the phy/serdes link
- * @adapter: address of board private structure
- */
-static void igb_power_down_link(struct igb_adapter *adapter)
-{
-       if (adapter->hw.phy.media_type == e1000_media_type_copper)
-               igb_power_down_phy_copper_82575(&adapter->hw);
-       else
-               igb_shutdown_serdes_link_82575(&adapter->hw);
-}
-
-/**
- * igb_up - Open the interface and prepare it to handle traffic
- * @adapter: board private structure
- **/
-int igb_up(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int i;
-
-       /* hardware has been reset, we need to reload some things */
-       igb_configure(adapter);
-
-       clear_bit(__IGB_DOWN, &adapter->state);
-
-       for (i = 0; i < adapter->num_q_vectors; i++) {
-               struct igb_q_vector *q_vector = adapter->q_vector[i];
-               napi_enable(&q_vector->napi);
-       }
-       if (adapter->msix_entries)
-               igb_configure_msix(adapter);
-       else
-               igb_assign_vector(adapter->q_vector[0], 0);
-
-       /* Clear any pending interrupts. */
-       rd32(E1000_ICR);
-       igb_irq_enable(adapter);
-
-       /* notify VFs that reset has been completed */
-       if (adapter->vfs_allocated_count) {
-               u32 reg_data = rd32(E1000_CTRL_EXT);
-               reg_data |= E1000_CTRL_EXT_PFRSTD;
-               wr32(E1000_CTRL_EXT, reg_data);
-       }
-
-       netif_tx_start_all_queues(adapter->netdev);
-
-       /* start the watchdog. */
-       hw->mac.get_link_status = 1;
-       schedule_work(&adapter->watchdog_task);
-
-       return 0;
-}
-
-void igb_down(struct igb_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tctl, rctl;
-       int i;
-
-       /* signal that we're down so the interrupt handler does not
-        * reschedule our watchdog timer */
-       set_bit(__IGB_DOWN, &adapter->state);
-
-       /* disable receives in the hardware */
-       rctl = rd32(E1000_RCTL);
-       wr32(E1000_RCTL, rctl & ~E1000_RCTL_EN);
-       /* flush and sleep below */
-
-       netif_tx_stop_all_queues(netdev);
-
-       /* disable transmits in the hardware */
-       tctl = rd32(E1000_TCTL);
-       tctl &= ~E1000_TCTL_EN;
-       wr32(E1000_TCTL, tctl);
-       /* flush both disables and wait for them to finish */
-       wrfl();
-       msleep(10);
-
-       for (i = 0; i < adapter->num_q_vectors; i++) {
-               struct igb_q_vector *q_vector = adapter->q_vector[i];
-               napi_disable(&q_vector->napi);
-       }
-
-       igb_irq_disable(adapter);
-
-       del_timer_sync(&adapter->watchdog_timer);
-       del_timer_sync(&adapter->phy_info_timer);
-
-       netif_carrier_off(netdev);
-
-       /* record the stats before reset*/
-       spin_lock(&adapter->stats64_lock);
-       igb_update_stats(adapter, &adapter->stats64);
-       spin_unlock(&adapter->stats64_lock);
-
-       adapter->link_speed = 0;
-       adapter->link_duplex = 0;
-
-       if (!pci_channel_offline(adapter->pdev))
-               igb_reset(adapter);
-       igb_clean_all_tx_rings(adapter);
-       igb_clean_all_rx_rings(adapter);
-#ifdef CONFIG_IGB_DCA
-
-       /* since we reset the hardware DCA settings were cleared */
-       igb_setup_dca(adapter);
-#endif
-}
-
-void igb_reinit_locked(struct igb_adapter *adapter)
-{
-       WARN_ON(in_interrupt());
-       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
-               msleep(1);
-       igb_down(adapter);
-       igb_up(adapter);
-       clear_bit(__IGB_RESETTING, &adapter->state);
-}
-
-void igb_reset(struct igb_adapter *adapter)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_fc_info *fc = &hw->fc;
-       u32 pba = 0, tx_space, min_tx_space, min_rx_space;
-       u16 hwm;
-
-       /* Repartition Pba for greater than 9k mtu
-        * To take effect CTRL.RST is required.
-        */
-       switch (mac->type) {
-       case e1000_i350:
-       case e1000_82580:
-               pba = rd32(E1000_RXPBS);
-               pba = igb_rxpbs_adjust_82580(pba);
-               break;
-       case e1000_82576:
-               pba = rd32(E1000_RXPBS);
-               pba &= E1000_RXPBS_SIZE_MASK_82576;
-               break;
-       case e1000_82575:
-       default:
-               pba = E1000_PBA_34K;
-               break;
-       }
-
-       if ((adapter->max_frame_size > ETH_FRAME_LEN + ETH_FCS_LEN) &&
-           (mac->type < e1000_82576)) {
-               /* adjust PBA for jumbo frames */
-               wr32(E1000_PBA, pba);
-
-               /* To maintain wire speed transmits, the Tx FIFO should be
-                * large enough to accommodate two full transmit packets,
-                * rounded up to the next 1KB and expressed in KB.  Likewise,
-                * the Rx FIFO should be large enough to accommodate at least
-                * one full receive packet and is similarly rounded up and
-                * expressed in KB. */
-               pba = rd32(E1000_PBA);
-               /* upper 16 bits has Tx packet buffer allocation size in KB */
-               tx_space = pba >> 16;
-               /* lower 16 bits has Rx packet buffer allocation size in KB */
-               pba &= 0xffff;
-               /* the tx fifo also stores 16 bytes of information about the tx
-                * but don't include ethernet FCS because hardware appends it */
-               min_tx_space = (adapter->max_frame_size +
-                               sizeof(union e1000_adv_tx_desc) -
-                               ETH_FCS_LEN) * 2;
-               min_tx_space = ALIGN(min_tx_space, 1024);
-               min_tx_space >>= 10;
-               /* software strips receive CRC, so leave room for it */
-               min_rx_space = adapter->max_frame_size;
-               min_rx_space = ALIGN(min_rx_space, 1024);
-               min_rx_space >>= 10;
-
-               /* If current Tx allocation is less than the min Tx FIFO size,
-                * and the min Tx FIFO size is less than the current Rx FIFO
-                * allocation, take space away from current Rx allocation */
-               if (tx_space < min_tx_space &&
-                   ((min_tx_space - tx_space) < pba)) {
-                       pba = pba - (min_tx_space - tx_space);
-
-                       /* if short on rx space, rx wins and must trump tx
-                        * adjustment */
-                       if (pba < min_rx_space)
-                               pba = min_rx_space;
-               }
-               wr32(E1000_PBA, pba);
-       }
-
-       /* 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 */
-       hwm = min(((pba << 10) * 9 / 10),
-                       ((pba << 10) - 2 * adapter->max_frame_size));
-
-       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;
-
-       /* disable receive for all VFs and wait one second */
-       if (adapter->vfs_allocated_count) {
-               int i;
-               for (i = 0 ; i < adapter->vfs_allocated_count; i++)
-                       adapter->vf_data[i].flags &= IGB_VF_FLAG_PF_SET_MAC;
-
-               /* ping all the active vfs to let them know we are going down */
-               igb_ping_all_vfs(adapter);
-
-               /* disable transmits and receives */
-               wr32(E1000_VFRE, 0);
-               wr32(E1000_VFTE, 0);
-       }
-
-       /* Allow time for pending master requests to run */
-       hw->mac.ops.reset_hw(hw);
-       wr32(E1000_WUC, 0);
-
-       if (hw->mac.ops.init_hw(hw))
-               dev_err(&pdev->dev, "Hardware Error\n");
-       if (hw->mac.type > e1000_82580) {
-               if (adapter->flags & IGB_FLAG_DMAC) {
-                       u32 reg;
-
-                       /*
-                        * DMA Coalescing high water mark needs to be higher
-                        * than * the * Rx threshold.  The Rx threshold is
-                        * currently * pba - 6, so we * should use a high water
-                        * mark of pba * - 4. */
-                       hwm = (pba - 4) << 10;
-
-                       reg = (((pba-6) << E1000_DMACR_DMACTHR_SHIFT)
-                              & E1000_DMACR_DMACTHR_MASK);
-
-                       /* transition to L0x or L1 if available..*/
-                       reg |= (E1000_DMACR_DMAC_EN | E1000_DMACR_DMAC_LX_MASK);
-
-                       /* watchdog timer= +-1000 usec in 32usec intervals */
-                       reg |= (1000 >> 5);
-                       wr32(E1000_DMACR, reg);
-
-                       /* no lower threshold to disable coalescing(smart fifb)
-                        * -UTRESH=0*/
-                       wr32(E1000_DMCRTRH, 0);
-
-                       /* set hwm to PBA -  2 * max frame size */
-                       wr32(E1000_FCRTC, hwm);
-
-                       /*
-                        * This sets the time to wait before requesting tran-
-                        * sition to * low power state to number of usecs needed
-                        * to receive 1 512 * byte frame at gigabit line rate
-                        */
-                       reg = rd32(E1000_DMCTLX);
-                       reg |= IGB_DMCTLX_DCFLUSH_DIS;
-
-                       /* Delay 255 usec before entering Lx state. */
-                       reg |= 0xFF;
-                       wr32(E1000_DMCTLX, reg);
-
-                       /* free space in Tx packet buffer to wake from DMAC */
-                       wr32(E1000_DMCTXTH,
-                            (IGB_MIN_TXPBSIZE -
-                            (IGB_TX_BUF_4096 + adapter->max_frame_size))
-                            >> 6);
-
-                       /* make low power state decision controlled by DMAC */
-                       reg = rd32(E1000_PCIEMISC);
-                       reg |= E1000_PCIEMISC_LX_DECISION;
-                       wr32(E1000_PCIEMISC, reg);
-               } /* end if IGB_FLAG_DMAC set */
-       }
-       if (hw->mac.type == e1000_82580) {
-               u32 reg = rd32(E1000_PCIEMISC);
-               wr32(E1000_PCIEMISC,
-                               reg & ~E1000_PCIEMISC_LX_DECISION);
-       }
-       if (!netif_running(adapter->netdev))
-               igb_power_down_link(adapter);
-
-       igb_update_mng_vlan(adapter);
-
-       /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
-       wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE);
-
-       igb_get_phy_info(hw);
-}
-
-static u32 igb_fix_features(struct net_device *netdev, u32 features)
-{
-       /*
-        * Since there is no support for separate rx/tx vlan accel
-        * enable/disable make sure tx flag is always in same state as rx.
-        */
-       if (features & NETIF_F_HW_VLAN_RX)
-               features |= NETIF_F_HW_VLAN_TX;
-       else
-               features &= ~NETIF_F_HW_VLAN_TX;
-
-       return features;
-}
-
-static int igb_set_features(struct net_device *netdev, u32 features)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       int i;
-       u32 changed = netdev->features ^ features;
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               if (features & NETIF_F_RXCSUM)
-                       adapter->rx_ring[i]->flags |= IGB_RING_FLAG_RX_CSUM;
-               else
-                       adapter->rx_ring[i]->flags &= ~IGB_RING_FLAG_RX_CSUM;
-       }
-
-       if (changed & NETIF_F_HW_VLAN_RX)
-               igb_vlan_mode(netdev, features);
-
-       return 0;
-}
-
-static const struct net_device_ops igb_netdev_ops = {
-       .ndo_open               = igb_open,
-       .ndo_stop               = igb_close,
-       .ndo_start_xmit         = igb_xmit_frame_adv,
-       .ndo_get_stats64        = igb_get_stats64,
-       .ndo_set_rx_mode        = igb_set_rx_mode,
-       .ndo_set_multicast_list = igb_set_rx_mode,
-       .ndo_set_mac_address    = igb_set_mac,
-       .ndo_change_mtu         = igb_change_mtu,
-       .ndo_do_ioctl           = igb_ioctl,
-       .ndo_tx_timeout         = igb_tx_timeout,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_vlan_rx_add_vid    = igb_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = igb_vlan_rx_kill_vid,
-       .ndo_set_vf_mac         = igb_ndo_set_vf_mac,
-       .ndo_set_vf_vlan        = igb_ndo_set_vf_vlan,
-       .ndo_set_vf_tx_rate     = igb_ndo_set_vf_bw,
-       .ndo_get_vf_config      = igb_ndo_get_vf_config,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = igb_netpoll,
-#endif
-       .ndo_fix_features       = igb_fix_features,
-       .ndo_set_features       = igb_set_features,
-};
-
-/**
- * igb_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in igb_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * igb_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-static int __devinit igb_probe(struct pci_dev *pdev,
-                              const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct igb_adapter *adapter;
-       struct e1000_hw *hw;
-       u16 eeprom_data = 0;
-       s32 ret_val;
-       static int global_quad_port_a; /* global quad port a indication */
-       const struct e1000_info *ei = igb_info_tbl[ent->driver_data];
-       unsigned long mmio_start, mmio_len;
-       int err, pci_using_dac;
-       u16 eeprom_apme_mask = IGB_EEPROM_APME;
-       u8 part_str[E1000_PBANUM_LENGTH];
-
-       /* Catch broken hardware that put the wrong VF device ID in
-        * the PCIe SR-IOV capability.
-        */
-       if (pdev->is_virtfn) {
-               WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
-                    pci_name(pdev), pdev->vendor, pdev->device);
-               return -EINVAL;
-       }
-
-       err = pci_enable_device_mem(pdev);
-       if (err)
-               return err;
-
-       pci_using_dac = 0;
-       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
-       if (!err) {
-               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-               if (!err)
-                       pci_using_dac = 1;
-       } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-               if (err) {
-                       err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-                       if (err) {
-                               dev_err(&pdev->dev, "No usable DMA "
-                                       "configuration, aborting\n");
-                               goto err_dma;
-                       }
-               }
-       }
-
-       err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
-                                          IORESOURCE_MEM),
-                                          igb_driver_name);
-       if (err)
-               goto err_pci_reg;
-
-       pci_enable_pcie_error_reporting(pdev);
-
-       pci_set_master(pdev);
-       pci_save_state(pdev);
-
-       err = -ENOMEM;
-       netdev = alloc_etherdev_mq(sizeof(struct igb_adapter),
-                                  IGB_ABS_MAX_TX_QUEUES);
-       if (!netdev)
-               goto err_alloc_etherdev;
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       pci_set_drvdata(pdev, netdev);
-       adapter = netdev_priv(netdev);
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       hw = &adapter->hw;
-       hw->back = adapter;
-       adapter->msg_enable = NETIF_MSG_DRV | NETIF_MSG_PROBE;
-
-       mmio_start = pci_resource_start(pdev, 0);
-       mmio_len = pci_resource_len(pdev, 0);
-
-       err = -EIO;
-       hw->hw_addr = ioremap(mmio_start, mmio_len);
-       if (!hw->hw_addr)
-               goto err_ioremap;
-
-       netdev->netdev_ops = &igb_netdev_ops;
-       igb_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo = 5 * HZ;
-
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       netdev->mem_start = mmio_start;
-       netdev->mem_end = mmio_start + mmio_len;
-
-       /* PCI config space info */
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-       hw->revision_id = pdev->revision;
-       hw->subsystem_vendor_id = pdev->subsystem_vendor;
-       hw->subsystem_device_id = pdev->subsystem_device;
-
-       /* Copy the default MAC, PHY and NVM function pointers */
-       memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
-       memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
-       memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
-       /* Initialize skew-specific constants */
-       err = ei->get_invariants(hw);
-       if (err)
-               goto err_sw_init;
-
-       /* setup the private structure */
-       err = igb_sw_init(adapter);
-       if (err)
-               goto err_sw_init;
-
-       igb_get_bus_info_pcie(hw);
-
-       hw->phy.autoneg_wait_to_complete = false;
-
-       /* Copper options */
-       if (hw->phy.media_type == e1000_media_type_copper) {
-               hw->phy.mdix = AUTO_ALL_MODES;
-               hw->phy.disable_polarity_correction = false;
-               hw->phy.ms_type = e1000_ms_hw_default;
-       }
-
-       if (igb_check_reset_block(hw))
-               dev_info(&pdev->dev,
-                       "PHY reset is blocked due to SOL/IDER session.\n");
-
-       netdev->hw_features = NETIF_F_SG |
-                          NETIF_F_IP_CSUM |
-                          NETIF_F_IPV6_CSUM |
-                          NETIF_F_TSO |
-                          NETIF_F_TSO6 |
-                          NETIF_F_RXCSUM |
-                          NETIF_F_HW_VLAN_RX;
-
-       netdev->features = netdev->hw_features |
-                          NETIF_F_HW_VLAN_TX |
-                          NETIF_F_HW_VLAN_FILTER;
-
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_TSO6;
-       netdev->vlan_features |= NETIF_F_IP_CSUM;
-       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
-
-       if (pci_using_dac) {
-               netdev->features |= NETIF_F_HIGHDMA;
-               netdev->vlan_features |= NETIF_F_HIGHDMA;
-       }
-
-       if (hw->mac.type >= e1000_82576) {
-               netdev->hw_features |= NETIF_F_SCTP_CSUM;
-               netdev->features |= NETIF_F_SCTP_CSUM;
-       }
-
-       adapter->en_mng_pt = igb_enable_mng_pass_thru(hw);
-
-       /* before reading the NVM, reset the controller to put the device in a
-        * known good starting state */
-       hw->mac.ops.reset_hw(hw);
-
-       /* make sure the NVM is good */
-       if (hw->nvm.ops.validate(hw) < 0) {
-               dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       /* copy the MAC address out of the NVM */
-       if (hw->mac.ops.read_mac_addr(hw))
-               dev_err(&pdev->dev, "NVM Read Error\n");
-
-       memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);
-       memcpy(netdev->perm_addr, hw->mac.addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->perm_addr)) {
-               dev_err(&pdev->dev, "Invalid MAC Address\n");
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       setup_timer(&adapter->watchdog_timer, igb_watchdog,
-                   (unsigned long) adapter);
-       setup_timer(&adapter->phy_info_timer, igb_update_phy_info,
-                   (unsigned long) adapter);
-
-       INIT_WORK(&adapter->reset_task, igb_reset_task);
-       INIT_WORK(&adapter->watchdog_task, igb_watchdog_task);
-
-       /* Initialize link properties that are user-changeable */
-       adapter->fc_autoneg = true;
-       hw->mac.autoneg = true;
-       hw->phy.autoneg_advertised = 0x2f;
-
-       hw->fc.requested_mode = e1000_fc_default;
-       hw->fc.current_mode = e1000_fc_default;
-
-       igb_validate_mdi_setting(hw);
-
-       /* Initial Wake on LAN setting If APM wake is enabled in the EEPROM,
-        * enable the ACPI Magic Packet filter
-        */
-
-       if (hw->bus.func == 0)
-               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
-       else if (hw->mac.type >= e1000_82580)
-               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
-                                NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
-                                &eeprom_data);
-       else if (hw->bus.func == 1)
-               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
-
-       if (eeprom_data & eeprom_apme_mask)
-               adapter->eeprom_wol |= E1000_WUFC_MAG;
-
-       /* now that we have the eeprom settings, apply the special cases where
-        * the eeprom may be wrong or the board simply won't support wake on
-        * lan on a particular port */
-       switch (pdev->device) {
-       case E1000_DEV_ID_82575GB_QUAD_COPPER:
-               adapter->eeprom_wol = 0;
-               break;
-       case E1000_DEV_ID_82575EB_FIBER_SERDES:
-       case E1000_DEV_ID_82576_FIBER:
-       case E1000_DEV_ID_82576_SERDES:
-               /* Wake events only supported on port A for dual fiber
-                * regardless of eeprom setting */
-               if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1)
-                       adapter->eeprom_wol = 0;
-               break;
-       case E1000_DEV_ID_82576_QUAD_COPPER:
-       case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
-               /* if quad port adapter, disable WoL on all but port A */
-               if (global_quad_port_a != 0)
-                       adapter->eeprom_wol = 0;
-               else
-                       adapter->flags |= IGB_FLAG_QUAD_PORT_A;
-               /* Reset for multiple quad port adapters */
-               if (++global_quad_port_a == 4)
-                       global_quad_port_a = 0;
-               break;
-       }
-
-       /* initialize the wol settings based on the eeprom settings */
-       adapter->wol = adapter->eeprom_wol;
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       /* 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);
-
-       strcpy(netdev->name, "eth%d");
-       err = register_netdev(netdev);
-       if (err)
-               goto err_register;
-
-       igb_vlan_mode(netdev, netdev->features);
-
-       /* carrier off reporting is important to ethtool even BEFORE open */
-       netif_carrier_off(netdev);
-
-#ifdef CONFIG_IGB_DCA
-       if (dca_add_requester(&pdev->dev) == 0) {
-               adapter->flags |= IGB_FLAG_DCA_ENABLED;
-               dev_info(&pdev->dev, "DCA enabled\n");
-               igb_setup_dca(adapter);
-       }
-
-#endif
-       /* do hw tstamp init after resetting */
-       igb_init_hw_timer(adapter);
-
-       dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
-       /* print bus type/speed/width info */
-       dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
-                netdev->name,
-                ((hw->bus.speed == e1000_bus_speed_2500) ? "2.5Gb/s" :
-                 (hw->bus.speed == e1000_bus_speed_5000) ? "5.0Gb/s" :
-                                                           "unknown"),
-                ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
-                 (hw->bus.width == e1000_bus_width_pcie_x2) ? "Width x2" :
-                 (hw->bus.width == e1000_bus_width_pcie_x1) ? "Width x1" :
-                  "unknown"),
-                netdev->dev_addr);
-
-       ret_val = igb_read_part_string(hw, part_str, E1000_PBANUM_LENGTH);
-       if (ret_val)
-               strcpy(part_str, "Unknown");
-       dev_info(&pdev->dev, "%s: PBA No: %s\n", netdev->name, part_str);
-       dev_info(&pdev->dev,
-               "Using %s interrupts. %d rx queue(s), %d tx queue(s)\n",
-               adapter->msix_entries ? "MSI-X" :
-               (adapter->flags & IGB_FLAG_HAS_MSI) ? "MSI" : "legacy",
-               adapter->num_rx_queues, adapter->num_tx_queues);
-       switch (hw->mac.type) {
-       case e1000_i350:
-               igb_set_eee_i350(hw);
-               break;
-       default:
-               break;
-       }
-       return 0;
-
-err_register:
-       igb_release_hw_control(adapter);
-err_eeprom:
-       if (!igb_check_reset_block(hw))
-               igb_reset_phy(hw);
-
-       if (hw->flash_address)
-               iounmap(hw->flash_address);
-err_sw_init:
-       igb_clear_interrupt_scheme(adapter);
-       iounmap(hw->hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_selected_regions(pdev,
-                                    pci_select_bars(pdev, IORESOURCE_MEM));
-err_pci_reg:
-err_dma:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * igb_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * igb_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-static void __devexit igb_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       /*
-        * The watchdog timer may be rescheduled, so explicitly
-        * disable watchdog from being rescheduled.
-        */
-       set_bit(__IGB_DOWN, &adapter->state);
-       del_timer_sync(&adapter->watchdog_timer);
-       del_timer_sync(&adapter->phy_info_timer);
-
-       cancel_work_sync(&adapter->reset_task);
-       cancel_work_sync(&adapter->watchdog_task);
-
-#ifdef CONFIG_IGB_DCA
-       if (adapter->flags & IGB_FLAG_DCA_ENABLED) {
-               dev_info(&pdev->dev, "DCA disabled\n");
-               dca_remove_requester(&pdev->dev);
-               adapter->flags &= ~IGB_FLAG_DCA_ENABLED;
-               wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_DISABLE);
-       }
-#endif
-
-       /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-        * would have already happened in close and is redundant. */
-       igb_release_hw_control(adapter);
-
-       unregister_netdev(netdev);
-
-       igb_clear_interrupt_scheme(adapter);
-
-#ifdef CONFIG_PCI_IOV
-       /* reclaim resources allocated to VFs */
-       if (adapter->vf_data) {
-               /* disable iov and allow time for transactions to clear */
-               pci_disable_sriov(pdev);
-               msleep(500);
-
-               kfree(adapter->vf_data);
-               adapter->vf_data = NULL;
-               wr32(E1000_IOVCTL, E1000_IOVCTL_REUSE_VFQ);
-               wrfl();
-               msleep(100);
-               dev_info(&pdev->dev, "IOV Disabled\n");
-       }
-#endif
-
-       iounmap(hw->hw_addr);
-       if (hw->flash_address)
-               iounmap(hw->flash_address);
-       pci_release_selected_regions(pdev,
-                                    pci_select_bars(pdev, IORESOURCE_MEM));
-
-       free_netdev(netdev);
-
-       pci_disable_pcie_error_reporting(pdev);
-
-       pci_disable_device(pdev);
-}
-
-/**
- * igb_probe_vfs - Initialize vf data storage and add VFs to pci config space
- * @adapter: board private structure to initialize
- *
- * This function initializes the vf specific data storage and then attempts to
- * allocate the VFs.  The reason for ordering it this way is because it is much
- * mor expensive time wise to disable SR-IOV than it is to allocate and free
- * the memory for the VFs.
- **/
-static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
-{
-#ifdef CONFIG_PCI_IOV
-       struct pci_dev *pdev = adapter->pdev;
-
-       if (adapter->vfs_allocated_count) {
-               adapter->vf_data = kcalloc(adapter->vfs_allocated_count,
-                                          sizeof(struct vf_data_storage),
-                                          GFP_KERNEL);
-               /* if allocation failed then we do not support SR-IOV */
-               if (!adapter->vf_data) {
-                       adapter->vfs_allocated_count = 0;
-                       dev_err(&pdev->dev, "Unable to allocate memory for VF "
-                               "Data Storage\n");
-               }
-       }
-
-       if (pci_enable_sriov(pdev, adapter->vfs_allocated_count)) {
-               kfree(adapter->vf_data);
-               adapter->vf_data = NULL;
-#endif /* CONFIG_PCI_IOV */
-               adapter->vfs_allocated_count = 0;
-#ifdef CONFIG_PCI_IOV
-       } else {
-               unsigned char mac_addr[ETH_ALEN];
-               int i;
-               dev_info(&pdev->dev, "%d vfs allocated\n",
-                        adapter->vfs_allocated_count);
-               for (i = 0; i < adapter->vfs_allocated_count; i++) {
-                       random_ether_addr(mac_addr);
-                       igb_set_vf_mac(adapter, i, mac_addr);
-               }
-               /* DMA Coalescing is not supported in IOV mode. */
-               if (adapter->flags & IGB_FLAG_DMAC)
-                       adapter->flags &= ~IGB_FLAG_DMAC;
-       }
-#endif /* CONFIG_PCI_IOV */
-}
-
-
-/**
- * igb_init_hw_timer - Initialize hardware timer used with IEEE 1588 timestamp
- * @adapter: board private structure to initialize
- *
- * igb_init_hw_timer initializes the function pointer and values for the hw
- * timer found in hardware.
- **/
-static void igb_init_hw_timer(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       switch (hw->mac.type) {
-       case e1000_i350:
-       case e1000_82580:
-               memset(&adapter->cycles, 0, sizeof(adapter->cycles));
-               adapter->cycles.read = igb_read_clock;
-               adapter->cycles.mask = CLOCKSOURCE_MASK(64);
-               adapter->cycles.mult = 1;
-               /*
-                * The 82580 timesync updates the system timer every 8ns by 8ns
-                * and the value cannot be shifted.  Instead we need to shift
-                * the registers to generate a 64bit timer value.  As a result
-                * SYSTIMR/L/H, TXSTMPL/H, RXSTMPL/H all have to be shifted by
-                * 24 in order to generate a larger value for synchronization.
-                */
-               adapter->cycles.shift = IGB_82580_TSYNC_SHIFT;
-               /* disable system timer temporarily by setting bit 31 */
-               wr32(E1000_TSAUXC, 0x80000000);
-               wrfl();
-
-               /* Set registers so that rollover occurs soon to test this. */
-               wr32(E1000_SYSTIMR, 0x00000000);
-               wr32(E1000_SYSTIML, 0x80000000);
-               wr32(E1000_SYSTIMH, 0x000000FF);
-               wrfl();
-
-               /* enable system timer by clearing bit 31 */
-               wr32(E1000_TSAUXC, 0x0);
-               wrfl();
-
-               timecounter_init(&adapter->clock,
-                                &adapter->cycles,
-                                ktime_to_ns(ktime_get_real()));
-               /*
-                * Synchronize our NIC clock against system wall clock. NIC
-                * time stamp reading requires ~3us per sample, each sample
-                * was pretty stable even under load => only require 10
-                * samples for each offset comparison.
-                */
-               memset(&adapter->compare, 0, sizeof(adapter->compare));
-               adapter->compare.source = &adapter->clock;
-               adapter->compare.target = ktime_get_real;
-               adapter->compare.num_samples = 10;
-               timecompare_update(&adapter->compare, 0);
-               break;
-       case e1000_82576:
-               /*
-                * Initialize hardware timer: we keep it running just in case
-                * that some program needs it later on.
-                */
-               memset(&adapter->cycles, 0, sizeof(adapter->cycles));
-               adapter->cycles.read = igb_read_clock;
-               adapter->cycles.mask = CLOCKSOURCE_MASK(64);
-               adapter->cycles.mult = 1;
-               /**
-                * Scale the NIC clock cycle by a large factor so that
-                * relatively small clock corrections can be added or
-                * subtracted at each clock tick. The drawbacks of a large
-                * factor are a) that the clock register overflows more quickly
-                * (not such a big deal) and b) that the increment per tick has
-                * to fit into 24 bits.  As a result we need to use a shift of
-                * 19 so we can fit a value of 16 into the TIMINCA register.
-                */
-               adapter->cycles.shift = IGB_82576_TSYNC_SHIFT;
-               wr32(E1000_TIMINCA,
-                               (1 << E1000_TIMINCA_16NS_SHIFT) |
-                               (16 << IGB_82576_TSYNC_SHIFT));
-
-               /* Set registers so that rollover occurs soon to test this. */
-               wr32(E1000_SYSTIML, 0x00000000);
-               wr32(E1000_SYSTIMH, 0xFF800000);
-               wrfl();
-
-               timecounter_init(&adapter->clock,
-                                &adapter->cycles,
-                                ktime_to_ns(ktime_get_real()));
-               /*
-                * Synchronize our NIC clock against system wall clock. NIC
-                * time stamp reading requires ~3us per sample, each sample
-                * was pretty stable even under load => only require 10
-                * samples for each offset comparison.
-                */
-               memset(&adapter->compare, 0, sizeof(adapter->compare));
-               adapter->compare.source = &adapter->clock;
-               adapter->compare.target = ktime_get_real;
-               adapter->compare.num_samples = 10;
-               timecompare_update(&adapter->compare, 0);
-               break;
-       case e1000_82575:
-               /* 82575 does not support timesync */
-       default:
-               break;
-       }
-
-}
-
-/**
- * igb_sw_init - Initialize general software structures (struct igb_adapter)
- * @adapter: board private structure to initialize
- *
- * igb_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 __devinit igb_sw_init(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-
-       pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);
-
-       adapter->tx_ring_count = IGB_DEFAULT_TXD;
-       adapter->rx_ring_count = IGB_DEFAULT_RXD;
-       adapter->rx_itr_setting = IGB_DEFAULT_ITR;
-       adapter->tx_itr_setting = IGB_DEFAULT_ITR;
-
-       adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
-
-       spin_lock_init(&adapter->stats64_lock);
-#ifdef CONFIG_PCI_IOV
-       switch (hw->mac.type) {
-       case e1000_82576:
-       case e1000_i350:
-               if (max_vfs > 7) {
-                       dev_warn(&pdev->dev,
-                                "Maximum of 7 VFs per PF, using max\n");
-                       adapter->vfs_allocated_count = 7;
-               } else
-                       adapter->vfs_allocated_count = max_vfs;
-               break;
-       default:
-               break;
-       }
-#endif /* CONFIG_PCI_IOV */
-       adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
-       /* i350 cannot do RSS and SR-IOV at the same time */
-       if (hw->mac.type == e1000_i350 && adapter->vfs_allocated_count)
-               adapter->rss_queues = 1;
-
-       /*
-        * if rss_queues > 4 or vfs are going to be allocated with rss_queues
-        * then we should combine the queues into a queue pair in order to
-        * conserve interrupts due to limited supply
-        */
-       if ((adapter->rss_queues > 4) ||
-           ((adapter->rss_queues > 1) && (adapter->vfs_allocated_count > 6)))
-               adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
-
-       /* This call may decrease the number of queues */
-       if (igb_init_interrupt_scheme(adapter)) {
-               dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
-               return -ENOMEM;
-       }
-
-       igb_probe_vfs(adapter);
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       igb_irq_disable(adapter);
-
-       if (hw->mac.type == e1000_i350)
-               adapter->flags &= ~IGB_FLAG_DMAC;
-
-       set_bit(__IGB_DOWN, &adapter->state);
-       return 0;
-}
-
-/**
- * igb_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-static int igb_open(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int err;
-       int i;
-
-       /* disallow open during test */
-       if (test_bit(__IGB_TESTING, &adapter->state))
-               return -EBUSY;
-
-       netif_carrier_off(netdev);
-
-       /* allocate transmit descriptors */
-       err = igb_setup_all_tx_resources(adapter);
-       if (err)
-               goto err_setup_tx;
-
-       /* allocate receive descriptors */
-       err = igb_setup_all_rx_resources(adapter);
-       if (err)
-               goto err_setup_rx;
-
-       igb_power_up_link(adapter);
-
-       /* before we allocate an interrupt, we must be ready to handle it.
-        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
-        * as soon as we call pci_request_irq, so we have to setup our
-        * clean_rx handler before we do so.  */
-       igb_configure(adapter);
-
-       err = igb_request_irq(adapter);
-       if (err)
-               goto err_req_irq;
-
-       /* From here on the code is the same as igb_up() */
-       clear_bit(__IGB_DOWN, &adapter->state);
-
-       for (i = 0; i < adapter->num_q_vectors; i++) {
-               struct igb_q_vector *q_vector = adapter->q_vector[i];
-               napi_enable(&q_vector->napi);
-       }
-
-       /* Clear any pending interrupts. */
-       rd32(E1000_ICR);
-
-       igb_irq_enable(adapter);
-
-       /* notify VFs that reset has been completed */
-       if (adapter->vfs_allocated_count) {
-               u32 reg_data = rd32(E1000_CTRL_EXT);
-               reg_data |= E1000_CTRL_EXT_PFRSTD;
-               wr32(E1000_CTRL_EXT, reg_data);
-       }
-
-       netif_tx_start_all_queues(netdev);
-
-       /* start the watchdog. */
-       hw->mac.get_link_status = 1;
-       schedule_work(&adapter->watchdog_task);
-
-       return 0;
-
-err_req_irq:
-       igb_release_hw_control(adapter);
-       igb_power_down_link(adapter);
-       igb_free_all_rx_resources(adapter);
-err_setup_rx:
-       igb_free_all_tx_resources(adapter);
-err_setup_tx:
-       igb_reset(adapter);
-
-       return err;
-}
-
-/**
- * igb_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the driver's control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-static int igb_close(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       WARN_ON(test_bit(__IGB_RESETTING, &adapter->state));
-       igb_down(adapter);
-
-       igb_free_irq(adapter);
-
-       igb_free_all_tx_resources(adapter);
-       igb_free_all_rx_resources(adapter);
-
-       return 0;
-}
-
-/**
- * igb_setup_tx_resources - allocate Tx resources (Descriptors)
- * @tx_ring: tx descriptor ring (for a specific queue) to setup
- *
- * Return 0 on success, negative on failure
- **/
-int igb_setup_tx_resources(struct igb_ring *tx_ring)
-{
-       struct device *dev = tx_ring->dev;
-       int size;
-
-       size = sizeof(struct igb_buffer) * tx_ring->count;
-       tx_ring->buffer_info = vzalloc(size);
-       if (!tx_ring->buffer_info)
-               goto err;
-
-       /* round up to nearest 4K */
-       tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc);
-       tx_ring->size = ALIGN(tx_ring->size, 4096);
-
-       tx_ring->desc = dma_alloc_coherent(dev,
-                                          tx_ring->size,
-                                          &tx_ring->dma,
-                                          GFP_KERNEL);
-
-       if (!tx_ring->desc)
-               goto err;
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-       return 0;
-
-err:
-       vfree(tx_ring->buffer_info);
-       dev_err(dev,
-               "Unable to allocate memory for the transmit descriptor ring\n");
-       return -ENOMEM;
-}
-
-/**
- * igb_setup_all_tx_resources - wrapper to allocate Tx resources
- *                               (Descriptors) for all queues
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-static int igb_setup_all_tx_resources(struct igb_adapter *adapter)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               err = igb_setup_tx_resources(adapter->tx_ring[i]);
-               if (err) {
-                       dev_err(&pdev->dev,
-                               "Allocation for Tx Queue %u failed\n", i);
-                       for (i--; i >= 0; i--)
-                               igb_free_tx_resources(adapter->tx_ring[i]);
-                       break;
-               }
-       }
-
-       for (i = 0; i < IGB_ABS_MAX_TX_QUEUES; i++) {
-               int r_idx = i % adapter->num_tx_queues;
-               adapter->multi_tx_table[i] = adapter->tx_ring[r_idx];
-       }
-       return err;
-}
-
-/**
- * igb_setup_tctl - configure the transmit control registers
- * @adapter: Board private structure
- **/
-void igb_setup_tctl(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tctl;
-
-       /* disable queue 0 which is enabled by default on 82575 and 82576 */
-       wr32(E1000_TXDCTL(0), 0);
-
-       /* Program the Transmit Control Register */
-       tctl = rd32(E1000_TCTL);
-       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;
-
-       wr32(E1000_TCTL, tctl);
-}
-
-/**
- * igb_configure_tx_ring - Configure transmit ring after Reset
- * @adapter: board private structure
- * @ring: tx ring to configure
- *
- * Configure a transmit ring after a reset.
- **/
-void igb_configure_tx_ring(struct igb_adapter *adapter,
-                           struct igb_ring *ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 txdctl;
-       u64 tdba = ring->dma;
-       int reg_idx = ring->reg_idx;
-
-       /* disable the queue */
-       txdctl = rd32(E1000_TXDCTL(reg_idx));
-       wr32(E1000_TXDCTL(reg_idx),
-                       txdctl & ~E1000_TXDCTL_QUEUE_ENABLE);
-       wrfl();
-       mdelay(10);
-
-       wr32(E1000_TDLEN(reg_idx),
-                       ring->count * sizeof(union e1000_adv_tx_desc));
-       wr32(E1000_TDBAL(reg_idx),
-                       tdba & 0x00000000ffffffffULL);
-       wr32(E1000_TDBAH(reg_idx), tdba >> 32);
-
-       ring->head = hw->hw_addr + E1000_TDH(reg_idx);
-       ring->tail = hw->hw_addr + E1000_TDT(reg_idx);
-       writel(0, ring->head);
-       writel(0, ring->tail);
-
-       txdctl |= IGB_TX_PTHRESH;
-       txdctl |= IGB_TX_HTHRESH << 8;
-       txdctl |= IGB_TX_WTHRESH << 16;
-
-       txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
-       wr32(E1000_TXDCTL(reg_idx), txdctl);
-}
-
-/**
- * igb_configure_tx - Configure 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)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               igb_configure_tx_ring(adapter, adapter->tx_ring[i]);
-}
-
-/**
- * igb_setup_rx_resources - allocate Rx resources (Descriptors)
- * @rx_ring:    rx descriptor ring (for a specific queue) to setup
- *
- * Returns 0 on success, negative on failure
- **/
-int igb_setup_rx_resources(struct igb_ring *rx_ring)
-{
-       struct device *dev = rx_ring->dev;
-       int size, desc_len;
-
-       size = sizeof(struct igb_buffer) * rx_ring->count;
-       rx_ring->buffer_info = vzalloc(size);
-       if (!rx_ring->buffer_info)
-               goto err;
-
-       desc_len = sizeof(union e1000_adv_rx_desc);
-
-       /* Round up to nearest 4K */
-       rx_ring->size = rx_ring->count * desc_len;
-       rx_ring->size = ALIGN(rx_ring->size, 4096);
-
-       rx_ring->desc = dma_alloc_coherent(dev,
-                                          rx_ring->size,
-                                          &rx_ring->dma,
-                                          GFP_KERNEL);
-
-       if (!rx_ring->desc)
-               goto err;
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       return 0;
-
-err:
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-       dev_err(dev, "Unable to allocate memory for the receive descriptor"
-               " ring\n");
-       return -ENOMEM;
-}
-
-/**
- * igb_setup_all_rx_resources - wrapper to allocate Rx resources
- *                               (Descriptors) for all queues
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-static int igb_setup_all_rx_resources(struct igb_adapter *adapter)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               err = igb_setup_rx_resources(adapter->rx_ring[i]);
-               if (err) {
-                       dev_err(&pdev->dev,
-                               "Allocation for Rx Queue %u failed\n", i);
-                       for (i--; i >= 0; i--)
-                               igb_free_rx_resources(adapter->rx_ring[i]);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-/**
- * igb_setup_mrqc - configure the multiple receive queue control registers
- * @adapter: Board private structure
- **/
-static void igb_setup_mrqc(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 mrqc, rxcsum;
-       u32 j, num_rx_queues, shift = 0, shift2 = 0;
-       union e1000_reta {
-               u32 dword;
-               u8  bytes[4];
-       } reta;
-       static const u8 rsshash[40] = {
-               0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, 0x41, 0x67,
-               0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, 0xd0, 0xca, 0x2b, 0xcb,
-               0xae, 0x7b, 0x30, 0xb4, 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30,
-               0xf2, 0x0c, 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa };
-
-       /* Fill out hash function seeds */
-       for (j = 0; j < 10; j++) {
-               u32 rsskey = rsshash[(j * 4)];
-               rsskey |= rsshash[(j * 4) + 1] << 8;
-               rsskey |= rsshash[(j * 4) + 2] << 16;
-               rsskey |= rsshash[(j * 4) + 3] << 24;
-               array_wr32(E1000_RSSRK(0), j, rsskey);
-       }
-
-       num_rx_queues = adapter->rss_queues;
-
-       if (adapter->vfs_allocated_count) {
-               /* 82575 and 82576 supports 2 RSS queues for VMDq */
-               switch (hw->mac.type) {
-               case e1000_i350:
-               case e1000_82580:
-                       num_rx_queues = 1;
-                       shift = 0;
-                       break;
-               case e1000_82576:
-                       shift = 3;
-                       num_rx_queues = 2;
-                       break;
-               case e1000_82575:
-                       shift = 2;
-                       shift2 = 6;
-               default:
-                       break;
-               }
-       } else {
-               if (hw->mac.type == e1000_82575)
-                       shift = 6;
-       }
-
-       for (j = 0; j < (32 * 4); j++) {
-               reta.bytes[j & 3] = (j % num_rx_queues) << shift;
-               if (shift2)
-                       reta.bytes[j & 3] |= num_rx_queues << shift2;
-               if ((j & 3) == 3)
-                       wr32(E1000_RETA(j >> 2), reta.dword);
-       }
-
-       /*
-        * Disable raw packet checksumming so that RSS hash is placed in
-        * descriptor on writeback.  No need to enable TCP/UDP/IP checksum
-        * offloads as they are enabled by default
-        */
-       rxcsum = rd32(E1000_RXCSUM);
-       rxcsum |= E1000_RXCSUM_PCSD;
-
-       if (adapter->hw.mac.type >= e1000_82576)
-               /* Enable Receive Checksum Offload for SCTP */
-               rxcsum |= E1000_RXCSUM_CRCOFL;
-
-       /* Don't need to set TUOFL or IPOFL, they default to 1 */
-       wr32(E1000_RXCSUM, rxcsum);
-
-       /* If VMDq is enabled then we set the appropriate mode for that, else
-        * we default to RSS so that an RSS hash is calculated per packet even
-        * if we are only using one queue */
-       if (adapter->vfs_allocated_count) {
-               if (hw->mac.type > e1000_82575) {
-                       /* Set the default pool for the PF's first queue */
-                       u32 vtctl = rd32(E1000_VT_CTL);
-                       vtctl &= ~(E1000_VT_CTL_DEFAULT_POOL_MASK |
-                                  E1000_VT_CTL_DISABLE_DEF_POOL);
-                       vtctl |= adapter->vfs_allocated_count <<
-                               E1000_VT_CTL_DEFAULT_POOL_SHIFT;
-                       wr32(E1000_VT_CTL, vtctl);
-               }
-               if (adapter->rss_queues > 1)
-                       mrqc = E1000_MRQC_ENABLE_VMDQ_RSS_2Q;
-               else
-                       mrqc = E1000_MRQC_ENABLE_VMDQ;
-       } else {
-               mrqc = E1000_MRQC_ENABLE_RSS_4Q;
-       }
-       igb_vmm_control(adapter);
-
-       /*
-        * Generate RSS hash based on TCP port numbers and/or
-        * IPv4/v6 src and dst addresses since UDP cannot be
-        * hashed reliably due to IP fragmentation
-        */
-       mrqc |= E1000_MRQC_RSS_FIELD_IPV4 |
-               E1000_MRQC_RSS_FIELD_IPV4_TCP |
-               E1000_MRQC_RSS_FIELD_IPV6 |
-               E1000_MRQC_RSS_FIELD_IPV6_TCP |
-               E1000_MRQC_RSS_FIELD_IPV6_TCP_EX;
-
-       wr32(E1000_MRQC, mrqc);
-}
-
-/**
- * igb_setup_rctl - configure the receive control registers
- * @adapter: Board private structure
- **/
-void igb_setup_rctl(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       rctl = rd32(E1000_RCTL);
-
-       rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
-       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
-
-       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_RDMTS_HALF |
-               (hw->mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
-
-       /*
-        * enable stripping of CRC. It's unlikely this will break BMC
-        * redirection as it did with e1000. Newer features require
-        * that the HW strips the CRC.
-        */
-       rctl |= E1000_RCTL_SECRC;
-
-       /* disable store bad packets and clear size bits. */
-       rctl &= ~(E1000_RCTL_SBP | E1000_RCTL_SZ_256);
-
-       /* enable LPE to prevent packets larger than max_frame_size */
-       rctl |= E1000_RCTL_LPE;
-
-       /* disable queue 0 to prevent tail write w/o re-config */
-       wr32(E1000_RXDCTL(0), 0);
-
-       /* Attention!!!  For SR-IOV PF driver operations you must enable
-        * queue drop for all VF and PF queues to prevent head of line blocking
-        * if an un-trusted VF does not provide descriptors to hardware.
-        */
-       if (adapter->vfs_allocated_count) {
-               /* set all queue drop enable bits */
-               wr32(E1000_QDE, ALL_QUEUES);
-       }
-
-       wr32(E1000_RCTL, rctl);
-}
-
-static inline int igb_set_vf_rlpml(struct igb_adapter *adapter, int size,
-                                   int vfn)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vmolr;
-
-       /* if it isn't the PF check to see if VFs are enabled and
-        * increase the size to support vlan tags */
-       if (vfn < adapter->vfs_allocated_count &&
-           adapter->vf_data[vfn].vlans_enabled)
-               size += VLAN_TAG_SIZE;
-
-       vmolr = rd32(E1000_VMOLR(vfn));
-       vmolr &= ~E1000_VMOLR_RLPML_MASK;
-       vmolr |= size | E1000_VMOLR_LPE;
-       wr32(E1000_VMOLR(vfn), vmolr);
-
-       return 0;
-}
-
-/**
- * igb_rlpml_set - set maximum receive packet size
- * @adapter: board private structure
- *
- * Configure maximum receivable packet size.
- **/
-static void igb_rlpml_set(struct igb_adapter *adapter)
-{
-       u32 max_frame_size;
-       struct e1000_hw *hw = &adapter->hw;
-       u16 pf_id = adapter->vfs_allocated_count;
-
-       max_frame_size = adapter->max_frame_size + VLAN_TAG_SIZE;
-
-       /* if vfs are enabled we set RLPML to the largest possible request
-        * size and set the VMOLR RLPML to the size we need */
-       if (pf_id) {
-               igb_set_vf_rlpml(adapter, max_frame_size, pf_id);
-               max_frame_size = MAX_JUMBO_FRAME_SIZE;
-       }
-
-       wr32(E1000_RLPML, max_frame_size);
-}
-
-static inline void igb_set_vmolr(struct igb_adapter *adapter,
-                                int vfn, bool aupe)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vmolr;
-
-       /*
-        * This register exists only on 82576 and newer so if we are older then
-        * we should exit and do nothing
-        */
-       if (hw->mac.type < e1000_82576)
-               return;
-
-       vmolr = rd32(E1000_VMOLR(vfn));
-       vmolr |= E1000_VMOLR_STRVLAN;      /* Strip vlan tags */
-       if (aupe)
-               vmolr |= E1000_VMOLR_AUPE;        /* Accept untagged packets */
-       else
-               vmolr &= ~(E1000_VMOLR_AUPE); /* Tagged packets ONLY */
-
-       /* clear all bits that might not be set */
-       vmolr &= ~(E1000_VMOLR_BAM | E1000_VMOLR_RSSE);
-
-       if (adapter->rss_queues > 1 && vfn == adapter->vfs_allocated_count)
-               vmolr |= E1000_VMOLR_RSSE; /* enable RSS */
-       /*
-        * for VMDq only allow the VFs and pool 0 to accept broadcast and
-        * multicast packets
-        */
-       if (vfn <= adapter->vfs_allocated_count)
-               vmolr |= E1000_VMOLR_BAM;          /* Accept broadcast */
-
-       wr32(E1000_VMOLR(vfn), vmolr);
-}
-
-/**
- * igb_configure_rx_ring - Configure a receive ring after Reset
- * @adapter: board private structure
- * @ring: receive ring to be configured
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-void igb_configure_rx_ring(struct igb_adapter *adapter,
-                           struct igb_ring *ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u64 rdba = ring->dma;
-       int reg_idx = ring->reg_idx;
-       u32 srrctl, rxdctl;
-
-       /* disable the queue */
-       rxdctl = rd32(E1000_RXDCTL(reg_idx));
-       wr32(E1000_RXDCTL(reg_idx),
-                       rxdctl & ~E1000_RXDCTL_QUEUE_ENABLE);
-
-       /* Set DMA base address registers */
-       wr32(E1000_RDBAL(reg_idx),
-            rdba & 0x00000000ffffffffULL);
-       wr32(E1000_RDBAH(reg_idx), rdba >> 32);
-       wr32(E1000_RDLEN(reg_idx),
-                      ring->count * sizeof(union e1000_adv_rx_desc));
-
-       /* initialize head and tail */
-       ring->head = hw->hw_addr + E1000_RDH(reg_idx);
-       ring->tail = hw->hw_addr + E1000_RDT(reg_idx);
-       writel(0, ring->head);
-       writel(0, ring->tail);
-
-       /* set descriptor configuration */
-       if (ring->rx_buffer_len < IGB_RXBUFFER_1024) {
-               srrctl = ALIGN(ring->rx_buffer_len, 64) <<
-                        E1000_SRRCTL_BSIZEHDRSIZE_SHIFT;
-#if (PAGE_SIZE / 2) > IGB_RXBUFFER_16384
-               srrctl |= IGB_RXBUFFER_16384 >>
-                         E1000_SRRCTL_BSIZEPKT_SHIFT;
-#else
-               srrctl |= (PAGE_SIZE / 2) >>
-                         E1000_SRRCTL_BSIZEPKT_SHIFT;
-#endif
-               srrctl |= E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
-       } else {
-               srrctl = ALIGN(ring->rx_buffer_len, 1024) >>
-                        E1000_SRRCTL_BSIZEPKT_SHIFT;
-               srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF;
-       }
-       if (hw->mac.type == e1000_82580)
-               srrctl |= E1000_SRRCTL_TIMESTAMP;
-       /* Only set Drop Enable if we are supporting multiple queues */
-       if (adapter->vfs_allocated_count || adapter->num_rx_queues > 1)
-               srrctl |= E1000_SRRCTL_DROP_EN;
-
-       wr32(E1000_SRRCTL(reg_idx), srrctl);
-
-       /* set filtering for VMDQ pools */
-       igb_set_vmolr(adapter, reg_idx & 0x7, true);
-
-       /* enable receive descriptor fetching */
-       rxdctl = rd32(E1000_RXDCTL(reg_idx));
-       rxdctl |= E1000_RXDCTL_QUEUE_ENABLE;
-       rxdctl &= 0xFFF00000;
-       rxdctl |= IGB_RX_PTHRESH;
-       rxdctl |= IGB_RX_HTHRESH << 8;
-       rxdctl |= IGB_RX_WTHRESH << 16;
-       wr32(E1000_RXDCTL(reg_idx), rxdctl);
-}
-
-/**
- * igb_configure_rx - Configure 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)
-{
-       int i;
-
-       /* set UTA to appropriate mode */
-       igb_set_uta(adapter);
-
-       /* set the correct pool for the PF default MAC address in entry 0 */
-       igb_rar_set_qsel(adapter, adapter->hw.mac.addr, 0,
-                        adapter->vfs_allocated_count);
-
-       /* Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring */
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               igb_configure_rx_ring(adapter, adapter->rx_ring[i]);
-}
-
-/**
- * igb_free_tx_resources - Free Tx Resources per Queue
- * @tx_ring: Tx descriptor ring for a specific queue
- *
- * Free all transmit software resources
- **/
-void igb_free_tx_resources(struct igb_ring *tx_ring)
-{
-       igb_clean_tx_ring(tx_ring);
-
-       vfree(tx_ring->buffer_info);
-       tx_ring->buffer_info = NULL;
-
-       /* if not set, then don't free */
-       if (!tx_ring->desc)
-               return;
-
-       dma_free_coherent(tx_ring->dev, tx_ring->size,
-                         tx_ring->desc, tx_ring->dma);
-
-       tx_ring->desc = NULL;
-}
-
-/**
- * igb_free_all_tx_resources - Free Tx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all transmit software resources
- **/
-static void igb_free_all_tx_resources(struct igb_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               igb_free_tx_resources(adapter->tx_ring[i]);
-}
-
-void igb_unmap_and_free_tx_resource(struct igb_ring *tx_ring,
-                                   struct igb_buffer *buffer_info)
-{
-       if (buffer_info->dma) {
-               if (buffer_info->mapped_as_page)
-                       dma_unmap_page(tx_ring->dev,
-                                       buffer_info->dma,
-                                       buffer_info->length,
-                                       DMA_TO_DEVICE);
-               else
-                       dma_unmap_single(tx_ring->dev,
-                                       buffer_info->dma,
-                                       buffer_info->length,
-                                       DMA_TO_DEVICE);
-               buffer_info->dma = 0;
-       }
-       if (buffer_info->skb) {
-               dev_kfree_skb_any(buffer_info->skb);
-               buffer_info->skb = NULL;
-       }
-       buffer_info->time_stamp = 0;
-       buffer_info->length = 0;
-       buffer_info->next_to_watch = 0;
-       buffer_info->mapped_as_page = false;
-}
-
-/**
- * igb_clean_tx_ring - Free Tx Buffers
- * @tx_ring: ring to be cleaned
- **/
-static void igb_clean_tx_ring(struct igb_ring *tx_ring)
-{
-       struct igb_buffer *buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       if (!tx_ring->buffer_info)
-               return;
-       /* Free all the Tx ring sk_buffs */
-
-       for (i = 0; i < tx_ring->count; i++) {
-               buffer_info = &tx_ring->buffer_info[i];
-               igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
-       }
-
-       size = sizeof(struct igb_buffer) * tx_ring->count;
-       memset(tx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-}
-
-/**
- * igb_clean_all_tx_rings - Free Tx Buffers for all queues
- * @adapter: board private structure
- **/
-static void igb_clean_all_tx_rings(struct igb_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               igb_clean_tx_ring(adapter->tx_ring[i]);
-}
-
-/**
- * igb_free_rx_resources - Free Rx Resources
- * @rx_ring: ring to clean the resources from
- *
- * Free all receive software resources
- **/
-void igb_free_rx_resources(struct igb_ring *rx_ring)
-{
-       igb_clean_rx_ring(rx_ring);
-
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-
-       /* if not set, then don't free */
-       if (!rx_ring->desc)
-               return;
-
-       dma_free_coherent(rx_ring->dev, rx_ring->size,
-                         rx_ring->desc, rx_ring->dma);
-
-       rx_ring->desc = NULL;
-}
-
-/**
- * igb_free_all_rx_resources - Free Rx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all receive software resources
- **/
-static void igb_free_all_rx_resources(struct igb_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               igb_free_rx_resources(adapter->rx_ring[i]);
-}
-
-/**
- * igb_clean_rx_ring - Free Rx Buffers per Queue
- * @rx_ring: ring to free buffers from
- **/
-static void igb_clean_rx_ring(struct igb_ring *rx_ring)
-{
-       struct igb_buffer *buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       if (!rx_ring->buffer_info)
-               return;
-
-       /* Free all the Rx ring sk_buffs */
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               if (buffer_info->dma) {
-                       dma_unmap_single(rx_ring->dev,
-                                        buffer_info->dma,
-                                        rx_ring->rx_buffer_len,
-                                        DMA_FROM_DEVICE);
-                       buffer_info->dma = 0;
-               }
-
-               if (buffer_info->skb) {
-                       dev_kfree_skb(buffer_info->skb);
-                       buffer_info->skb = NULL;
-               }
-               if (buffer_info->page_dma) {
-                       dma_unmap_page(rx_ring->dev,
-                                      buffer_info->page_dma,
-                                      PAGE_SIZE / 2,
-                                      DMA_FROM_DEVICE);
-                       buffer_info->page_dma = 0;
-               }
-               if (buffer_info->page) {
-                       put_page(buffer_info->page);
-                       buffer_info->page = NULL;
-                       buffer_info->page_offset = 0;
-               }
-       }
-
-       size = sizeof(struct igb_buffer) * rx_ring->count;
-       memset(rx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-}
-
-/**
- * igb_clean_all_rx_rings - Free Rx Buffers for all queues
- * @adapter: board private structure
- **/
-static void igb_clean_all_rx_rings(struct igb_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               igb_clean_rx_ring(adapter->rx_ring[i]);
-}
-
-/**
- * igb_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-static int igb_set_mac(struct net_device *netdev, void *p)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
-
-       /* set the correct pool for the new PF MAC address in entry 0 */
-       igb_rar_set_qsel(adapter, hw->mac.addr, 0,
-                        adapter->vfs_allocated_count);
-
-       return 0;
-}
-
-/**
- * igb_write_mc_addr_list - write multicast addresses to MTA
- * @netdev: network interface device structure
- *
- * Writes multicast address list to the MTA hash table.
- * Returns: -ENOMEM on failure
- *                0 on no addresses written
- *                X on writing X addresses to MTA
- **/
-static int igb_write_mc_addr_list(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct netdev_hw_addr *ha;
-       u8  *mta_list;
-       int i;
-
-       if (netdev_mc_empty(netdev)) {
-               /* nothing to program, so clear mc list */
-               igb_update_mc_addr_list(hw, NULL, 0);
-               igb_restore_vf_multicasts(adapter);
-               return 0;
-       }
-
-       mta_list = kzalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
-       if (!mta_list)
-               return -ENOMEM;
-
-       /* The shared function expects a packed array of only addresses. */
-       i = 0;
-       netdev_for_each_mc_addr(ha, netdev)
-               memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
-
-       igb_update_mc_addr_list(hw, mta_list, i);
-       kfree(mta_list);
-
-       return netdev_mc_count(netdev);
-}
-
-/**
- * igb_write_uc_addr_list - write unicast addresses to RAR table
- * @netdev: network interface device structure
- *
- * Writes unicast address list to the RAR table.
- * Returns: -ENOMEM on failure/insufficient address space
- *                0 on no addresses written
- *                X on writing X addresses to the RAR table
- **/
-static int igb_write_uc_addr_list(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       unsigned int vfn = adapter->vfs_allocated_count;
-       unsigned int rar_entries = hw->mac.rar_entry_count - (vfn + 1);
-       int count = 0;
-
-       /* return ENOMEM indicating insufficient memory for addresses */
-       if (netdev_uc_count(netdev) > rar_entries)
-               return -ENOMEM;
-
-       if (!netdev_uc_empty(netdev) && rar_entries) {
-               struct netdev_hw_addr *ha;
-
-               netdev_for_each_uc_addr(ha, netdev) {
-                       if (!rar_entries)
-                               break;
-                       igb_rar_set_qsel(adapter, ha->addr,
-                                        rar_entries--,
-                                        vfn);
-                       count++;
-               }
-       }
-       /* write the addresses in reverse order to avoid write combining */
-       for (; rar_entries > 0 ; rar_entries--) {
-               wr32(E1000_RAH(rar_entries), 0);
-               wr32(E1000_RAL(rar_entries), 0);
-       }
-       wrfl();
-
-       return count;
-}
-
-/**
- * igb_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_rx_mode entry point is called whenever the unicast or multicast
- * address lists or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper unicast, multicast,
- * promiscuous mode, and all-multi behavior.
- **/
-static void igb_set_rx_mode(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       unsigned int vfn = adapter->vfs_allocated_count;
-       u32 rctl, vmolr = 0;
-       int count;
-
-       /* Check for Promiscuous and All Multicast modes */
-       rctl = rd32(E1000_RCTL);
-
-       /* clear the effected bits */
-       rctl &= ~(E1000_RCTL_UPE | E1000_RCTL_MPE | E1000_RCTL_VFE);
-
-       if (netdev->flags & IFF_PROMISC) {
-               rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
-               vmolr |= (E1000_VMOLR_ROPE | E1000_VMOLR_MPME);
-       } else {
-               if (netdev->flags & IFF_ALLMULTI) {
-                       rctl |= E1000_RCTL_MPE;
-                       vmolr |= E1000_VMOLR_MPME;
-               } else {
-                       /*
-                        * Write addresses to the MTA, if the attempt fails
-                        * then we should just turn on promiscuous mode so
-                        * that we can at least receive multicast traffic
-                        */
-                       count = igb_write_mc_addr_list(netdev);
-                       if (count < 0) {
-                               rctl |= E1000_RCTL_MPE;
-                               vmolr |= E1000_VMOLR_MPME;
-                       } else if (count) {
-                               vmolr |= E1000_VMOLR_ROMPE;
-                       }
-               }
-               /*
-                * Write addresses to available RAR registers, if there is not
-                * sufficient space to store all the addresses then enable
-                * unicast promiscuous mode
-                */
-               count = igb_write_uc_addr_list(netdev);
-               if (count < 0) {
-                       rctl |= E1000_RCTL_UPE;
-                       vmolr |= E1000_VMOLR_ROPE;
-               }
-               rctl |= E1000_RCTL_VFE;
-       }
-       wr32(E1000_RCTL, rctl);
-
-       /*
-        * In order to support SR-IOV and eventually VMDq it is necessary to set
-        * the VMOLR to enable the appropriate modes.  Without this workaround
-        * we will have issues with VLAN tag stripping not being done for frames
-        * that are only arriving because we are the default pool
-        */
-       if (hw->mac.type < e1000_82576)
-               return;
-
-       vmolr |= rd32(E1000_VMOLR(vfn)) &
-                ~(E1000_VMOLR_ROPE | E1000_VMOLR_MPME | E1000_VMOLR_ROMPE);
-       wr32(E1000_VMOLR(vfn), vmolr);
-       igb_restore_vf_multicasts(adapter);
-}
-
-static void igb_check_wvbr(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 wvbr = 0;
-
-       switch (hw->mac.type) {
-       case e1000_82576:
-       case e1000_i350:
-               if (!(wvbr = rd32(E1000_WVBR)))
-                       return;
-               break;
-       default:
-               break;
-       }
-
-       adapter->wvbr |= wvbr;
-}
-
-#define IGB_STAGGERED_QUEUE_OFFSET 8
-
-static void igb_spoof_check(struct igb_adapter *adapter)
-{
-       int j;
-
-       if (!adapter->wvbr)
-               return;
-
-       for(j = 0; j < adapter->vfs_allocated_count; j++) {
-               if (adapter->wvbr & (1 << j) ||
-                   adapter->wvbr & (1 << (j + IGB_STAGGERED_QUEUE_OFFSET))) {
-                       dev_warn(&adapter->pdev->dev,
-                               "Spoof event(s) detected on VF %d\n", j);
-                       adapter->wvbr &=
-                               ~((1 << j) |
-                                 (1 << (j + IGB_STAGGERED_QUEUE_OFFSET)));
-               }
-       }
-}
-
-/* Need to wait a few seconds after link up to get diagnostic information from
- * the phy */
-static void igb_update_phy_info(unsigned long data)
-{
-       struct igb_adapter *adapter = (struct igb_adapter *) data;
-       igb_get_phy_info(&adapter->hw);
-}
-
-/**
- * igb_has_link - check shared code for link and determine up/down
- * @adapter: pointer to driver private info
- **/
-bool igb_has_link(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       bool link_active = false;
-       s32 ret_val = 0;
-
-       /* get_link_status is set on LSC (link status) interrupt or
-        * rx sequence error interrupt.  get_link_status will stay
-        * false until the e1000_check_for_link establishes link
-        * for copper adapters ONLY
-        */
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               if (hw->mac.get_link_status) {
-                       ret_val = hw->mac.ops.check_for_link(hw);
-                       link_active = !hw->mac.get_link_status;
-               } else {
-                       link_active = true;
-               }
-               break;
-       case e1000_media_type_internal_serdes:
-               ret_val = hw->mac.ops.check_for_link(hw);
-               link_active = hw->mac.serdes_has_link;
-               break;
-       default:
-       case e1000_media_type_unknown:
-               break;
-       }
-
-       return link_active;
-}
-
-static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)
-{
-       bool ret = false;
-       u32 ctrl_ext, thstat;
-
-       /* check for thermal sensor event on i350, copper only */
-       if (hw->mac.type == e1000_i350) {
-               thstat = rd32(E1000_THSTAT);
-               ctrl_ext = rd32(E1000_CTRL_EXT);
-
-               if ((hw->phy.media_type == e1000_media_type_copper) &&
-                   !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII)) {
-                       ret = !!(thstat & event);
-               }
-       }
-
-       return ret;
-}
-
-/**
- * igb_watchdog - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void igb_watchdog(unsigned long data)
-{
-       struct igb_adapter *adapter = (struct igb_adapter *)data;
-       /* Do the rest outside of interrupt context */
-       schedule_work(&adapter->watchdog_task);
-}
-
-static void igb_watchdog_task(struct work_struct *work)
-{
-       struct igb_adapter *adapter = container_of(work,
-                                                  struct igb_adapter,
-                                                   watchdog_task);
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 link;
-       int i;
-
-       link = igb_has_link(adapter);
-       if (link) {
-               if (!netif_carrier_ok(netdev)) {
-                       u32 ctrl;
-                       hw->mac.ops.get_speed_and_duplex(hw,
-                                                        &adapter->link_speed,
-                                                        &adapter->link_duplex);
-
-                       ctrl = rd32(E1000_CTRL);
-                       /* Links status message must follow this format */
-                       printk(KERN_INFO "igb: %s NIC Link is Up %d Mbps %s, "
-                                "Flow Control: %s\n",
-                              netdev->name,
-                              adapter->link_speed,
-                              adapter->link_duplex == FULL_DUPLEX ?
-                                "Full Duplex" : "Half Duplex",
-                              ((ctrl & E1000_CTRL_TFCE) &&
-                               (ctrl & E1000_CTRL_RFCE)) ? "RX/TX" :
-                              ((ctrl & E1000_CTRL_RFCE) ?  "RX" :
-                              ((ctrl & E1000_CTRL_TFCE) ?  "TX" : "None")));
-
-                       /* check for thermal sensor event */
-                       if (igb_thermal_sensor_event(hw, E1000_THSTAT_LINK_THROTTLE)) {
-                               printk(KERN_INFO "igb: %s The network adapter "
-                                                "link speed was downshifted "
-                                                "because it overheated.\n",
-                                                netdev->name);
-                       }
-
-                       /* adjust timeout factor according to speed/duplex */
-                       adapter->tx_timeout_factor = 1;
-                       switch (adapter->link_speed) {
-                       case SPEED_10:
-                               adapter->tx_timeout_factor = 14;
-                               break;
-                       case SPEED_100:
-                               /* maybe add some timeout factor ? */
-                               break;
-                       }
-
-                       netif_carrier_on(netdev);
-
-                       igb_ping_all_vfs(adapter);
-                       igb_check_vf_rate_limit(adapter);
-
-                       /* link state has changed, schedule phy info update */
-                       if (!test_bit(__IGB_DOWN, &adapter->state))
-                               mod_timer(&adapter->phy_info_timer,
-                                         round_jiffies(jiffies + 2 * HZ));
-               }
-       } else {
-               if (netif_carrier_ok(netdev)) {
-                       adapter->link_speed = 0;
-                       adapter->link_duplex = 0;
-
-                       /* check for thermal sensor event */
-                       if (igb_thermal_sensor_event(hw, E1000_THSTAT_PWR_DOWN)) {
-                               printk(KERN_ERR "igb: %s The network adapter "
-                                               "was stopped because it "
-                                               "overheated.\n",
-                                               netdev->name);
-                       }
-
-                       /* Links status message must follow this format */
-                       printk(KERN_INFO "igb: %s NIC Link is Down\n",
-                              netdev->name);
-                       netif_carrier_off(netdev);
-
-                       igb_ping_all_vfs(adapter);
-
-                       /* link state has changed, schedule phy info update */
-                       if (!test_bit(__IGB_DOWN, &adapter->state))
-                               mod_timer(&adapter->phy_info_timer,
-                                         round_jiffies(jiffies + 2 * HZ));
-               }
-       }
-
-       spin_lock(&adapter->stats64_lock);
-       igb_update_stats(adapter, &adapter->stats64);
-       spin_unlock(&adapter->stats64_lock);
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               struct igb_ring *tx_ring = adapter->tx_ring[i];
-               if (!netif_carrier_ok(netdev)) {
-                       /* We've lost link, so the controller stops DMA,
-                        * but we've got queued Tx work that's never going
-                        * to get done, so reset controller to flush Tx.
-                        * (Do the reset outside of interrupt context). */
-                       if (igb_desc_unused(tx_ring) + 1 < tx_ring->count) {
-                               adapter->tx_timeout_count++;
-                               schedule_work(&adapter->reset_task);
-                               /* return immediately since reset is imminent */
-                               return;
-                       }
-               }
-
-               /* Force detection of hung controller every watchdog period */
-               tx_ring->detect_tx_hung = true;
-       }
-
-       /* Cause software interrupt to ensure rx ring is cleaned */
-       if (adapter->msix_entries) {
-               u32 eics = 0;
-               for (i = 0; i < adapter->num_q_vectors; i++) {
-                       struct igb_q_vector *q_vector = adapter->q_vector[i];
-                       eics |= q_vector->eims_value;
-               }
-               wr32(E1000_EICS, eics);
-       } else {
-               wr32(E1000_ICS, E1000_ICS_RXDMT0);
-       }
-
-       igb_spoof_check(adapter);
-
-       /* Reset the timer */
-       if (!test_bit(__IGB_DOWN, &adapter->state))
-               mod_timer(&adapter->watchdog_timer,
-                         round_jiffies(jiffies + 2 * HZ));
-}
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-/**
- * igb_update_ring_itr - update the dynamic ITR value based on packet size
- *
- *      Stores a new ITR value based on strictly on packet size.  This
- *      algorithm is less sophisticated than that used in igb_update_itr,
- *      due to the difficulty of synchronizing statistics across multiple
- *      receive rings.  The divisors and thresholds used by this function
- *      were determined based on theoretical maximum wire speed and testing
- *      data, in order to minimize response time while increasing bulk
- *      throughput.
- *      This functionality is controlled by the InterruptThrottleRate module
- *      parameter (see igb_param.c)
- *      NOTE:  This function is called only when operating in a multiqueue
- *             receive environment.
- * @q_vector: pointer to q_vector
- **/
-static void igb_update_ring_itr(struct igb_q_vector *q_vector)
-{
-       int new_val = q_vector->itr_val;
-       int avg_wire_size = 0;
-       struct igb_adapter *adapter = q_vector->adapter;
-       struct igb_ring *ring;
-       unsigned int packets;
-
-       /* For non-gigabit speeds, just fix the interrupt rate at 4000
-        * ints/sec - ITR timer value of 120 ticks.
-        */
-       if (adapter->link_speed != SPEED_1000) {
-               new_val = 976;
-               goto set_itr_val;
-       }
-
-       ring = q_vector->rx_ring;
-       if (ring) {
-               packets = ACCESS_ONCE(ring->total_packets);
-
-               if (packets)
-                       avg_wire_size = ring->total_bytes / packets;
-       }
-
-       ring = q_vector->tx_ring;
-       if (ring) {
-               packets = ACCESS_ONCE(ring->total_packets);
-
-               if (packets)
-                       avg_wire_size = max_t(u32, avg_wire_size,
-                                             ring->total_bytes / packets);
-       }
-
-       /* if avg_wire_size isn't set no work was done */
-       if (!avg_wire_size)
-               goto clear_counts;
-
-       /* Add 24 bytes to size to account for CRC, preamble, and gap */
-       avg_wire_size += 24;
-
-       /* Don't starve jumbo frames */
-       avg_wire_size = min(avg_wire_size, 3000);
-
-       /* Give a little boost to mid-size frames */
-       if ((avg_wire_size > 300) && (avg_wire_size < 1200))
-               new_val = avg_wire_size / 3;
-       else
-               new_val = avg_wire_size / 2;
-
-       /* when in itr mode 3 do not exceed 20K ints/sec */
-       if (adapter->rx_itr_setting == 3 && new_val < 196)
-               new_val = 196;
-
-set_itr_val:
-       if (new_val != q_vector->itr_val) {
-               q_vector->itr_val = new_val;
-               q_vector->set_itr = 1;
-       }
-clear_counts:
-       if (q_vector->rx_ring) {
-               q_vector->rx_ring->total_bytes = 0;
-               q_vector->rx_ring->total_packets = 0;
-       }
-       if (q_vector->tx_ring) {
-               q_vector->tx_ring->total_bytes = 0;
-               q_vector->tx_ring->total_packets = 0;
-       }
-}
-
-/**
- * igb_update_itr - update the dynamic ITR value based on statistics
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.
- *      this functionality is controlled by the InterruptThrottleRate module
- *      parameter (see igb_param.c)
- *      NOTE:  These calculations are only valid when operating in a single-
- *             queue environment.
- * @adapter: pointer to adapter
- * @itr_setting: current q_vector->itr_val
- * @packets: the number of packets during this measurement interval
- * @bytes: the number of bytes during this measurement interval
- **/
-static unsigned int igb_update_itr(struct igb_adapter *adapter, u16 itr_setting,
-                                  int packets, int bytes)
-{
-       unsigned int retval = itr_setting;
-
-       if (packets == 0)
-               goto update_itr_done;
-
-       switch (itr_setting) {
-       case lowest_latency:
-               /* handle TSO and jumbo frames */
-               if (bytes/packets > 8000)
-                       retval = bulk_latency;
-               else if ((packets < 5) && (bytes > 512))
-                       retval = low_latency;
-               break;
-       case low_latency:  /* 50 usec aka 20000 ints/s */
-               if (bytes > 10000) {
-                       /* this if handles the TSO accounting */
-                       if (bytes/packets > 8000) {
-                               retval = bulk_latency;
-                       } else if ((packets < 10) || ((bytes/packets) > 1200)) {
-                               retval = bulk_latency;
-                       } else if ((packets > 35)) {
-                               retval = lowest_latency;
-                       }
-               } else if (bytes/packets > 2000) {
-                       retval = bulk_latency;
-               } else if (packets <= 2 && bytes < 512) {
-                       retval = lowest_latency;
-               }
-               break;
-       case bulk_latency: /* 250 usec aka 4000 ints/s */
-               if (bytes > 25000) {
-                       if (packets > 35)
-                               retval = low_latency;
-               } else if (bytes < 1500) {
-                       retval = low_latency;
-               }
-               break;
-       }
-
-update_itr_done:
-       return retval;
-}
-
-static void igb_set_itr(struct igb_adapter *adapter)
-{
-       struct igb_q_vector *q_vector = adapter->q_vector[0];
-       u16 current_itr;
-       u32 new_itr = q_vector->itr_val;
-
-       /* for non-gigabit speeds, just fix the interrupt rate at 4000 */
-       if (adapter->link_speed != SPEED_1000) {
-               current_itr = 0;
-               new_itr = 4000;
-               goto set_itr_now;
-       }
-
-       adapter->rx_itr = igb_update_itr(adapter,
-                                   adapter->rx_itr,
-                                   q_vector->rx_ring->total_packets,
-                                   q_vector->rx_ring->total_bytes);
-
-       adapter->tx_itr = igb_update_itr(adapter,
-                                   adapter->tx_itr,
-                                   q_vector->tx_ring->total_packets,
-                                   q_vector->tx_ring->total_bytes);
-       current_itr = max(adapter->rx_itr, adapter->tx_itr);
-
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->rx_itr_setting == 3 && current_itr == lowest_latency)
-               current_itr = low_latency;
-
-       switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
-       case lowest_latency:
-               new_itr = 56;  /* aka 70,000 ints/sec */
-               break;
-       case low_latency:
-               new_itr = 196; /* aka 20,000 ints/sec */
-               break;
-       case bulk_latency:
-               new_itr = 980; /* aka 4,000 ints/sec */
-               break;
-       default:
-               break;
-       }
-
-set_itr_now:
-       q_vector->rx_ring->total_bytes = 0;
-       q_vector->rx_ring->total_packets = 0;
-       q_vector->tx_ring->total_bytes = 0;
-       q_vector->tx_ring->total_packets = 0;
-
-       if (new_itr != q_vector->itr_val) {
-               /* this attempts to bias the interrupt rate towards Bulk
-                * by adding intermediate steps when interrupt rate is
-                * increasing */
-               new_itr = new_itr > q_vector->itr_val ?
-                            max((new_itr * q_vector->itr_val) /
-                                (new_itr + (q_vector->itr_val >> 2)),
-                                new_itr) :
-                            new_itr;
-               /* Don't write the value here; it resets the adapter's
-                * internal timer, and causes us to delay far longer than
-                * we should between interrupts.  Instead, we write the ITR
-                * value at the beginning of the next interrupt so the timing
-                * ends up being correct.
-                */
-               q_vector->itr_val = new_itr;
-               q_vector->set_itr = 1;
-       }
-}
-
-#define IGB_TX_FLAGS_CSUM              0x00000001
-#define IGB_TX_FLAGS_VLAN              0x00000002
-#define IGB_TX_FLAGS_TSO               0x00000004
-#define IGB_TX_FLAGS_IPV4              0x00000008
-#define IGB_TX_FLAGS_TSTAMP            0x00000010
-#define IGB_TX_FLAGS_VLAN_MASK         0xffff0000
-#define IGB_TX_FLAGS_VLAN_SHIFT                        16
-
-static inline int igb_tso_adv(struct igb_ring *tx_ring,
-                             struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
-{
-       struct e1000_adv_tx_context_desc *context_desc;
-       unsigned int i;
-       int err;
-       struct igb_buffer *buffer_info;
-       u32 info = 0, tu_cmd = 0;
-       u32 mss_l4len_idx;
-       u8 l4len;
-
-       if (skb_header_cloned(skb)) {
-               err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-               if (err)
-                       return err;
-       }
-
-       l4len = tcp_hdrlen(skb);
-       *hdr_len += l4len;
-
-       if (skb->protocol == htons(ETH_P_IP)) {
-               struct iphdr *iph = ip_hdr(skb);
-               iph->tot_len = 0;
-               iph->check = 0;
-               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                        iph->daddr, 0,
-                                                        IPPROTO_TCP,
-                                                        0);
-       } else if (skb_is_gso_v6(skb)) {
-               ipv6_hdr(skb)->payload_len = 0;
-               tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                      &ipv6_hdr(skb)->daddr,
-                                                      0, IPPROTO_TCP, 0);
-       }
-
-       i = tx_ring->next_to_use;
-
-       buffer_info = &tx_ring->buffer_info[i];
-       context_desc = E1000_TX_CTXTDESC_ADV(*tx_ring, i);
-       /* VLAN MACLEN IPLEN */
-       if (tx_flags & IGB_TX_FLAGS_VLAN)
-               info |= (tx_flags & IGB_TX_FLAGS_VLAN_MASK);
-       info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
-       *hdr_len += skb_network_offset(skb);
-       info |= skb_network_header_len(skb);
-       *hdr_len += skb_network_header_len(skb);
-       context_desc->vlan_macip_lens = cpu_to_le32(info);
-
-       /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
-       tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
-
-       if (skb->protocol == htons(ETH_P_IP))
-               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
-       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
-
-       context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
-
-       /* MSS L4LEN IDX */
-       mss_l4len_idx = (skb_shinfo(skb)->gso_size << E1000_ADVTXD_MSS_SHIFT);
-       mss_l4len_idx |= (l4len << E1000_ADVTXD_L4LEN_SHIFT);
-
-       /* For 82575, context index must be unique per ring. */
-       if (tx_ring->flags & IGB_RING_FLAG_TX_CTX_IDX)
-               mss_l4len_idx |= tx_ring->reg_idx << 4;
-
-       context_desc->mss_l4len_idx = cpu_to_le32(mss_l4len_idx);
-       context_desc->seqnum_seed = 0;
-
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-       buffer_info->dma = 0;
-       i++;
-       if (i == tx_ring->count)
-               i = 0;
-
-       tx_ring->next_to_use = i;
-
-       return true;
-}
-
-static inline bool igb_tx_csum_adv(struct igb_ring *tx_ring,
-                                  struct sk_buff *skb, u32 tx_flags)
-{
-       struct e1000_adv_tx_context_desc *context_desc;
-       struct device *dev = tx_ring->dev;
-       struct igb_buffer *buffer_info;
-       u32 info = 0, tu_cmd = 0;
-       unsigned int i;
-
-       if ((skb->ip_summed == CHECKSUM_PARTIAL) ||
-           (tx_flags & IGB_TX_FLAGS_VLAN)) {
-               i = tx_ring->next_to_use;
-               buffer_info = &tx_ring->buffer_info[i];
-               context_desc = E1000_TX_CTXTDESC_ADV(*tx_ring, i);
-
-               if (tx_flags & IGB_TX_FLAGS_VLAN)
-                       info |= (tx_flags & IGB_TX_FLAGS_VLAN_MASK);
-
-               info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
-               if (skb->ip_summed == CHECKSUM_PARTIAL)
-                       info |= skb_network_header_len(skb);
-
-               context_desc->vlan_macip_lens = cpu_to_le32(info);
-
-               tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
-
-               if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                       __be16 protocol;
-
-                       if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {
-                               const struct vlan_ethhdr *vhdr =
-                                         (const struct vlan_ethhdr*)skb->data;
-
-                               protocol = vhdr->h_vlan_encapsulated_proto;
-                       } else {
-                               protocol = skb->protocol;
-                       }
-
-                       switch (protocol) {
-                       case cpu_to_be16(ETH_P_IP):
-                               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
-                               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
-                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
-                               else if (ip_hdr(skb)->protocol == IPPROTO_SCTP)
-                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_SCTP;
-                               break;
-                       case cpu_to_be16(ETH_P_IPV6):
-                               /* XXX what about other V6 headers?? */
-                               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
-                               else if (ipv6_hdr(skb)->nexthdr == IPPROTO_SCTP)
-                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_SCTP;
-                               break;
-                       default:
-                               if (unlikely(net_ratelimit()))
-                                       dev_warn(dev,
-                                           "partial checksum but proto=%x!\n",
-                                           skb->protocol);
-                               break;
-                       }
-               }
-
-               context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
-               context_desc->seqnum_seed = 0;
-               if (tx_ring->flags & IGB_RING_FLAG_TX_CTX_IDX)
-                       context_desc->mss_l4len_idx =
-                               cpu_to_le32(tx_ring->reg_idx << 4);
-
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-               buffer_info->dma = 0;
-
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-               tx_ring->next_to_use = i;
-
-               return true;
-       }
-       return false;
-}
-
-#define IGB_MAX_TXD_PWR        16
-#define IGB_MAX_DATA_PER_TXD   (1<<IGB_MAX_TXD_PWR)
-
-static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
-                                unsigned int first)
-{
-       struct igb_buffer *buffer_info;
-       struct device *dev = tx_ring->dev;
-       unsigned int hlen = skb_headlen(skb);
-       unsigned int count = 0, i;
-       unsigned int f;
-       u16 gso_segs = skb_shinfo(skb)->gso_segs ?: 1;
-
-       i = tx_ring->next_to_use;
-
-       buffer_info = &tx_ring->buffer_info[i];
-       BUG_ON(hlen >= IGB_MAX_DATA_PER_TXD);
-       buffer_info->length = hlen;
-       /* set time_stamp *before* dma to help avoid a possible race */
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-       buffer_info->dma = dma_map_single(dev, skb->data, hlen,
-                                         DMA_TO_DEVICE);
-       if (dma_mapping_error(dev, buffer_info->dma))
-               goto dma_error;
-
-       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
-               struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[f];
-               unsigned int len = frag->size;
-
-               count++;
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-
-               buffer_info = &tx_ring->buffer_info[i];
-               BUG_ON(len >= IGB_MAX_DATA_PER_TXD);
-               buffer_info->length = len;
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-               buffer_info->mapped_as_page = true;
-               buffer_info->dma = dma_map_page(dev,
-                                               frag->page,
-                                               frag->page_offset,
-                                               len,
-                                               DMA_TO_DEVICE);
-               if (dma_mapping_error(dev, buffer_info->dma))
-                       goto dma_error;
-
-       }
-
-       tx_ring->buffer_info[i].skb = skb;
-       tx_ring->buffer_info[i].tx_flags = skb_shinfo(skb)->tx_flags;
-       /* multiply data chunks by size of headers */
-       tx_ring->buffer_info[i].bytecount = ((gso_segs - 1) * hlen) + skb->len;
-       tx_ring->buffer_info[i].gso_segs = gso_segs;
-       tx_ring->buffer_info[first].next_to_watch = i;
-
-       return ++count;
-
-dma_error:
-       dev_err(dev, "TX DMA map failed\n");
-
-       /* clear timestamp and dma mappings for failed buffer_info mapping */
-       buffer_info->dma = 0;
-       buffer_info->time_stamp = 0;
-       buffer_info->length = 0;
-       buffer_info->next_to_watch = 0;
-       buffer_info->mapped_as_page = false;
-
-       /* clear timestamp and dma mappings for remaining portion of packet */
-       while (count--) {
-               if (i == 0)
-                       i = tx_ring->count;
-               i--;
-               buffer_info = &tx_ring->buffer_info[i];
-               igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
-       }
-
-       return 0;
-}
-
-static inline void igb_tx_queue_adv(struct igb_ring *tx_ring,
-                                   u32 tx_flags, int count, u32 paylen,
-                                   u8 hdr_len)
-{
-       union e1000_adv_tx_desc *tx_desc;
-       struct igb_buffer *buffer_info;
-       u32 olinfo_status = 0, cmd_type_len;
-       unsigned int i = tx_ring->next_to_use;
-
-       cmd_type_len = (E1000_ADVTXD_DTYP_DATA | E1000_ADVTXD_DCMD_IFCS |
-                       E1000_ADVTXD_DCMD_DEXT);
-
-       if (tx_flags & IGB_TX_FLAGS_VLAN)
-               cmd_type_len |= E1000_ADVTXD_DCMD_VLE;
-
-       if (tx_flags & IGB_TX_FLAGS_TSTAMP)
-               cmd_type_len |= E1000_ADVTXD_MAC_TSTAMP;
-
-       if (tx_flags & IGB_TX_FLAGS_TSO) {
-               cmd_type_len |= E1000_ADVTXD_DCMD_TSE;
-
-               /* insert tcp checksum */
-               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
-
-               /* insert ip checksum */
-               if (tx_flags & IGB_TX_FLAGS_IPV4)
-                       olinfo_status |= E1000_TXD_POPTS_IXSM << 8;
-
-       } else if (tx_flags & IGB_TX_FLAGS_CSUM) {
-               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
-       }
-
-       if ((tx_ring->flags & IGB_RING_FLAG_TX_CTX_IDX) &&
-           (tx_flags & (IGB_TX_FLAGS_CSUM |
-                        IGB_TX_FLAGS_TSO |
-                        IGB_TX_FLAGS_VLAN)))
-               olinfo_status |= tx_ring->reg_idx << 4;
-
-       olinfo_status |= ((paylen - hdr_len) << E1000_ADVTXD_PAYLEN_SHIFT);
-
-       do {
-               buffer_info = &tx_ring->buffer_info[i];
-               tx_desc = E1000_TX_DESC_ADV(*tx_ring, i);
-               tx_desc->read.buffer_addr = cpu_to_le64(buffer_info->dma);
-               tx_desc->read.cmd_type_len =
-                       cpu_to_le32(cmd_type_len | buffer_info->length);
-               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
-               count--;
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-       } while (count > 0);
-
-       tx_desc->read.cmd_type_len |= cpu_to_le32(IGB_ADVTXD_DCMD);
-       /* Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64). */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       writel(i, tx_ring->tail);
-       /* we need this if more than one processor can write to our tail
-        * at a time, it syncronizes IO on IA64/Altix systems */
-       mmiowb();
-}
-
-static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
-{
-       struct net_device *netdev = tx_ring->netdev;
-
-       netif_stop_subqueue(netdev, tx_ring->queue_index);
-
-       /* Herbert's original patch had:
-        *  smp_mb__after_netif_stop_queue();
-        * but since that doesn't exist yet, just open code it. */
-       smp_mb();
-
-       /* We need to check again in a case another CPU has just
-        * made room available. */
-       if (igb_desc_unused(tx_ring) < size)
-               return -EBUSY;
-
-       /* A reprieve! */
-       netif_wake_subqueue(netdev, tx_ring->queue_index);
-
-       u64_stats_update_begin(&tx_ring->tx_syncp2);
-       tx_ring->tx_stats.restart_queue2++;
-       u64_stats_update_end(&tx_ring->tx_syncp2);
-
-       return 0;
-}
-
-static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
-{
-       if (igb_desc_unused(tx_ring) >= size)
-               return 0;
-       return __igb_maybe_stop_tx(tx_ring, size);
-}
-
-netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
-                                   struct igb_ring *tx_ring)
-{
-       int tso = 0, count;
-       u32 tx_flags = 0;
-       u16 first;
-       u8 hdr_len = 0;
-
-       /* need: 1 descriptor per page,
-        *       + 2 desc gap to keep tail from touching head,
-        *       + 1 desc for skb->data,
-        *       + 1 desc for context descriptor,
-        * otherwise try next time */
-       if (igb_maybe_stop_tx(tx_ring, skb_shinfo(skb)->nr_frags + 4)) {
-               /* this is a hard error */
-               return NETDEV_TX_BUSY;
-       }
-
-       if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
-               skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
-               tx_flags |= IGB_TX_FLAGS_TSTAMP;
-       }
-
-       if (vlan_tx_tag_present(skb)) {
-               tx_flags |= IGB_TX_FLAGS_VLAN;
-               tx_flags |= (vlan_tx_tag_get(skb) << IGB_TX_FLAGS_VLAN_SHIFT);
-       }
-
-       if (skb->protocol == htons(ETH_P_IP))
-               tx_flags |= IGB_TX_FLAGS_IPV4;
-
-       first = tx_ring->next_to_use;
-       if (skb_is_gso(skb)) {
-               tso = igb_tso_adv(tx_ring, skb, tx_flags, &hdr_len);
-
-               if (tso < 0) {
-                       dev_kfree_skb_any(skb);
-                       return NETDEV_TX_OK;
-               }
-       }
-
-       if (tso)
-               tx_flags |= IGB_TX_FLAGS_TSO;
-       else if (igb_tx_csum_adv(tx_ring, skb, tx_flags) &&
-                (skb->ip_summed == CHECKSUM_PARTIAL))
-               tx_flags |= IGB_TX_FLAGS_CSUM;
-
-       /*
-        * count reflects descriptors mapped, if 0 or less then mapping error
-        * has occurred and we need to rewind the descriptor queue
-        */
-       count = igb_tx_map_adv(tx_ring, skb, first);
-       if (!count) {
-               dev_kfree_skb_any(skb);
-               tx_ring->buffer_info[first].time_stamp = 0;
-               tx_ring->next_to_use = first;
-               return NETDEV_TX_OK;
-       }
-
-       igb_tx_queue_adv(tx_ring, tx_flags, count, skb->len, hdr_len);
-
-       /* Make sure there is space in the ring for the next send. */
-       igb_maybe_stop_tx(tx_ring, MAX_SKB_FRAGS + 4);
-
-       return NETDEV_TX_OK;
-}
-
-static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb,
-                                     struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct igb_ring *tx_ring;
-       int r_idx = 0;
-
-       if (test_bit(__IGB_DOWN, &adapter->state)) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (skb->len <= 0) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       r_idx = skb->queue_mapping & (IGB_ABS_MAX_TX_QUEUES - 1);
-       tx_ring = adapter->multi_tx_table[r_idx];
-
-       /* This goes back to the question of how to logically map a tx queue
-        * to a flow.  Right now, performance is impacted slightly negatively
-        * if using multiple tx queues.  If the stack breaks away from a
-        * single qdisc implementation, we can look at this again. */
-       return igb_xmit_frame_ring_adv(skb, tx_ring);
-}
-
-/**
- * igb_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-static void igb_tx_timeout(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Do the reset outside of interrupt context */
-       adapter->tx_timeout_count++;
-
-       if (hw->mac.type == e1000_82580)
-               hw->dev_spec._82575.global_device_reset = true;
-
-       schedule_work(&adapter->reset_task);
-       wr32(E1000_EICS,
-            (adapter->eims_enable_mask & ~adapter->eims_other));
-}
-
-static void igb_reset_task(struct work_struct *work)
-{
-       struct igb_adapter *adapter;
-       adapter = container_of(work, struct igb_adapter, reset_task);
-
-       igb_dump(adapter);
-       netdev_err(adapter->netdev, "Reset adapter\n");
-       igb_reinit_locked(adapter);
-}
-
-/**
- * igb_get_stats64 - Get System Network Statistics
- * @netdev: network interface device structure
- * @stats: rtnl_link_stats64 pointer
- *
- **/
-static struct rtnl_link_stats64 *igb_get_stats64(struct net_device *netdev,
-                                                struct rtnl_link_stats64 *stats)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       spin_lock(&adapter->stats64_lock);
-       igb_update_stats(adapter, &adapter->stats64);
-       memcpy(stats, &adapter->stats64, sizeof(*stats));
-       spin_unlock(&adapter->stats64_lock);
-
-       return stats;
-}
-
-/**
- * igb_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-static int igb_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct pci_dev *pdev = adapter->pdev;
-       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
-       u32 rx_buffer_len, i;
-
-       if ((new_mtu < 68) || (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-               dev_err(&pdev->dev, "Invalid MTU setting\n");
-               return -EINVAL;
-       }
-
-       if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
-               dev_err(&pdev->dev, "MTU > 9216 not supported.\n");
-               return -EINVAL;
-       }
-
-       while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
-               msleep(1);
-
-       /* igb_down has a dependency on max_frame_size */
-       adapter->max_frame_size = max_frame;
-
-       /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
-        * means we reserve 2 more, this pushes us to allocate from the next
-        * larger slab size.
-        * i.e. RXBUFFER_2048 --> size-4096 slab
-        */
-
-       if (adapter->hw.mac.type == e1000_82580)
-               max_frame += IGB_TS_HDR_LEN;
-
-       if (max_frame <= IGB_RXBUFFER_1024)
-               rx_buffer_len = IGB_RXBUFFER_1024;
-       else if (max_frame <= MAXIMUM_ETHERNET_VLAN_SIZE)
-               rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-       else
-               rx_buffer_len = IGB_RXBUFFER_128;
-
-       if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN + IGB_TS_HDR_LEN) ||
-            (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE + IGB_TS_HDR_LEN))
-               rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE + IGB_TS_HDR_LEN;
-
-       if ((adapter->hw.mac.type == e1000_82580) &&
-           (rx_buffer_len == IGB_RXBUFFER_128))
-               rx_buffer_len += IGB_RXBUFFER_64;
-
-       if (netif_running(netdev))
-               igb_down(adapter);
-
-       dev_info(&pdev->dev, "changing MTU from %d to %d\n",
-                netdev->mtu, new_mtu);
-       netdev->mtu = new_mtu;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               adapter->rx_ring[i]->rx_buffer_len = rx_buffer_len;
-
-       if (netif_running(netdev))
-               igb_up(adapter);
-       else
-               igb_reset(adapter);
-
-       clear_bit(__IGB_RESETTING, &adapter->state);
-
-       return 0;
-}
-
-/**
- * igb_update_stats - Update the board statistics counters
- * @adapter: board private structure
- **/
-
-void igb_update_stats(struct igb_adapter *adapter,
-                     struct rtnl_link_stats64 *net_stats)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       u32 reg, mpc;
-       u16 phy_tmp;
-       int i;
-       u64 bytes, packets;
-       unsigned int start;
-       u64 _bytes, _packets;
-
-#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
-
-       /*
-        * Prevent stats update while adapter is being reset, or if the pci
-        * connection is down.
-        */
-       if (adapter->link_speed == 0)
-               return;
-       if (pci_channel_offline(pdev))
-               return;
-
-       bytes = 0;
-       packets = 0;
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               u32 rqdpc_tmp = rd32(E1000_RQDPC(i)) & 0x0FFF;
-               struct igb_ring *ring = adapter->rx_ring[i];
-
-               ring->rx_stats.drops += rqdpc_tmp;
-               net_stats->rx_fifo_errors += rqdpc_tmp;
-
-               do {
-                       start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
-                       _bytes = ring->rx_stats.bytes;
-                       _packets = ring->rx_stats.packets;
-               } while (u64_stats_fetch_retry_bh(&ring->rx_syncp, start));
-               bytes += _bytes;
-               packets += _packets;
-       }
-
-       net_stats->rx_bytes = bytes;
-       net_stats->rx_packets = packets;
-
-       bytes = 0;
-       packets = 0;
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               struct igb_ring *ring = adapter->tx_ring[i];
-               do {
-                       start = u64_stats_fetch_begin_bh(&ring->tx_syncp);
-                       _bytes = ring->tx_stats.bytes;
-                       _packets = ring->tx_stats.packets;
-               } while (u64_stats_fetch_retry_bh(&ring->tx_syncp, start));
-               bytes += _bytes;
-               packets += _packets;
-       }
-       net_stats->tx_bytes = bytes;
-       net_stats->tx_packets = packets;
-
-       /* read stats registers */
-       adapter->stats.crcerrs += rd32(E1000_CRCERRS);
-       adapter->stats.gprc += rd32(E1000_GPRC);
-       adapter->stats.gorc += rd32(E1000_GORCL);
-       rd32(E1000_GORCH); /* clear GORCL */
-       adapter->stats.bprc += rd32(E1000_BPRC);
-       adapter->stats.mprc += rd32(E1000_MPRC);
-       adapter->stats.roc += rd32(E1000_ROC);
-
-       adapter->stats.prc64 += rd32(E1000_PRC64);
-       adapter->stats.prc127 += rd32(E1000_PRC127);
-       adapter->stats.prc255 += rd32(E1000_PRC255);
-       adapter->stats.prc511 += rd32(E1000_PRC511);
-       adapter->stats.prc1023 += rd32(E1000_PRC1023);
-       adapter->stats.prc1522 += rd32(E1000_PRC1522);
-       adapter->stats.symerrs += rd32(E1000_SYMERRS);
-       adapter->stats.sec += rd32(E1000_SEC);
-
-       mpc = rd32(E1000_MPC);
-       adapter->stats.mpc += mpc;
-       net_stats->rx_fifo_errors += mpc;
-       adapter->stats.scc += rd32(E1000_SCC);
-       adapter->stats.ecol += rd32(E1000_ECOL);
-       adapter->stats.mcc += rd32(E1000_MCC);
-       adapter->stats.latecol += rd32(E1000_LATECOL);
-       adapter->stats.dc += rd32(E1000_DC);
-       adapter->stats.rlec += rd32(E1000_RLEC);
-       adapter->stats.xonrxc += rd32(E1000_XONRXC);
-       adapter->stats.xontxc += rd32(E1000_XONTXC);
-       adapter->stats.xoffrxc += rd32(E1000_XOFFRXC);
-       adapter->stats.xofftxc += rd32(E1000_XOFFTXC);
-       adapter->stats.fcruc += rd32(E1000_FCRUC);
-       adapter->stats.gptc += rd32(E1000_GPTC);
-       adapter->stats.gotc += rd32(E1000_GOTCL);
-       rd32(E1000_GOTCH); /* clear GOTCL */
-       adapter->stats.rnbc += rd32(E1000_RNBC);
-       adapter->stats.ruc += rd32(E1000_RUC);
-       adapter->stats.rfc += rd32(E1000_RFC);
-       adapter->stats.rjc += rd32(E1000_RJC);
-       adapter->stats.tor += rd32(E1000_TORH);
-       adapter->stats.tot += rd32(E1000_TOTH);
-       adapter->stats.tpr += rd32(E1000_TPR);
-
-       adapter->stats.ptc64 += rd32(E1000_PTC64);
-       adapter->stats.ptc127 += rd32(E1000_PTC127);
-       adapter->stats.ptc255 += rd32(E1000_PTC255);
-       adapter->stats.ptc511 += rd32(E1000_PTC511);
-       adapter->stats.ptc1023 += rd32(E1000_PTC1023);
-       adapter->stats.ptc1522 += rd32(E1000_PTC1522);
-
-       adapter->stats.mptc += rd32(E1000_MPTC);
-       adapter->stats.bptc += rd32(E1000_BPTC);
-
-       adapter->stats.tpt += rd32(E1000_TPT);
-       adapter->stats.colc += rd32(E1000_COLC);
-
-       adapter->stats.algnerrc += rd32(E1000_ALGNERRC);
-       /* read internal phy specific stats */
-       reg = rd32(E1000_CTRL_EXT);
-       if (!(reg & E1000_CTRL_EXT_LINK_MODE_MASK)) {
-               adapter->stats.rxerrc += rd32(E1000_RXERRC);
-               adapter->stats.tncrs += rd32(E1000_TNCRS);
-       }
-
-       adapter->stats.tsctc += rd32(E1000_TSCTC);
-       adapter->stats.tsctfc += rd32(E1000_TSCTFC);
-
-       adapter->stats.iac += rd32(E1000_IAC);
-       adapter->stats.icrxoc += rd32(E1000_ICRXOC);
-       adapter->stats.icrxptc += rd32(E1000_ICRXPTC);
-       adapter->stats.icrxatc += rd32(E1000_ICRXATC);
-       adapter->stats.ictxptc += rd32(E1000_ICTXPTC);
-       adapter->stats.ictxatc += rd32(E1000_ICTXATC);
-       adapter->stats.ictxqec += rd32(E1000_ICTXQEC);
-       adapter->stats.ictxqmtc += rd32(E1000_ICTXQMTC);
-       adapter->stats.icrxdmtc += rd32(E1000_ICRXDMTC);
-
-       /* Fill out the OS statistics structure */
-       net_stats->multicast = adapter->stats.mprc;
-       net_stats->collisions = adapter->stats.colc;
-
-       /* Rx Errors */
-
-       /* RLEC on some newer hardware can be incorrect so build
-        * our own version based on RUC and ROC */
-       net_stats->rx_errors = adapter->stats.rxerrc +
-               adapter->stats.crcerrs + adapter->stats.algnerrc +
-               adapter->stats.ruc + adapter->stats.roc +
-               adapter->stats.cexterr;
-       net_stats->rx_length_errors = adapter->stats.ruc +
-                                     adapter->stats.roc;
-       net_stats->rx_crc_errors = adapter->stats.crcerrs;
-       net_stats->rx_frame_errors = adapter->stats.algnerrc;
-       net_stats->rx_missed_errors = adapter->stats.mpc;
-
-       /* Tx Errors */
-       net_stats->tx_errors = adapter->stats.ecol +
-                              adapter->stats.latecol;
-       net_stats->tx_aborted_errors = adapter->stats.ecol;
-       net_stats->tx_window_errors = adapter->stats.latecol;
-       net_stats->tx_carrier_errors = adapter->stats.tncrs;
-
-       /* Tx Dropped needs to be maintained elsewhere */
-
-       /* Phy Stats */
-       if (hw->phy.media_type == e1000_media_type_copper) {
-               if ((adapter->link_speed == SPEED_1000) &&
-                  (!igb_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
-                       phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
-                       adapter->phy_stats.idle_errors += phy_tmp;
-               }
-       }
-
-       /* Management Stats */
-       adapter->stats.mgptc += rd32(E1000_MGTPTC);
-       adapter->stats.mgprc += rd32(E1000_MGTPRC);
-       adapter->stats.mgpdc += rd32(E1000_MGTPDC);
-
-       /* OS2BMC Stats */
-       reg = rd32(E1000_MANC);
-       if (reg & E1000_MANC_EN_BMC2OS) {
-               adapter->stats.o2bgptc += rd32(E1000_O2BGPTC);
-               adapter->stats.o2bspc += rd32(E1000_O2BSPC);
-               adapter->stats.b2ospc += rd32(E1000_B2OSPC);
-               adapter->stats.b2ogprc += rd32(E1000_B2OGPRC);
-       }
-}
-
-static irqreturn_t igb_msix_other(int irq, void *data)
-{
-       struct igb_adapter *adapter = data;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 icr = rd32(E1000_ICR);
-       /* reading ICR causes bit 31 of EICR to be cleared */
-
-       if (icr & E1000_ICR_DRSTA)
-               schedule_work(&adapter->reset_task);
-
-       if (icr & E1000_ICR_DOUTSYNC) {
-               /* HW is reporting DMA is out of sync */
-               adapter->stats.doosync++;
-               /* The DMA Out of Sync is also indication of a spoof event
-                * in IOV mode. Check the Wrong VM Behavior register to
-                * see if it is really a spoof event. */
-               igb_check_wvbr(adapter);
-       }
-
-       /* Check for a mailbox event */
-       if (icr & E1000_ICR_VMMB)
-               igb_msg_task(adapter);
-
-       if (icr & E1000_ICR_LSC) {
-               hw->mac.get_link_status = 1;
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__IGB_DOWN, &adapter->state))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       if (adapter->vfs_allocated_count)
-               wr32(E1000_IMS, E1000_IMS_LSC |
-                               E1000_IMS_VMMB |
-                               E1000_IMS_DOUTSYNC);
-       else
-               wr32(E1000_IMS, E1000_IMS_LSC | E1000_IMS_DOUTSYNC);
-       wr32(E1000_EIMS, adapter->eims_other);
-
-       return IRQ_HANDLED;
-}
-
-static void igb_write_itr(struct igb_q_vector *q_vector)
-{
-       struct igb_adapter *adapter = q_vector->adapter;
-       u32 itr_val = q_vector->itr_val & 0x7FFC;
-
-       if (!q_vector->set_itr)
-               return;
-
-       if (!itr_val)
-               itr_val = 0x4;
-
-       if (adapter->hw.mac.type == e1000_82575)
-               itr_val |= itr_val << 16;
-       else
-               itr_val |= 0x8000000;
-
-       writel(itr_val, q_vector->itr_register);
-       q_vector->set_itr = 0;
-}
-
-static irqreturn_t igb_msix_ring(int irq, void *data)
-{
-       struct igb_q_vector *q_vector = data;
-
-       /* Write the ITR value calculated from the previous interrupt. */
-       igb_write_itr(q_vector);
-
-       napi_schedule(&q_vector->napi);
-
-       return IRQ_HANDLED;
-}
-
-#ifdef CONFIG_IGB_DCA
-static void igb_update_dca(struct igb_q_vector *q_vector)
-{
-       struct igb_adapter *adapter = q_vector->adapter;
-       struct e1000_hw *hw = &adapter->hw;
-       int cpu = get_cpu();
-
-       if (q_vector->cpu == cpu)
-               goto out_no_update;
-
-       if (q_vector->tx_ring) {
-               int q = q_vector->tx_ring->reg_idx;
-               u32 dca_txctrl = rd32(E1000_DCA_TXCTRL(q));
-               if (hw->mac.type == e1000_82575) {
-                       dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK;
-                       dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
-               } else {
-                       dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK_82576;
-                       dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) <<
-                                     E1000_DCA_TXCTRL_CPUID_SHIFT;
-               }
-               dca_txctrl |= E1000_DCA_TXCTRL_DESC_DCA_EN;
-               wr32(E1000_DCA_TXCTRL(q), dca_txctrl);
-       }
-       if (q_vector->rx_ring) {
-               int q = q_vector->rx_ring->reg_idx;
-               u32 dca_rxctrl = rd32(E1000_DCA_RXCTRL(q));
-               if (hw->mac.type == e1000_82575) {
-                       dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK;
-                       dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
-               } else {
-                       dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK_82576;
-                       dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) <<
-                                     E1000_DCA_RXCTRL_CPUID_SHIFT;
-               }
-               dca_rxctrl |= E1000_DCA_RXCTRL_DESC_DCA_EN;
-               dca_rxctrl |= E1000_DCA_RXCTRL_HEAD_DCA_EN;
-               dca_rxctrl |= E1000_DCA_RXCTRL_DATA_DCA_EN;
-               wr32(E1000_DCA_RXCTRL(q), dca_rxctrl);
-       }
-       q_vector->cpu = cpu;
-out_no_update:
-       put_cpu();
-}
-
-static void igb_setup_dca(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int i;
-
-       if (!(adapter->flags & IGB_FLAG_DCA_ENABLED))
-               return;
-
-       /* Always use CB2 mode, difference is masked in the CB driver. */
-       wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_CB2);
-
-       for (i = 0; i < adapter->num_q_vectors; i++) {
-               adapter->q_vector[i]->cpu = -1;
-               igb_update_dca(adapter->q_vector[i]);
-       }
-}
-
-static int __igb_notify_dca(struct device *dev, void *data)
-{
-       struct net_device *netdev = dev_get_drvdata(dev);
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_hw *hw = &adapter->hw;
-       unsigned long event = *(unsigned long *)data;
-
-       switch (event) {
-       case DCA_PROVIDER_ADD:
-               /* if already enabled, don't do it again */
-               if (adapter->flags & IGB_FLAG_DCA_ENABLED)
-                       break;
-               if (dca_add_requester(dev) == 0) {
-                       adapter->flags |= IGB_FLAG_DCA_ENABLED;
-                       dev_info(&pdev->dev, "DCA enabled\n");
-                       igb_setup_dca(adapter);
-                       break;
-               }
-               /* Fall Through since DCA is disabled. */
-       case DCA_PROVIDER_REMOVE:
-               if (adapter->flags & IGB_FLAG_DCA_ENABLED) {
-                       /* without this a class_device is left
-                        * hanging around in the sysfs model */
-                       dca_remove_requester(dev);
-                       dev_info(&pdev->dev, "DCA disabled\n");
-                       adapter->flags &= ~IGB_FLAG_DCA_ENABLED;
-                       wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_DISABLE);
-               }
-               break;
-       }
-
-       return 0;
-}
-
-static int igb_notify_dca(struct notifier_block *nb, unsigned long event,
-                          void *p)
-{
-       int ret_val;
-
-       ret_val = driver_for_each_device(&igb_driver.driver, NULL, &event,
-                                        __igb_notify_dca);
-
-       return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
-}
-#endif /* CONFIG_IGB_DCA */
-
-static void igb_ping_all_vfs(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ping;
-       int i;
-
-       for (i = 0 ; i < adapter->vfs_allocated_count; i++) {
-               ping = E1000_PF_CONTROL_MSG;
-               if (adapter->vf_data[i].flags & IGB_VF_FLAG_CTS)
-                       ping |= E1000_VT_MSGTYPE_CTS;
-               igb_write_mbx(hw, &ping, 1, i);
-       }
-}
-
-static int igb_set_vf_promisc(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vmolr = rd32(E1000_VMOLR(vf));
-       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
-
-       vf_data->flags &= ~(IGB_VF_FLAG_UNI_PROMISC |
-                           IGB_VF_FLAG_MULTI_PROMISC);
-       vmolr &= ~(E1000_VMOLR_ROPE | E1000_VMOLR_ROMPE | E1000_VMOLR_MPME);
-
-       if (*msgbuf & E1000_VF_SET_PROMISC_MULTICAST) {
-               vmolr |= E1000_VMOLR_MPME;
-               vf_data->flags |= IGB_VF_FLAG_MULTI_PROMISC;
-               *msgbuf &= ~E1000_VF_SET_PROMISC_MULTICAST;
-       } else {
-               /*
-                * if we have hashes and we are clearing a multicast promisc
-                * flag we need to write the hashes to the MTA as this step
-                * was previously skipped
-                */
-               if (vf_data->num_vf_mc_hashes > 30) {
-                       vmolr |= E1000_VMOLR_MPME;
-               } else if (vf_data->num_vf_mc_hashes) {
-                       int j;
-                       vmolr |= E1000_VMOLR_ROMPE;
-                       for (j = 0; j < vf_data->num_vf_mc_hashes; j++)
-                               igb_mta_set(hw, vf_data->vf_mc_hashes[j]);
-               }
-       }
-
-       wr32(E1000_VMOLR(vf), vmolr);
-
-       /* there are flags left unprocessed, likely not supported */
-       if (*msgbuf & E1000_VT_MSGINFO_MASK)
-               return -EINVAL;
-
-       return 0;
-
-}
-
-static int igb_set_vf_multicasts(struct igb_adapter *adapter,
-                                 u32 *msgbuf, u32 vf)
-{
-       int n = (msgbuf[0] & E1000_VT_MSGINFO_MASK) >> E1000_VT_MSGINFO_SHIFT;
-       u16 *hash_list = (u16 *)&msgbuf[1];
-       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
-       int i;
-
-       /* salt away the number of multicast addresses assigned
-        * to this VF for later use to restore when the PF multi cast
-        * list changes
-        */
-       vf_data->num_vf_mc_hashes = n;
-
-       /* only up to 30 hash values supported */
-       if (n > 30)
-               n = 30;
-
-       /* store the hashes for later use */
-       for (i = 0; i < n; i++)
-               vf_data->vf_mc_hashes[i] = hash_list[i];
-
-       /* Flush and reset the mta with the new values */
-       igb_set_rx_mode(adapter->netdev);
-
-       return 0;
-}
-
-static void igb_restore_vf_multicasts(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct vf_data_storage *vf_data;
-       int i, j;
-
-       for (i = 0; i < adapter->vfs_allocated_count; i++) {
-               u32 vmolr = rd32(E1000_VMOLR(i));
-               vmolr &= ~(E1000_VMOLR_ROMPE | E1000_VMOLR_MPME);
-
-               vf_data = &adapter->vf_data[i];
-
-               if ((vf_data->num_vf_mc_hashes > 30) ||
-                   (vf_data->flags & IGB_VF_FLAG_MULTI_PROMISC)) {
-                       vmolr |= E1000_VMOLR_MPME;
-               } else if (vf_data->num_vf_mc_hashes) {
-                       vmolr |= E1000_VMOLR_ROMPE;
-                       for (j = 0; j < vf_data->num_vf_mc_hashes; j++)
-                               igb_mta_set(hw, vf_data->vf_mc_hashes[j]);
-               }
-               wr32(E1000_VMOLR(i), vmolr);
-       }
-}
-
-static void igb_clear_vf_vfta(struct igb_adapter *adapter, u32 vf)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 pool_mask, reg, vid;
-       int i;
-
-       pool_mask = 1 << (E1000_VLVF_POOLSEL_SHIFT + vf);
-
-       /* Find the vlan filter for this id */
-       for (i = 0; i < E1000_VLVF_ARRAY_SIZE; i++) {
-               reg = rd32(E1000_VLVF(i));
-
-               /* remove the vf from the pool */
-               reg &= ~pool_mask;
-
-               /* if pool is empty then remove entry from vfta */
-               if (!(reg & E1000_VLVF_POOLSEL_MASK) &&
-                   (reg & E1000_VLVF_VLANID_ENABLE)) {
-                       reg = 0;
-                       vid = reg & E1000_VLVF_VLANID_MASK;
-                       igb_vfta_set(hw, vid, false);
-               }
-
-               wr32(E1000_VLVF(i), reg);
-       }
-
-       adapter->vf_data[vf].vlans_enabled = 0;
-}
-
-static s32 igb_vlvf_set(struct igb_adapter *adapter, u32 vid, bool add, u32 vf)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 reg, i;
-
-       /* The vlvf table only exists on 82576 hardware and newer */
-       if (hw->mac.type < e1000_82576)
-               return -1;
-
-       /* we only need to do this if VMDq is enabled */
-       if (!adapter->vfs_allocated_count)
-               return -1;
-
-       /* Find the vlan filter for this id */
-       for (i = 0; i < E1000_VLVF_ARRAY_SIZE; i++) {
-               reg = rd32(E1000_VLVF(i));
-               if ((reg & E1000_VLVF_VLANID_ENABLE) &&
-                   vid == (reg & E1000_VLVF_VLANID_MASK))
-                       break;
-       }
-
-       if (add) {
-               if (i == E1000_VLVF_ARRAY_SIZE) {
-                       /* Did not find a matching VLAN ID entry that was
-                        * enabled.  Search for a free filter entry, i.e.
-                        * one without the enable bit set
-                        */
-                       for (i = 0; i < E1000_VLVF_ARRAY_SIZE; i++) {
-                               reg = rd32(E1000_VLVF(i));
-                               if (!(reg & E1000_VLVF_VLANID_ENABLE))
-                                       break;
-                       }
-               }
-               if (i < E1000_VLVF_ARRAY_SIZE) {
-                       /* Found an enabled/available entry */
-                       reg |= 1 << (E1000_VLVF_POOLSEL_SHIFT + vf);
-
-                       /* if !enabled we need to set this up in vfta */
-                       if (!(reg & E1000_VLVF_VLANID_ENABLE)) {
-                               /* add VID to filter table */
-                               igb_vfta_set(hw, vid, true);
-                               reg |= E1000_VLVF_VLANID_ENABLE;
-                       }
-                       reg &= ~E1000_VLVF_VLANID_MASK;
-                       reg |= vid;
-                       wr32(E1000_VLVF(i), reg);
-
-                       /* do not modify RLPML for PF devices */
-                       if (vf >= adapter->vfs_allocated_count)
-                               return 0;
-
-                       if (!adapter->vf_data[vf].vlans_enabled) {
-                               u32 size;
-                               reg = rd32(E1000_VMOLR(vf));
-                               size = reg & E1000_VMOLR_RLPML_MASK;
-                               size += 4;
-                               reg &= ~E1000_VMOLR_RLPML_MASK;
-                               reg |= size;
-                               wr32(E1000_VMOLR(vf), reg);
-                       }
-
-                       adapter->vf_data[vf].vlans_enabled++;
-                       return 0;
-               }
-       } else {
-               if (i < E1000_VLVF_ARRAY_SIZE) {
-                       /* remove vf from the pool */
-                       reg &= ~(1 << (E1000_VLVF_POOLSEL_SHIFT + vf));
-                       /* if pool is empty then remove entry from vfta */
-                       if (!(reg & E1000_VLVF_POOLSEL_MASK)) {
-                               reg = 0;
-                               igb_vfta_set(hw, vid, false);
-                       }
-                       wr32(E1000_VLVF(i), reg);
-
-                       /* do not modify RLPML for PF devices */
-                       if (vf >= adapter->vfs_allocated_count)
-                               return 0;
-
-                       adapter->vf_data[vf].vlans_enabled--;
-                       if (!adapter->vf_data[vf].vlans_enabled) {
-                               u32 size;
-                               reg = rd32(E1000_VMOLR(vf));
-                               size = reg & E1000_VMOLR_RLPML_MASK;
-                               size -= 4;
-                               reg &= ~E1000_VMOLR_RLPML_MASK;
-                               reg |= size;
-                               wr32(E1000_VMOLR(vf), reg);
-                       }
-               }
-       }
-       return 0;
-}
-
-static void igb_set_vmvir(struct igb_adapter *adapter, u32 vid, u32 vf)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (vid)
-               wr32(E1000_VMVIR(vf), (vid | E1000_VMVIR_VLANA_DEFAULT));
-       else
-               wr32(E1000_VMVIR(vf), 0);
-}
-
-static int igb_ndo_set_vf_vlan(struct net_device *netdev,
-                              int vf, u16 vlan, u8 qos)
-{
-       int err = 0;
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       if ((vf >= adapter->vfs_allocated_count) || (vlan > 4095) || (qos > 7))
-               return -EINVAL;
-       if (vlan || qos) {
-               err = igb_vlvf_set(adapter, vlan, !!vlan, vf);
-               if (err)
-                       goto out;
-               igb_set_vmvir(adapter, vlan | (qos << VLAN_PRIO_SHIFT), vf);
-               igb_set_vmolr(adapter, vf, !vlan);
-               adapter->vf_data[vf].pf_vlan = vlan;
-               adapter->vf_data[vf].pf_qos = qos;
-               dev_info(&adapter->pdev->dev,
-                        "Setting VLAN %d, QOS 0x%x on VF %d\n", vlan, qos, vf);
-               if (test_bit(__IGB_DOWN, &adapter->state)) {
-                       dev_warn(&adapter->pdev->dev,
-                                "The VF VLAN has been set,"
-                                " but the PF device is not up.\n");
-                       dev_warn(&adapter->pdev->dev,
-                                "Bring the PF device up before"
-                                " attempting to use the VF device.\n");
-               }
-       } else {
-               igb_vlvf_set(adapter, adapter->vf_data[vf].pf_vlan,
-                                  false, vf);
-               igb_set_vmvir(adapter, vlan, vf);
-               igb_set_vmolr(adapter, vf, true);
-               adapter->vf_data[vf].pf_vlan = 0;
-               adapter->vf_data[vf].pf_qos = 0;
-       }
-out:
-       return err;
-}
-
-static int igb_set_vf_vlan(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
-{
-       int add = (msgbuf[0] & E1000_VT_MSGINFO_MASK) >> E1000_VT_MSGINFO_SHIFT;
-       int vid = (msgbuf[1] & E1000_VLVF_VLANID_MASK);
-
-       return igb_vlvf_set(adapter, vid, add, vf);
-}
-
-static inline void igb_vf_reset(struct igb_adapter *adapter, u32 vf)
-{
-       /* clear flags - except flag that indicates PF has set the MAC */
-       adapter->vf_data[vf].flags &= IGB_VF_FLAG_PF_SET_MAC;
-       adapter->vf_data[vf].last_nack = jiffies;
-
-       /* reset offloads to defaults */
-       igb_set_vmolr(adapter, vf, true);
-
-       /* reset vlans for device */
-       igb_clear_vf_vfta(adapter, vf);
-       if (adapter->vf_data[vf].pf_vlan)
-               igb_ndo_set_vf_vlan(adapter->netdev, vf,
-                                   adapter->vf_data[vf].pf_vlan,
-                                   adapter->vf_data[vf].pf_qos);
-       else
-               igb_clear_vf_vfta(adapter, vf);
-
-       /* reset multicast table array for vf */
-       adapter->vf_data[vf].num_vf_mc_hashes = 0;
-
-       /* Flush and reset the mta with the new values */
-       igb_set_rx_mode(adapter->netdev);
-}
-
-static void igb_vf_reset_event(struct igb_adapter *adapter, u32 vf)
-{
-       unsigned char *vf_mac = adapter->vf_data[vf].vf_mac_addresses;
-
-       /* generate a new mac address as we were hotplug removed/added */
-       if (!(adapter->vf_data[vf].flags & IGB_VF_FLAG_PF_SET_MAC))
-               random_ether_addr(vf_mac);
-
-       /* process remaining reset events */
-       igb_vf_reset(adapter, vf);
-}
-
-static void igb_vf_reset_msg(struct igb_adapter *adapter, u32 vf)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       unsigned char *vf_mac = adapter->vf_data[vf].vf_mac_addresses;
-       int rar_entry = hw->mac.rar_entry_count - (vf + 1);
-       u32 reg, msgbuf[3];
-       u8 *addr = (u8 *)(&msgbuf[1]);
-
-       /* process all the same items cleared in a function level reset */
-       igb_vf_reset(adapter, vf);
-
-       /* set vf mac address */
-       igb_rar_set_qsel(adapter, vf_mac, rar_entry, vf);
-
-       /* enable transmit and receive for vf */
-       reg = rd32(E1000_VFTE);
-       wr32(E1000_VFTE, reg | (1 << vf));
-       reg = rd32(E1000_VFRE);
-       wr32(E1000_VFRE, reg | (1 << vf));
-
-       adapter->vf_data[vf].flags |= IGB_VF_FLAG_CTS;
-
-       /* reply to reset with ack and vf mac address */
-       msgbuf[0] = E1000_VF_RESET | E1000_VT_MSGTYPE_ACK;
-       memcpy(addr, vf_mac, 6);
-       igb_write_mbx(hw, msgbuf, 3, vf);
-}
-
-static int igb_set_vf_mac_addr(struct igb_adapter *adapter, u32 *msg, int vf)
-{
-       /*
-        * The VF MAC Address is stored in a packed array of bytes
-        * starting at the second 32 bit word of the msg array
-        */
-       unsigned char *addr = (char *)&msg[1];
-       int err = -1;
-
-       if (is_valid_ether_addr(addr))
-               err = igb_set_vf_mac(adapter, vf, addr);
-
-       return err;
-}
-
-static void igb_rcv_ack_from_vf(struct igb_adapter *adapter, u32 vf)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
-       u32 msg = E1000_VT_MSGTYPE_NACK;
-
-       /* if device isn't clear to send it shouldn't be reading either */
-       if (!(vf_data->flags & IGB_VF_FLAG_CTS) &&
-           time_after(jiffies, vf_data->last_nack + (2 * HZ))) {
-               igb_write_mbx(hw, &msg, 1, vf);
-               vf_data->last_nack = jiffies;
-       }
-}
-
-static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       u32 msgbuf[E1000_VFMAILBOX_SIZE];
-       struct e1000_hw *hw = &adapter->hw;
-       struct vf_data_storage *vf_data = &adapter->vf_data[vf];
-       s32 retval;
-
-       retval = igb_read_mbx(hw, msgbuf, E1000_VFMAILBOX_SIZE, vf);
-
-       if (retval) {
-               /* if receive failed revoke VF CTS stats and restart init */
-               dev_err(&pdev->dev, "Error receiving message from VF\n");
-               vf_data->flags &= ~IGB_VF_FLAG_CTS;
-               if (!time_after(jiffies, vf_data->last_nack + (2 * HZ)))
-                       return;
-               goto out;
-       }
-
-       /* this is a message we already processed, do nothing */
-       if (msgbuf[0] & (E1000_VT_MSGTYPE_ACK | E1000_VT_MSGTYPE_NACK))
-               return;
-
-       /*
-        * until the vf completes a reset it should not be
-        * allowed to start any configuration.
-        */
-
-       if (msgbuf[0] == E1000_VF_RESET) {
-               igb_vf_reset_msg(adapter, vf);
-               return;
-       }
-
-       if (!(vf_data->flags & IGB_VF_FLAG_CTS)) {
-               if (!time_after(jiffies, vf_data->last_nack + (2 * HZ)))
-                       return;
-               retval = -1;
-               goto out;
-       }
-
-       switch ((msgbuf[0] & 0xFFFF)) {
-       case E1000_VF_SET_MAC_ADDR:
-               retval = -EINVAL;
-               if (!(vf_data->flags & IGB_VF_FLAG_PF_SET_MAC))
-                       retval = igb_set_vf_mac_addr(adapter, msgbuf, vf);
-               else
-                       dev_warn(&pdev->dev,
-                                "VF %d attempted to override administratively "
-                                "set MAC address\nReload the VF driver to "
-                                "resume operations\n", vf);
-               break;
-       case E1000_VF_SET_PROMISC:
-               retval = igb_set_vf_promisc(adapter, msgbuf, vf);
-               break;
-       case E1000_VF_SET_MULTICAST:
-               retval = igb_set_vf_multicasts(adapter, msgbuf, vf);
-               break;
-       case E1000_VF_SET_LPE:
-               retval = igb_set_vf_rlpml(adapter, msgbuf[1], vf);
-               break;
-       case E1000_VF_SET_VLAN:
-               retval = -1;
-               if (vf_data->pf_vlan)
-                       dev_warn(&pdev->dev,
-                                "VF %d attempted to override administratively "
-                                "set VLAN tag\nReload the VF driver to "
-                                "resume operations\n", vf);
-               else
-                       retval = igb_set_vf_vlan(adapter, msgbuf, vf);
-               break;
-       default:
-               dev_err(&pdev->dev, "Unhandled Msg %08x\n", msgbuf[0]);
-               retval = -1;
-               break;
-       }
-
-       msgbuf[0] |= E1000_VT_MSGTYPE_CTS;
-out:
-       /* notify the VF of the results of what it sent us */
-       if (retval)
-               msgbuf[0] |= E1000_VT_MSGTYPE_NACK;
-       else
-               msgbuf[0] |= E1000_VT_MSGTYPE_ACK;
-
-       igb_write_mbx(hw, msgbuf, 1, vf);
-}
-
-static void igb_msg_task(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vf;
-
-       for (vf = 0; vf < adapter->vfs_allocated_count; vf++) {
-               /* process any reset requests */
-               if (!igb_check_for_rst(hw, vf))
-                       igb_vf_reset_event(adapter, vf);
-
-               /* process any messages pending */
-               if (!igb_check_for_msg(hw, vf))
-                       igb_rcv_msg_from_vf(adapter, vf);
-
-               /* process any acks */
-               if (!igb_check_for_ack(hw, vf))
-                       igb_rcv_ack_from_vf(adapter, vf);
-       }
-}
-
-/**
- *  igb_set_uta - Set unicast filter table address
- *  @adapter: board private structure
- *
- *  The unicast table address is a register array of 32-bit registers.
- *  The table is meant to be used in a way similar to how the MTA is used
- *  however due to certain limitations in the hardware it is necessary to
- *  set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscuous
- *  enable bit to allow vlan tag stripping when promiscuous mode is enabled
- **/
-static void igb_set_uta(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int i;
-
-       /* The UTA table only exists on 82576 hardware and newer */
-       if (hw->mac.type < e1000_82576)
-               return;
-
-       /* we only need to do this if VMDq is enabled */
-       if (!adapter->vfs_allocated_count)
-               return;
-
-       for (i = 0; i < hw->mac.uta_reg_count; i++)
-               array_wr32(E1000_UTA, i, ~0);
-}
-
-/**
- * igb_intr_msi - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-static irqreturn_t igb_intr_msi(int irq, void *data)
-{
-       struct igb_adapter *adapter = data;
-       struct igb_q_vector *q_vector = adapter->q_vector[0];
-       struct e1000_hw *hw = &adapter->hw;
-       /* read ICR disables interrupts using IAM */
-       u32 icr = rd32(E1000_ICR);
-
-       igb_write_itr(q_vector);
-
-       if (icr & E1000_ICR_DRSTA)
-               schedule_work(&adapter->reset_task);
-
-       if (icr & E1000_ICR_DOUTSYNC) {
-               /* HW is reporting DMA is out of sync */
-               adapter->stats.doosync++;
-       }
-
-       if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
-               hw->mac.get_link_status = 1;
-               if (!test_bit(__IGB_DOWN, &adapter->state))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       napi_schedule(&q_vector->napi);
-
-       return IRQ_HANDLED;
-}
-
-/**
- * igb_intr - Legacy Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-static irqreturn_t igb_intr(int irq, void *data)
-{
-       struct igb_adapter *adapter = data;
-       struct igb_q_vector *q_vector = adapter->q_vector[0];
-       struct e1000_hw *hw = &adapter->hw;
-       /* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No
-        * need for the IMC write */
-       u32 icr = rd32(E1000_ICR);
-       if (!icr)
-               return IRQ_NONE;  /* Not our interrupt */
-
-       igb_write_itr(q_vector);
-
-       /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is
-        * not set, then the adapter didn't send an interrupt */
-       if (!(icr & E1000_ICR_INT_ASSERTED))
-               return IRQ_NONE;
-
-       if (icr & E1000_ICR_DRSTA)
-               schedule_work(&adapter->reset_task);
-
-       if (icr & E1000_ICR_DOUTSYNC) {
-               /* HW is reporting DMA is out of sync */
-               adapter->stats.doosync++;
-       }
-
-       if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
-               hw->mac.get_link_status = 1;
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__IGB_DOWN, &adapter->state))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       napi_schedule(&q_vector->napi);
-
-       return IRQ_HANDLED;
-}
-
-static inline void igb_ring_irq_enable(struct igb_q_vector *q_vector)
-{
-       struct igb_adapter *adapter = q_vector->adapter;
-       struct e1000_hw *hw = &adapter->hw;
-
-       if ((q_vector->rx_ring && (adapter->rx_itr_setting & 3)) ||
-           (!q_vector->rx_ring && (adapter->tx_itr_setting & 3))) {
-               if (!adapter->msix_entries)
-                       igb_set_itr(adapter);
-               else
-                       igb_update_ring_itr(q_vector);
-       }
-
-       if (!test_bit(__IGB_DOWN, &adapter->state)) {
-               if (adapter->msix_entries)
-                       wr32(E1000_EIMS, q_vector->eims_value);
-               else
-                       igb_irq_enable(adapter);
-       }
-}
-
-/**
- * igb_poll - NAPI Rx polling callback
- * @napi: napi polling structure
- * @budget: count of how many packets we should handle
- **/
-static int igb_poll(struct napi_struct *napi, int budget)
-{
-       struct igb_q_vector *q_vector = container_of(napi,
-                                                    struct igb_q_vector,
-                                                    napi);
-       int tx_clean_complete = 1, work_done = 0;
-
-#ifdef CONFIG_IGB_DCA
-       if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
-               igb_update_dca(q_vector);
-#endif
-       if (q_vector->tx_ring)
-               tx_clean_complete = igb_clean_tx_irq(q_vector);
-
-       if (q_vector->rx_ring)
-               igb_clean_rx_irq_adv(q_vector, &work_done, budget);
-
-       if (!tx_clean_complete)
-               work_done = budget;
-
-       /* If not enough Rx work done, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               igb_ring_irq_enable(q_vector);
-       }
-
-       return work_done;
-}
-
-/**
- * igb_systim_to_hwtstamp - convert system time value to hw timestamp
- * @adapter: board private structure
- * @shhwtstamps: timestamp structure to update
- * @regval: unsigned 64bit system time value.
- *
- * We need to convert the system time value stored in the RX/TXSTMP registers
- * into a hwtstamp which can be used by the upper level timestamping functions
- */
-static void igb_systim_to_hwtstamp(struct igb_adapter *adapter,
-                                   struct skb_shared_hwtstamps *shhwtstamps,
-                                   u64 regval)
-{
-       u64 ns;
-
-       /*
-        * The 82580 starts with 1ns at bit 0 in RX/TXSTMPL, shift this up to
-        * 24 to match clock shift we setup earlier.
-        */
-       if (adapter->hw.mac.type == e1000_82580)
-               regval <<= IGB_82580_TSYNC_SHIFT;
-
-       ns = timecounter_cyc2time(&adapter->clock, regval);
-       timecompare_update(&adapter->compare, ns);
-       memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps));
-       shhwtstamps->hwtstamp = ns_to_ktime(ns);
-       shhwtstamps->syststamp = timecompare_transform(&adapter->compare, ns);
-}
-
-/**
- * igb_tx_hwtstamp - utility function which checks for TX time stamp
- * @q_vector: pointer to q_vector containing needed info
- * @buffer: pointer to igb_buffer structure
- *
- * If we were asked to do hardware stamping and such a time stamp is
- * available, then it must have been for this skb here because we only
- * allow only one such packet into the queue.
- */
-static void igb_tx_hwtstamp(struct igb_q_vector *q_vector, struct igb_buffer *buffer_info)
-{
-       struct igb_adapter *adapter = q_vector->adapter;
-       struct e1000_hw *hw = &adapter->hw;
-       struct skb_shared_hwtstamps shhwtstamps;
-       u64 regval;
-
-       /* if skb does not support hw timestamp or TX stamp not valid exit */
-       if (likely(!(buffer_info->tx_flags & SKBTX_HW_TSTAMP)) ||
-           !(rd32(E1000_TSYNCTXCTL) & E1000_TSYNCTXCTL_VALID))
-               return;
-
-       regval = rd32(E1000_TXSTMPL);
-       regval |= (u64)rd32(E1000_TXSTMPH) << 32;
-
-       igb_systim_to_hwtstamp(adapter, &shhwtstamps, regval);
-       skb_tstamp_tx(buffer_info->skb, &shhwtstamps);
-}
-
-/**
- * igb_clean_tx_irq - Reclaim resources after transmit completes
- * @q_vector: pointer to q_vector containing needed info
- * returns true if ring is completely cleaned
- **/
-static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
-{
-       struct igb_adapter *adapter = q_vector->adapter;
-       struct igb_ring *tx_ring = q_vector->tx_ring;
-       struct net_device *netdev = tx_ring->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       struct igb_buffer *buffer_info;
-       union e1000_adv_tx_desc *tx_desc, *eop_desc;
-       unsigned int total_bytes = 0, total_packets = 0;
-       unsigned int i, eop, count = 0;
-       bool cleaned = false;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->buffer_info[i].next_to_watch;
-       eop_desc = E1000_TX_DESC_ADV(*tx_ring, eop);
-
-       while ((eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)) &&
-              (count < tx_ring->count)) {
-               rmb();  /* read buffer_info after eop_desc status */
-               for (cleaned = false; !cleaned; count++) {
-                       tx_desc = E1000_TX_DESC_ADV(*tx_ring, i);
-                       buffer_info = &tx_ring->buffer_info[i];
-                       cleaned = (i == eop);
-
-                       if (buffer_info->skb) {
-                               total_bytes += buffer_info->bytecount;
-                               /* gso_segs is currently only valid for tcp */
-                               total_packets += buffer_info->gso_segs;
-                               igb_tx_hwtstamp(q_vector, buffer_info);
-                       }
-
-                       igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
-                       tx_desc->wb.status = 0;
-
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-               eop = tx_ring->buffer_info[i].next_to_watch;
-               eop_desc = E1000_TX_DESC_ADV(*tx_ring, eop);
-       }
-
-       tx_ring->next_to_clean = i;
-
-       if (unlikely(count &&
-                    netif_carrier_ok(netdev) &&
-                    igb_desc_unused(tx_ring) >= IGB_TX_QUEUE_WAKE)) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean.
-                */
-               smp_mb();
-               if (__netif_subqueue_stopped(netdev, tx_ring->queue_index) &&
-                   !(test_bit(__IGB_DOWN, &adapter->state))) {
-                       netif_wake_subqueue(netdev, tx_ring->queue_index);
-
-                       u64_stats_update_begin(&tx_ring->tx_syncp);
-                       tx_ring->tx_stats.restart_queue++;
-                       u64_stats_update_end(&tx_ring->tx_syncp);
-               }
-       }
-
-       if (tx_ring->detect_tx_hung) {
-               /* Detect a transmit hang in hardware, this serializes the
-                * check with the clearing of time_stamp and movement of i */
-               tx_ring->detect_tx_hung = false;
-               if (tx_ring->buffer_info[i].time_stamp &&
-                   time_after(jiffies, tx_ring->buffer_info[i].time_stamp +
-                              (adapter->tx_timeout_factor * HZ)) &&
-                   !(rd32(E1000_STATUS) & E1000_STATUS_TXOFF)) {
-
-                       /* detected Tx unit hang */
-                       dev_err(tx_ring->dev,
-                               "Detected Tx Unit Hang\n"
-                               "  Tx Queue             <%d>\n"
-                               "  TDH                  <%x>\n"
-                               "  TDT                  <%x>\n"
-                               "  next_to_use          <%x>\n"
-                               "  next_to_clean        <%x>\n"
-                               "buffer_info[next_to_clean]\n"
-                               "  time_stamp           <%lx>\n"
-                               "  next_to_watch        <%x>\n"
-                               "  jiffies              <%lx>\n"
-                               "  desc.status          <%x>\n",
-                               tx_ring->queue_index,
-                               readl(tx_ring->head),
-                               readl(tx_ring->tail),
-                               tx_ring->next_to_use,
-                               tx_ring->next_to_clean,
-                               tx_ring->buffer_info[eop].time_stamp,
-                               eop,
-                               jiffies,
-                               eop_desc->wb.status);
-                       netif_stop_subqueue(netdev, tx_ring->queue_index);
-               }
-       }
-       tx_ring->total_bytes += total_bytes;
-       tx_ring->total_packets += total_packets;
-       u64_stats_update_begin(&tx_ring->tx_syncp);
-       tx_ring->tx_stats.bytes += total_bytes;
-       tx_ring->tx_stats.packets += total_packets;
-       u64_stats_update_end(&tx_ring->tx_syncp);
-       return count < tx_ring->count;
-}
-
-static inline void igb_rx_checksum_adv(struct igb_ring *ring,
-                                      u32 status_err, struct sk_buff *skb)
-{
-       skb_checksum_none_assert(skb);
-
-       /* Ignore Checksum bit is set or checksum is disabled through ethtool */
-       if (!(ring->flags & IGB_RING_FLAG_RX_CSUM) ||
-            (status_err & E1000_RXD_STAT_IXSM))
-               return;
-
-       /* TCP/UDP checksum error bit is set */
-       if (status_err &
-           (E1000_RXDEXT_STATERR_TCPE | E1000_RXDEXT_STATERR_IPE)) {
-               /*
-                * work around errata with sctp packets where the TCPE aka
-                * L4E bit is set incorrectly on 64 byte (60 byte w/o crc)
-                * packets, (aka let the stack check the crc32c)
-                */
-               if ((skb->len == 60) &&
-                   (ring->flags & IGB_RING_FLAG_RX_SCTP_CSUM)) {
-                       u64_stats_update_begin(&ring->rx_syncp);
-                       ring->rx_stats.csum_err++;
-                       u64_stats_update_end(&ring->rx_syncp);
-               }
-               /* let the stack verify checksum errors */
-               return;
-       }
-       /* It must be a TCP or UDP packet with a valid checksum */
-       if (status_err & (E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_UDPCS))
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-
-       dev_dbg(ring->dev, "cksum success: bits %08X\n", status_err);
-}
-
-static void igb_rx_hwtstamp(struct igb_q_vector *q_vector, u32 staterr,
-                                   struct sk_buff *skb)
-{
-       struct igb_adapter *adapter = q_vector->adapter;
-       struct e1000_hw *hw = &adapter->hw;
-       u64 regval;
-
-       /*
-        * If this bit is set, then the RX registers contain the time stamp. No
-        * other packet will be time stamped until we read these registers, so
-        * read the registers to make them available again. Because only one
-        * packet can be time stamped at a time, we know that the register
-        * values must belong to this one here and therefore we don't need to
-        * compare any of the additional attributes stored for it.
-        *
-        * If nothing went wrong, then it should have a shared tx_flags that we
-        * can turn into a skb_shared_hwtstamps.
-        */
-       if (staterr & E1000_RXDADV_STAT_TSIP) {
-               u32 *stamp = (u32 *)skb->data;
-               regval = le32_to_cpu(*(stamp + 2));
-               regval |= (u64)le32_to_cpu(*(stamp + 3)) << 32;
-               skb_pull(skb, IGB_TS_HDR_LEN);
-       } else {
-               if(!(rd32(E1000_TSYNCRXCTL) & E1000_TSYNCRXCTL_VALID))
-                       return;
-
-               regval = rd32(E1000_RXSTMPL);
-               regval |= (u64)rd32(E1000_RXSTMPH) << 32;
-       }
-
-       igb_systim_to_hwtstamp(adapter, skb_hwtstamps(skb), regval);
-}
-static inline u16 igb_get_hlen(struct igb_ring *rx_ring,
-                               union e1000_adv_rx_desc *rx_desc)
-{
-       /* HW will not DMA in data larger than the given buffer, even if it
-        * parses the (NFS, of course) header to be larger.  In that case, it
-        * fills the header buffer and spills the rest into the page.
-        */
-       u16 hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hdr_info) &
-                  E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT;
-       if (hlen > rx_ring->rx_buffer_len)
-               hlen = rx_ring->rx_buffer_len;
-       return hlen;
-}
-
-static bool igb_clean_rx_irq_adv(struct igb_q_vector *q_vector,
-                                 int *work_done, int budget)
-{
-       struct igb_ring *rx_ring = q_vector->rx_ring;
-       struct net_device *netdev = rx_ring->netdev;
-       struct device *dev = rx_ring->dev;
-       union e1000_adv_rx_desc *rx_desc , *next_rxd;
-       struct igb_buffer *buffer_info , *next_buffer;
-       struct sk_buff *skb;
-       bool cleaned = false;
-       int cleaned_count = 0;
-       int current_node = numa_node_id();
-       unsigned int total_bytes = 0, total_packets = 0;
-       unsigned int i;
-       u32 staterr;
-       u16 length;
-
-       i = rx_ring->next_to_clean;
-       buffer_info = &rx_ring->buffer_info[i];
-       rx_desc = E1000_RX_DESC_ADV(*rx_ring, i);
-       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-
-       while (staterr & E1000_RXD_STAT_DD) {
-               if (*work_done >= budget)
-                       break;
-               (*work_done)++;
-               rmb(); /* read descriptor and rx_buffer_info after status DD */
-
-               skb = buffer_info->skb;
-               prefetch(skb->data - NET_IP_ALIGN);
-               buffer_info->skb = NULL;
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-
-               next_rxd = E1000_RX_DESC_ADV(*rx_ring, i);
-               prefetch(next_rxd);
-               next_buffer = &rx_ring->buffer_info[i];
-
-               length = le16_to_cpu(rx_desc->wb.upper.length);
-               cleaned = true;
-               cleaned_count++;
-
-               if (buffer_info->dma) {
-                       dma_unmap_single(dev, buffer_info->dma,
-                                        rx_ring->rx_buffer_len,
-                                        DMA_FROM_DEVICE);
-                       buffer_info->dma = 0;
-                       if (rx_ring->rx_buffer_len >= IGB_RXBUFFER_1024) {
-                               skb_put(skb, length);
-                               goto send_up;
-                       }
-                       skb_put(skb, igb_get_hlen(rx_ring, rx_desc));
-               }
-
-               if (length) {
-                       dma_unmap_page(dev, buffer_info->page_dma,
-                                      PAGE_SIZE / 2, DMA_FROM_DEVICE);
-                       buffer_info->page_dma = 0;
-
-                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
-                                               buffer_info->page,
-                                               buffer_info->page_offset,
-                                               length);
-
-                       if ((page_count(buffer_info->page) != 1) ||
-                           (page_to_nid(buffer_info->page) != current_node))
-                               buffer_info->page = NULL;
-                       else
-                               get_page(buffer_info->page);
-
-                       skb->len += length;
-                       skb->data_len += length;
-                       skb->truesize += length;
-               }
-
-               if (!(staterr & E1000_RXD_STAT_EOP)) {
-                       buffer_info->skb = next_buffer->skb;
-                       buffer_info->dma = next_buffer->dma;
-                       next_buffer->skb = skb;
-                       next_buffer->dma = 0;
-                       goto next_desc;
-               }
-send_up:
-               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
-                       dev_kfree_skb_irq(skb);
-                       goto next_desc;
-               }
-
-               if (staterr & (E1000_RXDADV_STAT_TSIP | E1000_RXDADV_STAT_TS))
-                       igb_rx_hwtstamp(q_vector, staterr, skb);
-               total_bytes += skb->len;
-               total_packets++;
-
-               igb_rx_checksum_adv(rx_ring, staterr, skb);
-
-               skb->protocol = eth_type_trans(skb, netdev);
-               skb_record_rx_queue(skb, rx_ring->queue_index);
-
-               if (staterr & E1000_RXD_STAT_VP) {
-                       u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
-
-                       __vlan_hwaccel_put_tag(skb, vid);
-               }
-               napi_gro_receive(&q_vector->napi, skb);
-
-next_desc:
-               rx_desc->wb.upper.status_error = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (cleaned_count >= IGB_RX_BUFFER_WRITE) {
-                       igb_alloc_rx_buffers_adv(rx_ring, cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-       }
-
-       rx_ring->next_to_clean = i;
-       cleaned_count = igb_desc_unused(rx_ring);
-
-       if (cleaned_count)
-               igb_alloc_rx_buffers_adv(rx_ring, cleaned_count);
-
-       rx_ring->total_packets += total_packets;
-       rx_ring->total_bytes += total_bytes;
-       u64_stats_update_begin(&rx_ring->rx_syncp);
-       rx_ring->rx_stats.packets += total_packets;
-       rx_ring->rx_stats.bytes += total_bytes;
-       u64_stats_update_end(&rx_ring->rx_syncp);
-       return cleaned;
-}
-
-/**
- * igb_alloc_rx_buffers_adv - Replace used receive buffers; packet split
- * @adapter: address of board private structure
- **/
-void igb_alloc_rx_buffers_adv(struct igb_ring *rx_ring, int cleaned_count)
-{
-       struct net_device *netdev = rx_ring->netdev;
-       union e1000_adv_rx_desc *rx_desc;
-       struct igb_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       int bufsz;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       bufsz = rx_ring->rx_buffer_len;
-
-       while (cleaned_count--) {
-               rx_desc = E1000_RX_DESC_ADV(*rx_ring, i);
-
-               if ((bufsz < IGB_RXBUFFER_1024) && !buffer_info->page_dma) {
-                       if (!buffer_info->page) {
-                               buffer_info->page = netdev_alloc_page(netdev);
-                               if (unlikely(!buffer_info->page)) {
-                                       u64_stats_update_begin(&rx_ring->rx_syncp);
-                                       rx_ring->rx_stats.alloc_failed++;
-                                       u64_stats_update_end(&rx_ring->rx_syncp);
-                                       goto no_buffers;
-                               }
-                               buffer_info->page_offset = 0;
-                       } else {
-                               buffer_info->page_offset ^= PAGE_SIZE / 2;
-                       }
-                       buffer_info->page_dma =
-                               dma_map_page(rx_ring->dev, buffer_info->page,
-                                            buffer_info->page_offset,
-                                            PAGE_SIZE / 2,
-                                            DMA_FROM_DEVICE);
-                       if (dma_mapping_error(rx_ring->dev,
-                                             buffer_info->page_dma)) {
-                               buffer_info->page_dma = 0;
-                               u64_stats_update_begin(&rx_ring->rx_syncp);
-                               rx_ring->rx_stats.alloc_failed++;
-                               u64_stats_update_end(&rx_ring->rx_syncp);
-                               goto no_buffers;
-                       }
-               }
-
-               skb = buffer_info->skb;
-               if (!skb) {
-                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
-                       if (unlikely(!skb)) {
-                               u64_stats_update_begin(&rx_ring->rx_syncp);
-                               rx_ring->rx_stats.alloc_failed++;
-                               u64_stats_update_end(&rx_ring->rx_syncp);
-                               goto no_buffers;
-                       }
-
-                       buffer_info->skb = skb;
-               }
-               if (!buffer_info->dma) {
-                       buffer_info->dma = dma_map_single(rx_ring->dev,
-                                                         skb->data,
-                                                         bufsz,
-                                                         DMA_FROM_DEVICE);
-                       if (dma_mapping_error(rx_ring->dev,
-                                             buffer_info->dma)) {
-                               buffer_info->dma = 0;
-                               u64_stats_update_begin(&rx_ring->rx_syncp);
-                               rx_ring->rx_stats.alloc_failed++;
-                               u64_stats_update_end(&rx_ring->rx_syncp);
-                               goto no_buffers;
-                       }
-               }
-               /* Refresh the desc even if buffer_addrs didn't change because
-                * each write-back erases this info. */
-               if (bufsz < IGB_RXBUFFER_1024) {
-                       rx_desc->read.pkt_addr =
-                            cpu_to_le64(buffer_info->page_dma);
-                       rx_desc->read.hdr_addr = cpu_to_le64(buffer_info->dma);
-               } else {
-                       rx_desc->read.pkt_addr = cpu_to_le64(buffer_info->dma);
-                       rx_desc->read.hdr_addr = 0;
-               }
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-no_buffers:
-       if (rx_ring->next_to_use != i) {
-               rx_ring->next_to_use = i;
-               if (i == 0)
-                       i = (rx_ring->count - 1);
-               else
-                       i--;
-
-               /* Force memory writes to complete before letting h/w
-                * know there are new descriptors to fetch.  (Only
-                * applicable for weak-ordered memory model archs,
-                * such as IA-64). */
-               wmb();
-               writel(i, rx_ring->tail);
-       }
-}
-
-/**
- * igb_mii_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- **/
-static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct mii_ioctl_data *data = if_mii(ifr);
-
-       if (adapter->hw.phy.media_type != e1000_media_type_copper)
-               return -EOPNOTSUPP;
-
-       switch (cmd) {
-       case SIOCGMIIPHY:
-               data->phy_id = adapter->hw.phy.addr;
-               break;
-       case SIOCGMIIREG:
-               if (igb_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
-                                    &data->val_out))
-                       return -EIO;
-               break;
-       case SIOCSMIIREG:
-       default:
-               return -EOPNOTSUPP;
-       }
-       return 0;
-}
-
-/**
- * igb_hwtstamp_ioctl - control hardware time stamping
- * @netdev:
- * @ifreq:
- * @cmd:
- *
- * Outgoing time stamping can be enabled and disabled. Play nice and
- * disable it when requested, although it shouldn't case any overhead
- * when no packet needs it. At most one packet in the queue may be
- * marked for time stamping, otherwise it would be impossible to tell
- * for sure to which packet the hardware time stamp belongs.
- *
- * Incoming time stamping has to be configured via the hardware
- * filters. Not all combinations are supported, in particular event
- * type has to be specified. Matching the kind of event packet is
- * not supported, with the exception of "all V2 events regardless of
- * level 2 or 4".
- *
- **/
-static int igb_hwtstamp_ioctl(struct net_device *netdev,
-                             struct ifreq *ifr, int cmd)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct hwtstamp_config config;
-       u32 tsync_tx_ctl = E1000_TSYNCTXCTL_ENABLED;
-       u32 tsync_rx_ctl = E1000_TSYNCRXCTL_ENABLED;
-       u32 tsync_rx_cfg = 0;
-       bool is_l4 = false;
-       bool is_l2 = false;
-       u32 regval;
-
-       if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
-               return -EFAULT;
-
-       /* reserved for future extensions */
-       if (config.flags)
-               return -EINVAL;
-
-       switch (config.tx_type) {
-       case HWTSTAMP_TX_OFF:
-               tsync_tx_ctl = 0;
-       case HWTSTAMP_TX_ON:
-               break;
-       default:
-               return -ERANGE;
-       }
-
-       switch (config.rx_filter) {
-       case HWTSTAMP_FILTER_NONE:
-               tsync_rx_ctl = 0;
-               break;
-       case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
-       case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
-       case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
-       case HWTSTAMP_FILTER_ALL:
-               /*
-                * register TSYNCRXCFG must be set, therefore it is not
-                * possible to time stamp both Sync and Delay_Req messages
-                * => fall back to time stamping all packets
-                */
-               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_ALL;
-               config.rx_filter = HWTSTAMP_FILTER_ALL;
-               break;
-       case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
-               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L4_V1;
-               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V1_SYNC_MESSAGE;
-               is_l4 = true;
-               break;
-       case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
-               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L4_V1;
-               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V1_DELAY_REQ_MESSAGE;
-               is_l4 = true;
-               break;
-       case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
-       case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
-               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L2_L4_V2;
-               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V2_SYNC_MESSAGE;
-               is_l2 = true;
-               is_l4 = true;
-               config.rx_filter = HWTSTAMP_FILTER_SOME;
-               break;
-       case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
-       case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
-               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_L2_L4_V2;
-               tsync_rx_cfg = E1000_TSYNCRXCFG_PTP_V2_DELAY_REQ_MESSAGE;
-               is_l2 = true;
-               is_l4 = true;
-               config.rx_filter = HWTSTAMP_FILTER_SOME;
-               break;
-       case HWTSTAMP_FILTER_PTP_V2_EVENT:
-       case HWTSTAMP_FILTER_PTP_V2_SYNC:
-       case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
-               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_EVENT_V2;
-               config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
-               is_l2 = true;
-               break;
-       default:
-               return -ERANGE;
-       }
-
-       if (hw->mac.type == e1000_82575) {
-               if (tsync_rx_ctl | tsync_tx_ctl)
-                       return -EINVAL;
-               return 0;
-       }
-
-       /*
-        * Per-packet timestamping only works if all packets are
-        * timestamped, so enable timestamping in all packets as
-        * long as one rx filter was configured.
-        */
-       if ((hw->mac.type == e1000_82580) && tsync_rx_ctl) {
-               tsync_rx_ctl = E1000_TSYNCRXCTL_ENABLED;
-               tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_ALL;
-       }
-
-       /* enable/disable TX */
-       regval = rd32(E1000_TSYNCTXCTL);
-       regval &= ~E1000_TSYNCTXCTL_ENABLED;
-       regval |= tsync_tx_ctl;
-       wr32(E1000_TSYNCTXCTL, regval);
-
-       /* enable/disable RX */
-       regval = rd32(E1000_TSYNCRXCTL);
-       regval &= ~(E1000_TSYNCRXCTL_ENABLED | E1000_TSYNCRXCTL_TYPE_MASK);
-       regval |= tsync_rx_ctl;
-       wr32(E1000_TSYNCRXCTL, regval);
-
-       /* define which PTP packets are time stamped */
-       wr32(E1000_TSYNCRXCFG, tsync_rx_cfg);
-
-       /* define ethertype filter for timestamped packets */
-       if (is_l2)
-               wr32(E1000_ETQF(3),
-                               (E1000_ETQF_FILTER_ENABLE | /* enable filter */
-                                E1000_ETQF_1588 | /* enable timestamping */
-                                ETH_P_1588));     /* 1588 eth protocol type */
-       else
-               wr32(E1000_ETQF(3), 0);
-
-#define PTP_PORT 319
-       /* L4 Queue Filter[3]: filter by destination port and protocol */
-       if (is_l4) {
-               u32 ftqf = (IPPROTO_UDP /* UDP */
-                       | E1000_FTQF_VF_BP /* VF not compared */
-                       | E1000_FTQF_1588_TIME_STAMP /* Enable Timestamping */
-                       | E1000_FTQF_MASK); /* mask all inputs */
-               ftqf &= ~E1000_FTQF_MASK_PROTO_BP; /* enable protocol check */
-
-               wr32(E1000_IMIR(3), htons(PTP_PORT));
-               wr32(E1000_IMIREXT(3),
-                    (E1000_IMIREXT_SIZE_BP | E1000_IMIREXT_CTRL_BP));
-               if (hw->mac.type == e1000_82576) {
-                       /* enable source port check */
-                       wr32(E1000_SPQF(3), htons(PTP_PORT));
-                       ftqf &= ~E1000_FTQF_MASK_SOURCE_PORT_BP;
-               }
-               wr32(E1000_FTQF(3), ftqf);
-       } else {
-               wr32(E1000_FTQF(3), E1000_FTQF_MASK);
-       }
-       wrfl();
-
-       adapter->hwtstamp_config = config;
-
-       /* clear TX/RX time stamp registers, just to be sure */
-       regval = rd32(E1000_TXSTMPH);
-       regval = rd32(E1000_RXSTMPH);
-
-       return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
-               -EFAULT : 0;
-}
-
-/**
- * igb_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- **/
-static int igb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       switch (cmd) {
-       case SIOCGMIIPHY:
-       case SIOCGMIIREG:
-       case SIOCSMIIREG:
-               return igb_mii_ioctl(netdev, ifr, cmd);
-       case SIOCSHWTSTAMP:
-               return igb_hwtstamp_ioctl(netdev, ifr, cmd);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
-{
-       struct igb_adapter *adapter = hw->back;
-       u16 cap_offset;
-
-       cap_offset = adapter->pdev->pcie_cap;
-       if (!cap_offset)
-               return -E1000_ERR_CONFIG;
-
-       pci_read_config_word(adapter->pdev, cap_offset + reg, value);
-
-       return 0;
-}
-
-s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
-{
-       struct igb_adapter *adapter = hw->back;
-       u16 cap_offset;
-
-       cap_offset = adapter->pdev->pcie_cap;
-       if (!cap_offset)
-               return -E1000_ERR_CONFIG;
-
-       pci_write_config_word(adapter->pdev, cap_offset + reg, *value);
-
-       return 0;
-}
-
-static void igb_vlan_mode(struct net_device *netdev, u32 features)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl, rctl;
-
-       igb_irq_disable(adapter);
-
-       if (features & NETIF_F_HW_VLAN_RX) {
-               /* enable VLAN tag insert/strip */
-               ctrl = rd32(E1000_CTRL);
-               ctrl |= E1000_CTRL_VME;
-               wr32(E1000_CTRL, ctrl);
-
-               /* Disable CFI check */
-               rctl = rd32(E1000_RCTL);
-               rctl &= ~E1000_RCTL_CFIEN;
-               wr32(E1000_RCTL, rctl);
-       } else {
-               /* disable VLAN tag insert/strip */
-               ctrl = rd32(E1000_CTRL);
-               ctrl &= ~E1000_CTRL_VME;
-               wr32(E1000_CTRL, ctrl);
-       }
-
-       igb_rlpml_set(adapter);
-
-       if (!test_bit(__IGB_DOWN, &adapter->state))
-               igb_irq_enable(adapter);
-}
-
-static void igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int pf_id = adapter->vfs_allocated_count;
-
-       /* attempt to add filter to vlvf array */
-       igb_vlvf_set(adapter, vid, true, pf_id);
-
-       /* add the filter since PF can receive vlans w/o entry in vlvf */
-       igb_vfta_set(hw, vid, true);
-
-       set_bit(vid, adapter->active_vlans);
-}
-
-static void igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int pf_id = adapter->vfs_allocated_count;
-       s32 err;
-
-       igb_irq_disable(adapter);
-
-       if (!test_bit(__IGB_DOWN, &adapter->state))
-               igb_irq_enable(adapter);
-
-       /* remove vlan from VLVF table array */
-       err = igb_vlvf_set(adapter, vid, false, pf_id);
-
-       /* if vid was not present in VLVF just remove it from table */
-       if (err)
-               igb_vfta_set(hw, vid, false);
-
-       clear_bit(vid, adapter->active_vlans);
-}
-
-static void igb_restore_vlan(struct igb_adapter *adapter)
-{
-       u16 vid;
-
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               igb_vlan_rx_add_vid(adapter->netdev, vid);
-}
-
-int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-
-       mac->autoneg = 0;
-
-       /* Make sure dplx is at most 1 bit and lsb of speed is not set
-        * for the switch() below to work */
-       if ((spd & 1) || (dplx & ~1))
-               goto err_inval;
-
-       /* Fiber NIC's only allow 1000 Gbps Full duplex */
-       if ((adapter->hw.phy.media_type == e1000_media_type_internal_serdes) &&
-           spd != SPEED_1000 &&
-           dplx != DUPLEX_FULL)
-               goto err_inval;
-
-       switch (spd + dplx) {
-       case SPEED_10 + DUPLEX_HALF:
-               mac->forced_speed_duplex = ADVERTISE_10_HALF;
-               break;
-       case SPEED_10 + DUPLEX_FULL:
-               mac->forced_speed_duplex = ADVERTISE_10_FULL;
-               break;
-       case SPEED_100 + DUPLEX_HALF:
-               mac->forced_speed_duplex = ADVERTISE_100_HALF;
-               break;
-       case SPEED_100 + DUPLEX_FULL:
-               mac->forced_speed_duplex = ADVERTISE_100_FULL;
-               break;
-       case SPEED_1000 + DUPLEX_FULL:
-               mac->autoneg = 1;
-               adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
-       case SPEED_1000 + DUPLEX_HALF: /* not supported */
-       default:
-               goto err_inval;
-       }
-       return 0;
-
-err_inval:
-       dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n");
-       return -EINVAL;
-}
-
-static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl, rctl, status;
-       u32 wufc = adapter->wol;
-#ifdef CONFIG_PM
-       int retval = 0;
-#endif
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev))
-               igb_close(netdev);
-
-       igb_clear_interrupt_scheme(adapter);
-
-#ifdef CONFIG_PM
-       retval = pci_save_state(pdev);
-       if (retval)
-               return retval;
-#endif
-
-       status = rd32(E1000_STATUS);
-       if (status & E1000_STATUS_LU)
-               wufc &= ~E1000_WUFC_LNKC;
-
-       if (wufc) {
-               igb_setup_rctl(adapter);
-               igb_set_rx_mode(netdev);
-
-               /* turn on all-multi mode if wake on multicast is enabled */
-               if (wufc & E1000_WUFC_MC) {
-                       rctl = rd32(E1000_RCTL);
-                       rctl |= E1000_RCTL_MPE;
-                       wr32(E1000_RCTL, rctl);
-               }
-
-               ctrl = rd32(E1000_CTRL);
-               /* advertise wake from D3Cold */
-               #define E1000_CTRL_ADVD3WUC 0x00100000
-               /* phy power management enable */
-               #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
-               ctrl |= E1000_CTRL_ADVD3WUC;
-               wr32(E1000_CTRL, ctrl);
-
-               /* Allow time for pending master requests to run */
-               igb_disable_pcie_master(hw);
-
-               wr32(E1000_WUC, E1000_WUC_PME_EN);
-               wr32(E1000_WUFC, wufc);
-       } else {
-               wr32(E1000_WUC, 0);
-               wr32(E1000_WUFC, 0);
-       }
-
-       *enable_wake = wufc || adapter->en_mng_pt;
-       if (!*enable_wake)
-               igb_power_down_link(adapter);
-       else
-               igb_power_up_link(adapter);
-
-       /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-        * would have already happened in close and is redundant. */
-       igb_release_hw_control(adapter);
-
-       pci_disable_device(pdev);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int igb_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       int retval;
-       bool wake;
-
-       retval = __igb_shutdown(pdev, &wake);
-       if (retval)
-               return retval;
-
-       if (wake) {
-               pci_prepare_to_sleep(pdev);
-       } else {
-               pci_wake_from_d3(pdev, false);
-               pci_set_power_state(pdev, PCI_D3hot);
-       }
-
-       return 0;
-}
-
-static int igb_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 err;
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       pci_save_state(pdev);
-
-       err = pci_enable_device_mem(pdev);
-       if (err) {
-               dev_err(&pdev->dev,
-                       "igb: Cannot enable PCI device from suspend\n");
-               return err;
-       }
-       pci_set_master(pdev);
-
-       pci_enable_wake(pdev, PCI_D3hot, 0);
-       pci_enable_wake(pdev, PCI_D3cold, 0);
-
-       if (igb_init_interrupt_scheme(adapter)) {
-               dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
-               return -ENOMEM;
-       }
-
-       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);
-
-       wr32(E1000_WUS, ~0);
-
-       if (netif_running(netdev)) {
-               err = igb_open(netdev);
-               if (err)
-                       return err;
-       }
-
-       netif_device_attach(netdev);
-
-       return 0;
-}
-#endif
-
-static void igb_shutdown(struct pci_dev *pdev)
-{
-       bool wake;
-
-       __igb_shutdown(pdev, &wake);
-
-       if (system_state == SYSTEM_POWER_OFF) {
-               pci_wake_from_d3(pdev, wake);
-               pci_set_power_state(pdev, PCI_D3hot);
-       }
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-static void igb_netpoll(struct net_device *netdev)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int i;
-
-       if (!adapter->msix_entries) {
-               struct igb_q_vector *q_vector = adapter->q_vector[0];
-               igb_irq_disable(adapter);
-               napi_schedule(&q_vector->napi);
-               return;
-       }
-
-       for (i = 0; i < adapter->num_q_vectors; i++) {
-               struct igb_q_vector *q_vector = adapter->q_vector[i];
-               wr32(E1000_EIMC, q_vector->eims_value);
-               napi_schedule(&q_vector->napi);
-       }
-}
-#endif /* CONFIG_NET_POLL_CONTROLLER */
-
-/**
- * igb_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
-static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev,
-                                             pci_channel_state_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (state == pci_channel_io_perm_failure)
-               return PCI_ERS_RESULT_DISCONNECT;
-
-       if (netif_running(netdev))
-               igb_down(adapter);
-       pci_disable_device(pdev);
-
-       /* Request a slot slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * igb_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the igb_resume routine.
- */
-static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       pci_ers_result_t result;
-       int err;
-
-       if (pci_enable_device_mem(pdev)) {
-               dev_err(&pdev->dev,
-                       "Cannot re-enable PCI device after reset.\n");
-               result = PCI_ERS_RESULT_DISCONNECT;
-       } else {
-               pci_set_master(pdev);
-               pci_restore_state(pdev);
-               pci_save_state(pdev);
-
-               pci_enable_wake(pdev, PCI_D3hot, 0);
-               pci_enable_wake(pdev, PCI_D3cold, 0);
-
-               igb_reset(adapter);
-               wr32(E1000_WUS, ~0);
-               result = PCI_ERS_RESULT_RECOVERED;
-       }
-
-       err = pci_cleanup_aer_uncorrect_error_status(pdev);
-       if (err) {
-               dev_err(&pdev->dev, "pci_cleanup_aer_uncorrect_error_status "
-                       "failed 0x%0x\n", err);
-               /* non-fatal, continue */
-       }
-
-       return result;
-}
-
-/**
- * igb_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the igb_resume routine.
- */
-static void igb_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igb_adapter *adapter = netdev_priv(netdev);
-
-       if (netif_running(netdev)) {
-               if (igb_up(adapter)) {
-                       dev_err(&pdev->dev, "igb_up failed after reset\n");
-                       return;
-               }
-       }
-
-       netif_device_attach(netdev);
-
-       /* let the f/w know that the h/w is now under the control of the
-        * driver. */
-       igb_get_hw_control(adapter);
-}
-
-static void igb_rar_set_qsel(struct igb_adapter *adapter, u8 *addr, u32 index,
-                             u8 qsel)
-{
-       u32 rar_low, rar_high;
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* 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));
-
-       /* Indicate to hardware the Address is Valid. */
-       rar_high |= E1000_RAH_AV;
-
-       if (hw->mac.type == e1000_82575)
-               rar_high |= E1000_RAH_POOL_1 * qsel;
-       else
-               rar_high |= E1000_RAH_POOL_1 << qsel;
-
-       wr32(E1000_RAL(index), rar_low);
-       wrfl();
-       wr32(E1000_RAH(index), rar_high);
-       wrfl();
-}
-
-static int igb_set_vf_mac(struct igb_adapter *adapter,
-                          int vf, unsigned char *mac_addr)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       /* VF MAC addresses start at end of receive addresses and moves
-        * torwards the first, as a result a collision should not be possible */
-       int rar_entry = hw->mac.rar_entry_count - (vf + 1);
-
-       memcpy(adapter->vf_data[vf].vf_mac_addresses, mac_addr, ETH_ALEN);
-
-       igb_rar_set_qsel(adapter, mac_addr, rar_entry, vf);
-
-       return 0;
-}
-
-static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       if (!is_valid_ether_addr(mac) || (vf >= adapter->vfs_allocated_count))
-               return -EINVAL;
-       adapter->vf_data[vf].flags |= IGB_VF_FLAG_PF_SET_MAC;
-       dev_info(&adapter->pdev->dev, "setting MAC %pM on VF %d\n", mac, vf);
-       dev_info(&adapter->pdev->dev, "Reload the VF driver to make this"
-                                     " change effective.");
-       if (test_bit(__IGB_DOWN, &adapter->state)) {
-               dev_warn(&adapter->pdev->dev, "The VF MAC address has been set,"
-                        " but the PF device is not up.\n");
-               dev_warn(&adapter->pdev->dev, "Bring the PF device up before"
-                        " attempting to use the VF device.\n");
-       }
-       return igb_set_vf_mac(adapter, vf, mac);
-}
-
-static int igb_link_mbps(int internal_link_speed)
-{
-       switch (internal_link_speed) {
-       case SPEED_100:
-               return 100;
-       case SPEED_1000:
-               return 1000;
-       default:
-               return 0;
-       }
-}
-
-static void igb_set_vf_rate_limit(struct e1000_hw *hw, int vf, int tx_rate,
-                                 int link_speed)
-{
-       int rf_dec, rf_int;
-       u32 bcnrc_val;
-
-       if (tx_rate != 0) {
-               /* Calculate the rate factor values to set */
-               rf_int = link_speed / tx_rate;
-               rf_dec = (link_speed - (rf_int * tx_rate));
-               rf_dec = (rf_dec * (1<<E1000_RTTBCNRC_RF_INT_SHIFT)) / tx_rate;
-
-               bcnrc_val = E1000_RTTBCNRC_RS_ENA;
-               bcnrc_val |= ((rf_int<<E1000_RTTBCNRC_RF_INT_SHIFT) &
-                              E1000_RTTBCNRC_RF_INT_MASK);
-               bcnrc_val |= (rf_dec & E1000_RTTBCNRC_RF_DEC_MASK);
-       } else {
-               bcnrc_val = 0;
-       }
-
-       wr32(E1000_RTTDQSEL, vf); /* vf X uses queue X */
-       wr32(E1000_RTTBCNRC, bcnrc_val);
-}
-
-static void igb_check_vf_rate_limit(struct igb_adapter *adapter)
-{
-       int actual_link_speed, i;
-       bool reset_rate = false;
-
-       /* VF TX rate limit was not set or not supported */
-       if ((adapter->vf_rate_link_speed == 0) ||
-           (adapter->hw.mac.type != e1000_82576))
-               return;
-
-       actual_link_speed = igb_link_mbps(adapter->link_speed);
-       if (actual_link_speed != adapter->vf_rate_link_speed) {
-               reset_rate = true;
-               adapter->vf_rate_link_speed = 0;
-               dev_info(&adapter->pdev->dev,
-                        "Link speed has been changed. VF Transmit "
-                        "rate is disabled\n");
-       }
-
-       for (i = 0; i < adapter->vfs_allocated_count; i++) {
-               if (reset_rate)
-                       adapter->vf_data[i].tx_rate = 0;
-
-               igb_set_vf_rate_limit(&adapter->hw, i,
-                                     adapter->vf_data[i].tx_rate,
-                                     actual_link_speed);
-       }
-}
-
-static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int actual_link_speed;
-
-       if (hw->mac.type != e1000_82576)
-               return -EOPNOTSUPP;
-
-       actual_link_speed = igb_link_mbps(adapter->link_speed);
-       if ((vf >= adapter->vfs_allocated_count) ||
-           (!(rd32(E1000_STATUS) & E1000_STATUS_LU)) ||
-           (tx_rate < 0) || (tx_rate > actual_link_speed))
-               return -EINVAL;
-
-       adapter->vf_rate_link_speed = actual_link_speed;
-       adapter->vf_data[vf].tx_rate = (u16)tx_rate;
-       igb_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
-
-       return 0;
-}
-
-static int igb_ndo_get_vf_config(struct net_device *netdev,
-                                int vf, struct ifla_vf_info *ivi)
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       if (vf >= adapter->vfs_allocated_count)
-               return -EINVAL;
-       ivi->vf = vf;
-       memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);
-       ivi->tx_rate = adapter->vf_data[vf].tx_rate;
-       ivi->vlan = adapter->vf_data[vf].pf_vlan;
-       ivi->qos = adapter->vf_data[vf].pf_qos;
-       return 0;
-}
-
-static void igb_vmm_control(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 reg;
-
-       switch (hw->mac.type) {
-       case e1000_82575:
-       default:
-               /* replication is not supported for 82575 */
-               return;
-       case e1000_82576:
-               /* notify HW that the MAC is adding vlan tags */
-               reg = rd32(E1000_DTXCTL);
-               reg |= E1000_DTXCTL_VLAN_ADDED;
-               wr32(E1000_DTXCTL, reg);
-       case e1000_82580:
-               /* enable replication vlan tag stripping */
-               reg = rd32(E1000_RPLOLR);
-               reg |= E1000_RPLOLR_STRVLAN;
-               wr32(E1000_RPLOLR, reg);
-       case e1000_i350:
-               /* none of the above registers are supported by i350 */
-               break;
-       }
-
-       if (adapter->vfs_allocated_count) {
-               igb_vmdq_set_loopback_pf(hw, true);
-               igb_vmdq_set_replication_pf(hw, true);
-               igb_vmdq_set_anti_spoofing_pf(hw, true,
-                                               adapter->vfs_allocated_count);
-       } else {
-               igb_vmdq_set_loopback_pf(hw, false);
-               igb_vmdq_set_replication_pf(hw, false);
-       }
-}
-
-/* igb_main.c */
diff --git a/drivers/net/igbvf/Makefile b/drivers/net/igbvf/Makefile
deleted file mode 100644 (file)
index 0fa3db3..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#
-# Intel(R) 82576 Virtual Function Linux driver
-# Copyright(c) 2009 - 2010 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
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) 82576 VF ethernet driver
-#
-
-obj-$(CONFIG_IGBVF) += igbvf.o
-
-igbvf-objs := vf.o \
-              mbx.o \
-              ethtool.o \
-              netdev.o
-
diff --git a/drivers/net/igbvf/defines.h b/drivers/net/igbvf/defines.h
deleted file mode 100644 (file)
index 79f2604..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#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
-
-/* IVAR valid bit */
-#define E1000_IVAR_VALID        0x80
-
-/* 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_ERR_SE        0x02    /* Symbol Error */
-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-
-#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
-
-
-/* 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)
-
-/* Device Control */
-#define E1000_CTRL_RST      0x04000000  /* Global reset */
-
-/* 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_TXOFF      0x00000010      /* transmission paused */
-#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 SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-/* Transmit Descriptor bit definitions */
-#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-
-#define MAX_JUMBO_FRAME_SIZE    0x3F00
-
-/* 802.1q VLAN Packet Size */
-#define VLAN_TAG_SIZE              4    /* 802.3ac tag (not DMA'd) */
-
-/* Error Codes */
-#define E1000_SUCCESS      0
-#define E1000_ERR_CONFIG   3
-#define E1000_ERR_MAC_INIT 5
-#define E1000_ERR_MBX      15
-
-#ifndef ETH_ADDR_LEN
-#define ETH_ADDR_LEN                 6
-#endif
-
-/* 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_ADV_ONEBUF                0x02000000
-#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS          0x0A000000
-#define E1000_SRRCTL_DESCTYPE_MASK                      0x0E000000
-#define E1000_SRRCTL_DROP_EN                            0x80000000
-
-#define E1000_SRRCTL_BSIZEPKT_MASK      0x0000007F
-#define E1000_SRRCTL_BSIZEHDR_MASK      0x00003F00
-
-/* Additional Descriptor Control definitions */
-#define E1000_TXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Tx Queue */
-#define E1000_RXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Rx Queue */
-
-/* Direct Cache Access (DCA) definitions */
-#define E1000_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
-
-#define E1000_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
-
-#endif /* _E1000_DEFINES_H_ */
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
deleted file mode 100644 (file)
index b0b14d6..0000000
+++ /dev/null
@@ -1,534 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 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
-
-*******************************************************************************/
-
-/* ethtool support for igbvf */
-
-#include <linux/netdevice.h>
-#include <linux/ethtool.h>
-#include <linux/pci.h>
-#include <linux/vmalloc.h>
-#include <linux/delay.h>
-
-#include "igbvf.h"
-#include <linux/if_vlan.h>
-
-
-struct igbvf_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int sizeof_stat;
-       int stat_offset;
-       int base_stat_offset;
-};
-
-#define IGBVF_STAT(current, base) \
-               sizeof(((struct igbvf_adapter *)0)->current), \
-               offsetof(struct igbvf_adapter, current), \
-               offsetof(struct igbvf_adapter, base)
-
-static const struct igbvf_stats igbvf_gstrings_stats[] = {
-       { "rx_packets", IGBVF_STAT(stats.gprc, stats.base_gprc) },
-       { "tx_packets", IGBVF_STAT(stats.gptc, stats.base_gptc) },
-       { "rx_bytes", IGBVF_STAT(stats.gorc, stats.base_gorc) },
-       { "tx_bytes", IGBVF_STAT(stats.gotc, stats.base_gotc) },
-       { "multicast", IGBVF_STAT(stats.mprc, stats.base_mprc) },
-       { "lbrx_bytes", IGBVF_STAT(stats.gorlbc, stats.base_gorlbc) },
-       { "lbrx_packets", IGBVF_STAT(stats.gprlbc, stats.base_gprlbc) },
-       { "tx_restart_queue", IGBVF_STAT(restart_queue, zero_base) },
-       { "rx_long_byte_count", IGBVF_STAT(stats.gorc, stats.base_gorc) },
-       { "rx_csum_offload_good", IGBVF_STAT(hw_csum_good, zero_base) },
-       { "rx_csum_offload_errors", IGBVF_STAT(hw_csum_err, zero_base) },
-       { "rx_header_split", IGBVF_STAT(rx_hdr_split, zero_base) },
-       { "alloc_rx_buff_failed", IGBVF_STAT(alloc_rx_buff_failed, zero_base) },
-};
-
-#define IGBVF_GLOBAL_STATS_LEN ARRAY_SIZE(igbvf_gstrings_stats)
-
-static const char igbvf_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Link test   (on/offline)"
-};
-
-#define IGBVF_TEST_LEN ARRAY_SIZE(igbvf_gstrings_test)
-
-static int igbvf_get_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 status;
-
-       ecmd->supported   = SUPPORTED_1000baseT_Full;
-
-       ecmd->advertising = ADVERTISED_1000baseT_Full;
-
-       ecmd->port = -1;
-       ecmd->transceiver = XCVR_DUMMY1;
-
-       status = er32(STATUS);
-       if (status & E1000_STATUS_LU) {
-               if (status & E1000_STATUS_SPEED_1000)
-                       ethtool_cmd_speed_set(ecmd, SPEED_1000);
-               else if (status & E1000_STATUS_SPEED_100)
-                       ethtool_cmd_speed_set(ecmd, SPEED_100);
-               else
-                       ethtool_cmd_speed_set(ecmd, SPEED_10);
-
-               if (status & E1000_STATUS_FD)
-                       ecmd->duplex = DUPLEX_FULL;
-               else
-                       ecmd->duplex = DUPLEX_HALF;
-       } else {
-               ethtool_cmd_speed_set(ecmd, -1);
-               ecmd->duplex = -1;
-       }
-
-       ecmd->autoneg = AUTONEG_DISABLE;
-
-       return 0;
-}
-
-static int igbvf_set_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
-{
-       return -EOPNOTSUPP;
-}
-
-static void igbvf_get_pauseparam(struct net_device *netdev,
-                                 struct ethtool_pauseparam *pause)
-{
-       return;
-}
-
-static int igbvf_set_pauseparam(struct net_device *netdev,
-                                struct ethtool_pauseparam *pause)
-{
-       return -EOPNOTSUPP;
-}
-
-static u32 igbvf_get_rx_csum(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       return !(adapter->flags & IGBVF_FLAG_RX_CSUM_DISABLED);
-}
-
-static int igbvf_set_rx_csum(struct net_device *netdev, u32 data)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       if (data)
-               adapter->flags &= ~IGBVF_FLAG_RX_CSUM_DISABLED;
-       else
-               adapter->flags |= IGBVF_FLAG_RX_CSUM_DISABLED;
-
-       return 0;
-}
-
-static u32 igbvf_get_tx_csum(struct net_device *netdev)
-{
-       return (netdev->features & NETIF_F_IP_CSUM) != 0;
-}
-
-static int igbvf_set_tx_csum(struct net_device *netdev, u32 data)
-{
-       if (data)
-               netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
-       else
-               netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
-       return 0;
-}
-
-static int igbvf_set_tso(struct net_device *netdev, u32 data)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       if (data) {
-               netdev->features |= NETIF_F_TSO;
-               netdev->features |= NETIF_F_TSO6;
-       } else {
-               netdev->features &= ~NETIF_F_TSO;
-               netdev->features &= ~NETIF_F_TSO6;
-       }
-
-       dev_info(&adapter->pdev->dev, "TSO is %s\n",
-                data ? "Enabled" : "Disabled");
-       return 0;
-}
-
-static u32 igbvf_get_msglevel(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void igbvf_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-
-static int igbvf_get_regs_len(struct net_device *netdev)
-{
-#define IGBVF_REGS_LEN 8
-       return IGBVF_REGS_LEN * sizeof(u32);
-}
-
-static void igbvf_get_regs(struct net_device *netdev,
-                           struct ethtool_regs *regs, void *p)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 *regs_buff = p;
-
-       memset(p, 0, IGBVF_REGS_LEN * sizeof(u32));
-
-       regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
-                       adapter->pdev->device;
-
-       regs_buff[0] = er32(CTRL);
-       regs_buff[1] = er32(STATUS);
-
-       regs_buff[2] = er32(RDLEN(0));
-       regs_buff[3] = er32(RDH(0));
-       regs_buff[4] = er32(RDT(0));
-
-       regs_buff[5] = er32(TDLEN(0));
-       regs_buff[6] = er32(TDH(0));
-       regs_buff[7] = er32(TDT(0));
-}
-
-static int igbvf_get_eeprom_len(struct net_device *netdev)
-{
-       return 0;
-}
-
-static int igbvf_get_eeprom(struct net_device *netdev,
-                            struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       return -EOPNOTSUPP;
-}
-
-static int igbvf_set_eeprom(struct net_device *netdev,
-                            struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       return -EOPNOTSUPP;
-}
-
-static void igbvf_get_drvinfo(struct net_device *netdev,
-                              struct ethtool_drvinfo *drvinfo)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       char firmware_version[32] = "N/A";
-
-       strncpy(drvinfo->driver,  igbvf_driver_name, 32);
-       strncpy(drvinfo->version, igbvf_driver_version, 32);
-       strncpy(drvinfo->fw_version, firmware_version, 32);
-       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-       drvinfo->regdump_len = igbvf_get_regs_len(netdev);
-       drvinfo->eedump_len = igbvf_get_eeprom_len(netdev);
-}
-
-static void igbvf_get_ringparam(struct net_device *netdev,
-                                struct ethtool_ringparam *ring)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct igbvf_ring *tx_ring = adapter->tx_ring;
-       struct igbvf_ring *rx_ring = adapter->rx_ring;
-
-       ring->rx_max_pending = IGBVF_MAX_RXD;
-       ring->tx_max_pending = IGBVF_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rx_ring->count;
-       ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int igbvf_set_ringparam(struct net_device *netdev,
-                               struct ethtool_ringparam *ring)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct igbvf_ring *temp_ring;
-       int err = 0;
-       u32 new_rx_count, new_tx_count;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       new_rx_count = max(ring->rx_pending, (u32)IGBVF_MIN_RXD);
-       new_rx_count = min(new_rx_count, (u32)IGBVF_MAX_RXD);
-       new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       new_tx_count = max(ring->tx_pending, (u32)IGBVF_MIN_TXD);
-       new_tx_count = min(new_tx_count, (u32)IGBVF_MAX_TXD);
-       new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       if ((new_tx_count == adapter->tx_ring->count) &&
-           (new_rx_count == adapter->rx_ring->count)) {
-               /* nothing to do */
-               return 0;
-       }
-
-       while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
-               msleep(1);
-
-       if (!netif_running(adapter->netdev)) {
-               adapter->tx_ring->count = new_tx_count;
-               adapter->rx_ring->count = new_rx_count;
-               goto clear_reset;
-       }
-
-       temp_ring = vmalloc(sizeof(struct igbvf_ring));
-       if (!temp_ring) {
-               err = -ENOMEM;
-               goto clear_reset;
-       }
-
-       igbvf_down(adapter);
-
-       /*
-        * We can't just free everything and then setup again,
-        * because the ISRs in MSI-X mode get passed pointers
-        * to the tx and rx ring structs.
-        */
-       if (new_tx_count != adapter->tx_ring->count) {
-               memcpy(temp_ring, adapter->tx_ring, sizeof(struct igbvf_ring));
-
-               temp_ring->count = new_tx_count;
-               err = igbvf_setup_tx_resources(adapter, temp_ring);
-               if (err)
-                       goto err_setup;
-
-               igbvf_free_tx_resources(adapter->tx_ring);
-
-               memcpy(adapter->tx_ring, temp_ring, sizeof(struct igbvf_ring));
-       }
-
-       if (new_rx_count != adapter->rx_ring->count) {
-               memcpy(temp_ring, adapter->rx_ring, sizeof(struct igbvf_ring));
-
-               temp_ring->count = new_rx_count;
-               err = igbvf_setup_rx_resources(adapter, temp_ring);
-               if (err)
-                       goto err_setup;
-
-               igbvf_free_rx_resources(adapter->rx_ring);
-
-               memcpy(adapter->rx_ring, temp_ring,sizeof(struct igbvf_ring));
-       }
-err_setup:
-       igbvf_up(adapter);
-       vfree(temp_ring);
-clear_reset:
-       clear_bit(__IGBVF_RESETTING, &adapter->state);
-       return err;
-}
-
-static int igbvf_link_test(struct igbvf_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       *data = 0;
-
-       hw->mac.ops.check_for_link(hw);
-
-       if (!(er32(STATUS) & E1000_STATUS_LU))
-               *data = 1;
-
-       return *data;
-}
-
-static void igbvf_diag_test(struct net_device *netdev,
-                            struct ethtool_test *eth_test, u64 *data)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       set_bit(__IGBVF_TESTING, &adapter->state);
-
-       /*
-        * Link test performed before hardware reset so autoneg doesn't
-        * interfere with test result
-        */
-       if (igbvf_link_test(adapter, &data[0]))
-               eth_test->flags |= ETH_TEST_FL_FAILED;
-
-       clear_bit(__IGBVF_TESTING, &adapter->state);
-       msleep_interruptible(4 * 1000);
-}
-
-static void igbvf_get_wol(struct net_device *netdev,
-                          struct ethtool_wolinfo *wol)
-{
-       wol->supported = 0;
-       wol->wolopts = 0;
-}
-
-static int igbvf_set_wol(struct net_device *netdev,
-                         struct ethtool_wolinfo *wol)
-{
-       return -EOPNOTSUPP;
-}
-
-static int igbvf_get_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       if (adapter->itr_setting <= 3)
-               ec->rx_coalesce_usecs = adapter->itr_setting;
-       else
-               ec->rx_coalesce_usecs = adapter->itr_setting >> 2;
-
-       return 0;
-}
-
-static int igbvf_set_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if ((ec->rx_coalesce_usecs > IGBVF_MAX_ITR_USECS) ||
-           ((ec->rx_coalesce_usecs > 3) &&
-            (ec->rx_coalesce_usecs < IGBVF_MIN_ITR_USECS)) ||
-           (ec->rx_coalesce_usecs == 2))
-               return -EINVAL;
-
-       /* convert to rate of irq's per second */
-       if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3) {
-               adapter->itr = IGBVF_START_ITR;
-               adapter->itr_setting = ec->rx_coalesce_usecs;
-       } else {
-               adapter->itr = ec->rx_coalesce_usecs << 2;
-               adapter->itr_setting = adapter->itr;
-       }
-
-       writel(adapter->itr,
-              hw->hw_addr + adapter->rx_ring[0].itr_register);
-
-       return 0;
-}
-
-static int igbvf_nway_reset(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       if (netif_running(netdev))
-               igbvf_reinit_locked(adapter);
-       return 0;
-}
-
-
-static void igbvf_get_ethtool_stats(struct net_device *netdev,
-                                    struct ethtool_stats *stats,
-                                    u64 *data)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       int i;
-
-       igbvf_update_stats(adapter);
-       for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) {
-               char *p = (char *)adapter +
-                         igbvf_gstrings_stats[i].stat_offset;
-               char *b = (char *)adapter +
-                         igbvf_gstrings_stats[i].base_stat_offset;
-               data[i] = ((igbvf_gstrings_stats[i].sizeof_stat ==
-                           sizeof(u64)) ? (*(u64 *)p - *(u64 *)b) :
-                           (*(u32 *)p - *(u32 *)b));
-       }
-
-}
-
-static int igbvf_get_sset_count(struct net_device *dev, int stringset)
-{
-       switch(stringset) {
-       case ETH_SS_TEST:
-               return IGBVF_TEST_LEN;
-       case ETH_SS_STATS:
-               return IGBVF_GLOBAL_STATS_LEN;
-       default:
-               return -EINVAL;
-       }
-}
-
-static void igbvf_get_strings(struct net_device *netdev, u32 stringset,
-                              u8 *data)
-{
-       u8 *p = data;
-       int i;
-
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *igbvf_gstrings_test, sizeof(igbvf_gstrings_test));
-               break;
-       case ETH_SS_STATS:
-               for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, igbvf_gstrings_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-               break;
-       }
-}
-
-static const struct ethtool_ops igbvf_ethtool_ops = {
-       .get_settings           = igbvf_get_settings,
-       .set_settings           = igbvf_set_settings,
-       .get_drvinfo            = igbvf_get_drvinfo,
-       .get_regs_len           = igbvf_get_regs_len,
-       .get_regs               = igbvf_get_regs,
-       .get_wol                = igbvf_get_wol,
-       .set_wol                = igbvf_set_wol,
-       .get_msglevel           = igbvf_get_msglevel,
-       .set_msglevel           = igbvf_set_msglevel,
-       .nway_reset             = igbvf_nway_reset,
-       .get_link               = ethtool_op_get_link,
-       .get_eeprom_len         = igbvf_get_eeprom_len,
-       .get_eeprom             = igbvf_get_eeprom,
-       .set_eeprom             = igbvf_set_eeprom,
-       .get_ringparam          = igbvf_get_ringparam,
-       .set_ringparam          = igbvf_set_ringparam,
-       .get_pauseparam         = igbvf_get_pauseparam,
-       .set_pauseparam         = igbvf_set_pauseparam,
-       .get_rx_csum            = igbvf_get_rx_csum,
-       .set_rx_csum            = igbvf_set_rx_csum,
-       .get_tx_csum            = igbvf_get_tx_csum,
-       .set_tx_csum            = igbvf_set_tx_csum,
-       .get_sg                 = ethtool_op_get_sg,
-       .set_sg                 = ethtool_op_set_sg,
-       .get_tso                = ethtool_op_get_tso,
-       .set_tso                = igbvf_set_tso,
-       .self_test              = igbvf_diag_test,
-       .get_sset_count         = igbvf_get_sset_count,
-       .get_strings            = igbvf_get_strings,
-       .get_ethtool_stats      = igbvf_get_ethtool_stats,
-       .get_coalesce           = igbvf_get_coalesce,
-       .set_coalesce           = igbvf_set_coalesce,
-};
-
-void igbvf_set_ethtool_ops(struct net_device *netdev)
-{
-       /* have to "undeclare" const on this struct to remove warnings */
-       SET_ETHTOOL_OPS(netdev, (struct ethtool_ops *)&igbvf_ethtool_ops);
-}
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
deleted file mode 100644 (file)
index fd4a7b7..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 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
-
-*******************************************************************************/
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _IGBVF_H_
-#define _IGBVF_H_
-
-#include <linux/types.h>
-#include <linux/timer.h>
-#include <linux/io.h>
-#include <linux/netdevice.h>
-#include <linux/if_vlan.h>
-
-#include "vf.h"
-
-/* Forward declarations */
-struct igbvf_info;
-struct igbvf_adapter;
-
-/* Interrupt defines */
-#define IGBVF_START_ITR                 648 /* ~6000 ints/sec */
-
-/* Interrupt modes, as used by the IntMode parameter */
-#define IGBVF_INT_MODE_LEGACY           0
-#define IGBVF_INT_MODE_MSI              1
-#define IGBVF_INT_MODE_MSIX             2
-
-/* Tx/Rx descriptor defines */
-#define IGBVF_DEFAULT_TXD               256
-#define IGBVF_MAX_TXD                   4096
-#define IGBVF_MIN_TXD                   80
-
-#define IGBVF_DEFAULT_RXD               256
-#define IGBVF_MAX_RXD                   4096
-#define IGBVF_MIN_RXD                   80
-
-#define IGBVF_MIN_ITR_USECS             10 /* 100000 irq/sec */
-#define IGBVF_MAX_ITR_USECS             10000 /* 100    irq/sec */
-
-/* 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 IGBVF_RX_PTHRESH                16
-#define IGBVF_RX_HTHRESH                8
-#define IGBVF_RX_WTHRESH                1
-
-/* this is the size past which hardware will drop packets when setting LPE=0 */
-#define MAXIMUM_ETHERNET_VLAN_SIZE      1522
-
-#define IGBVF_FC_PAUSE_TIME             0x0680 /* 858 usec */
-
-/* How many Tx Descriptors do we need to call netif_wake_queue ? */
-#define IGBVF_TX_QUEUE_WAKE             32
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IGBVF_RX_BUFFER_WRITE           16 /* Must be power of 2 */
-
-#define AUTO_ALL_MODES                  0
-#define IGBVF_EEPROM_APME               0x0400
-
-#define IGBVF_MNG_VLAN_NONE             (-1)
-
-/* Number of packet split data buffers (not including the header buffer) */
-#define PS_PAGE_BUFFERS                 (MAX_PS_BUFFERS - 1)
-
-enum igbvf_boards {
-       board_vf,
-       board_i350_vf,
-};
-
-struct igbvf_queue_stats {
-       u64 packets;
-       u64 bytes;
-};
-
-/*
- * wrappers around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer
- */
-struct igbvf_buffer {
-       dma_addr_t dma;
-       struct sk_buff *skb;
-       union {
-               /* Tx */
-               struct {
-                       unsigned long time_stamp;
-                       u16 length;
-                       u16 next_to_watch;
-                       u16 mapped_as_page;
-               };
-               /* Rx */
-               struct {
-                       struct page *page;
-                       u64 page_dma;
-                       unsigned int page_offset;
-               };
-       };
-};
-
-union igbvf_desc {
-       union e1000_adv_rx_desc rx_desc;
-       union e1000_adv_tx_desc tx_desc;
-       struct e1000_adv_tx_context_desc tx_context_desc;
-};
-
-struct igbvf_ring {
-       struct igbvf_adapter *adapter;  /* backlink */
-       union igbvf_desc *desc;         /* pointer to ring memory  */
-       dma_addr_t dma;                 /* phys address of ring    */
-       unsigned int size;              /* length of ring in bytes */
-       unsigned int count;             /* number of desc. in ring */
-
-       u16 next_to_use;
-       u16 next_to_clean;
-
-       u16 head;
-       u16 tail;
-
-       /* array of buffer information structs */
-       struct igbvf_buffer *buffer_info;
-       struct napi_struct napi;
-
-       char name[IFNAMSIZ + 5];
-       u32 eims_value;
-       u32 itr_val;
-       u16 itr_register;
-       int set_itr;
-
-       struct sk_buff *rx_skb_top;
-
-       struct igbvf_queue_stats stats;
-};
-
-/* board specific private data structure */
-struct igbvf_adapter {
-       struct timer_list watchdog_timer;
-       struct timer_list blink_timer;
-
-       struct work_struct reset_task;
-       struct work_struct watchdog_task;
-
-       const struct igbvf_info *ei;
-
-       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-       u32 bd_number;
-       u32 rx_buffer_len;
-       u32 polling_interval;
-       u16 mng_vlan_id;
-       u16 link_speed;
-       u16 link_duplex;
-
-       spinlock_t tx_queue_lock; /* prevent concurrent tail updates */
-
-       /* track device up/down/testing state */
-       unsigned long state;
-
-       /* Interrupt Throttle Rate */
-       u32 itr;
-       u32 itr_setting;
-       u16 tx_itr;
-       u16 rx_itr;
-
-       /*
-        * Tx
-        */
-       struct igbvf_ring *tx_ring /* One per active queue */
-       ____cacheline_aligned_in_smp;
-
-       unsigned int restart_queue;
-       u32 txd_cmd;
-
-       u32 tx_int_delay;
-       u32 tx_abs_int_delay;
-
-       unsigned int total_tx_bytes;
-       unsigned int total_tx_packets;
-       unsigned int total_rx_bytes;
-       unsigned int total_rx_packets;
-
-       /* Tx stats */
-       u32 tx_timeout_count;
-       u32 tx_fifo_head;
-       u32 tx_head_addr;
-       u32 tx_fifo_size;
-       u32 tx_dma_failed;
-
-       /*
-        * Rx
-        */
-       struct igbvf_ring *rx_ring;
-
-       u32 rx_int_delay;
-       u32 rx_abs_int_delay;
-
-       /* Rx stats */
-       u64 hw_csum_err;
-       u64 hw_csum_good;
-       u64 rx_hdr_split;
-       u32 alloc_rx_buff_failed;
-       u32 rx_dma_failed;
-
-       unsigned int rx_ps_hdr_size;
-       u32 max_frame_size;
-       u32 min_frame_size;
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-       struct net_device_stats net_stats;
-       spinlock_t stats_lock;      /* prevent concurrent stats updates */
-
-       /* structs defined in e1000_hw.h */
-       struct e1000_hw hw;
-
-       /* The VF counters don't clear on read so we have to get a base
-        * count on driver start up and always subtract that base on
-        * on the first update, thus the flag..
-        */
-       struct e1000_vf_stats stats;
-       u64 zero_base;
-
-       struct igbvf_ring test_tx_ring;
-       struct igbvf_ring test_rx_ring;
-       u32 test_icr;
-
-       u32 msg_enable;
-       struct msix_entry *msix_entries;
-       int int_mode;
-       u32 eims_enable_mask;
-       u32 eims_other;
-       u32 int_counter0;
-       u32 int_counter1;
-
-       u32 eeprom_wol;
-       u32 wol;
-       u32 pba;
-
-       bool fc_autoneg;
-
-       unsigned long led_status;
-
-       unsigned int flags;
-       unsigned long last_reset;
-};
-
-struct igbvf_info {
-       enum e1000_mac_type     mac;
-       unsigned int            flags;
-       u32                     pba;
-       void                    (*init_ops)(struct e1000_hw *);
-       s32                     (*get_variants)(struct igbvf_adapter *);
-};
-
-/* hardware capability, feature, and workaround flags */
-#define IGBVF_FLAG_RX_CSUM_DISABLED             (1 << 0)
-
-#define IGBVF_RX_DESC_ADV(R, i)     \
-       (&((((R).desc))[i].rx_desc))
-#define IGBVF_TX_DESC_ADV(R, i)     \
-       (&((((R).desc))[i].tx_desc))
-#define IGBVF_TX_CTXTDESC_ADV(R, i) \
-       (&((((R).desc))[i].tx_context_desc))
-
-enum igbvf_state_t {
-       __IGBVF_TESTING,
-       __IGBVF_RESETTING,
-       __IGBVF_DOWN
-};
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-extern char igbvf_driver_name[];
-extern const char igbvf_driver_version[];
-
-extern void igbvf_check_options(struct igbvf_adapter *);
-extern void igbvf_set_ethtool_ops(struct net_device *);
-
-extern int igbvf_up(struct igbvf_adapter *);
-extern void igbvf_down(struct igbvf_adapter *);
-extern void igbvf_reinit_locked(struct igbvf_adapter *);
-extern int igbvf_setup_rx_resources(struct igbvf_adapter *, struct igbvf_ring *);
-extern int igbvf_setup_tx_resources(struct igbvf_adapter *, struct igbvf_ring *);
-extern void igbvf_free_rx_resources(struct igbvf_ring *);
-extern void igbvf_free_tx_resources(struct igbvf_ring *);
-extern void igbvf_update_stats(struct igbvf_adapter *);
-
-extern unsigned int copybreak;
-
-#endif /* _IGBVF_H_ */
diff --git a/drivers/net/igbvf/mbx.c b/drivers/net/igbvf/mbx.c
deleted file mode 100644 (file)
index 3d6f4cc..0000000
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 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
-
-*******************************************************************************/
-
-#include "mbx.h"
-
-/**
- *  e1000_poll_for_msg - Wait for message notification
- *  @hw: pointer to the HW structure
- *
- *  returns SUCCESS if it successfully received a message notification
- **/
-static s32 e1000_poll_for_msg(struct e1000_hw *hw)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       if (!mbx->ops.check_for_msg)
-               goto out;
-
-       while (countdown && mbx->ops.check_for_msg(hw)) {
-               countdown--;
-               udelay(mbx->usec_delay);
-       }
-
-       /* if we failed, all future posted messages fail until reset */
-       if (!countdown)
-               mbx->timeout = 0;
-out:
-       return countdown ? E1000_SUCCESS : -E1000_ERR_MBX;
-}
-
-/**
- *  e1000_poll_for_ack - Wait for message acknowledgement
- *  @hw: pointer to the HW structure
- *
- *  returns SUCCESS if it successfully received a message acknowledgement
- **/
-static s32 e1000_poll_for_ack(struct e1000_hw *hw)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       if (!mbx->ops.check_for_ack)
-               goto out;
-
-       while (countdown && mbx->ops.check_for_ack(hw)) {
-               countdown--;
-               udelay(mbx->usec_delay);
-       }
-
-       /* if we failed, all future posted messages fail until reset */
-       if (!countdown)
-               mbx->timeout = 0;
-out:
-       return countdown ? E1000_SUCCESS : -E1000_ERR_MBX;
-}
-
-/**
- *  e1000_read_posted_mbx - Wait for message notification and receive message
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns SUCCESS if it successfully received a message notification and
- *  copied it into the receive buffer.
- **/
-static s32 e1000_read_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (!mbx->ops.read)
-               goto out;
-
-       ret_val = e1000_poll_for_msg(hw);
-
-       /* if ack received read message, otherwise we timed out */
-       if (!ret_val)
-               ret_val = mbx->ops.read(hw, msg, size);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_posted_mbx - Write a message to the mailbox, wait for ack
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns SUCCESS if it successfully copied message into the buffer and
- *  received an ack to that message within delay * timeout period
- **/
-static s32 e1000_write_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = -E1000_ERR_MBX;
-
-       /* exit if we either can't write or there isn't a defined timeout */
-       if (!mbx->ops.write || !mbx->timeout)
-               goto out;
-
-       /* send msg*/
-       ret_val = mbx->ops.write(hw, msg, size);
-
-       /* if msg sent wait until we receive an ack */
-       if (!ret_val)
-               ret_val = e1000_poll_for_ack(hw);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_v2p_mailbox - read v2p mailbox
- *  @hw: pointer to the HW structure
- *
- *  This function is used to read the v2p mailbox without losing the read to
- *  clear status bits.
- **/
-static u32 e1000_read_v2p_mailbox(struct e1000_hw *hw)
-{
-       u32 v2p_mailbox = er32(V2PMAILBOX(0));
-
-       v2p_mailbox |= hw->dev_spec.vf.v2p_mailbox;
-       hw->dev_spec.vf.v2p_mailbox |= v2p_mailbox & E1000_V2PMAILBOX_R2C_BITS;
-
-       return v2p_mailbox;
-}
-
-/**
- *  e1000_check_for_bit_vf - Determine if a status bit was set
- *  @hw: pointer to the HW structure
- *  @mask: bitmask for bits to be tested and cleared
- *
- *  This function is used to check for the read to clear bits within
- *  the V2P mailbox.
- **/
-static s32 e1000_check_for_bit_vf(struct e1000_hw *hw, u32 mask)
-{
-       u32 v2p_mailbox = e1000_read_v2p_mailbox(hw);
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (v2p_mailbox & mask)
-               ret_val = E1000_SUCCESS;
-
-       hw->dev_spec.vf.v2p_mailbox &= ~mask;
-
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_msg_vf - checks to see if the PF has sent mail
- *  @hw: pointer to the HW structure
- *
- *  returns SUCCESS if the PF has set the Status bit or else ERR_MBX
- **/
-static s32 e1000_check_for_msg_vf(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (!e1000_check_for_bit_vf(hw, E1000_V2PMAILBOX_PFSTS)) {
-               ret_val = E1000_SUCCESS;
-               hw->mbx.stats.reqs++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_ack_vf - checks to see if the PF has ACK'd
- *  @hw: pointer to the HW structure
- *
- *  returns SUCCESS if the PF has set the ACK bit or else ERR_MBX
- **/
-static s32 e1000_check_for_ack_vf(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (!e1000_check_for_bit_vf(hw, E1000_V2PMAILBOX_PFACK)) {
-               ret_val = E1000_SUCCESS;
-               hw->mbx.stats.acks++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_rst_vf - checks to see if the PF has reset
- *  @hw: pointer to the HW structure
- *
- *  returns true if the PF has set the reset done bit or else false
- **/
-static s32 e1000_check_for_rst_vf(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_MBX;
-
-       if (!e1000_check_for_bit_vf(hw, (E1000_V2PMAILBOX_RSTD |
-                                        E1000_V2PMAILBOX_RSTI))) {
-               ret_val = E1000_SUCCESS;
-               hw->mbx.stats.rsts++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_obtain_mbx_lock_vf - obtain mailbox lock
- *  @hw: pointer to the HW structure
- *
- *  return SUCCESS if we obtained the mailbox lock
- **/
-static s32 e1000_obtain_mbx_lock_vf(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_MBX;
-
-       /* Take ownership of the buffer */
-       ew32(V2PMAILBOX(0), E1000_V2PMAILBOX_VFU);
-
-       /* reserve mailbox for vf use */
-       if (e1000_read_v2p_mailbox(hw) & E1000_V2PMAILBOX_VFU)
-               ret_val = E1000_SUCCESS;
-
-       return ret_val;
-}
-
-/**
- *  e1000_write_mbx_vf - Write a message to the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns SUCCESS if it successfully copied message into the buffer
- **/
-static s32 e1000_write_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size)
-{
-       s32 err;
-       u16 i;
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       err = e1000_obtain_mbx_lock_vf(hw);
-       if (err)
-               goto out_no_write;
-
-       /* flush any ack or msg as we are going to overwrite mailbox */
-       e1000_check_for_ack_vf(hw);
-       e1000_check_for_msg_vf(hw);
-
-       /* copy the caller specified message to the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               array_ew32(VMBMEM(0), i, msg[i]);
-
-       /* update stats */
-       hw->mbx.stats.msgs_tx++;
-
-       /* Drop VFU and interrupt the PF to tell it a message has been sent */
-       ew32(V2PMAILBOX(0), E1000_V2PMAILBOX_REQ);
-
-out_no_write:
-       return err;
-}
-
-/**
- *  e1000_read_mbx_vf - Reads a message from the inbox intended for vf
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns SUCCESS if it successfuly read message from buffer
- **/
-static s32 e1000_read_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size)
-{
-       s32 err;
-       u16 i;
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       err = e1000_obtain_mbx_lock_vf(hw);
-       if (err)
-               goto out_no_read;
-
-       /* copy the message from the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               msg[i] = array_er32(VMBMEM(0), i);
-
-       /* Acknowledge receipt and release mailbox, then we're done */
-       ew32(V2PMAILBOX(0), E1000_V2PMAILBOX_ACK);
-
-       /* update stats */
-       hw->mbx.stats.msgs_rx++;
-
-out_no_read:
-       return err;
-}
-
-/**
- *  e1000_init_mbx_params_vf - set initial values for vf mailbox
- *  @hw: pointer to the HW structure
- *
- *  Initializes the hw->mbx struct to correct values for vf mailbox
- */
-s32 e1000_init_mbx_params_vf(struct e1000_hw *hw)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-
-       /* start mailbox as timed out and let the reset_hw call set the timeout
-        * value to being communications */
-       mbx->timeout = 0;
-       mbx->usec_delay = E1000_VF_MBX_INIT_DELAY;
-
-       mbx->size = E1000_VFMAILBOX_SIZE;
-
-       mbx->ops.read = e1000_read_mbx_vf;
-       mbx->ops.write = e1000_write_mbx_vf;
-       mbx->ops.read_posted = e1000_read_posted_mbx;
-       mbx->ops.write_posted = e1000_write_posted_mbx;
-       mbx->ops.check_for_msg = e1000_check_for_msg_vf;
-       mbx->ops.check_for_ack = e1000_check_for_ack_vf;
-       mbx->ops.check_for_rst = e1000_check_for_rst_vf;
-
-       mbx->stats.msgs_tx = 0;
-       mbx->stats.msgs_rx = 0;
-       mbx->stats.reqs = 0;
-       mbx->stats.acks = 0;
-       mbx->stats.rsts = 0;
-
-       return E1000_SUCCESS;
-}
-
diff --git a/drivers/net/igbvf/mbx.h b/drivers/net/igbvf/mbx.h
deleted file mode 100644 (file)
index c2883c4..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#ifndef _E1000_MBX_H_
-#define _E1000_MBX_H_
-
-#include "vf.h"
-
-#define E1000_V2PMAILBOX_REQ   0x00000001 /* Request for PF Ready bit */
-#define E1000_V2PMAILBOX_ACK   0x00000002 /* Ack PF message received */
-#define E1000_V2PMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
-#define E1000_V2PMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
-#define E1000_V2PMAILBOX_PFSTS 0x00000010 /* PF wrote a message in the MB */
-#define E1000_V2PMAILBOX_PFACK 0x00000020 /* PF ack the previous VF msg */
-#define E1000_V2PMAILBOX_RSTI  0x00000040 /* PF has reset indication */
-#define E1000_V2PMAILBOX_RSTD  0x00000080 /* PF has indicated reset done */
-#define E1000_V2PMAILBOX_R2C_BITS 0x000000B0 /* All read to clear bits */
-
-#define E1000_VFMAILBOX_SIZE   16 /* 16 32 bit words - 64 bytes */
-
-/* If it's a E1000_VF_* msg then it originates in the VF and is sent to the
- * PF.  The reverse is true if it is E1000_PF_*.
- * Message ACK's are the value or'd with 0xF0000000
- */
-#define E1000_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
-                                               * this are the ACK */
-#define E1000_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
-                                               * this are the NACK */
-#define E1000_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
-                                                 clear to send requests */
-
-/* We have a total wait time of 1s for vf mailbox posted messages */
-#define E1000_VF_MBX_INIT_TIMEOUT 2000 /* retry count for mailbox timeout */
-#define E1000_VF_MBX_INIT_DELAY   500  /* usec delay between retries */
-
-#define E1000_VT_MSGINFO_SHIFT    16
-/* bits 23:16 are used for exra info for certain messages */
-#define E1000_VT_MSGINFO_MASK     (0xFF << E1000_VT_MSGINFO_SHIFT)
-
-#define E1000_VF_RESET            0x01 /* VF requests reset */
-#define E1000_VF_SET_MAC_ADDR     0x02 /* VF requests PF to set MAC addr */
-#define E1000_VF_SET_MULTICAST    0x03 /* VF requests PF to set MC addr */
-#define E1000_VF_SET_VLAN         0x04 /* VF requests PF to set VLAN */
-#define E1000_VF_SET_LPE          0x05 /* VF requests PF to set VMOLR.LPE */
-
-#define E1000_PF_CONTROL_MSG      0x0100 /* PF control message */
-
-void e1000_init_mbx_ops_generic(struct e1000_hw *hw);
-s32 e1000_init_mbx_params_vf(struct e1000_hw *);
-
-#endif /* _E1000_MBX_H_ */
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
deleted file mode 100644 (file)
index 40ed066..0000000
+++ /dev/null
@@ -1,2859 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 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
-
-*******************************************************************************/
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/vmalloc.h>
-#include <linux/pagemap.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/tcp.h>
-#include <linux/ipv6.h>
-#include <linux/slab.h>
-#include <net/checksum.h>
-#include <net/ip6_checksum.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-#include <linux/prefetch.h>
-
-#include "igbvf.h"
-
-#define DRV_VERSION "2.0.0-k"
-char igbvf_driver_name[] = "igbvf";
-const char igbvf_driver_version[] = DRV_VERSION;
-static const char igbvf_driver_string[] =
-                               "Intel(R) Virtual Function Network Driver";
-static const char igbvf_copyright[] =
-                               "Copyright (c) 2009 - 2010 Intel Corporation.";
-
-static int igbvf_poll(struct napi_struct *napi, int budget);
-static void igbvf_reset(struct igbvf_adapter *);
-static void igbvf_set_interrupt_capability(struct igbvf_adapter *);
-static void igbvf_reset_interrupt_capability(struct igbvf_adapter *);
-
-static struct igbvf_info igbvf_vf_info = {
-       .mac                    = e1000_vfadapt,
-       .flags                  = 0,
-       .pba                    = 10,
-       .init_ops               = e1000_init_function_pointers_vf,
-};
-
-static struct igbvf_info igbvf_i350_vf_info = {
-       .mac                    = e1000_vfadapt_i350,
-       .flags                  = 0,
-       .pba                    = 10,
-       .init_ops               = e1000_init_function_pointers_vf,
-};
-
-static const struct igbvf_info *igbvf_info_tbl[] = {
-       [board_vf]              = &igbvf_vf_info,
-       [board_i350_vf]         = &igbvf_i350_vf_info,
-};
-
-/**
- * igbvf_desc_unused - calculate if we have unused descriptors
- **/
-static int igbvf_desc_unused(struct igbvf_ring *ring)
-{
-       if (ring->next_to_clean > ring->next_to_use)
-               return ring->next_to_clean - ring->next_to_use - 1;
-
-       return ring->count + ring->next_to_clean - ring->next_to_use - 1;
-}
-
-/**
- * igbvf_receive_skb - helper function to handle Rx indications
- * @adapter: board private structure
- * @status: descriptor status field as written by hardware
- * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
- * @skb: pointer to sk_buff to be indicated to stack
- **/
-static void igbvf_receive_skb(struct igbvf_adapter *adapter,
-                              struct net_device *netdev,
-                              struct sk_buff *skb,
-                              u32 status, u16 vlan)
-{
-       if (status & E1000_RXD_STAT_VP) {
-               u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
-
-               __vlan_hwaccel_put_tag(skb, vid);
-       }
-       netif_receive_skb(skb);
-}
-
-static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
-                                         u32 status_err, struct sk_buff *skb)
-{
-       skb_checksum_none_assert(skb);
-
-       /* Ignore Checksum bit is set or checksum is disabled through ethtool */
-       if ((status_err & E1000_RXD_STAT_IXSM) ||
-           (adapter->flags & IGBVF_FLAG_RX_CSUM_DISABLED))
-               return;
-
-       /* TCP/UDP checksum error bit is set */
-       if (status_err &
-           (E1000_RXDEXT_STATERR_TCPE | E1000_RXDEXT_STATERR_IPE)) {
-               /* let the stack verify checksum errors */
-               adapter->hw_csum_err++;
-               return;
-       }
-
-       /* It must be a TCP or UDP packet with a valid checksum */
-       if (status_err & (E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_UDPCS))
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-
-       adapter->hw_csum_good++;
-}
-
-/**
- * igbvf_alloc_rx_buffers - Replace used receive buffers; packet split
- * @rx_ring: address of ring structure to repopulate
- * @cleaned_count: number of buffers to repopulate
- **/
-static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring,
-                                   int cleaned_count)
-{
-       struct igbvf_adapter *adapter = rx_ring->adapter;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       union e1000_adv_rx_desc *rx_desc;
-       struct igbvf_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       int bufsz;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       if (adapter->rx_ps_hdr_size)
-               bufsz = adapter->rx_ps_hdr_size;
-       else
-               bufsz = adapter->rx_buffer_len;
-
-       while (cleaned_count--) {
-               rx_desc = IGBVF_RX_DESC_ADV(*rx_ring, i);
-
-               if (adapter->rx_ps_hdr_size && !buffer_info->page_dma) {
-                       if (!buffer_info->page) {
-                               buffer_info->page = alloc_page(GFP_ATOMIC);
-                               if (!buffer_info->page) {
-                                       adapter->alloc_rx_buff_failed++;
-                                       goto no_buffers;
-                               }
-                               buffer_info->page_offset = 0;
-                       } else {
-                               buffer_info->page_offset ^= PAGE_SIZE / 2;
-                       }
-                       buffer_info->page_dma =
-                               dma_map_page(&pdev->dev, buffer_info->page,
-                                            buffer_info->page_offset,
-                                            PAGE_SIZE / 2,
-                                            DMA_FROM_DEVICE);
-               }
-
-               if (!buffer_info->skb) {
-                       skb = netdev_alloc_skb_ip_align(netdev, bufsz);
-                       if (!skb) {
-                               adapter->alloc_rx_buff_failed++;
-                               goto no_buffers;
-                       }
-
-                       buffer_info->skb = skb;
-                       buffer_info->dma = dma_map_single(&pdev->dev, skb->data,
-                                                         bufsz,
-                                                         DMA_FROM_DEVICE);
-               }
-               /* Refresh the desc even if buffer_addrs didn't change because
-                * each write-back erases this info. */
-               if (adapter->rx_ps_hdr_size) {
-                       rx_desc->read.pkt_addr =
-                            cpu_to_le64(buffer_info->page_dma);
-                       rx_desc->read.hdr_addr = cpu_to_le64(buffer_info->dma);
-               } else {
-                       rx_desc->read.pkt_addr =
-                            cpu_to_le64(buffer_info->dma);
-                       rx_desc->read.hdr_addr = 0;
-               }
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-no_buffers:
-       if (rx_ring->next_to_use != i) {
-               rx_ring->next_to_use = i;
-               if (i == 0)
-                       i = (rx_ring->count - 1);
-               else
-                       i--;
-
-               /* Force memory writes to complete before letting h/w
-                * know there are new descriptors to fetch.  (Only
-                * applicable for weak-ordered memory model archs,
-                * such as IA-64). */
-               wmb();
-               writel(i, adapter->hw.hw_addr + rx_ring->tail);
-       }
-}
-
-/**
- * igbvf_clean_rx_irq - Send received data up the network stack; legacy
- * @adapter: board private structure
- *
- * the return value indicates whether actual cleaning was done, there
- * is no guarantee that everything was cleaned
- **/
-static bool igbvf_clean_rx_irq(struct igbvf_adapter *adapter,
-                               int *work_done, int work_to_do)
-{
-       struct igbvf_ring *rx_ring = adapter->rx_ring;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       union e1000_adv_rx_desc *rx_desc, *next_rxd;
-       struct igbvf_buffer *buffer_info, *next_buffer;
-       struct sk_buff *skb;
-       bool cleaned = false;
-       int cleaned_count = 0;
-       unsigned int total_bytes = 0, total_packets = 0;
-       unsigned int i;
-       u32 length, hlen, staterr;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = IGBVF_RX_DESC_ADV(*rx_ring, i);
-       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-
-       while (staterr & E1000_RXD_STAT_DD) {
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-               rmb(); /* read descriptor and rx_buffer_info after status DD */
-
-               buffer_info = &rx_ring->buffer_info[i];
-
-               /* HW will not DMA in data larger than the given buffer, even
-                * if it parses the (NFS, of course) header to be larger.  In
-                * that case, it fills the header buffer and spills the rest
-                * into the page.
-                */
-               hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hs_rss.hdr_info) &
-                 E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT;
-               if (hlen > adapter->rx_ps_hdr_size)
-                       hlen = adapter->rx_ps_hdr_size;
-
-               length = le16_to_cpu(rx_desc->wb.upper.length);
-               cleaned = true;
-               cleaned_count++;
-
-               skb = buffer_info->skb;
-               prefetch(skb->data - NET_IP_ALIGN);
-               buffer_info->skb = NULL;
-               if (!adapter->rx_ps_hdr_size) {
-                       dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                        adapter->rx_buffer_len,
-                                        DMA_FROM_DEVICE);
-                       buffer_info->dma = 0;
-                       skb_put(skb, length);
-                       goto send_up;
-               }
-
-               if (!skb_shinfo(skb)->nr_frags) {
-                       dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                        adapter->rx_ps_hdr_size,
-                                        DMA_FROM_DEVICE);
-                       skb_put(skb, hlen);
-               }
-
-               if (length) {
-                       dma_unmap_page(&pdev->dev, buffer_info->page_dma,
-                                      PAGE_SIZE / 2,
-                                      DMA_FROM_DEVICE);
-                       buffer_info->page_dma = 0;
-
-                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
-                                          buffer_info->page,
-                                          buffer_info->page_offset,
-                                          length);
-
-                       if ((adapter->rx_buffer_len > (PAGE_SIZE / 2)) ||
-                           (page_count(buffer_info->page) != 1))
-                               buffer_info->page = NULL;
-                       else
-                               get_page(buffer_info->page);
-
-                       skb->len += length;
-                       skb->data_len += length;
-                       skb->truesize += length;
-               }
-send_up:
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               next_rxd = IGBVF_RX_DESC_ADV(*rx_ring, i);
-               prefetch(next_rxd);
-               next_buffer = &rx_ring->buffer_info[i];
-
-               if (!(staterr & E1000_RXD_STAT_EOP)) {
-                       buffer_info->skb = next_buffer->skb;
-                       buffer_info->dma = next_buffer->dma;
-                       next_buffer->skb = skb;
-                       next_buffer->dma = 0;
-                       goto next_desc;
-               }
-
-               if (staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) {
-                       dev_kfree_skb_irq(skb);
-                       goto next_desc;
-               }
-
-               total_bytes += skb->len;
-               total_packets++;
-
-               igbvf_rx_checksum_adv(adapter, staterr, skb);
-
-               skb->protocol = eth_type_trans(skb, netdev);
-
-               igbvf_receive_skb(adapter, netdev, skb, staterr,
-                                 rx_desc->wb.upper.vlan);
-
-next_desc:
-               rx_desc->wb.upper.status_error = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (cleaned_count >= IGBVF_RX_BUFFER_WRITE) {
-                       igbvf_alloc_rx_buffers(rx_ring, cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-
-               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-       }
-
-       rx_ring->next_to_clean = i;
-       cleaned_count = igbvf_desc_unused(rx_ring);
-
-       if (cleaned_count)
-               igbvf_alloc_rx_buffers(rx_ring, cleaned_count);
-
-       adapter->total_rx_packets += total_packets;
-       adapter->total_rx_bytes += total_bytes;
-       adapter->net_stats.rx_bytes += total_bytes;
-       adapter->net_stats.rx_packets += total_packets;
-       return cleaned;
-}
-
-static void igbvf_put_txbuf(struct igbvf_adapter *adapter,
-                            struct igbvf_buffer *buffer_info)
-{
-       if (buffer_info->dma) {
-               if (buffer_info->mapped_as_page)
-                       dma_unmap_page(&adapter->pdev->dev,
-                                      buffer_info->dma,
-                                      buffer_info->length,
-                                      DMA_TO_DEVICE);
-               else
-                       dma_unmap_single(&adapter->pdev->dev,
-                                        buffer_info->dma,
-                                        buffer_info->length,
-                                        DMA_TO_DEVICE);
-               buffer_info->dma = 0;
-       }
-       if (buffer_info->skb) {
-               dev_kfree_skb_any(buffer_info->skb);
-               buffer_info->skb = NULL;
-       }
-       buffer_info->time_stamp = 0;
-}
-
-/**
- * igbvf_setup_tx_resources - allocate Tx resources (Descriptors)
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-int igbvf_setup_tx_resources(struct igbvf_adapter *adapter,
-                             struct igbvf_ring *tx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int size;
-
-       size = sizeof(struct igbvf_buffer) * tx_ring->count;
-       tx_ring->buffer_info = vzalloc(size);
-       if (!tx_ring->buffer_info)
-               goto err;
-
-       /* round up to nearest 4K */
-       tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc);
-       tx_ring->size = ALIGN(tx_ring->size, 4096);
-
-       tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
-                                          &tx_ring->dma, GFP_KERNEL);
-
-       if (!tx_ring->desc)
-               goto err;
-
-       tx_ring->adapter = adapter;
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-
-       return 0;
-err:
-       vfree(tx_ring->buffer_info);
-       dev_err(&adapter->pdev->dev,
-               "Unable to allocate memory for the transmit descriptor ring\n");
-       return -ENOMEM;
-}
-
-/**
- * igbvf_setup_rx_resources - allocate Rx resources (Descriptors)
- * @adapter: board private structure
- *
- * Returns 0 on success, negative on failure
- **/
-int igbvf_setup_rx_resources(struct igbvf_adapter *adapter,
-                            struct igbvf_ring *rx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int size, desc_len;
-
-       size = sizeof(struct igbvf_buffer) * rx_ring->count;
-       rx_ring->buffer_info = vzalloc(size);
-       if (!rx_ring->buffer_info)
-               goto err;
-
-       desc_len = sizeof(union e1000_adv_rx_desc);
-
-       /* Round up to nearest 4K */
-       rx_ring->size = rx_ring->count * desc_len;
-       rx_ring->size = ALIGN(rx_ring->size, 4096);
-
-       rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
-                                          &rx_ring->dma, GFP_KERNEL);
-
-       if (!rx_ring->desc)
-               goto err;
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       rx_ring->adapter = adapter;
-
-       return 0;
-
-err:
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-       dev_err(&adapter->pdev->dev,
-               "Unable to allocate memory for the receive descriptor ring\n");
-       return -ENOMEM;
-}
-
-/**
- * igbvf_clean_tx_ring - Free Tx Buffers
- * @tx_ring: ring to be cleaned
- **/
-static void igbvf_clean_tx_ring(struct igbvf_ring *tx_ring)
-{
-       struct igbvf_adapter *adapter = tx_ring->adapter;
-       struct igbvf_buffer *buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       if (!tx_ring->buffer_info)
-               return;
-
-       /* Free all the Tx ring sk_buffs */
-       for (i = 0; i < tx_ring->count; i++) {
-               buffer_info = &tx_ring->buffer_info[i];
-               igbvf_put_txbuf(adapter, buffer_info);
-       }
-
-       size = sizeof(struct igbvf_buffer) * tx_ring->count;
-       memset(tx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-
-       writel(0, adapter->hw.hw_addr + tx_ring->head);
-       writel(0, adapter->hw.hw_addr + tx_ring->tail);
-}
-
-/**
- * igbvf_free_tx_resources - Free Tx Resources per Queue
- * @tx_ring: ring to free resources from
- *
- * Free all transmit software resources
- **/
-void igbvf_free_tx_resources(struct igbvf_ring *tx_ring)
-{
-       struct pci_dev *pdev = tx_ring->adapter->pdev;
-
-       igbvf_clean_tx_ring(tx_ring);
-
-       vfree(tx_ring->buffer_info);
-       tx_ring->buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
-                         tx_ring->dma);
-
-       tx_ring->desc = NULL;
-}
-
-/**
- * igbvf_clean_rx_ring - Free Rx Buffers per Queue
- * @adapter: board private structure
- **/
-static void igbvf_clean_rx_ring(struct igbvf_ring *rx_ring)
-{
-       struct igbvf_adapter *adapter = rx_ring->adapter;
-       struct igbvf_buffer *buffer_info;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned long size;
-       unsigned int i;
-
-       if (!rx_ring->buffer_info)
-               return;
-
-       /* Free all the Rx ring sk_buffs */
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               if (buffer_info->dma) {
-                       if (adapter->rx_ps_hdr_size){
-                               dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                                adapter->rx_ps_hdr_size,
-                                                DMA_FROM_DEVICE);
-                       } else {
-                               dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                                adapter->rx_buffer_len,
-                                                DMA_FROM_DEVICE);
-                       }
-                       buffer_info->dma = 0;
-               }
-
-               if (buffer_info->skb) {
-                       dev_kfree_skb(buffer_info->skb);
-                       buffer_info->skb = NULL;
-               }
-
-               if (buffer_info->page) {
-                       if (buffer_info->page_dma)
-                               dma_unmap_page(&pdev->dev,
-                                              buffer_info->page_dma,
-                                              PAGE_SIZE / 2,
-                                              DMA_FROM_DEVICE);
-                       put_page(buffer_info->page);
-                       buffer_info->page = NULL;
-                       buffer_info->page_dma = 0;
-                       buffer_info->page_offset = 0;
-               }
-       }
-
-       size = sizeof(struct igbvf_buffer) * rx_ring->count;
-       memset(rx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       writel(0, adapter->hw.hw_addr + rx_ring->head);
-       writel(0, adapter->hw.hw_addr + rx_ring->tail);
-}
-
-/**
- * igbvf_free_rx_resources - Free Rx Resources
- * @rx_ring: ring to clean the resources from
- *
- * Free all receive software resources
- **/
-
-void igbvf_free_rx_resources(struct igbvf_ring *rx_ring)
-{
-       struct pci_dev *pdev = rx_ring->adapter->pdev;
-
-       igbvf_clean_rx_ring(rx_ring);
-
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
-                         rx_ring->dma);
-       rx_ring->desc = NULL;
-}
-
-/**
- * igbvf_update_itr - update the dynamic ITR value based on statistics
- * @adapter: pointer to adapter
- * @itr_setting: current adapter->itr
- * @packets: the number of packets during this measurement interval
- * @bytes: the number of bytes during this measurement interval
- *
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.  This functionality is controlled
- *      by the InterruptThrottleRate module parameter.
- **/
-static unsigned int igbvf_update_itr(struct igbvf_adapter *adapter,
-                                     u16 itr_setting, int packets,
-                                     int bytes)
-{
-       unsigned int retval = itr_setting;
-
-       if (packets == 0)
-               goto update_itr_done;
-
-       switch (itr_setting) {
-       case lowest_latency:
-               /* handle TSO and jumbo frames */
-               if (bytes/packets > 8000)
-                       retval = bulk_latency;
-               else if ((packets < 5) && (bytes > 512))
-                       retval = low_latency;
-               break;
-       case low_latency:  /* 50 usec aka 20000 ints/s */
-               if (bytes > 10000) {
-                       /* this if handles the TSO accounting */
-                       if (bytes/packets > 8000)
-                               retval = bulk_latency;
-                       else if ((packets < 10) || ((bytes/packets) > 1200))
-                               retval = bulk_latency;
-                       else if ((packets > 35))
-                               retval = lowest_latency;
-               } else if (bytes/packets > 2000) {
-                       retval = bulk_latency;
-               } else if (packets <= 2 && bytes < 512) {
-                       retval = lowest_latency;
-               }
-               break;
-       case bulk_latency: /* 250 usec aka 4000 ints/s */
-               if (bytes > 25000) {
-                       if (packets > 35)
-                               retval = low_latency;
-               } else if (bytes < 6000) {
-                       retval = low_latency;
-               }
-               break;
-       }
-
-update_itr_done:
-       return retval;
-}
-
-static void igbvf_set_itr(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 current_itr;
-       u32 new_itr = adapter->itr;
-
-       adapter->tx_itr = igbvf_update_itr(adapter, adapter->tx_itr,
-                                          adapter->total_tx_packets,
-                                          adapter->total_tx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
-               adapter->tx_itr = low_latency;
-
-       adapter->rx_itr = igbvf_update_itr(adapter, adapter->rx_itr,
-                                          adapter->total_rx_packets,
-                                          adapter->total_rx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
-               adapter->rx_itr = low_latency;
-
-       current_itr = max(adapter->rx_itr, adapter->tx_itr);
-
-       switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
-       case lowest_latency:
-               new_itr = 70000;
-               break;
-       case low_latency:
-               new_itr = 20000; /* aka hwitr = ~200 */
-               break;
-       case bulk_latency:
-               new_itr = 4000;
-               break;
-       default:
-               break;
-       }
-
-       if (new_itr != adapter->itr) {
-               /*
-                * this attempts to bias the interrupt rate towards Bulk
-                * by adding intermediate steps when interrupt rate is
-                * increasing
-                */
-               new_itr = new_itr > adapter->itr ?
-                            min(adapter->itr + (new_itr >> 2), new_itr) :
-                            new_itr;
-               adapter->itr = new_itr;
-               adapter->rx_ring->itr_val = 1952;
-
-               if (adapter->msix_entries)
-                       adapter->rx_ring->set_itr = 1;
-               else
-                       ew32(ITR, 1952);
-       }
-}
-
-/**
- * igbvf_clean_tx_irq - Reclaim resources after transmit completes
- * @adapter: board private structure
- * returns true if ring is completely cleaned
- **/
-static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
-{
-       struct igbvf_adapter *adapter = tx_ring->adapter;
-       struct net_device *netdev = adapter->netdev;
-       struct igbvf_buffer *buffer_info;
-       struct sk_buff *skb;
-       union e1000_adv_tx_desc *tx_desc, *eop_desc;
-       unsigned int total_bytes = 0, total_packets = 0;
-       unsigned int i, eop, count = 0;
-       bool cleaned = false;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->buffer_info[i].next_to_watch;
-       eop_desc = IGBVF_TX_DESC_ADV(*tx_ring, eop);
-
-       while ((eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)) &&
-              (count < tx_ring->count)) {
-               rmb();  /* read buffer_info after eop_desc status */
-               for (cleaned = false; !cleaned; count++) {
-                       tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
-                       buffer_info = &tx_ring->buffer_info[i];
-                       cleaned = (i == eop);
-                       skb = buffer_info->skb;
-
-                       if (skb) {
-                               unsigned int segs, bytecount;
-
-                               /* gso_segs is currently only valid for tcp */
-                               segs = skb_shinfo(skb)->gso_segs ?: 1;
-                               /* multiply data chunks by size of headers */
-                               bytecount = ((segs - 1) * skb_headlen(skb)) +
-                                           skb->len;
-                               total_packets += segs;
-                               total_bytes += bytecount;
-                       }
-
-                       igbvf_put_txbuf(adapter, buffer_info);
-                       tx_desc->wb.status = 0;
-
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-               eop = tx_ring->buffer_info[i].next_to_watch;
-               eop_desc = IGBVF_TX_DESC_ADV(*tx_ring, eop);
-       }
-
-       tx_ring->next_to_clean = i;
-
-       if (unlikely(count &&
-                    netif_carrier_ok(netdev) &&
-                    igbvf_desc_unused(tx_ring) >= IGBVF_TX_QUEUE_WAKE)) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean.
-                */
-               smp_mb();
-               if (netif_queue_stopped(netdev) &&
-                   !(test_bit(__IGBVF_DOWN, &adapter->state))) {
-                       netif_wake_queue(netdev);
-                       ++adapter->restart_queue;
-               }
-       }
-
-       adapter->net_stats.tx_bytes += total_bytes;
-       adapter->net_stats.tx_packets += total_packets;
-       return count < tx_ring->count;
-}
-
-static irqreturn_t igbvf_msix_other(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       adapter->int_counter1++;
-
-       netif_carrier_off(netdev);
-       hw->mac.get_link_status = 1;
-       if (!test_bit(__IGBVF_DOWN, &adapter->state))
-               mod_timer(&adapter->watchdog_timer, jiffies + 1);
-
-       ew32(EIMS, adapter->eims_other);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t igbvf_intr_msix_tx(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct igbvf_ring *tx_ring = adapter->tx_ring;
-
-
-       adapter->total_tx_bytes = 0;
-       adapter->total_tx_packets = 0;
-
-       /* auto mask will automatically reenable the interrupt when we write
-        * EICS */
-       if (!igbvf_clean_tx_irq(tx_ring))
-               /* Ring was not completely cleaned, so fire another interrupt */
-               ew32(EICS, tx_ring->eims_value);
-       else
-               ew32(EIMS, tx_ring->eims_value);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t igbvf_intr_msix_rx(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       adapter->int_counter0++;
-
-       /* Write the ITR value calculated at the end of the
-        * previous interrupt.
-        */
-       if (adapter->rx_ring->set_itr) {
-               writel(adapter->rx_ring->itr_val,
-                      adapter->hw.hw_addr + adapter->rx_ring->itr_register);
-               adapter->rx_ring->set_itr = 0;
-       }
-
-       if (napi_schedule_prep(&adapter->rx_ring->napi)) {
-               adapter->total_rx_bytes = 0;
-               adapter->total_rx_packets = 0;
-               __napi_schedule(&adapter->rx_ring->napi);
-       }
-
-       return IRQ_HANDLED;
-}
-
-#define IGBVF_NO_QUEUE -1
-
-static void igbvf_assign_vector(struct igbvf_adapter *adapter, int rx_queue,
-                                int tx_queue, int msix_vector)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ivar, index;
-
-       /* 82576 uses a table-based method for assigning vectors.
-          Each queue has a single entry in the table to which we write
-          a vector number along with a "valid" bit.  Sadly, the layout
-          of the table is somewhat counterintuitive. */
-       if (rx_queue > IGBVF_NO_QUEUE) {
-               index = (rx_queue >> 1);
-               ivar = array_er32(IVAR0, index);
-               if (rx_queue & 0x1) {
-                       /* vector goes into third byte of register */
-                       ivar = ivar & 0xFF00FFFF;
-                       ivar |= (msix_vector | E1000_IVAR_VALID) << 16;
-               } else {
-                       /* vector goes into low byte of register */
-                       ivar = ivar & 0xFFFFFF00;
-                       ivar |= msix_vector | E1000_IVAR_VALID;
-               }
-               adapter->rx_ring[rx_queue].eims_value = 1 << msix_vector;
-               array_ew32(IVAR0, index, ivar);
-       }
-       if (tx_queue > IGBVF_NO_QUEUE) {
-               index = (tx_queue >> 1);
-               ivar = array_er32(IVAR0, index);
-               if (tx_queue & 0x1) {
-                       /* vector goes into high byte of register */
-                       ivar = ivar & 0x00FFFFFF;
-                       ivar |= (msix_vector | E1000_IVAR_VALID) << 24;
-               } else {
-                       /* vector goes into second byte of register */
-                       ivar = ivar & 0xFFFF00FF;
-                       ivar |= (msix_vector | E1000_IVAR_VALID) << 8;
-               }
-               adapter->tx_ring[tx_queue].eims_value = 1 << msix_vector;
-               array_ew32(IVAR0, index, ivar);
-       }
-}
-
-/**
- * igbvf_configure_msix - Configure MSI-X hardware
- *
- * igbvf_configure_msix sets up the hardware to properly
- * generate MSI-X interrupts.
- **/
-static void igbvf_configure_msix(struct igbvf_adapter *adapter)
-{
-       u32 tmp;
-       struct e1000_hw *hw = &adapter->hw;
-       struct igbvf_ring *tx_ring = adapter->tx_ring;
-       struct igbvf_ring *rx_ring = adapter->rx_ring;
-       int vector = 0;
-
-       adapter->eims_enable_mask = 0;
-
-       igbvf_assign_vector(adapter, IGBVF_NO_QUEUE, 0, vector++);
-       adapter->eims_enable_mask |= tx_ring->eims_value;
-       if (tx_ring->itr_val)
-               writel(tx_ring->itr_val,
-                      hw->hw_addr + tx_ring->itr_register);
-       else
-               writel(1952, hw->hw_addr + tx_ring->itr_register);
-
-       igbvf_assign_vector(adapter, 0, IGBVF_NO_QUEUE, vector++);
-       adapter->eims_enable_mask |= rx_ring->eims_value;
-       if (rx_ring->itr_val)
-               writel(rx_ring->itr_val,
-                      hw->hw_addr + rx_ring->itr_register);
-       else
-               writel(1952, hw->hw_addr + rx_ring->itr_register);
-
-       /* set vector for other causes, i.e. link changes */
-
-       tmp = (vector++ | E1000_IVAR_VALID);
-
-       ew32(IVAR_MISC, tmp);
-
-       adapter->eims_enable_mask = (1 << (vector)) - 1;
-       adapter->eims_other = 1 << (vector - 1);
-       e1e_flush();
-}
-
-static void igbvf_reset_interrupt_capability(struct igbvf_adapter *adapter)
-{
-       if (adapter->msix_entries) {
-               pci_disable_msix(adapter->pdev);
-               kfree(adapter->msix_entries);
-               adapter->msix_entries = NULL;
-       }
-}
-
-/**
- * igbvf_set_interrupt_capability - set MSI or MSI-X if supported
- *
- * Attempt to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-static void igbvf_set_interrupt_capability(struct igbvf_adapter *adapter)
-{
-       int err = -ENOMEM;
-       int i;
-
-       /* we allocate 3 vectors, 1 for tx, 1 for rx, one for pf messages */
-       adapter->msix_entries = kcalloc(3, sizeof(struct msix_entry),
-                                       GFP_KERNEL);
-       if (adapter->msix_entries) {
-               for (i = 0; i < 3; i++)
-                       adapter->msix_entries[i].entry = i;
-
-               err = pci_enable_msix(adapter->pdev,
-                                     adapter->msix_entries, 3);
-       }
-
-       if (err) {
-               /* MSI-X failed */
-               dev_err(&adapter->pdev->dev,
-                       "Failed to initialize MSI-X interrupts.\n");
-               igbvf_reset_interrupt_capability(adapter);
-       }
-}
-
-/**
- * igbvf_request_msix - Initialize MSI-X interrupts
- *
- * igbvf_request_msix allocates MSI-X vectors and requests interrupts from the
- * kernel.
- **/
-static int igbvf_request_msix(struct igbvf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int err = 0, vector = 0;
-
-       if (strlen(netdev->name) < (IFNAMSIZ - 5)) {
-               sprintf(adapter->tx_ring->name, "%s-tx-0", netdev->name);
-               sprintf(adapter->rx_ring->name, "%s-rx-0", netdev->name);
-       } else {
-               memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
-               memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
-       }
-
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         igbvf_intr_msix_tx, 0, adapter->tx_ring->name,
-                         netdev);
-       if (err)
-               goto out;
-
-       adapter->tx_ring->itr_register = E1000_EITR(vector);
-       adapter->tx_ring->itr_val = 1952;
-       vector++;
-
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
-                         netdev);
-       if (err)
-               goto out;
-
-       adapter->rx_ring->itr_register = E1000_EITR(vector);
-       adapter->rx_ring->itr_val = 1952;
-       vector++;
-
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         igbvf_msix_other, 0, netdev->name, netdev);
-       if (err)
-               goto out;
-
-       igbvf_configure_msix(adapter);
-       return 0;
-out:
-       return err;
-}
-
-/**
- * igbvf_alloc_queues - Allocate memory for all rings
- * @adapter: board private structure to initialize
- **/
-static int __devinit igbvf_alloc_queues(struct igbvf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       adapter->tx_ring = kzalloc(sizeof(struct igbvf_ring), GFP_KERNEL);
-       if (!adapter->tx_ring)
-               return -ENOMEM;
-
-       adapter->rx_ring = kzalloc(sizeof(struct igbvf_ring), GFP_KERNEL);
-       if (!adapter->rx_ring) {
-               kfree(adapter->tx_ring);
-               return -ENOMEM;
-       }
-
-       netif_napi_add(netdev, &adapter->rx_ring->napi, igbvf_poll, 64);
-
-       return 0;
-}
-
-/**
- * igbvf_request_irq - initialize interrupts
- *
- * Attempts to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-static int igbvf_request_irq(struct igbvf_adapter *adapter)
-{
-       int err = -1;
-
-       /* igbvf supports msi-x only */
-       if (adapter->msix_entries)
-               err = igbvf_request_msix(adapter);
-
-       if (!err)
-               return err;
-
-       dev_err(&adapter->pdev->dev,
-               "Unable to allocate interrupt, Error: %d\n", err);
-
-       return err;
-}
-
-static void igbvf_free_irq(struct igbvf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int vector;
-
-       if (adapter->msix_entries) {
-               for (vector = 0; vector < 3; vector++)
-                       free_irq(adapter->msix_entries[vector].vector, netdev);
-       }
-}
-
-/**
- * igbvf_irq_disable - Mask off interrupt generation on the NIC
- **/
-static void igbvf_irq_disable(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(EIMC, ~0);
-
-       if (adapter->msix_entries)
-               ew32(EIAC, 0);
-}
-
-/**
- * igbvf_irq_enable - Enable default interrupt generation settings
- **/
-static void igbvf_irq_enable(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(EIAC, adapter->eims_enable_mask);
-       ew32(EIAM, adapter->eims_enable_mask);
-       ew32(EIMS, adapter->eims_enable_mask);
-}
-
-/**
- * igbvf_poll - NAPI Rx polling callback
- * @napi: struct associated with this polling callback
- * @budget: amount of packets driver is allowed to process this poll
- **/
-static int igbvf_poll(struct napi_struct *napi, int budget)
-{
-       struct igbvf_ring *rx_ring = container_of(napi, struct igbvf_ring, napi);
-       struct igbvf_adapter *adapter = rx_ring->adapter;
-       struct e1000_hw *hw = &adapter->hw;
-       int work_done = 0;
-
-       igbvf_clean_rx_irq(adapter, &work_done, budget);
-
-       /* If not enough Rx work done, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-
-               if (adapter->itr_setting & 3)
-                       igbvf_set_itr(adapter);
-
-               if (!test_bit(__IGBVF_DOWN, &adapter->state))
-                       ew32(EIMS, adapter->rx_ring->eims_value);
-       }
-
-       return work_done;
-}
-
-/**
- * igbvf_set_rlpml - set receive large packet maximum length
- * @adapter: board private structure
- *
- * Configure the maximum size of packets that will be received
- */
-static void igbvf_set_rlpml(struct igbvf_adapter *adapter)
-{
-       int max_frame_size;
-       struct e1000_hw *hw = &adapter->hw;
-
-       max_frame_size = adapter->max_frame_size + VLAN_TAG_SIZE;
-       e1000_rlpml_set_vf(hw, max_frame_size);
-}
-
-static void igbvf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (hw->mac.ops.set_vfta(hw, vid, true))
-               dev_err(&adapter->pdev->dev, "Failed to add vlan id %d\n", vid);
-       else
-               set_bit(vid, adapter->active_vlans);
-}
-
-static void igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       igbvf_irq_disable(adapter);
-
-       if (!test_bit(__IGBVF_DOWN, &adapter->state))
-               igbvf_irq_enable(adapter);
-
-       if (hw->mac.ops.set_vfta(hw, vid, false))
-               dev_err(&adapter->pdev->dev,
-                       "Failed to remove vlan id %d\n", vid);
-       else
-               clear_bit(vid, adapter->active_vlans);
-}
-
-static void igbvf_restore_vlan(struct igbvf_adapter *adapter)
-{
-       u16 vid;
-
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               igbvf_vlan_rx_add_vid(adapter->netdev, vid);
-}
-
-/**
- * igbvf_configure_tx - Configure Transmit Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-static void igbvf_configure_tx(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct igbvf_ring *tx_ring = adapter->tx_ring;
-       u64 tdba;
-       u32 txdctl, dca_txctrl;
-
-       /* disable transmits */
-       txdctl = er32(TXDCTL(0));
-       ew32(TXDCTL(0), txdctl & ~E1000_TXDCTL_QUEUE_ENABLE);
-       e1e_flush();
-       msleep(10);
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-       ew32(TDLEN(0), tx_ring->count * sizeof(union e1000_adv_tx_desc));
-       tdba = tx_ring->dma;
-       ew32(TDBAL(0), (tdba & DMA_BIT_MASK(32)));
-       ew32(TDBAH(0), (tdba >> 32));
-       ew32(TDH(0), 0);
-       ew32(TDT(0), 0);
-       tx_ring->head = E1000_TDH(0);
-       tx_ring->tail = E1000_TDT(0);
-
-       /* Turn off Relaxed Ordering on head write-backs.  The writebacks
-        * MUST be delivered in order or it will completely screw up
-        * our bookeeping.
-        */
-       dca_txctrl = er32(DCA_TXCTRL(0));
-       dca_txctrl &= ~E1000_DCA_TXCTRL_TX_WB_RO_EN;
-       ew32(DCA_TXCTRL(0), dca_txctrl);
-
-       /* enable transmits */
-       txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
-       ew32(TXDCTL(0), txdctl);
-
-       /* Setup Transmit Descriptor Settings for eop descriptor */
-       adapter->txd_cmd = E1000_ADVTXD_DCMD_EOP | E1000_ADVTXD_DCMD_IFCS;
-
-       /* enable Report Status bit */
-       adapter->txd_cmd |= E1000_ADVTXD_DCMD_RS;
-}
-
-/**
- * igbvf_setup_srrctl - configure the receive control registers
- * @adapter: Board private structure
- **/
-static void igbvf_setup_srrctl(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 srrctl = 0;
-
-       srrctl &= ~(E1000_SRRCTL_DESCTYPE_MASK |
-                   E1000_SRRCTL_BSIZEHDR_MASK |
-                   E1000_SRRCTL_BSIZEPKT_MASK);
-
-       /* Enable queue drop to avoid head of line blocking */
-       srrctl |= E1000_SRRCTL_DROP_EN;
-
-       /* Setup buffer sizes */
-       srrctl |= ALIGN(adapter->rx_buffer_len, 1024) >>
-                 E1000_SRRCTL_BSIZEPKT_SHIFT;
-
-       if (adapter->rx_buffer_len < 2048) {
-               adapter->rx_ps_hdr_size = 0;
-               srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF;
-       } else {
-               adapter->rx_ps_hdr_size = 128;
-               srrctl |= adapter->rx_ps_hdr_size <<
-                         E1000_SRRCTL_BSIZEHDRSIZE_SHIFT;
-               srrctl |= E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
-       }
-
-       ew32(SRRCTL(0), srrctl);
-}
-
-/**
- * igbvf_configure_rx - Configure Receive Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-static void igbvf_configure_rx(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct igbvf_ring *rx_ring = adapter->rx_ring;
-       u64 rdba;
-       u32 rdlen, rxdctl;
-
-       /* disable receives */
-       rxdctl = er32(RXDCTL(0));
-       ew32(RXDCTL(0), rxdctl & ~E1000_RXDCTL_QUEUE_ENABLE);
-       e1e_flush();
-       msleep(10);
-
-       rdlen = rx_ring->count * sizeof(union e1000_adv_rx_desc);
-
-       /*
-        * Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring
-        */
-       rdba = rx_ring->dma;
-       ew32(RDBAL(0), (rdba & DMA_BIT_MASK(32)));
-       ew32(RDBAH(0), (rdba >> 32));
-       ew32(RDLEN(0), rx_ring->count * sizeof(union e1000_adv_rx_desc));
-       rx_ring->head = E1000_RDH(0);
-       rx_ring->tail = E1000_RDT(0);
-       ew32(RDH(0), 0);
-       ew32(RDT(0), 0);
-
-       rxdctl |= E1000_RXDCTL_QUEUE_ENABLE;
-       rxdctl &= 0xFFF00000;
-       rxdctl |= IGBVF_RX_PTHRESH;
-       rxdctl |= IGBVF_RX_HTHRESH << 8;
-       rxdctl |= IGBVF_RX_WTHRESH << 16;
-
-       igbvf_set_rlpml(adapter);
-
-       /* enable receives */
-       ew32(RXDCTL(0), rxdctl);
-}
-
-/**
- * igbvf_set_multi - Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_multi entry point is called whenever the multicast address
- * list or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper multicast,
- * promiscuous mode, and all-multi behavior.
- **/
-static void igbvf_set_multi(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct netdev_hw_addr *ha;
-       u8  *mta_list = NULL;
-       int i;
-
-       if (!netdev_mc_empty(netdev)) {
-               mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
-               if (!mta_list) {
-                       dev_err(&adapter->pdev->dev,
-                               "failed to allocate multicast filter list\n");
-                       return;
-               }
-       }
-
-       /* prepare a packed array of only addresses. */
-       i = 0;
-       netdev_for_each_mc_addr(ha, netdev)
-               memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
-
-       hw->mac.ops.update_mc_addr_list(hw, mta_list, i, 0, 0);
-       kfree(mta_list);
-}
-
-/**
- * igbvf_configure - configure the hardware for Rx and Tx
- * @adapter: private board structure
- **/
-static void igbvf_configure(struct igbvf_adapter *adapter)
-{
-       igbvf_set_multi(adapter->netdev);
-
-       igbvf_restore_vlan(adapter);
-
-       igbvf_configure_tx(adapter);
-       igbvf_setup_srrctl(adapter);
-       igbvf_configure_rx(adapter);
-       igbvf_alloc_rx_buffers(adapter->rx_ring,
-                              igbvf_desc_unused(adapter->rx_ring));
-}
-
-/* igbvf_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.
- */
-static void igbvf_reset(struct igbvf_adapter *adapter)
-{
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Allow time for pending master requests to run */
-       if (mac->ops.reset_hw(hw))
-               dev_err(&adapter->pdev->dev, "PF still resetting\n");
-
-       mac->ops.init_hw(hw);
-
-       if (is_valid_ether_addr(adapter->hw.mac.addr)) {
-               memcpy(netdev->dev_addr, adapter->hw.mac.addr,
-                      netdev->addr_len);
-               memcpy(netdev->perm_addr, adapter->hw.mac.addr,
-                      netdev->addr_len);
-       }
-
-       adapter->last_reset = jiffies;
-}
-
-int igbvf_up(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* hardware has been reset, we need to reload some things */
-       igbvf_configure(adapter);
-
-       clear_bit(__IGBVF_DOWN, &adapter->state);
-
-       napi_enable(&adapter->rx_ring->napi);
-       if (adapter->msix_entries)
-               igbvf_configure_msix(adapter);
-
-       /* Clear any pending interrupts. */
-       er32(EICR);
-       igbvf_irq_enable(adapter);
-
-       /* start the watchdog */
-       hw->mac.get_link_status = 1;
-       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-
-
-       return 0;
-}
-
-void igbvf_down(struct igbvf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rxdctl, txdctl;
-
-       /*
-        * signal that we're down so the interrupt handler does not
-        * reschedule our watchdog timer
-        */
-       set_bit(__IGBVF_DOWN, &adapter->state);
-
-       /* disable receives in the hardware */
-       rxdctl = er32(RXDCTL(0));
-       ew32(RXDCTL(0), rxdctl & ~E1000_RXDCTL_QUEUE_ENABLE);
-
-       netif_stop_queue(netdev);
-
-       /* disable transmits in the hardware */
-       txdctl = er32(TXDCTL(0));
-       ew32(TXDCTL(0), txdctl & ~E1000_TXDCTL_QUEUE_ENABLE);
-
-       /* flush both disables and wait for them to finish */
-       e1e_flush();
-       msleep(10);
-
-       napi_disable(&adapter->rx_ring->napi);
-
-       igbvf_irq_disable(adapter);
-
-       del_timer_sync(&adapter->watchdog_timer);
-
-       netif_carrier_off(netdev);
-
-       /* record the stats before reset*/
-       igbvf_update_stats(adapter);
-
-       adapter->link_speed = 0;
-       adapter->link_duplex = 0;
-
-       igbvf_reset(adapter);
-       igbvf_clean_tx_ring(adapter->tx_ring);
-       igbvf_clean_rx_ring(adapter->rx_ring);
-}
-
-void igbvf_reinit_locked(struct igbvf_adapter *adapter)
-{
-       might_sleep();
-       while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
-               msleep(1);
-       igbvf_down(adapter);
-       igbvf_up(adapter);
-       clear_bit(__IGBVF_RESETTING, &adapter->state);
-}
-
-/**
- * igbvf_sw_init - Initialize general software structures (struct igbvf_adapter)
- * @adapter: board private structure to initialize
- *
- * igbvf_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 __devinit igbvf_sw_init(struct igbvf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       s32 rc;
-
-       adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN;
-       adapter->rx_ps_hdr_size = 0;
-       adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
-
-       adapter->tx_int_delay = 8;
-       adapter->tx_abs_int_delay = 32;
-       adapter->rx_int_delay = 0;
-       adapter->rx_abs_int_delay = 8;
-       adapter->itr_setting = 3;
-       adapter->itr = 20000;
-
-       /* 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.mbx.ops.init_params(&adapter->hw);
-       if (rc)
-               return rc;
-
-       igbvf_set_interrupt_capability(adapter);
-
-       if (igbvf_alloc_queues(adapter))
-               return -ENOMEM;
-
-       spin_lock_init(&adapter->tx_queue_lock);
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       igbvf_irq_disable(adapter);
-
-       spin_lock_init(&adapter->stats_lock);
-
-       set_bit(__IGBVF_DOWN, &adapter->state);
-       return 0;
-}
-
-static void igbvf_initialize_last_counter_stats(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       adapter->stats.last_gprc = er32(VFGPRC);
-       adapter->stats.last_gorc = er32(VFGORC);
-       adapter->stats.last_gptc = er32(VFGPTC);
-       adapter->stats.last_gotc = er32(VFGOTC);
-       adapter->stats.last_mprc = er32(VFMPRC);
-       adapter->stats.last_gotlbc = er32(VFGOTLBC);
-       adapter->stats.last_gptlbc = er32(VFGPTLBC);
-       adapter->stats.last_gorlbc = er32(VFGORLBC);
-       adapter->stats.last_gprlbc = er32(VFGPRLBC);
-
-       adapter->stats.base_gprc = er32(VFGPRC);
-       adapter->stats.base_gorc = er32(VFGORC);
-       adapter->stats.base_gptc = er32(VFGPTC);
-       adapter->stats.base_gotc = er32(VFGOTC);
-       adapter->stats.base_mprc = er32(VFMPRC);
-       adapter->stats.base_gotlbc = er32(VFGOTLBC);
-       adapter->stats.base_gptlbc = er32(VFGPTLBC);
-       adapter->stats.base_gorlbc = er32(VFGORLBC);
-       adapter->stats.base_gprlbc = er32(VFGPRLBC);
-}
-
-/**
- * igbvf_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-static int igbvf_open(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int err;
-
-       /* disallow open during test */
-       if (test_bit(__IGBVF_TESTING, &adapter->state))
-               return -EBUSY;
-
-       /* allocate transmit descriptors */
-       err = igbvf_setup_tx_resources(adapter, adapter->tx_ring);
-       if (err)
-               goto err_setup_tx;
-
-       /* allocate receive descriptors */
-       err = igbvf_setup_rx_resources(adapter, adapter->rx_ring);
-       if (err)
-               goto err_setup_rx;
-
-       /*
-        * before we allocate an interrupt, we must be ready to handle it.
-        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
-        * as soon as we call pci_request_irq, so we have to setup our
-        * clean_rx handler before we do so.
-        */
-       igbvf_configure(adapter);
-
-       err = igbvf_request_irq(adapter);
-       if (err)
-               goto err_req_irq;
-
-       /* From here on the code is the same as igbvf_up() */
-       clear_bit(__IGBVF_DOWN, &adapter->state);
-
-       napi_enable(&adapter->rx_ring->napi);
-
-       /* clear any pending interrupts */
-       er32(EICR);
-
-       igbvf_irq_enable(adapter);
-
-       /* start the watchdog */
-       hw->mac.get_link_status = 1;
-       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-
-       return 0;
-
-err_req_irq:
-       igbvf_free_rx_resources(adapter->rx_ring);
-err_setup_rx:
-       igbvf_free_tx_resources(adapter->tx_ring);
-err_setup_tx:
-       igbvf_reset(adapter);
-
-       return err;
-}
-
-/**
- * igbvf_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-static int igbvf_close(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       WARN_ON(test_bit(__IGBVF_RESETTING, &adapter->state));
-       igbvf_down(adapter);
-
-       igbvf_free_irq(adapter);
-
-       igbvf_free_tx_resources(adapter->tx_ring);
-       igbvf_free_rx_resources(adapter->rx_ring);
-
-       return 0;
-}
-/**
- * igbvf_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-static int igbvf_set_mac(struct net_device *netdev, void *p)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
-
-       hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
-
-       if (memcmp(addr->sa_data, hw->mac.addr, 6))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-
-       return 0;
-}
-
-#define UPDATE_VF_COUNTER(reg, name)                                    \
-       {                                                               \
-               u32 current_counter = er32(reg);                        \
-               if (current_counter < adapter->stats.last_##name)       \
-                       adapter->stats.name += 0x100000000LL;           \
-               adapter->stats.last_##name = current_counter;           \
-               adapter->stats.name &= 0xFFFFFFFF00000000LL;            \
-               adapter->stats.name |= current_counter;                 \
-       }
-
-/**
- * igbvf_update_stats - Update the board statistics counters
- * @adapter: board private structure
-**/
-void igbvf_update_stats(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-
-       /*
-        * Prevent stats update while adapter is being reset, link is down
-        * or if the pci connection is down.
-        */
-       if (adapter->link_speed == 0)
-               return;
-
-       if (test_bit(__IGBVF_RESETTING, &adapter->state))
-               return;
-
-       if (pci_channel_offline(pdev))
-               return;
-
-       UPDATE_VF_COUNTER(VFGPRC, gprc);
-       UPDATE_VF_COUNTER(VFGORC, gorc);
-       UPDATE_VF_COUNTER(VFGPTC, gptc);
-       UPDATE_VF_COUNTER(VFGOTC, gotc);
-       UPDATE_VF_COUNTER(VFMPRC, mprc);
-       UPDATE_VF_COUNTER(VFGOTLBC, gotlbc);
-       UPDATE_VF_COUNTER(VFGPTLBC, gptlbc);
-       UPDATE_VF_COUNTER(VFGORLBC, gorlbc);
-       UPDATE_VF_COUNTER(VFGPRLBC, gprlbc);
-
-       /* Fill out the OS statistics structure */
-       adapter->net_stats.multicast = adapter->stats.mprc;
-}
-
-static void igbvf_print_link_info(struct igbvf_adapter *adapter)
-{
-       dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s\n",
-                adapter->link_speed,
-                ((adapter->link_duplex == FULL_DUPLEX) ?
-                 "Full Duplex" : "Half Duplex"));
-}
-
-static bool igbvf_has_link(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       s32 ret_val = E1000_SUCCESS;
-       bool link_active;
-
-       /* If interface is down, stay link down */
-       if (test_bit(__IGBVF_DOWN, &adapter->state))
-               return false;
-
-       ret_val = hw->mac.ops.check_for_link(hw);
-       link_active = !hw->mac.get_link_status;
-
-       /* if check for link returns error we will need to reset */
-       if (ret_val && time_after(jiffies, adapter->last_reset + (10 * HZ)))
-               schedule_work(&adapter->reset_task);
-
-       return link_active;
-}
-
-/**
- * igbvf_watchdog - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void igbvf_watchdog(unsigned long data)
-{
-       struct igbvf_adapter *adapter = (struct igbvf_adapter *) data;
-
-       /* Do the rest outside of interrupt context */
-       schedule_work(&adapter->watchdog_task);
-}
-
-static void igbvf_watchdog_task(struct work_struct *work)
-{
-       struct igbvf_adapter *adapter = container_of(work,
-                                                    struct igbvf_adapter,
-                                                    watchdog_task);
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-       struct igbvf_ring *tx_ring = adapter->tx_ring;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 link;
-       int tx_pending = 0;
-
-       link = igbvf_has_link(adapter);
-
-       if (link) {
-               if (!netif_carrier_ok(netdev)) {
-                       mac->ops.get_link_up_info(&adapter->hw,
-                                                 &adapter->link_speed,
-                                                 &adapter->link_duplex);
-                       igbvf_print_link_info(adapter);
-
-                       netif_carrier_on(netdev);
-                       netif_wake_queue(netdev);
-               }
-       } else {
-               if (netif_carrier_ok(netdev)) {
-                       adapter->link_speed = 0;
-                       adapter->link_duplex = 0;
-                       dev_info(&adapter->pdev->dev, "Link is Down\n");
-                       netif_carrier_off(netdev);
-                       netif_stop_queue(netdev);
-               }
-       }
-
-       if (netif_carrier_ok(netdev)) {
-               igbvf_update_stats(adapter);
-       } else {
-               tx_pending = (igbvf_desc_unused(tx_ring) + 1 <
-                             tx_ring->count);
-               if (tx_pending) {
-                       /*
-                        * We've lost link, so the controller stops DMA,
-                        * but we've got queued Tx work that's never going
-                        * to get done, so reset controller to flush Tx.
-                        * (Do the reset outside of interrupt context).
-                        */
-                       adapter->tx_timeout_count++;
-                       schedule_work(&adapter->reset_task);
-               }
-       }
-
-       /* Cause software interrupt to ensure Rx ring is cleaned */
-       ew32(EICS, adapter->rx_ring->eims_value);
-
-       /* Reset the timer */
-       if (!test_bit(__IGBVF_DOWN, &adapter->state))
-               mod_timer(&adapter->watchdog_timer,
-                         round_jiffies(jiffies + (2 * HZ)));
-}
-
-#define IGBVF_TX_FLAGS_CSUM             0x00000001
-#define IGBVF_TX_FLAGS_VLAN             0x00000002
-#define IGBVF_TX_FLAGS_TSO              0x00000004
-#define IGBVF_TX_FLAGS_IPV4             0x00000008
-#define IGBVF_TX_FLAGS_VLAN_MASK        0xffff0000
-#define IGBVF_TX_FLAGS_VLAN_SHIFT       16
-
-static int igbvf_tso(struct igbvf_adapter *adapter,
-                     struct igbvf_ring *tx_ring,
-                     struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
-{
-       struct e1000_adv_tx_context_desc *context_desc;
-       unsigned int i;
-       int err;
-       struct igbvf_buffer *buffer_info;
-       u32 info = 0, tu_cmd = 0;
-       u32 mss_l4len_idx, l4len;
-       *hdr_len = 0;
-
-       if (skb_header_cloned(skb)) {
-               err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-               if (err) {
-                       dev_err(&adapter->pdev->dev,
-                               "igbvf_tso returning an error\n");
-                       return err;
-               }
-       }
-
-       l4len = tcp_hdrlen(skb);
-       *hdr_len += l4len;
-
-       if (skb->protocol == htons(ETH_P_IP)) {
-               struct iphdr *iph = ip_hdr(skb);
-               iph->tot_len = 0;
-               iph->check = 0;
-               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                        iph->daddr, 0,
-                                                        IPPROTO_TCP,
-                                                        0);
-       } else if (skb_is_gso_v6(skb)) {
-               ipv6_hdr(skb)->payload_len = 0;
-               tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                      &ipv6_hdr(skb)->daddr,
-                                                      0, IPPROTO_TCP, 0);
-       }
-
-       i = tx_ring->next_to_use;
-
-       buffer_info = &tx_ring->buffer_info[i];
-       context_desc = IGBVF_TX_CTXTDESC_ADV(*tx_ring, i);
-       /* VLAN MACLEN IPLEN */
-       if (tx_flags & IGBVF_TX_FLAGS_VLAN)
-               info |= (tx_flags & IGBVF_TX_FLAGS_VLAN_MASK);
-       info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
-       *hdr_len += skb_network_offset(skb);
-       info |= (skb_transport_header(skb) - skb_network_header(skb));
-       *hdr_len += (skb_transport_header(skb) - skb_network_header(skb));
-       context_desc->vlan_macip_lens = cpu_to_le32(info);
-
-       /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
-       tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
-
-       if (skb->protocol == htons(ETH_P_IP))
-               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
-       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
-
-       context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
-
-       /* MSS L4LEN IDX */
-       mss_l4len_idx = (skb_shinfo(skb)->gso_size << E1000_ADVTXD_MSS_SHIFT);
-       mss_l4len_idx |= (l4len << E1000_ADVTXD_L4LEN_SHIFT);
-
-       context_desc->mss_l4len_idx = cpu_to_le32(mss_l4len_idx);
-       context_desc->seqnum_seed = 0;
-
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-       buffer_info->dma = 0;
-       i++;
-       if (i == tx_ring->count)
-               i = 0;
-
-       tx_ring->next_to_use = i;
-
-       return true;
-}
-
-static inline bool igbvf_tx_csum(struct igbvf_adapter *adapter,
-                                 struct igbvf_ring *tx_ring,
-                                 struct sk_buff *skb, u32 tx_flags)
-{
-       struct e1000_adv_tx_context_desc *context_desc;
-       unsigned int i;
-       struct igbvf_buffer *buffer_info;
-       u32 info = 0, tu_cmd = 0;
-
-       if ((skb->ip_summed == CHECKSUM_PARTIAL) ||
-           (tx_flags & IGBVF_TX_FLAGS_VLAN)) {
-               i = tx_ring->next_to_use;
-               buffer_info = &tx_ring->buffer_info[i];
-               context_desc = IGBVF_TX_CTXTDESC_ADV(*tx_ring, i);
-
-               if (tx_flags & IGBVF_TX_FLAGS_VLAN)
-                       info |= (tx_flags & IGBVF_TX_FLAGS_VLAN_MASK);
-
-               info |= (skb_network_offset(skb) << E1000_ADVTXD_MACLEN_SHIFT);
-               if (skb->ip_summed == CHECKSUM_PARTIAL)
-                       info |= (skb_transport_header(skb) -
-                                skb_network_header(skb));
-
-
-               context_desc->vlan_macip_lens = cpu_to_le32(info);
-
-               tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
-
-               if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                       switch (skb->protocol) {
-                       case __constant_htons(ETH_P_IP):
-                               tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;
-                               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
-                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
-                               break;
-                       case __constant_htons(ETH_P_IPV6):
-                               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                                       tu_cmd |= E1000_ADVTXD_TUCMD_L4T_TCP;
-                               break;
-                       default:
-                               break;
-                       }
-               }
-
-               context_desc->type_tucmd_mlhl = cpu_to_le32(tu_cmd);
-               context_desc->seqnum_seed = 0;
-               context_desc->mss_l4len_idx = 0;
-
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-               buffer_info->dma = 0;
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-               tx_ring->next_to_use = i;
-
-               return true;
-       }
-
-       return false;
-}
-
-static int igbvf_maybe_stop_tx(struct net_device *netdev, int size)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       /* there is enough descriptors then we don't need to worry  */
-       if (igbvf_desc_unused(adapter->tx_ring) >= size)
-               return 0;
-
-       netif_stop_queue(netdev);
-
-       smp_mb();
-
-       /* We need to check again just in case room has been made available */
-       if (igbvf_desc_unused(adapter->tx_ring) < size)
-               return -EBUSY;
-
-       netif_wake_queue(netdev);
-
-       ++adapter->restart_queue;
-       return 0;
-}
-
-#define IGBVF_MAX_TXD_PWR       16
-#define IGBVF_MAX_DATA_PER_TXD  (1 << IGBVF_MAX_TXD_PWR)
-
-static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
-                                   struct igbvf_ring *tx_ring,
-                                   struct sk_buff *skb,
-                                   unsigned int first)
-{
-       struct igbvf_buffer *buffer_info;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned int len = skb_headlen(skb);
-       unsigned int count = 0, i;
-       unsigned int f;
-
-       i = tx_ring->next_to_use;
-
-       buffer_info = &tx_ring->buffer_info[i];
-       BUG_ON(len >= IGBVF_MAX_DATA_PER_TXD);
-       buffer_info->length = len;
-       /* set time_stamp *before* dma to help avoid a possible race */
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-       buffer_info->mapped_as_page = false;
-       buffer_info->dma = dma_map_single(&pdev->dev, skb->data, len,
-                                         DMA_TO_DEVICE);
-       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-               goto dma_error;
-
-
-       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
-               struct skb_frag_struct *frag;
-
-               count++;
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-
-               frag = &skb_shinfo(skb)->frags[f];
-               len = frag->size;
-
-               buffer_info = &tx_ring->buffer_info[i];
-               BUG_ON(len >= IGBVF_MAX_DATA_PER_TXD);
-               buffer_info->length = len;
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-               buffer_info->mapped_as_page = true;
-               buffer_info->dma = dma_map_page(&pdev->dev,
-                                               frag->page,
-                                               frag->page_offset,
-                                               len,
-                                               DMA_TO_DEVICE);
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-                       goto dma_error;
-       }
-
-       tx_ring->buffer_info[i].skb = skb;
-       tx_ring->buffer_info[first].next_to_watch = i;
-
-       return ++count;
-
-dma_error:
-       dev_err(&pdev->dev, "TX DMA map failed\n");
-
-       /* clear timestamp and dma mappings for failed buffer_info mapping */
-       buffer_info->dma = 0;
-       buffer_info->time_stamp = 0;
-       buffer_info->length = 0;
-       buffer_info->next_to_watch = 0;
-       buffer_info->mapped_as_page = false;
-       if (count)
-               count--;
-
-       /* clear timestamp and dma mappings for remaining portion of packet */
-       while (count--) {
-               if (i==0)
-                       i += tx_ring->count;
-               i--;
-               buffer_info = &tx_ring->buffer_info[i];
-               igbvf_put_txbuf(adapter, buffer_info);
-       }
-
-       return 0;
-}
-
-static inline void igbvf_tx_queue_adv(struct igbvf_adapter *adapter,
-                                      struct igbvf_ring *tx_ring,
-                                      int tx_flags, int count, u32 paylen,
-                                      u8 hdr_len)
-{
-       union e1000_adv_tx_desc *tx_desc = NULL;
-       struct igbvf_buffer *buffer_info;
-       u32 olinfo_status = 0, cmd_type_len;
-       unsigned int i;
-
-       cmd_type_len = (E1000_ADVTXD_DTYP_DATA | E1000_ADVTXD_DCMD_IFCS |
-                       E1000_ADVTXD_DCMD_DEXT);
-
-       if (tx_flags & IGBVF_TX_FLAGS_VLAN)
-               cmd_type_len |= E1000_ADVTXD_DCMD_VLE;
-
-       if (tx_flags & IGBVF_TX_FLAGS_TSO) {
-               cmd_type_len |= E1000_ADVTXD_DCMD_TSE;
-
-               /* insert tcp checksum */
-               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
-
-               /* insert ip checksum */
-               if (tx_flags & IGBVF_TX_FLAGS_IPV4)
-                       olinfo_status |= E1000_TXD_POPTS_IXSM << 8;
-
-       } else if (tx_flags & IGBVF_TX_FLAGS_CSUM) {
-               olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
-       }
-
-       olinfo_status |= ((paylen - hdr_len) << E1000_ADVTXD_PAYLEN_SHIFT);
-
-       i = tx_ring->next_to_use;
-       while (count--) {
-               buffer_info = &tx_ring->buffer_info[i];
-               tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
-               tx_desc->read.buffer_addr = cpu_to_le64(buffer_info->dma);
-               tx_desc->read.cmd_type_len =
-                        cpu_to_le32(cmd_type_len | buffer_info->length);
-               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-       }
-
-       tx_desc->read.cmd_type_len |= cpu_to_le32(adapter->txd_cmd);
-       /* Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64). */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       writel(i, adapter->hw.hw_addr + tx_ring->tail);
-       /* we need this if more than one processor can write to our tail
-        * at a time, it syncronizes IO on IA64/Altix systems */
-       mmiowb();
-}
-
-static netdev_tx_t igbvf_xmit_frame_ring_adv(struct sk_buff *skb,
-                                            struct net_device *netdev,
-                                            struct igbvf_ring *tx_ring)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       unsigned int first, tx_flags = 0;
-       u8 hdr_len = 0;
-       int count = 0;
-       int tso = 0;
-
-       if (test_bit(__IGBVF_DOWN, &adapter->state)) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (skb->len <= 0) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       /*
-        * need: count + 4 desc gap to keep tail from touching
-         *       + 2 desc gap to keep tail from touching head,
-         *       + 1 desc for skb->data,
-         *       + 1 desc for context descriptor,
-        * head, otherwise try next time
-        */
-       if (igbvf_maybe_stop_tx(netdev, skb_shinfo(skb)->nr_frags + 4)) {
-               /* this is a hard error */
-               return NETDEV_TX_BUSY;
-       }
-
-       if (vlan_tx_tag_present(skb)) {
-               tx_flags |= IGBVF_TX_FLAGS_VLAN;
-               tx_flags |= (vlan_tx_tag_get(skb) << IGBVF_TX_FLAGS_VLAN_SHIFT);
-       }
-
-       if (skb->protocol == htons(ETH_P_IP))
-               tx_flags |= IGBVF_TX_FLAGS_IPV4;
-
-       first = tx_ring->next_to_use;
-
-       tso = skb_is_gso(skb) ?
-               igbvf_tso(adapter, tx_ring, skb, tx_flags, &hdr_len) : 0;
-       if (unlikely(tso < 0)) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (tso)
-               tx_flags |= IGBVF_TX_FLAGS_TSO;
-       else if (igbvf_tx_csum(adapter, tx_ring, skb, tx_flags) &&
-                (skb->ip_summed == CHECKSUM_PARTIAL))
-               tx_flags |= IGBVF_TX_FLAGS_CSUM;
-
-       /*
-        * count reflects descriptors mapped, if 0 then mapping error
-        * has occurred and we need to rewind the descriptor queue
-        */
-       count = igbvf_tx_map_adv(adapter, tx_ring, skb, first);
-
-       if (count) {
-               igbvf_tx_queue_adv(adapter, tx_ring, tx_flags, count,
-                                  skb->len, hdr_len);
-               /* Make sure there is space in the ring for the next send. */
-               igbvf_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 4);
-       } else {
-               dev_kfree_skb_any(skb);
-               tx_ring->buffer_info[first].time_stamp = 0;
-               tx_ring->next_to_use = first;
-       }
-
-       return NETDEV_TX_OK;
-}
-
-static netdev_tx_t igbvf_xmit_frame(struct sk_buff *skb,
-                                   struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct igbvf_ring *tx_ring;
-
-       if (test_bit(__IGBVF_DOWN, &adapter->state)) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       tx_ring = &adapter->tx_ring[0];
-
-       return igbvf_xmit_frame_ring_adv(skb, netdev, tx_ring);
-}
-
-/**
- * igbvf_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-static void igbvf_tx_timeout(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       /* Do the reset outside of interrupt context */
-       adapter->tx_timeout_count++;
-       schedule_work(&adapter->reset_task);
-}
-
-static void igbvf_reset_task(struct work_struct *work)
-{
-       struct igbvf_adapter *adapter;
-       adapter = container_of(work, struct igbvf_adapter, reset_task);
-
-       igbvf_reinit_locked(adapter);
-}
-
-/**
- * igbvf_get_stats - Get System Network Statistics
- * @netdev: network interface device structure
- *
- * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
- **/
-static struct net_device_stats *igbvf_get_stats(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       /* only return the current stats */
-       return &adapter->net_stats;
-}
-
-/**
- * igbvf_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-static int igbvf_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
-
-       if ((new_mtu < 68) || (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-               dev_err(&adapter->pdev->dev, "Invalid MTU setting\n");
-               return -EINVAL;
-       }
-
-#define MAX_STD_JUMBO_FRAME_SIZE 9234
-       if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
-               dev_err(&adapter->pdev->dev, "MTU > 9216 not supported.\n");
-               return -EINVAL;
-       }
-
-       while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
-               msleep(1);
-       /* igbvf_down has a dependency on max_frame_size */
-       adapter->max_frame_size = max_frame;
-       if (netif_running(netdev))
-               igbvf_down(adapter);
-
-       /*
-        * NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
-        * means we reserve 2 more, this pushes us to allocate from the next
-        * larger slab size.
-        * i.e. RXBUFFER_2048 --> size-4096 slab
-        * However with the new *_jumbo_rx* routines, jumbo receives will use
-        * fragmented skbs
-        */
-
-       if (max_frame <= 1024)
-               adapter->rx_buffer_len = 1024;
-       else if (max_frame <= 2048)
-               adapter->rx_buffer_len = 2048;
-       else
-#if (PAGE_SIZE / 2) > 16384
-               adapter->rx_buffer_len = 16384;
-#else
-               adapter->rx_buffer_len = PAGE_SIZE / 2;
-#endif
-
-
-       /* adjust allocation if LPE protects us, and we aren't using SBP */
-       if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||
-            (max_frame == ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN))
-               adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN +
-                                        ETH_FCS_LEN;
-
-       dev_info(&adapter->pdev->dev, "changing MTU from %d to %d\n",
-                netdev->mtu, new_mtu);
-       netdev->mtu = new_mtu;
-
-       if (netif_running(netdev))
-               igbvf_up(adapter);
-       else
-               igbvf_reset(adapter);
-
-       clear_bit(__IGBVF_RESETTING, &adapter->state);
-
-       return 0;
-}
-
-static int igbvf_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       switch (cmd) {
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static int igbvf_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-#ifdef CONFIG_PM
-       int retval = 0;
-#endif
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev)) {
-               WARN_ON(test_bit(__IGBVF_RESETTING, &adapter->state));
-               igbvf_down(adapter);
-               igbvf_free_irq(adapter);
-       }
-
-#ifdef CONFIG_PM
-       retval = pci_save_state(pdev);
-       if (retval)
-               return retval;
-#endif
-
-       pci_disable_device(pdev);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int igbvf_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       u32 err;
-
-       pci_restore_state(pdev);
-       err = pci_enable_device_mem(pdev);
-       if (err) {
-               dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n");
-               return err;
-       }
-
-       pci_set_master(pdev);
-
-       if (netif_running(netdev)) {
-               err = igbvf_request_irq(adapter);
-               if (err)
-                       return err;
-       }
-
-       igbvf_reset(adapter);
-
-       if (netif_running(netdev))
-               igbvf_up(adapter);
-
-       netif_device_attach(netdev);
-
-       return 0;
-}
-#endif
-
-static void igbvf_shutdown(struct pci_dev *pdev)
-{
-       igbvf_suspend(pdev, PMSG_SUSPEND);
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-static void igbvf_netpoll(struct net_device *netdev)
-{
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       disable_irq(adapter->pdev->irq);
-
-       igbvf_clean_tx_irq(adapter->tx_ring);
-
-       enable_irq(adapter->pdev->irq);
-}
-#endif
-
-/**
- * igbvf_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
-static pci_ers_result_t igbvf_io_error_detected(struct pci_dev *pdev,
-                                                pci_channel_state_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (state == pci_channel_io_perm_failure)
-               return PCI_ERS_RESULT_DISCONNECT;
-
-       if (netif_running(netdev))
-               igbvf_down(adapter);
-       pci_disable_device(pdev);
-
-       /* Request a slot slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * igbvf_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the igbvf_resume routine.
- */
-static pci_ers_result_t igbvf_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       if (pci_enable_device_mem(pdev)) {
-               dev_err(&pdev->dev,
-                       "Cannot re-enable PCI device after reset.\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-       pci_set_master(pdev);
-
-       igbvf_reset(adapter);
-
-       return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * igbvf_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the igbvf_resume routine.
- */
-static void igbvf_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-       if (netif_running(netdev)) {
-               if (igbvf_up(adapter)) {
-                       dev_err(&pdev->dev,
-                               "can't bring device back up after reset\n");
-                       return;
-               }
-       }
-
-       netif_device_attach(netdev);
-}
-
-static void igbvf_print_device_info(struct igbvf_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-
-       dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n");
-       dev_info(&pdev->dev, "Address: %pM\n", netdev->dev_addr);
-       dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type);
-}
-
-static const struct net_device_ops igbvf_netdev_ops = {
-       .ndo_open                       = igbvf_open,
-       .ndo_stop                       = igbvf_close,
-       .ndo_start_xmit                 = igbvf_xmit_frame,
-       .ndo_get_stats                  = igbvf_get_stats,
-       .ndo_set_multicast_list         = igbvf_set_multi,
-       .ndo_set_mac_address            = igbvf_set_mac,
-       .ndo_change_mtu                 = igbvf_change_mtu,
-       .ndo_do_ioctl                   = igbvf_ioctl,
-       .ndo_tx_timeout                 = igbvf_tx_timeout,
-       .ndo_vlan_rx_add_vid            = igbvf_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid           = igbvf_vlan_rx_kill_vid,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller            = igbvf_netpoll,
-#endif
-};
-
-/**
- * igbvf_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in igbvf_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * igbvf_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-static int __devinit igbvf_probe(struct pci_dev *pdev,
-                                 const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct igbvf_adapter *adapter;
-       struct e1000_hw *hw;
-       const struct igbvf_info *ei = igbvf_info_tbl[ent->driver_data];
-
-       static int cards_found;
-       int err, pci_using_dac;
-
-       err = pci_enable_device_mem(pdev);
-       if (err)
-               return err;
-
-       pci_using_dac = 0;
-       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
-       if (!err) {
-               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-               if (!err)
-                       pci_using_dac = 1;
-       } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-               if (err) {
-                       err = dma_set_coherent_mask(&pdev->dev,
-                                                   DMA_BIT_MASK(32));
-                       if (err) {
-                               dev_err(&pdev->dev, "No usable DMA "
-                                       "configuration, aborting\n");
-                               goto err_dma;
-                       }
-               }
-       }
-
-       err = pci_request_regions(pdev, igbvf_driver_name);
-       if (err)
-               goto err_pci_reg;
-
-       pci_set_master(pdev);
-
-       err = -ENOMEM;
-       netdev = alloc_etherdev(sizeof(struct igbvf_adapter));
-       if (!netdev)
-               goto err_alloc_etherdev;
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       pci_set_drvdata(pdev, netdev);
-       adapter = netdev_priv(netdev);
-       hw = &adapter->hw;
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       adapter->ei = ei;
-       adapter->pba = ei->pba;
-       adapter->flags = ei->flags;
-       adapter->hw.back = adapter;
-       adapter->hw.mac.type = ei->mac;
-       adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
-
-       /* PCI config space info */
-
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-       hw->subsystem_vendor_id = pdev->subsystem_vendor;
-       hw->subsystem_device_id = pdev->subsystem_device;
-       hw->revision_id = pdev->revision;
-
-       err = -EIO;
-       adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, 0),
-                                     pci_resource_len(pdev, 0));
-
-       if (!adapter->hw.hw_addr)
-               goto err_ioremap;
-
-       if (ei->get_variants) {
-               err = ei->get_variants(adapter);
-               if (err)
-                       goto err_ioremap;
-       }
-
-       /* setup adapter struct */
-       err = igbvf_sw_init(adapter);
-       if (err)
-               goto err_sw_init;
-
-       /* construct the net_device struct */
-       netdev->netdev_ops = &igbvf_netdev_ops;
-
-       igbvf_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo = 5 * HZ;
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       adapter->bd_number = cards_found++;
-
-       netdev->features = NETIF_F_SG |
-                          NETIF_F_IP_CSUM |
-                          NETIF_F_HW_VLAN_TX |
-                          NETIF_F_HW_VLAN_RX |
-                          NETIF_F_HW_VLAN_FILTER;
-
-       netdev->features |= NETIF_F_IPV6_CSUM;
-       netdev->features |= NETIF_F_TSO;
-       netdev->features |= NETIF_F_TSO6;
-
-       if (pci_using_dac)
-               netdev->features |= NETIF_F_HIGHDMA;
-
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_TSO6;
-       netdev->vlan_features |= NETIF_F_IP_CSUM;
-       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
-
-       /*reset the controller to put the device in a known good state */
-       err = hw->mac.ops.reset_hw(hw);
-       if (err) {
-               dev_info(&pdev->dev,
-                        "PF still in reset state, assigning new address."
-                        " Is the PF interface up?\n");
-               dev_hw_addr_random(adapter->netdev, hw->mac.addr);
-       } else {
-               err = hw->mac.ops.read_mac_addr(hw);
-               if (err) {
-                       dev_err(&pdev->dev, "Error reading MAC address\n");
-                       goto err_hw_init;
-               }
-       }
-
-       memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
-       memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->perm_addr)) {
-               dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
-                       netdev->dev_addr);
-               err = -EIO;
-               goto err_hw_init;
-       }
-
-       setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,
-                   (unsigned long) adapter);
-
-       INIT_WORK(&adapter->reset_task, igbvf_reset_task);
-       INIT_WORK(&adapter->watchdog_task, igbvf_watchdog_task);
-
-       /* ring size defaults */
-       adapter->rx_ring->count = 1024;
-       adapter->tx_ring->count = 1024;
-
-       /* reset the hardware with the new settings */
-       igbvf_reset(adapter);
-
-       strcpy(netdev->name, "eth%d");
-       err = register_netdev(netdev);
-       if (err)
-               goto err_hw_init;
-
-       /* tell the stack to leave us alone until igbvf_open() is called */
-       netif_carrier_off(netdev);
-       netif_stop_queue(netdev);
-
-       igbvf_print_device_info(adapter);
-
-       igbvf_initialize_last_counter_stats(adapter);
-
-       return 0;
-
-err_hw_init:
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-err_sw_init:
-       igbvf_reset_interrupt_capability(adapter);
-       iounmap(adapter->hw.hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_regions(pdev);
-err_pci_reg:
-err_dma:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * igbvf_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * igbvf_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-static void __devexit igbvf_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct igbvf_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       /*
-        * The watchdog timer may be rescheduled, so explicitly
-        * disable it from being rescheduled.
-        */
-       set_bit(__IGBVF_DOWN, &adapter->state);
-       del_timer_sync(&adapter->watchdog_timer);
-
-       cancel_work_sync(&adapter->reset_task);
-       cancel_work_sync(&adapter->watchdog_task);
-
-       unregister_netdev(netdev);
-
-       igbvf_reset_interrupt_capability(adapter);
-
-       /*
-        * it is important to delete the napi struct prior to freeing the
-        * rx ring so that you do not end up with null pointer refs
-        */
-       netif_napi_del(&adapter->rx_ring->napi);
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-
-       iounmap(hw->hw_addr);
-       if (hw->flash_address)
-               iounmap(hw->flash_address);
-       pci_release_regions(pdev);
-
-       free_netdev(netdev);
-
-       pci_disable_device(pdev);
-}
-
-/* PCI Error Recovery (ERS) */
-static struct pci_error_handlers igbvf_err_handler = {
-       .error_detected = igbvf_io_error_detected,
-       .slot_reset = igbvf_io_slot_reset,
-       .resume = igbvf_io_resume,
-};
-
-static DEFINE_PCI_DEVICE_TABLE(igbvf_pci_tbl) = {
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf },
-       { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_VF), board_i350_vf },
-       { } /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci, igbvf_pci_tbl);
-
-/* PCI Device API Driver */
-static struct pci_driver igbvf_driver = {
-       .name     = igbvf_driver_name,
-       .id_table = igbvf_pci_tbl,
-       .probe    = igbvf_probe,
-       .remove   = __devexit_p(igbvf_remove),
-#ifdef CONFIG_PM
-       /* Power Management Hooks */
-       .suspend  = igbvf_suspend,
-       .resume   = igbvf_resume,
-#endif
-       .shutdown = igbvf_shutdown,
-       .err_handler = &igbvf_err_handler
-};
-
-/**
- * igbvf_init_module - Driver Registration Routine
- *
- * igbvf_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-static int __init igbvf_init_module(void)
-{
-       int ret;
-       printk(KERN_INFO "%s - version %s\n",
-              igbvf_driver_string, igbvf_driver_version);
-       printk(KERN_INFO "%s\n", igbvf_copyright);
-
-       ret = pci_register_driver(&igbvf_driver);
-
-       return ret;
-}
-module_init(igbvf_init_module);
-
-/**
- * igbvf_exit_module - Driver Exit Cleanup Routine
- *
- * igbvf_exit_module is called just before the driver is removed
- * from memory.
- **/
-static void __exit igbvf_exit_module(void)
-{
-       pci_unregister_driver(&igbvf_driver);
-}
-module_exit(igbvf_exit_module);
-
-
-MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
-MODULE_DESCRIPTION("Intel(R) 82576 Virtual Function Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-/* netdev.c */
diff --git a/drivers/net/igbvf/regs.h b/drivers/net/igbvf/regs.h
deleted file mode 100644 (file)
index 77e18d3..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 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
-
-*******************************************************************************/
-
-#ifndef _E1000_REGS_H_
-#define _E1000_REGS_H_
-
-#define E1000_CTRL      0x00000 /* Device Control - RW */
-#define E1000_STATUS    0x00008 /* Device Status - RO */
-#define E1000_ITR       0x000C4 /* Interrupt Throttling Rate - RW */
-#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_IVAR0     0x01700 /* Interrupt Vector Allocation (array) - RW */
-#define E1000_IVAR_MISC 0x01740 /* IVAR for "other" causes - 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_DCA_TXCTRL(_n) (0x03814 + (_n << 8))
-#define E1000_DCA_RXCTRL(_n) (0x02814 + (_n << 8))
-#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)))
-
-/* Statistics registers */
-#define E1000_VFGPRC    0x00F10
-#define E1000_VFGORC    0x00F18
-#define E1000_VFMPRC    0x00F3C
-#define E1000_VFGPTC    0x00F14
-#define E1000_VFGOTC    0x00F34
-#define E1000_VFGOTLBC  0x00F50
-#define E1000_VFGPTLBC  0x00F44
-#define E1000_VFGORLBC  0x00F48
-#define E1000_VFGPRLBC  0x00F40
-
-/* These act per VF so an array friendly macro is used */
-#define E1000_V2PMAILBOX(_n)   (0x00C40 + (4 * (_n)))
-#define E1000_VMBMEM(_n)       (0x00800 + (64 * (_n)))
-
-/* Define macros for handling registers */
-#define er32(reg) readl(hw->hw_addr + E1000_##reg)
-#define ew32(reg, val) writel((val), hw->hw_addr +  E1000_##reg)
-#define array_er32(reg, offset) \
-       readl(hw->hw_addr + E1000_##reg + (offset << 2))
-#define array_ew32(reg, offset, val) \
-       writel((val), hw->hw_addr +  E1000_##reg + (offset << 2))
-#define e1e_flush() er32(STATUS)
-
-#endif
diff --git a/drivers/net/igbvf/vf.c b/drivers/net/igbvf/vf.c
deleted file mode 100644 (file)
index af3822f..0000000
+++ /dev/null
@@ -1,402 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 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
-
-*******************************************************************************/
-
-
-#include "vf.h"
-
-static s32 e1000_check_for_link_vf(struct e1000_hw *hw);
-static s32 e1000_get_link_up_info_vf(struct e1000_hw *hw, u16 *speed,
-                                     u16 *duplex);
-static s32 e1000_init_hw_vf(struct e1000_hw *hw);
-static s32 e1000_reset_hw_vf(struct e1000_hw *hw);
-
-static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, u8 *,
-                                         u32, u32, u32);
-static void e1000_rar_set_vf(struct e1000_hw *, u8 *, u32);
-static s32 e1000_read_mac_addr_vf(struct e1000_hw *);
-static s32 e1000_set_vfta_vf(struct e1000_hw *, u16, bool);
-
-/**
- *  e1000_init_mac_params_vf - Inits MAC params
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_mac_params_vf(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       /* VF's have no MTA Registers - PF feature only */
-       mac->mta_reg_count = 128;
-       /* VF's have no access to RAR entries  */
-       mac->rar_entry_count = 1;
-
-       /* Function pointers */
-       /* reset */
-       mac->ops.reset_hw = e1000_reset_hw_vf;
-       /* hw initialization */
-       mac->ops.init_hw = e1000_init_hw_vf;
-       /* check for link */
-       mac->ops.check_for_link = e1000_check_for_link_vf;
-       /* link info */
-       mac->ops.get_link_up_info = e1000_get_link_up_info_vf;
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_vf;
-       /* set mac address */
-       mac->ops.rar_set = e1000_rar_set_vf;
-       /* read mac address */
-       mac->ops.read_mac_addr = e1000_read_mac_addr_vf;
-       /* set vlan filter table array */
-       mac->ops.set_vfta = e1000_set_vfta_vf;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_init_function_pointers_vf - Inits function pointers
- *  @hw: pointer to the HW structure
- **/
-void e1000_init_function_pointers_vf(struct e1000_hw *hw)
-{
-       hw->mac.ops.init_params = e1000_init_mac_params_vf;
-       hw->mbx.ops.init_params = e1000_init_mbx_params_vf;
-}
-
-/**
- *  e1000_get_link_up_info_vf - Gets link info.
- *  @hw: pointer to the HW structure
- *  @speed: pointer to 16 bit value to store link speed.
- *  @duplex: pointer to 16 bit value to store duplex.
- *
- *  Since we cannot read the PHY and get accurate link info, we must rely upon
- *  the status register's data which is often stale and inaccurate.
- **/
-static s32 e1000_get_link_up_info_vf(struct e1000_hw *hw, u16 *speed,
-                                     u16 *duplex)
-{
-       s32 status;
-
-       status = er32(STATUS);
-       if (status & E1000_STATUS_SPEED_1000)
-               *speed = SPEED_1000;
-       else if (status & E1000_STATUS_SPEED_100)
-               *speed = SPEED_100;
-       else
-               *speed = SPEED_10;
-
-       if (status & E1000_STATUS_FD)
-               *duplex = FULL_DUPLEX;
-       else
-               *duplex = HALF_DUPLEX;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_reset_hw_vf - Resets the HW
- *  @hw: pointer to the HW structure
- *
- *  VF's provide a function level reset. This is done using bit 26 of ctrl_reg.
- *  This is all the reset we can perform on a VF.
- **/
-static s32 e1000_reset_hw_vf(struct e1000_hw *hw)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       u32 timeout = E1000_VF_INIT_TIMEOUT;
-       u32 ret_val = -E1000_ERR_MAC_INIT;
-       u32 msgbuf[3];
-       u8 *addr = (u8 *)(&msgbuf[1]);
-       u32 ctrl;
-
-       /* assert vf queue/interrupt reset */
-       ctrl = er32(CTRL);
-       ew32(CTRL, ctrl | E1000_CTRL_RST);
-
-       /* we cannot initialize while the RSTI / RSTD bits are asserted */
-       while (!mbx->ops.check_for_rst(hw) && timeout) {
-               timeout--;
-               udelay(5);
-       }
-
-       if (timeout) {
-               /* mailbox timeout can now become active */
-               mbx->timeout = E1000_VF_MBX_INIT_TIMEOUT;
-
-               /* notify pf of vf reset completion */
-               msgbuf[0] = E1000_VF_RESET;
-               mbx->ops.write_posted(hw, msgbuf, 1);
-
-               msleep(10);
-
-               /* set our "perm_addr" based on info provided by PF */
-               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
-               if (!ret_val) {
-                       if (msgbuf[0] == (E1000_VF_RESET | E1000_VT_MSGTYPE_ACK))
-                               memcpy(hw->mac.perm_addr, addr, 6);
-                       else
-                               ret_val = -E1000_ERR_MAC_INIT;
-               }
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_init_hw_vf - Inits the HW
- *  @hw: pointer to the HW structure
- *
- *  Not much to do here except clear the PF Reset indication if there is one.
- **/
-static s32 e1000_init_hw_vf(struct e1000_hw *hw)
-{
-       /* attempt to set and restore our mac address */
-       e1000_rar_set_vf(hw, hw->mac.addr, 0);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_hash_mc_addr_vf - 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()
- **/
-static u32 e1000_hash_mc_addr_vf(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;
-
-       /*
-        * The 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++;
-
-       hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) |
-                                 (((u16) mc_addr[5]) << bit_shift)));
-
-       return hash_value;
-}
-
-/**
- *  e1000_update_mc_addr_list_vf - 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
- *  @rar_used_count: the first RAR register free to program
- *  @rar_count: total number of supported Receive Address Registers
- *
- *  Updates the Receive Address Registers and Multicast Table Array.
- *  The caller must have a packed mc_addr_list of multicast addresses.
- *  The parameter rar_count will usually be hw->mac.rar_entry_count
- *  unless there are workarounds that change this.
- **/
-static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
-                                  u8 *mc_addr_list, u32 mc_addr_count,
-                                  u32 rar_used_count, u32 rar_count)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[E1000_VFMAILBOX_SIZE];
-       u16 *hash_list = (u16 *)&msgbuf[1];
-       u32 hash_value;
-       u32 cnt, i;
-
-       /* Each entry in the list uses 1 16 bit word.  We have 30
-        * 16 bit words available in our HW msg buffer (minus 1 for the
-        * msg type).  That's 30 hash values if we pack 'em right.  If
-        * there are more than 30 MC addresses to add then punt the
-        * extras for now and then add code to handle more than 30 later.
-        * It would be unusual for a server to request that many multi-cast
-        * addresses except for in large enterprise network environments.
-        */
-
-       cnt = (mc_addr_count > 30) ? 30 : mc_addr_count;
-       msgbuf[0] = E1000_VF_SET_MULTICAST;
-       msgbuf[0] |= cnt << E1000_VT_MSGINFO_SHIFT;
-
-       for (i = 0; i < cnt; i++) {
-               hash_value = e1000_hash_mc_addr_vf(hw, mc_addr_list);
-               hash_list[i] = hash_value & 0x0FFFF;
-               mc_addr_list += ETH_ADDR_LEN;
-       }
-
-       mbx->ops.write_posted(hw, msgbuf, E1000_VFMAILBOX_SIZE);
-}
-
-/**
- *  e1000_set_vfta_vf - Set/Unset vlan filter table address
- *  @hw: pointer to the HW structure
- *  @vid: determines the vfta register and bit to set/unset
- *  @set: if true then set bit, else clear bit
- **/
-static s32 e1000_set_vfta_vf(struct e1000_hw *hw, u16 vid, bool set)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[2];
-       s32 err;
-
-       msgbuf[0] = E1000_VF_SET_VLAN;
-       msgbuf[1] = vid;
-       /* Setting the 8 bit field MSG INFO to true indicates "add" */
-       if (set)
-               msgbuf[0] |= 1 << E1000_VT_MSGINFO_SHIFT;
-
-       mbx->ops.write_posted(hw, msgbuf, 2);
-
-       err = mbx->ops.read_posted(hw, msgbuf, 2);
-
-       msgbuf[0] &= ~E1000_VT_MSGTYPE_CTS;
-
-       /* if nacked the vlan was rejected */
-       if (!err && (msgbuf[0] == (E1000_VF_SET_VLAN | E1000_VT_MSGTYPE_NACK)))
-               err = -E1000_ERR_MAC_INIT;
-
-       return err;
-}
-
-/** e1000_rlpml_set_vf - Set the maximum receive packet length
- *  @hw: pointer to the HW structure
- *  @max_size: value to assign to max frame size
- **/
-void e1000_rlpml_set_vf(struct e1000_hw *hw, u16 max_size)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[2];
-
-       msgbuf[0] = E1000_VF_SET_LPE;
-       msgbuf[1] = max_size;
-
-       mbx->ops.write_posted(hw, msgbuf, 2);
-}
-
-/**
- *  e1000_rar_set_vf - set device MAC address
- *  @hw: pointer to the HW structure
- *  @addr: pointer to the receive address
- *  @index receive address array register
- **/
-static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[3];
-       u8 *msg_addr = (u8 *)(&msgbuf[1]);
-       s32 ret_val;
-
-       memset(msgbuf, 0, 12);
-       msgbuf[0] = E1000_VF_SET_MAC_ADDR;
-       memcpy(msg_addr, addr, 6);
-       ret_val = mbx->ops.write_posted(hw, msgbuf, 3);
-
-       if (!ret_val)
-               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
-
-       msgbuf[0] &= ~E1000_VT_MSGTYPE_CTS;
-
-       /* if nacked the address was rejected, use "perm_addr" */
-       if (!ret_val &&
-           (msgbuf[0] == (E1000_VF_SET_MAC_ADDR | E1000_VT_MSGTYPE_NACK)))
-               e1000_read_mac_addr_vf(hw);
-}
-
-/**
- *  e1000_read_mac_addr_vf - Read device MAC address
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_read_mac_addr_vf(struct e1000_hw *hw)
-{
-       int i;
-
-       for (i = 0; i < ETH_ADDR_LEN; i++)
-               hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_check_for_link_vf - Check for link for a virtual interface
- *  @hw: pointer to the HW structure
- *
- *  Checks to see if the underlying PF is still talking to the VF and
- *  if it is then it reports the link state to the hardware, otherwise
- *  it reports link down and returns an error.
- **/
-static s32 e1000_check_for_link_vf(struct e1000_hw *hw)
-{
-       struct e1000_mbx_info *mbx = &hw->mbx;
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-       u32 in_msg = 0;
-
-       /*
-        * We only want to run this if there has been a rst asserted.
-        * in this case that could mean a link change, device reset,
-        * or a virtual function reset
-        */
-
-       /* If we were hit with a reset or timeout drop the link */
-       if (!mbx->ops.check_for_rst(hw) || !mbx->timeout)
-               mac->get_link_status = true;
-
-       if (!mac->get_link_status)
-               goto out;
-
-       /* if link status is down no point in checking to see if pf is up */
-       if (!(er32(STATUS) & E1000_STATUS_LU))
-               goto out;
-
-       /* if the read failed it could just be a mailbox collision, best wait
-        * until we are called again and don't report an error */
-       if (mbx->ops.read(hw, &in_msg, 1))
-               goto out;
-
-       /* if incoming message isn't clear to send we are waiting on response */
-       if (!(in_msg & E1000_VT_MSGTYPE_CTS)) {
-               /* message is not CTS and is NACK we must have lost CTS status */
-               if (in_msg & E1000_VT_MSGTYPE_NACK)
-                       ret_val = -E1000_ERR_MAC_INIT;
-               goto out;
-       }
-
-       /* the pf is talking, if we timed out in the past we reinit */
-       if (!mbx->timeout) {
-               ret_val = -E1000_ERR_MAC_INIT;
-               goto out;
-       }
-
-       /* if we passed all the tests above then the link is up and we no
-        * longer need to check for link */
-       mac->get_link_status = false;
-
-out:
-       return ret_val;
-}
-
diff --git a/drivers/net/igbvf/vf.h b/drivers/net/igbvf/vf.h
deleted file mode 100644 (file)
index d7ed58f..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 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
-
-*******************************************************************************/
-
-#ifndef _E1000_VF_H_
-#define _E1000_VF_H_
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-
-#include "regs.h"
-#include "defines.h"
-
-struct e1000_hw;
-
-#define E1000_DEV_ID_82576_VF                 0x10CA
-#define E1000_DEV_ID_I350_VF                  0x1520
-#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
-
-/*
- * 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.
- */
-#define E1000_RAR_ENTRIES_VF      1
-
-/* Receive Descriptor - Advanced */
-union e1000_adv_rx_desc {
-       struct {
-               u64 pkt_addr;             /* Packet buffer address */
-               u64 hdr_addr;             /* Header buffer address */
-       } read;
-       struct {
-               struct {
-                       union {
-                               u32 data;
-                               struct {
-                                       u16 pkt_info; /* RSS/Packet type */
-                                       u16 hdr_info; /* Split Header,
-                                                      * hdr buffer length */
-                               } hs_rss;
-                       } lo_dword;
-                       union {
-                               u32 rss;          /* RSS Hash */
-                               struct {
-                                       u16 ip_id;    /* IP id */
-                                       u16 csum;     /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       u32 status_error;     /* ext status/error */
-                       u16 length;           /* Packet length */
-                       u16 vlan;             /* VLAN tag */
-               } upper;
-       } wb;  /* writeback */
-};
-
-#define E1000_RXDADV_HDRBUFLEN_MASK      0x7FE0
-#define E1000_RXDADV_HDRBUFLEN_SHIFT     5
-
-/* Transmit Descriptor - Advanced */
-union e1000_adv_tx_desc {
-       struct {
-               u64 buffer_addr;    /* Address of descriptor's data buf */
-               u32 cmd_type_len;
-               u32 olinfo_status;
-       } read;
-       struct {
-               u64 rsvd;       /* Reserved */
-               u32 nxtseq_seed;
-               u32 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_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_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
-
-/* Context descriptors */
-struct e1000_adv_tx_context_desc {
-       u32 vlan_macip_lens;
-       u32 seqnum_seed;
-       u32 type_tucmd_mlhl;
-       u32 mss_l4len_idx;
-};
-
-#define E1000_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
-#define E1000_ADVTXD_TUCMD_IPV4    0x00000400  /* IP Packet Type: 1=IPv4 */
-#define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800  /* L4 Packet TYPE of TCP */
-#define E1000_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
-#define E1000_ADVTXD_MSS_SHIFT      16  /* Adv ctxt MSS shift */
-
-enum e1000_mac_type {
-       e1000_undefined = 0,
-       e1000_vfadapt,
-       e1000_vfadapt_i350,
-       e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
-};
-
-struct e1000_vf_stats {
-       u64 base_gprc;
-       u64 base_gptc;
-       u64 base_gorc;
-       u64 base_gotc;
-       u64 base_mprc;
-       u64 base_gotlbc;
-       u64 base_gptlbc;
-       u64 base_gorlbc;
-       u64 base_gprlbc;
-
-       u32 last_gprc;
-       u32 last_gptc;
-       u32 last_gorc;
-       u32 last_gotc;
-       u32 last_mprc;
-       u32 last_gotlbc;
-       u32 last_gptlbc;
-       u32 last_gorlbc;
-       u32 last_gprlbc;
-
-       u64 gprc;
-       u64 gptc;
-       u64 gorc;
-       u64 gotc;
-       u64 mprc;
-       u64 gotlbc;
-       u64 gptlbc;
-       u64 gorlbc;
-       u64 gprlbc;
-};
-
-#include "mbx.h"
-
-struct e1000_mac_operations {
-       /* Function pointers for the MAC. */
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*check_for_link)(struct e1000_hw *);
-       void (*clear_vfta)(struct e1000_hw *);
-       s32  (*get_bus_info)(struct e1000_hw *);
-       s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
-       void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32, u32, u32);
-       s32  (*reset_hw)(struct e1000_hw *);
-       s32  (*init_hw)(struct e1000_hw *);
-       s32  (*setup_link)(struct e1000_hw *);
-       void (*write_vfta)(struct e1000_hw *, u32, u32);
-       void (*mta_set)(struct e1000_hw *, u32);
-       void (*rar_set)(struct e1000_hw *, u8*, u32);
-       s32  (*read_mac_addr)(struct e1000_hw *);
-       s32  (*set_vfta)(struct e1000_hw *, u16, bool);
-};
-
-struct e1000_mac_info {
-       struct e1000_mac_operations ops;
-       u8 addr[6];
-       u8 perm_addr[6];
-
-       enum e1000_mac_type type;
-
-       u16 mta_reg_count;
-       u16 rar_entry_count;
-
-       bool get_link_status;
-};
-
-struct e1000_mbx_operations {
-       s32 (*init_params)(struct e1000_hw *hw);
-       s32 (*read)(struct e1000_hw *, u32 *, u16);
-       s32 (*write)(struct e1000_hw *, u32 *, u16);
-       s32 (*read_posted)(struct e1000_hw *, u32 *, u16);
-       s32 (*write_posted)(struct e1000_hw *, u32 *, u16);
-       s32 (*check_for_msg)(struct e1000_hw *);
-       s32 (*check_for_ack)(struct e1000_hw *);
-       s32 (*check_for_rst)(struct e1000_hw *);
-};
-
-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_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_mbx_info mbx;
-
-       union {
-               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;
-};
-
-/* These functions must be implemented by drivers */
-void e1000_rlpml_set_vf(struct e1000_hw *, u16);
-void e1000_init_function_pointers_vf(struct e1000_hw *hw);
-
-
-#endif /* _E1000_VF_H_ */
diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ixgb/Makefile
deleted file mode 100644 (file)
index 0b20c5e..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#
-# Intel PRO/10GbE 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
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) PRO/10GbE ethernet driver
-#
-
-obj-$(CONFIG_IXGB) += ixgb.o
-
-ixgb-objs := ixgb_main.o ixgb_hw.o ixgb_ee.o ixgb_ethtool.o ixgb_param.o
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
deleted file mode 100644 (file)
index 49e8408..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-#ifndef _IXGB_H_
-#define _IXGB_H_
-
-#include <linux/stddef.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/pagemap.h>
-#include <linux/dma-mapping.h>
-#include <linux/bitops.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <linux/capability.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <net/pkt_sched.h>
-#include <linux/list.h>
-#include <linux/reboot.h>
-#include <net/checksum.h>
-
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-
-#define BAR_0          0
-#define BAR_1          1
-#define BAR_5          5
-
-struct ixgb_adapter;
-#include "ixgb_hw.h"
-#include "ixgb_ee.h"
-#include "ixgb_ids.h"
-
-#define PFX "ixgb: "
-
-#ifdef _DEBUG_DRIVER_
-#define IXGB_DBG(fmt, args...) printk(KERN_DEBUG PFX fmt, ##args)
-#else
-#define IXGB_DBG(fmt, args...)                         \
-do {                                                   \
-       if (0)                                          \
-               printk(KERN_DEBUG PFX fmt, ##args);     \
-} while (0)
-#endif
-
-/* TX/RX descriptor defines */
-#define DEFAULT_TXD      256
-#define MAX_TXD         4096
-#define MIN_TXD           64
-
-/* hardware cannot reliably support more than 512 descriptors owned by
- * hardware descriptor cache otherwise an unreliable ring under heavy
- * receive load may result */
-#define DEFAULT_RXD      512
-#define MAX_RXD          512
-#define MIN_RXD           64
-
-/* Supported Rx Buffer Sizes */
-#define IXGB_RXBUFFER_2048  2048
-#define IXGB_RXBUFFER_4096  4096
-#define IXGB_RXBUFFER_8192  8192
-#define IXGB_RXBUFFER_16384 16384
-
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IXGB_RX_BUFFER_WRITE   8       /* Must be power of 2 */
-
-/* wrapper around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer */
-struct ixgb_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       unsigned long time_stamp;
-       u16 length;
-       u16 next_to_watch;
-       u16 mapped_as_page;
-};
-
-struct ixgb_desc_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 ixgb_buffer *buffer_info;
-};
-
-#define IXGB_DESC_UNUSED(R) \
-       ((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
-       (R)->next_to_clean - (R)->next_to_use - 1)
-
-#define IXGB_GET_DESC(R, i, type)      (&(((struct type *)((R).desc))[i]))
-#define IXGB_RX_DESC(R, i)             IXGB_GET_DESC(R, i, ixgb_rx_desc)
-#define IXGB_TX_DESC(R, i)             IXGB_GET_DESC(R, i, ixgb_tx_desc)
-#define IXGB_CONTEXT_DESC(R, i)        IXGB_GET_DESC(R, i, ixgb_context_desc)
-
-/* board specific private data structure */
-
-struct ixgb_adapter {
-       struct timer_list watchdog_timer;
-       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-       u32 bd_number;
-       u32 rx_buffer_len;
-       u32 part_num;
-       u16 link_speed;
-       u16 link_duplex;
-       struct work_struct tx_timeout_task;
-
-       /* TX */
-       struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp;
-       unsigned int restart_queue;
-       unsigned long timeo_start;
-       u32 tx_cmd_type;
-       u64 hw_csum_tx_good;
-       u64 hw_csum_tx_error;
-       u32 tx_int_delay;
-       u32 tx_timeout_count;
-       bool tx_int_delay_enable;
-       bool detect_tx_hung;
-
-       /* RX */
-       struct ixgb_desc_ring rx_ring;
-       u64 hw_csum_rx_error;
-       u64 hw_csum_rx_good;
-       u32 rx_int_delay;
-       bool rx_csum;
-
-       /* OS defined structs */
-       struct napi_struct napi;
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-
-       /* structs defined in ixgb_hw.h */
-       struct ixgb_hw hw;
-       u16 msg_enable;
-       struct ixgb_hw_stats stats;
-       u32 alloc_rx_buff_failed;
-       bool have_msi;
-       unsigned long flags;
-};
-
-enum ixgb_state_t {
-       /* TBD
-       __IXGB_TESTING,
-       __IXGB_RESETTING,
-       */
-       __IXGB_DOWN
-};
-
-/* Exported from other modules */
-extern void ixgb_check_options(struct ixgb_adapter *adapter);
-extern void ixgb_set_ethtool_ops(struct net_device *netdev);
-extern char ixgb_driver_name[];
-extern const char ixgb_driver_version[];
-
-extern int ixgb_up(struct ixgb_adapter *adapter);
-extern void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);
-extern void ixgb_reset(struct ixgb_adapter *adapter);
-extern int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
-extern int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
-extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);
-extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);
-extern void ixgb_update_stats(struct ixgb_adapter *adapter);
-
-
-#endif /* _IXGB_H_ */
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
deleted file mode 100644 (file)
index 38b362b..0000000
+++ /dev/null
@@ -1,607 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include "ixgb_hw.h"
-#include "ixgb_ee.h"
-/* Local prototypes */
-static u16 ixgb_shift_in_bits(struct ixgb_hw *hw);
-
-static void ixgb_shift_out_bits(struct ixgb_hw *hw,
-                               u16 data,
-                               u16 count);
-static void ixgb_standby_eeprom(struct ixgb_hw *hw);
-
-static bool ixgb_wait_eeprom_command(struct ixgb_hw *hw);
-
-static void ixgb_cleanup_eeprom(struct ixgb_hw *hw);
-
-/******************************************************************************
- * Raises the EEPROM's clock input.
- *
- * hw - Struct containing variables accessed by shared code
- * eecd_reg - EECD's current value
- *****************************************************************************/
-static void
-ixgb_raise_clock(struct ixgb_hw *hw,
-                 u32 *eecd_reg)
-{
-       /* Raise the clock input to the EEPROM (by setting the SK bit), and then
-        *  wait 50 microseconds.
-        */
-       *eecd_reg = *eecd_reg | IXGB_EECD_SK;
-       IXGB_WRITE_REG(hw, EECD, *eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-}
-
-/******************************************************************************
- * Lowers the EEPROM's clock input.
- *
- * hw - Struct containing variables accessed by shared code
- * eecd_reg - EECD's current value
- *****************************************************************************/
-static void
-ixgb_lower_clock(struct ixgb_hw *hw,
-                 u32 *eecd_reg)
-{
-       /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
-        * wait 50 microseconds.
-        */
-       *eecd_reg = *eecd_reg & ~IXGB_EECD_SK;
-       IXGB_WRITE_REG(hw, EECD, *eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-}
-
-/******************************************************************************
- * Shift data bits out to the EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- * data - data to send to the EEPROM
- * count - number of bits to shift out
- *****************************************************************************/
-static void
-ixgb_shift_out_bits(struct ixgb_hw *hw,
-                                        u16 data,
-                                        u16 count)
-{
-       u32 eecd_reg;
-       u32 mask;
-
-       /* We need to shift "count" bits out to the EEPROM. So, 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.
-        */
-       mask = 0x01 << (count - 1);
-       eecd_reg = IXGB_READ_REG(hw, EECD);
-       eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI);
-       do {
-               /* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
-                * and then raising and then lowering the clock (the SK bit controls
-                * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
-                * by setting "DI" to "0" and then raising and then lowering the clock.
-                */
-               eecd_reg &= ~IXGB_EECD_DI;
-
-               if (data & mask)
-                       eecd_reg |= IXGB_EECD_DI;
-
-               IXGB_WRITE_REG(hw, EECD, eecd_reg);
-               IXGB_WRITE_FLUSH(hw);
-
-               udelay(50);
-
-               ixgb_raise_clock(hw, &eecd_reg);
-               ixgb_lower_clock(hw, &eecd_reg);
-
-               mask = mask >> 1;
-
-       } while (mask);
-
-       /* We leave the "DI" bit set to "0" when we leave this routine. */
-       eecd_reg &= ~IXGB_EECD_DI;
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-}
-
-/******************************************************************************
- * Shift data bits in from the EEPROM
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static u16
-ixgb_shift_in_bits(struct ixgb_hw *hw)
-{
-       u32 eecd_reg;
-       u32 i;
-       u16 data;
-
-       /* In order to read a register from the EEPROM, we need to shift 16 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 "DO"
-        * bit.  During this "shifting in" process the "DI" bit should always be
-        * clear..
-        */
-
-       eecd_reg = IXGB_READ_REG(hw, EECD);
-
-       eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI);
-       data = 0;
-
-       for (i = 0; i < 16; i++) {
-               data = data << 1;
-               ixgb_raise_clock(hw, &eecd_reg);
-
-               eecd_reg = IXGB_READ_REG(hw, EECD);
-
-               eecd_reg &= ~(IXGB_EECD_DI);
-               if (eecd_reg & IXGB_EECD_DO)
-                       data |= 1;
-
-               ixgb_lower_clock(hw, &eecd_reg);
-       }
-
-       return data;
-}
-
-/******************************************************************************
- * Prepares EEPROM for access
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This
- * function should be called before issuing a command to the EEPROM.
- *****************************************************************************/
-static void
-ixgb_setup_eeprom(struct ixgb_hw *hw)
-{
-       u32 eecd_reg;
-
-       eecd_reg = IXGB_READ_REG(hw, EECD);
-
-       /*  Clear SK and DI  */
-       eecd_reg &= ~(IXGB_EECD_SK | IXGB_EECD_DI);
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-
-       /*  Set CS  */
-       eecd_reg |= IXGB_EECD_CS;
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-}
-
-/******************************************************************************
- * Returns EEPROM to a "standby" state
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void
-ixgb_standby_eeprom(struct ixgb_hw *hw)
-{
-       u32 eecd_reg;
-
-       eecd_reg = IXGB_READ_REG(hw, EECD);
-
-       /*  Deselect EEPROM  */
-       eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_SK);
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-
-       /*  Clock high  */
-       eecd_reg |= IXGB_EECD_SK;
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-
-       /*  Select EEPROM  */
-       eecd_reg |= IXGB_EECD_CS;
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-
-       /*  Clock low  */
-       eecd_reg &= ~IXGB_EECD_SK;
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-}
-
-/******************************************************************************
- * Raises then lowers the EEPROM's clock pin
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void
-ixgb_clock_eeprom(struct ixgb_hw *hw)
-{
-       u32 eecd_reg;
-
-       eecd_reg = IXGB_READ_REG(hw, EECD);
-
-       /*  Rising edge of clock  */
-       eecd_reg |= IXGB_EECD_SK;
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-
-       /*  Falling edge of clock  */
-       eecd_reg &= ~IXGB_EECD_SK;
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-       IXGB_WRITE_FLUSH(hw);
-       udelay(50);
-}
-
-/******************************************************************************
- * Terminates a command by lowering the EEPROM's chip select pin
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void
-ixgb_cleanup_eeprom(struct ixgb_hw *hw)
-{
-       u32 eecd_reg;
-
-       eecd_reg = IXGB_READ_REG(hw, EECD);
-
-       eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_DI);
-
-       IXGB_WRITE_REG(hw, EECD, eecd_reg);
-
-       ixgb_clock_eeprom(hw);
-}
-
-/******************************************************************************
- * Waits for the EEPROM to finish the current command.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * The command is done when the EEPROM's data out pin goes high.
- *
- * Returns:
- *      true: EEPROM data pin is high before timeout.
- *      false:  Time expired.
- *****************************************************************************/
-static bool
-ixgb_wait_eeprom_command(struct ixgb_hw *hw)
-{
-       u32 eecd_reg;
-       u32 i;
-
-       /* Toggle the CS line.  This in effect tells to EEPROM to actually execute
-        * the command in question.
-        */
-       ixgb_standby_eeprom(hw);
-
-       /* Now read DO repeatedly until is high (equal to '1').  The EEPROM will
-        * signal that the command has been completed by raising the DO signal.
-        * If DO does not go high in 10 milliseconds, then error out.
-        */
-       for (i = 0; i < 200; i++) {
-               eecd_reg = IXGB_READ_REG(hw, EECD);
-
-               if (eecd_reg & IXGB_EECD_DO)
-                       return true;
-
-               udelay(50);
-       }
-       ASSERT(0);
-       return false;
-}
-
-/******************************************************************************
- * Verifies that the EEPROM has a valid checksum
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Reads the first 64 16 bit words of the EEPROM and sums the values read.
- * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
- * valid.
- *
- * Returns:
- *  true: Checksum is valid
- *  false: Checksum is not valid.
- *****************************************************************************/
-bool
-ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
-{
-       u16 checksum = 0;
-       u16 i;
-
-       for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++)
-               checksum += ixgb_read_eeprom(hw, i);
-
-       if (checksum == (u16) EEPROM_SUM)
-               return true;
-       else
-               return false;
-}
-
-/******************************************************************************
- * Calculates the EEPROM checksum and writes it to the EEPROM
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Sums the first 63 16 bit words of the EEPROM. Subtracts the sum from 0xBABA.
- * Writes the difference to word offset 63 of the EEPROM.
- *****************************************************************************/
-void
-ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
-{
-       u16 checksum = 0;
-       u16 i;
-
-       for (i = 0; i < EEPROM_CHECKSUM_REG; i++)
-               checksum += ixgb_read_eeprom(hw, i);
-
-       checksum = (u16) EEPROM_SUM - checksum;
-
-       ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum);
-}
-
-/******************************************************************************
- * Writes a 16 bit word to a given offset in the EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- * reg - offset within the EEPROM to be written to
- * data - 16 bit word to be written to the EEPROM
- *
- * If ixgb_update_eeprom_checksum is not called after this function, the
- * EEPROM will most likely contain an invalid checksum.
- *
- *****************************************************************************/
-void
-ixgb_write_eeprom(struct ixgb_hw *hw, u16 offset, u16 data)
-{
-       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
-
-       /* Prepare the EEPROM for writing */
-       ixgb_setup_eeprom(hw);
-
-       /*  Send the 9-bit EWEN (write enable) command to the EEPROM (5-bit opcode
-        *  plus 4-bit dummy).  This puts the EEPROM into write/erase mode.
-        */
-       ixgb_shift_out_bits(hw, EEPROM_EWEN_OPCODE, 5);
-       ixgb_shift_out_bits(hw, 0, 4);
-
-       /*  Prepare the EEPROM  */
-       ixgb_standby_eeprom(hw);
-
-       /*  Send the Write command (3-bit opcode + 6-bit addr)  */
-       ixgb_shift_out_bits(hw, EEPROM_WRITE_OPCODE, 3);
-       ixgb_shift_out_bits(hw, offset, 6);
-
-       /*  Send the data  */
-       ixgb_shift_out_bits(hw, data, 16);
-
-       ixgb_wait_eeprom_command(hw);
-
-       /*  Recover from write  */
-       ixgb_standby_eeprom(hw);
-
-       /* Send the 9-bit EWDS (write disable) command to the EEPROM (5-bit
-        * opcode plus 4-bit dummy).  This takes the EEPROM out of write/erase
-        * mode.
-        */
-       ixgb_shift_out_bits(hw, EEPROM_EWDS_OPCODE, 5);
-       ixgb_shift_out_bits(hw, 0, 4);
-
-       /*  Done with writing  */
-       ixgb_cleanup_eeprom(hw);
-
-       /* clear the init_ctrl_reg_1 to signify that the cache is invalidated */
-       ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
-}
-
-/******************************************************************************
- * Reads a 16 bit word from the EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset of 16 bit word in the EEPROM to read
- *
- * Returns:
- *  The 16-bit value read from the eeprom
- *****************************************************************************/
-u16
-ixgb_read_eeprom(struct ixgb_hw *hw,
-                 u16 offset)
-{
-       u16 data;
-
-       /*  Prepare the EEPROM for reading  */
-       ixgb_setup_eeprom(hw);
-
-       /*  Send the READ command (opcode + addr)  */
-       ixgb_shift_out_bits(hw, EEPROM_READ_OPCODE, 3);
-       /*
-        * We have a 64 word EEPROM, there are 6 address bits
-        */
-       ixgb_shift_out_bits(hw, offset, 6);
-
-       /*  Read the data  */
-       data = ixgb_shift_in_bits(hw);
-
-       /*  End this read operation  */
-       ixgb_standby_eeprom(hw);
-
-       return data;
-}
-
-/******************************************************************************
- * Reads eeprom and stores data in shared structure.
- * Validates eeprom checksum and eeprom signature.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Returns:
- *      true: if eeprom read is successful
- *      false: otherwise.
- *****************************************************************************/
-bool
-ixgb_get_eeprom_data(struct ixgb_hw *hw)
-{
-       u16 i;
-       u16 checksum = 0;
-       struct ixgb_ee_map_type *ee_map;
-
-       ENTER();
-
-       ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
-
-       pr_debug("Reading eeprom data\n");
-       for (i = 0; i < IXGB_EEPROM_SIZE ; i++) {
-               u16 ee_data;
-               ee_data = ixgb_read_eeprom(hw, i);
-               checksum += ee_data;
-               hw->eeprom[i] = cpu_to_le16(ee_data);
-       }
-
-       if (checksum != (u16) EEPROM_SUM) {
-               pr_debug("Checksum invalid\n");
-               /* clear the init_ctrl_reg_1 to signify that the cache is
-                * invalidated */
-               ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
-               return false;
-       }
-
-       if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
-                != cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
-               pr_debug("Signature invalid\n");
-               return false;
-       }
-
-       return true;
-}
-
-/******************************************************************************
- * Local function to check if the eeprom signature is good
- * If the eeprom signature is good, calls ixgb)get_eeprom_data.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Returns:
- *      true: eeprom signature was good and the eeprom read was successful
- *      false: otherwise.
- ******************************************************************************/
-static bool
-ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw)
-{
-       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
-
-       if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
-           == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
-               return true;
-       } else {
-               return ixgb_get_eeprom_data(hw);
-       }
-}
-
-/******************************************************************************
- * return a word from the eeprom
- *
- * hw - Struct containing variables accessed by shared code
- * index - Offset of eeprom word
- *
- * Returns:
- *          Word at indexed offset in eeprom, if valid, 0 otherwise.
- ******************************************************************************/
-__le16
-ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index)
-{
-
-       if ((index < IXGB_EEPROM_SIZE) &&
-               (ixgb_check_and_get_eeprom_data(hw) == true)) {
-          return hw->eeprom[index];
-       }
-
-       return 0;
-}
-
-/******************************************************************************
- * return the mac address from EEPROM
- *
- * hw       - Struct containing variables accessed by shared code
- * mac_addr - Ethernet Address if EEPROM contents are valid, 0 otherwise
- *
- * Returns: None.
- ******************************************************************************/
-void
-ixgb_get_ee_mac_addr(struct ixgb_hw *hw,
-                       u8 *mac_addr)
-{
-       int i;
-       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
-
-       ENTER();
-
-       if (ixgb_check_and_get_eeprom_data(hw) == true) {
-               for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) {
-                       mac_addr[i] = ee_map->mac_addr[i];
-               }
-               pr_debug("eeprom mac address = %pM\n", mac_addr);
-       }
-}
-
-
-/******************************************************************************
- * return the Printed Board Assembly number from EEPROM
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Returns:
- *          PBA number if EEPROM contents are valid, 0 otherwise
- ******************************************************************************/
-u32
-ixgb_get_ee_pba_number(struct ixgb_hw *hw)
-{
-       if (ixgb_check_and_get_eeprom_data(hw) == true)
-               return le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG])
-                       | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16);
-
-       return 0;
-}
-
-
-/******************************************************************************
- * return the Device Id from EEPROM
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Returns:
- *          Device Id if EEPROM contents are valid, 0 otherwise
- ******************************************************************************/
-u16
-ixgb_get_ee_device_id(struct ixgb_hw *hw)
-{
-       struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
-
-       if (ixgb_check_and_get_eeprom_data(hw) == true)
-               return le16_to_cpu(ee_map->device_id);
-
-       return 0;
-}
-
diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ixgb/ixgb_ee.h
deleted file mode 100644 (file)
index 7ea1265..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-#ifndef _IXGB_EE_H_
-#define _IXGB_EE_H_
-
-#define IXGB_EEPROM_SIZE    64 /* Size in words */
-
-#define IXGB_ETH_LENGTH_OF_ADDRESS   6
-
-/* EEPROM Commands */
-#define EEPROM_READ_OPCODE  0x6        /* EEPROM read opcode */
-#define EEPROM_WRITE_OPCODE 0x5        /* EEPROM write opcode */
-#define EEPROM_ERASE_OPCODE 0x7        /* EEPROM erase opcode */
-#define EEPROM_EWEN_OPCODE  0x13       /* EEPROM erase/write enable */
-#define EEPROM_EWDS_OPCODE  0x10       /* EEPROM erase/write disable */
-
-/* EEPROM MAP (Word Offsets) */
-#define EEPROM_IA_1_2_REG        0x0000
-#define EEPROM_IA_3_4_REG        0x0001
-#define EEPROM_IA_5_6_REG        0x0002
-#define EEPROM_COMPATIBILITY_REG 0x0003
-#define EEPROM_PBA_1_2_REG       0x0008
-#define EEPROM_PBA_3_4_REG       0x0009
-#define EEPROM_INIT_CONTROL1_REG 0x000A
-#define EEPROM_SUBSYS_ID_REG     0x000B
-#define EEPROM_SUBVEND_ID_REG    0x000C
-#define EEPROM_DEVICE_ID_REG     0x000D
-#define EEPROM_VENDOR_ID_REG     0x000E
-#define EEPROM_INIT_CONTROL2_REG 0x000F
-#define EEPROM_SWDPINS_REG       0x0020
-#define EEPROM_CIRCUIT_CTRL_REG  0x0021
-#define EEPROM_D0_D3_POWER_REG   0x0022
-#define EEPROM_FLASH_VERSION     0x0032
-#define EEPROM_CHECKSUM_REG      0x003F
-
-/* Mask bits for fields in Word 0x0a of the EEPROM */
-
-#define EEPROM_ICW1_SIGNATURE_MASK  0xC000
-#define EEPROM_ICW1_SIGNATURE_VALID 0x4000
-#define EEPROM_ICW1_SIGNATURE_CLEAR 0x0000
-
-/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
-#define EEPROM_SUM 0xBABA
-
-/* EEPROM Map Sizes (Byte Counts) */
-#define PBA_SIZE 4
-
-/* EEPROM Map defines (WORD OFFSETS)*/
-
-/* EEPROM structure */
-struct ixgb_ee_map_type {
-       u8 mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];
-       __le16 compatibility;
-       __le16 reserved1[4];
-       __le32 pba_number;
-       __le16 init_ctrl_reg_1;
-       __le16 subsystem_id;
-       __le16 subvendor_id;
-       __le16 device_id;
-       __le16 vendor_id;
-       __le16 init_ctrl_reg_2;
-       __le16 oem_reserved[16];
-       __le16 swdpins_reg;
-       __le16 circuit_ctrl_reg;
-       u8 d3_power;
-       u8 d0_power;
-       __le16 reserved2[28];
-       __le16 checksum;
-};
-
-/* EEPROM Functions */
-u16 ixgb_read_eeprom(struct ixgb_hw *hw, u16 reg);
-
-bool ixgb_validate_eeprom_checksum(struct ixgb_hw *hw);
-
-void ixgb_update_eeprom_checksum(struct ixgb_hw *hw);
-
-void ixgb_write_eeprom(struct ixgb_hw *hw, u16 reg, u16 data);
-
-#endif                         /* IXGB_EE_H */
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
deleted file mode 100644 (file)
index 6da890b..0000000
+++ /dev/null
@@ -1,758 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-/* ethtool support for ixgb */
-
-#include "ixgb.h"
-
-#include <asm/uaccess.h>
-
-#define IXGB_ALL_RAR_ENTRIES 16
-
-enum {NETDEV_STATS, IXGB_STATS};
-
-struct ixgb_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int type;
-       int sizeof_stat;
-       int stat_offset;
-};
-
-#define IXGB_STAT(m)           IXGB_STATS, \
-                               FIELD_SIZEOF(struct ixgb_adapter, m), \
-                               offsetof(struct ixgb_adapter, m)
-#define IXGB_NETDEV_STAT(m)    NETDEV_STATS, \
-                               FIELD_SIZEOF(struct net_device, m), \
-                               offsetof(struct net_device, m)
-
-static struct ixgb_stats ixgb_gstrings_stats[] = {
-       {"rx_packets", IXGB_NETDEV_STAT(stats.rx_packets)},
-       {"tx_packets", IXGB_NETDEV_STAT(stats.tx_packets)},
-       {"rx_bytes", IXGB_NETDEV_STAT(stats.rx_bytes)},
-       {"tx_bytes", IXGB_NETDEV_STAT(stats.tx_bytes)},
-       {"rx_errors", IXGB_NETDEV_STAT(stats.rx_errors)},
-       {"tx_errors", IXGB_NETDEV_STAT(stats.tx_errors)},
-       {"rx_dropped", IXGB_NETDEV_STAT(stats.rx_dropped)},
-       {"tx_dropped", IXGB_NETDEV_STAT(stats.tx_dropped)},
-       {"multicast", IXGB_NETDEV_STAT(stats.multicast)},
-       {"collisions", IXGB_NETDEV_STAT(stats.collisions)},
-
-/*     { "rx_length_errors", IXGB_NETDEV_STAT(stats.rx_length_errors) },       */
-       {"rx_over_errors", IXGB_NETDEV_STAT(stats.rx_over_errors)},
-       {"rx_crc_errors", IXGB_NETDEV_STAT(stats.rx_crc_errors)},
-       {"rx_frame_errors", IXGB_NETDEV_STAT(stats.rx_frame_errors)},
-       {"rx_no_buffer_count", IXGB_STAT(stats.rnbc)},
-       {"rx_fifo_errors", IXGB_NETDEV_STAT(stats.rx_fifo_errors)},
-       {"rx_missed_errors", IXGB_NETDEV_STAT(stats.rx_missed_errors)},
-       {"tx_aborted_errors", IXGB_NETDEV_STAT(stats.tx_aborted_errors)},
-       {"tx_carrier_errors", IXGB_NETDEV_STAT(stats.tx_carrier_errors)},
-       {"tx_fifo_errors", IXGB_NETDEV_STAT(stats.tx_fifo_errors)},
-       {"tx_heartbeat_errors", IXGB_NETDEV_STAT(stats.tx_heartbeat_errors)},
-       {"tx_window_errors", IXGB_NETDEV_STAT(stats.tx_window_errors)},
-       {"tx_deferred_ok", IXGB_STAT(stats.dc)},
-       {"tx_timeout_count", IXGB_STAT(tx_timeout_count) },
-       {"tx_restart_queue", IXGB_STAT(restart_queue) },
-       {"rx_long_length_errors", IXGB_STAT(stats.roc)},
-       {"rx_short_length_errors", IXGB_STAT(stats.ruc)},
-       {"tx_tcp_seg_good", IXGB_STAT(stats.tsctc)},
-       {"tx_tcp_seg_failed", IXGB_STAT(stats.tsctfc)},
-       {"rx_flow_control_xon", IXGB_STAT(stats.xonrxc)},
-       {"rx_flow_control_xoff", IXGB_STAT(stats.xoffrxc)},
-       {"tx_flow_control_xon", IXGB_STAT(stats.xontxc)},
-       {"tx_flow_control_xoff", IXGB_STAT(stats.xofftxc)},
-       {"rx_csum_offload_good", IXGB_STAT(hw_csum_rx_good)},
-       {"rx_csum_offload_errors", IXGB_STAT(hw_csum_rx_error)},
-       {"tx_csum_offload_good", IXGB_STAT(hw_csum_tx_good)},
-       {"tx_csum_offload_errors", IXGB_STAT(hw_csum_tx_error)}
-};
-
-#define IXGB_STATS_LEN ARRAY_SIZE(ixgb_gstrings_stats)
-
-static int
-ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
-       ecmd->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE);
-       ecmd->port = PORT_FIBRE;
-       ecmd->transceiver = XCVR_EXTERNAL;
-
-       if (netif_carrier_ok(adapter->netdev)) {
-               ethtool_cmd_speed_set(ecmd, SPEED_10000);
-               ecmd->duplex = DUPLEX_FULL;
-       } else {
-               ethtool_cmd_speed_set(ecmd, -1);
-               ecmd->duplex = -1;
-       }
-
-       ecmd->autoneg = AUTONEG_DISABLE;
-       return 0;
-}
-
-static void ixgb_set_speed_duplex(struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       /* be optimistic about our link, since we were up before */
-       adapter->link_speed = 10000;
-       adapter->link_duplex = FULL_DUPLEX;
-       netif_carrier_on(netdev);
-       netif_wake_queue(netdev);
-}
-
-static int
-ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       u32 speed = ethtool_cmd_speed(ecmd);
-
-       if (ecmd->autoneg == AUTONEG_ENABLE ||
-           (speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL))
-               return -EINVAL;
-
-       if (netif_running(adapter->netdev)) {
-               ixgb_down(adapter, true);
-               ixgb_reset(adapter);
-               ixgb_up(adapter);
-               ixgb_set_speed_duplex(netdev);
-       } else
-               ixgb_reset(adapter);
-
-       return 0;
-}
-
-static void
-ixgb_get_pauseparam(struct net_device *netdev,
-                        struct ethtool_pauseparam *pause)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_hw *hw = &adapter->hw;
-
-       pause->autoneg = AUTONEG_DISABLE;
-
-       if (hw->fc.type == ixgb_fc_rx_pause)
-               pause->rx_pause = 1;
-       else if (hw->fc.type == ixgb_fc_tx_pause)
-               pause->tx_pause = 1;
-       else if (hw->fc.type == ixgb_fc_full) {
-               pause->rx_pause = 1;
-               pause->tx_pause = 1;
-       }
-}
-
-static int
-ixgb_set_pauseparam(struct net_device *netdev,
-                        struct ethtool_pauseparam *pause)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_hw *hw = &adapter->hw;
-
-       if (pause->autoneg == AUTONEG_ENABLE)
-               return -EINVAL;
-
-       if (pause->rx_pause && pause->tx_pause)
-               hw->fc.type = ixgb_fc_full;
-       else if (pause->rx_pause && !pause->tx_pause)
-               hw->fc.type = ixgb_fc_rx_pause;
-       else if (!pause->rx_pause && pause->tx_pause)
-               hw->fc.type = ixgb_fc_tx_pause;
-       else if (!pause->rx_pause && !pause->tx_pause)
-               hw->fc.type = ixgb_fc_none;
-
-       if (netif_running(adapter->netdev)) {
-               ixgb_down(adapter, true);
-               ixgb_up(adapter);
-               ixgb_set_speed_duplex(netdev);
-       } else
-               ixgb_reset(adapter);
-
-       return 0;
-}
-
-static u32
-ixgb_get_rx_csum(struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       return adapter->rx_csum;
-}
-
-static int
-ixgb_set_rx_csum(struct net_device *netdev, u32 data)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       adapter->rx_csum = data;
-
-       if (netif_running(netdev)) {
-               ixgb_down(adapter, true);
-               ixgb_up(adapter);
-               ixgb_set_speed_duplex(netdev);
-       } else
-               ixgb_reset(adapter);
-       return 0;
-}
-
-static u32
-ixgb_get_tx_csum(struct net_device *netdev)
-{
-       return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
-static int
-ixgb_set_tx_csum(struct net_device *netdev, u32 data)
-{
-       if (data)
-               netdev->features |= NETIF_F_HW_CSUM;
-       else
-               netdev->features &= ~NETIF_F_HW_CSUM;
-
-       return 0;
-}
-
-static int
-ixgb_set_tso(struct net_device *netdev, u32 data)
-{
-       if (data)
-               netdev->features |= NETIF_F_TSO;
-       else
-               netdev->features &= ~NETIF_F_TSO;
-       return 0;
-}
-
-static u32
-ixgb_get_msglevel(struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void
-ixgb_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-#define IXGB_GET_STAT(_A_, _R_) _A_->stats._R_
-
-static int
-ixgb_get_regs_len(struct net_device *netdev)
-{
-#define IXGB_REG_DUMP_LEN  136*sizeof(u32)
-       return IXGB_REG_DUMP_LEN;
-}
-
-static void
-ixgb_get_regs(struct net_device *netdev,
-                  struct ethtool_regs *regs, void *p)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_hw *hw = &adapter->hw;
-       u32 *reg = p;
-       u32 *reg_start = reg;
-       u8 i;
-
-       /* the 1 (one) below indicates an attempt at versioning, if the
-        * interface in ethtool or the driver changes, this 1 should be
-        * incremented */
-       regs->version = (1<<24) | hw->revision_id << 16 | hw->device_id;
-
-       /* General Registers */
-       *reg++ = IXGB_READ_REG(hw, CTRL0);      /*   0 */
-       *reg++ = IXGB_READ_REG(hw, CTRL1);      /*   1 */
-       *reg++ = IXGB_READ_REG(hw, STATUS);     /*   2 */
-       *reg++ = IXGB_READ_REG(hw, EECD);       /*   3 */
-       *reg++ = IXGB_READ_REG(hw, MFS);        /*   4 */
-
-       /* Interrupt */
-       *reg++ = IXGB_READ_REG(hw, ICR);        /*   5 */
-       *reg++ = IXGB_READ_REG(hw, ICS);        /*   6 */
-       *reg++ = IXGB_READ_REG(hw, IMS);        /*   7 */
-       *reg++ = IXGB_READ_REG(hw, IMC);        /*   8 */
-
-       /* Receive */
-       *reg++ = IXGB_READ_REG(hw, RCTL);       /*   9 */
-       *reg++ = IXGB_READ_REG(hw, FCRTL);      /*  10 */
-       *reg++ = IXGB_READ_REG(hw, FCRTH);      /*  11 */
-       *reg++ = IXGB_READ_REG(hw, RDBAL);      /*  12 */
-       *reg++ = IXGB_READ_REG(hw, RDBAH);      /*  13 */
-       *reg++ = IXGB_READ_REG(hw, RDLEN);      /*  14 */
-       *reg++ = IXGB_READ_REG(hw, RDH);        /*  15 */
-       *reg++ = IXGB_READ_REG(hw, RDT);        /*  16 */
-       *reg++ = IXGB_READ_REG(hw, RDTR);       /*  17 */
-       *reg++ = IXGB_READ_REG(hw, RXDCTL);     /*  18 */
-       *reg++ = IXGB_READ_REG(hw, RAIDC);      /*  19 */
-       *reg++ = IXGB_READ_REG(hw, RXCSUM);     /*  20 */
-
-       /* there are 16 RAR entries in hardware, we only use 3 */
-       for (i = 0; i < IXGB_ALL_RAR_ENTRIES; i++) {
-               *reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i << 1)); /*21,...,51 */
-               *reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i << 1)); /*22,...,52 */
-       }
-
-       /* Transmit */
-       *reg++ = IXGB_READ_REG(hw, TCTL);       /*  53 */
-       *reg++ = IXGB_READ_REG(hw, TDBAL);      /*  54 */
-       *reg++ = IXGB_READ_REG(hw, TDBAH);      /*  55 */
-       *reg++ = IXGB_READ_REG(hw, TDLEN);      /*  56 */
-       *reg++ = IXGB_READ_REG(hw, TDH);        /*  57 */
-       *reg++ = IXGB_READ_REG(hw, TDT);        /*  58 */
-       *reg++ = IXGB_READ_REG(hw, TIDV);       /*  59 */
-       *reg++ = IXGB_READ_REG(hw, TXDCTL);     /*  60 */
-       *reg++ = IXGB_READ_REG(hw, TSPMT);      /*  61 */
-       *reg++ = IXGB_READ_REG(hw, PAP);        /*  62 */
-
-       /* Physical */
-       *reg++ = IXGB_READ_REG(hw, PCSC1);      /*  63 */
-       *reg++ = IXGB_READ_REG(hw, PCSC2);      /*  64 */
-       *reg++ = IXGB_READ_REG(hw, PCSS1);      /*  65 */
-       *reg++ = IXGB_READ_REG(hw, PCSS2);      /*  66 */
-       *reg++ = IXGB_READ_REG(hw, XPCSS);      /*  67 */
-       *reg++ = IXGB_READ_REG(hw, UCCR);       /*  68 */
-       *reg++ = IXGB_READ_REG(hw, XPCSTC);     /*  69 */
-       *reg++ = IXGB_READ_REG(hw, MACA);       /*  70 */
-       *reg++ = IXGB_READ_REG(hw, APAE);       /*  71 */
-       *reg++ = IXGB_READ_REG(hw, ARD);        /*  72 */
-       *reg++ = IXGB_READ_REG(hw, AIS);        /*  73 */
-       *reg++ = IXGB_READ_REG(hw, MSCA);       /*  74 */
-       *reg++ = IXGB_READ_REG(hw, MSRWD);      /*  75 */
-
-       /* Statistics */
-       *reg++ = IXGB_GET_STAT(adapter, tprl);  /*  76 */
-       *reg++ = IXGB_GET_STAT(adapter, tprh);  /*  77 */
-       *reg++ = IXGB_GET_STAT(adapter, gprcl); /*  78 */
-       *reg++ = IXGB_GET_STAT(adapter, gprch); /*  79 */
-       *reg++ = IXGB_GET_STAT(adapter, bprcl); /*  80 */
-       *reg++ = IXGB_GET_STAT(adapter, bprch); /*  81 */
-       *reg++ = IXGB_GET_STAT(adapter, mprcl); /*  82 */
-       *reg++ = IXGB_GET_STAT(adapter, mprch); /*  83 */
-       *reg++ = IXGB_GET_STAT(adapter, uprcl); /*  84 */
-       *reg++ = IXGB_GET_STAT(adapter, uprch); /*  85 */
-       *reg++ = IXGB_GET_STAT(adapter, vprcl); /*  86 */
-       *reg++ = IXGB_GET_STAT(adapter, vprch); /*  87 */
-       *reg++ = IXGB_GET_STAT(adapter, jprcl); /*  88 */
-       *reg++ = IXGB_GET_STAT(adapter, jprch); /*  89 */
-       *reg++ = IXGB_GET_STAT(adapter, gorcl); /*  90 */
-       *reg++ = IXGB_GET_STAT(adapter, gorch); /*  91 */
-       *reg++ = IXGB_GET_STAT(adapter, torl);  /*  92 */
-       *reg++ = IXGB_GET_STAT(adapter, torh);  /*  93 */
-       *reg++ = IXGB_GET_STAT(adapter, rnbc);  /*  94 */
-       *reg++ = IXGB_GET_STAT(adapter, ruc);   /*  95 */
-       *reg++ = IXGB_GET_STAT(adapter, roc);   /*  96 */
-       *reg++ = IXGB_GET_STAT(adapter, rlec);  /*  97 */
-       *reg++ = IXGB_GET_STAT(adapter, crcerrs);       /*  98 */
-       *reg++ = IXGB_GET_STAT(adapter, icbc);  /*  99 */
-       *reg++ = IXGB_GET_STAT(adapter, ecbc);  /* 100 */
-       *reg++ = IXGB_GET_STAT(adapter, mpc);   /* 101 */
-       *reg++ = IXGB_GET_STAT(adapter, tptl);  /* 102 */
-       *reg++ = IXGB_GET_STAT(adapter, tpth);  /* 103 */
-       *reg++ = IXGB_GET_STAT(adapter, gptcl); /* 104 */
-       *reg++ = IXGB_GET_STAT(adapter, gptch); /* 105 */
-       *reg++ = IXGB_GET_STAT(adapter, bptcl); /* 106 */
-       *reg++ = IXGB_GET_STAT(adapter, bptch); /* 107 */
-       *reg++ = IXGB_GET_STAT(adapter, mptcl); /* 108 */
-       *reg++ = IXGB_GET_STAT(adapter, mptch); /* 109 */
-       *reg++ = IXGB_GET_STAT(adapter, uptcl); /* 110 */
-       *reg++ = IXGB_GET_STAT(adapter, uptch); /* 111 */
-       *reg++ = IXGB_GET_STAT(adapter, vptcl); /* 112 */
-       *reg++ = IXGB_GET_STAT(adapter, vptch); /* 113 */
-       *reg++ = IXGB_GET_STAT(adapter, jptcl); /* 114 */
-       *reg++ = IXGB_GET_STAT(adapter, jptch); /* 115 */
-       *reg++ = IXGB_GET_STAT(adapter, gotcl); /* 116 */
-       *reg++ = IXGB_GET_STAT(adapter, gotch); /* 117 */
-       *reg++ = IXGB_GET_STAT(adapter, totl);  /* 118 */
-       *reg++ = IXGB_GET_STAT(adapter, toth);  /* 119 */
-       *reg++ = IXGB_GET_STAT(adapter, dc);    /* 120 */
-       *reg++ = IXGB_GET_STAT(adapter, plt64c);        /* 121 */
-       *reg++ = IXGB_GET_STAT(adapter, tsctc); /* 122 */
-       *reg++ = IXGB_GET_STAT(adapter, tsctfc);        /* 123 */
-       *reg++ = IXGB_GET_STAT(adapter, ibic);  /* 124 */
-       *reg++ = IXGB_GET_STAT(adapter, rfc);   /* 125 */
-       *reg++ = IXGB_GET_STAT(adapter, lfc);   /* 126 */
-       *reg++ = IXGB_GET_STAT(adapter, pfrc);  /* 127 */
-       *reg++ = IXGB_GET_STAT(adapter, pftc);  /* 128 */
-       *reg++ = IXGB_GET_STAT(adapter, mcfrc); /* 129 */
-       *reg++ = IXGB_GET_STAT(adapter, mcftc); /* 130 */
-       *reg++ = IXGB_GET_STAT(adapter, xonrxc);        /* 131 */
-       *reg++ = IXGB_GET_STAT(adapter, xontxc);        /* 132 */
-       *reg++ = IXGB_GET_STAT(adapter, xoffrxc);       /* 133 */
-       *reg++ = IXGB_GET_STAT(adapter, xofftxc);       /* 134 */
-       *reg++ = IXGB_GET_STAT(adapter, rjc);   /* 135 */
-
-       regs->len = (reg - reg_start) * sizeof(u32);
-}
-
-static int
-ixgb_get_eeprom_len(struct net_device *netdev)
-{
-       /* return size in bytes */
-       return IXGB_EEPROM_SIZE << 1;
-}
-
-static int
-ixgb_get_eeprom(struct net_device *netdev,
-                 struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_hw *hw = &adapter->hw;
-       __le16 *eeprom_buff;
-       int i, max_len, first_word, last_word;
-       int ret_val = 0;
-
-       if (eeprom->len == 0) {
-               ret_val = -EINVAL;
-               goto geeprom_error;
-       }
-
-       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
-
-       max_len = ixgb_get_eeprom_len(netdev);
-
-       if (eeprom->offset > eeprom->offset + eeprom->len) {
-               ret_val = -EINVAL;
-               goto geeprom_error;
-       }
-
-       if ((eeprom->offset + eeprom->len) > max_len)
-               eeprom->len = (max_len - eeprom->offset);
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-
-       eeprom_buff = kmalloc(sizeof(__le16) *
-                       (last_word - first_word + 1), GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       /* note the eeprom was good because the driver loaded */
-       for (i = 0; i <= (last_word - first_word); i++)
-               eeprom_buff[i] = ixgb_get_eeprom_word(hw, (first_word + i));
-
-       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
-       kfree(eeprom_buff);
-
-geeprom_error:
-       return ret_val;
-}
-
-static int
-ixgb_set_eeprom(struct net_device *netdev,
-                 struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       void *ptr;
-       int max_len, first_word, last_word;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EINVAL;
-
-       if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
-               return -EFAULT;
-
-       max_len = ixgb_get_eeprom_len(netdev);
-
-       if (eeprom->offset > eeprom->offset + eeprom->len)
-               return -EINVAL;
-
-       if ((eeprom->offset + eeprom->len) > max_len)
-               eeprom->len = (max_len - eeprom->offset);
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       ptr = (void *)eeprom_buff;
-
-       if (eeprom->offset & 1) {
-               /* need read/modify/write of first changed EEPROM word */
-               /* only the second byte of the word is being modified */
-               eeprom_buff[0] = ixgb_read_eeprom(hw, first_word);
-               ptr++;
-       }
-       if ((eeprom->offset + eeprom->len) & 1) {
-               /* need read/modify/write of last changed EEPROM word */
-               /* only the first byte of the word is being modified */
-               eeprom_buff[last_word - first_word]
-                       = ixgb_read_eeprom(hw, last_word);
-       }
-
-       memcpy(ptr, bytes, eeprom->len);
-       for (i = 0; i <= (last_word - first_word); i++)
-               ixgb_write_eeprom(hw, first_word + i, eeprom_buff[i]);
-
-       /* Update the checksum over the first part of the EEPROM if needed */
-       if (first_word <= EEPROM_CHECKSUM_REG)
-               ixgb_update_eeprom_checksum(hw);
-
-       kfree(eeprom_buff);
-       return 0;
-}
-
-static void
-ixgb_get_drvinfo(struct net_device *netdev,
-                  struct ethtool_drvinfo *drvinfo)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       strncpy(drvinfo->driver,  ixgb_driver_name, 32);
-       strncpy(drvinfo->version, ixgb_driver_version, 32);
-       strncpy(drvinfo->fw_version, "N/A", 32);
-       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-       drvinfo->n_stats = IXGB_STATS_LEN;
-       drvinfo->regdump_len = ixgb_get_regs_len(netdev);
-       drvinfo->eedump_len = ixgb_get_eeprom_len(netdev);
-}
-
-static void
-ixgb_get_ringparam(struct net_device *netdev,
-               struct ethtool_ringparam *ring)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
-       struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
-
-       ring->rx_max_pending = MAX_RXD;
-       ring->tx_max_pending = MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rxdr->count;
-       ring->tx_pending = txdr->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int
-ixgb_set_ringparam(struct net_device *netdev,
-               struct ethtool_ringparam *ring)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
-       struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
-       struct ixgb_desc_ring tx_old, tx_new, rx_old, rx_new;
-       int err;
-
-       tx_old = adapter->tx_ring;
-       rx_old = adapter->rx_ring;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       if (netif_running(adapter->netdev))
-               ixgb_down(adapter, true);
-
-       rxdr->count = max(ring->rx_pending,(u32)MIN_RXD);
-       rxdr->count = min(rxdr->count,(u32)MAX_RXD);
-       rxdr->count = ALIGN(rxdr->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       txdr->count = max(ring->tx_pending,(u32)MIN_TXD);
-       txdr->count = min(txdr->count,(u32)MAX_TXD);
-       txdr->count = ALIGN(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       if (netif_running(adapter->netdev)) {
-               /* Try to get new resources before deleting old */
-               if ((err = ixgb_setup_rx_resources(adapter)))
-                       goto err_setup_rx;
-               if ((err = ixgb_setup_tx_resources(adapter)))
-                       goto err_setup_tx;
-
-               /* save the new, restore the old in order to free it,
-                * then restore the new back again */
-
-               rx_new = adapter->rx_ring;
-               tx_new = adapter->tx_ring;
-               adapter->rx_ring = rx_old;
-               adapter->tx_ring = tx_old;
-               ixgb_free_rx_resources(adapter);
-               ixgb_free_tx_resources(adapter);
-               adapter->rx_ring = rx_new;
-               adapter->tx_ring = tx_new;
-               if ((err = ixgb_up(adapter)))
-                       return err;
-               ixgb_set_speed_duplex(netdev);
-       }
-
-       return 0;
-err_setup_tx:
-       ixgb_free_rx_resources(adapter);
-err_setup_rx:
-       adapter->rx_ring = rx_old;
-       adapter->tx_ring = tx_old;
-       ixgb_up(adapter);
-       return err;
-}
-
-static int
-ixgb_set_phys_id(struct net_device *netdev, enum ethtool_phys_id_state state)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       switch (state) {
-       case ETHTOOL_ID_ACTIVE:
-               return 2;
-
-       case ETHTOOL_ID_ON:
-               ixgb_led_on(&adapter->hw);
-               break;
-
-       case ETHTOOL_ID_OFF:
-       case ETHTOOL_ID_INACTIVE:
-               ixgb_led_off(&adapter->hw);
-       }
-
-       return 0;
-}
-
-static int
-ixgb_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_STATS:
-               return IXGB_STATS_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void
-ixgb_get_ethtool_stats(struct net_device *netdev,
-               struct ethtool_stats *stats, u64 *data)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       int i;
-       char *p = NULL;
-
-       ixgb_update_stats(adapter);
-       for (i = 0; i < IXGB_STATS_LEN; i++) {
-               switch (ixgb_gstrings_stats[i].type) {
-               case NETDEV_STATS:
-                       p = (char *) netdev +
-                                       ixgb_gstrings_stats[i].stat_offset;
-                       break;
-               case IXGB_STATS:
-                       p = (char *) adapter +
-                                       ixgb_gstrings_stats[i].stat_offset;
-                       break;
-               }
-
-               data[i] = (ixgb_gstrings_stats[i].sizeof_stat ==
-                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-       }
-}
-
-static void
-ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
-{
-       int i;
-
-       switch(stringset) {
-       case ETH_SS_STATS:
-               for (i = 0; i < IXGB_STATS_LEN; i++) {
-                       memcpy(data + i * ETH_GSTRING_LEN,
-                       ixgb_gstrings_stats[i].stat_string,
-                       ETH_GSTRING_LEN);
-               }
-               break;
-       }
-}
-
-static int ixgb_set_flags(struct net_device *netdev, u32 data)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       bool need_reset;
-       int rc;
-
-       /*
-        * Tx VLAN insertion does not work per HW design when Rx stripping is
-        * disabled.  Disable txvlan when rxvlan is turned off, and enable
-        * rxvlan when txvlan is turned on.
-        */
-       if (!(data & ETH_FLAG_RXVLAN) &&
-           (netdev->features & NETIF_F_HW_VLAN_TX))
-               data &= ~ETH_FLAG_TXVLAN;
-       else if (data & ETH_FLAG_TXVLAN)
-               data |= ETH_FLAG_RXVLAN;
-
-       need_reset = (data & ETH_FLAG_RXVLAN) !=
-                    (netdev->features & NETIF_F_HW_VLAN_RX);
-
-       rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
-                                               ETH_FLAG_TXVLAN);
-       if (rc)
-               return rc;
-
-       if (need_reset) {
-               if (netif_running(netdev)) {
-                       ixgb_down(adapter, true);
-                       ixgb_up(adapter);
-                       ixgb_set_speed_duplex(netdev);
-               } else
-                       ixgb_reset(adapter);
-       }
-
-       return 0;
-}
-
-static const struct ethtool_ops ixgb_ethtool_ops = {
-       .get_settings = ixgb_get_settings,
-       .set_settings = ixgb_set_settings,
-       .get_drvinfo = ixgb_get_drvinfo,
-       .get_regs_len = ixgb_get_regs_len,
-       .get_regs = ixgb_get_regs,
-       .get_link = ethtool_op_get_link,
-       .get_eeprom_len = ixgb_get_eeprom_len,
-       .get_eeprom = ixgb_get_eeprom,
-       .set_eeprom = ixgb_set_eeprom,
-       .get_ringparam = ixgb_get_ringparam,
-       .set_ringparam = ixgb_set_ringparam,
-       .get_pauseparam = ixgb_get_pauseparam,
-       .set_pauseparam = ixgb_set_pauseparam,
-       .get_rx_csum = ixgb_get_rx_csum,
-       .set_rx_csum = ixgb_set_rx_csum,
-       .get_tx_csum = ixgb_get_tx_csum,
-       .set_tx_csum = ixgb_set_tx_csum,
-       .set_sg = ethtool_op_set_sg,
-       .get_msglevel = ixgb_get_msglevel,
-       .set_msglevel = ixgb_set_msglevel,
-       .set_tso = ixgb_set_tso,
-       .get_strings = ixgb_get_strings,
-       .set_phys_id = ixgb_set_phys_id,
-       .get_sset_count = ixgb_get_sset_count,
-       .get_ethtool_stats = ixgb_get_ethtool_stats,
-       .get_flags = ethtool_op_get_flags,
-       .set_flags = ixgb_set_flags,
-};
-
-void ixgb_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &ixgb_ethtool_ops);
-}
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
deleted file mode 100644 (file)
index 3d61a9e..0000000
+++ /dev/null
@@ -1,1262 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-/* ixgb_hw.c
- * Shared functions for accessing and configuring the adapter
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include "ixgb_hw.h"
-#include "ixgb_ids.h"
-
-#include <linux/etherdevice.h>
-
-/*  Local function prototypes */
-
-static u32 ixgb_hash_mc_addr(struct ixgb_hw *hw, u8 * mc_addr);
-
-static void ixgb_mta_set(struct ixgb_hw *hw, u32 hash_value);
-
-static void ixgb_get_bus_info(struct ixgb_hw *hw);
-
-static bool ixgb_link_reset(struct ixgb_hw *hw);
-
-static void ixgb_optics_reset(struct ixgb_hw *hw);
-
-static void ixgb_optics_reset_bcm(struct ixgb_hw *hw);
-
-static ixgb_phy_type ixgb_identify_phy(struct ixgb_hw *hw);
-
-static void ixgb_clear_hw_cntrs(struct ixgb_hw *hw);
-
-static void ixgb_clear_vfta(struct ixgb_hw *hw);
-
-static void ixgb_init_rx_addrs(struct ixgb_hw *hw);
-
-static u16 ixgb_read_phy_reg(struct ixgb_hw *hw,
-                                 u32 reg_address,
-                                 u32 phy_address,
-                                 u32 device_type);
-
-static bool ixgb_setup_fc(struct ixgb_hw *hw);
-
-static bool mac_addr_valid(u8 *mac_addr);
-
-static u32 ixgb_mac_reset(struct ixgb_hw *hw)
-{
-       u32 ctrl_reg;
-
-       ctrl_reg =  IXGB_CTRL0_RST |
-                               IXGB_CTRL0_SDP3_DIR |   /* All pins are Output=1 */
-                               IXGB_CTRL0_SDP2_DIR |
-                               IXGB_CTRL0_SDP1_DIR |
-                               IXGB_CTRL0_SDP0_DIR |
-                               IXGB_CTRL0_SDP3  |   /* Initial value 1101   */
-                               IXGB_CTRL0_SDP2  |
-                               IXGB_CTRL0_SDP0;
-
-#ifdef HP_ZX1
-       /* Workaround for 82597EX reset errata */
-       IXGB_WRITE_REG_IO(hw, CTRL0, ctrl_reg);
-#else
-       IXGB_WRITE_REG(hw, CTRL0, ctrl_reg);
-#endif
-
-       /* Delay a few ms just to allow the reset to complete */
-       msleep(IXGB_DELAY_AFTER_RESET);
-       ctrl_reg = IXGB_READ_REG(hw, CTRL0);
-#ifdef DBG
-       /* Make sure the self-clearing global reset bit did self clear */
-       ASSERT(!(ctrl_reg & IXGB_CTRL0_RST));
-#endif
-
-       if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) {
-               ctrl_reg =  /* Enable interrupt from XFP and SerDes */
-                          IXGB_CTRL1_GPI0_EN |
-                          IXGB_CTRL1_SDP6_DIR |
-                          IXGB_CTRL1_SDP7_DIR |
-                          IXGB_CTRL1_SDP6 |
-                          IXGB_CTRL1_SDP7;
-               IXGB_WRITE_REG(hw, CTRL1, ctrl_reg);
-               ixgb_optics_reset_bcm(hw);
-       }
-
-       if (hw->phy_type == ixgb_phy_type_txn17401)
-               ixgb_optics_reset(hw);
-
-       return ctrl_reg;
-}
-
-/******************************************************************************
- * Reset the transmit and receive units; mask and clear all interrupts.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-bool
-ixgb_adapter_stop(struct ixgb_hw *hw)
-{
-       u32 ctrl_reg;
-       u32 icr_reg;
-
-       ENTER();
-
-       /* If we are stopped or resetting exit gracefully and wait to be
-        * started again before accessing the hardware.
-        */
-       if (hw->adapter_stopped) {
-               pr_debug("Exiting because the adapter is already stopped!!!\n");
-               return false;
-       }
-
-       /* Set the Adapter Stopped flag so other driver functions stop
-        * touching the Hardware.
-        */
-       hw->adapter_stopped = true;
-
-       /* Clear interrupt mask to stop board from generating interrupts */
-       pr_debug("Masking off all interrupts\n");
-       IXGB_WRITE_REG(hw, 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.
-        */
-       IXGB_WRITE_REG(hw, RCTL, IXGB_READ_REG(hw, RCTL) & ~IXGB_RCTL_RXEN);
-       IXGB_WRITE_REG(hw, TCTL, IXGB_READ_REG(hw, TCTL) & ~IXGB_TCTL_TXEN);
-       IXGB_WRITE_FLUSH(hw);
-       msleep(IXGB_DELAY_BEFORE_RESET);
-
-       /* Issue a global reset to the MAC.  This will reset the chip's
-        * transmit, receive, DMA, and link units.  It will not effect
-        * the current PCI configuration.  The global reset bit is self-
-        * clearing, and should clear within a microsecond.
-        */
-       pr_debug("Issuing a global reset to MAC\n");
-
-       ctrl_reg = ixgb_mac_reset(hw);
-
-       /* Clear interrupt mask to stop board from generating interrupts */
-       pr_debug("Masking off all interrupts\n");
-       IXGB_WRITE_REG(hw, IMC, 0xffffffff);
-
-       /* Clear any pending interrupt events. */
-       icr_reg = IXGB_READ_REG(hw, ICR);
-
-       return ctrl_reg & IXGB_CTRL0_RST;
-}
-
-
-/******************************************************************************
- * Identifies the vendor of the optics module on the adapter.  The SR adapters
- * support two different types of XPAK optics, so it is necessary to determine
- * which optics are present before applying any optics-specific workarounds.
- *
- * hw - Struct containing variables accessed by shared code.
- *
- * Returns: the vendor of the XPAK optics module.
- *****************************************************************************/
-static ixgb_xpak_vendor
-ixgb_identify_xpak_vendor(struct ixgb_hw *hw)
-{
-       u32 i;
-       u16 vendor_name[5];
-       ixgb_xpak_vendor xpak_vendor;
-
-       ENTER();
-
-       /* Read the first few bytes of the vendor string from the XPAK NVR
-        * registers.  These are standard XENPAK/XPAK registers, so all XPAK
-        * devices should implement them. */
-       for (i = 0; i < 5; i++) {
-               vendor_name[i] = ixgb_read_phy_reg(hw,
-                                                  MDIO_PMA_PMD_XPAK_VENDOR_NAME
-                                                  + i, IXGB_PHY_ADDRESS,
-                                                  MDIO_MMD_PMAPMD);
-       }
-
-       /* Determine the actual vendor */
-       if (vendor_name[0] == 'I' &&
-           vendor_name[1] == 'N' &&
-           vendor_name[2] == 'T' &&
-           vendor_name[3] == 'E' && vendor_name[4] == 'L') {
-               xpak_vendor = ixgb_xpak_vendor_intel;
-       } else {
-               xpak_vendor = ixgb_xpak_vendor_infineon;
-       }
-
-       return xpak_vendor;
-}
-
-/******************************************************************************
- * Determine the physical layer module on the adapter.
- *
- * hw - Struct containing variables accessed by shared code.  The device_id
- *      field must be (correctly) populated before calling this routine.
- *
- * Returns: the phy type of the adapter.
- *****************************************************************************/
-static ixgb_phy_type
-ixgb_identify_phy(struct ixgb_hw *hw)
-{
-       ixgb_phy_type phy_type;
-       ixgb_xpak_vendor xpak_vendor;
-
-       ENTER();
-
-       /* Infer the transceiver/phy type from the device id */
-       switch (hw->device_id) {
-       case IXGB_DEVICE_ID_82597EX:
-               pr_debug("Identified TXN17401 optics\n");
-               phy_type = ixgb_phy_type_txn17401;
-               break;
-
-       case IXGB_DEVICE_ID_82597EX_SR:
-               /* The SR adapters carry two different types of XPAK optics
-                * modules; read the vendor identifier to determine the exact
-                * type of optics. */
-               xpak_vendor = ixgb_identify_xpak_vendor(hw);
-               if (xpak_vendor == ixgb_xpak_vendor_intel) {
-                       pr_debug("Identified TXN17201 optics\n");
-                       phy_type = ixgb_phy_type_txn17201;
-               } else {
-                       pr_debug("Identified G6005 optics\n");
-                       phy_type = ixgb_phy_type_g6005;
-               }
-               break;
-       case IXGB_DEVICE_ID_82597EX_LR:
-               pr_debug("Identified G6104 optics\n");
-               phy_type = ixgb_phy_type_g6104;
-               break;
-       case IXGB_DEVICE_ID_82597EX_CX4:
-               pr_debug("Identified CX4\n");
-               xpak_vendor = ixgb_identify_xpak_vendor(hw);
-               if (xpak_vendor == ixgb_xpak_vendor_intel) {
-                       pr_debug("Identified TXN17201 optics\n");
-                       phy_type = ixgb_phy_type_txn17201;
-               } else {
-                       pr_debug("Identified G6005 optics\n");
-                       phy_type = ixgb_phy_type_g6005;
-               }
-               break;
-       default:
-               pr_debug("Unknown physical layer module\n");
-               phy_type = ixgb_phy_type_unknown;
-               break;
-       }
-
-       /* update phy type for sun specific board */
-       if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID)
-               phy_type = ixgb_phy_type_bcm;
-
-       return phy_type;
-}
-
-/******************************************************************************
- * Performs basic configuration of the adapter.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Resets the controller.
- * Reads and validates the EEPROM.
- * Initializes the receive address registers.
- * Initializes the multicast table.
- * Clears all on-chip counters.
- * Calls routine to setup flow control settings.
- * Leaves the transmit and receive units disabled and uninitialized.
- *
- * Returns:
- *      true if successful,
- *      false if unrecoverable problems were encountered.
- *****************************************************************************/
-bool
-ixgb_init_hw(struct ixgb_hw *hw)
-{
-       u32 i;
-       u32 ctrl_reg;
-       bool status;
-
-       ENTER();
-
-       /* Issue a global reset to the MAC.  This will reset the chip's
-        * transmit, receive, DMA, and link units.  It will not effect
-        * the current PCI configuration.  The global reset bit is self-
-        * clearing, and should clear within a microsecond.
-        */
-       pr_debug("Issuing a global reset to MAC\n");
-
-       ctrl_reg = ixgb_mac_reset(hw);
-
-       pr_debug("Issuing an EE reset to MAC\n");
-#ifdef HP_ZX1
-       /* Workaround for 82597EX reset errata */
-       IXGB_WRITE_REG_IO(hw, CTRL1, IXGB_CTRL1_EE_RST);
-#else
-       IXGB_WRITE_REG(hw, CTRL1, IXGB_CTRL1_EE_RST);
-#endif
-
-       /* Delay a few ms just to allow the reset to complete */
-       msleep(IXGB_DELAY_AFTER_EE_RESET);
-
-       if (!ixgb_get_eeprom_data(hw))
-               return false;
-
-       /* Use the device id to determine the type of phy/transceiver. */
-       hw->device_id = ixgb_get_ee_device_id(hw);
-       hw->phy_type = ixgb_identify_phy(hw);
-
-       /* Setup the receive addresses.
-        * Receive Address Registers (RARs 0 - 15).
-        */
-       ixgb_init_rx_addrs(hw);
-
-       /*
-        * Check that a valid MAC address has been set.
-        * If it is not valid, we fail hardware init.
-        */
-       if (!mac_addr_valid(hw->curr_mac_addr)) {
-               pr_debug("MAC address invalid after ixgb_init_rx_addrs\n");
-               return(false);
-       }
-
-       /* tell the routines in this file they can access hardware again */
-       hw->adapter_stopped = false;
-
-       /* Fill in the bus_info structure */
-       ixgb_get_bus_info(hw);
-
-       /* Zero out the Multicast HASH table */
-       pr_debug("Zeroing the MTA\n");
-       for (i = 0; i < IXGB_MC_TBL_SIZE; i++)
-               IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0);
-
-       /* Zero out the VLAN Filter Table Array */
-       ixgb_clear_vfta(hw);
-
-       /* Zero all of the hardware counters */
-       ixgb_clear_hw_cntrs(hw);
-
-       /* Call a subroutine to setup flow control. */
-       status = ixgb_setup_fc(hw);
-
-       /* 82597EX errata: Call check-for-link in case lane deskew is locked */
-       ixgb_check_for_link(hw);
-
-       return status;
-}
-
-/******************************************************************************
- * Initializes receive address filters.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Places the MAC address in receive address register 0 and clears the rest
- * of the receive address registers. Clears the multicast table. Assumes
- * the receiver is in reset when the routine is called.
- *****************************************************************************/
-static void
-ixgb_init_rx_addrs(struct ixgb_hw *hw)
-{
-       u32 i;
-
-       ENTER();
-
-       /*
-        * If the current mac address is valid, assume it is a software override
-        * to the permanent address.
-        * Otherwise, use the permanent address from the eeprom.
-        */
-       if (!mac_addr_valid(hw->curr_mac_addr)) {
-
-               /* Get the MAC address from the eeprom for later reference */
-               ixgb_get_ee_mac_addr(hw, hw->curr_mac_addr);
-
-               pr_debug("Keeping Permanent MAC Addr = %pM\n",
-                        hw->curr_mac_addr);
-       } else {
-
-               /* Setup the receive address. */
-               pr_debug("Overriding MAC Address in RAR[0]\n");
-               pr_debug("New MAC Addr = %pM\n", hw->curr_mac_addr);
-
-               ixgb_rar_set(hw, hw->curr_mac_addr, 0);
-       }
-
-       /* Zero out the other 15 receive addresses. */
-       pr_debug("Clearing RAR[1-15]\n");
-       for (i = 1; i < IXGB_RAR_ENTRIES; i++) {
-               /* Write high reg first to disable the AV bit first */
-               IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
-               IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
-       }
-}
-
-/******************************************************************************
- * Updates the MAC's list of multicast addresses.
- *
- * hw - Struct containing variables accessed by shared code
- * mc_addr_list - the list of new multicast addresses
- * mc_addr_count - number of addresses
- * pad - number of bytes between addresses in the list
- *
- * The given list replaces any existing list. Clears the last 15 receive
- * address registers and the multicast table. Uses receive address registers
- * for the first 15 multicast addresses, and hashes the rest into the
- * multicast table.
- *****************************************************************************/
-void
-ixgb_mc_addr_list_update(struct ixgb_hw *hw,
-                         u8 *mc_addr_list,
-                         u32 mc_addr_count,
-                         u32 pad)
-{
-       u32 hash_value;
-       u32 i;
-       u32 rar_used_count = 1;         /* RAR[0] is used for our MAC address */
-       u8 *mca;
-
-       ENTER();
-
-       /* Set the new number of MC addresses that we are being requested to use. */
-       hw->num_mc_addrs = mc_addr_count;
-
-       /* Clear RAR[1-15] */
-       pr_debug("Clearing RAR[1-15]\n");
-       for (i = rar_used_count; i < IXGB_RAR_ENTRIES; i++) {
-               IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
-               IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
-       }
-
-       /* Clear the MTA */
-       pr_debug("Clearing MTA\n");
-       for (i = 0; i < IXGB_MC_TBL_SIZE; i++)
-               IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0);
-
-       /* Add the new addresses */
-       mca = mc_addr_list;
-       for (i = 0; i < mc_addr_count; i++) {
-               pr_debug("Adding the multicast addresses:\n");
-               pr_debug("MC Addr #%d = %pM\n", i, mca);
-
-               /* Place this multicast address in the RAR if there is room, *
-                * else put it in the MTA
-                */
-               if (rar_used_count < IXGB_RAR_ENTRIES) {
-                       ixgb_rar_set(hw, mca, rar_used_count);
-                       pr_debug("Added a multicast address to RAR[%d]\n", i);
-                       rar_used_count++;
-               } else {
-                       hash_value = ixgb_hash_mc_addr(hw, mca);
-
-                       pr_debug("Hash value = 0x%03X\n", hash_value);
-
-                       ixgb_mta_set(hw, hash_value);
-               }
-
-               mca += IXGB_ETH_LENGTH_OF_ADDRESS + pad;
-       }
-
-       pr_debug("MC Update Complete\n");
-}
-
-/******************************************************************************
- * Hashes an address to determine its location in the multicast table
- *
- * hw - Struct containing variables accessed by shared code
- * mc_addr - the multicast address to hash
- *
- * Returns:
- *      The hash value
- *****************************************************************************/
-static u32
-ixgb_hash_mc_addr(struct ixgb_hw *hw,
-                  u8 *mc_addr)
-{
-       u32 hash_value = 0;
-
-       ENTER();
-
-       /* The portion of the address that is used for the hash table is
-        * determined by the mc_filter_type setting.
-        */
-       switch (hw->mc_filter_type) {
-               /* [0] [1] [2] [3] [4] [5]
-                * 01  AA  00  12  34  56
-                * LSB                 MSB - According to H/W docs */
-       case 0:
-               /* [47:36] i.e. 0x563 for above example address */
-               hash_value =
-                   ((mc_addr[4] >> 4) | (((u16) mc_addr[5]) << 4));
-               break;
-       case 1:         /* [46:35] i.e. 0xAC6 for above example address */
-               hash_value =
-                   ((mc_addr[4] >> 3) | (((u16) mc_addr[5]) << 5));
-               break;
-       case 2:         /* [45:34] i.e. 0x5D8 for above example address */
-               hash_value =
-                   ((mc_addr[4] >> 2) | (((u16) mc_addr[5]) << 6));
-               break;
-       case 3:         /* [43:32] i.e. 0x634 for above example address */
-               hash_value = ((mc_addr[4]) | (((u16) mc_addr[5]) << 8));
-               break;
-       default:
-               /* Invalid mc_filter_type, what should we do? */
-               pr_debug("MC filter type param set incorrectly\n");
-               ASSERT(0);
-               break;
-       }
-
-       hash_value &= 0xFFF;
-       return hash_value;
-}
-
-/******************************************************************************
- * Sets the bit in the multicast table corresponding to the hash value.
- *
- * hw - Struct containing variables accessed by shared code
- * hash_value - Multicast address hash value
- *****************************************************************************/
-static void
-ixgb_mta_set(struct ixgb_hw *hw,
-                 u32 hash_value)
-{
-       u32 hash_bit, hash_reg;
-       u32 mta_reg;
-
-       /* The MTA is a register array of 128 32-bit registers.
-        * It is treated like an array of 4096 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 register is determined by the
-        * upper 7 bits of the hash value and the bit within that
-        * register are determined by the lower 5 bits of the value.
-        */
-       hash_reg = (hash_value >> 5) & 0x7F;
-       hash_bit = hash_value & 0x1F;
-
-       mta_reg = IXGB_READ_REG_ARRAY(hw, MTA, hash_reg);
-
-       mta_reg |= (1 << hash_bit);
-
-       IXGB_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta_reg);
-}
-
-/******************************************************************************
- * Puts an ethernet address into a receive address register.
- *
- * hw - Struct containing variables accessed by shared code
- * addr - Address to put into receive address register
- * index - Receive address register to write
- *****************************************************************************/
-void
-ixgb_rar_set(struct ixgb_hw *hw,
-                 u8 *addr,
-                 u32 index)
-{
-       u32 rar_low, rar_high;
-
-       ENTER();
-
-       /* 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) |
-                       IXGB_RAH_AV);
-
-       IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
-       IXGB_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
-}
-
-/******************************************************************************
- * Writes a value to the specified offset in the VLAN filter table.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - Offset in VLAN filer table to write
- * value - Value to write into VLAN filter table
- *****************************************************************************/
-void
-ixgb_write_vfta(struct ixgb_hw *hw,
-                u32 offset,
-                u32 value)
-{
-       IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value);
-}
-
-/******************************************************************************
- * Clears the VLAN filer table
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void
-ixgb_clear_vfta(struct ixgb_hw *hw)
-{
-       u32 offset;
-
-       for (offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++)
-               IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
-}
-
-/******************************************************************************
- * Configures the flow control settings based on SW configuration.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-
-static bool
-ixgb_setup_fc(struct ixgb_hw *hw)
-{
-       u32 ctrl_reg;
-       u32 pap_reg = 0;   /* by default, assume no pause time */
-       bool status = true;
-
-       ENTER();
-
-       /* Get the current control reg 0 settings */
-       ctrl_reg = IXGB_READ_REG(hw, CTRL0);
-
-       /* Clear the Receive Pause Enable and Transmit Pause Enable bits */
-       ctrl_reg &= ~(IXGB_CTRL0_RPE | IXGB_CTRL0_TPE);
-
-       /* The possible values of the "flow_control" 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:  Invalid.
-        */
-       switch (hw->fc.type) {
-       case ixgb_fc_none:      /* 0 */
-               /* Set CMDC bit to disable Rx Flow control */
-               ctrl_reg |= (IXGB_CTRL0_CMDC);
-               break;
-       case ixgb_fc_rx_pause:  /* 1 */
-               /* RX Flow control is enabled, and TX Flow control is
-                * disabled.
-                */
-               ctrl_reg |= (IXGB_CTRL0_RPE);
-               break;
-       case ixgb_fc_tx_pause:  /* 2 */
-               /* TX Flow control is enabled, and RX Flow control is
-                * disabled, by a software over-ride.
-                */
-               ctrl_reg |= (IXGB_CTRL0_TPE);
-               pap_reg = hw->fc.pause_time;
-               break;
-       case ixgb_fc_full:      /* 3 */
-               /* Flow control (both RX and TX) is enabled by a software
-                * over-ride.
-                */
-               ctrl_reg |= (IXGB_CTRL0_RPE | IXGB_CTRL0_TPE);
-               pap_reg = hw->fc.pause_time;
-               break;
-       default:
-               /* We should never get here.  The value should be 0-3. */
-               pr_debug("Flow control param set incorrectly\n");
-               ASSERT(0);
-               break;
-       }
-
-       /* Write the new settings */
-       IXGB_WRITE_REG(hw, CTRL0, ctrl_reg);
-
-       if (pap_reg != 0)
-               IXGB_WRITE_REG(hw, PAP, pap_reg);
-
-       /* 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 in not enabled, then these
-        * registers will be set to 0.
-        */
-       if (!(hw->fc.type & ixgb_fc_tx_pause)) {
-               IXGB_WRITE_REG(hw, FCRTL, 0);
-               IXGB_WRITE_REG(hw, FCRTH, 0);
-       } else {
-          /* We need to set up the Receive Threshold high and low water
-           * marks as well as (optionally) enabling the transmission of XON
-           * frames. */
-               if (hw->fc.send_xon) {
-                       IXGB_WRITE_REG(hw, FCRTL,
-                               (hw->fc.low_water | IXGB_FCRTL_XONE));
-               } else {
-                       IXGB_WRITE_REG(hw, FCRTL, hw->fc.low_water);
-               }
-               IXGB_WRITE_REG(hw, FCRTH, hw->fc.high_water);
-       }
-       return status;
-}
-
-/******************************************************************************
- * Reads a word from a device over the Management Data Interface (MDI) bus.
- * This interface is used to manage Physical layer devices.
- *
- * hw          - Struct containing variables accessed by hw code
- * reg_address - Offset of device register being read.
- * phy_address - Address of device on MDI.
- *
- * Returns:  Data word (16 bits) from MDI device.
- *
- * The 82597EX has support for several MDI access methods.  This routine
- * uses the new protocol MDI Single Command and Address Operation.
- * This requires that first an address cycle command is sent, followed by a
- * read command.
- *****************************************************************************/
-static u16
-ixgb_read_phy_reg(struct ixgb_hw *hw,
-               u32 reg_address,
-               u32 phy_address,
-               u32 device_type)
-{
-       u32 i;
-       u32 data;
-       u32 command = 0;
-
-       ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
-       ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
-       ASSERT(device_type <= IXGB_MAX_PHY_DEV_TYPE);
-
-       /* Setup and write the address cycle command */
-       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT) |
-                  (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
-                  (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
-                  (IXGB_MSCA_ADDR_CYCLE | IXGB_MSCA_MDI_COMMAND));
-
-       IXGB_WRITE_REG(hw, MSCA, command);
-
-    /**************************************************************
-    ** Check every 10 usec to see if the address cycle completed
-    ** The COMMAND bit will clear when the operation is complete.
-    ** This may take as long as 64 usecs (we'll wait 100 usecs max)
-    ** from the CPU Write to the Ready bit assertion.
-    **************************************************************/
-
-       for (i = 0; i < 10; i++)
-       {
-               udelay(10);
-
-               command = IXGB_READ_REG(hw, MSCA);
-
-               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
-                       break;
-       }
-
-       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
-
-       /* Address cycle complete, setup and write the read command */
-       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT) |
-                  (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
-                  (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
-                  (IXGB_MSCA_READ | IXGB_MSCA_MDI_COMMAND));
-
-       IXGB_WRITE_REG(hw, MSCA, command);
-
-    /**************************************************************
-    ** Check every 10 usec to see if the read command completed
-    ** The COMMAND bit will clear when the operation is complete.
-    ** The read may take as long as 64 usecs (we'll wait 100 usecs max)
-    ** from the CPU Write to the Ready bit assertion.
-    **************************************************************/
-
-       for (i = 0; i < 10; i++)
-       {
-               udelay(10);
-
-               command = IXGB_READ_REG(hw, MSCA);
-
-               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
-                       break;
-       }
-
-       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
-
-       /* Operation is complete, get the data from the MDIO Read/Write Data
-        * register and return.
-        */
-       data = IXGB_READ_REG(hw, MSRWD);
-       data >>= IXGB_MSRWD_READ_DATA_SHIFT;
-       return((u16) data);
-}
-
-/******************************************************************************
- * Writes a word to a device over the Management Data Interface (MDI) bus.
- * This interface is used to manage Physical layer devices.
- *
- * hw          - Struct containing variables accessed by hw code
- * reg_address - Offset of device register being read.
- * phy_address - Address of device on MDI.
- * device_type - Also known as the Device ID or DID.
- * data        - 16-bit value to be written
- *
- * Returns:  void.
- *
- * The 82597EX has support for several MDI access methods.  This routine
- * uses the new protocol MDI Single Command and Address Operation.
- * This requires that first an address cycle command is sent, followed by a
- * write command.
- *****************************************************************************/
-static void
-ixgb_write_phy_reg(struct ixgb_hw *hw,
-                       u32 reg_address,
-                       u32 phy_address,
-                       u32 device_type,
-                       u16 data)
-{
-       u32 i;
-       u32 command = 0;
-
-       ASSERT(reg_address <= IXGB_MAX_PHY_REG_ADDRESS);
-       ASSERT(phy_address <= IXGB_MAX_PHY_ADDRESS);
-       ASSERT(device_type <= IXGB_MAX_PHY_DEV_TYPE);
-
-       /* Put the data in the MDIO Read/Write Data register */
-       IXGB_WRITE_REG(hw, MSRWD, (u32)data);
-
-       /* Setup and write the address cycle command */
-       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
-                          (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
-                          (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
-                          (IXGB_MSCA_ADDR_CYCLE | IXGB_MSCA_MDI_COMMAND));
-
-       IXGB_WRITE_REG(hw, MSCA, command);
-
-       /**************************************************************
-       ** Check every 10 usec to see if the address cycle completed
-       ** The COMMAND bit will clear when the operation is complete.
-       ** This may take as long as 64 usecs (we'll wait 100 usecs max)
-       ** from the CPU Write to the Ready bit assertion.
-       **************************************************************/
-
-       for (i = 0; i < 10; i++)
-       {
-               udelay(10);
-
-               command = IXGB_READ_REG(hw, MSCA);
-
-               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
-                       break;
-       }
-
-       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
-
-       /* Address cycle complete, setup and write the write command */
-       command = ((reg_address << IXGB_MSCA_NP_ADDR_SHIFT)  |
-                          (device_type << IXGB_MSCA_DEV_TYPE_SHIFT) |
-                          (phy_address << IXGB_MSCA_PHY_ADDR_SHIFT) |
-                          (IXGB_MSCA_WRITE | IXGB_MSCA_MDI_COMMAND));
-
-       IXGB_WRITE_REG(hw, MSCA, command);
-
-       /**************************************************************
-       ** Check every 10 usec to see if the read command completed
-       ** The COMMAND bit will clear when the operation is complete.
-       ** The write may take as long as 64 usecs (we'll wait 100 usecs max)
-       ** from the CPU Write to the Ready bit assertion.
-       **************************************************************/
-
-       for (i = 0; i < 10; i++)
-       {
-               udelay(10);
-
-               command = IXGB_READ_REG(hw, MSCA);
-
-               if ((command & IXGB_MSCA_MDI_COMMAND) == 0)
-                       break;
-       }
-
-       ASSERT((command & IXGB_MSCA_MDI_COMMAND) == 0);
-
-       /* Operation is complete, return. */
-}
-
-/******************************************************************************
- * Checks to see if the link status of the hardware has changed.
- *
- * hw - Struct containing variables accessed by hw code
- *
- * Called by any function that needs to check the link status of the adapter.
- *****************************************************************************/
-void
-ixgb_check_for_link(struct ixgb_hw *hw)
-{
-       u32 status_reg;
-       u32 xpcss_reg;
-
-       ENTER();
-
-       xpcss_reg = IXGB_READ_REG(hw, XPCSS);
-       status_reg = IXGB_READ_REG(hw, STATUS);
-
-       if ((xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
-           (status_reg & IXGB_STATUS_LU)) {
-               hw->link_up = true;
-       } else if (!(xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
-                  (status_reg & IXGB_STATUS_LU)) {
-               pr_debug("XPCSS Not Aligned while Status:LU is set\n");
-               hw->link_up = ixgb_link_reset(hw);
-       } else {
-               /*
-                * 82597EX errata.  Since the lane deskew problem may prevent
-                * link, reset the link before reporting link down.
-                */
-               hw->link_up = ixgb_link_reset(hw);
-       }
-       /*  Anything else for 10 Gig?? */
-}
-
-/******************************************************************************
- * Check for a bad link condition that may have occurred.
- * The indication is that the RFC / LFC registers may be incrementing
- * continually.  A full adapter reset is required to recover.
- *
- * hw - Struct containing variables accessed by hw code
- *
- * Called by any function that needs to check the link status of the adapter.
- *****************************************************************************/
-bool ixgb_check_for_bad_link(struct ixgb_hw *hw)
-{
-       u32 newLFC, newRFC;
-       bool bad_link_returncode = false;
-
-       if (hw->phy_type == ixgb_phy_type_txn17401) {
-               newLFC = IXGB_READ_REG(hw, LFC);
-               newRFC = IXGB_READ_REG(hw, RFC);
-               if ((hw->lastLFC + 250 < newLFC)
-                   || (hw->lastRFC + 250 < newRFC)) {
-                       pr_debug("BAD LINK! too many LFC/RFC since last check\n");
-                       bad_link_returncode = true;
-               }
-               hw->lastLFC = newLFC;
-               hw->lastRFC = newRFC;
-       }
-
-       return bad_link_returncode;
-}
-
-/******************************************************************************
- * Clears all hardware statistics counters.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void
-ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
-{
-       volatile u32 temp_reg;
-
-       ENTER();
-
-       /* if we are stopped or resetting exit gracefully */
-       if (hw->adapter_stopped) {
-               pr_debug("Exiting because the adapter is stopped!!!\n");
-               return;
-       }
-
-       temp_reg = IXGB_READ_REG(hw, TPRL);
-       temp_reg = IXGB_READ_REG(hw, TPRH);
-       temp_reg = IXGB_READ_REG(hw, GPRCL);
-       temp_reg = IXGB_READ_REG(hw, GPRCH);
-       temp_reg = IXGB_READ_REG(hw, BPRCL);
-       temp_reg = IXGB_READ_REG(hw, BPRCH);
-       temp_reg = IXGB_READ_REG(hw, MPRCL);
-       temp_reg = IXGB_READ_REG(hw, MPRCH);
-       temp_reg = IXGB_READ_REG(hw, UPRCL);
-       temp_reg = IXGB_READ_REG(hw, UPRCH);
-       temp_reg = IXGB_READ_REG(hw, VPRCL);
-       temp_reg = IXGB_READ_REG(hw, VPRCH);
-       temp_reg = IXGB_READ_REG(hw, JPRCL);
-       temp_reg = IXGB_READ_REG(hw, JPRCH);
-       temp_reg = IXGB_READ_REG(hw, GORCL);
-       temp_reg = IXGB_READ_REG(hw, GORCH);
-       temp_reg = IXGB_READ_REG(hw, TORL);
-       temp_reg = IXGB_READ_REG(hw, TORH);
-       temp_reg = IXGB_READ_REG(hw, RNBC);
-       temp_reg = IXGB_READ_REG(hw, RUC);
-       temp_reg = IXGB_READ_REG(hw, ROC);
-       temp_reg = IXGB_READ_REG(hw, RLEC);
-       temp_reg = IXGB_READ_REG(hw, CRCERRS);
-       temp_reg = IXGB_READ_REG(hw, ICBC);
-       temp_reg = IXGB_READ_REG(hw, ECBC);
-       temp_reg = IXGB_READ_REG(hw, MPC);
-       temp_reg = IXGB_READ_REG(hw, TPTL);
-       temp_reg = IXGB_READ_REG(hw, TPTH);
-       temp_reg = IXGB_READ_REG(hw, GPTCL);
-       temp_reg = IXGB_READ_REG(hw, GPTCH);
-       temp_reg = IXGB_READ_REG(hw, BPTCL);
-       temp_reg = IXGB_READ_REG(hw, BPTCH);
-       temp_reg = IXGB_READ_REG(hw, MPTCL);
-       temp_reg = IXGB_READ_REG(hw, MPTCH);
-       temp_reg = IXGB_READ_REG(hw, UPTCL);
-       temp_reg = IXGB_READ_REG(hw, UPTCH);
-       temp_reg = IXGB_READ_REG(hw, VPTCL);
-       temp_reg = IXGB_READ_REG(hw, VPTCH);
-       temp_reg = IXGB_READ_REG(hw, JPTCL);
-       temp_reg = IXGB_READ_REG(hw, JPTCH);
-       temp_reg = IXGB_READ_REG(hw, GOTCL);
-       temp_reg = IXGB_READ_REG(hw, GOTCH);
-       temp_reg = IXGB_READ_REG(hw, TOTL);
-       temp_reg = IXGB_READ_REG(hw, TOTH);
-       temp_reg = IXGB_READ_REG(hw, DC);
-       temp_reg = IXGB_READ_REG(hw, PLT64C);
-       temp_reg = IXGB_READ_REG(hw, TSCTC);
-       temp_reg = IXGB_READ_REG(hw, TSCTFC);
-       temp_reg = IXGB_READ_REG(hw, IBIC);
-       temp_reg = IXGB_READ_REG(hw, RFC);
-       temp_reg = IXGB_READ_REG(hw, LFC);
-       temp_reg = IXGB_READ_REG(hw, PFRC);
-       temp_reg = IXGB_READ_REG(hw, PFTC);
-       temp_reg = IXGB_READ_REG(hw, MCFRC);
-       temp_reg = IXGB_READ_REG(hw, MCFTC);
-       temp_reg = IXGB_READ_REG(hw, XONRXC);
-       temp_reg = IXGB_READ_REG(hw, XONTXC);
-       temp_reg = IXGB_READ_REG(hw, XOFFRXC);
-       temp_reg = IXGB_READ_REG(hw, XOFFTXC);
-       temp_reg = IXGB_READ_REG(hw, RJC);
-}
-
-/******************************************************************************
- * Turns on the software controllable LED
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-void
-ixgb_led_on(struct ixgb_hw *hw)
-{
-       u32 ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
-
-       /* To turn on the LED, clear software-definable pin 0 (SDP0). */
-       ctrl0_reg &= ~IXGB_CTRL0_SDP0;
-       IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
-}
-
-/******************************************************************************
- * Turns off the software controllable LED
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-void
-ixgb_led_off(struct ixgb_hw *hw)
-{
-       u32 ctrl0_reg = IXGB_READ_REG(hw, CTRL0);
-
-       /* To turn off the LED, set software-definable pin 0 (SDP0). */
-       ctrl0_reg |= IXGB_CTRL0_SDP0;
-       IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
-}
-
-/******************************************************************************
- * Gets the current PCI bus type, speed, and width of the hardware
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void
-ixgb_get_bus_info(struct ixgb_hw *hw)
-{
-       u32 status_reg;
-
-       status_reg = IXGB_READ_REG(hw, STATUS);
-
-       hw->bus.type = (status_reg & IXGB_STATUS_PCIX_MODE) ?
-               ixgb_bus_type_pcix : ixgb_bus_type_pci;
-
-       if (hw->bus.type == ixgb_bus_type_pci) {
-               hw->bus.speed = (status_reg & IXGB_STATUS_PCI_SPD) ?
-                       ixgb_bus_speed_66 : ixgb_bus_speed_33;
-       } else {
-               switch (status_reg & IXGB_STATUS_PCIX_SPD_MASK) {
-               case IXGB_STATUS_PCIX_SPD_66:
-                       hw->bus.speed = ixgb_bus_speed_66;
-                       break;
-               case IXGB_STATUS_PCIX_SPD_100:
-                       hw->bus.speed = ixgb_bus_speed_100;
-                       break;
-               case IXGB_STATUS_PCIX_SPD_133:
-                       hw->bus.speed = ixgb_bus_speed_133;
-                       break;
-               default:
-                       hw->bus.speed = ixgb_bus_speed_reserved;
-                       break;
-               }
-       }
-
-       hw->bus.width = (status_reg & IXGB_STATUS_BUS64) ?
-               ixgb_bus_width_64 : ixgb_bus_width_32;
-}
-
-/******************************************************************************
- * Tests a MAC address to ensure it is a valid Individual Address
- *
- * mac_addr - pointer to MAC address.
- *
- *****************************************************************************/
-static bool
-mac_addr_valid(u8 *mac_addr)
-{
-       bool is_valid = true;
-       ENTER();
-
-       /* Make sure it is not a multicast address */
-       if (is_multicast_ether_addr(mac_addr)) {
-               pr_debug("MAC address is multicast\n");
-               is_valid = false;
-       }
-       /* Not a broadcast address */
-       else if (is_broadcast_ether_addr(mac_addr)) {
-               pr_debug("MAC address is broadcast\n");
-               is_valid = false;
-       }
-       /* Reject the zero address */
-       else if (is_zero_ether_addr(mac_addr)) {
-               pr_debug("MAC address is all zeros\n");
-               is_valid = false;
-       }
-       return is_valid;
-}
-
-/******************************************************************************
- * Resets the 10GbE link.  Waits the settle time and returns the state of
- * the link.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static bool
-ixgb_link_reset(struct ixgb_hw *hw)
-{
-       bool link_status = false;
-       u8 wait_retries = MAX_RESET_ITERATIONS;
-       u8 lrst_retries = MAX_RESET_ITERATIONS;
-
-       do {
-               /* Reset the link */
-               IXGB_WRITE_REG(hw, CTRL0,
-                              IXGB_READ_REG(hw, CTRL0) | IXGB_CTRL0_LRST);
-
-               /* Wait for link-up and lane re-alignment */
-               do {
-                       udelay(IXGB_DELAY_USECS_AFTER_LINK_RESET);
-                       link_status =
-                           ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU)
-                            && (IXGB_READ_REG(hw, XPCSS) &
-                                IXGB_XPCSS_ALIGN_STATUS)) ? true : false;
-               } while (!link_status && --wait_retries);
-
-       } while (!link_status && --lrst_retries);
-
-       return link_status;
-}
-
-/******************************************************************************
- * Resets the 10GbE optics module.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void
-ixgb_optics_reset(struct ixgb_hw *hw)
-{
-       if (hw->phy_type == ixgb_phy_type_txn17401) {
-               u16 mdio_reg;
-
-               ixgb_write_phy_reg(hw,
-                                  MDIO_CTRL1,
-                                  IXGB_PHY_ADDRESS,
-                                  MDIO_MMD_PMAPMD,
-                                  MDIO_CTRL1_RESET);
-
-               mdio_reg = ixgb_read_phy_reg(hw,
-                                            MDIO_CTRL1,
-                                            IXGB_PHY_ADDRESS,
-                                            MDIO_MMD_PMAPMD);
-       }
-}
-
-/******************************************************************************
- * Resets the 10GbE optics module for Sun variant NIC.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-
-#define   IXGB_BCM8704_USER_PMD_TX_CTRL_REG         0xC803
-#define   IXGB_BCM8704_USER_PMD_TX_CTRL_REG_VAL     0x0164
-#define   IXGB_BCM8704_USER_CTRL_REG                0xC800
-#define   IXGB_BCM8704_USER_CTRL_REG_VAL            0x7FBF
-#define   IXGB_BCM8704_USER_DEV3_ADDR               0x0003
-#define   IXGB_SUN_PHY_ADDRESS                      0x0000
-#define   IXGB_SUN_PHY_RESET_DELAY                     305
-
-static void
-ixgb_optics_reset_bcm(struct ixgb_hw *hw)
-{
-       u32 ctrl = IXGB_READ_REG(hw, CTRL0);
-       ctrl &= ~IXGB_CTRL0_SDP2;
-       ctrl |= IXGB_CTRL0_SDP3;
-       IXGB_WRITE_REG(hw, CTRL0, ctrl);
-       IXGB_WRITE_FLUSH(hw);
-
-       /* SerDes needs extra delay */
-       msleep(IXGB_SUN_PHY_RESET_DELAY);
-
-       /* Broadcom 7408L configuration */
-       /* Reference clock config */
-       ixgb_write_phy_reg(hw,
-                          IXGB_BCM8704_USER_PMD_TX_CTRL_REG,
-                          IXGB_SUN_PHY_ADDRESS,
-                          IXGB_BCM8704_USER_DEV3_ADDR,
-                          IXGB_BCM8704_USER_PMD_TX_CTRL_REG_VAL);
-       /*  we must read the registers twice */
-       ixgb_read_phy_reg(hw,
-                         IXGB_BCM8704_USER_PMD_TX_CTRL_REG,
-                         IXGB_SUN_PHY_ADDRESS,
-                         IXGB_BCM8704_USER_DEV3_ADDR);
-       ixgb_read_phy_reg(hw,
-                         IXGB_BCM8704_USER_PMD_TX_CTRL_REG,
-                         IXGB_SUN_PHY_ADDRESS,
-                         IXGB_BCM8704_USER_DEV3_ADDR);
-
-       ixgb_write_phy_reg(hw,
-                          IXGB_BCM8704_USER_CTRL_REG,
-                          IXGB_SUN_PHY_ADDRESS,
-                          IXGB_BCM8704_USER_DEV3_ADDR,
-                          IXGB_BCM8704_USER_CTRL_REG_VAL);
-       ixgb_read_phy_reg(hw,
-                         IXGB_BCM8704_USER_CTRL_REG,
-                         IXGB_SUN_PHY_ADDRESS,
-                         IXGB_BCM8704_USER_DEV3_ADDR);
-       ixgb_read_phy_reg(hw,
-                         IXGB_BCM8704_USER_CTRL_REG,
-                         IXGB_SUN_PHY_ADDRESS,
-                         IXGB_BCM8704_USER_DEV3_ADDR);
-
-       /* SerDes needs extra delay */
-       msleep(IXGB_SUN_PHY_RESET_DELAY);
-}
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
deleted file mode 100644 (file)
index 873d32b..0000000
+++ /dev/null
@@ -1,801 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-#ifndef _IXGB_HW_H_
-#define _IXGB_HW_H_
-
-#include <linux/mdio.h>
-
-#include "ixgb_osdep.h"
-
-/* Enums */
-typedef enum {
-       ixgb_mac_unknown = 0,
-       ixgb_82597,
-       ixgb_num_macs
-} ixgb_mac_type;
-
-/* Types of physical layer modules */
-typedef enum {
-       ixgb_phy_type_unknown = 0,
-       ixgb_phy_type_g6005,    /* 850nm, MM fiber, XPAK transceiver */
-       ixgb_phy_type_g6104,    /* 1310nm, SM fiber, XPAK transceiver */
-       ixgb_phy_type_txn17201, /* 850nm, MM fiber, XPAK transceiver */
-       ixgb_phy_type_txn17401, /* 1310nm, SM fiber, XENPAK transceiver */
-       ixgb_phy_type_bcm       /* SUN specific board */
-} ixgb_phy_type;
-
-/* XPAK transceiver vendors, for the SR adapters */
-typedef enum {
-       ixgb_xpak_vendor_intel,
-       ixgb_xpak_vendor_infineon
-} ixgb_xpak_vendor;
-
-/* Media Types */
-typedef enum {
-       ixgb_media_type_unknown = 0,
-       ixgb_media_type_fiber = 1,
-       ixgb_media_type_copper = 2,
-       ixgb_num_media_types
-} ixgb_media_type;
-
-/* Flow Control Settings */
-typedef enum {
-       ixgb_fc_none = 0,
-       ixgb_fc_rx_pause = 1,
-       ixgb_fc_tx_pause = 2,
-       ixgb_fc_full = 3,
-       ixgb_fc_default = 0xFF
-} ixgb_fc_type;
-
-/* PCI bus types */
-typedef enum {
-       ixgb_bus_type_unknown = 0,
-       ixgb_bus_type_pci,
-       ixgb_bus_type_pcix
-} ixgb_bus_type;
-
-/* PCI bus speeds */
-typedef enum {
-       ixgb_bus_speed_unknown = 0,
-       ixgb_bus_speed_33,
-       ixgb_bus_speed_66,
-       ixgb_bus_speed_100,
-       ixgb_bus_speed_133,
-       ixgb_bus_speed_reserved
-} ixgb_bus_speed;
-
-/* PCI bus widths */
-typedef enum {
-       ixgb_bus_width_unknown = 0,
-       ixgb_bus_width_32,
-       ixgb_bus_width_64
-} ixgb_bus_width;
-
-#define IXGB_ETH_LENGTH_OF_ADDRESS   6
-
-#define IXGB_EEPROM_SIZE    64 /* Size in words */
-
-#define SPEED_10000  10000
-#define FULL_DUPLEX  2
-
-#define MIN_NUMBER_OF_DESCRIPTORS       8
-#define MAX_NUMBER_OF_DESCRIPTORS  0xFFF8      /* 13 bits in RDLEN/TDLEN, 128B aligned     */
-
-#define IXGB_DELAY_BEFORE_RESET        10      /* allow 10ms after idling rx/tx units      */
-#define IXGB_DELAY_AFTER_RESET          1      /* allow 1ms after the reset                */
-#define IXGB_DELAY_AFTER_EE_RESET      10      /* allow 10ms after the EEPROM reset        */
-
-#define IXGB_DELAY_USECS_AFTER_LINK_RESET    13        /* allow 13 microseconds after the reset    */
-                                          /* NOTE: this is MICROSECONDS               */
-#define MAX_RESET_ITERATIONS            8      /* number of iterations to get things right */
-
-/* General Registers */
-#define IXGB_CTRL0   0x00000   /* Device Control Register 0 - RW */
-#define IXGB_CTRL1   0x00008   /* Device Control Register 1 - RW */
-#define IXGB_STATUS  0x00010   /* Device Status Register - RO */
-#define IXGB_EECD    0x00018   /* EEPROM/Flash Control/Data Register - RW */
-#define IXGB_MFS     0x00020   /* Maximum Frame Size - RW */
-
-/* Interrupt */
-#define IXGB_ICR     0x00080   /* Interrupt Cause Read - R/clr */
-#define IXGB_ICS     0x00088   /* Interrupt Cause Set - RW */
-#define IXGB_IMS     0x00090   /* Interrupt Mask Set/Read - RW */
-#define IXGB_IMC     0x00098   /* Interrupt Mask Clear - WO */
-
-/* Receive */
-#define IXGB_RCTL    0x00100   /* RX Control - RW */
-#define IXGB_FCRTL   0x00108   /* Flow Control Receive Threshold Low - RW */
-#define IXGB_FCRTH   0x00110   /* Flow Control Receive Threshold High - RW */
-#define IXGB_RDBAL   0x00118   /* RX Descriptor Base Low - RW */
-#define IXGB_RDBAH   0x0011C   /* RX Descriptor Base High - RW */
-#define IXGB_RDLEN   0x00120   /* RX Descriptor Length - RW */
-#define IXGB_RDH     0x00128   /* RX Descriptor Head - RW */
-#define IXGB_RDT     0x00130   /* RX Descriptor Tail - RW */
-#define IXGB_RDTR    0x00138   /* RX Delay Timer Ring - RW */
-#define IXGB_RXDCTL  0x00140   /* Receive Descriptor Control - RW */
-#define IXGB_RAIDC   0x00148   /* Receive Adaptive Interrupt Delay Control - RW */
-#define IXGB_RXCSUM  0x00158   /* Receive Checksum Control - RW */
-#define IXGB_RA      0x00180   /* Receive Address Array Base - RW */
-#define IXGB_RAL     0x00180   /* Receive Address Low [0:15] - RW */
-#define IXGB_RAH     0x00184   /* Receive Address High [0:15] - RW */
-#define IXGB_MTA     0x00200   /* Multicast Table Array [0:127] - RW */
-#define IXGB_VFTA    0x00400   /* VLAN Filter Table Array [0:127] - RW */
-#define IXGB_REQ_RX_DESCRIPTOR_MULTIPLE 8
-
-/* Transmit */
-#define IXGB_TCTL    0x00600   /* TX Control - RW */
-#define IXGB_TDBAL   0x00608   /* TX Descriptor Base Low - RW */
-#define IXGB_TDBAH   0x0060C   /* TX Descriptor Base High - RW */
-#define IXGB_TDLEN   0x00610   /* TX Descriptor Length - RW */
-#define IXGB_TDH     0x00618   /* TX Descriptor Head - RW */
-#define IXGB_TDT     0x00620   /* TX Descriptor Tail - RW */
-#define IXGB_TIDV    0x00628   /* TX Interrupt Delay Value - RW */
-#define IXGB_TXDCTL  0x00630   /* Transmit Descriptor Control - RW */
-#define IXGB_TSPMT   0x00638   /* TCP Segmentation PAD & Min Threshold - RW */
-#define IXGB_PAP     0x00640   /* Pause and Pace - RW */
-#define IXGB_REQ_TX_DESCRIPTOR_MULTIPLE 8
-
-/* Physical */
-#define IXGB_PCSC1   0x00700   /* PCS Control 1 - RW */
-#define IXGB_PCSC2   0x00708   /* PCS Control 2 - RW */
-#define IXGB_PCSS1   0x00710   /* PCS Status 1 - RO */
-#define IXGB_PCSS2   0x00718   /* PCS Status 2 - RO */
-#define IXGB_XPCSS   0x00720   /* 10GBASE-X PCS Status (or XGXS Lane Status) - RO */
-#define IXGB_UCCR    0x00728   /* Unilink Circuit Control Register */
-#define IXGB_XPCSTC  0x00730   /* 10GBASE-X PCS Test Control */
-#define IXGB_MACA    0x00738   /* MDI Autoscan Command and Address - RW */
-#define IXGB_APAE    0x00740   /* Autoscan PHY Address Enable - RW */
-#define IXGB_ARD     0x00748   /* Autoscan Read Data - RO */
-#define IXGB_AIS     0x00750   /* Autoscan Interrupt Status - RO */
-#define IXGB_MSCA    0x00758   /* MDI Single Command and Address - RW */
-#define IXGB_MSRWD   0x00760   /* MDI Single Read and Write Data - RW, RO */
-
-/* Wake-up */
-#define IXGB_WUFC    0x00808   /* Wake Up Filter Control - RW */
-#define IXGB_WUS     0x00810   /* Wake Up Status - RO */
-#define IXGB_FFLT    0x01000   /* Flexible Filter Length Table - RW */
-#define IXGB_FFMT    0x01020   /* Flexible Filter Mask Table - RW */
-#define IXGB_FTVT    0x01420   /* Flexible Filter Value Table - RW */
-
-/* Statistics */
-#define IXGB_TPRL    0x02000   /* Total Packets Received (Low) */
-#define IXGB_TPRH    0x02004   /* Total Packets Received (High) */
-#define IXGB_GPRCL   0x02008   /* Good Packets Received Count (Low) */
-#define IXGB_GPRCH   0x0200C   /* Good Packets Received Count (High) */
-#define IXGB_BPRCL   0x02010   /* Broadcast Packets Received Count (Low) */
-#define IXGB_BPRCH   0x02014   /* Broadcast Packets Received Count (High) */
-#define IXGB_MPRCL   0x02018   /* Multicast Packets Received Count (Low) */
-#define IXGB_MPRCH   0x0201C   /* Multicast Packets Received Count (High) */
-#define IXGB_UPRCL   0x02020   /* Unicast Packets Received Count (Low) */
-#define IXGB_UPRCH   0x02024   /* Unicast Packets Received Count (High) */
-#define IXGB_VPRCL   0x02028   /* VLAN Packets Received Count (Low) */
-#define IXGB_VPRCH   0x0202C   /* VLAN Packets Received Count (High) */
-#define IXGB_JPRCL   0x02030   /* Jumbo Packets Received Count (Low) */
-#define IXGB_JPRCH   0x02034   /* Jumbo Packets Received Count (High) */
-#define IXGB_GORCL   0x02038   /* Good Octets Received Count (Low) */
-#define IXGB_GORCH   0x0203C   /* Good Octets Received Count (High) */
-#define IXGB_TORL    0x02040   /* Total Octets Received (Low) */
-#define IXGB_TORH    0x02044   /* Total Octets Received (High) */
-#define IXGB_RNBC    0x02048   /* Receive No Buffers Count */
-#define IXGB_RUC     0x02050   /* Receive Undersize Count */
-#define IXGB_ROC     0x02058   /* Receive Oversize Count */
-#define IXGB_RLEC    0x02060   /* Receive Length Error Count */
-#define IXGB_CRCERRS 0x02068   /* CRC Error Count */
-#define IXGB_ICBC    0x02070   /* Illegal control byte in mid-packet Count */
-#define IXGB_ECBC    0x02078   /* Error Control byte in mid-packet Count */
-#define IXGB_MPC     0x02080   /* Missed Packets Count */
-#define IXGB_TPTL    0x02100   /* Total Packets Transmitted (Low) */
-#define IXGB_TPTH    0x02104   /* Total Packets Transmitted (High) */
-#define IXGB_GPTCL   0x02108   /* Good Packets Transmitted Count (Low) */
-#define IXGB_GPTCH   0x0210C   /* Good Packets Transmitted Count (High) */
-#define IXGB_BPTCL   0x02110   /* Broadcast Packets Transmitted Count (Low) */
-#define IXGB_BPTCH   0x02114   /* Broadcast Packets Transmitted Count (High) */
-#define IXGB_MPTCL   0x02118   /* Multicast Packets Transmitted Count (Low) */
-#define IXGB_MPTCH   0x0211C   /* Multicast Packets Transmitted Count (High) */
-#define IXGB_UPTCL   0x02120   /* Unicast Packets Transmitted Count (Low) */
-#define IXGB_UPTCH   0x02124   /* Unicast Packets Transmitted Count (High) */
-#define IXGB_VPTCL   0x02128   /* VLAN Packets Transmitted Count (Low) */
-#define IXGB_VPTCH   0x0212C   /* VLAN Packets Transmitted Count (High) */
-#define IXGB_JPTCL   0x02130   /* Jumbo Packets Transmitted Count (Low) */
-#define IXGB_JPTCH   0x02134   /* Jumbo Packets Transmitted Count (High) */
-#define IXGB_GOTCL   0x02138   /* Good Octets Transmitted Count (Low) */
-#define IXGB_GOTCH   0x0213C   /* Good Octets Transmitted Count (High) */
-#define IXGB_TOTL    0x02140   /* Total Octets Transmitted Count (Low) */
-#define IXGB_TOTH    0x02144   /* Total Octets Transmitted Count (High) */
-#define IXGB_DC      0x02148   /* Defer Count */
-#define IXGB_PLT64C  0x02150   /* Packet Transmitted was less than 64 bytes Count */
-#define IXGB_TSCTC   0x02170   /* TCP Segmentation Context Transmitted Count */
-#define IXGB_TSCTFC  0x02178   /* TCP Segmentation Context Tx Fail Count */
-#define IXGB_IBIC    0x02180   /* Illegal byte during Idle stream count */
-#define IXGB_RFC     0x02188   /* Remote Fault Count */
-#define IXGB_LFC     0x02190   /* Local Fault Count */
-#define IXGB_PFRC    0x02198   /* Pause Frame Receive Count */
-#define IXGB_PFTC    0x021A0   /* Pause Frame Transmit Count */
-#define IXGB_MCFRC   0x021A8   /* MAC Control Frames (non-Pause) Received Count */
-#define IXGB_MCFTC   0x021B0   /* MAC Control Frames (non-Pause) Transmitted Count */
-#define IXGB_XONRXC  0x021B8   /* XON Received Count */
-#define IXGB_XONTXC  0x021C0   /* XON Transmitted Count */
-#define IXGB_XOFFRXC 0x021C8   /* XOFF Received Count */
-#define IXGB_XOFFTXC 0x021D0   /* XOFF Transmitted Count */
-#define IXGB_RJC     0x021D8   /* Receive Jabber Count */
-
-/* CTRL0 Bit Masks */
-#define IXGB_CTRL0_LRST     0x00000008
-#define IXGB_CTRL0_JFE      0x00000010
-#define IXGB_CTRL0_XLE      0x00000020
-#define IXGB_CTRL0_MDCS     0x00000040
-#define IXGB_CTRL0_CMDC     0x00000080
-#define IXGB_CTRL0_SDP0     0x00040000
-#define IXGB_CTRL0_SDP1     0x00080000
-#define IXGB_CTRL0_SDP2     0x00100000
-#define IXGB_CTRL0_SDP3     0x00200000
-#define IXGB_CTRL0_SDP0_DIR 0x00400000
-#define IXGB_CTRL0_SDP1_DIR 0x00800000
-#define IXGB_CTRL0_SDP2_DIR 0x01000000
-#define IXGB_CTRL0_SDP3_DIR 0x02000000
-#define IXGB_CTRL0_RST      0x04000000
-#define IXGB_CTRL0_RPE      0x08000000
-#define IXGB_CTRL0_TPE      0x10000000
-#define IXGB_CTRL0_VME      0x40000000
-
-/* CTRL1 Bit Masks */
-#define IXGB_CTRL1_GPI0_EN     0x00000001
-#define IXGB_CTRL1_GPI1_EN     0x00000002
-#define IXGB_CTRL1_GPI2_EN     0x00000004
-#define IXGB_CTRL1_GPI3_EN     0x00000008
-#define IXGB_CTRL1_SDP4        0x00000010
-#define IXGB_CTRL1_SDP5        0x00000020
-#define IXGB_CTRL1_SDP6        0x00000040
-#define IXGB_CTRL1_SDP7        0x00000080
-#define IXGB_CTRL1_SDP4_DIR    0x00000100
-#define IXGB_CTRL1_SDP5_DIR    0x00000200
-#define IXGB_CTRL1_SDP6_DIR    0x00000400
-#define IXGB_CTRL1_SDP7_DIR    0x00000800
-#define IXGB_CTRL1_EE_RST      0x00002000
-#define IXGB_CTRL1_RO_DIS      0x00020000
-#define IXGB_CTRL1_PCIXHM_MASK 0x00C00000
-#define IXGB_CTRL1_PCIXHM_1_2  0x00000000
-#define IXGB_CTRL1_PCIXHM_5_8  0x00400000
-#define IXGB_CTRL1_PCIXHM_3_4  0x00800000
-#define IXGB_CTRL1_PCIXHM_7_8  0x00C00000
-
-/* STATUS Bit Masks */
-#define IXGB_STATUS_LU            0x00000002
-#define IXGB_STATUS_AIP           0x00000004
-#define IXGB_STATUS_TXOFF         0x00000010
-#define IXGB_STATUS_XAUIME        0x00000020
-#define IXGB_STATUS_RES           0x00000040
-#define IXGB_STATUS_RIS           0x00000080
-#define IXGB_STATUS_RIE           0x00000100
-#define IXGB_STATUS_RLF           0x00000200
-#define IXGB_STATUS_RRF           0x00000400
-#define IXGB_STATUS_PCI_SPD       0x00000800
-#define IXGB_STATUS_BUS64         0x00001000
-#define IXGB_STATUS_PCIX_MODE     0x00002000
-#define IXGB_STATUS_PCIX_SPD_MASK 0x0000C000
-#define IXGB_STATUS_PCIX_SPD_66   0x00000000
-#define IXGB_STATUS_PCIX_SPD_100  0x00004000
-#define IXGB_STATUS_PCIX_SPD_133  0x00008000
-#define IXGB_STATUS_REV_ID_MASK   0x000F0000
-#define IXGB_STATUS_REV_ID_SHIFT  16
-
-/* EECD Bit Masks */
-#define IXGB_EECD_SK       0x00000001
-#define IXGB_EECD_CS       0x00000002
-#define IXGB_EECD_DI       0x00000004
-#define IXGB_EECD_DO       0x00000008
-#define IXGB_EECD_FWE_MASK 0x00000030
-#define IXGB_EECD_FWE_DIS  0x00000010
-#define IXGB_EECD_FWE_EN   0x00000020
-
-/* MFS */
-#define IXGB_MFS_SHIFT 16
-
-/* Interrupt Register Bit Masks (used for ICR, ICS, IMS, and IMC) */
-#define IXGB_INT_TXDW     0x00000001
-#define IXGB_INT_TXQE     0x00000002
-#define IXGB_INT_LSC      0x00000004
-#define IXGB_INT_RXSEQ    0x00000008
-#define IXGB_INT_RXDMT0   0x00000010
-#define IXGB_INT_RXO      0x00000040
-#define IXGB_INT_RXT0     0x00000080
-#define IXGB_INT_AUTOSCAN 0x00000200
-#define IXGB_INT_GPI0     0x00000800
-#define IXGB_INT_GPI1     0x00001000
-#define IXGB_INT_GPI2     0x00002000
-#define IXGB_INT_GPI3     0x00004000
-
-/* RCTL Bit Masks */
-#define IXGB_RCTL_RXEN        0x00000002
-#define IXGB_RCTL_SBP         0x00000004
-#define IXGB_RCTL_UPE         0x00000008
-#define IXGB_RCTL_MPE         0x00000010
-#define IXGB_RCTL_RDMTS_MASK  0x00000300
-#define IXGB_RCTL_RDMTS_1_2   0x00000000
-#define IXGB_RCTL_RDMTS_1_4   0x00000100
-#define IXGB_RCTL_RDMTS_1_8   0x00000200
-#define IXGB_RCTL_MO_MASK     0x00003000
-#define IXGB_RCTL_MO_47_36    0x00000000
-#define IXGB_RCTL_MO_46_35    0x00001000
-#define IXGB_RCTL_MO_45_34    0x00002000
-#define IXGB_RCTL_MO_43_32    0x00003000
-#define IXGB_RCTL_MO_SHIFT    12
-#define IXGB_RCTL_BAM         0x00008000
-#define IXGB_RCTL_BSIZE_MASK  0x00030000
-#define IXGB_RCTL_BSIZE_2048  0x00000000
-#define IXGB_RCTL_BSIZE_4096  0x00010000
-#define IXGB_RCTL_BSIZE_8192  0x00020000
-#define IXGB_RCTL_BSIZE_16384 0x00030000
-#define IXGB_RCTL_VFE         0x00040000
-#define IXGB_RCTL_CFIEN       0x00080000
-#define IXGB_RCTL_CFI         0x00100000
-#define IXGB_RCTL_RPDA_MASK   0x00600000
-#define IXGB_RCTL_RPDA_MC_MAC 0x00000000
-#define IXGB_RCTL_MC_ONLY     0x00400000
-#define IXGB_RCTL_CFF         0x00800000
-#define IXGB_RCTL_SECRC       0x04000000
-#define IXGB_RDT_FPDB         0x80000000
-
-#define IXGB_RCTL_IDLE_RX_UNIT 0
-
-/* FCRTL Bit Masks */
-#define IXGB_FCRTL_XONE       0x80000000
-
-/* RXDCTL Bit Masks */
-#define IXGB_RXDCTL_PTHRESH_MASK  0x000001FF
-#define IXGB_RXDCTL_PTHRESH_SHIFT 0
-#define IXGB_RXDCTL_HTHRESH_MASK  0x0003FE00
-#define IXGB_RXDCTL_HTHRESH_SHIFT 9
-#define IXGB_RXDCTL_WTHRESH_MASK  0x07FC0000
-#define IXGB_RXDCTL_WTHRESH_SHIFT 18
-
-/* RAIDC Bit Masks */
-#define IXGB_RAIDC_HIGHTHRS_MASK 0x0000003F
-#define IXGB_RAIDC_DELAY_MASK    0x000FF800
-#define IXGB_RAIDC_DELAY_SHIFT   11
-#define IXGB_RAIDC_POLL_MASK     0x1FF00000
-#define IXGB_RAIDC_POLL_SHIFT    20
-#define IXGB_RAIDC_RXT_GATE      0x40000000
-#define IXGB_RAIDC_EN            0x80000000
-
-#define IXGB_RAIDC_POLL_1000_INTERRUPTS_PER_SECOND      1220
-#define IXGB_RAIDC_POLL_5000_INTERRUPTS_PER_SECOND      244
-#define IXGB_RAIDC_POLL_10000_INTERRUPTS_PER_SECOND     122
-#define IXGB_RAIDC_POLL_20000_INTERRUPTS_PER_SECOND     61
-
-/* RXCSUM Bit Masks */
-#define IXGB_RXCSUM_IPOFL 0x00000100
-#define IXGB_RXCSUM_TUOFL 0x00000200
-
-/* RAH Bit Masks */
-#define IXGB_RAH_ASEL_MASK 0x00030000
-#define IXGB_RAH_ASEL_DEST 0x00000000
-#define IXGB_RAH_ASEL_SRC  0x00010000
-#define IXGB_RAH_AV        0x80000000
-
-/* TCTL Bit Masks */
-#define IXGB_TCTL_TCE  0x00000001
-#define IXGB_TCTL_TXEN 0x00000002
-#define IXGB_TCTL_TPDE 0x00000004
-
-#define IXGB_TCTL_IDLE_TX_UNIT  0
-
-/* TXDCTL Bit Masks */
-#define IXGB_TXDCTL_PTHRESH_MASK  0x0000007F
-#define IXGB_TXDCTL_HTHRESH_MASK  0x00007F00
-#define IXGB_TXDCTL_HTHRESH_SHIFT 8
-#define IXGB_TXDCTL_WTHRESH_MASK  0x007F0000
-#define IXGB_TXDCTL_WTHRESH_SHIFT 16
-
-/* TSPMT Bit Masks */
-#define IXGB_TSPMT_TSMT_MASK   0x0000FFFF
-#define IXGB_TSPMT_TSPBP_MASK  0xFFFF0000
-#define IXGB_TSPMT_TSPBP_SHIFT 16
-
-/* PAP Bit Masks */
-#define IXGB_PAP_TXPC_MASK 0x0000FFFF
-#define IXGB_PAP_TXPV_MASK 0x000F0000
-#define IXGB_PAP_TXPV_10G  0x00000000
-#define IXGB_PAP_TXPV_1G   0x00010000
-#define IXGB_PAP_TXPV_2G   0x00020000
-#define IXGB_PAP_TXPV_3G   0x00030000
-#define IXGB_PAP_TXPV_4G   0x00040000
-#define IXGB_PAP_TXPV_5G   0x00050000
-#define IXGB_PAP_TXPV_6G   0x00060000
-#define IXGB_PAP_TXPV_7G   0x00070000
-#define IXGB_PAP_TXPV_8G   0x00080000
-#define IXGB_PAP_TXPV_9G   0x00090000
-#define IXGB_PAP_TXPV_WAN  0x000F0000
-
-/* PCSC1 Bit Masks */
-#define IXGB_PCSC1_LOOPBACK 0x00004000
-
-/* PCSC2 Bit Masks */
-#define IXGB_PCSC2_PCS_TYPE_MASK  0x00000003
-#define IXGB_PCSC2_PCS_TYPE_10GBX 0x00000001
-
-/* PCSS1 Bit Masks */
-#define IXGB_PCSS1_LOCAL_FAULT    0x00000080
-#define IXGB_PCSS1_RX_LINK_STATUS 0x00000004
-
-/* PCSS2 Bit Masks */
-#define IXGB_PCSS2_DEV_PRES_MASK 0x0000C000
-#define IXGB_PCSS2_DEV_PRES      0x00004000
-#define IXGB_PCSS2_TX_LF         0x00000800
-#define IXGB_PCSS2_RX_LF         0x00000400
-#define IXGB_PCSS2_10GBW         0x00000004
-#define IXGB_PCSS2_10GBX         0x00000002
-#define IXGB_PCSS2_10GBR         0x00000001
-
-/* XPCSS Bit Masks */
-#define IXGB_XPCSS_ALIGN_STATUS 0x00001000
-#define IXGB_XPCSS_PATTERN_TEST 0x00000800
-#define IXGB_XPCSS_LANE_3_SYNC  0x00000008
-#define IXGB_XPCSS_LANE_2_SYNC  0x00000004
-#define IXGB_XPCSS_LANE_1_SYNC  0x00000002
-#define IXGB_XPCSS_LANE_0_SYNC  0x00000001
-
-/* XPCSTC Bit Masks */
-#define IXGB_XPCSTC_BERT_TRIG       0x00200000
-#define IXGB_XPCSTC_BERT_SST        0x00100000
-#define IXGB_XPCSTC_BERT_PSZ_MASK   0x000C0000
-#define IXGB_XPCSTC_BERT_PSZ_SHIFT  17
-#define IXGB_XPCSTC_BERT_PSZ_INF    0x00000003
-#define IXGB_XPCSTC_BERT_PSZ_68     0x00000001
-#define IXGB_XPCSTC_BERT_PSZ_1028   0x00000000
-
-/* MSCA bit Masks */
-/* New Protocol Address */
-#define IXGB_MSCA_NP_ADDR_MASK      0x0000FFFF
-#define IXGB_MSCA_NP_ADDR_SHIFT     0
-/* Either Device Type or Register Address,depending on ST_CODE */
-#define IXGB_MSCA_DEV_TYPE_MASK     0x001F0000
-#define IXGB_MSCA_DEV_TYPE_SHIFT    16
-#define IXGB_MSCA_PHY_ADDR_MASK     0x03E00000
-#define IXGB_MSCA_PHY_ADDR_SHIFT    21
-#define IXGB_MSCA_OP_CODE_MASK      0x0C000000
-/* OP_CODE == 00, Address cycle, New Protocol           */
-/* OP_CODE == 01, Write operation                       */
-/* OP_CODE == 10, Read operation                        */
-/* OP_CODE == 11, Read, auto increment, New Protocol    */
-#define IXGB_MSCA_ADDR_CYCLE        0x00000000
-#define IXGB_MSCA_WRITE             0x04000000
-#define IXGB_MSCA_READ              0x08000000
-#define IXGB_MSCA_READ_AUTOINC      0x0C000000
-#define IXGB_MSCA_OP_CODE_SHIFT     26
-#define IXGB_MSCA_ST_CODE_MASK      0x30000000
-/* ST_CODE == 00, New Protocol  */
-/* ST_CODE == 01, Old Protocol  */
-#define IXGB_MSCA_NEW_PROTOCOL      0x00000000
-#define IXGB_MSCA_OLD_PROTOCOL      0x10000000
-#define IXGB_MSCA_ST_CODE_SHIFT     28
-/* Initiate command, self-clearing when command completes */
-#define IXGB_MSCA_MDI_COMMAND       0x40000000
-/*MDI In Progress Enable. */
-#define IXGB_MSCA_MDI_IN_PROG_EN    0x80000000
-
-/* MSRWD bit masks */
-#define IXGB_MSRWD_WRITE_DATA_MASK  0x0000FFFF
-#define IXGB_MSRWD_WRITE_DATA_SHIFT 0
-#define IXGB_MSRWD_READ_DATA_MASK   0xFFFF0000
-#define IXGB_MSRWD_READ_DATA_SHIFT  16
-
-/* Definitions for the optics devices on the MDIO bus. */
-#define IXGB_PHY_ADDRESS             0x0       /* Single PHY, multiple "Devices" */
-
-#define MDIO_PMA_PMD_XPAK_VENDOR_NAME       0x803A     /* XPAK/XENPAK devices only */
-
-/* Vendor-specific MDIO registers */
-#define G6XXX_PMA_PMD_VS1                   0xC001     /* Vendor-specific register */
-#define G6XXX_XGXS_XAUI_VS2                 0x18       /* Vendor-specific register */
-
-#define G6XXX_PMA_PMD_VS1_PLL_RESET         0x80
-#define G6XXX_PMA_PMD_VS1_REMOVE_PLL_RESET  0x00
-#define G6XXX_XGXS_XAUI_VS2_INPUT_MASK      0x0F       /* XAUI lanes synchronized */
-
-/* Layout of a single receive descriptor.  The controller assumes that this
- * structure is packed into 16 bytes, which is a safe assumption with most
- * compilers.  However, some compilers may insert padding between the fields,
- * in which case the structure must be packed in some compiler-specific
- * manner. */
-struct ixgb_rx_desc {
-       __le64 buff_addr;
-       __le16 length;
-       __le16 reserved;
-       u8 status;
-       u8 errors;
-       __le16 special;
-};
-
-#define IXGB_RX_DESC_STATUS_DD    0x01
-#define IXGB_RX_DESC_STATUS_EOP   0x02
-#define IXGB_RX_DESC_STATUS_IXSM  0x04
-#define IXGB_RX_DESC_STATUS_VP    0x08
-#define IXGB_RX_DESC_STATUS_TCPCS 0x20
-#define IXGB_RX_DESC_STATUS_IPCS  0x40
-#define IXGB_RX_DESC_STATUS_PIF   0x80
-
-#define IXGB_RX_DESC_ERRORS_CE   0x01
-#define IXGB_RX_DESC_ERRORS_SE   0x02
-#define IXGB_RX_DESC_ERRORS_P    0x08
-#define IXGB_RX_DESC_ERRORS_TCPE 0x20
-#define IXGB_RX_DESC_ERRORS_IPE  0x40
-#define IXGB_RX_DESC_ERRORS_RXE  0x80
-
-#define IXGB_RX_DESC_SPECIAL_VLAN_MASK  0x0FFF /* VLAN ID is in lower 12 bits */
-#define IXGB_RX_DESC_SPECIAL_PRI_MASK   0xE000 /* Priority is in upper 3 bits */
-#define IXGB_RX_DESC_SPECIAL_PRI_SHIFT  0x000D /* Priority is in upper 3 of 16 */
-
-/* Layout of a single transmit descriptor.  The controller assumes that this
- * structure is packed into 16 bytes, which is a safe assumption with most
- * compilers.  However, some compilers may insert padding between the fields,
- * in which case the structure must be packed in some compiler-specific
- * manner. */
-struct ixgb_tx_desc {
-       __le64 buff_addr;
-       __le32 cmd_type_len;
-       u8 status;
-       u8 popts;
-       __le16 vlan;
-};
-
-#define IXGB_TX_DESC_LENGTH_MASK    0x000FFFFF
-#define IXGB_TX_DESC_TYPE_MASK      0x00F00000
-#define IXGB_TX_DESC_TYPE_SHIFT     20
-#define IXGB_TX_DESC_CMD_MASK       0xFF000000
-#define IXGB_TX_DESC_CMD_SHIFT      24
-#define IXGB_TX_DESC_CMD_EOP        0x01000000
-#define IXGB_TX_DESC_CMD_TSE        0x04000000
-#define IXGB_TX_DESC_CMD_RS         0x08000000
-#define IXGB_TX_DESC_CMD_VLE        0x40000000
-#define IXGB_TX_DESC_CMD_IDE        0x80000000
-
-#define IXGB_TX_DESC_TYPE           0x00100000
-
-#define IXGB_TX_DESC_STATUS_DD  0x01
-
-#define IXGB_TX_DESC_POPTS_IXSM 0x01
-#define IXGB_TX_DESC_POPTS_TXSM 0x02
-#define IXGB_TX_DESC_SPECIAL_PRI_SHIFT  IXGB_RX_DESC_SPECIAL_PRI_SHIFT /* Priority is in upper 3 of 16 */
-
-struct ixgb_context_desc {
-       u8 ipcss;
-       u8 ipcso;
-       __le16 ipcse;
-       u8 tucss;
-       u8 tucso;
-       __le16 tucse;
-       __le32 cmd_type_len;
-       u8 status;
-       u8 hdr_len;
-       __le16 mss;
-};
-
-#define IXGB_CONTEXT_DESC_CMD_TCP 0x01000000
-#define IXGB_CONTEXT_DESC_CMD_IP  0x02000000
-#define IXGB_CONTEXT_DESC_CMD_TSE 0x04000000
-#define IXGB_CONTEXT_DESC_CMD_RS  0x08000000
-#define IXGB_CONTEXT_DESC_CMD_IDE 0x80000000
-
-#define IXGB_CONTEXT_DESC_TYPE 0x00000000
-
-#define IXGB_CONTEXT_DESC_STATUS_DD 0x01
-
-/* Filters */
-#define IXGB_MC_TBL_SIZE          128  /* Multicast Filter Table (4096 bits) */
-#define IXGB_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
-#define IXGB_RAR_ENTRIES                 3     /* Number of entries in Rx Address array */
-
-#define IXGB_MEMORY_REGISTER_BASE_ADDRESS   0
-#define ENET_HEADER_SIZE                       14
-#define ENET_FCS_LENGTH                         4
-#define IXGB_MAX_NUM_MULTICAST_ADDRESSES       128
-#define IXGB_MIN_ENET_FRAME_SIZE_WITHOUT_FCS   60
-#define IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS   1514
-#define IXGB_MAX_JUMBO_FRAME_SIZE              0x3F00
-
-/* Phy Addresses */
-#define IXGB_OPTICAL_PHY_ADDR 0x0      /* Optical Module phy address */
-#define IXGB_XAUII_PHY_ADDR   0x1      /* Xauii transceiver phy address */
-#define IXGB_DIAG_PHY_ADDR    0x1F     /* Diagnostic Device phy address */
-
-/* This structure takes a 64k flash and maps it for identification commands */
-struct ixgb_flash_buffer {
-       u8 manufacturer_id;
-       u8 device_id;
-       u8 filler1[0x2AA8];
-       u8 cmd2;
-       u8 filler2[0x2AAA];
-       u8 cmd1;
-       u8 filler3[0xAAAA];
-};
-
-/* Flow control parameters */
-struct ixgb_fc {
-       u32 high_water; /* Flow Control High-water          */
-       u32 low_water;  /* Flow Control Low-water           */
-       u16 pause_time; /* Flow Control Pause timer         */
-       bool send_xon;          /* Flow control send XON            */
-       ixgb_fc_type type;      /* Type of flow control             */
-};
-
-/* The historical defaults for the flow control values are given below. */
-#define FC_DEFAULT_HI_THRESH        (0x8000)   /* 32KB */
-#define FC_DEFAULT_LO_THRESH        (0x4000)   /* 16KB */
-#define FC_DEFAULT_TX_TIMER         (0x100)    /* ~130 us */
-
-/* Phy definitions */
-#define IXGB_MAX_PHY_REG_ADDRESS    0xFFFF
-#define IXGB_MAX_PHY_ADDRESS        31
-#define IXGB_MAX_PHY_DEV_TYPE       31
-
-/* Bus parameters */
-struct ixgb_bus {
-       ixgb_bus_speed speed;
-       ixgb_bus_width width;
-       ixgb_bus_type type;
-};
-
-struct ixgb_hw {
-       u8 __iomem *hw_addr;/* Base Address of the hardware     */
-       void *back;             /* Pointer to OS-dependent struct   */
-       struct ixgb_fc fc;      /* Flow control parameters          */
-       struct ixgb_bus bus;    /* Bus parameters                   */
-       u32 phy_id;     /* Phy Identifier                   */
-       u32 phy_addr;   /* XGMII address of Phy             */
-       ixgb_mac_type mac_type; /* Identifier for MAC controller    */
-       ixgb_phy_type phy_type; /* Transceiver/phy identifier       */
-       u32 max_frame_size;     /* Maximum frame size supported     */
-       u32 mc_filter_type;     /* Multicast filter hash type       */
-       u32 num_mc_addrs;       /* Number of current Multicast addrs */
-       u8 curr_mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];   /* Individual address currently programmed in MAC */
-       u32 num_tx_desc;        /* Number of Transmit descriptors   */
-       u32 num_rx_desc;        /* Number of Receive descriptors    */
-       u32 rx_buffer_size;     /* Size of Receive buffer           */
-       bool link_up;           /* true if link is valid            */
-       bool adapter_stopped;   /* State of adapter                 */
-       u16 device_id;  /* device id from PCI configuration space */
-       u16 vendor_id;  /* vendor id from PCI configuration space */
-       u8 revision_id; /* revision id from PCI configuration space */
-       u16 subsystem_vendor_id;        /* subsystem vendor id from PCI configuration space */
-       u16 subsystem_id;       /* subsystem id from PCI configuration space */
-       u32 bar0;               /* Base Address registers           */
-       u32 bar1;
-       u32 bar2;
-       u32 bar3;
-       u16 pci_cmd_word;       /* PCI command register id from PCI configuration space */
-       __le16 eeprom[IXGB_EEPROM_SIZE];        /* EEPROM contents read at init time  */
-       unsigned long io_base;  /* Our I/O mapped location */
-       u32 lastLFC;
-       u32 lastRFC;
-};
-
-/* Statistics reported by the hardware */
-struct ixgb_hw_stats {
-       u64 tprl;
-       u64 tprh;
-       u64 gprcl;
-       u64 gprch;
-       u64 bprcl;
-       u64 bprch;
-       u64 mprcl;
-       u64 mprch;
-       u64 uprcl;
-       u64 uprch;
-       u64 vprcl;
-       u64 vprch;
-       u64 jprcl;
-       u64 jprch;
-       u64 gorcl;
-       u64 gorch;
-       u64 torl;
-       u64 torh;
-       u64 rnbc;
-       u64 ruc;
-       u64 roc;
-       u64 rlec;
-       u64 crcerrs;
-       u64 icbc;
-       u64 ecbc;
-       u64 mpc;
-       u64 tptl;
-       u64 tpth;
-       u64 gptcl;
-       u64 gptch;
-       u64 bptcl;
-       u64 bptch;
-       u64 mptcl;
-       u64 mptch;
-       u64 uptcl;
-       u64 uptch;
-       u64 vptcl;
-       u64 vptch;
-       u64 jptcl;
-       u64 jptch;
-       u64 gotcl;
-       u64 gotch;
-       u64 totl;
-       u64 toth;
-       u64 dc;
-       u64 plt64c;
-       u64 tsctc;
-       u64 tsctfc;
-       u64 ibic;
-       u64 rfc;
-       u64 lfc;
-       u64 pfrc;
-       u64 pftc;
-       u64 mcfrc;
-       u64 mcftc;
-       u64 xonrxc;
-       u64 xontxc;
-       u64 xoffrxc;
-       u64 xofftxc;
-       u64 rjc;
-};
-
-/* Function Prototypes */
-extern bool ixgb_adapter_stop(struct ixgb_hw *hw);
-extern bool ixgb_init_hw(struct ixgb_hw *hw);
-extern bool ixgb_adapter_start(struct ixgb_hw *hw);
-extern void ixgb_check_for_link(struct ixgb_hw *hw);
-extern bool ixgb_check_for_bad_link(struct ixgb_hw *hw);
-
-extern void ixgb_rar_set(struct ixgb_hw *hw,
-                               u8 *addr,
-                               u32 index);
-
-
-/* Filters (multicast, vlan, receive) */
-extern void ixgb_mc_addr_list_update(struct ixgb_hw *hw,
-                                  u8 *mc_addr_list,
-                                  u32 mc_addr_count,
-                                  u32 pad);
-
-/* Vfta functions */
-extern void ixgb_write_vfta(struct ixgb_hw *hw,
-                                u32 offset,
-                                u32 value);
-
-/* Access functions to eeprom data */
-void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, u8 *mac_addr);
-u32 ixgb_get_ee_pba_number(struct ixgb_hw *hw);
-u16 ixgb_get_ee_device_id(struct ixgb_hw *hw);
-bool ixgb_get_eeprom_data(struct ixgb_hw *hw);
-__le16 ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index);
-
-/* Everything else */
-void ixgb_led_on(struct ixgb_hw *hw);
-void ixgb_led_off(struct ixgb_hw *hw);
-void ixgb_write_pci_cfg(struct ixgb_hw *hw,
-                        u32 reg,
-                        u16 * value);
-
-
-#endif /* _IXGB_HW_H_ */
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h
deleted file mode 100644 (file)
index 2a58847..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-#ifndef _IXGB_IDS_H_
-#define _IXGB_IDS_H_
-
-/**********************************************************************
-** The Device and Vendor IDs for 10 Gigabit MACs
-**********************************************************************/
-
-#define INTEL_VENDOR_ID             0x8086
-#define INTEL_SUBVENDOR_ID          0x8086
-#define SUN_VENDOR_ID               0x108E
-#define SUN_SUBVENDOR_ID            0x108E
-
-#define IXGB_DEVICE_ID_82597EX      0x1048
-#define IXGB_DEVICE_ID_82597EX_SR   0x1A48
-#define IXGB_DEVICE_ID_82597EX_LR   0x1B48
-#define IXGB_SUBDEVICE_ID_A11F      0xA11F
-#define IXGB_SUBDEVICE_ID_A01F      0xA01F
-
-#define IXGB_DEVICE_ID_82597EX_CX4   0x109E
-#define IXGB_SUBDEVICE_ID_A00C  0xA00C
-#define IXGB_SUBDEVICE_ID_A01C  0xA01C
-#define IXGB_SUBDEVICE_ID_7036  0x7036
-
-#endif /* #ifndef _IXGB_IDS_H_ */
-/* End of File */
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
deleted file mode 100644 (file)
index 6a130eb..0000000
+++ /dev/null
@@ -1,2332 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/prefetch.h>
-#include "ixgb.h"
-
-char ixgb_driver_name[] = "ixgb";
-static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
-
-#define DRIVERNAPI "-NAPI"
-#define DRV_VERSION "1.0.135-k2" DRIVERNAPI
-const char ixgb_driver_version[] = DRV_VERSION;
-static const char ixgb_copyright[] = "Copyright (c) 1999-2008 Intel Corporation.";
-
-#define IXGB_CB_LENGTH 256
-static unsigned int copybreak __read_mostly = IXGB_CB_LENGTH;
-module_param(copybreak, uint, 0644);
-MODULE_PARM_DESC(copybreak,
-       "Maximum size of packet that is copied to a new buffer on receive");
-
-/* ixgb_pci_tbl - PCI Device ID Table
- *
- * Wildcard entries (PCI_ANY_ID) should come last
- * Last entry must be all 0s
- *
- * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
- *   Class, Class Mask, private data (not used) }
- */
-static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = {
-       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
-        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
-        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
-        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,
-        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-
-       /* required last entry */
-       {0,}
-};
-
-MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl);
-
-/* Local Function Prototypes */
-static int ixgb_init_module(void);
-static void ixgb_exit_module(void);
-static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
-static void __devexit ixgb_remove(struct pci_dev *pdev);
-static int ixgb_sw_init(struct ixgb_adapter *adapter);
-static int ixgb_open(struct net_device *netdev);
-static int ixgb_close(struct net_device *netdev);
-static void ixgb_configure_tx(struct ixgb_adapter *adapter);
-static void ixgb_configure_rx(struct ixgb_adapter *adapter);
-static void ixgb_setup_rctl(struct ixgb_adapter *adapter);
-static void ixgb_clean_tx_ring(struct ixgb_adapter *adapter);
-static void ixgb_clean_rx_ring(struct ixgb_adapter *adapter);
-static void ixgb_set_multi(struct net_device *netdev);
-static void ixgb_watchdog(unsigned long data);
-static netdev_tx_t ixgb_xmit_frame(struct sk_buff *skb,
-                                  struct net_device *netdev);
-static struct net_device_stats *ixgb_get_stats(struct net_device *netdev);
-static int ixgb_change_mtu(struct net_device *netdev, int new_mtu);
-static int ixgb_set_mac(struct net_device *netdev, void *p);
-static irqreturn_t ixgb_intr(int irq, void *data);
-static bool ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
-
-static int ixgb_clean(struct napi_struct *, int);
-static bool ixgb_clean_rx_irq(struct ixgb_adapter *, int *, int);
-static void ixgb_alloc_rx_buffers(struct ixgb_adapter *, int);
-
-static void ixgb_tx_timeout(struct net_device *dev);
-static void ixgb_tx_timeout_task(struct work_struct *work);
-
-static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter);
-static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter);
-static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
-static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
-static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/* for netdump / net console */
-static void ixgb_netpoll(struct net_device *dev);
-#endif
-
-static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
-                             enum pci_channel_state state);
-static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev);
-static void ixgb_io_resume (struct pci_dev *pdev);
-
-static struct pci_error_handlers ixgb_err_handler = {
-       .error_detected = ixgb_io_error_detected,
-       .slot_reset = ixgb_io_slot_reset,
-       .resume = ixgb_io_resume,
-};
-
-static struct pci_driver ixgb_driver = {
-       .name     = ixgb_driver_name,
-       .id_table = ixgb_pci_tbl,
-       .probe    = ixgb_probe,
-       .remove   = __devexit_p(ixgb_remove),
-       .err_handler = &ixgb_err_handler
-};
-
-MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
-MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-#define DEFAULT_DEBUG_LEVEL_SHIFT 3
-static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
-
-/**
- * ixgb_init_module - Driver Registration Routine
- *
- * ixgb_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-
-static int __init
-ixgb_init_module(void)
-{
-       pr_info("%s - version %s\n", ixgb_driver_string, ixgb_driver_version);
-       pr_info("%s\n", ixgb_copyright);
-
-       return pci_register_driver(&ixgb_driver);
-}
-
-module_init(ixgb_init_module);
-
-/**
- * ixgb_exit_module - Driver Exit Cleanup Routine
- *
- * ixgb_exit_module is called just before the driver is removed
- * from memory.
- **/
-
-static void __exit
-ixgb_exit_module(void)
-{
-       pci_unregister_driver(&ixgb_driver);
-}
-
-module_exit(ixgb_exit_module);
-
-/**
- * ixgb_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- **/
-
-static void
-ixgb_irq_disable(struct ixgb_adapter *adapter)
-{
-       IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
-       IXGB_WRITE_FLUSH(&adapter->hw);
-       synchronize_irq(adapter->pdev->irq);
-}
-
-/**
- * ixgb_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- **/
-
-static void
-ixgb_irq_enable(struct ixgb_adapter *adapter)
-{
-       u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |
-                 IXGB_INT_TXDW | IXGB_INT_LSC;
-       if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)
-               val |= IXGB_INT_GPI0;
-       IXGB_WRITE_REG(&adapter->hw, IMS, val);
-       IXGB_WRITE_FLUSH(&adapter->hw);
-}
-
-int
-ixgb_up(struct ixgb_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int err, irq_flags = IRQF_SHARED;
-       int max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
-       struct ixgb_hw *hw = &adapter->hw;
-
-       /* hardware has been reset, we need to reload some things */
-
-       ixgb_rar_set(hw, netdev->dev_addr, 0);
-       ixgb_set_multi(netdev);
-
-       ixgb_restore_vlan(adapter);
-
-       ixgb_configure_tx(adapter);
-       ixgb_setup_rctl(adapter);
-       ixgb_configure_rx(adapter);
-       ixgb_alloc_rx_buffers(adapter, IXGB_DESC_UNUSED(&adapter->rx_ring));
-
-       /* disable interrupts and get the hardware into a known state */
-       IXGB_WRITE_REG(&adapter->hw, IMC, 0xffffffff);
-
-       /* only enable MSI if bus is in PCI-X mode */
-       if (IXGB_READ_REG(&adapter->hw, STATUS) & IXGB_STATUS_PCIX_MODE) {
-               err = pci_enable_msi(adapter->pdev);
-               if (!err) {
-                       adapter->have_msi = 1;
-                       irq_flags = 0;
-               }
-               /* proceed to try to request regular interrupt */
-       }
-
-       err = request_irq(adapter->pdev->irq, ixgb_intr, irq_flags,
-                         netdev->name, netdev);
-       if (err) {
-               if (adapter->have_msi)
-                       pci_disable_msi(adapter->pdev);
-               netif_err(adapter, probe, adapter->netdev,
-                         "Unable to allocate interrupt Error: %d\n", err);
-               return err;
-       }
-
-       if ((hw->max_frame_size != max_frame) ||
-               (hw->max_frame_size !=
-               (IXGB_READ_REG(hw, MFS) >> IXGB_MFS_SHIFT))) {
-
-               hw->max_frame_size = max_frame;
-
-               IXGB_WRITE_REG(hw, MFS, hw->max_frame_size << IXGB_MFS_SHIFT);
-
-               if (hw->max_frame_size >
-                  IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) {
-                       u32 ctrl0 = IXGB_READ_REG(hw, CTRL0);
-
-                       if (!(ctrl0 & IXGB_CTRL0_JFE)) {
-                               ctrl0 |= IXGB_CTRL0_JFE;
-                               IXGB_WRITE_REG(hw, CTRL0, ctrl0);
-                       }
-               }
-       }
-
-       clear_bit(__IXGB_DOWN, &adapter->flags);
-
-       napi_enable(&adapter->napi);
-       ixgb_irq_enable(adapter);
-
-       netif_wake_queue(netdev);
-
-       mod_timer(&adapter->watchdog_timer, jiffies);
-
-       return 0;
-}
-
-void
-ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       /* prevent the interrupt handler from restarting watchdog */
-       set_bit(__IXGB_DOWN, &adapter->flags);
-
-       napi_disable(&adapter->napi);
-       /* waiting for NAPI to complete can re-enable interrupts */
-       ixgb_irq_disable(adapter);
-       free_irq(adapter->pdev->irq, netdev);
-
-       if (adapter->have_msi)
-               pci_disable_msi(adapter->pdev);
-
-       if (kill_watchdog)
-               del_timer_sync(&adapter->watchdog_timer);
-
-       adapter->link_speed = 0;
-       adapter->link_duplex = 0;
-       netif_carrier_off(netdev);
-       netif_stop_queue(netdev);
-
-       ixgb_reset(adapter);
-       ixgb_clean_tx_ring(adapter);
-       ixgb_clean_rx_ring(adapter);
-}
-
-void
-ixgb_reset(struct ixgb_adapter *adapter)
-{
-       struct ixgb_hw *hw = &adapter->hw;
-
-       ixgb_adapter_stop(hw);
-       if (!ixgb_init_hw(hw))
-               netif_err(adapter, probe, adapter->netdev, "ixgb_init_hw failed\n");
-
-       /* restore frame size information */
-       IXGB_WRITE_REG(hw, MFS, hw->max_frame_size << IXGB_MFS_SHIFT);
-       if (hw->max_frame_size >
-           IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) {
-               u32 ctrl0 = IXGB_READ_REG(hw, CTRL0);
-               if (!(ctrl0 & IXGB_CTRL0_JFE)) {
-                       ctrl0 |= IXGB_CTRL0_JFE;
-                       IXGB_WRITE_REG(hw, CTRL0, ctrl0);
-               }
-       }
-}
-
-static const struct net_device_ops ixgb_netdev_ops = {
-       .ndo_open               = ixgb_open,
-       .ndo_stop               = ixgb_close,
-       .ndo_start_xmit         = ixgb_xmit_frame,
-       .ndo_get_stats          = ixgb_get_stats,
-       .ndo_set_multicast_list = ixgb_set_multi,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_mac_address    = ixgb_set_mac,
-       .ndo_change_mtu         = ixgb_change_mtu,
-       .ndo_tx_timeout         = ixgb_tx_timeout,
-       .ndo_vlan_rx_add_vid    = ixgb_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = ixgb_vlan_rx_kill_vid,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = ixgb_netpoll,
-#endif
-};
-
-/**
- * ixgb_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in ixgb_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * ixgb_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-
-static int __devinit
-ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       struct net_device *netdev = NULL;
-       struct ixgb_adapter *adapter;
-       static int cards_found = 0;
-       int pci_using_dac;
-       int i;
-       int err;
-
-       err = pci_enable_device(pdev);
-       if (err)
-               return err;
-
-       pci_using_dac = 0;
-       err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
-       if (!err) {
-               err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-               if (!err)
-                       pci_using_dac = 1;
-       } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-               if (err) {
-                       err = dma_set_coherent_mask(&pdev->dev,
-                                                   DMA_BIT_MASK(32));
-                       if (err) {
-                               pr_err("No usable DMA configuration, aborting\n");
-                               goto err_dma_mask;
-                       }
-               }
-       }
-
-       err = pci_request_regions(pdev, ixgb_driver_name);
-       if (err)
-               goto err_request_regions;
-
-       pci_set_master(pdev);
-
-       netdev = alloc_etherdev(sizeof(struct ixgb_adapter));
-       if (!netdev) {
-               err = -ENOMEM;
-               goto err_alloc_etherdev;
-       }
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       pci_set_drvdata(pdev, netdev);
-       adapter = netdev_priv(netdev);
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       adapter->hw.back = adapter;
-       adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
-
-       adapter->hw.hw_addr = pci_ioremap_bar(pdev, BAR_0);
-       if (!adapter->hw.hw_addr) {
-               err = -EIO;
-               goto err_ioremap;
-       }
-
-       for (i = BAR_1; i <= BAR_5; i++) {
-               if (pci_resource_len(pdev, i) == 0)
-                       continue;
-               if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
-                       adapter->hw.io_base = pci_resource_start(pdev, i);
-                       break;
-               }
-       }
-
-       netdev->netdev_ops = &ixgb_netdev_ops;
-       ixgb_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, ixgb_clean, 64);
-
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       adapter->bd_number = cards_found;
-       adapter->link_speed = 0;
-       adapter->link_duplex = 0;
-
-       /* setup the private structure */
-
-       err = ixgb_sw_init(adapter);
-       if (err)
-               goto err_sw_init;
-
-       netdev->features = NETIF_F_SG |
-                          NETIF_F_HW_CSUM |
-                          NETIF_F_HW_VLAN_TX |
-                          NETIF_F_HW_VLAN_RX |
-                          NETIF_F_HW_VLAN_FILTER;
-       netdev->features |= NETIF_F_TSO;
-
-       if (pci_using_dac) {
-               netdev->features |= NETIF_F_HIGHDMA;
-               netdev->vlan_features |= NETIF_F_HIGHDMA;
-       }
-
-       /* make sure the EEPROM is good */
-
-       if (!ixgb_validate_eeprom_checksum(&adapter->hw)) {
-               netif_err(adapter, probe, adapter->netdev,
-                         "The EEPROM Checksum Is Not Valid\n");
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);
-       memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->perm_addr)) {
-               netif_err(adapter, probe, adapter->netdev, "Invalid MAC Address\n");
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       adapter->part_num = ixgb_get_ee_pba_number(&adapter->hw);
-
-       init_timer(&adapter->watchdog_timer);
-       adapter->watchdog_timer.function = ixgb_watchdog;
-       adapter->watchdog_timer.data = (unsigned long)adapter;
-
-       INIT_WORK(&adapter->tx_timeout_task, ixgb_tx_timeout_task);
-
-       strcpy(netdev->name, "eth%d");
-       err = register_netdev(netdev);
-       if (err)
-               goto err_register;
-
-       /* carrier off reporting is important to ethtool even BEFORE open */
-       netif_carrier_off(netdev);
-
-       netif_info(adapter, probe, adapter->netdev,
-                  "Intel(R) PRO/10GbE Network Connection\n");
-       ixgb_check_options(adapter);
-       /* reset the hardware with the new settings */
-
-       ixgb_reset(adapter);
-
-       cards_found++;
-       return 0;
-
-err_register:
-err_sw_init:
-err_eeprom:
-       iounmap(adapter->hw.hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_regions(pdev);
-err_request_regions:
-err_dma_mask:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * ixgb_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * ixgb_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-
-static void __devexit
-ixgb_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       cancel_work_sync(&adapter->tx_timeout_task);
-
-       unregister_netdev(netdev);
-
-       iounmap(adapter->hw.hw_addr);
-       pci_release_regions(pdev);
-
-       free_netdev(netdev);
-       pci_disable_device(pdev);
-}
-
-/**
- * ixgb_sw_init - Initialize general software structures (struct ixgb_adapter)
- * @adapter: board private structure to initialize
- *
- * ixgb_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 __devinit
-ixgb_sw_init(struct ixgb_adapter *adapter)
-{
-       struct ixgb_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-
-       /* PCI config space info */
-
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-       hw->subsystem_vendor_id = pdev->subsystem_vendor;
-       hw->subsystem_id = pdev->subsystem_device;
-
-       hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
-       adapter->rx_buffer_len = hw->max_frame_size + 8; /* + 8 for errata */
-
-       if ((hw->device_id == IXGB_DEVICE_ID_82597EX) ||
-           (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4) ||
-           (hw->device_id == IXGB_DEVICE_ID_82597EX_LR) ||
-           (hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
-               hw->mac_type = ixgb_82597;
-       else {
-               /* should never have loaded on this device */
-               netif_err(adapter, probe, adapter->netdev, "unsupported device id\n");
-       }
-
-       /* enable flow control to be programmed */
-       hw->fc.send_xon = 1;
-
-       set_bit(__IXGB_DOWN, &adapter->flags);
-       return 0;
-}
-
-/**
- * ixgb_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-
-static int
-ixgb_open(struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       int err;
-
-       /* allocate transmit descriptors */
-       err = ixgb_setup_tx_resources(adapter);
-       if (err)
-               goto err_setup_tx;
-
-       netif_carrier_off(netdev);
-
-       /* allocate receive descriptors */
-
-       err = ixgb_setup_rx_resources(adapter);
-       if (err)
-               goto err_setup_rx;
-
-       err = ixgb_up(adapter);
-       if (err)
-               goto err_up;
-
-       netif_start_queue(netdev);
-
-       return 0;
-
-err_up:
-       ixgb_free_rx_resources(adapter);
-err_setup_rx:
-       ixgb_free_tx_resources(adapter);
-err_setup_tx:
-       ixgb_reset(adapter);
-
-       return err;
-}
-
-/**
- * ixgb_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-
-static int
-ixgb_close(struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       ixgb_down(adapter, true);
-
-       ixgb_free_tx_resources(adapter);
-       ixgb_free_rx_resources(adapter);
-
-       return 0;
-}
-
-/**
- * ixgb_setup_tx_resources - allocate Tx resources (Descriptors)
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-
-int
-ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
-{
-       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       int size;
-
-       size = sizeof(struct ixgb_buffer) * txdr->count;
-       txdr->buffer_info = vzalloc(size);
-       if (!txdr->buffer_info) {
-               netif_err(adapter, probe, adapter->netdev,
-                         "Unable to allocate transmit descriptor ring memory\n");
-               return -ENOMEM;
-       }
-
-       /* round up to nearest 4K */
-
-       txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);
-       txdr->size = ALIGN(txdr->size, 4096);
-
-       txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                       GFP_KERNEL);
-       if (!txdr->desc) {
-               vfree(txdr->buffer_info);
-               netif_err(adapter, probe, adapter->netdev,
-                         "Unable to allocate transmit descriptor memory\n");
-               return -ENOMEM;
-       }
-       memset(txdr->desc, 0, txdr->size);
-
-       txdr->next_to_use = 0;
-       txdr->next_to_clean = 0;
-
-       return 0;
-}
-
-/**
- * ixgb_configure_tx - Configure 82597 Transmit Unit after Reset.
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-
-static void
-ixgb_configure_tx(struct ixgb_adapter *adapter)
-{
-       u64 tdba = adapter->tx_ring.dma;
-       u32 tdlen = adapter->tx_ring.count * sizeof(struct ixgb_tx_desc);
-       u32 tctl;
-       struct ixgb_hw *hw = &adapter->hw;
-
-       /* Setup the Base and Length of the Tx Descriptor Ring
-        * tx_ring.dma can be either a 32 or 64 bit value
-        */
-
-       IXGB_WRITE_REG(hw, TDBAL, (tdba & 0x00000000ffffffffULL));
-       IXGB_WRITE_REG(hw, TDBAH, (tdba >> 32));
-
-       IXGB_WRITE_REG(hw, TDLEN, tdlen);
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-
-       IXGB_WRITE_REG(hw, TDH, 0);
-       IXGB_WRITE_REG(hw, TDT, 0);
-
-       /* don't set up txdctl, it induces performance problems if configured
-        * incorrectly */
-       /* Set the Tx Interrupt Delay register */
-
-       IXGB_WRITE_REG(hw, TIDV, adapter->tx_int_delay);
-
-       /* Program the Transmit Control Register */
-
-       tctl = IXGB_TCTL_TCE | IXGB_TCTL_TXEN | IXGB_TCTL_TPDE;
-       IXGB_WRITE_REG(hw, TCTL, tctl);
-
-       /* Setup Transmit Descriptor Settings for this adapter */
-       adapter->tx_cmd_type =
-               IXGB_TX_DESC_TYPE |
-               (adapter->tx_int_delay_enable ? IXGB_TX_DESC_CMD_IDE : 0);
-}
-
-/**
- * ixgb_setup_rx_resources - allocate Rx resources (Descriptors)
- * @adapter: board private structure
- *
- * Returns 0 on success, negative on failure
- **/
-
-int
-ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
-{
-       struct ixgb_desc_ring *rxdr = &adapter->rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       int size;
-
-       size = sizeof(struct ixgb_buffer) * rxdr->count;
-       rxdr->buffer_info = vzalloc(size);
-       if (!rxdr->buffer_info) {
-               netif_err(adapter, probe, adapter->netdev,
-                         "Unable to allocate receive descriptor ring\n");
-               return -ENOMEM;
-       }
-
-       /* Round up to nearest 4K */
-
-       rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc);
-       rxdr->size = ALIGN(rxdr->size, 4096);
-
-       rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
-                                       GFP_KERNEL);
-
-       if (!rxdr->desc) {
-               vfree(rxdr->buffer_info);
-               netif_err(adapter, probe, adapter->netdev,
-                         "Unable to allocate receive descriptors\n");
-               return -ENOMEM;
-       }
-       memset(rxdr->desc, 0, rxdr->size);
-
-       rxdr->next_to_clean = 0;
-       rxdr->next_to_use = 0;
-
-       return 0;
-}
-
-/**
- * ixgb_setup_rctl - configure the receive control register
- * @adapter: Board private structure
- **/
-
-static void
-ixgb_setup_rctl(struct ixgb_adapter *adapter)
-{
-       u32 rctl;
-
-       rctl = IXGB_READ_REG(&adapter->hw, RCTL);
-
-       rctl &= ~(3 << IXGB_RCTL_MO_SHIFT);
-
-       rctl |=
-               IXGB_RCTL_BAM | IXGB_RCTL_RDMTS_1_2 |
-               IXGB_RCTL_RXEN | IXGB_RCTL_CFF |
-               (adapter->hw.mc_filter_type << IXGB_RCTL_MO_SHIFT);
-
-       rctl |= IXGB_RCTL_SECRC;
-
-       if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048)
-               rctl |= IXGB_RCTL_BSIZE_2048;
-       else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096)
-               rctl |= IXGB_RCTL_BSIZE_4096;
-       else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192)
-               rctl |= IXGB_RCTL_BSIZE_8192;
-       else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384)
-               rctl |= IXGB_RCTL_BSIZE_16384;
-
-       IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
-}
-
-/**
- * ixgb_configure_rx - Configure 82597 Receive Unit after Reset.
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-
-static void
-ixgb_configure_rx(struct ixgb_adapter *adapter)
-{
-       u64 rdba = adapter->rx_ring.dma;
-       u32 rdlen = adapter->rx_ring.count * sizeof(struct ixgb_rx_desc);
-       struct ixgb_hw *hw = &adapter->hw;
-       u32 rctl;
-       u32 rxcsum;
-
-       /* make sure receives are disabled while setting up the descriptors */
-
-       rctl = IXGB_READ_REG(hw, RCTL);
-       IXGB_WRITE_REG(hw, RCTL, rctl & ~IXGB_RCTL_RXEN);
-
-       /* set the Receive Delay Timer Register */
-
-       IXGB_WRITE_REG(hw, RDTR, adapter->rx_int_delay);
-
-       /* Setup the Base and Length of the Rx Descriptor Ring */
-
-       IXGB_WRITE_REG(hw, RDBAL, (rdba & 0x00000000ffffffffULL));
-       IXGB_WRITE_REG(hw, RDBAH, (rdba >> 32));
-
-       IXGB_WRITE_REG(hw, RDLEN, rdlen);
-
-       /* Setup the HW Rx Head and Tail Descriptor Pointers */
-       IXGB_WRITE_REG(hw, RDH, 0);
-       IXGB_WRITE_REG(hw, RDT, 0);
-
-       /* due to the hardware errata with RXDCTL, we are unable to use any of
-        * the performance enhancing features of it without causing other
-        * subtle bugs, some of the bugs could include receive length
-        * corruption at high data rates (WTHRESH > 0) and/or receive
-        * descriptor ring irregularites (particularly in hardware cache) */
-       IXGB_WRITE_REG(hw, RXDCTL, 0);
-
-       /* Enable Receive Checksum Offload for TCP and UDP */
-       if (adapter->rx_csum) {
-               rxcsum = IXGB_READ_REG(hw, RXCSUM);
-               rxcsum |= IXGB_RXCSUM_TUOFL;
-               IXGB_WRITE_REG(hw, RXCSUM, rxcsum);
-       }
-
-       /* Enable Receives */
-
-       IXGB_WRITE_REG(hw, RCTL, rctl);
-}
-
-/**
- * ixgb_free_tx_resources - Free Tx Resources
- * @adapter: board private structure
- *
- * Free all transmit software resources
- **/
-
-void
-ixgb_free_tx_resources(struct ixgb_adapter *adapter)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       ixgb_clean_tx_ring(adapter);
-
-       vfree(adapter->tx_ring.buffer_info);
-       adapter->tx_ring.buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, adapter->tx_ring.size,
-                         adapter->tx_ring.desc, adapter->tx_ring.dma);
-
-       adapter->tx_ring.desc = NULL;
-}
-
-static void
-ixgb_unmap_and_free_tx_resource(struct ixgb_adapter *adapter,
-                                struct ixgb_buffer *buffer_info)
-{
-       if (buffer_info->dma) {
-               if (buffer_info->mapped_as_page)
-                       dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
-                                      buffer_info->length, DMA_TO_DEVICE);
-               else
-                       dma_unmap_single(&adapter->pdev->dev, buffer_info->dma,
-                                        buffer_info->length, DMA_TO_DEVICE);
-               buffer_info->dma = 0;
-       }
-
-       if (buffer_info->skb) {
-               dev_kfree_skb_any(buffer_info->skb);
-               buffer_info->skb = NULL;
-       }
-       buffer_info->time_stamp = 0;
-       /* these fields must always be initialized in tx
-        * buffer_info->length = 0;
-        * buffer_info->next_to_watch = 0; */
-}
-
-/**
- * ixgb_clean_tx_ring - Free Tx Buffers
- * @adapter: board private structure
- **/
-
-static void
-ixgb_clean_tx_ring(struct ixgb_adapter *adapter)
-{
-       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
-       struct ixgb_buffer *buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       /* Free all the Tx ring sk_buffs */
-
-       for (i = 0; i < tx_ring->count; i++) {
-               buffer_info = &tx_ring->buffer_info[i];
-               ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
-       }
-
-       size = sizeof(struct ixgb_buffer) * tx_ring->count;
-       memset(tx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-
-       IXGB_WRITE_REG(&adapter->hw, TDH, 0);
-       IXGB_WRITE_REG(&adapter->hw, TDT, 0);
-}
-
-/**
- * ixgb_free_rx_resources - Free Rx Resources
- * @adapter: board private structure
- *
- * Free all receive software resources
- **/
-
-void
-ixgb_free_rx_resources(struct ixgb_adapter *adapter)
-{
-       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-
-       ixgb_clean_rx_ring(adapter);
-
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
-                         rx_ring->dma);
-
-       rx_ring->desc = NULL;
-}
-
-/**
- * ixgb_clean_rx_ring - Free Rx Buffers
- * @adapter: board private structure
- **/
-
-static void
-ixgb_clean_rx_ring(struct ixgb_adapter *adapter)
-{
-       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
-       struct ixgb_buffer *buffer_info;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned long size;
-       unsigned int i;
-
-       /* Free all the Rx ring sk_buffs */
-
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               if (buffer_info->dma) {
-                       dma_unmap_single(&pdev->dev,
-                                        buffer_info->dma,
-                                        buffer_info->length,
-                                        DMA_FROM_DEVICE);
-                       buffer_info->dma = 0;
-                       buffer_info->length = 0;
-               }
-
-               if (buffer_info->skb) {
-                       dev_kfree_skb(buffer_info->skb);
-                       buffer_info->skb = NULL;
-               }
-       }
-
-       size = sizeof(struct ixgb_buffer) * rx_ring->count;
-       memset(rx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       IXGB_WRITE_REG(&adapter->hw, RDH, 0);
-       IXGB_WRITE_REG(&adapter->hw, RDT, 0);
-}
-
-/**
- * ixgb_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int
-ixgb_set_mac(struct net_device *netdev, void *p)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-
-       ixgb_rar_set(&adapter->hw, addr->sa_data, 0);
-
-       return 0;
-}
-
-/**
- * ixgb_set_multi - Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_multi entry point is called whenever the multicast address
- * list or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper multicast,
- * promiscuous mode, and all-multi behavior.
- **/
-
-static void
-ixgb_set_multi(struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_hw *hw = &adapter->hw;
-       struct netdev_hw_addr *ha;
-       u32 rctl;
-       int i;
-
-       /* Check for Promiscuous and All Multicast modes */
-
-       rctl = IXGB_READ_REG(hw, RCTL);
-
-       if (netdev->flags & IFF_PROMISC) {
-               rctl |= (IXGB_RCTL_UPE | IXGB_RCTL_MPE);
-               /* disable VLAN filtering */
-               rctl &= ~IXGB_RCTL_CFIEN;
-               rctl &= ~IXGB_RCTL_VFE;
-       } else {
-               if (netdev->flags & IFF_ALLMULTI) {
-                       rctl |= IXGB_RCTL_MPE;
-                       rctl &= ~IXGB_RCTL_UPE;
-               } else {
-                       rctl &= ~(IXGB_RCTL_UPE | IXGB_RCTL_MPE);
-               }
-               /* enable VLAN filtering */
-               rctl |= IXGB_RCTL_VFE;
-               rctl &= ~IXGB_RCTL_CFIEN;
-       }
-
-       if (netdev_mc_count(netdev) > IXGB_MAX_NUM_MULTICAST_ADDRESSES) {
-               rctl |= IXGB_RCTL_MPE;
-               IXGB_WRITE_REG(hw, RCTL, rctl);
-       } else {
-               u8 mta[IXGB_MAX_NUM_MULTICAST_ADDRESSES *
-                           IXGB_ETH_LENGTH_OF_ADDRESS];
-
-               IXGB_WRITE_REG(hw, RCTL, rctl);
-
-               i = 0;
-               netdev_for_each_mc_addr(ha, netdev)
-                       memcpy(&mta[i++ * IXGB_ETH_LENGTH_OF_ADDRESS],
-                              ha->addr, IXGB_ETH_LENGTH_OF_ADDRESS);
-
-               ixgb_mc_addr_list_update(hw, mta, netdev_mc_count(netdev), 0);
-       }
-
-       if (netdev->features & NETIF_F_HW_VLAN_RX)
-               ixgb_vlan_strip_enable(adapter);
-       else
-               ixgb_vlan_strip_disable(adapter);
-
-}
-
-/**
- * ixgb_watchdog - Timer Call-back
- * @data: pointer to netdev cast into an unsigned long
- **/
-
-static void
-ixgb_watchdog(unsigned long data)
-{
-       struct ixgb_adapter *adapter = (struct ixgb_adapter *)data;
-       struct net_device *netdev = adapter->netdev;
-       struct ixgb_desc_ring *txdr = &adapter->tx_ring;
-
-       ixgb_check_for_link(&adapter->hw);
-
-       if (ixgb_check_for_bad_link(&adapter->hw)) {
-               /* force the reset path */
-               netif_stop_queue(netdev);
-       }
-
-       if (adapter->hw.link_up) {
-               if (!netif_carrier_ok(netdev)) {
-                       netdev_info(netdev,
-                                   "NIC Link is Up 10 Gbps Full Duplex, Flow Control: %s\n",
-                                   (adapter->hw.fc.type == ixgb_fc_full) ?
-                                   "RX/TX" :
-                                   (adapter->hw.fc.type == ixgb_fc_rx_pause) ?
-                                    "RX" :
-                                   (adapter->hw.fc.type == ixgb_fc_tx_pause) ?
-                                   "TX" : "None");
-                       adapter->link_speed = 10000;
-                       adapter->link_duplex = FULL_DUPLEX;
-                       netif_carrier_on(netdev);
-               }
-       } else {
-               if (netif_carrier_ok(netdev)) {
-                       adapter->link_speed = 0;
-                       adapter->link_duplex = 0;
-                       netdev_info(netdev, "NIC Link is Down\n");
-                       netif_carrier_off(netdev);
-               }
-       }
-
-       ixgb_update_stats(adapter);
-
-       if (!netif_carrier_ok(netdev)) {
-               if (IXGB_DESC_UNUSED(txdr) + 1 < txdr->count) {
-                       /* We've lost link, so the controller stops DMA,
-                        * but we've got queued Tx work that's never going
-                        * to get done, so reset controller to flush Tx.
-                        * (Do the reset outside of interrupt context). */
-                       schedule_work(&adapter->tx_timeout_task);
-                       /* return immediately since reset is imminent */
-                       return;
-               }
-       }
-
-       /* Force detection of hung controller every watchdog period */
-       adapter->detect_tx_hung = true;
-
-       /* generate an interrupt to force clean up of any stragglers */
-       IXGB_WRITE_REG(&adapter->hw, ICS, IXGB_INT_TXDW);
-
-       /* Reset the timer */
-       mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
-}
-
-#define IXGB_TX_FLAGS_CSUM             0x00000001
-#define IXGB_TX_FLAGS_VLAN             0x00000002
-#define IXGB_TX_FLAGS_TSO              0x00000004
-
-static int
-ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
-{
-       struct ixgb_context_desc *context_desc;
-       unsigned int i;
-       u8 ipcss, ipcso, tucss, tucso, hdr_len;
-       u16 ipcse, tucse, mss;
-       int err;
-
-       if (likely(skb_is_gso(skb))) {
-               struct ixgb_buffer *buffer_info;
-               struct iphdr *iph;
-
-               if (skb_header_cloned(skb)) {
-                       err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                       if (err)
-                               return err;
-               }
-
-               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-               mss = skb_shinfo(skb)->gso_size;
-               iph = ip_hdr(skb);
-               iph->tot_len = 0;
-               iph->check = 0;
-               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                        iph->daddr, 0,
-                                                        IPPROTO_TCP, 0);
-               ipcss = skb_network_offset(skb);
-               ipcso = (void *)&(iph->check) - (void *)skb->data;
-               ipcse = skb_transport_offset(skb) - 1;
-               tucss = skb_transport_offset(skb);
-               tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
-               tucse = 0;
-
-               i = adapter->tx_ring.next_to_use;
-               context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
-               buffer_info = &adapter->tx_ring.buffer_info[i];
-               WARN_ON(buffer_info->dma != 0);
-
-               context_desc->ipcss = ipcss;
-               context_desc->ipcso = ipcso;
-               context_desc->ipcse = cpu_to_le16(ipcse);
-               context_desc->tucss = tucss;
-               context_desc->tucso = tucso;
-               context_desc->tucse = cpu_to_le16(tucse);
-               context_desc->mss = cpu_to_le16(mss);
-               context_desc->hdr_len = hdr_len;
-               context_desc->status = 0;
-               context_desc->cmd_type_len = cpu_to_le32(
-                                                 IXGB_CONTEXT_DESC_TYPE
-                                               | IXGB_CONTEXT_DESC_CMD_TSE
-                                               | IXGB_CONTEXT_DESC_CMD_IP
-                                               | IXGB_CONTEXT_DESC_CMD_TCP
-                                               | IXGB_CONTEXT_DESC_CMD_IDE
-                                               | (skb->len - (hdr_len)));
-
-
-               if (++i == adapter->tx_ring.count) i = 0;
-               adapter->tx_ring.next_to_use = i;
-
-               return 1;
-       }
-
-       return 0;
-}
-
-static bool
-ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
-{
-       struct ixgb_context_desc *context_desc;
-       unsigned int i;
-       u8 css, cso;
-
-       if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
-               struct ixgb_buffer *buffer_info;
-               css = skb_checksum_start_offset(skb);
-               cso = css + skb->csum_offset;
-
-               i = adapter->tx_ring.next_to_use;
-               context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
-               buffer_info = &adapter->tx_ring.buffer_info[i];
-               WARN_ON(buffer_info->dma != 0);
-
-               context_desc->tucss = css;
-               context_desc->tucso = cso;
-               context_desc->tucse = 0;
-               /* zero out any previously existing data in one instruction */
-               *(u32 *)&(context_desc->ipcss) = 0;
-               context_desc->status = 0;
-               context_desc->hdr_len = 0;
-               context_desc->mss = 0;
-               context_desc->cmd_type_len =
-                       cpu_to_le32(IXGB_CONTEXT_DESC_TYPE
-                                   | IXGB_TX_DESC_CMD_IDE);
-
-               if (++i == adapter->tx_ring.count) i = 0;
-               adapter->tx_ring.next_to_use = i;
-
-               return true;
-       }
-
-       return false;
-}
-
-#define IXGB_MAX_TXD_PWR       14
-#define IXGB_MAX_DATA_PER_TXD  (1<<IXGB_MAX_TXD_PWR)
-
-static int
-ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
-           unsigned int first)
-{
-       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       struct ixgb_buffer *buffer_info;
-       int len = skb_headlen(skb);
-       unsigned int offset = 0, size, count = 0, i;
-       unsigned int mss = skb_shinfo(skb)->gso_size;
-       unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
-       unsigned int f;
-
-       i = tx_ring->next_to_use;
-
-       while (len) {
-               buffer_info = &tx_ring->buffer_info[i];
-               size = min(len, IXGB_MAX_DATA_PER_TXD);
-               /* Workaround for premature desc write-backs
-                * in TSO mode.  Append 4-byte sentinel desc */
-               if (unlikely(mss && !nr_frags && size == len && size > 8))
-                       size -= 4;
-
-               buffer_info->length = size;
-               WARN_ON(buffer_info->dma != 0);
-               buffer_info->time_stamp = jiffies;
-               buffer_info->mapped_as_page = false;
-               buffer_info->dma = dma_map_single(&pdev->dev,
-                                                 skb->data + offset,
-                                                 size, DMA_TO_DEVICE);
-               if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-                       goto dma_error;
-               buffer_info->next_to_watch = 0;
-
-               len -= size;
-               offset += size;
-               count++;
-               if (len) {
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-       }
-
-       for (f = 0; f < nr_frags; f++) {
-               struct skb_frag_struct *frag;
-
-               frag = &skb_shinfo(skb)->frags[f];
-               len = frag->size;
-               offset = frag->page_offset;
-
-               while (len) {
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-
-                       buffer_info = &tx_ring->buffer_info[i];
-                       size = min(len, IXGB_MAX_DATA_PER_TXD);
-
-                       /* Workaround for premature desc write-backs
-                        * in TSO mode.  Append 4-byte sentinel desc */
-                       if (unlikely(mss && (f == (nr_frags - 1))
-                                    && size == len && size > 8))
-                               size -= 4;
-
-                       buffer_info->length = size;
-                       buffer_info->time_stamp = jiffies;
-                       buffer_info->mapped_as_page = true;
-                       buffer_info->dma =
-                               dma_map_page(&pdev->dev, frag->page,
-                                            offset, size, DMA_TO_DEVICE);
-                       if (dma_mapping_error(&pdev->dev, buffer_info->dma))
-                               goto dma_error;
-                       buffer_info->next_to_watch = 0;
-
-                       len -= size;
-                       offset += size;
-                       count++;
-               }
-       }
-       tx_ring->buffer_info[i].skb = skb;
-       tx_ring->buffer_info[first].next_to_watch = i;
-
-       return count;
-
-dma_error:
-       dev_err(&pdev->dev, "TX DMA map failed\n");
-       buffer_info->dma = 0;
-       if (count)
-               count--;
-
-       while (count--) {
-               if (i==0)
-                       i += tx_ring->count;
-               i--;
-               buffer_info = &tx_ring->buffer_info[i];
-               ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
-       }
-
-       return 0;
-}
-
-static void
-ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags)
-{
-       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
-       struct ixgb_tx_desc *tx_desc = NULL;
-       struct ixgb_buffer *buffer_info;
-       u32 cmd_type_len = adapter->tx_cmd_type;
-       u8 status = 0;
-       u8 popts = 0;
-       unsigned int i;
-
-       if (tx_flags & IXGB_TX_FLAGS_TSO) {
-               cmd_type_len |= IXGB_TX_DESC_CMD_TSE;
-               popts |= (IXGB_TX_DESC_POPTS_IXSM | IXGB_TX_DESC_POPTS_TXSM);
-       }
-
-       if (tx_flags & IXGB_TX_FLAGS_CSUM)
-               popts |= IXGB_TX_DESC_POPTS_TXSM;
-
-       if (tx_flags & IXGB_TX_FLAGS_VLAN)
-               cmd_type_len |= IXGB_TX_DESC_CMD_VLE;
-
-       i = tx_ring->next_to_use;
-
-       while (count--) {
-               buffer_info = &tx_ring->buffer_info[i];
-               tx_desc = IXGB_TX_DESC(*tx_ring, i);
-               tx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
-               tx_desc->cmd_type_len =
-                       cpu_to_le32(cmd_type_len | buffer_info->length);
-               tx_desc->status = status;
-               tx_desc->popts = popts;
-               tx_desc->vlan = cpu_to_le16(vlan_id);
-
-               if (++i == tx_ring->count) i = 0;
-       }
-
-       tx_desc->cmd_type_len |=
-               cpu_to_le32(IXGB_TX_DESC_CMD_EOP | IXGB_TX_DESC_CMD_RS);
-
-       /* Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64). */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       IXGB_WRITE_REG(&adapter->hw, TDT, i);
-}
-
-static int __ixgb_maybe_stop_tx(struct net_device *netdev, int size)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
-
-       netif_stop_queue(netdev);
-       /* Herbert's original patch had:
-        *  smp_mb__after_netif_stop_queue();
-        * but since that doesn't exist yet, just open code it. */
-       smp_mb();
-
-       /* We need to check again in a case another CPU has just
-        * made room available. */
-       if (likely(IXGB_DESC_UNUSED(tx_ring) < size))
-               return -EBUSY;
-
-       /* A reprieve! */
-       netif_start_queue(netdev);
-       ++adapter->restart_queue;
-       return 0;
-}
-
-static int ixgb_maybe_stop_tx(struct net_device *netdev,
-                              struct ixgb_desc_ring *tx_ring, int size)
-{
-       if (likely(IXGB_DESC_UNUSED(tx_ring) >= size))
-               return 0;
-       return __ixgb_maybe_stop_tx(netdev, size);
-}
-
-
-/* Tx Descriptors needed, worst case */
-#define TXD_USE_COUNT(S) (((S) >> IXGB_MAX_TXD_PWR) + \
-                        (((S) & (IXGB_MAX_DATA_PER_TXD - 1)) ? 1 : 0))
-#define DESC_NEEDED TXD_USE_COUNT(IXGB_MAX_DATA_PER_TXD) /* skb->date */ + \
-       MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1 /* for context */ \
-       + 1 /* one more needed for sentinel TSO workaround */
-
-static netdev_tx_t
-ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       unsigned int first;
-       unsigned int tx_flags = 0;
-       int vlan_id = 0;
-       int count = 0;
-       int tso;
-
-       if (test_bit(__IXGB_DOWN, &adapter->flags)) {
-               dev_kfree_skb(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (skb->len <= 0) {
-               dev_kfree_skb(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (unlikely(ixgb_maybe_stop_tx(netdev, &adapter->tx_ring,
-                     DESC_NEEDED)))
-               return NETDEV_TX_BUSY;
-
-       if (vlan_tx_tag_present(skb)) {
-               tx_flags |= IXGB_TX_FLAGS_VLAN;
-               vlan_id = vlan_tx_tag_get(skb);
-       }
-
-       first = adapter->tx_ring.next_to_use;
-
-       tso = ixgb_tso(adapter, skb);
-       if (tso < 0) {
-               dev_kfree_skb(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (likely(tso))
-               tx_flags |= IXGB_TX_FLAGS_TSO;
-       else if (ixgb_tx_csum(adapter, skb))
-               tx_flags |= IXGB_TX_FLAGS_CSUM;
-
-       count = ixgb_tx_map(adapter, skb, first);
-
-       if (count) {
-               ixgb_tx_queue(adapter, count, vlan_id, tx_flags);
-               /* Make sure there is space in the ring for the next send. */
-               ixgb_maybe_stop_tx(netdev, &adapter->tx_ring, DESC_NEEDED);
-
-       } else {
-               dev_kfree_skb_any(skb);
-               adapter->tx_ring.buffer_info[first].time_stamp = 0;
-               adapter->tx_ring.next_to_use = first;
-       }
-
-       return NETDEV_TX_OK;
-}
-
-/**
- * ixgb_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-
-static void
-ixgb_tx_timeout(struct net_device *netdev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       /* Do the reset outside of interrupt context */
-       schedule_work(&adapter->tx_timeout_task);
-}
-
-static void
-ixgb_tx_timeout_task(struct work_struct *work)
-{
-       struct ixgb_adapter *adapter =
-               container_of(work, struct ixgb_adapter, tx_timeout_task);
-
-       adapter->tx_timeout_count++;
-       ixgb_down(adapter, true);
-       ixgb_up(adapter);
-}
-
-/**
- * ixgb_get_stats - Get System Network Statistics
- * @netdev: network interface device structure
- *
- * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
- **/
-
-static struct net_device_stats *
-ixgb_get_stats(struct net_device *netdev)
-{
-       return &netdev->stats;
-}
-
-/**
- * ixgb_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int
-ixgb_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       int max_frame = new_mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
-       int old_max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
-
-       /* MTU < 68 is an error for IPv4 traffic, just don't allow it */
-       if ((new_mtu < 68) ||
-           (max_frame > IXGB_MAX_JUMBO_FRAME_SIZE + ENET_FCS_LENGTH)) {
-               netif_err(adapter, probe, adapter->netdev,
-                         "Invalid MTU setting %d\n", new_mtu);
-               return -EINVAL;
-       }
-
-       if (old_max_frame == max_frame)
-               return 0;
-
-       if (netif_running(netdev))
-               ixgb_down(adapter, true);
-
-       adapter->rx_buffer_len = max_frame + 8; /* + 8 for errata */
-
-       netdev->mtu = new_mtu;
-
-       if (netif_running(netdev))
-               ixgb_up(adapter);
-
-       return 0;
-}
-
-/**
- * ixgb_update_stats - Update the board statistics counters.
- * @adapter: board private structure
- **/
-
-void
-ixgb_update_stats(struct ixgb_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-
-       /* Prevent stats update while adapter is being reset */
-       if (pci_channel_offline(pdev))
-               return;
-
-       if ((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||
-          (netdev_mc_count(netdev) > IXGB_MAX_NUM_MULTICAST_ADDRESSES)) {
-               u64 multi = IXGB_READ_REG(&adapter->hw, MPRCL);
-               u32 bcast_l = IXGB_READ_REG(&adapter->hw, BPRCL);
-               u32 bcast_h = IXGB_READ_REG(&adapter->hw, BPRCH);
-               u64 bcast = ((u64)bcast_h << 32) | bcast_l;
-
-               multi |= ((u64)IXGB_READ_REG(&adapter->hw, MPRCH) << 32);
-               /* fix up multicast stats by removing broadcasts */
-               if (multi >= bcast)
-                       multi -= bcast;
-
-               adapter->stats.mprcl += (multi & 0xFFFFFFFF);
-               adapter->stats.mprch += (multi >> 32);
-               adapter->stats.bprcl += bcast_l;
-               adapter->stats.bprch += bcast_h;
-       } else {
-               adapter->stats.mprcl += IXGB_READ_REG(&adapter->hw, MPRCL);
-               adapter->stats.mprch += IXGB_READ_REG(&adapter->hw, MPRCH);
-               adapter->stats.bprcl += IXGB_READ_REG(&adapter->hw, BPRCL);
-               adapter->stats.bprch += IXGB_READ_REG(&adapter->hw, BPRCH);
-       }
-       adapter->stats.tprl += IXGB_READ_REG(&adapter->hw, TPRL);
-       adapter->stats.tprh += IXGB_READ_REG(&adapter->hw, TPRH);
-       adapter->stats.gprcl += IXGB_READ_REG(&adapter->hw, GPRCL);
-       adapter->stats.gprch += IXGB_READ_REG(&adapter->hw, GPRCH);
-       adapter->stats.uprcl += IXGB_READ_REG(&adapter->hw, UPRCL);
-       adapter->stats.uprch += IXGB_READ_REG(&adapter->hw, UPRCH);
-       adapter->stats.vprcl += IXGB_READ_REG(&adapter->hw, VPRCL);
-       adapter->stats.vprch += IXGB_READ_REG(&adapter->hw, VPRCH);
-       adapter->stats.jprcl += IXGB_READ_REG(&adapter->hw, JPRCL);
-       adapter->stats.jprch += IXGB_READ_REG(&adapter->hw, JPRCH);
-       adapter->stats.gorcl += IXGB_READ_REG(&adapter->hw, GORCL);
-       adapter->stats.gorch += IXGB_READ_REG(&adapter->hw, GORCH);
-       adapter->stats.torl += IXGB_READ_REG(&adapter->hw, TORL);
-       adapter->stats.torh += IXGB_READ_REG(&adapter->hw, TORH);
-       adapter->stats.rnbc += IXGB_READ_REG(&adapter->hw, RNBC);
-       adapter->stats.ruc += IXGB_READ_REG(&adapter->hw, RUC);
-       adapter->stats.roc += IXGB_READ_REG(&adapter->hw, ROC);
-       adapter->stats.rlec += IXGB_READ_REG(&adapter->hw, RLEC);
-       adapter->stats.crcerrs += IXGB_READ_REG(&adapter->hw, CRCERRS);
-       adapter->stats.icbc += IXGB_READ_REG(&adapter->hw, ICBC);
-       adapter->stats.ecbc += IXGB_READ_REG(&adapter->hw, ECBC);
-       adapter->stats.mpc += IXGB_READ_REG(&adapter->hw, MPC);
-       adapter->stats.tptl += IXGB_READ_REG(&adapter->hw, TPTL);
-       adapter->stats.tpth += IXGB_READ_REG(&adapter->hw, TPTH);
-       adapter->stats.gptcl += IXGB_READ_REG(&adapter->hw, GPTCL);
-       adapter->stats.gptch += IXGB_READ_REG(&adapter->hw, GPTCH);
-       adapter->stats.bptcl += IXGB_READ_REG(&adapter->hw, BPTCL);
-       adapter->stats.bptch += IXGB_READ_REG(&adapter->hw, BPTCH);
-       adapter->stats.mptcl += IXGB_READ_REG(&adapter->hw, MPTCL);
-       adapter->stats.mptch += IXGB_READ_REG(&adapter->hw, MPTCH);
-       adapter->stats.uptcl += IXGB_READ_REG(&adapter->hw, UPTCL);
-       adapter->stats.uptch += IXGB_READ_REG(&adapter->hw, UPTCH);
-       adapter->stats.vptcl += IXGB_READ_REG(&adapter->hw, VPTCL);
-       adapter->stats.vptch += IXGB_READ_REG(&adapter->hw, VPTCH);
-       adapter->stats.jptcl += IXGB_READ_REG(&adapter->hw, JPTCL);
-       adapter->stats.jptch += IXGB_READ_REG(&adapter->hw, JPTCH);
-       adapter->stats.gotcl += IXGB_READ_REG(&adapter->hw, GOTCL);
-       adapter->stats.gotch += IXGB_READ_REG(&adapter->hw, GOTCH);
-       adapter->stats.totl += IXGB_READ_REG(&adapter->hw, TOTL);
-       adapter->stats.toth += IXGB_READ_REG(&adapter->hw, TOTH);
-       adapter->stats.dc += IXGB_READ_REG(&adapter->hw, DC);
-       adapter->stats.plt64c += IXGB_READ_REG(&adapter->hw, PLT64C);
-       adapter->stats.tsctc += IXGB_READ_REG(&adapter->hw, TSCTC);
-       adapter->stats.tsctfc += IXGB_READ_REG(&adapter->hw, TSCTFC);
-       adapter->stats.ibic += IXGB_READ_REG(&adapter->hw, IBIC);
-       adapter->stats.rfc += IXGB_READ_REG(&adapter->hw, RFC);
-       adapter->stats.lfc += IXGB_READ_REG(&adapter->hw, LFC);
-       adapter->stats.pfrc += IXGB_READ_REG(&adapter->hw, PFRC);
-       adapter->stats.pftc += IXGB_READ_REG(&adapter->hw, PFTC);
-       adapter->stats.mcfrc += IXGB_READ_REG(&adapter->hw, MCFRC);
-       adapter->stats.mcftc += IXGB_READ_REG(&adapter->hw, MCFTC);
-       adapter->stats.xonrxc += IXGB_READ_REG(&adapter->hw, XONRXC);
-       adapter->stats.xontxc += IXGB_READ_REG(&adapter->hw, XONTXC);
-       adapter->stats.xoffrxc += IXGB_READ_REG(&adapter->hw, XOFFRXC);
-       adapter->stats.xofftxc += IXGB_READ_REG(&adapter->hw, XOFFTXC);
-       adapter->stats.rjc += IXGB_READ_REG(&adapter->hw, RJC);
-
-       /* Fill out the OS statistics structure */
-
-       netdev->stats.rx_packets = adapter->stats.gprcl;
-       netdev->stats.tx_packets = adapter->stats.gptcl;
-       netdev->stats.rx_bytes = adapter->stats.gorcl;
-       netdev->stats.tx_bytes = adapter->stats.gotcl;
-       netdev->stats.multicast = adapter->stats.mprcl;
-       netdev->stats.collisions = 0;
-
-       /* ignore RLEC as it reports errors for padded (<64bytes) frames
-        * with a length in the type/len field */
-       netdev->stats.rx_errors =
-           /* adapter->stats.rnbc + */ adapter->stats.crcerrs +
-           adapter->stats.ruc +
-           adapter->stats.roc /*+ adapter->stats.rlec */  +
-           adapter->stats.icbc +
-           adapter->stats.ecbc + adapter->stats.mpc;
-
-       /* see above
-        * netdev->stats.rx_length_errors = adapter->stats.rlec;
-        */
-
-       netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
-       netdev->stats.rx_fifo_errors = adapter->stats.mpc;
-       netdev->stats.rx_missed_errors = adapter->stats.mpc;
-       netdev->stats.rx_over_errors = adapter->stats.mpc;
-
-       netdev->stats.tx_errors = 0;
-       netdev->stats.rx_frame_errors = 0;
-       netdev->stats.tx_aborted_errors = 0;
-       netdev->stats.tx_carrier_errors = 0;
-       netdev->stats.tx_fifo_errors = 0;
-       netdev->stats.tx_heartbeat_errors = 0;
-       netdev->stats.tx_window_errors = 0;
-}
-
-#define IXGB_MAX_INTR 10
-/**
- * ixgb_intr - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-
-static irqreturn_t
-ixgb_intr(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       struct ixgb_hw *hw = &adapter->hw;
-       u32 icr = IXGB_READ_REG(hw, ICR);
-
-       if (unlikely(!icr))
-               return IRQ_NONE;  /* Not our interrupt */
-
-       if (unlikely(icr & (IXGB_INT_RXSEQ | IXGB_INT_LSC)))
-               if (!test_bit(__IXGB_DOWN, &adapter->flags))
-                       mod_timer(&adapter->watchdog_timer, jiffies);
-
-       if (napi_schedule_prep(&adapter->napi)) {
-
-               /* Disable interrupts and register for poll. The flush
-                 of the posted write is intentionally left out.
-               */
-
-               IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
-               __napi_schedule(&adapter->napi);
-       }
-       return IRQ_HANDLED;
-}
-
-/**
- * ixgb_clean - NAPI Rx polling callback
- * @adapter: board private structure
- **/
-
-static int
-ixgb_clean(struct napi_struct *napi, int budget)
-{
-       struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi);
-       int work_done = 0;
-
-       ixgb_clean_tx_irq(adapter);
-       ixgb_clean_rx_irq(adapter, &work_done, budget);
-
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               if (!test_bit(__IXGB_DOWN, &adapter->flags))
-                       ixgb_irq_enable(adapter);
-       }
-
-       return work_done;
-}
-
-/**
- * ixgb_clean_tx_irq - Reclaim resources after transmit completes
- * @adapter: board private structure
- **/
-
-static bool
-ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
-{
-       struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
-       struct net_device *netdev = adapter->netdev;
-       struct ixgb_tx_desc *tx_desc, *eop_desc;
-       struct ixgb_buffer *buffer_info;
-       unsigned int i, eop;
-       bool cleaned = false;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->buffer_info[i].next_to_watch;
-       eop_desc = IXGB_TX_DESC(*tx_ring, eop);
-
-       while (eop_desc->status & IXGB_TX_DESC_STATUS_DD) {
-
-               rmb(); /* read buffer_info after eop_desc */
-               for (cleaned = false; !cleaned; ) {
-                       tx_desc = IXGB_TX_DESC(*tx_ring, i);
-                       buffer_info = &tx_ring->buffer_info[i];
-
-                       if (tx_desc->popts &
-                          (IXGB_TX_DESC_POPTS_TXSM |
-                           IXGB_TX_DESC_POPTS_IXSM))
-                               adapter->hw_csum_tx_good++;
-
-                       ixgb_unmap_and_free_tx_resource(adapter, buffer_info);
-
-                       *(u32 *)&(tx_desc->status) = 0;
-
-                       cleaned = (i == eop);
-                       if (++i == tx_ring->count) i = 0;
-               }
-
-               eop = tx_ring->buffer_info[i].next_to_watch;
-               eop_desc = IXGB_TX_DESC(*tx_ring, eop);
-       }
-
-       tx_ring->next_to_clean = i;
-
-       if (unlikely(cleaned && netif_carrier_ok(netdev) &&
-                    IXGB_DESC_UNUSED(tx_ring) >= DESC_NEEDED)) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean. */
-               smp_mb();
-
-               if (netif_queue_stopped(netdev) &&
-                   !(test_bit(__IXGB_DOWN, &adapter->flags))) {
-                       netif_wake_queue(netdev);
-                       ++adapter->restart_queue;
-               }
-       }
-
-       if (adapter->detect_tx_hung) {
-               /* detect a transmit hang in hardware, this serializes the
-                * check with the clearing of time_stamp and movement of i */
-               adapter->detect_tx_hung = false;
-               if (tx_ring->buffer_info[eop].time_stamp &&
-                  time_after(jiffies, tx_ring->buffer_info[eop].time_stamp + HZ)
-                  && !(IXGB_READ_REG(&adapter->hw, STATUS) &
-                       IXGB_STATUS_TXOFF)) {
-                       /* detected Tx unit hang */
-                       netif_err(adapter, drv, adapter->netdev,
-                                 "Detected Tx Unit Hang\n"
-                                 "  TDH                  <%x>\n"
-                                 "  TDT                  <%x>\n"
-                                 "  next_to_use          <%x>\n"
-                                 "  next_to_clean        <%x>\n"
-                                 "buffer_info[next_to_clean]\n"
-                                 "  time_stamp           <%lx>\n"
-                                 "  next_to_watch        <%x>\n"
-                                 "  jiffies              <%lx>\n"
-                                 "  next_to_watch.status <%x>\n",
-                                 IXGB_READ_REG(&adapter->hw, TDH),
-                                 IXGB_READ_REG(&adapter->hw, TDT),
-                                 tx_ring->next_to_use,
-                                 tx_ring->next_to_clean,
-                                 tx_ring->buffer_info[eop].time_stamp,
-                                 eop,
-                                 jiffies,
-                                 eop_desc->status);
-                       netif_stop_queue(netdev);
-               }
-       }
-
-       return cleaned;
-}
-
-/**
- * ixgb_rx_checksum - Receive Checksum Offload for 82597.
- * @adapter: board private structure
- * @rx_desc: receive descriptor
- * @sk_buff: socket buffer with received data
- **/
-
-static void
-ixgb_rx_checksum(struct ixgb_adapter *adapter,
-                 struct ixgb_rx_desc *rx_desc,
-                 struct sk_buff *skb)
-{
-       /* Ignore Checksum bit is set OR
-        * TCP Checksum has not been calculated
-        */
-       if ((rx_desc->status & IXGB_RX_DESC_STATUS_IXSM) ||
-          (!(rx_desc->status & IXGB_RX_DESC_STATUS_TCPCS))) {
-               skb_checksum_none_assert(skb);
-               return;
-       }
-
-       /* At this point we know the hardware did the TCP checksum */
-       /* now look at the TCP checksum error bit */
-       if (rx_desc->errors & IXGB_RX_DESC_ERRORS_TCPE) {
-               /* let the stack verify checksum errors */
-               skb_checksum_none_assert(skb);
-               adapter->hw_csum_rx_error++;
-       } else {
-               /* TCP checksum is good */
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-               adapter->hw_csum_rx_good++;
-       }
-}
-
-/*
- * this should improve performance for small packets with large amounts
- * of reassembly being done in the stack
- */
-static void ixgb_check_copybreak(struct net_device *netdev,
-                                struct ixgb_buffer *buffer_info,
-                                u32 length, struct sk_buff **skb)
-{
-       struct sk_buff *new_skb;
-
-       if (length > copybreak)
-               return;
-
-       new_skb = netdev_alloc_skb_ip_align(netdev, length);
-       if (!new_skb)
-               return;
-
-       skb_copy_to_linear_data_offset(new_skb, -NET_IP_ALIGN,
-                                      (*skb)->data - NET_IP_ALIGN,
-                                      length + NET_IP_ALIGN);
-       /* save the skb in buffer_info as good */
-       buffer_info->skb = *skb;
-       *skb = new_skb;
-}
-
-/**
- * ixgb_clean_rx_irq - Send received data up the network stack,
- * @adapter: board private structure
- **/
-
-static bool
-ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
-{
-       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct ixgb_rx_desc *rx_desc, *next_rxd;
-       struct ixgb_buffer *buffer_info, *next_buffer, *next2_buffer;
-       u32 length;
-       unsigned int i, j;
-       int cleaned_count = 0;
-       bool cleaned = false;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = IXGB_RX_DESC(*rx_ring, i);
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (rx_desc->status & IXGB_RX_DESC_STATUS_DD) {
-               struct sk_buff *skb;
-               u8 status;
-
-               if (*work_done >= work_to_do)
-                       break;
-
-               (*work_done)++;
-               rmb();  /* read descriptor and rx_buffer_info after status DD */
-               status = rx_desc->status;
-               skb = buffer_info->skb;
-               buffer_info->skb = NULL;
-
-               prefetch(skb->data - NET_IP_ALIGN);
-
-               if (++i == rx_ring->count)
-                       i = 0;
-               next_rxd = IXGB_RX_DESC(*rx_ring, i);
-               prefetch(next_rxd);
-
-               j = i + 1;
-               if (j == rx_ring->count)
-                       j = 0;
-               next2_buffer = &rx_ring->buffer_info[j];
-               prefetch(next2_buffer);
-
-               next_buffer = &rx_ring->buffer_info[i];
-
-               cleaned = true;
-               cleaned_count++;
-
-               dma_unmap_single(&pdev->dev,
-                                buffer_info->dma,
-                                buffer_info->length,
-                                DMA_FROM_DEVICE);
-               buffer_info->dma = 0;
-
-               length = le16_to_cpu(rx_desc->length);
-               rx_desc->length = 0;
-
-               if (unlikely(!(status & IXGB_RX_DESC_STATUS_EOP))) {
-
-                       /* All receives must fit into a single buffer */
-
-                       IXGB_DBG("Receive packet consumed multiple buffers "
-                                        "length<%x>\n", length);
-
-                       dev_kfree_skb_irq(skb);
-                       goto rxdesc_done;
-               }
-
-               if (unlikely(rx_desc->errors &
-                   (IXGB_RX_DESC_ERRORS_CE | IXGB_RX_DESC_ERRORS_SE |
-                    IXGB_RX_DESC_ERRORS_P | IXGB_RX_DESC_ERRORS_RXE))) {
-                       dev_kfree_skb_irq(skb);
-                       goto rxdesc_done;
-               }
-
-               ixgb_check_copybreak(netdev, buffer_info, length, &skb);
-
-               /* Good Receive */
-               skb_put(skb, length);
-
-               /* Receive Checksum Offload */
-               ixgb_rx_checksum(adapter, rx_desc, skb);
-
-               skb->protocol = eth_type_trans(skb, netdev);
-               if (status & IXGB_RX_DESC_STATUS_VP)
-                       __vlan_hwaccel_put_tag(skb,
-                                              le16_to_cpu(rx_desc->special));
-
-               netif_receive_skb(skb);
-
-rxdesc_done:
-               /* clean up descriptor, might be written over by hw */
-               rx_desc->status = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (unlikely(cleaned_count >= IXGB_RX_BUFFER_WRITE)) {
-                       ixgb_alloc_rx_buffers(adapter, cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-       }
-
-       rx_ring->next_to_clean = i;
-
-       cleaned_count = IXGB_DESC_UNUSED(rx_ring);
-       if (cleaned_count)
-               ixgb_alloc_rx_buffers(adapter, cleaned_count);
-
-       return cleaned;
-}
-
-/**
- * ixgb_alloc_rx_buffers - Replace used receive buffers
- * @adapter: address of board private structure
- **/
-
-static void
-ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter, int cleaned_count)
-{
-       struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct ixgb_rx_desc *rx_desc;
-       struct ixgb_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       long cleancount;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-       cleancount = IXGB_DESC_UNUSED(rx_ring);
-
-
-       /* leave three descriptors unused */
-       while (--cleancount > 2 && cleaned_count--) {
-               /* recycle! its good for you */
-               skb = buffer_info->skb;
-               if (skb) {
-                       skb_trim(skb, 0);
-                       goto map_skb;
-               }
-
-               skb = netdev_alloc_skb_ip_align(netdev, adapter->rx_buffer_len);
-               if (unlikely(!skb)) {
-                       /* Better luck next round */
-                       adapter->alloc_rx_buff_failed++;
-                       break;
-               }
-
-               buffer_info->skb = skb;
-               buffer_info->length = adapter->rx_buffer_len;
-map_skb:
-               buffer_info->dma = dma_map_single(&pdev->dev,
-                                                 skb->data,
-                                                 adapter->rx_buffer_len,
-                                                 DMA_FROM_DEVICE);
-
-               rx_desc = IXGB_RX_DESC(*rx_ring, i);
-               rx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
-               /* guarantee DD bit not set now before h/w gets descriptor
-                * this is the rest of the workaround for h/w double
-                * writeback. */
-               rx_desc->status = 0;
-
-
-               if (++i == rx_ring->count) i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-       if (likely(rx_ring->next_to_use != i)) {
-               rx_ring->next_to_use = i;
-               if (unlikely(i-- == 0))
-                       i = (rx_ring->count - 1);
-
-               /* Force memory writes to complete before letting h/w
-                * know there are new descriptors to fetch.  (Only
-                * applicable for weak-ordered memory model archs, such
-                * as IA-64). */
-               wmb();
-               IXGB_WRITE_REG(&adapter->hw, RDT, i);
-       }
-}
-
-static void
-ixgb_vlan_strip_enable(struct ixgb_adapter *adapter)
-{
-       u32 ctrl;
-
-       /* enable VLAN tag insert/strip */
-       ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
-       ctrl |= IXGB_CTRL0_VME;
-       IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
-}
-
-static void
-ixgb_vlan_strip_disable(struct ixgb_adapter *adapter)
-{
-       u32 ctrl;
-
-       /* disable VLAN tag insert/strip */
-       ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
-       ctrl &= ~IXGB_CTRL0_VME;
-       IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
-}
-
-static void
-ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       u32 vfta, index;
-
-       /* add VID to filter table */
-
-       index = (vid >> 5) & 0x7F;
-       vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
-       vfta |= (1 << (vid & 0x1F));
-       ixgb_write_vfta(&adapter->hw, index, vfta);
-       set_bit(vid, adapter->active_vlans);
-}
-
-static void
-ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-       u32 vfta, index;
-
-       /* remove VID from filter table */
-
-       index = (vid >> 5) & 0x7F;
-       vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
-       vfta &= ~(1 << (vid & 0x1F));
-       ixgb_write_vfta(&adapter->hw, index, vfta);
-       clear_bit(vid, adapter->active_vlans);
-}
-
-static void
-ixgb_restore_vlan(struct ixgb_adapter *adapter)
-{
-       u16 vid;
-
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               ixgb_vlan_rx_add_vid(adapter->netdev, vid);
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-
-static void ixgb_netpoll(struct net_device *dev)
-{
-       struct ixgb_adapter *adapter = netdev_priv(dev);
-
-       disable_irq(adapter->pdev->irq);
-       ixgb_intr(adapter->pdev->irq, dev);
-       enable_irq(adapter->pdev->irq);
-}
-#endif
-
-/**
- * ixgb_io_error_detected() - called when PCI error is detected
- * @pdev    pointer to pci device with error
- * @state   pci channel state after error
- *
- * This callback is called by the PCI subsystem whenever
- * a PCI bus error is detected.
- */
-static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev,
-                                               enum pci_channel_state state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (state == pci_channel_io_perm_failure)
-               return PCI_ERS_RESULT_DISCONNECT;
-
-       if (netif_running(netdev))
-               ixgb_down(adapter, true);
-
-       pci_disable_device(pdev);
-
-       /* Request a slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * ixgb_io_slot_reset - called after the pci bus has been reset.
- * @pdev    pointer to pci device with error
- *
- * This callback is called after the PCI bus has been reset.
- * Basically, this tries to restart the card from scratch.
- * This is a shortened version of the device probe/discovery code,
- * it resembles the first-half of the ixgb_probe() routine.
- */
-static pci_ers_result_t ixgb_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       if (pci_enable_device(pdev)) {
-               netif_err(adapter, probe, adapter->netdev,
-                         "Cannot re-enable PCI device after reset\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-
-       /* Perform card reset only on one instance of the card */
-       if (0 != PCI_FUNC (pdev->devfn))
-               return PCI_ERS_RESULT_RECOVERED;
-
-       pci_set_master(pdev);
-
-       netif_carrier_off(netdev);
-       netif_stop_queue(netdev);
-       ixgb_reset(adapter);
-
-       /* Make sure the EEPROM is good */
-       if (!ixgb_validate_eeprom_checksum(&adapter->hw)) {
-               netif_err(adapter, probe, adapter->netdev,
-                         "After reset, the EEPROM checksum is not valid\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-       ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);
-       memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->perm_addr)) {
-               netif_err(adapter, probe, adapter->netdev,
-                         "After reset, invalid MAC address\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-
-       return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * ixgb_io_resume - called when its OK to resume normal operations
- * @pdev    pointer to pci device with error
- *
- * The error recovery driver tells us that its OK to resume
- * normal operation. Implementation resembles the second-half
- * of the ixgb_probe() routine.
- */
-static void ixgb_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-       pci_set_master(pdev);
-
-       if (netif_running(netdev)) {
-               if (ixgb_up(adapter)) {
-                       pr_err("can't bring device back up after reset\n");
-                       return;
-               }
-       }
-
-       netif_device_attach(netdev);
-       mod_timer(&adapter->watchdog_timer, jiffies);
-}
-
-/* ixgb_main.c */
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
deleted file mode 100644 (file)
index e361185..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-/* glue for the OS independent part of ixgb
- * includes register access macros
- */
-
-#ifndef _IXGB_OSDEP_H_
-#define _IXGB_OSDEP_H_
-
-#include <linux/types.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <linux/interrupt.h>
-#include <linux/sched.h>
-
-#undef ASSERT
-#define ASSERT(x)      BUG_ON(!(x))
-
-#define ENTER() pr_debug("%s\n", __func__);
-
-#define IXGB_WRITE_REG(a, reg, value) ( \
-       writel((value), ((a)->hw_addr + IXGB_##reg)))
-
-#define IXGB_READ_REG(a, reg) ( \
-       readl((a)->hw_addr + IXGB_##reg))
-
-#define IXGB_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-       writel((value), ((a)->hw_addr + IXGB_##reg + ((offset) << 2))))
-
-#define IXGB_READ_REG_ARRAY(a, reg, offset) ( \
-       readl((a)->hw_addr + IXGB_##reg + ((offset) << 2)))
-
-#define IXGB_WRITE_FLUSH(a) IXGB_READ_REG(a, STATUS)
-
-#define IXGB_MEMCPY memcpy
-
-#endif /* _IXGB_OSDEP_H_ */
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
deleted file mode 100644 (file)
index dd7fbeb..0000000
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/10GbE 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
-
-*******************************************************************************/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include "ixgb.h"
-
-/* This is the only thing that needs to be changed to adjust the
- * maximum number of ports that the driver can manage.
- */
-
-#define IXGB_MAX_NIC 8
-
-#define OPTION_UNSET   -1
-#define OPTION_DISABLED 0
-#define OPTION_ENABLED  1
-
-/* All parameters are treated the same, as an integer array of values.
- * This macro just reduces the need to repeat the same declaration code
- * over and over (plus this helps to avoid typo bugs).
- */
-
-#define IXGB_PARAM_INIT { [0 ... IXGB_MAX_NIC] = OPTION_UNSET }
-#define IXGB_PARAM(X, desc)                                    \
-       static int __devinitdata X[IXGB_MAX_NIC+1]              \
-               = IXGB_PARAM_INIT;                              \
-       static unsigned int num_##X = 0;                        \
-       module_param_array_named(X, X, int, &num_##X, 0);       \
-       MODULE_PARM_DESC(X, desc);
-
-/* Transmit Descriptor Count
- *
- * Valid Range: 64-4096
- *
- * Default Value: 256
- */
-
-IXGB_PARAM(TxDescriptors, "Number of transmit descriptors");
-
-/* Receive Descriptor Count
- *
- * Valid Range: 64-4096
- *
- * Default Value: 1024
- */
-
-IXGB_PARAM(RxDescriptors, "Number of receive descriptors");
-
-/* User Specified Flow Control Override
- *
- * Valid Range: 0-3
- *  - 0 - No Flow Control
- *  - 1 - Rx only, respond to PAUSE frames but do not generate them
- *  - 2 - Tx only, generate PAUSE frames but ignore them on receive
- *  - 3 - Full Flow Control Support
- *
- * Default Value: 2 - Tx only (silicon bug avoidance)
- */
-
-IXGB_PARAM(FlowControl, "Flow Control setting");
-
-/* XsumRX - Receive Checksum Offload Enable/Disable
- *
- * Valid Range: 0, 1
- *  - 0 - disables all checksum offload
- *  - 1 - enables receive IP/TCP/UDP checksum offload
- *        on 82597 based NICs
- *
- * Default Value: 1
- */
-
-IXGB_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
-
-/* Transmit Interrupt Delay in units of 0.8192 microseconds
- *
- * Valid Range: 0-65535
- *
- * Default Value: 32
- */
-
-IXGB_PARAM(TxIntDelay, "Transmit Interrupt Delay");
-
-/* Receive Interrupt Delay in units of 0.8192 microseconds
- *
- * Valid Range: 0-65535
- *
- * Default Value: 72
- */
-
-IXGB_PARAM(RxIntDelay, "Receive Interrupt Delay");
-
-/* Receive Flow control high threshold (when we send a pause frame)
- * (FCRTH)
- *
- * Valid Range: 1,536 - 262,136 (0x600 - 0x3FFF8, 8 byte granularity)
- *
- * Default Value: 196,608 (0x30000)
- */
-
-IXGB_PARAM(RxFCHighThresh, "Receive Flow Control High Threshold");
-
-/* Receive Flow control low threshold (when we send a resume frame)
- * (FCRTL)
- *
- * Valid Range: 64 - 262,136 (0x40 - 0x3FFF8, 8 byte granularity)
- *              must be less than high threshold by at least 8 bytes
- *
- * Default Value:  163,840 (0x28000)
- */
-
-IXGB_PARAM(RxFCLowThresh, "Receive Flow Control Low Threshold");
-
-/* Flow control request timeout (how long to pause the link partner's tx)
- * (PAP 15:0)
- *
- * Valid Range: 1 - 65535
- *
- * Default Value:  65535 (0xffff) (we'll send an xon if we recover)
- */
-
-IXGB_PARAM(FCReqTimeout, "Flow Control Request Timeout");
-
-/* Interrupt Delay Enable
- *
- * Valid Range: 0, 1
- *
- *  - 0 - disables transmit interrupt delay
- *  - 1 - enables transmmit interrupt delay
- *
- * Default Value: 1
- */
-
-IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");
-
-
-#define DEFAULT_TIDV                        32
-#define MAX_TIDV                        0xFFFF
-#define MIN_TIDV                             0
-
-#define DEFAULT_RDTR                        72
-#define MAX_RDTR                        0xFFFF
-#define MIN_RDTR                             0
-
-#define XSUMRX_DEFAULT          OPTION_ENABLED
-
-#define DEFAULT_FCRTL                  0x28000
-#define DEFAULT_FCRTH                  0x30000
-#define MIN_FCRTL                            0
-#define MAX_FCRTL                      0x3FFE8
-#define MIN_FCRTH                            8
-#define MAX_FCRTH                      0x3FFF0
-
-#define MIN_FCPAUSE                          1
-#define MAX_FCPAUSE                     0xffff
-#define DEFAULT_FCPAUSE                         0xFFFF /* this may be too long */
-
-struct ixgb_option {
-       enum { enable_option, range_option, list_option } type;
-       const char *name;
-       const char *err;
-       int def;
-       union {
-               struct {        /* range_option info */
-                       int min;
-                       int max;
-               } r;
-               struct {        /* list_option info */
-                       int nr;
-                       const struct ixgb_opt_list {
-                               int i;
-                               const char *str;
-                       } *p;
-               } l;
-       } arg;
-};
-
-static int __devinit
-ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt)
-{
-       if (*value == OPTION_UNSET) {
-               *value = opt->def;
-               return 0;
-       }
-
-       switch (opt->type) {
-       case enable_option:
-               switch (*value) {
-               case OPTION_ENABLED:
-                       pr_info("%s Enabled\n", opt->name);
-                       return 0;
-               case OPTION_DISABLED:
-                       pr_info("%s Disabled\n", opt->name);
-                       return 0;
-               }
-               break;
-       case range_option:
-               if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
-                       pr_info("%s set to %i\n", opt->name, *value);
-                       return 0;
-               }
-               break;
-       case list_option: {
-               int i;
-               const struct ixgb_opt_list *ent;
-
-               for (i = 0; i < opt->arg.l.nr; i++) {
-                       ent = &opt->arg.l.p[i];
-                       if (*value == ent->i) {
-                               if (ent->str[0] != '\0')
-                                       pr_info("%s\n", ent->str);
-                               return 0;
-                       }
-               }
-       }
-               break;
-       default:
-               BUG();
-       }
-
-       pr_info("Invalid %s specified (%i) %s\n", opt->name, *value, opt->err);
-       *value = opt->def;
-       return -1;
-}
-
-/**
- * ixgb_check_options - Range Checking for Command Line Parameters
- * @adapter: board private structure
- *
- * This routine checks all command line parameters for valid user
- * input.  If an invalid value is given, or if no user specified
- * value exists, a default value is used.  The final value is stored
- * in a variable in the adapter structure.
- **/
-
-void __devinit
-ixgb_check_options(struct ixgb_adapter *adapter)
-{
-       int bd = adapter->bd_number;
-       if (bd >= IXGB_MAX_NIC) {
-               pr_notice("Warning: no configuration for board #%i\n", bd);
-               pr_notice("Using defaults for all values\n");
-       }
-
-       { /* Transmit Descriptor Count */
-               const struct ixgb_option opt = {
-                       .type = range_option,
-                       .name = "Transmit Descriptors",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_TXD),
-                       .def  = DEFAULT_TXD,
-                       .arg  = { .r = { .min = MIN_TXD,
-                                        .max = MAX_TXD}}
-               };
-               struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
-
-               if (num_TxDescriptors > bd) {
-                       tx_ring->count = TxDescriptors[bd];
-                       ixgb_validate_option(&tx_ring->count, &opt);
-               } else {
-                       tx_ring->count = opt.def;
-               }
-               tx_ring->count = ALIGN(tx_ring->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);
-       }
-       { /* Receive Descriptor Count */
-               const struct ixgb_option opt = {
-                       .type = range_option,
-                       .name = "Receive Descriptors",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_RXD),
-                       .def  = DEFAULT_RXD,
-                       .arg  = { .r = { .min = MIN_RXD,
-                                        .max = MAX_RXD}}
-               };
-               struct ixgb_desc_ring *rx_ring = &adapter->rx_ring;
-
-               if (num_RxDescriptors > bd) {
-                       rx_ring->count = RxDescriptors[bd];
-                       ixgb_validate_option(&rx_ring->count, &opt);
-               } else {
-                       rx_ring->count = opt.def;
-               }
-               rx_ring->count = ALIGN(rx_ring->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);
-       }
-       { /* Receive Checksum Offload Enable */
-               const struct ixgb_option opt = {
-                       .type = enable_option,
-                       .name = "Receive Checksum Offload",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (num_XsumRX > bd) {
-                       unsigned int rx_csum = XsumRX[bd];
-                       ixgb_validate_option(&rx_csum, &opt);
-                       adapter->rx_csum = rx_csum;
-               } else {
-                       adapter->rx_csum = opt.def;
-               }
-       }
-       { /* Flow Control */
-
-               static const struct ixgb_opt_list fc_list[] = {
-                      { ixgb_fc_none, "Flow Control Disabled" },
-                      { ixgb_fc_rx_pause, "Flow Control Receive Only" },
-                      { ixgb_fc_tx_pause, "Flow Control Transmit Only" },
-                      { ixgb_fc_full, "Flow Control Enabled" },
-                      { ixgb_fc_default, "Flow Control Hardware Default" }
-               };
-
-               static const struct ixgb_option opt = {
-                       .type = list_option,
-                       .name = "Flow Control",
-                       .err  = "reading default settings from EEPROM",
-                       .def  = ixgb_fc_tx_pause,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(fc_list),
-                                        .p = fc_list }}
-               };
-
-               if (num_FlowControl > bd) {
-                       unsigned int fc = FlowControl[bd];
-                       ixgb_validate_option(&fc, &opt);
-                       adapter->hw.fc.type = fc;
-               } else {
-                       adapter->hw.fc.type = opt.def;
-               }
-       }
-       { /* Receive Flow Control High Threshold */
-               const struct ixgb_option opt = {
-                       .type = range_option,
-                       .name = "Rx Flow Control High Threshold",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_FCRTH),
-                       .def  = DEFAULT_FCRTH,
-                       .arg  = { .r = { .min = MIN_FCRTH,
-                                        .max = MAX_FCRTH}}
-               };
-
-               if (num_RxFCHighThresh > bd) {
-                       adapter->hw.fc.high_water = RxFCHighThresh[bd];
-                       ixgb_validate_option(&adapter->hw.fc.high_water, &opt);
-               } else {
-                       adapter->hw.fc.high_water = opt.def;
-               }
-               if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
-                       pr_info("Ignoring RxFCHighThresh when no RxFC\n");
-       }
-       { /* Receive Flow Control Low Threshold */
-               const struct ixgb_option opt = {
-                       .type = range_option,
-                       .name = "Rx Flow Control Low Threshold",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_FCRTL),
-                       .def  = DEFAULT_FCRTL,
-                       .arg  = { .r = { .min = MIN_FCRTL,
-                                        .max = MAX_FCRTL}}
-               };
-
-               if (num_RxFCLowThresh > bd) {
-                       adapter->hw.fc.low_water = RxFCLowThresh[bd];
-                       ixgb_validate_option(&adapter->hw.fc.low_water, &opt);
-               } else {
-                       adapter->hw.fc.low_water = opt.def;
-               }
-               if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
-                       pr_info("Ignoring RxFCLowThresh when no RxFC\n");
-       }
-       { /* Flow Control Pause Time Request*/
-               const struct ixgb_option opt = {
-                       .type = range_option,
-                       .name = "Flow Control Pause Time Request",
-                       .err  = "using default of "__MODULE_STRING(DEFAULT_FCPAUSE),
-                       .def  = DEFAULT_FCPAUSE,
-                       .arg = { .r = { .min = MIN_FCPAUSE,
-                                       .max = MAX_FCPAUSE}}
-               };
-
-               if (num_FCReqTimeout > bd) {
-                       unsigned int pause_time = FCReqTimeout[bd];
-                       ixgb_validate_option(&pause_time, &opt);
-                       adapter->hw.fc.pause_time = pause_time;
-               } else {
-                       adapter->hw.fc.pause_time = opt.def;
-               }
-               if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
-                       pr_info("Ignoring FCReqTimeout when no RxFC\n");
-       }
-       /* high low and spacing check for rx flow control thresholds */
-       if (adapter->hw.fc.type & ixgb_fc_tx_pause) {
-               /* high must be greater than low */
-               if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) {
-                       /* set defaults */
-                       pr_info("RxFCHighThresh must be >= (RxFCLowThresh + 8), Using Defaults\n");
-                       adapter->hw.fc.high_water = DEFAULT_FCRTH;
-                       adapter->hw.fc.low_water  = DEFAULT_FCRTL;
-               }
-       }
-       { /* Receive Interrupt Delay */
-               const struct ixgb_option opt = {
-                       .type = range_option,
-                       .name = "Receive Interrupt Delay",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
-                       .def  = DEFAULT_RDTR,
-                       .arg  = { .r = { .min = MIN_RDTR,
-                                        .max = MAX_RDTR}}
-               };
-
-               if (num_RxIntDelay > bd) {
-                       adapter->rx_int_delay = RxIntDelay[bd];
-                       ixgb_validate_option(&adapter->rx_int_delay, &opt);
-               } else {
-                       adapter->rx_int_delay = opt.def;
-               }
-       }
-       { /* Transmit Interrupt Delay */
-               const struct ixgb_option opt = {
-                       .type = range_option,
-                       .name = "Transmit Interrupt Delay",
-                       .err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
-                       .def  = DEFAULT_TIDV,
-                       .arg  = { .r = { .min = MIN_TIDV,
-                                        .max = MAX_TIDV}}
-               };
-
-               if (num_TxIntDelay > bd) {
-                       adapter->tx_int_delay = TxIntDelay[bd];
-                       ixgb_validate_option(&adapter->tx_int_delay, &opt);
-               } else {
-                       adapter->tx_int_delay = opt.def;
-               }
-       }
-
-       { /* Transmit Interrupt Delay Enable */
-               const struct ixgb_option opt = {
-                       .type = enable_option,
-                       .name = "Tx Interrupt Delay Enable",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (num_IntDelayEnable > bd) {
-                       unsigned int ide = IntDelayEnable[bd];
-                       ixgb_validate_option(&ide, &opt);
-                       adapter->tx_int_delay_enable = ide;
-               } else {
-                       adapter->tx_int_delay_enable = opt.def;
-               }
-       }
-}
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile
deleted file mode 100644 (file)
index 7d7387f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-################################################################################
-#
-# Intel 10 Gigabit PCI Express Linux driver
-# Copyright(c) 1999 - 2010 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
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) 10GbE PCI Express ethernet driver
-#
-
-obj-$(CONFIG_IXGBE) += ixgbe.o
-
-ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
-              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
-              ixgbe_mbx.o ixgbe_x540.o
-
-ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
-                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o
-
-ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
deleted file mode 100644 (file)
index e04a8e4..0000000
+++ /dev/null
@@ -1,617 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_H_
-#define _IXGBE_H_
-
-#include <linux/bitops.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/cpumask.h>
-#include <linux/aer.h>
-#include <linux/if_vlan.h>
-
-#include "ixgbe_type.h"
-#include "ixgbe_common.h"
-#include "ixgbe_dcb.h"
-#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
-#define IXGBE_FCOE
-#include "ixgbe_fcoe.h"
-#endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */
-#ifdef CONFIG_IXGBE_DCA
-#include <linux/dca.h>
-#endif
-
-/* common prefix used by pr_<> macros */
-#undef pr_fmt
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-/* TX/RX descriptor defines */
-#define IXGBE_DEFAULT_TXD                  512
-#define IXGBE_MAX_TXD                     4096
-#define IXGBE_MIN_TXD                       64
-
-#define IXGBE_DEFAULT_RXD                  512
-#define IXGBE_MAX_RXD                     4096
-#define IXGBE_MIN_RXD                       64
-
-/* flow control */
-#define IXGBE_MIN_FCRTL                           0x40
-#define IXGBE_MAX_FCRTL                        0x7FF80
-#define IXGBE_MIN_FCRTH                          0x600
-#define IXGBE_MAX_FCRTH                        0x7FFF0
-#define IXGBE_DEFAULT_FCPAUSE           0xFFFF
-#define IXGBE_MIN_FCPAUSE                    0
-#define IXGBE_MAX_FCPAUSE               0xFFFF
-
-/* Supported Rx Buffer Sizes */
-#define IXGBE_RXBUFFER_512   512    /* Used for packet split */
-#define IXGBE_RXBUFFER_2048  2048
-#define IXGBE_RXBUFFER_4096  4096
-#define IXGBE_RXBUFFER_8192  8192
-#define IXGBE_MAX_RXBUFFER   16384  /* largest size for a single descriptor */
-
-/*
- * NOTE: netdev_alloc_skb reserves up to 64 bytes, NET_IP_ALIGN mans we
- * reserve 2 more, and skb_shared_info adds an additional 384 bytes more,
- * this adds up to 512 bytes of extra data meaning the smallest allocation
- * we could have is 1K.
- * i.e. RXBUFFER_512 --> size-1024 slab
- */
-#define IXGBE_RX_HDR_SIZE IXGBE_RXBUFFER_512
-
-#define MAXIMUM_ETHERNET_VLAN_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
-
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IXGBE_RX_BUFFER_WRITE  16      /* Must be power of 2 */
-
-#define IXGBE_TX_FLAGS_CSUM            (u32)(1)
-#define IXGBE_TX_FLAGS_VLAN            (u32)(1 << 1)
-#define IXGBE_TX_FLAGS_TSO             (u32)(1 << 2)
-#define IXGBE_TX_FLAGS_IPV4            (u32)(1 << 3)
-#define IXGBE_TX_FLAGS_FCOE            (u32)(1 << 4)
-#define IXGBE_TX_FLAGS_FSO             (u32)(1 << 5)
-#define IXGBE_TX_FLAGS_VLAN_MASK       0xffff0000
-#define IXGBE_TX_FLAGS_VLAN_PRIO_MASK   0x0000e000
-#define IXGBE_TX_FLAGS_VLAN_SHIFT      16
-
-#define IXGBE_MAX_RSC_INT_RATE          162760
-
-#define IXGBE_MAX_VF_MC_ENTRIES         30
-#define IXGBE_MAX_VF_FUNCTIONS          64
-#define IXGBE_MAX_VFTA_ENTRIES          128
-#define MAX_EMULATION_MAC_ADDRS         16
-#define IXGBE_MAX_PF_MACVLANS           15
-#define VMDQ_P(p)   ((p) + adapter->num_vfs)
-
-struct vf_data_storage {
-       unsigned char vf_mac_addresses[ETH_ALEN];
-       u16 vf_mc_hashes[IXGBE_MAX_VF_MC_ENTRIES];
-       u16 num_vf_mc_hashes;
-       u16 default_vf_vlan_id;
-       u16 vlans_enabled;
-       bool clear_to_send;
-       bool pf_set_mac;
-       u16 pf_vlan; /* When set, guest VLAN config not allowed. */
-       u16 pf_qos;
-       u16 tx_rate;
-};
-
-struct vf_macvlans {
-       struct list_head l;
-       int vf;
-       int rar_entry;
-       bool free;
-       bool is_macvlan;
-       u8 vf_macvlan[ETH_ALEN];
-};
-
-#define IXGBE_MAX_TXD_PWR      14
-#define IXGBE_MAX_DATA_PER_TXD (1 << IXGBE_MAX_TXD_PWR)
-
-/* Tx Descriptors needed, worst case */
-#define TXD_USE_COUNT(S) DIV_ROUND_UP((S), IXGBE_MAX_DATA_PER_TXD)
-#define DESC_NEEDED ((MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE)) + 4)
-
-/* wrapper around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer */
-struct ixgbe_tx_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       unsigned long time_stamp;
-       u16 length;
-       u16 next_to_watch;
-       unsigned int bytecount;
-       u16 gso_segs;
-       u8 mapped_as_page;
-};
-
-struct ixgbe_rx_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       struct page *page;
-       dma_addr_t page_dma;
-       unsigned int page_offset;
-};
-
-struct ixgbe_queue_stats {
-       u64 packets;
-       u64 bytes;
-};
-
-struct ixgbe_tx_queue_stats {
-       u64 restart_queue;
-       u64 tx_busy;
-       u64 completed;
-       u64 tx_done_old;
-};
-
-struct ixgbe_rx_queue_stats {
-       u64 rsc_count;
-       u64 rsc_flush;
-       u64 non_eop_descs;
-       u64 alloc_rx_page_failed;
-       u64 alloc_rx_buff_failed;
-};
-
-enum ixbge_ring_state_t {
-       __IXGBE_TX_FDIR_INIT_DONE,
-       __IXGBE_TX_DETECT_HANG,
-       __IXGBE_HANG_CHECK_ARMED,
-       __IXGBE_RX_PS_ENABLED,
-       __IXGBE_RX_RSC_ENABLED,
-};
-
-#define ring_is_ps_enabled(ring) \
-       test_bit(__IXGBE_RX_PS_ENABLED, &(ring)->state)
-#define set_ring_ps_enabled(ring) \
-       set_bit(__IXGBE_RX_PS_ENABLED, &(ring)->state)
-#define clear_ring_ps_enabled(ring) \
-       clear_bit(__IXGBE_RX_PS_ENABLED, &(ring)->state)
-#define check_for_tx_hang(ring) \
-       test_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)
-#define set_check_for_tx_hang(ring) \
-       set_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)
-#define clear_check_for_tx_hang(ring) \
-       clear_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)
-#define ring_is_rsc_enabled(ring) \
-       test_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)
-#define set_ring_rsc_enabled(ring) \
-       set_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)
-#define clear_ring_rsc_enabled(ring) \
-       clear_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)
-struct ixgbe_ring {
-       void *desc;                     /* descriptor ring memory */
-       struct device *dev;             /* device for DMA mapping */
-       struct net_device *netdev;      /* netdev ring belongs to */
-       union {
-               struct ixgbe_tx_buffer *tx_buffer_info;
-               struct ixgbe_rx_buffer *rx_buffer_info;
-       };
-       unsigned long state;
-       u8 __iomem *tail;
-
-       u16 count;                      /* amount of descriptors */
-       u16 rx_buf_len;
-
-       u8 queue_index; /* needed for multiqueue queue management */
-       u8 reg_idx;                     /* holds the special value that gets
-                                        * the hardware register offset
-                                        * associated with this ring, which is
-                                        * different for DCB and RSS modes
-                                        */
-       u8 atr_sample_rate;
-       u8 atr_count;
-
-       u16 next_to_use;
-       u16 next_to_clean;
-
-       u8 dcb_tc;
-       struct ixgbe_queue_stats stats;
-       struct u64_stats_sync syncp;
-       union {
-               struct ixgbe_tx_queue_stats tx_stats;
-               struct ixgbe_rx_queue_stats rx_stats;
-       };
-       int numa_node;
-       unsigned int size;              /* length in bytes */
-       dma_addr_t dma;                 /* phys. address of descriptor ring */
-       struct rcu_head rcu;
-       struct ixgbe_q_vector *q_vector; /* back-pointer to host q_vector */
-} ____cacheline_internodealigned_in_smp;
-
-enum ixgbe_ring_f_enum {
-       RING_F_NONE = 0,
-       RING_F_VMDQ,  /* SR-IOV uses the same ring feature */
-       RING_F_RSS,
-       RING_F_FDIR,
-#ifdef IXGBE_FCOE
-       RING_F_FCOE,
-#endif /* IXGBE_FCOE */
-
-       RING_F_ARRAY_SIZE      /* must be last in enum set */
-};
-
-#define IXGBE_MAX_RSS_INDICES  16
-#define IXGBE_MAX_VMDQ_INDICES 64
-#define IXGBE_MAX_FDIR_INDICES 64
-#ifdef IXGBE_FCOE
-#define IXGBE_MAX_FCOE_INDICES  8
-#define MAX_RX_QUEUES (IXGBE_MAX_FDIR_INDICES + IXGBE_MAX_FCOE_INDICES)
-#define MAX_TX_QUEUES (IXGBE_MAX_FDIR_INDICES + IXGBE_MAX_FCOE_INDICES)
-#else
-#define MAX_RX_QUEUES IXGBE_MAX_FDIR_INDICES
-#define MAX_TX_QUEUES IXGBE_MAX_FDIR_INDICES
-#endif /* IXGBE_FCOE */
-struct ixgbe_ring_feature {
-       int indices;
-       int mask;
-} ____cacheline_internodealigned_in_smp;
-
-struct ixgbe_ring_container {
-#if MAX_RX_QUEUES > MAX_TX_QUEUES
-       DECLARE_BITMAP(idx, MAX_RX_QUEUES);
-#else
-       DECLARE_BITMAP(idx, MAX_TX_QUEUES);
-#endif
-       unsigned int total_bytes;       /* total bytes processed this int */
-       unsigned int total_packets;     /* total packets processed this int */
-       u16 work_limit;                 /* total work allowed per interrupt */
-       u8 count;                       /* total number of rings in vector */
-       u8 itr;                         /* current ITR setting for ring */
-};
-
-#define MAX_RX_PACKET_BUFFERS ((adapter->flags & IXGBE_FLAG_DCB_ENABLED) \
-                              ? 8 : 1)
-#define MAX_TX_PACKET_BUFFERS MAX_RX_PACKET_BUFFERS
-
-/* MAX_MSIX_Q_VECTORS of these are allocated,
- * but we only use one per queue-specific vector.
- */
-struct ixgbe_q_vector {
-       struct ixgbe_adapter *adapter;
-       unsigned int v_idx; /* index of q_vector within array, also used for
-                            * finding the bit in EICR and friends that
-                            * represents the vector for this ring */
-#ifdef CONFIG_IXGBE_DCA
-       int cpu;            /* CPU for DCA */
-#endif
-       struct napi_struct napi;
-       struct ixgbe_ring_container rx, tx;
-       u32 eitr;
-       cpumask_var_t affinity_mask;
-       char name[IFNAMSIZ + 9];
-};
-
-/* Helper macros to switch between ints/sec and what the register uses.
- * And yes, it's the same math going both ways.  The lowest value
- * supported by all of the ixgbe hardware is 8.
- */
-#define EITR_INTS_PER_SEC_TO_REG(_eitr) \
-       ((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8)
-#define EITR_REG_TO_INTS_PER_SEC EITR_INTS_PER_SEC_TO_REG
-
-static inline u16 ixgbe_desc_unused(struct ixgbe_ring *ring)
-{
-       u16 ntc = ring->next_to_clean;
-       u16 ntu = ring->next_to_use;
-
-       return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1;
-}
-
-#define IXGBE_RX_DESC_ADV(R, i)            \
-       (&(((union ixgbe_adv_rx_desc *)((R)->desc))[i]))
-#define IXGBE_TX_DESC_ADV(R, i)            \
-       (&(((union ixgbe_adv_tx_desc *)((R)->desc))[i]))
-#define IXGBE_TX_CTXTDESC_ADV(R, i)        \
-       (&(((struct ixgbe_adv_tx_context_desc *)((R)->desc))[i]))
-
-#define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
-#ifdef IXGBE_FCOE
-/* Use 3K as the baby jumbo frame size for FCoE */
-#define IXGBE_FCOE_JUMBO_FRAME_SIZE       3072
-#endif /* IXGBE_FCOE */
-
-#define OTHER_VECTOR 1
-#define NON_Q_VECTORS (OTHER_VECTOR)
-
-#define MAX_MSIX_VECTORS_82599 64
-#define MAX_MSIX_Q_VECTORS_82599 64
-#define MAX_MSIX_VECTORS_82598 18
-#define MAX_MSIX_Q_VECTORS_82598 16
-
-#define MAX_MSIX_Q_VECTORS MAX_MSIX_Q_VECTORS_82599
-#define MAX_MSIX_COUNT MAX_MSIX_VECTORS_82599
-
-#define MIN_MSIX_Q_VECTORS 2
-#define MIN_MSIX_COUNT (MIN_MSIX_Q_VECTORS + NON_Q_VECTORS)
-
-/* board specific private data structure */
-struct ixgbe_adapter {
-       unsigned long state;
-
-       /* Some features need tri-state capability,
-        * thus the additional *_CAPABLE flags.
-        */
-       u32 flags;
-#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1)
-#define IXGBE_FLAG_MSI_CAPABLE                  (u32)(1 << 1)
-#define IXGBE_FLAG_MSI_ENABLED                  (u32)(1 << 2)
-#define IXGBE_FLAG_MSIX_CAPABLE                 (u32)(1 << 3)
-#define IXGBE_FLAG_MSIX_ENABLED                 (u32)(1 << 4)
-#define IXGBE_FLAG_RX_1BUF_CAPABLE              (u32)(1 << 6)
-#define IXGBE_FLAG_RX_PS_CAPABLE                (u32)(1 << 7)
-#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 << 8)
-#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 << 9)
-#define IXGBE_FLAG_DCA_ENABLED                  (u32)(1 << 10)
-#define IXGBE_FLAG_DCA_CAPABLE                  (u32)(1 << 11)
-#define IXGBE_FLAG_IMIR_ENABLED                 (u32)(1 << 12)
-#define IXGBE_FLAG_MQ_CAPABLE                   (u32)(1 << 13)
-#define IXGBE_FLAG_DCB_ENABLED                  (u32)(1 << 14)
-#define IXGBE_FLAG_RSS_ENABLED                  (u32)(1 << 16)
-#define IXGBE_FLAG_RSS_CAPABLE                  (u32)(1 << 17)
-#define IXGBE_FLAG_VMDQ_CAPABLE                 (u32)(1 << 18)
-#define IXGBE_FLAG_VMDQ_ENABLED                 (u32)(1 << 19)
-#define IXGBE_FLAG_FAN_FAIL_CAPABLE             (u32)(1 << 20)
-#define IXGBE_FLAG_NEED_LINK_UPDATE             (u32)(1 << 22)
-#define IXGBE_FLAG_NEED_LINK_CONFIG             (u32)(1 << 23)
-#define IXGBE_FLAG_FDIR_HASH_CAPABLE            (u32)(1 << 24)
-#define IXGBE_FLAG_FDIR_PERFECT_CAPABLE         (u32)(1 << 25)
-#define IXGBE_FLAG_FCOE_CAPABLE                 (u32)(1 << 26)
-#define IXGBE_FLAG_FCOE_ENABLED                 (u32)(1 << 27)
-#define IXGBE_FLAG_SRIOV_CAPABLE                (u32)(1 << 28)
-#define IXGBE_FLAG_SRIOV_ENABLED                (u32)(1 << 29)
-
-       u32 flags2;
-#define IXGBE_FLAG2_RSC_CAPABLE                 (u32)(1)
-#define IXGBE_FLAG2_RSC_ENABLED                 (u32)(1 << 1)
-#define IXGBE_FLAG2_TEMP_SENSOR_CAPABLE         (u32)(1 << 2)
-#define IXGBE_FLAG2_TEMP_SENSOR_EVENT           (u32)(1 << 3)
-#define IXGBE_FLAG2_SEARCH_FOR_SFP              (u32)(1 << 4)
-#define IXGBE_FLAG2_SFP_NEEDS_RESET             (u32)(1 << 5)
-#define IXGBE_FLAG2_RESET_REQUESTED             (u32)(1 << 6)
-#define IXGBE_FLAG2_FDIR_REQUIRES_REINIT        (u32)(1 << 7)
-
-       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-       u16 bd_number;
-       struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
-
-       /* DCB parameters */
-       struct ieee_pfc *ixgbe_ieee_pfc;
-       struct ieee_ets *ixgbe_ieee_ets;
-       struct ixgbe_dcb_config dcb_cfg;
-       struct ixgbe_dcb_config temp_dcb_cfg;
-       u8 dcb_set_bitmap;
-       u8 dcbx_cap;
-       enum ixgbe_fc_mode last_lfc_mode;
-
-       /* Interrupt Throttle Rate */
-       u32 rx_itr_setting;
-       u32 tx_itr_setting;
-       u16 eitr_low;
-       u16 eitr_high;
-
-       /* Work limits */
-       u16 tx_work_limit;
-
-       /* TX */
-       struct ixgbe_ring *tx_ring[MAX_TX_QUEUES] ____cacheline_aligned_in_smp;
-       int num_tx_queues;
-       u32 tx_timeout_count;
-       bool detect_tx_hung;
-
-       u64 restart_queue;
-       u64 lsc_int;
-
-       /* RX */
-       struct ixgbe_ring *rx_ring[MAX_RX_QUEUES] ____cacheline_aligned_in_smp;
-       int num_rx_queues;
-       int num_rx_pools;               /* == num_rx_queues in 82598 */
-       int num_rx_queues_per_pool;     /* 1 if 82598, can be many if 82599 */
-       u64 hw_csum_rx_error;
-       u64 hw_rx_no_dma_resources;
-       u64 non_eop_descs;
-       int num_msix_vectors;
-       int max_msix_q_vectors;         /* true count of q_vectors for device */
-       struct ixgbe_ring_feature ring_feature[RING_F_ARRAY_SIZE];
-       struct msix_entry *msix_entries;
-
-       u32 alloc_rx_page_failed;
-       u32 alloc_rx_buff_failed;
-
-/* default to trying for four seconds */
-#define IXGBE_TRY_LINK_TIMEOUT (4 * HZ)
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-
-       u32 test_icr;
-       struct ixgbe_ring test_tx_ring;
-       struct ixgbe_ring test_rx_ring;
-
-       /* structs defined in ixgbe_hw.h */
-       struct ixgbe_hw hw;
-       u16 msg_enable;
-       struct ixgbe_hw_stats stats;
-
-       /* Interrupt Throttle Rate */
-       u32 rx_eitr_param;
-       u32 tx_eitr_param;
-
-       u64 tx_busy;
-       unsigned int tx_ring_count;
-       unsigned int rx_ring_count;
-
-       u32 link_speed;
-       bool link_up;
-       unsigned long link_check_timeout;
-
-       struct work_struct service_task;
-       struct timer_list service_timer;
-       u32 fdir_pballoc;
-       u32 atr_sample_rate;
-       unsigned long fdir_overflow; /* number of times ATR was backed off */
-       spinlock_t fdir_perfect_lock;
-#ifdef IXGBE_FCOE
-       struct ixgbe_fcoe fcoe;
-#endif /* IXGBE_FCOE */
-       u64 rsc_total_count;
-       u64 rsc_total_flush;
-       u32 wol;
-       u16 eeprom_version;
-
-       int node;
-       u32 led_reg;
-       u32 interrupt_event;
-       char lsc_int_name[IFNAMSIZ + 9];
-
-       /* SR-IOV */
-       DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS);
-       unsigned int num_vfs;
-       struct vf_data_storage *vfinfo;
-       int vf_rate_link_speed;
-       struct vf_macvlans vf_mvs;
-       struct vf_macvlans *mv_list;
-       bool antispoofing_enabled;
-
-       struct hlist_head fdir_filter_list;
-       union ixgbe_atr_input fdir_mask;
-       int fdir_filter_count;
-};
-
-struct ixgbe_fdir_filter {
-       struct hlist_node fdir_node;
-       union ixgbe_atr_input filter;
-       u16 sw_idx;
-       u16 action;
-};
-
-enum ixbge_state_t {
-       __IXGBE_TESTING,
-       __IXGBE_RESETTING,
-       __IXGBE_DOWN,
-       __IXGBE_SERVICE_SCHED,
-       __IXGBE_IN_SFP_INIT,
-};
-
-struct ixgbe_rsc_cb {
-       dma_addr_t dma;
-       u16 skb_cnt;
-       bool delay_unmap;
-};
-#define IXGBE_RSC_CB(skb) ((struct ixgbe_rsc_cb *)(skb)->cb)
-
-enum ixgbe_boards {
-       board_82598,
-       board_82599,
-       board_X540,
-};
-
-extern struct ixgbe_info ixgbe_82598_info;
-extern struct ixgbe_info ixgbe_82599_info;
-extern struct ixgbe_info ixgbe_X540_info;
-#ifdef CONFIG_IXGBE_DCB
-extern const struct dcbnl_rtnl_ops dcbnl_ops;
-extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
-                              struct ixgbe_dcb_config *dst_dcb_cfg,
-                              int tc_max);
-#endif
-
-extern char ixgbe_driver_name[];
-extern const char ixgbe_driver_version[];
-
-extern int ixgbe_up(struct ixgbe_adapter *adapter);
-extern void ixgbe_down(struct ixgbe_adapter *adapter);
-extern void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);
-extern void ixgbe_reset(struct ixgbe_adapter *adapter);
-extern void ixgbe_set_ethtool_ops(struct net_device *netdev);
-extern int ixgbe_setup_rx_resources(struct ixgbe_ring *);
-extern int ixgbe_setup_tx_resources(struct ixgbe_ring *);
-extern void ixgbe_free_rx_resources(struct ixgbe_ring *);
-extern void ixgbe_free_tx_resources(struct ixgbe_ring *);
-extern void ixgbe_configure_rx_ring(struct ixgbe_adapter *,struct ixgbe_ring *);
-extern void ixgbe_configure_tx_ring(struct ixgbe_adapter *,struct ixgbe_ring *);
-extern void ixgbe_disable_rx_queue(struct ixgbe_adapter *adapter,
-                                  struct ixgbe_ring *);
-extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);
-extern int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter);
-extern void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter);
-extern netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *,
-                                        struct ixgbe_adapter *,
-                                        struct ixgbe_ring *);
-extern void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *,
-                                             struct ixgbe_tx_buffer *);
-extern void ixgbe_alloc_rx_buffers(struct ixgbe_ring *, u16);
-extern void ixgbe_write_eitr(struct ixgbe_q_vector *);
-extern int ethtool_ioctl(struct ifreq *ifr);
-extern s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw);
-extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 fdirctrl);
-extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 fdirctrl);
-extern s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw,
-                                                union ixgbe_atr_hash_dword input,
-                                                union ixgbe_atr_hash_dword common,
-                                                 u8 queue);
-extern s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
-                                          union ixgbe_atr_input *input_mask);
-extern s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
-                                                union ixgbe_atr_input *input,
-                                                u16 soft_id, u8 queue);
-extern s32 ixgbe_fdir_erase_perfect_filter_82599(struct ixgbe_hw *hw,
-                                                union ixgbe_atr_input *input,
-                                                u16 soft_id);
-extern void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,
-                                                union ixgbe_atr_input *mask);
-extern void ixgbe_set_rx_mode(struct net_device *netdev);
-extern int ixgbe_setup_tc(struct net_device *dev, u8 tc);
-extern void ixgbe_tx_ctxtdesc(struct ixgbe_ring *, u32, u32, u32, u32);
-extern void ixgbe_do_reset(struct net_device *netdev);
-#ifdef IXGBE_FCOE
-extern void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter);
-extern int ixgbe_fso(struct ixgbe_ring *tx_ring, struct sk_buff *skb,
-                     u32 tx_flags, u8 *hdr_len);
-extern void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter);
-extern int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
-                         union ixgbe_adv_rx_desc *rx_desc,
-                         struct sk_buff *skb,
-                         u32 staterr);
-extern int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
-                              struct scatterlist *sgl, unsigned int sgc);
-extern int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,
-                                struct scatterlist *sgl, unsigned int sgc);
-extern int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid);
-extern int ixgbe_fcoe_enable(struct net_device *netdev);
-extern int ixgbe_fcoe_disable(struct net_device *netdev);
-#ifdef CONFIG_IXGBE_DCB
-extern u8 ixgbe_fcoe_getapp(struct ixgbe_adapter *adapter);
-extern u8 ixgbe_fcoe_setapp(struct ixgbe_adapter *adapter, u8 up);
-#endif /* CONFIG_IXGBE_DCB */
-extern int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type);
-#endif /* IXGBE_FCOE */
-
-#endif /* _IXGBE_H_ */
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
deleted file mode 100644 (file)
index 0d4e382..0000000
+++ /dev/null
@@ -1,1353 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-
-#include "ixgbe.h"
-#include "ixgbe_phy.h"
-
-#define IXGBE_82598_MAX_TX_QUEUES 32
-#define IXGBE_82598_MAX_RX_QUEUES 64
-#define IXGBE_82598_RAR_ENTRIES   16
-#define IXGBE_82598_MC_TBL_SIZE  128
-#define IXGBE_82598_VFT_TBL_SIZE 128
-#define IXGBE_82598_RX_PB_SIZE  512
-
-static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw,
-                                         ixgbe_link_speed speed,
-                                         bool autoneg,
-                                         bool autoneg_wait_to_complete);
-static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset,
-                                       u8 *eeprom_data);
-
-/**
- *  ixgbe_set_pcie_completion_timeout - set pci-e completion timeout
- *  @hw: pointer to the HW structure
- *
- *  The defaults for 82598 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 250ms for capability version 1 config,
- *  or 16ms to 55ms for version 2.
- **/
-static void ixgbe_set_pcie_completion_timeout(struct ixgbe_hw *hw)
-{
-       struct ixgbe_adapter *adapter = hw->back;
-       u32 gcr = IXGBE_READ_REG(hw, IXGBE_GCR);
-       u16 pcie_devctl2;
-
-       /* only take action if timeout value is defaulted to 0 */
-       if (gcr & IXGBE_GCR_CMPL_TMOUT_MASK)
-               goto out;
-
-       /*
-        * if capababilities version is type 1 we can write the
-        * timeout of 10ms to 250ms through the GCR register
-        */
-       if (!(gcr & IXGBE_GCR_CAP_VER2)) {
-               gcr |= IXGBE_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
-        */
-       pci_read_config_word(adapter->pdev,
-                            IXGBE_PCI_DEVICE_CONTROL2, &pcie_devctl2);
-       pcie_devctl2 |= IXGBE_PCI_DEVICE_CONTROL2_16ms;
-       pci_write_config_word(adapter->pdev,
-                             IXGBE_PCI_DEVICE_CONTROL2, pcie_devctl2);
-out:
-       /* disable completion timeout resend */
-       gcr &= ~IXGBE_GCR_CMPL_TMOUT_RESEND;
-       IXGBE_WRITE_REG(hw, IXGBE_GCR, gcr);
-}
-
-/**
- *  ixgbe_get_pcie_msix_count_82598 - Gets MSI-X vector count
- *  @hw: pointer to hardware structure
- *
- *  Read PCIe configuration space, and get the MSI-X vector count from
- *  the capabilities table.
- **/
-static u16 ixgbe_get_pcie_msix_count_82598(struct ixgbe_hw *hw)
-{
-       struct ixgbe_adapter *adapter = hw->back;
-       u16 msix_count;
-       pci_read_config_word(adapter->pdev, IXGBE_PCIE_MSIX_82598_CAPS,
-                            &msix_count);
-       msix_count &= IXGBE_PCIE_MSIX_TBL_SZ_MASK;
-
-       /* MSI-X count is zero-based in HW, so increment to give proper value */
-       msix_count++;
-
-       return msix_count;
-}
-
-/**
- */
-static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mac_info *mac = &hw->mac;
-
-       /* Call PHY identify routine to get the phy type */
-       ixgbe_identify_phy_generic(hw);
-
-       mac->mcft_size = IXGBE_82598_MC_TBL_SIZE;
-       mac->vft_size = IXGBE_82598_VFT_TBL_SIZE;
-       mac->num_rar_entries = IXGBE_82598_RAR_ENTRIES;
-       mac->max_rx_queues = IXGBE_82598_MAX_RX_QUEUES;
-       mac->max_tx_queues = IXGBE_82598_MAX_TX_QUEUES;
-       mac->max_msix_vectors = ixgbe_get_pcie_msix_count_82598(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_init_phy_ops_82598 - PHY/SFP specific init
- *  @hw: pointer to hardware structure
- *
- *  Initialize any function pointers that were not able to be
- *  set during get_invariants because the PHY/SFP type was
- *  not known.  Perform the SFP init if necessary.
- *
- **/
-static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mac_info *mac = &hw->mac;
-       struct ixgbe_phy_info *phy = &hw->phy;
-       s32 ret_val = 0;
-       u16 list_offset, data_offset;
-
-       /* Identify the PHY */
-       phy->ops.identify(hw);
-
-       /* Overwrite the link function pointers if copper PHY */
-       if (mac->ops.get_media_type(hw) == ixgbe_media_type_copper) {
-               mac->ops.setup_link = &ixgbe_setup_copper_link_82598;
-               mac->ops.get_link_capabilities =
-                       &ixgbe_get_copper_link_capabilities_generic;
-       }
-
-       switch (hw->phy.type) {
-       case ixgbe_phy_tn:
-               phy->ops.setup_link = &ixgbe_setup_phy_link_tnx;
-               phy->ops.check_link = &ixgbe_check_phy_link_tnx;
-               phy->ops.get_firmware_version =
-                            &ixgbe_get_phy_firmware_version_tnx;
-               break;
-       case ixgbe_phy_nl:
-               phy->ops.reset = &ixgbe_reset_phy_nl;
-
-               /* Call SFP+ identify routine to get the SFP+ module type */
-               ret_val = phy->ops.identify_sfp(hw);
-               if (ret_val != 0)
-                       goto out;
-               else if (hw->phy.sfp_type == ixgbe_sfp_type_unknown) {
-                       ret_val = IXGBE_ERR_SFP_NOT_SUPPORTED;
-                       goto out;
-               }
-
-               /* Check to see if SFP+ module is supported */
-               ret_val = ixgbe_get_sfp_init_sequence_offsets(hw,
-                                                           &list_offset,
-                                                           &data_offset);
-               if (ret_val != 0) {
-                       ret_val = IXGBE_ERR_SFP_NOT_SUPPORTED;
-                       goto out;
-               }
-               break;
-       default:
-               break;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_start_hw_82598 - Prepare hardware for Tx/Rx
- *  @hw: pointer to hardware structure
- *
- *  Starts the hardware using the generic start_hw function.
- *  Disables relaxed ordering Then set pcie completion timeout
- *
- **/
-static s32 ixgbe_start_hw_82598(struct ixgbe_hw *hw)
-{
-       u32 regval;
-       u32 i;
-       s32 ret_val = 0;
-
-       ret_val = ixgbe_start_hw_generic(hw);
-
-       /* Disable relaxed ordering */
-       for (i = 0; ((i < hw->mac.max_tx_queues) &&
-            (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {
-               regval = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));
-               regval &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
-               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(i), regval);
-       }
-
-       for (i = 0; ((i < hw->mac.max_rx_queues) &&
-            (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {
-               regval = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
-               regval &= ~(IXGBE_DCA_RXCTRL_DESC_WRO_EN |
-                           IXGBE_DCA_RXCTRL_DESC_HSRO_EN);
-               IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
-       }
-
-       hw->mac.rx_pb_size = IXGBE_82598_RX_PB_SIZE;
-
-       /* set the completion timeout for interface */
-       if (ret_val == 0)
-               ixgbe_set_pcie_completion_timeout(hw);
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_get_link_capabilities_82598 - Determines link capabilities
- *  @hw: pointer to hardware structure
- *  @speed: pointer to link speed
- *  @autoneg: boolean auto-negotiation value
- *
- *  Determines the link capabilities by reading the AUTOC register.
- **/
-static s32 ixgbe_get_link_capabilities_82598(struct ixgbe_hw *hw,
-                                             ixgbe_link_speed *speed,
-                                             bool *autoneg)
-{
-       s32 status = 0;
-       u32 autoc = 0;
-
-       /*
-        * Determine link capabilities based on the stored value of AUTOC,
-        * which represents EEPROM defaults.  If AUTOC value has not been
-        * stored, use the current register value.
-        */
-       if (hw->mac.orig_link_settings_stored)
-               autoc = hw->mac.orig_autoc;
-       else
-               autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-
-       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
-       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-               *autoneg = false;
-               break;
-
-       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
-               *speed = IXGBE_LINK_SPEED_10GB_FULL;
-               *autoneg = false;
-               break;
-
-       case IXGBE_AUTOC_LMS_1G_AN:
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-               *autoneg = true;
-               break;
-
-       case IXGBE_AUTOC_LMS_KX4_AN:
-       case IXGBE_AUTOC_LMS_KX4_AN_1G_AN:
-               *speed = IXGBE_LINK_SPEED_UNKNOWN;
-               if (autoc & IXGBE_AUTOC_KX4_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (autoc & IXGBE_AUTOC_KX_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
-               *autoneg = true;
-               break;
-
-       default:
-               status = IXGBE_ERR_LINK_SETUP;
-               break;
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_get_media_type_82598 - Determines media type
- *  @hw: pointer to hardware structure
- *
- *  Returns the media type (fiber, copper, backplane)
- **/
-static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
-{
-       enum ixgbe_media_type media_type;
-
-       /* Detect if there is a copper PHY attached. */
-       switch (hw->phy.type) {
-       case ixgbe_phy_cu_unknown:
-       case ixgbe_phy_tn:
-       case ixgbe_phy_aq:
-               media_type = ixgbe_media_type_copper;
-               goto out;
-       default:
-               break;
-       }
-
-       /* Media type for I82598 is based on device ID */
-       switch (hw->device_id) {
-       case IXGBE_DEV_ID_82598:
-       case IXGBE_DEV_ID_82598_BX:
-               /* Default device ID is mezzanine card KX/KX4 */
-               media_type = ixgbe_media_type_backplane;
-               break;
-       case IXGBE_DEV_ID_82598AF_DUAL_PORT:
-       case IXGBE_DEV_ID_82598AF_SINGLE_PORT:
-       case IXGBE_DEV_ID_82598_DA_DUAL_PORT:
-       case IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM:
-       case IXGBE_DEV_ID_82598EB_XF_LR:
-       case IXGBE_DEV_ID_82598EB_SFP_LOM:
-               media_type = ixgbe_media_type_fiber;
-               break;
-       case IXGBE_DEV_ID_82598EB_CX4:
-       case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
-               media_type = ixgbe_media_type_cx4;
-               break;
-       case IXGBE_DEV_ID_82598AT:
-       case IXGBE_DEV_ID_82598AT2:
-               media_type = ixgbe_media_type_copper;
-               break;
-       default:
-               media_type = ixgbe_media_type_unknown;
-               break;
-       }
-out:
-       return media_type;
-}
-
-/**
- *  ixgbe_fc_enable_82598 - Enable flow control
- *  @hw: pointer to hardware structure
- *  @packetbuf_num: packet buffer number (0-7)
- *
- *  Enable flow control according to the current settings.
- **/
-static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
-{
-       s32 ret_val = 0;
-       u32 fctrl_reg;
-       u32 rmcs_reg;
-       u32 reg;
-       u32 rx_pba_size;
-       u32 link_speed = 0;
-       bool link_up;
-
-#ifdef CONFIG_DCB
-       if (hw->fc.requested_mode == ixgbe_fc_pfc)
-               goto out;
-
-#endif /* CONFIG_DCB */
-       /*
-        * On 82598 having Rx FC on causes resets while doing 1G
-        * so if it's on turn it off once we know link_speed. For
-        * more details see 82598 Specification update.
-        */
-       hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
-       if (link_up && link_speed == IXGBE_LINK_SPEED_1GB_FULL) {
-               switch (hw->fc.requested_mode) {
-               case ixgbe_fc_full:
-                       hw->fc.requested_mode = ixgbe_fc_tx_pause;
-                       break;
-               case ixgbe_fc_rx_pause:
-                       hw->fc.requested_mode = ixgbe_fc_none;
-                       break;
-               default:
-                       /* no change */
-                       break;
-               }
-       }
-
-       /* Negotiate the fc mode to use */
-       ret_val = ixgbe_fc_autoneg(hw);
-       if (ret_val == IXGBE_ERR_FLOW_CONTROL)
-               goto out;
-
-       /* Disable any previous flow control settings */
-       fctrl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-       fctrl_reg &= ~(IXGBE_FCTRL_RFCE | IXGBE_FCTRL_RPFCE);
-
-       rmcs_reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
-       rmcs_reg &= ~(IXGBE_RMCS_TFCE_PRIORITY | IXGBE_RMCS_TFCE_802_3X);
-
-       /*
-        * The possible values of fc.current_mode 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.
-#ifdef CONFIG_DCB
-        * 4: Priority Flow Control is enabled.
-#endif
-        * other: Invalid.
-        */
-       switch (hw->fc.current_mode) {
-       case ixgbe_fc_none:
-               /*
-                * Flow control is disabled by software override or autoneg.
-                * The code below will actually disable it in the HW.
-                */
-               break;
-       case ixgbe_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled and Tx Flow control is
-                * disabled by software override. 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.
-                */
-               fctrl_reg |= IXGBE_FCTRL_RFCE;
-               break;
-       case ixgbe_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is
-                * disabled by software override.
-                */
-               rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;
-               break;
-       case ixgbe_fc_full:
-               /* Flow control (both Rx and Tx) is enabled by SW override. */
-               fctrl_reg |= IXGBE_FCTRL_RFCE;
-               rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;
-               break;
-#ifdef CONFIG_DCB
-       case ixgbe_fc_pfc:
-               goto out;
-               break;
-#endif /* CONFIG_DCB */
-       default:
-               hw_dbg(hw, "Flow control param set incorrectly\n");
-               ret_val = IXGBE_ERR_CONFIG;
-               goto out;
-               break;
-       }
-
-       /* Set 802.3x based flow control settings. */
-       fctrl_reg |= IXGBE_FCTRL_DPF;
-       IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl_reg);
-       IXGBE_WRITE_REG(hw, IXGBE_RMCS, rmcs_reg);
-
-       /* Set up and enable Rx high/low water mark thresholds, enable XON. */
-       if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
-               rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num));
-               rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
-
-               reg = (rx_pba_size - hw->fc.low_water) << 6;
-               if (hw->fc.send_xon)
-                       reg |= IXGBE_FCRTL_XONE;
-
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num), reg);
-
-               reg = (rx_pba_size - hw->fc.high_water) << 6;
-               reg |= IXGBE_FCRTH_FCEN;
-
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num), reg);
-       }
-
-       /* Configure pause time (2 TCs per register) */
-       reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
-       if ((packetbuf_num & 1) == 0)
-               reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
-       else
-               reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
-       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
-
-       IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
-
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_start_mac_link_82598 - Configures MAC link settings
- *  @hw: pointer to hardware structure
- *
- *  Configures link settings based on values in the ixgbe_hw struct.
- *  Restarts the link.  Performs autonegotiation if needed.
- **/
-static s32 ixgbe_start_mac_link_82598(struct ixgbe_hw *hw,
-                                      bool autoneg_wait_to_complete)
-{
-       u32 autoc_reg;
-       u32 links_reg;
-       u32 i;
-       s32 status = 0;
-
-       /* Restart link */
-       autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       autoc_reg |= IXGBE_AUTOC_AN_RESTART;
-       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
-
-       /* Only poll for autoneg to complete if specified to do so */
-       if (autoneg_wait_to_complete) {
-               if ((autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
-                    IXGBE_AUTOC_LMS_KX4_AN ||
-                   (autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
-                    IXGBE_AUTOC_LMS_KX4_AN_1G_AN) {
-                       links_reg = 0; /* Just in case Autoneg time = 0 */
-                       for (i = 0; i < IXGBE_AUTO_NEG_TIME; i++) {
-                               links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
-                               if (links_reg & IXGBE_LINKS_KX_AN_COMP)
-                                       break;
-                               msleep(100);
-                       }
-                       if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {
-                               status = IXGBE_ERR_AUTONEG_NOT_COMPLETE;
-                               hw_dbg(hw, "Autonegotiation did not complete.\n");
-                       }
-               }
-       }
-
-       /* Add delay to filter out noises during initial link setup */
-       msleep(50);
-
-       return status;
-}
-
-/**
- *  ixgbe_validate_link_ready - Function looks for phy link
- *  @hw: pointer to hardware structure
- *
- *  Function indicates success when phy link is available. If phy is not ready
- *  within 5 seconds of MAC indicating link, the function returns error.
- **/
-static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw)
-{
-       u32 timeout;
-       u16 an_reg;
-
-       if (hw->device_id != IXGBE_DEV_ID_82598AT2)
-               return 0;
-
-       for (timeout = 0;
-            timeout < IXGBE_VALIDATE_LINK_READY_TIMEOUT; timeout++) {
-               hw->phy.ops.read_reg(hw, MDIO_STAT1, MDIO_MMD_AN, &an_reg);
-
-               if ((an_reg & MDIO_AN_STAT1_COMPLETE) &&
-                   (an_reg & MDIO_STAT1_LSTATUS))
-                       break;
-
-               msleep(100);
-       }
-
-       if (timeout == IXGBE_VALIDATE_LINK_READY_TIMEOUT) {
-               hw_dbg(hw, "Link was indicated but link is down\n");
-               return IXGBE_ERR_LINK_SETUP;
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_check_mac_link_82598 - Get link/speed status
- *  @hw: pointer to hardware structure
- *  @speed: pointer to link speed
- *  @link_up: true is link is up, false otherwise
- *  @link_up_wait_to_complete: bool used to wait for link up or not
- *
- *  Reads the links register to determine if link is up and the current speed
- **/
-static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
-                                      ixgbe_link_speed *speed, bool *link_up,
-                                      bool link_up_wait_to_complete)
-{
-       u32 links_reg;
-       u32 i;
-       u16 link_reg, adapt_comp_reg;
-
-       /*
-        * SERDES PHY requires us to read link status from register 0xC79F.
-        * Bit 0 set indicates link is up/ready; clear indicates link down.
-        * 0xC00C is read to check that the XAUI lanes are active.  Bit 0
-        * clear indicates active; set indicates inactive.
-        */
-       if (hw->phy.type == ixgbe_phy_nl) {
-               hw->phy.ops.read_reg(hw, 0xC79F, MDIO_MMD_PMAPMD, &link_reg);
-               hw->phy.ops.read_reg(hw, 0xC79F, MDIO_MMD_PMAPMD, &link_reg);
-               hw->phy.ops.read_reg(hw, 0xC00C, MDIO_MMD_PMAPMD,
-                                    &adapt_comp_reg);
-               if (link_up_wait_to_complete) {
-                       for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
-                               if ((link_reg & 1) &&
-                                   ((adapt_comp_reg & 1) == 0)) {
-                                       *link_up = true;
-                                       break;
-                               } else {
-                                       *link_up = false;
-                               }
-                               msleep(100);
-                               hw->phy.ops.read_reg(hw, 0xC79F,
-                                                    MDIO_MMD_PMAPMD,
-                                                    &link_reg);
-                               hw->phy.ops.read_reg(hw, 0xC00C,
-                                                    MDIO_MMD_PMAPMD,
-                                                    &adapt_comp_reg);
-                       }
-               } else {
-                       if ((link_reg & 1) && ((adapt_comp_reg & 1) == 0))
-                               *link_up = true;
-                       else
-                               *link_up = false;
-               }
-
-               if (*link_up == false)
-                       goto out;
-       }
-
-       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
-       if (link_up_wait_to_complete) {
-               for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
-                       if (links_reg & IXGBE_LINKS_UP) {
-                               *link_up = true;
-                               break;
-                       } else {
-                               *link_up = false;
-                       }
-                       msleep(100);
-                       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
-               }
-       } else {
-               if (links_reg & IXGBE_LINKS_UP)
-                       *link_up = true;
-               else
-                       *link_up = false;
-       }
-
-       if (links_reg & IXGBE_LINKS_SPEED)
-               *speed = IXGBE_LINK_SPEED_10GB_FULL;
-       else
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-
-       if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) &&
-           (ixgbe_validate_link_ready(hw) != 0))
-               *link_up = false;
-
-       /* if link is down, zero out the current_mode */
-       if (*link_up == false) {
-               hw->fc.current_mode = ixgbe_fc_none;
-               hw->fc.fc_was_autonegged = false;
-       }
-out:
-       return 0;
-}
-
-/**
- *  ixgbe_setup_mac_link_82598 - Set MAC link speed
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if auto-negotiation enabled
- *  @autoneg_wait_to_complete: true when waiting for completion is needed
- *
- *  Set the link speed in the AUTOC register and restarts link.
- **/
-static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw,
-                                           ixgbe_link_speed speed, bool autoneg,
-                                           bool autoneg_wait_to_complete)
-{
-       s32              status            = 0;
-       ixgbe_link_speed link_capabilities = IXGBE_LINK_SPEED_UNKNOWN;
-       u32              curr_autoc        = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       u32              autoc             = curr_autoc;
-       u32              link_mode         = autoc & IXGBE_AUTOC_LMS_MASK;
-
-       /* Check to see if speed passed in is supported. */
-       ixgbe_get_link_capabilities_82598(hw, &link_capabilities, &autoneg);
-       speed &= link_capabilities;
-
-       if (speed == IXGBE_LINK_SPEED_UNKNOWN)
-               status = IXGBE_ERR_LINK_SETUP;
-
-       /* Set KX4/KX support according to speed requested */
-       else if (link_mode == IXGBE_AUTOC_LMS_KX4_AN ||
-                link_mode == IXGBE_AUTOC_LMS_KX4_AN_1G_AN) {
-               autoc &= ~IXGBE_AUTOC_KX4_KX_SUPP_MASK;
-               if (speed & IXGBE_LINK_SPEED_10GB_FULL)
-                       autoc |= IXGBE_AUTOC_KX4_SUPP;
-               if (speed & IXGBE_LINK_SPEED_1GB_FULL)
-                       autoc |= IXGBE_AUTOC_KX_SUPP;
-               if (autoc != curr_autoc)
-                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);
-       }
-
-       if (status == 0) {
-               /*
-                * Setup and restart the link based on the new values in
-                * ixgbe_hw This will write the AUTOC register based on the new
-                * stored values
-                */
-               status = ixgbe_start_mac_link_82598(hw,
-                                                   autoneg_wait_to_complete);
-       }
-
-       return status;
-}
-
-
-/**
- *  ixgbe_setup_copper_link_82598 - Set the PHY autoneg advertised field
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
- *  @autoneg_wait_to_complete: true if waiting is needed to complete
- *
- *  Sets the link speed in the AUTOC register in the MAC and restarts link.
- **/
-static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw,
-                                               ixgbe_link_speed speed,
-                                               bool autoneg,
-                                               bool autoneg_wait_to_complete)
-{
-       s32 status;
-
-       /* Setup the PHY according to input speed */
-       status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,
-                                             autoneg_wait_to_complete);
-       /* Set up MAC */
-       ixgbe_start_mac_link_82598(hw, autoneg_wait_to_complete);
-
-       return status;
-}
-
-/**
- *  ixgbe_reset_hw_82598 - Performs hardware reset
- *  @hw: pointer to hardware structure
- *
- *  Resets the hardware by resetting the transmit and receive units, masks and
- *  clears all interrupts, performing a PHY reset, and performing a link (MAC)
- *  reset.
- **/
-static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
-{
-       s32 status = 0;
-       s32 phy_status = 0;
-       u32 ctrl;
-       u32 gheccr;
-       u32 i;
-       u32 autoc;
-       u8  analog_val;
-
-       /* Call adapter stop to disable tx/rx and clear interrupts */
-       hw->mac.ops.stop_adapter(hw);
-
-       /*
-        * Power up the Atlas Tx lanes if they are currently powered down.
-        * Atlas Tx lanes are powered down for MAC loopback tests, but
-        * they are not automatically restored on reset.
-        */
-       hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, &analog_val);
-       if (analog_val & IXGBE_ATLAS_PDN_TX_REG_EN) {
-               /* Enable Tx Atlas so packets can be transmitted again */
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK,
-                                            &analog_val);
-               analog_val &= ~IXGBE_ATLAS_PDN_TX_REG_EN;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK,
-                                             analog_val);
-
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_10G,
-                                            &analog_val);
-               analog_val &= ~IXGBE_ATLAS_PDN_TX_10G_QL_ALL;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_10G,
-                                             analog_val);
-
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_1G,
-                                            &analog_val);
-               analog_val &= ~IXGBE_ATLAS_PDN_TX_1G_QL_ALL;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_1G,
-                                             analog_val);
-
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_AN,
-                                            &analog_val);
-               analog_val &= ~IXGBE_ATLAS_PDN_TX_AN_QL_ALL;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_AN,
-                                             analog_val);
-       }
-
-       /* Reset PHY */
-       if (hw->phy.reset_disable == false) {
-               /* PHY ops must be identified and initialized prior to reset */
-
-               /* Init PHY and function pointers, perform SFP setup */
-               phy_status = hw->phy.ops.init(hw);
-               if (phy_status == IXGBE_ERR_SFP_NOT_SUPPORTED)
-                       goto reset_hw_out;
-               else if (phy_status == IXGBE_ERR_SFP_NOT_PRESENT)
-                       goto no_phy_reset;
-
-               hw->phy.ops.reset(hw);
-       }
-
-no_phy_reset:
-       /*
-        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
-        * access and verify no pending requests before reset
-        */
-       ixgbe_disable_pcie_master(hw);
-
-mac_reset_top:
-       /*
-        * Issue global reset to the MAC.  This needs to be a SW reset.
-        * If link reset is used, it might reset the MAC when mng is using it
-        */
-       ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-       IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | IXGBE_CTRL_RST));
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Poll for reset bit to self-clear indicating reset is complete */
-       for (i = 0; i < 10; i++) {
-               udelay(1);
-               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-               if (!(ctrl & IXGBE_CTRL_RST))
-                       break;
-       }
-       if (ctrl & IXGBE_CTRL_RST) {
-               status = IXGBE_ERR_RESET_FAILED;
-               hw_dbg(hw, "Reset polling failed to complete.\n");
-       }
-
-       /*
-        * Double resets are required for recovery from certain error
-        * conditions.  Between resets, it is necessary to stall to allow time
-        * for any pending HW events to complete.  We use 1usec since that is
-        * what is needed for ixgbe_disable_pcie_master().  The second reset
-        * then clears out any effects of those events.
-        */
-       if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
-               hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
-               udelay(1);
-               goto mac_reset_top;
-       }
-
-       msleep(50);
-
-       gheccr = IXGBE_READ_REG(hw, IXGBE_GHECCR);
-       gheccr &= ~((1 << 21) | (1 << 18) | (1 << 9) | (1 << 6));
-       IXGBE_WRITE_REG(hw, IXGBE_GHECCR, gheccr);
-
-       /*
-        * Store the original AUTOC value if it has not been
-        * stored off yet.  Otherwise restore the stored original
-        * AUTOC value since the reset operation sets back to deaults.
-        */
-       autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       if (hw->mac.orig_link_settings_stored == false) {
-               hw->mac.orig_autoc = autoc;
-               hw->mac.orig_link_settings_stored = true;
-       } else if (autoc != hw->mac.orig_autoc) {
-               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc);
-       }
-
-       /* Store the permanent mac address */
-       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
-
-       /*
-        * Store MAC address from RAR0, clear receive address registers, and
-        * clear the multicast table
-        */
-       hw->mac.ops.init_rx_addrs(hw);
-
-reset_hw_out:
-       if (phy_status)
-               status = phy_status;
-
-       return status;
-}
-
-/**
- *  ixgbe_set_vmdq_82598 - Associate a VMDq set index with a rx address
- *  @hw: pointer to hardware struct
- *  @rar: receive address register index to associate with a VMDq index
- *  @vmdq: VMDq set index
- **/
-static s32 ixgbe_set_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
-{
-       u32 rar_high;
-       u32 rar_entries = hw->mac.num_rar_entries;
-
-       /* Make sure we are using a valid rar index range */
-       if (rar >= rar_entries) {
-               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
-               return IXGBE_ERR_INVALID_ARGUMENT;
-       }
-
-       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
-       rar_high &= ~IXGBE_RAH_VIND_MASK;
-       rar_high |= ((vmdq << IXGBE_RAH_VIND_SHIFT) & IXGBE_RAH_VIND_MASK);
-       IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);
-       return 0;
-}
-
-/**
- *  ixgbe_clear_vmdq_82598 - Disassociate a VMDq set index from an rx address
- *  @hw: pointer to hardware struct
- *  @rar: receive address register index to associate with a VMDq index
- *  @vmdq: VMDq clear index (not used in 82598, but elsewhere)
- **/
-static s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
-{
-       u32 rar_high;
-       u32 rar_entries = hw->mac.num_rar_entries;
-
-
-       /* Make sure we are using a valid rar index range */
-       if (rar >= rar_entries) {
-               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
-               return IXGBE_ERR_INVALID_ARGUMENT;
-       }
-
-       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
-       if (rar_high & IXGBE_RAH_VIND_MASK) {
-               rar_high &= ~IXGBE_RAH_VIND_MASK;
-               IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_set_vfta_82598 - Set VLAN filter table
- *  @hw: pointer to hardware structure
- *  @vlan: VLAN id to write to VLAN filter
- *  @vind: VMDq output index that maps queue to VLAN id in VFTA
- *  @vlan_on: boolean flag to turn on/off VLAN in VFTA
- *
- *  Turn on/off specified VLAN in the VLAN filter table.
- **/
-static s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind,
-                               bool vlan_on)
-{
-       u32 regindex;
-       u32 bitindex;
-       u32 bits;
-       u32 vftabyte;
-
-       if (vlan > 4095)
-               return IXGBE_ERR_PARAM;
-
-       /* Determine 32-bit word position in array */
-       regindex = (vlan >> 5) & 0x7F;   /* upper seven bits */
-
-       /* Determine the location of the (VMD) queue index */
-       vftabyte =  ((vlan >> 3) & 0x03); /* bits (4:3) indicating byte array */
-       bitindex = (vlan & 0x7) << 2;    /* lower 3 bits indicate nibble */
-
-       /* Set the nibble for VMD queue index */
-       bits = IXGBE_READ_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex));
-       bits &= (~(0x0F << bitindex));
-       bits |= (vind << bitindex);
-       IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex), bits);
-
-       /* Determine the location of the bit for this VLAN id */
-       bitindex = vlan & 0x1F;   /* lower five bits */
-
-       bits = IXGBE_READ_REG(hw, IXGBE_VFTA(regindex));
-       if (vlan_on)
-               /* Turn on this VLAN id */
-               bits |= (1 << bitindex);
-       else
-               /* Turn off this VLAN id */
-               bits &= ~(1 << bitindex);
-       IXGBE_WRITE_REG(hw, IXGBE_VFTA(regindex), bits);
-
-       return 0;
-}
-
-/**
- *  ixgbe_clear_vfta_82598 - Clear VLAN filter table
- *  @hw: pointer to hardware structure
- *
- *  Clears the VLAN filer table, and the VMDq index associated with the filter
- **/
-static s32 ixgbe_clear_vfta_82598(struct ixgbe_hw *hw)
-{
-       u32 offset;
-       u32 vlanbyte;
-
-       for (offset = 0; offset < hw->mac.vft_size; offset++)
-               IXGBE_WRITE_REG(hw, IXGBE_VFTA(offset), 0);
-
-       for (vlanbyte = 0; vlanbyte < 4; vlanbyte++)
-               for (offset = 0; offset < hw->mac.vft_size; offset++)
-                       IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vlanbyte, offset),
-                                       0);
-
-       return 0;
-}
-
-/**
- *  ixgbe_read_analog_reg8_82598 - Reads 8 bit Atlas analog register
- *  @hw: pointer to hardware structure
- *  @reg: analog register to read
- *  @val: read value
- *
- *  Performs read operation to Atlas analog register specified.
- **/
-static s32 ixgbe_read_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 *val)
-{
-       u32  atlas_ctl;
-
-       IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL,
-                       IXGBE_ATLASCTL_WRITE_CMD | (reg << 8));
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(10);
-       atlas_ctl = IXGBE_READ_REG(hw, IXGBE_ATLASCTL);
-       *val = (u8)atlas_ctl;
-
-       return 0;
-}
-
-/**
- *  ixgbe_write_analog_reg8_82598 - Writes 8 bit Atlas analog register
- *  @hw: pointer to hardware structure
- *  @reg: atlas register to write
- *  @val: value to write
- *
- *  Performs write operation to Atlas analog register specified.
- **/
-static s32 ixgbe_write_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 val)
-{
-       u32  atlas_ctl;
-
-       atlas_ctl = (reg << 8) | val;
-       IXGBE_WRITE_REG(hw, IXGBE_ATLASCTL, atlas_ctl);
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(10);
-
-       return 0;
-}
-
-/**
- *  ixgbe_read_i2c_eeprom_82598 - Reads 8 bit word over I2C interface.
- *  @hw: pointer to hardware structure
- *  @byte_offset: EEPROM byte offset to read
- *  @eeprom_data: value read
- *
- *  Performs 8 byte read operation to SFP module's EEPROM over I2C interface.
- **/
-static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset,
-                                      u8 *eeprom_data)
-{
-       s32 status = 0;
-       u16 sfp_addr = 0;
-       u16 sfp_data = 0;
-       u16 sfp_stat = 0;
-       u32 i;
-
-       if (hw->phy.type == ixgbe_phy_nl) {
-               /*
-                * phy SDA/SCL registers are at addresses 0xC30A to
-                * 0xC30D.  These registers are used to talk to the SFP+
-                * module's EEPROM through the SDA/SCL (I2C) interface.
-                */
-               sfp_addr = (IXGBE_I2C_EEPROM_DEV_ADDR << 8) + byte_offset;
-               sfp_addr = (sfp_addr | IXGBE_I2C_EEPROM_READ_MASK);
-               hw->phy.ops.write_reg(hw,
-                                     IXGBE_MDIO_PMA_PMD_SDA_SCL_ADDR,
-                                     MDIO_MMD_PMAPMD,
-                                     sfp_addr);
-
-               /* Poll status */
-               for (i = 0; i < 100; i++) {
-                       hw->phy.ops.read_reg(hw,
-                                            IXGBE_MDIO_PMA_PMD_SDA_SCL_STAT,
-                                            MDIO_MMD_PMAPMD,
-                                            &sfp_stat);
-                       sfp_stat = sfp_stat & IXGBE_I2C_EEPROM_STATUS_MASK;
-                       if (sfp_stat != IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS)
-                               break;
-                       usleep_range(10000, 20000);
-               }
-
-               if (sfp_stat != IXGBE_I2C_EEPROM_STATUS_PASS) {
-                       hw_dbg(hw, "EEPROM read did not pass.\n");
-                       status = IXGBE_ERR_SFP_NOT_PRESENT;
-                       goto out;
-               }
-
-               /* Read data */
-               hw->phy.ops.read_reg(hw, IXGBE_MDIO_PMA_PMD_SDA_SCL_DATA,
-                                    MDIO_MMD_PMAPMD, &sfp_data);
-
-               *eeprom_data = (u8)(sfp_data >> 8);
-       } else {
-               status = IXGBE_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_get_supported_physical_layer_82598 - Returns physical layer type
- *  @hw: pointer to hardware structure
- *
- *  Determines physical layer capabilities of the current configuration.
- **/
-static u32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw)
-{
-       u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
-       u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       u32 pma_pmd_10g = autoc & IXGBE_AUTOC_10G_PMA_PMD_MASK;
-       u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
-       u16 ext_ability = 0;
-
-       hw->phy.ops.identify(hw);
-
-       /* Copper PHY must be checked before AUTOC LMS to determine correct
-        * physical layer because 10GBase-T PHYs use LMS = KX4/KX */
-       switch (hw->phy.type) {
-       case ixgbe_phy_tn:
-       case ixgbe_phy_aq:
-       case ixgbe_phy_cu_unknown:
-               hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE,
-               MDIO_MMD_PMAPMD, &ext_ability);
-               if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
-               if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
-               if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
-               goto out;
-       default:
-               break;
-       }
-
-       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
-       case IXGBE_AUTOC_LMS_1G_AN:
-       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
-               if (pma_pmd_1g == IXGBE_AUTOC_1G_KX)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX;
-               else
-                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_BX;
-               break;
-       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
-               if (pma_pmd_10g == IXGBE_AUTOC_10G_CX4)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;
-               else if (pma_pmd_10g == IXGBE_AUTOC_10G_KX4)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
-               else /* XAUI */
-                       physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
-               break;
-       case IXGBE_AUTOC_LMS_KX4_AN:
-       case IXGBE_AUTOC_LMS_KX4_AN_1G_AN:
-               if (autoc & IXGBE_AUTOC_KX_SUPP)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_KX;
-               if (autoc & IXGBE_AUTOC_KX4_SUPP)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
-               break;
-       default:
-               break;
-       }
-
-       if (hw->phy.type == ixgbe_phy_nl) {
-               hw->phy.ops.identify_sfp(hw);
-
-               switch (hw->phy.sfp_type) {
-               case ixgbe_sfp_type_da_cu:
-                       physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
-                       break;
-               case ixgbe_sfp_type_sr:
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
-                       break;
-               case ixgbe_sfp_type_lr:
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
-                       break;
-               default:
-                       physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
-                       break;
-               }
-       }
-
-       switch (hw->device_id) {
-       case IXGBE_DEV_ID_82598_DA_DUAL_PORT:
-               physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
-               break;
-       case IXGBE_DEV_ID_82598AF_DUAL_PORT:
-       case IXGBE_DEV_ID_82598AF_SINGLE_PORT:
-       case IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM:
-               physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
-               break;
-       case IXGBE_DEV_ID_82598EB_XF_LR:
-               physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
-               break;
-       default:
-               break;
-       }
-
-out:
-       return physical_layer;
-}
-
-/**
- *  ixgbe_set_lan_id_multi_port_pcie_82598 - Set LAN id for PCIe multiple
- *  port devices.
- *  @hw: pointer to the HW structure
- *
- *  Calls common function and corrects issue with some single port devices
- *  that enable LAN1 but not LAN0.
- **/
-static void ixgbe_set_lan_id_multi_port_pcie_82598(struct ixgbe_hw *hw)
-{
-       struct ixgbe_bus_info *bus = &hw->bus;
-       u16 pci_gen = 0;
-       u16 pci_ctrl2 = 0;
-
-       ixgbe_set_lan_id_multi_port_pcie(hw);
-
-       /* check if LAN0 is disabled */
-       hw->eeprom.ops.read(hw, IXGBE_PCIE_GENERAL_PTR, &pci_gen);
-       if ((pci_gen != 0) && (pci_gen != 0xFFFF)) {
-
-               hw->eeprom.ops.read(hw, pci_gen + IXGBE_PCIE_CTRL2, &pci_ctrl2);
-
-               /* if LAN0 is completely disabled force function to 0 */
-               if ((pci_ctrl2 & IXGBE_PCIE_CTRL2_LAN_DISABLE) &&
-                   !(pci_ctrl2 & IXGBE_PCIE_CTRL2_DISABLE_SELECT) &&
-                   !(pci_ctrl2 & IXGBE_PCIE_CTRL2_DUMMY_ENABLE)) {
-
-                       bus->func = 0;
-               }
-       }
-}
-
-/**
- * ixgbe_set_rxpba_82598 - Configure packet buffers
- * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
- *
- * Configure packet buffers.
- */
-static void ixgbe_set_rxpba_82598(struct ixgbe_hw *hw, int num_pb, u32 headroom,
-                                 int strategy)
-{
-       u32 rxpktsize = IXGBE_RXPBSIZE_64KB;
-       u8  i = 0;
-
-       if (!num_pb)
-               return;
-
-       /* Setup Rx packet buffer sizes */
-       switch (strategy) {
-       case PBA_STRATEGY_WEIGHTED:
-               /* Setup the first four at 80KB */
-               rxpktsize = IXGBE_RXPBSIZE_80KB;
-               for (; i < 4; i++)
-                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
-               /* Setup the last four at 48KB...don't re-init i */
-               rxpktsize = IXGBE_RXPBSIZE_48KB;
-               /* Fall Through */
-       case PBA_STRATEGY_EQUAL:
-       default:
-               /* Divide the remaining Rx packet buffer evenly among the TCs */
-               for (; i < IXGBE_MAX_PACKET_BUFFERS; i++)
-                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
-               break;
-       }
-
-       /* Setup Tx packet buffer sizes */
-       for (i = 0; i < IXGBE_MAX_PACKET_BUFFERS; i++)
-               IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), IXGBE_TXPBSIZE_40KB);
-
-       return;
-}
-
-static struct ixgbe_mac_operations mac_ops_82598 = {
-       .init_hw                = &ixgbe_init_hw_generic,
-       .reset_hw               = &ixgbe_reset_hw_82598,
-       .start_hw               = &ixgbe_start_hw_82598,
-       .clear_hw_cntrs         = &ixgbe_clear_hw_cntrs_generic,
-       .get_media_type         = &ixgbe_get_media_type_82598,
-       .get_supported_physical_layer = &ixgbe_get_supported_physical_layer_82598,
-       .enable_rx_dma          = &ixgbe_enable_rx_dma_generic,
-       .get_mac_addr           = &ixgbe_get_mac_addr_generic,
-       .stop_adapter           = &ixgbe_stop_adapter_generic,
-       .get_bus_info           = &ixgbe_get_bus_info_generic,
-       .set_lan_id             = &ixgbe_set_lan_id_multi_port_pcie_82598,
-       .read_analog_reg8       = &ixgbe_read_analog_reg8_82598,
-       .write_analog_reg8      = &ixgbe_write_analog_reg8_82598,
-       .setup_link             = &ixgbe_setup_mac_link_82598,
-       .set_rxpba              = &ixgbe_set_rxpba_82598,
-       .check_link             = &ixgbe_check_mac_link_82598,
-       .get_link_capabilities  = &ixgbe_get_link_capabilities_82598,
-       .led_on                 = &ixgbe_led_on_generic,
-       .led_off                = &ixgbe_led_off_generic,
-       .blink_led_start        = &ixgbe_blink_led_start_generic,
-       .blink_led_stop         = &ixgbe_blink_led_stop_generic,
-       .set_rar                = &ixgbe_set_rar_generic,
-       .clear_rar              = &ixgbe_clear_rar_generic,
-       .set_vmdq               = &ixgbe_set_vmdq_82598,
-       .clear_vmdq             = &ixgbe_clear_vmdq_82598,
-       .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
-       .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
-       .enable_mc              = &ixgbe_enable_mc_generic,
-       .disable_mc             = &ixgbe_disable_mc_generic,
-       .clear_vfta             = &ixgbe_clear_vfta_82598,
-       .set_vfta               = &ixgbe_set_vfta_82598,
-       .fc_enable              = &ixgbe_fc_enable_82598,
-       .set_fw_drv_ver         = NULL,
-       .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
-       .release_swfw_sync      = &ixgbe_release_swfw_sync,
-};
-
-static struct ixgbe_eeprom_operations eeprom_ops_82598 = {
-       .init_params            = &ixgbe_init_eeprom_params_generic,
-       .read                   = &ixgbe_read_eerd_generic,
-       .read_buffer            = &ixgbe_read_eerd_buffer_generic,
-       .calc_checksum          = &ixgbe_calc_eeprom_checksum_generic,
-       .validate_checksum      = &ixgbe_validate_eeprom_checksum_generic,
-       .update_checksum        = &ixgbe_update_eeprom_checksum_generic,
-};
-
-static struct ixgbe_phy_operations phy_ops_82598 = {
-       .identify               = &ixgbe_identify_phy_generic,
-       .identify_sfp           = &ixgbe_identify_sfp_module_generic,
-       .init                   = &ixgbe_init_phy_ops_82598,
-       .reset                  = &ixgbe_reset_phy_generic,
-       .read_reg               = &ixgbe_read_phy_reg_generic,
-       .write_reg              = &ixgbe_write_phy_reg_generic,
-       .setup_link             = &ixgbe_setup_phy_link_generic,
-       .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
-       .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_82598,
-       .check_overtemp   = &ixgbe_tn_check_overtemp,
-};
-
-struct ixgbe_info ixgbe_82598_info = {
-       .mac                    = ixgbe_mac_82598EB,
-       .get_invariants         = &ixgbe_get_invariants_82598,
-       .mac_ops                = &mac_ops_82598,
-       .eeprom_ops             = &eeprom_ops_82598,
-       .phy_ops                = &phy_ops_82598,
-};
-
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
deleted file mode 100644 (file)
index 34f30ec..0000000
+++ /dev/null
@@ -1,2263 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-
-#include "ixgbe.h"
-#include "ixgbe_phy.h"
-#include "ixgbe_mbx.h"
-
-#define IXGBE_82599_MAX_TX_QUEUES 128
-#define IXGBE_82599_MAX_RX_QUEUES 128
-#define IXGBE_82599_RAR_ENTRIES   128
-#define IXGBE_82599_MC_TBL_SIZE   128
-#define IXGBE_82599_VFT_TBL_SIZE  128
-#define IXGBE_82599_RX_PB_SIZE   512
-
-static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
-static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
-static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
-static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
-                                                ixgbe_link_speed speed,
-                                                bool autoneg,
-                                                bool autoneg_wait_to_complete);
-static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
-                                           ixgbe_link_speed speed,
-                                           bool autoneg,
-                                           bool autoneg_wait_to_complete);
-static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
-                                     bool autoneg_wait_to_complete);
-static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
-                               ixgbe_link_speed speed,
-                               bool autoneg,
-                               bool autoneg_wait_to_complete);
-static s32 ixgbe_setup_copper_link_82599(struct ixgbe_hw *hw,
-                                         ixgbe_link_speed speed,
-                                         bool autoneg,
-                                         bool autoneg_wait_to_complete);
-static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw);
-static bool ixgbe_verify_lesm_fw_enabled_82599(struct ixgbe_hw *hw);
-
-static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mac_info *mac = &hw->mac;
-
-       /* enable the laser control functions for SFP+ fiber */
-       if (mac->ops.get_media_type(hw) == ixgbe_media_type_fiber) {
-               mac->ops.disable_tx_laser =
-                                      &ixgbe_disable_tx_laser_multispeed_fiber;
-               mac->ops.enable_tx_laser =
-                                       &ixgbe_enable_tx_laser_multispeed_fiber;
-               mac->ops.flap_tx_laser = &ixgbe_flap_tx_laser_multispeed_fiber;
-       } else {
-               mac->ops.disable_tx_laser = NULL;
-               mac->ops.enable_tx_laser = NULL;
-               mac->ops.flap_tx_laser = NULL;
-       }
-
-       if (hw->phy.multispeed_fiber) {
-               /* Set up dual speed SFP+ support */
-               mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber;
-       } else {
-               if ((mac->ops.get_media_type(hw) ==
-                    ixgbe_media_type_backplane) &&
-                   (hw->phy.smart_speed == ixgbe_smart_speed_auto ||
-                    hw->phy.smart_speed == ixgbe_smart_speed_on) &&
-                    !ixgbe_verify_lesm_fw_enabled_82599(hw))
-                       mac->ops.setup_link = &ixgbe_setup_mac_link_smartspeed;
-               else
-                       mac->ops.setup_link = &ixgbe_setup_mac_link_82599;
-       }
-}
-
-static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
-{
-       s32 ret_val = 0;
-       u32 reg_anlp1 = 0;
-       u32 i = 0;
-       u16 list_offset, data_offset, data_value;
-
-       if (hw->phy.sfp_type != ixgbe_sfp_type_unknown) {
-               ixgbe_init_mac_link_ops_82599(hw);
-
-               hw->phy.ops.reset = NULL;
-
-               ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,
-                                                             &data_offset);
-               if (ret_val != 0)
-                       goto setup_sfp_out;
-
-               /* PHY config will finish before releasing the semaphore */
-               ret_val = hw->mac.ops.acquire_swfw_sync(hw,
-                                                       IXGBE_GSSR_MAC_CSR_SM);
-               if (ret_val != 0) {
-                       ret_val = IXGBE_ERR_SWFW_SYNC;
-                       goto setup_sfp_out;
-               }
-
-               hw->eeprom.ops.read(hw, ++data_offset, &data_value);
-               while (data_value != 0xffff) {
-                       IXGBE_WRITE_REG(hw, IXGBE_CORECTL, data_value);
-                       IXGBE_WRITE_FLUSH(hw);
-                       hw->eeprom.ops.read(hw, ++data_offset, &data_value);
-               }
-
-               /* Release the semaphore */
-               hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);
-               /*
-                * Delay obtaining semaphore again to allow FW access,
-                * semaphore_delay is in ms usleep_range needs us.
-                */
-               usleep_range(hw->eeprom.semaphore_delay * 1000,
-                            hw->eeprom.semaphore_delay * 2000);
-
-               /* Now restart DSP by setting Restart_AN and clearing LMS */
-               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, ((IXGBE_READ_REG(hw,
-                               IXGBE_AUTOC) & ~IXGBE_AUTOC_LMS_MASK) |
-                               IXGBE_AUTOC_AN_RESTART));
-
-               /* Wait for AN to leave state 0 */
-               for (i = 0; i < 10; i++) {
-                       usleep_range(4000, 8000);
-                       reg_anlp1 = IXGBE_READ_REG(hw, IXGBE_ANLP1);
-                       if (reg_anlp1 & IXGBE_ANLP1_AN_STATE_MASK)
-                               break;
-               }
-               if (!(reg_anlp1 & IXGBE_ANLP1_AN_STATE_MASK)) {
-                       hw_dbg(hw, "sfp module setup not complete\n");
-                       ret_val = IXGBE_ERR_SFP_SETUP_NOT_COMPLETE;
-                       goto setup_sfp_out;
-               }
-
-               /* Restart DSP by setting Restart_AN and return to SFI mode */
-               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (IXGBE_READ_REG(hw,
-                               IXGBE_AUTOC) | IXGBE_AUTOC_LMS_10G_SERIAL |
-                               IXGBE_AUTOC_AN_RESTART));
-       }
-
-setup_sfp_out:
-       return ret_val;
-}
-
-static s32 ixgbe_get_invariants_82599(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mac_info *mac = &hw->mac;
-
-       ixgbe_init_mac_link_ops_82599(hw);
-
-       mac->mcft_size = IXGBE_82599_MC_TBL_SIZE;
-       mac->vft_size = IXGBE_82599_VFT_TBL_SIZE;
-       mac->num_rar_entries = IXGBE_82599_RAR_ENTRIES;
-       mac->max_rx_queues = IXGBE_82599_MAX_RX_QUEUES;
-       mac->max_tx_queues = IXGBE_82599_MAX_TX_QUEUES;
-       mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_init_phy_ops_82599 - PHY/SFP specific init
- *  @hw: pointer to hardware structure
- *
- *  Initialize any function pointers that were not able to be
- *  set during get_invariants because the PHY/SFP type was
- *  not known.  Perform the SFP init if necessary.
- *
- **/
-static s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mac_info *mac = &hw->mac;
-       struct ixgbe_phy_info *phy = &hw->phy;
-       s32 ret_val = 0;
-
-       /* Identify the PHY or SFP module */
-       ret_val = phy->ops.identify(hw);
-
-       /* Setup function pointers based on detected SFP module and speeds */
-       ixgbe_init_mac_link_ops_82599(hw);
-
-       /* If copper media, overwrite with copper function pointers */
-       if (mac->ops.get_media_type(hw) == ixgbe_media_type_copper) {
-               mac->ops.setup_link = &ixgbe_setup_copper_link_82599;
-               mac->ops.get_link_capabilities =
-                       &ixgbe_get_copper_link_capabilities_generic;
-       }
-
-       /* Set necessary function pointers based on phy type */
-       switch (hw->phy.type) {
-       case ixgbe_phy_tn:
-               phy->ops.check_link = &ixgbe_check_phy_link_tnx;
-               phy->ops.setup_link = &ixgbe_setup_phy_link_tnx;
-               phy->ops.get_firmware_version =
-                            &ixgbe_get_phy_firmware_version_tnx;
-               break;
-       case ixgbe_phy_aq:
-               phy->ops.get_firmware_version =
-                       &ixgbe_get_phy_firmware_version_generic;
-               break;
-       default:
-               break;
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_get_link_capabilities_82599 - Determines link capabilities
- *  @hw: pointer to hardware structure
- *  @speed: pointer to link speed
- *  @negotiation: true when autoneg or autotry is enabled
- *
- *  Determines the link capabilities by reading the AUTOC register.
- **/
-static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
-                                             ixgbe_link_speed *speed,
-                                             bool *negotiation)
-{
-       s32 status = 0;
-       u32 autoc = 0;
-
-       /* Determine 1G link capabilities off of SFP+ type */
-       if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
-           hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) {
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-               *negotiation = true;
-               goto out;
-       }
-
-       /*
-        * Determine link capabilities based on the stored value of AUTOC,
-        * which represents EEPROM defaults.  If AUTOC value has not been
-        * stored, use the current register value.
-        */
-       if (hw->mac.orig_link_settings_stored)
-               autoc = hw->mac.orig_autoc;
-       else
-               autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-
-       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
-       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-               *negotiation = false;
-               break;
-
-       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
-               *speed = IXGBE_LINK_SPEED_10GB_FULL;
-               *negotiation = false;
-               break;
-
-       case IXGBE_AUTOC_LMS_1G_AN:
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-               *negotiation = true;
-               break;
-
-       case IXGBE_AUTOC_LMS_10G_SERIAL:
-               *speed = IXGBE_LINK_SPEED_10GB_FULL;
-               *negotiation = false;
-               break;
-
-       case IXGBE_AUTOC_LMS_KX4_KX_KR:
-       case IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN:
-               *speed = IXGBE_LINK_SPEED_UNKNOWN;
-               if (autoc & IXGBE_AUTOC_KR_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (autoc & IXGBE_AUTOC_KX4_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (autoc & IXGBE_AUTOC_KX_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
-               *negotiation = true;
-               break;
-
-       case IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII:
-               *speed = IXGBE_LINK_SPEED_100_FULL;
-               if (autoc & IXGBE_AUTOC_KR_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (autoc & IXGBE_AUTOC_KX4_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (autoc & IXGBE_AUTOC_KX_SUPP)
-                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
-               *negotiation = true;
-               break;
-
-       case IXGBE_AUTOC_LMS_SGMII_1G_100M:
-               *speed = IXGBE_LINK_SPEED_1GB_FULL | IXGBE_LINK_SPEED_100_FULL;
-               *negotiation = false;
-               break;
-
-       default:
-               status = IXGBE_ERR_LINK_SETUP;
-               goto out;
-               break;
-       }
-
-       if (hw->phy.multispeed_fiber) {
-               *speed |= IXGBE_LINK_SPEED_10GB_FULL |
-                         IXGBE_LINK_SPEED_1GB_FULL;
-               *negotiation = true;
-       }
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_get_media_type_82599 - Get media type
- *  @hw: pointer to hardware structure
- *
- *  Returns the media type (fiber, copper, backplane)
- **/
-static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
-{
-       enum ixgbe_media_type media_type;
-
-       /* Detect if there is a copper PHY attached. */
-       switch (hw->phy.type) {
-       case ixgbe_phy_cu_unknown:
-       case ixgbe_phy_tn:
-       case ixgbe_phy_aq:
-               media_type = ixgbe_media_type_copper;
-               goto out;
-       default:
-               break;
-       }
-
-       switch (hw->device_id) {
-       case IXGBE_DEV_ID_82599_KX4:
-       case IXGBE_DEV_ID_82599_KX4_MEZZ:
-       case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
-       case IXGBE_DEV_ID_82599_KR:
-       case IXGBE_DEV_ID_82599_BACKPLANE_FCOE:
-       case IXGBE_DEV_ID_82599_XAUI_LOM:
-               /* Default device ID is mezzanine card KX/KX4 */
-               media_type = ixgbe_media_type_backplane;
-               break;
-       case IXGBE_DEV_ID_82599_SFP:
-       case IXGBE_DEV_ID_82599_SFP_FCOE:
-       case IXGBE_DEV_ID_82599_SFP_EM:
-       case IXGBE_DEV_ID_82599_SFP_SF2:
-               media_type = ixgbe_media_type_fiber;
-               break;
-       case IXGBE_DEV_ID_82599_CX4:
-               media_type = ixgbe_media_type_cx4;
-               break;
-       case IXGBE_DEV_ID_82599_T3_LOM:
-               media_type = ixgbe_media_type_copper;
-               break;
-       case IXGBE_DEV_ID_82599_LS:
-               media_type = ixgbe_media_type_fiber_lco;
-               break;
-       default:
-               media_type = ixgbe_media_type_unknown;
-               break;
-       }
-out:
-       return media_type;
-}
-
-/**
- *  ixgbe_start_mac_link_82599 - Setup MAC link settings
- *  @hw: pointer to hardware structure
- *  @autoneg_wait_to_complete: true when waiting for completion is needed
- *
- *  Configures link settings based on values in the ixgbe_hw struct.
- *  Restarts the link.  Performs autonegotiation if needed.
- **/
-static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
-                               bool autoneg_wait_to_complete)
-{
-       u32 autoc_reg;
-       u32 links_reg;
-       u32 i;
-       s32 status = 0;
-
-       /* Restart link */
-       autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       autoc_reg |= IXGBE_AUTOC_AN_RESTART;
-       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
-
-       /* Only poll for autoneg to complete if specified to do so */
-       if (autoneg_wait_to_complete) {
-               if ((autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
-                    IXGBE_AUTOC_LMS_KX4_KX_KR ||
-                   (autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
-                    IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
-                   (autoc_reg & IXGBE_AUTOC_LMS_MASK) ==
-                    IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
-                       links_reg = 0; /* Just in case Autoneg time = 0 */
-                       for (i = 0; i < IXGBE_AUTO_NEG_TIME; i++) {
-                               links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
-                               if (links_reg & IXGBE_LINKS_KX_AN_COMP)
-                                       break;
-                               msleep(100);
-                       }
-                       if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {
-                               status = IXGBE_ERR_AUTONEG_NOT_COMPLETE;
-                               hw_dbg(hw, "Autoneg did not complete.\n");
-                       }
-               }
-       }
-
-       /* Add delay to filter out noises during initial link setup */
-       msleep(50);
-
-       return status;
-}
-
-/**
- *  ixgbe_disable_tx_laser_multispeed_fiber - Disable Tx laser
- *  @hw: pointer to hardware structure
- *
- *  The base drivers may require better control over SFP+ module
- *  PHY states.  This includes selectively shutting down the Tx
- *  laser on the PHY, effectively halting physical link.
- **/
-static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
-{
-       u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
-
-       /* Disable tx laser; allow 100us to go dark per spec */
-       esdp_reg |= IXGBE_ESDP_SDP3;
-       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(100);
-}
-
-/**
- *  ixgbe_enable_tx_laser_multispeed_fiber - Enable Tx laser
- *  @hw: pointer to hardware structure
- *
- *  The base drivers may require better control over SFP+ module
- *  PHY states.  This includes selectively turning on the Tx
- *  laser on the PHY, effectively starting physical link.
- **/
-static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
-{
-       u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
-
-       /* Enable tx laser; allow 100ms to light up */
-       esdp_reg &= ~IXGBE_ESDP_SDP3;
-       IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
-       IXGBE_WRITE_FLUSH(hw);
-       msleep(100);
-}
-
-/**
- *  ixgbe_flap_tx_laser_multispeed_fiber - Flap Tx laser
- *  @hw: pointer to hardware structure
- *
- *  When the driver changes the link speeds that it can support,
- *  it sets autotry_restart to true to indicate that we need to
- *  initiate a new autotry session with the link partner.  To do
- *  so, we set the speed then disable and re-enable the tx laser, to
- *  alert the link partner that it also needs to restart autotry on its
- *  end.  This is consistent with true clause 37 autoneg, which also
- *  involves a loss of signal.
- **/
-static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
-{
-       if (hw->mac.autotry_restart) {
-               ixgbe_disable_tx_laser_multispeed_fiber(hw);
-               ixgbe_enable_tx_laser_multispeed_fiber(hw);
-               hw->mac.autotry_restart = false;
-       }
-}
-
-/**
- *  ixgbe_setup_mac_link_multispeed_fiber - Set MAC link speed
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
- *  @autoneg_wait_to_complete: true when waiting for completion is needed
- *
- *  Set the link speed in the AUTOC register and restarts link.
- **/
-static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
-                                          ixgbe_link_speed speed,
-                                          bool autoneg,
-                                          bool autoneg_wait_to_complete)
-{
-       s32 status = 0;
-       ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
-       ixgbe_link_speed highest_link_speed = IXGBE_LINK_SPEED_UNKNOWN;
-       u32 speedcnt = 0;
-       u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
-       u32 i = 0;
-       bool link_up = false;
-       bool negotiation;
-
-       /* Mask off requested but non-supported speeds */
-       status = hw->mac.ops.get_link_capabilities(hw, &link_speed,
-                                                  &negotiation);
-       if (status != 0)
-               return status;
-
-       speed &= link_speed;
-
-       /*
-        * Try each speed one by one, highest priority first.  We do this in
-        * software because 10gb fiber doesn't support speed autonegotiation.
-        */
-       if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
-               speedcnt++;
-               highest_link_speed = IXGBE_LINK_SPEED_10GB_FULL;
-
-               /* If we already have link at this speed, just jump out */
-               status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
-                                               false);
-               if (status != 0)
-                       return status;
-
-               if ((link_speed == IXGBE_LINK_SPEED_10GB_FULL) && link_up)
-                       goto out;
-
-               /* Set the module link speed */
-               esdp_reg |= (IXGBE_ESDP_SDP5_DIR | IXGBE_ESDP_SDP5);
-               IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
-               IXGBE_WRITE_FLUSH(hw);
-
-               /* Allow module to change analog characteristics (1G->10G) */
-               msleep(40);
-
-               status = ixgbe_setup_mac_link_82599(hw,
-                                                   IXGBE_LINK_SPEED_10GB_FULL,
-                                                   autoneg,
-                                                   autoneg_wait_to_complete);
-               if (status != 0)
-                       return status;
-
-               /* Flap the tx laser if it has not already been done */
-               hw->mac.ops.flap_tx_laser(hw);
-
-               /*
-                * Wait for the controller to acquire link.  Per IEEE 802.3ap,
-                * Section 73.10.2, we may have to wait up to 500ms if KR is
-                * attempted.  82599 uses the same timing for 10g SFI.
-                */
-               for (i = 0; i < 5; i++) {
-                       /* Wait for the link partner to also set speed */
-                       msleep(100);
-
-                       /* If we have link, just jump out */
-                       status = hw->mac.ops.check_link(hw, &link_speed,
-                                                       &link_up, false);
-                       if (status != 0)
-                               return status;
-
-                       if (link_up)
-                               goto out;
-               }
-       }
-
-       if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
-               speedcnt++;
-               if (highest_link_speed == IXGBE_LINK_SPEED_UNKNOWN)
-                       highest_link_speed = IXGBE_LINK_SPEED_1GB_FULL;
-
-               /* If we already have link at this speed, just jump out */
-               status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
-                                               false);
-               if (status != 0)
-                       return status;
-
-               if ((link_speed == IXGBE_LINK_SPEED_1GB_FULL) && link_up)
-                       goto out;
-
-               /* Set the module link speed */
-               esdp_reg &= ~IXGBE_ESDP_SDP5;
-               esdp_reg |= IXGBE_ESDP_SDP5_DIR;
-               IXGBE_WRITE_REG(hw, IXGBE_ESDP, esdp_reg);
-               IXGBE_WRITE_FLUSH(hw);
-
-               /* Allow module to change analog characteristics (10G->1G) */
-               msleep(40);
-
-               status = ixgbe_setup_mac_link_82599(hw,
-                                                   IXGBE_LINK_SPEED_1GB_FULL,
-                                                   autoneg,
-                                                   autoneg_wait_to_complete);
-               if (status != 0)
-                       return status;
-
-               /* Flap the tx laser if it has not already been done */
-               hw->mac.ops.flap_tx_laser(hw);
-
-               /* Wait for the link partner to also set speed */
-               msleep(100);
-
-               /* If we have link, just jump out */
-               status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
-                                               false);
-               if (status != 0)
-                       return status;
-
-               if (link_up)
-                       goto out;
-       }
-
-       /*
-        * We didn't get link.  Configure back to the highest speed we tried,
-        * (if there was more than one).  We call ourselves back with just the
-        * single highest speed that the user requested.
-        */
-       if (speedcnt > 1)
-               status = ixgbe_setup_mac_link_multispeed_fiber(hw,
-                                                              highest_link_speed,
-                                                              autoneg,
-                                                              autoneg_wait_to_complete);
-
-out:
-       /* Set autoneg_advertised value based on input link speed */
-       hw->phy.autoneg_advertised = 0;
-
-       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;
-
-       if (speed & IXGBE_LINK_SPEED_1GB_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
-
-       return status;
-}
-
-/**
- *  ixgbe_setup_mac_link_smartspeed - Set MAC link speed using SmartSpeed
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
- *  @autoneg_wait_to_complete: true when waiting for completion is needed
- *
- *  Implements the Intel SmartSpeed algorithm.
- **/
-static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
-                                    ixgbe_link_speed speed, bool autoneg,
-                                    bool autoneg_wait_to_complete)
-{
-       s32 status = 0;
-       ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
-       s32 i, j;
-       bool link_up = false;
-       u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-
-        /* Set autoneg_advertised value based on input link speed */
-       hw->phy.autoneg_advertised = 0;
-
-       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;
-
-       if (speed & IXGBE_LINK_SPEED_1GB_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
-
-       if (speed & IXGBE_LINK_SPEED_100_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_100_FULL;
-
-       /*
-        * Implement Intel SmartSpeed algorithm.  SmartSpeed will reduce the
-        * autoneg advertisement if link is unable to be established at the
-        * highest negotiated rate.  This can sometimes happen due to integrity
-        * issues with the physical media connection.
-        */
-
-       /* First, try to get link with full advertisement */
-       hw->phy.smart_speed_active = false;
-       for (j = 0; j < IXGBE_SMARTSPEED_MAX_RETRIES; j++) {
-               status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
-                                                   autoneg_wait_to_complete);
-               if (status != 0)
-                       goto out;
-
-               /*
-                * Wait for the controller to acquire link.  Per IEEE 802.3ap,
-                * Section 73.10.2, we may have to wait up to 500ms if KR is
-                * attempted, or 200ms if KX/KX4/BX/BX4 is attempted, per
-                * Table 9 in the AN MAS.
-                */
-               for (i = 0; i < 5; i++) {
-                       mdelay(100);
-
-                       /* If we have link, just jump out */
-                       status = hw->mac.ops.check_link(hw, &link_speed,
-                                                       &link_up, false);
-                       if (status != 0)
-                               goto out;
-
-                       if (link_up)
-                               goto out;
-               }
-       }
-
-       /*
-        * We didn't get link.  If we advertised KR plus one of KX4/KX
-        * (or BX4/BX), then disable KR and try again.
-        */
-       if (((autoc_reg & IXGBE_AUTOC_KR_SUPP) == 0) ||
-           ((autoc_reg & IXGBE_AUTOC_KX4_KX_SUPP_MASK) == 0))
-               goto out;
-
-       /* Turn SmartSpeed on to disable KR support */
-       hw->phy.smart_speed_active = true;
-       status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
-                                           autoneg_wait_to_complete);
-       if (status != 0)
-               goto out;
-
-       /*
-        * Wait for the controller to acquire link.  600ms will allow for
-        * the AN link_fail_inhibit_timer as well for multiple cycles of
-        * parallel detect, both 10g and 1g. This allows for the maximum
-        * connect attempts as defined in the AN MAS table 73-7.
-        */
-       for (i = 0; i < 6; i++) {
-               mdelay(100);
-
-               /* If we have link, just jump out */
-               status = hw->mac.ops.check_link(hw, &link_speed,
-                                               &link_up, false);
-               if (status != 0)
-                       goto out;
-
-               if (link_up)
-                       goto out;
-       }
-
-       /* We didn't get link.  Turn SmartSpeed back off. */
-       hw->phy.smart_speed_active = false;
-       status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
-                                           autoneg_wait_to_complete);
-
-out:
-       if (link_up && (link_speed == IXGBE_LINK_SPEED_1GB_FULL))
-               hw_dbg(hw, "Smartspeed has downgraded the link speed from "
-                      "the maximum advertised\n");
-       return status;
-}
-
-/**
- *  ixgbe_setup_mac_link_82599 - Set MAC link speed
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
- *  @autoneg_wait_to_complete: true when waiting for completion is needed
- *
- *  Set the link speed in the AUTOC register and restarts link.
- **/
-static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
-                               ixgbe_link_speed speed, bool autoneg,
-                               bool autoneg_wait_to_complete)
-{
-       s32 status = 0;
-       u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       u32 autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
-       u32 start_autoc = autoc;
-       u32 orig_autoc = 0;
-       u32 link_mode = autoc & IXGBE_AUTOC_LMS_MASK;
-       u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
-       u32 pma_pmd_10g_serial = autoc2 & IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK;
-       u32 links_reg;
-       u32 i;
-       ixgbe_link_speed link_capabilities = IXGBE_LINK_SPEED_UNKNOWN;
-
-       /* Check to see if speed passed in is supported. */
-       hw->mac.ops.get_link_capabilities(hw, &link_capabilities, &autoneg);
-       if (status != 0)
-               goto out;
-
-       speed &= link_capabilities;
-
-       if (speed == IXGBE_LINK_SPEED_UNKNOWN) {
-               status = IXGBE_ERR_LINK_SETUP;
-               goto out;
-       }
-
-       /* Use stored value (EEPROM defaults) of AUTOC to find KR/KX4 support*/
-       if (hw->mac.orig_link_settings_stored)
-               orig_autoc = hw->mac.orig_autoc;
-       else
-               orig_autoc = autoc;
-
-       if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
-           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
-           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
-               /* Set KX4/KX/KR support according to speed requested */
-               autoc &= ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP);
-               if (speed & IXGBE_LINK_SPEED_10GB_FULL)
-                       if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
-                               autoc |= IXGBE_AUTOC_KX4_SUPP;
-                       if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
-                           (hw->phy.smart_speed_active == false))
-                               autoc |= IXGBE_AUTOC_KR_SUPP;
-               if (speed & IXGBE_LINK_SPEED_1GB_FULL)
-                       autoc |= IXGBE_AUTOC_KX_SUPP;
-       } else if ((pma_pmd_1g == IXGBE_AUTOC_1G_SFI) &&
-                  (link_mode == IXGBE_AUTOC_LMS_1G_LINK_NO_AN ||
-                   link_mode == IXGBE_AUTOC_LMS_1G_AN)) {
-               /* Switch from 1G SFI to 10G SFI if requested */
-               if ((speed == IXGBE_LINK_SPEED_10GB_FULL) &&
-                   (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)) {
-                       autoc &= ~IXGBE_AUTOC_LMS_MASK;
-                       autoc |= IXGBE_AUTOC_LMS_10G_SERIAL;
-               }
-       } else if ((pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI) &&
-                  (link_mode == IXGBE_AUTOC_LMS_10G_SERIAL)) {
-               /* Switch from 10G SFI to 1G SFI if requested */
-               if ((speed == IXGBE_LINK_SPEED_1GB_FULL) &&
-                   (pma_pmd_1g == IXGBE_AUTOC_1G_SFI)) {
-                       autoc &= ~IXGBE_AUTOC_LMS_MASK;
-                       if (autoneg)
-                               autoc |= IXGBE_AUTOC_LMS_1G_AN;
-                       else
-                               autoc |= IXGBE_AUTOC_LMS_1G_LINK_NO_AN;
-               }
-       }
-
-       if (autoc != start_autoc) {
-               /* Restart link */
-               autoc |= IXGBE_AUTOC_AN_RESTART;
-               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);
-
-               /* Only poll for autoneg to complete if specified to do so */
-               if (autoneg_wait_to_complete) {
-                       if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
-                           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
-                           link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
-                               links_reg = 0; /*Just in case Autoneg time=0*/
-                               for (i = 0; i < IXGBE_AUTO_NEG_TIME; i++) {
-                                       links_reg =
-                                              IXGBE_READ_REG(hw, IXGBE_LINKS);
-                                       if (links_reg & IXGBE_LINKS_KX_AN_COMP)
-                                               break;
-                                       msleep(100);
-                               }
-                               if (!(links_reg & IXGBE_LINKS_KX_AN_COMP)) {
-                                       status =
-                                               IXGBE_ERR_AUTONEG_NOT_COMPLETE;
-                                       hw_dbg(hw, "Autoneg did not "
-                                              "complete.\n");
-                               }
-                       }
-               }
-
-               /* Add delay to filter out noises during initial link setup */
-               msleep(50);
-       }
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_setup_copper_link_82599 - Set the PHY autoneg advertised field
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
- *  @autoneg_wait_to_complete: true if waiting is needed to complete
- *
- *  Restarts link on PHY and MAC based on settings passed in.
- **/
-static s32 ixgbe_setup_copper_link_82599(struct ixgbe_hw *hw,
-                                         ixgbe_link_speed speed,
-                                         bool autoneg,
-                                         bool autoneg_wait_to_complete)
-{
-       s32 status;
-
-       /* Setup the PHY according to input speed */
-       status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,
-                                             autoneg_wait_to_complete);
-       /* Set up MAC */
-       ixgbe_start_mac_link_82599(hw, autoneg_wait_to_complete);
-
-       return status;
-}
-
-/**
- *  ixgbe_reset_hw_82599 - Perform hardware reset
- *  @hw: pointer to hardware structure
- *
- *  Resets the hardware by resetting the transmit and receive units, masks
- *  and clears all interrupts, perform a PHY reset, and perform a link (MAC)
- *  reset.
- **/
-static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
-{
-       s32 status = 0;
-       u32 ctrl;
-       u32 i;
-       u32 autoc;
-       u32 autoc2;
-
-       /* Call adapter stop to disable tx/rx and clear interrupts */
-       hw->mac.ops.stop_adapter(hw);
-
-       /* PHY ops must be identified and initialized prior to reset */
-
-       /* Identify PHY and related function pointers */
-       status = hw->phy.ops.init(hw);
-
-       if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
-               goto reset_hw_out;
-
-       /* Setup SFP module if there is one present. */
-       if (hw->phy.sfp_setup_needed) {
-               status = hw->mac.ops.setup_sfp(hw);
-               hw->phy.sfp_setup_needed = false;
-       }
-
-       if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
-               goto reset_hw_out;
-
-       /* Reset PHY */
-       if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)
-               hw->phy.ops.reset(hw);
-
-       /*
-        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
-        * access and verify no pending requests before reset
-        */
-       ixgbe_disable_pcie_master(hw);
-
-mac_reset_top:
-       /*
-        * Issue global reset to the MAC.  This needs to be a SW reset.
-        * If link reset is used, it might reset the MAC when mng is using it
-        */
-       ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-       IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | IXGBE_CTRL_RST));
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Poll for reset bit to self-clear indicating reset is complete */
-       for (i = 0; i < 10; i++) {
-               udelay(1);
-               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-               if (!(ctrl & IXGBE_CTRL_RST))
-                       break;
-       }
-       if (ctrl & IXGBE_CTRL_RST) {
-               status = IXGBE_ERR_RESET_FAILED;
-               hw_dbg(hw, "Reset polling failed to complete.\n");
-       }
-
-       /*
-        * Double resets are required for recovery from certain error
-        * conditions.  Between resets, it is necessary to stall to allow time
-        * for any pending HW events to complete.  We use 1usec since that is
-        * what is needed for ixgbe_disable_pcie_master().  The second reset
-        * then clears out any effects of those events.
-        */
-       if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
-               hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
-               udelay(1);
-               goto mac_reset_top;
-       }
-
-       msleep(50);
-
-       /*
-        * Store the original AUTOC/AUTOC2 values if they have not been
-        * stored off yet.  Otherwise restore the stored original
-        * values since the reset operation sets back to defaults.
-        */
-       autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
-       if (hw->mac.orig_link_settings_stored == false) {
-               hw->mac.orig_autoc = autoc;
-               hw->mac.orig_autoc2 = autoc2;
-               hw->mac.orig_link_settings_stored = true;
-       } else {
-               if (autoc != hw->mac.orig_autoc)
-                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (hw->mac.orig_autoc |
-                                       IXGBE_AUTOC_AN_RESTART));
-
-               if ((autoc2 & IXGBE_AUTOC2_UPPER_MASK) !=
-                   (hw->mac.orig_autoc2 & IXGBE_AUTOC2_UPPER_MASK)) {
-                       autoc2 &= ~IXGBE_AUTOC2_UPPER_MASK;
-                       autoc2 |= (hw->mac.orig_autoc2 &
-                                  IXGBE_AUTOC2_UPPER_MASK);
-                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC2, autoc2);
-               }
-       }
-
-       /* Store the permanent mac address */
-       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
-
-       /*
-        * Store MAC address from RAR0, clear receive address registers, and
-        * clear the multicast table.  Also reset num_rar_entries to 128,
-        * since we modify this value when programming the SAN MAC address.
-        */
-       hw->mac.num_rar_entries = 128;
-       hw->mac.ops.init_rx_addrs(hw);
-
-       /* Store the permanent SAN mac address */
-       hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
-
-       /* Add the SAN MAC address to the RAR only if it's a valid address */
-       if (ixgbe_validate_mac_addr(hw->mac.san_addr) == 0) {
-               hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,
-                                   hw->mac.san_addr, 0, IXGBE_RAH_AV);
-
-               /* Reserve the last RAR for the SAN MAC address */
-               hw->mac.num_rar_entries--;
-       }
-
-       /* Store the alternative WWNN/WWPN prefix */
-       hw->mac.ops.get_wwn_prefix(hw, &hw->mac.wwnn_prefix,
-                                      &hw->mac.wwpn_prefix);
-
-reset_hw_out:
-       return status;
-}
-
-/**
- *  ixgbe_reinit_fdir_tables_82599 - Reinitialize Flow Director tables.
- *  @hw: pointer to hardware structure
- **/
-s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw)
-{
-       int i;
-       u32 fdirctrl = IXGBE_READ_REG(hw, IXGBE_FDIRCTRL);
-       fdirctrl &= ~IXGBE_FDIRCTRL_INIT_DONE;
-
-       /*
-        * Before starting reinitialization process,
-        * FDIRCMD.CMD must be zero.
-        */
-       for (i = 0; i < IXGBE_FDIRCMD_CMD_POLL; i++) {
-               if (!(IXGBE_READ_REG(hw, IXGBE_FDIRCMD) &
-                     IXGBE_FDIRCMD_CMD_MASK))
-                       break;
-               udelay(10);
-       }
-       if (i >= IXGBE_FDIRCMD_CMD_POLL) {
-               hw_dbg(hw, "Flow Director previous command isn't complete, "
-                      "aborting table re-initialization.\n");
-               return IXGBE_ERR_FDIR_REINIT_FAILED;
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRFREE, 0);
-       IXGBE_WRITE_FLUSH(hw);
-       /*
-        * 82599 adapters flow director init flow cannot be restarted,
-        * Workaround 82599 silicon errata by performing the following steps
-        * before re-writing the FDIRCTRL control register with the same value.
-        * - write 1 to bit 8 of FDIRCMD register &
-        * - write 0 to bit 8 of FDIRCMD register
-        */
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
-                       (IXGBE_READ_REG(hw, IXGBE_FDIRCMD) |
-                        IXGBE_FDIRCMD_CLEARHT));
-       IXGBE_WRITE_FLUSH(hw);
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
-                       (IXGBE_READ_REG(hw, IXGBE_FDIRCMD) &
-                        ~IXGBE_FDIRCMD_CLEARHT));
-       IXGBE_WRITE_FLUSH(hw);
-       /*
-        * Clear FDIR Hash register to clear any leftover hashes
-        * waiting to be programmed.
-        */
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, 0x00);
-       IXGBE_WRITE_FLUSH(hw);
-
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRCTRL, fdirctrl);
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Poll init-done after we write FDIRCTRL register */
-       for (i = 0; i < IXGBE_FDIR_INIT_DONE_POLL; i++) {
-               if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &
-                                  IXGBE_FDIRCTRL_INIT_DONE)
-                       break;
-               udelay(10);
-       }
-       if (i >= IXGBE_FDIR_INIT_DONE_POLL) {
-               hw_dbg(hw, "Flow Director Signature poll time exceeded!\n");
-               return IXGBE_ERR_FDIR_REINIT_FAILED;
-       }
-
-       /* Clear FDIR statistics registers (read to clear) */
-       IXGBE_READ_REG(hw, IXGBE_FDIRUSTAT);
-       IXGBE_READ_REG(hw, IXGBE_FDIRFSTAT);
-       IXGBE_READ_REG(hw, IXGBE_FDIRMATCH);
-       IXGBE_READ_REG(hw, IXGBE_FDIRMISS);
-       IXGBE_READ_REG(hw, IXGBE_FDIRLEN);
-
-       return 0;
-}
-
-/**
- *  ixgbe_set_fdir_rxpba_82599 - Initialize Flow Director Rx packet buffer
- *  @hw: pointer to hardware structure
- *  @pballoc: which mode to allocate filters with
- **/
-static s32 ixgbe_set_fdir_rxpba_82599(struct ixgbe_hw *hw, const u32 pballoc)
-{
-       u32 fdir_pbsize = hw->mac.rx_pb_size << IXGBE_RXPBSIZE_SHIFT;
-       u32 current_rxpbsize = 0;
-       int i;
-
-       /* reserve space for Flow Director filters */
-       switch (pballoc) {
-       case IXGBE_FDIR_PBALLOC_256K:
-               fdir_pbsize -= 256 << IXGBE_RXPBSIZE_SHIFT;
-               break;
-       case IXGBE_FDIR_PBALLOC_128K:
-               fdir_pbsize -= 128 << IXGBE_RXPBSIZE_SHIFT;
-               break;
-       case IXGBE_FDIR_PBALLOC_64K:
-               fdir_pbsize -= 64 << IXGBE_RXPBSIZE_SHIFT;
-               break;
-       case IXGBE_FDIR_PBALLOC_NONE:
-       default:
-               return IXGBE_ERR_PARAM;
-       }
-
-       /* determine current RX packet buffer size */
-       for (i = 0; i < 8; i++)
-               current_rxpbsize += IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
-
-       /* if there is already room for the filters do nothing */
-       if (current_rxpbsize <= fdir_pbsize)
-               return 0;
-
-       if (current_rxpbsize > hw->mac.rx_pb_size) {
-               /*
-                * if rxpbsize is greater than max then HW max the Rx buffer
-                * sizes are unconfigured or misconfigured since HW default is
-                * to give the full buffer to each traffic class resulting in
-                * the total size being buffer size 8x actual size
-                *
-                * This assumes no DCB since the RXPBSIZE registers appear to
-                * be unconfigured.
-                */
-               IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0), fdir_pbsize);
-               for (i = 1; i < 8; i++)
-                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), 0);
-       } else {
-               /*
-                * Since the Rx packet buffer appears to have already been
-                * configured we need to shrink each packet buffer by enough
-                * to make room for the filters.  As such we take each rxpbsize
-                * value and multiply it by a fraction representing the size
-                * needed over the size we currently have.
-                *
-                * We need to reduce fdir_pbsize and current_rxpbsize to
-                * 1/1024 of their original values in order to avoid
-                * overflowing the u32 being used to store rxpbsize.
-                */
-               fdir_pbsize >>= IXGBE_RXPBSIZE_SHIFT;
-               current_rxpbsize >>= IXGBE_RXPBSIZE_SHIFT;
-               for (i = 0; i < 8; i++) {
-                       u32 rxpbsize = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
-                       rxpbsize *= fdir_pbsize;
-                       rxpbsize /= current_rxpbsize;
-                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpbsize);
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_fdir_enable_82599 - Initialize Flow Director control registers
- *  @hw: pointer to hardware structure
- *  @fdirctrl: value to write to flow director control register
- **/
-static void ixgbe_fdir_enable_82599(struct ixgbe_hw *hw, u32 fdirctrl)
-{
-       int i;
-
-       /* Prime the keys for hashing */
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRHKEY, IXGBE_ATR_BUCKET_HASH_KEY);
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRSKEY, IXGBE_ATR_SIGNATURE_HASH_KEY);
-
-       /*
-        * Poll init-done after we write the register.  Estimated times:
-        *      10G: PBALLOC = 11b, timing is 60us
-        *       1G: PBALLOC = 11b, timing is 600us
-        *     100M: PBALLOC = 11b, timing is 6ms
-        *
-        *     Multiple these timings by 4 if under full Rx load
-        *
-        * So we'll poll for IXGBE_FDIR_INIT_DONE_POLL times, sleeping for
-        * 1 msec per poll time.  If we're at line rate and drop to 100M, then
-        * this might not finish in our poll time, but we can live with that
-        * for now.
-        */
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRCTRL, fdirctrl);
-       IXGBE_WRITE_FLUSH(hw);
-       for (i = 0; i < IXGBE_FDIR_INIT_DONE_POLL; i++) {
-               if (IXGBE_READ_REG(hw, IXGBE_FDIRCTRL) &
-                                  IXGBE_FDIRCTRL_INIT_DONE)
-                       break;
-               usleep_range(1000, 2000);
-       }
-
-       if (i >= IXGBE_FDIR_INIT_DONE_POLL)
-               hw_dbg(hw, "Flow Director poll time exceeded!\n");
-}
-
-/**
- *  ixgbe_init_fdir_signature_82599 - Initialize Flow Director signature filters
- *  @hw: pointer to hardware structure
- *  @fdirctrl: value to write to flow director control register, initially
- *             contains just the value of the Rx packet buffer allocation
- **/
-s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 fdirctrl)
-{
-       s32 err;
-
-       /* Before enabling Flow Director, verify the Rx Packet Buffer size */
-       err = ixgbe_set_fdir_rxpba_82599(hw, fdirctrl);
-       if (err)
-               return err;
-
-       /*
-        * Continue setup of fdirctrl register bits:
-        *  Move the flexible bytes to use the ethertype - shift 6 words
-        *  Set the maximum length per hash bucket to 0xA filters
-        *  Send interrupt when 64 filters are left
-        */
-       fdirctrl |= (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT) |
-                   (0xA << IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT) |
-                   (4 << IXGBE_FDIRCTRL_FULL_THRESH_SHIFT);
-
-       /* write hashes and fdirctrl register, poll for completion */
-       ixgbe_fdir_enable_82599(hw, fdirctrl);
-
-       return 0;
-}
-
-/**
- *  ixgbe_init_fdir_perfect_82599 - Initialize Flow Director perfect filters
- *  @hw: pointer to hardware structure
- *  @fdirctrl: value to write to flow director control register, initially
- *             contains just the value of the Rx packet buffer allocation
- **/
-s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 fdirctrl)
-{
-       s32 err;
-
-       /* Before enabling Flow Director, verify the Rx Packet Buffer size */
-       err = ixgbe_set_fdir_rxpba_82599(hw, fdirctrl);
-       if (err)
-               return err;
-
-       /*
-        * Continue setup of fdirctrl register bits:
-        *  Turn perfect match filtering on
-        *  Report hash in RSS field of Rx wb descriptor
-        *  Initialize the drop queue
-        *  Move the flexible bytes to use the ethertype - shift 6 words
-        *  Set the maximum length per hash bucket to 0xA filters
-        *  Send interrupt when 64 (0x4 * 16) filters are left
-        */
-       fdirctrl |= IXGBE_FDIRCTRL_PERFECT_MATCH |
-                   IXGBE_FDIRCTRL_REPORT_STATUS |
-                   (IXGBE_FDIR_DROP_QUEUE << IXGBE_FDIRCTRL_DROP_Q_SHIFT) |
-                   (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT) |
-                   (0xA << IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT) |
-                   (4 << IXGBE_FDIRCTRL_FULL_THRESH_SHIFT);
-
-       /* write hashes and fdirctrl register, poll for completion */
-       ixgbe_fdir_enable_82599(hw, fdirctrl);
-
-       return 0;
-}
-
-/*
- * These defines allow us to quickly generate all of the necessary instructions
- * in the function below by simply calling out IXGBE_COMPUTE_SIG_HASH_ITERATION
- * for values 0 through 15
- */
-#define IXGBE_ATR_COMMON_HASH_KEY \
-               (IXGBE_ATR_BUCKET_HASH_KEY & IXGBE_ATR_SIGNATURE_HASH_KEY)
-#define IXGBE_COMPUTE_SIG_HASH_ITERATION(_n) \
-do { \
-       u32 n = (_n); \
-       if (IXGBE_ATR_COMMON_HASH_KEY & (0x01 << n)) \
-               common_hash ^= lo_hash_dword >> n; \
-       else if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << n)) \
-               bucket_hash ^= lo_hash_dword >> n; \
-       else if (IXGBE_ATR_SIGNATURE_HASH_KEY & (0x01 << n)) \
-               sig_hash ^= lo_hash_dword << (16 - n); \
-       if (IXGBE_ATR_COMMON_HASH_KEY & (0x01 << (n + 16))) \
-               common_hash ^= hi_hash_dword >> n; \
-       else if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << (n + 16))) \
-               bucket_hash ^= hi_hash_dword >> n; \
-       else if (IXGBE_ATR_SIGNATURE_HASH_KEY & (0x01 << (n + 16))) \
-               sig_hash ^= hi_hash_dword << (16 - n); \
-} while (0);
-
-/**
- *  ixgbe_atr_compute_sig_hash_82599 - Compute the signature hash
- *  @stream: input bitstream to compute the hash on
- *
- *  This function is almost identical to the function above but contains
- *  several optomizations such as unwinding all of the loops, letting the
- *  compiler work out all of the conditional ifs since the keys are static
- *  defines, and computing two keys at once since the hashed dword stream
- *  will be the same for both keys.
- **/
-static u32 ixgbe_atr_compute_sig_hash_82599(union ixgbe_atr_hash_dword input,
-                                           union ixgbe_atr_hash_dword common)
-{
-       u32 hi_hash_dword, lo_hash_dword, flow_vm_vlan;
-       u32 sig_hash = 0, bucket_hash = 0, common_hash = 0;
-
-       /* record the flow_vm_vlan bits as they are a key part to the hash */
-       flow_vm_vlan = ntohl(input.dword);
-
-       /* generate common hash dword */
-       hi_hash_dword = ntohl(common.dword);
-
-       /* low dword is word swapped version of common */
-       lo_hash_dword = (hi_hash_dword >> 16) | (hi_hash_dword << 16);
-
-       /* apply flow ID/VM pool/VLAN ID bits to hash words */
-       hi_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan >> 16);
-
-       /* Process bits 0 and 16 */
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(0);
-
-       /*
-        * apply flow ID/VM pool/VLAN ID bits to lo hash dword, we had to
-        * delay this because bit 0 of the stream should not be processed
-        * so we do not add the vlan until after bit 0 was processed
-        */
-       lo_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan << 16);
-
-       /* Process remaining 30 bit of the key */
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(1);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(2);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(3);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(4);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(5);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(6);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(7);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(8);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(9);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(10);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(11);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(12);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(13);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(14);
-       IXGBE_COMPUTE_SIG_HASH_ITERATION(15);
-
-       /* combine common_hash result with signature and bucket hashes */
-       bucket_hash ^= common_hash;
-       bucket_hash &= IXGBE_ATR_HASH_MASK;
-
-       sig_hash ^= common_hash << 16;
-       sig_hash &= IXGBE_ATR_HASH_MASK << 16;
-
-       /* return completed signature hash */
-       return sig_hash ^ bucket_hash;
-}
-
-/**
- *  ixgbe_atr_add_signature_filter_82599 - Adds a signature hash filter
- *  @hw: pointer to hardware structure
- *  @input: unique input dword
- *  @common: compressed common input dword
- *  @queue: queue index to direct traffic to
- **/
-s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw,
-                                          union ixgbe_atr_hash_dword input,
-                                          union ixgbe_atr_hash_dword common,
-                                          u8 queue)
-{
-       u64  fdirhashcmd;
-       u32  fdircmd;
-
-       /*
-        * Get the flow_type in order to program FDIRCMD properly
-        * lowest 2 bits are FDIRCMD.L4TYPE, third lowest bit is FDIRCMD.IPV6
-        */
-       switch (input.formatted.flow_type) {
-       case IXGBE_ATR_FLOW_TYPE_TCPV4:
-       case IXGBE_ATR_FLOW_TYPE_UDPV4:
-       case IXGBE_ATR_FLOW_TYPE_SCTPV4:
-       case IXGBE_ATR_FLOW_TYPE_TCPV6:
-       case IXGBE_ATR_FLOW_TYPE_UDPV6:
-       case IXGBE_ATR_FLOW_TYPE_SCTPV6:
-               break;
-       default:
-               hw_dbg(hw, " Error on flow type input\n");
-               return IXGBE_ERR_CONFIG;
-       }
-
-       /* configure FDIRCMD register */
-       fdircmd = IXGBE_FDIRCMD_CMD_ADD_FLOW | IXGBE_FDIRCMD_FILTER_UPDATE |
-                 IXGBE_FDIRCMD_LAST | IXGBE_FDIRCMD_QUEUE_EN;
-       fdircmd |= input.formatted.flow_type << IXGBE_FDIRCMD_FLOW_TYPE_SHIFT;
-       fdircmd |= (u32)queue << IXGBE_FDIRCMD_RX_QUEUE_SHIFT;
-
-       /*
-        * The lower 32-bits of fdirhashcmd is for FDIRHASH, the upper 32-bits
-        * is for FDIRCMD.  Then do a 64-bit register write from FDIRHASH.
-        */
-       fdirhashcmd = (u64)fdircmd << 32;
-       fdirhashcmd |= ixgbe_atr_compute_sig_hash_82599(input, common);
-       IXGBE_WRITE_REG64(hw, IXGBE_FDIRHASH, fdirhashcmd);
-
-       hw_dbg(hw, "Tx Queue=%x hash=%x\n", queue, (u32)fdirhashcmd);
-
-       return 0;
-}
-
-#define IXGBE_COMPUTE_BKT_HASH_ITERATION(_n) \
-do { \
-       u32 n = (_n); \
-       if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << n)) \
-               bucket_hash ^= lo_hash_dword >> n; \
-       if (IXGBE_ATR_BUCKET_HASH_KEY & (0x01 << (n + 16))) \
-               bucket_hash ^= hi_hash_dword >> n; \
-} while (0);
-
-/**
- *  ixgbe_atr_compute_perfect_hash_82599 - Compute the perfect filter hash
- *  @atr_input: input bitstream to compute the hash on
- *  @input_mask: mask for the input bitstream
- *
- *  This function serves two main purposes.  First it applys the input_mask
- *  to the atr_input resulting in a cleaned up atr_input data stream.
- *  Secondly it computes the hash and stores it in the bkt_hash field at
- *  the end of the input byte stream.  This way it will be available for
- *  future use without needing to recompute the hash.
- **/
-void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,
-                                         union ixgbe_atr_input *input_mask)
-{
-
-       u32 hi_hash_dword, lo_hash_dword, flow_vm_vlan;
-       u32 bucket_hash = 0;
-
-       /* Apply masks to input data */
-       input->dword_stream[0]  &= input_mask->dword_stream[0];
-       input->dword_stream[1]  &= input_mask->dword_stream[1];
-       input->dword_stream[2]  &= input_mask->dword_stream[2];
-       input->dword_stream[3]  &= input_mask->dword_stream[3];
-       input->dword_stream[4]  &= input_mask->dword_stream[4];
-       input->dword_stream[5]  &= input_mask->dword_stream[5];
-       input->dword_stream[6]  &= input_mask->dword_stream[6];
-       input->dword_stream[7]  &= input_mask->dword_stream[7];
-       input->dword_stream[8]  &= input_mask->dword_stream[8];
-       input->dword_stream[9]  &= input_mask->dword_stream[9];
-       input->dword_stream[10] &= input_mask->dword_stream[10];
-
-       /* record the flow_vm_vlan bits as they are a key part to the hash */
-       flow_vm_vlan = ntohl(input->dword_stream[0]);
-
-       /* generate common hash dword */
-       hi_hash_dword = ntohl(input->dword_stream[1] ^
-                                   input->dword_stream[2] ^
-                                   input->dword_stream[3] ^
-                                   input->dword_stream[4] ^
-                                   input->dword_stream[5] ^
-                                   input->dword_stream[6] ^
-                                   input->dword_stream[7] ^
-                                   input->dword_stream[8] ^
-                                   input->dword_stream[9] ^
-                                   input->dword_stream[10]);
-
-       /* low dword is word swapped version of common */
-       lo_hash_dword = (hi_hash_dword >> 16) | (hi_hash_dword << 16);
-
-       /* apply flow ID/VM pool/VLAN ID bits to hash words */
-       hi_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan >> 16);
-
-       /* Process bits 0 and 16 */
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(0);
-
-       /*
-        * apply flow ID/VM pool/VLAN ID bits to lo hash dword, we had to
-        * delay this because bit 0 of the stream should not be processed
-        * so we do not add the vlan until after bit 0 was processed
-        */
-       lo_hash_dword ^= flow_vm_vlan ^ (flow_vm_vlan << 16);
-
-       /* Process remaining 30 bit of the key */
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(1);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(2);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(3);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(4);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(5);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(6);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(7);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(8);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(9);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(10);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(11);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(12);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(13);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(14);
-       IXGBE_COMPUTE_BKT_HASH_ITERATION(15);
-
-       /*
-        * Limit hash to 13 bits since max bucket count is 8K.
-        * Store result at the end of the input stream.
-        */
-       input->formatted.bkt_hash = bucket_hash & 0x1FFF;
-}
-
-/**
- *  ixgbe_get_fdirtcpm_82599 - generate a tcp port from atr_input_masks
- *  @input_mask: mask to be bit swapped
- *
- *  The source and destination port masks for flow director are bit swapped
- *  in that bit 15 effects bit 0, 14 effects 1, 13, 2 etc.  In order to
- *  generate a correctly swapped value we need to bit swap the mask and that
- *  is what is accomplished by this function.
- **/
-static u32 ixgbe_get_fdirtcpm_82599(union ixgbe_atr_input *input_mask)
-{
-       u32 mask = ntohs(input_mask->formatted.dst_port);
-       mask <<= IXGBE_FDIRTCPM_DPORTM_SHIFT;
-       mask |= ntohs(input_mask->formatted.src_port);
-       mask = ((mask & 0x55555555) << 1) | ((mask & 0xAAAAAAAA) >> 1);
-       mask = ((mask & 0x33333333) << 2) | ((mask & 0xCCCCCCCC) >> 2);
-       mask = ((mask & 0x0F0F0F0F) << 4) | ((mask & 0xF0F0F0F0) >> 4);
-       return ((mask & 0x00FF00FF) << 8) | ((mask & 0xFF00FF00) >> 8);
-}
-
-/*
- * These two macros are meant to address the fact that we have registers
- * that are either all or in part big-endian.  As a result on big-endian
- * systems we will end up byte swapping the value to little-endian before
- * it is byte swapped again and written to the hardware in the original
- * big-endian format.
- */
-#define IXGBE_STORE_AS_BE32(_value) \
-       (((u32)(_value) >> 24) | (((u32)(_value) & 0x00FF0000) >> 8) | \
-        (((u32)(_value) & 0x0000FF00) << 8) | ((u32)(_value) << 24))
-
-#define IXGBE_WRITE_REG_BE32(a, reg, value) \
-       IXGBE_WRITE_REG((a), (reg), IXGBE_STORE_AS_BE32(ntohl(value)))
-
-#define IXGBE_STORE_AS_BE16(_value) \
-       ntohs(((u16)(_value) >> 8) | ((u16)(_value) << 8))
-
-s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
-                                   union ixgbe_atr_input *input_mask)
-{
-       /* mask IPv6 since it is currently not supported */
-       u32 fdirm = IXGBE_FDIRM_DIPv6;
-       u32 fdirtcpm;
-
-       /*
-        * Program the relevant mask registers.  If src/dst_port or src/dst_addr
-        * are zero, then assume a full mask for that field.  Also assume that
-        * a VLAN of 0 is unspecified, so mask that out as well.  L4type
-        * cannot be masked out in this implementation.
-        *
-        * This also assumes IPv4 only.  IPv6 masking isn't supported at this
-        * point in time.
-        */
-
-       /* verify bucket hash is cleared on hash generation */
-       if (input_mask->formatted.bkt_hash)
-               hw_dbg(hw, " bucket hash should always be 0 in mask\n");
-
-       /* Program FDIRM and verify partial masks */
-       switch (input_mask->formatted.vm_pool & 0x7F) {
-       case 0x0:
-               fdirm |= IXGBE_FDIRM_POOL;
-       case 0x7F:
-               break;
-       default:
-               hw_dbg(hw, " Error on vm pool mask\n");
-               return IXGBE_ERR_CONFIG;
-       }
-
-       switch (input_mask->formatted.flow_type & IXGBE_ATR_L4TYPE_MASK) {
-       case 0x0:
-               fdirm |= IXGBE_FDIRM_L4P;
-               if (input_mask->formatted.dst_port ||
-                   input_mask->formatted.src_port) {
-                       hw_dbg(hw, " Error on src/dst port mask\n");
-                       return IXGBE_ERR_CONFIG;
-               }
-       case IXGBE_ATR_L4TYPE_MASK:
-               break;
-       default:
-               hw_dbg(hw, " Error on flow type mask\n");
-               return IXGBE_ERR_CONFIG;
-       }
-
-       switch (ntohs(input_mask->formatted.vlan_id) & 0xEFFF) {
-       case 0x0000:
-               /* mask VLAN ID, fall through to mask VLAN priority */
-               fdirm |= IXGBE_FDIRM_VLANID;
-       case 0x0FFF:
-               /* mask VLAN priority */
-               fdirm |= IXGBE_FDIRM_VLANP;
-               break;
-       case 0xE000:
-               /* mask VLAN ID only, fall through */
-               fdirm |= IXGBE_FDIRM_VLANID;
-       case 0xEFFF:
-               /* no VLAN fields masked */
-               break;
-       default:
-               hw_dbg(hw, " Error on VLAN mask\n");
-               return IXGBE_ERR_CONFIG;
-       }
-
-       switch (input_mask->formatted.flex_bytes & 0xFFFF) {
-       case 0x0000:
-               /* Mask Flex Bytes, fall through */
-               fdirm |= IXGBE_FDIRM_FLEX;
-       case 0xFFFF:
-               break;
-       default:
-               hw_dbg(hw, " Error on flexible byte mask\n");
-               return IXGBE_ERR_CONFIG;
-       }
-
-       /* Now mask VM pool and destination IPv6 - bits 5 and 2 */
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRM, fdirm);
-
-       /* store the TCP/UDP port masks, bit reversed from port layout */
-       fdirtcpm = ixgbe_get_fdirtcpm_82599(input_mask);
-
-       /* write both the same so that UDP and TCP use the same mask */
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRTCPM, ~fdirtcpm);
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRUDPM, ~fdirtcpm);
-
-       /* store source and destination IP masks (big-enian) */
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIP4M,
-                            ~input_mask->formatted.src_ip[0]);
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRDIP4M,
-                            ~input_mask->formatted.dst_ip[0]);
-
-       return 0;
-}
-
-s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
-                                         union ixgbe_atr_input *input,
-                                         u16 soft_id, u8 queue)
-{
-       u32 fdirport, fdirvlan, fdirhash, fdircmd;
-
-       /* currently IPv6 is not supported, must be programmed with 0 */
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(0),
-                            input->formatted.src_ip[0]);
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(1),
-                            input->formatted.src_ip[1]);
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(2),
-                            input->formatted.src_ip[2]);
-
-       /* record the source address (big-endian) */
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRIPSA, input->formatted.src_ip[0]);
-
-       /* record the first 32 bits of the destination address (big-endian) */
-       IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRIPDA, input->formatted.dst_ip[0]);
-
-       /* record source and destination port (little-endian)*/
-       fdirport = ntohs(input->formatted.dst_port);
-       fdirport <<= IXGBE_FDIRPORT_DESTINATION_SHIFT;
-       fdirport |= ntohs(input->formatted.src_port);
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRPORT, fdirport);
-
-       /* record vlan (little-endian) and flex_bytes(big-endian) */
-       fdirvlan = IXGBE_STORE_AS_BE16(input->formatted.flex_bytes);
-       fdirvlan <<= IXGBE_FDIRVLAN_FLEX_SHIFT;
-       fdirvlan |= ntohs(input->formatted.vlan_id);
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRVLAN, fdirvlan);
-
-       /* configure FDIRHASH register */
-       fdirhash = input->formatted.bkt_hash;
-       fdirhash |= soft_id << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT;
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
-
-       /*
-        * flush all previous writes to make certain registers are
-        * programmed prior to issuing the command
-        */
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* configure FDIRCMD register */
-       fdircmd = IXGBE_FDIRCMD_CMD_ADD_FLOW | IXGBE_FDIRCMD_FILTER_UPDATE |
-                 IXGBE_FDIRCMD_LAST | IXGBE_FDIRCMD_QUEUE_EN;
-       if (queue == IXGBE_FDIR_DROP_QUEUE)
-               fdircmd |= IXGBE_FDIRCMD_DROP;
-       fdircmd |= input->formatted.flow_type << IXGBE_FDIRCMD_FLOW_TYPE_SHIFT;
-       fdircmd |= (u32)queue << IXGBE_FDIRCMD_RX_QUEUE_SHIFT;
-       fdircmd |= (u32)input->formatted.vm_pool << IXGBE_FDIRCMD_VT_POOL_SHIFT;
-
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD, fdircmd);
-
-       return 0;
-}
-
-s32 ixgbe_fdir_erase_perfect_filter_82599(struct ixgbe_hw *hw,
-                                         union ixgbe_atr_input *input,
-                                         u16 soft_id)
-{
-       u32 fdirhash;
-       u32 fdircmd = 0;
-       u32 retry_count;
-       s32 err = 0;
-
-       /* configure FDIRHASH register */
-       fdirhash = input->formatted.bkt_hash;
-       fdirhash |= soft_id << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT;
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
-
-       /* flush hash to HW */
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Query if filter is present */
-       IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD, IXGBE_FDIRCMD_CMD_QUERY_REM_FILT);
-
-       for (retry_count = 10; retry_count; retry_count--) {
-               /* allow 10us for query to process */
-               udelay(10);
-               /* verify query completed successfully */
-               fdircmd = IXGBE_READ_REG(hw, IXGBE_FDIRCMD);
-               if (!(fdircmd & IXGBE_FDIRCMD_CMD_MASK))
-                       break;
-       }
-
-       if (!retry_count)
-               err = IXGBE_ERR_FDIR_REINIT_FAILED;
-
-       /* if filter exists in hardware then remove it */
-       if (fdircmd & IXGBE_FDIRCMD_FILTER_VALID) {
-               IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
-               IXGBE_WRITE_FLUSH(hw);
-               IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD,
-                               IXGBE_FDIRCMD_CMD_REMOVE_FLOW);
-       }
-
-       return err;
-}
-
-/**
- *  ixgbe_read_analog_reg8_82599 - Reads 8 bit Omer analog register
- *  @hw: pointer to hardware structure
- *  @reg: analog register to read
- *  @val: read value
- *
- *  Performs read operation to Omer analog register specified.
- **/
-static s32 ixgbe_read_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 *val)
-{
-       u32  core_ctl;
-
-       IXGBE_WRITE_REG(hw, IXGBE_CORECTL, IXGBE_CORECTL_WRITE_CMD |
-                       (reg << 8));
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(10);
-       core_ctl = IXGBE_READ_REG(hw, IXGBE_CORECTL);
-       *val = (u8)core_ctl;
-
-       return 0;
-}
-
-/**
- *  ixgbe_write_analog_reg8_82599 - Writes 8 bit Omer analog register
- *  @hw: pointer to hardware structure
- *  @reg: atlas register to write
- *  @val: value to write
- *
- *  Performs write operation to Omer analog register specified.
- **/
-static s32 ixgbe_write_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 val)
-{
-       u32  core_ctl;
-
-       core_ctl = (reg << 8) | val;
-       IXGBE_WRITE_REG(hw, IXGBE_CORECTL, core_ctl);
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(10);
-
-       return 0;
-}
-
-/**
- *  ixgbe_start_hw_82599 - Prepare hardware for Tx/Rx
- *  @hw: pointer to hardware structure
- *
- *  Starts the hardware using the generic start_hw function
- *  and the generation start_hw function.
- *  Then performs revision-specific operations, if any.
- **/
-static s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
-{
-       s32 ret_val = 0;
-
-       ret_val = ixgbe_start_hw_generic(hw);
-       if (ret_val != 0)
-               goto out;
-
-       ret_val = ixgbe_start_hw_gen2(hw);
-       if (ret_val != 0)
-               goto out;
-
-       /* We need to run link autotry after the driver loads */
-       hw->mac.autotry_restart = true;
-       hw->mac.rx_pb_size = IXGBE_82599_RX_PB_SIZE;
-
-       if (ret_val == 0)
-               ret_val = ixgbe_verify_fw_version_82599(hw);
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_identify_phy_82599 - Get physical layer module
- *  @hw: pointer to hardware structure
- *
- *  Determines the physical layer module found on the current adapter.
- *  If PHY already detected, maintains current PHY type in hw struct,
- *  otherwise executes the PHY detection routine.
- **/
-static s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw)
-{
-       s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
-
-       /* Detect PHY if not unknown - returns success if already detected. */
-       status = ixgbe_identify_phy_generic(hw);
-       if (status != 0) {
-               /* 82599 10GBASE-T requires an external PHY */
-               if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper)
-                       goto out;
-               else
-                       status = ixgbe_identify_sfp_module_generic(hw);
-       }
-
-       /* Set PHY type none if no PHY detected */
-       if (hw->phy.type == ixgbe_phy_unknown) {
-               hw->phy.type = ixgbe_phy_none;
-               status = 0;
-       }
-
-       /* Return error if SFP module has been detected but is not supported */
-       if (hw->phy.type == ixgbe_phy_sfp_unsupported)
-               status = IXGBE_ERR_SFP_NOT_SUPPORTED;
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_get_supported_physical_layer_82599 - Returns physical layer type
- *  @hw: pointer to hardware structure
- *
- *  Determines physical layer capabilities of the current configuration.
- **/
-static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
-{
-       u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
-       u32 autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       u32 autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
-       u32 pma_pmd_10g_serial = autoc2 & IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK;
-       u32 pma_pmd_10g_parallel = autoc & IXGBE_AUTOC_10G_PMA_PMD_MASK;
-       u32 pma_pmd_1g = autoc & IXGBE_AUTOC_1G_PMA_PMD_MASK;
-       u16 ext_ability = 0;
-       u8 comp_codes_10g = 0;
-       u8 comp_codes_1g = 0;
-
-       hw->phy.ops.identify(hw);
-
-       switch (hw->phy.type) {
-       case ixgbe_phy_tn:
-       case ixgbe_phy_aq:
-       case ixgbe_phy_cu_unknown:
-               hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
-                                                        &ext_ability);
-               if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
-               if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
-               if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
-               goto out;
-       default:
-               break;
-       }
-
-       switch (autoc & IXGBE_AUTOC_LMS_MASK) {
-       case IXGBE_AUTOC_LMS_1G_AN:
-       case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
-               if (pma_pmd_1g == IXGBE_AUTOC_1G_KX_BX) {
-                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX |
-                           IXGBE_PHYSICAL_LAYER_1000BASE_BX;
-                       goto out;
-               } else
-                       /* SFI mode so read SFP module */
-                       goto sfp_check;
-               break;
-       case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
-               if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_CX4)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;
-               else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_KX4)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
-               else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;
-               goto out;
-               break;
-       case IXGBE_AUTOC_LMS_10G_SERIAL:
-               if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR;
-                       goto out;
-               } else if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_SFI)
-                       goto sfp_check;
-               break;
-       case IXGBE_AUTOC_LMS_KX4_KX_KR:
-       case IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN:
-               if (autoc & IXGBE_AUTOC_KX_SUPP)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_KX;
-               if (autoc & IXGBE_AUTOC_KX4_SUPP)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
-               if (autoc & IXGBE_AUTOC_KR_SUPP)
-                       physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR;
-               goto out;
-               break;
-       default:
-               goto out;
-               break;
-       }
-
-sfp_check:
-       /* SFP check must be done last since DA modules are sometimes used to
-        * test KR mode -  we need to id KR mode correctly before SFP module.
-        * Call identify_sfp because the pluggable module may have changed */
-       hw->phy.ops.identify_sfp(hw);
-       if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
-               goto out;
-
-       switch (hw->phy.type) {
-       case ixgbe_phy_sfp_passive_tyco:
-       case ixgbe_phy_sfp_passive_unknown:
-               physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;
-               break;
-       case ixgbe_phy_sfp_ftl_active:
-       case ixgbe_phy_sfp_active_unknown:
-               physical_layer = IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA;
-               break;
-       case ixgbe_phy_sfp_avago:
-       case ixgbe_phy_sfp_ftl:
-       case ixgbe_phy_sfp_intel:
-       case ixgbe_phy_sfp_unknown:
-               hw->phy.ops.read_i2c_eeprom(hw,
-                     IXGBE_SFF_1GBE_COMP_CODES, &comp_codes_1g);
-               hw->phy.ops.read_i2c_eeprom(hw,
-                     IXGBE_SFF_10GBE_COMP_CODES, &comp_codes_10g);
-               if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_SR;
-               else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;
-               else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE)
-                       physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T;
-               break;
-       default:
-               break;
-       }
-
-out:
-       return physical_layer;
-}
-
-/**
- *  ixgbe_enable_rx_dma_82599 - Enable the Rx DMA unit on 82599
- *  @hw: pointer to hardware structure
- *  @regval: register value to write to RXCTRL
- *
- *  Enables the Rx DMA unit for 82599
- **/
-static s32 ixgbe_enable_rx_dma_82599(struct ixgbe_hw *hw, u32 regval)
-{
-#define IXGBE_MAX_SECRX_POLL 30
-       int i;
-       int secrxreg;
-
-       /*
-        * Workaround for 82599 silicon errata when enabling the Rx datapath.
-        * If traffic is incoming before we enable the Rx unit, it could hang
-        * the Rx DMA unit.  Therefore, make sure the security engine is
-        * completely disabled prior to enabling the Rx unit.
-        */
-       secrxreg = IXGBE_READ_REG(hw, IXGBE_SECRXCTRL);
-       secrxreg |= IXGBE_SECRXCTRL_RX_DIS;
-       IXGBE_WRITE_REG(hw, IXGBE_SECRXCTRL, secrxreg);
-       for (i = 0; i < IXGBE_MAX_SECRX_POLL; i++) {
-               secrxreg = IXGBE_READ_REG(hw, IXGBE_SECRXSTAT);
-               if (secrxreg & IXGBE_SECRXSTAT_SECRX_RDY)
-                       break;
-               else
-                       /* Use interrupt-safe sleep just in case */
-                       udelay(10);
-       }
-
-       /* For informational purposes only */
-       if (i >= IXGBE_MAX_SECRX_POLL)
-               hw_dbg(hw, "Rx unit being enabled before security "
-                      "path fully disabled.  Continuing with init.\n");
-
-       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, regval);
-       secrxreg = IXGBE_READ_REG(hw, IXGBE_SECRXCTRL);
-       secrxreg &= ~IXGBE_SECRXCTRL_RX_DIS;
-       IXGBE_WRITE_REG(hw, IXGBE_SECRXCTRL, secrxreg);
-       IXGBE_WRITE_FLUSH(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_verify_fw_version_82599 - verify fw version for 82599
- *  @hw: pointer to hardware structure
- *
- *  Verifies that installed the firmware version is 0.6 or higher
- *  for SFI devices. All 82599 SFI devices should have version 0.6 or higher.
- *
- *  Returns IXGBE_ERR_EEPROM_VERSION if the FW is not present or
- *  if the FW version is not supported.
- **/
-static s32 ixgbe_verify_fw_version_82599(struct ixgbe_hw *hw)
-{
-       s32 status = IXGBE_ERR_EEPROM_VERSION;
-       u16 fw_offset, fw_ptp_cfg_offset;
-       u16 fw_version = 0;
-
-       /* firmware check is only necessary for SFI devices */
-       if (hw->phy.media_type != ixgbe_media_type_fiber) {
-               status = 0;
-               goto fw_version_out;
-       }
-
-       /* get the offset to the Firmware Module block */
-       hw->eeprom.ops.read(hw, IXGBE_FW_PTR, &fw_offset);
-
-       if ((fw_offset == 0) || (fw_offset == 0xFFFF))
-               goto fw_version_out;
-
-       /* get the offset to the Pass Through Patch Configuration block */
-       hw->eeprom.ops.read(hw, (fw_offset +
-                                IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR),
-                                &fw_ptp_cfg_offset);
-
-       if ((fw_ptp_cfg_offset == 0) || (fw_ptp_cfg_offset == 0xFFFF))
-               goto fw_version_out;
-
-       /* get the firmware version */
-       hw->eeprom.ops.read(hw, (fw_ptp_cfg_offset +
-                                IXGBE_FW_PATCH_VERSION_4),
-                                &fw_version);
-
-       if (fw_version > 0x5)
-               status = 0;
-
-fw_version_out:
-       return status;
-}
-
-/**
- *  ixgbe_verify_lesm_fw_enabled_82599 - Checks LESM FW module state.
- *  @hw: pointer to hardware structure
- *
- *  Returns true if the LESM FW module is present and enabled. Otherwise
- *  returns false. Smart Speed must be disabled if LESM FW module is enabled.
- **/
-static bool ixgbe_verify_lesm_fw_enabled_82599(struct ixgbe_hw *hw)
-{
-       bool lesm_enabled = false;
-       u16 fw_offset, fw_lesm_param_offset, fw_lesm_state;
-       s32 status;
-
-       /* get the offset to the Firmware Module block */
-       status = hw->eeprom.ops.read(hw, IXGBE_FW_PTR, &fw_offset);
-
-       if ((status != 0) ||
-           (fw_offset == 0) || (fw_offset == 0xFFFF))
-               goto out;
-
-       /* get the offset to the LESM Parameters block */
-       status = hw->eeprom.ops.read(hw, (fw_offset +
-                                    IXGBE_FW_LESM_PARAMETERS_PTR),
-                                    &fw_lesm_param_offset);
-
-       if ((status != 0) ||
-           (fw_lesm_param_offset == 0) || (fw_lesm_param_offset == 0xFFFF))
-               goto out;
-
-       /* get the lesm state word */
-       status = hw->eeprom.ops.read(hw, (fw_lesm_param_offset +
-                                    IXGBE_FW_LESM_STATE_1),
-                                    &fw_lesm_state);
-
-       if ((status == 0) &&
-           (fw_lesm_state & IXGBE_FW_LESM_STATE_ENABLED))
-               lesm_enabled = true;
-
-out:
-       return lesm_enabled;
-}
-
-/**
- *  ixgbe_read_eeprom_buffer_82599 - Read EEPROM word(s) using
- *  fastest available method
- *
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in EEPROM to read
- *  @words: number of words
- *  @data: word(s) read from the EEPROM
- *
- *  Retrieves 16 bit word(s) read from EEPROM
- **/
-static s32 ixgbe_read_eeprom_buffer_82599(struct ixgbe_hw *hw, u16 offset,
-                                         u16 words, u16 *data)
-{
-       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
-       s32 ret_val = IXGBE_ERR_CONFIG;
-
-       /*
-        * If EEPROM is detected and can be addressed using 14 bits,
-        * use EERD otherwise use bit bang
-        */
-       if ((eeprom->type == ixgbe_eeprom_spi) &&
-           (offset + (words - 1) <= IXGBE_EERD_MAX_ADDR))
-               ret_val = ixgbe_read_eerd_buffer_generic(hw, offset, words,
-                                                        data);
-       else
-               ret_val = ixgbe_read_eeprom_buffer_bit_bang_generic(hw, offset,
-                                                                   words,
-                                                                   data);
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_read_eeprom_82599 - Read EEPROM word using
- *  fastest available method
- *
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM
- **/
-static s32 ixgbe_read_eeprom_82599(struct ixgbe_hw *hw,
-                                  u16 offset, u16 *data)
-{
-       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
-       s32 ret_val = IXGBE_ERR_CONFIG;
-
-       /*
-        * If EEPROM is detected and can be addressed using 14 bits,
-        * use EERD otherwise use bit bang
-        */
-       if ((eeprom->type == ixgbe_eeprom_spi) &&
-           (offset <= IXGBE_EERD_MAX_ADDR))
-               ret_val = ixgbe_read_eerd_generic(hw, offset, data);
-       else
-               ret_val = ixgbe_read_eeprom_bit_bang_generic(hw, offset, data);
-
-       return ret_val;
-}
-
-static struct ixgbe_mac_operations mac_ops_82599 = {
-       .init_hw                = &ixgbe_init_hw_generic,
-       .reset_hw               = &ixgbe_reset_hw_82599,
-       .start_hw               = &ixgbe_start_hw_82599,
-       .clear_hw_cntrs         = &ixgbe_clear_hw_cntrs_generic,
-       .get_media_type         = &ixgbe_get_media_type_82599,
-       .get_supported_physical_layer = &ixgbe_get_supported_physical_layer_82599,
-       .enable_rx_dma          = &ixgbe_enable_rx_dma_82599,
-       .get_mac_addr           = &ixgbe_get_mac_addr_generic,
-       .get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,
-       .get_device_caps        = &ixgbe_get_device_caps_generic,
-       .get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,
-       .stop_adapter           = &ixgbe_stop_adapter_generic,
-       .get_bus_info           = &ixgbe_get_bus_info_generic,
-       .set_lan_id             = &ixgbe_set_lan_id_multi_port_pcie,
-       .read_analog_reg8       = &ixgbe_read_analog_reg8_82599,
-       .write_analog_reg8      = &ixgbe_write_analog_reg8_82599,
-       .setup_link             = &ixgbe_setup_mac_link_82599,
-       .set_rxpba              = &ixgbe_set_rxpba_generic,
-       .check_link             = &ixgbe_check_mac_link_generic,
-       .get_link_capabilities  = &ixgbe_get_link_capabilities_82599,
-       .led_on                 = &ixgbe_led_on_generic,
-       .led_off                = &ixgbe_led_off_generic,
-       .blink_led_start        = &ixgbe_blink_led_start_generic,
-       .blink_led_stop         = &ixgbe_blink_led_stop_generic,
-       .set_rar                = &ixgbe_set_rar_generic,
-       .clear_rar              = &ixgbe_clear_rar_generic,
-       .set_vmdq               = &ixgbe_set_vmdq_generic,
-       .clear_vmdq             = &ixgbe_clear_vmdq_generic,
-       .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
-       .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
-       .enable_mc              = &ixgbe_enable_mc_generic,
-       .disable_mc             = &ixgbe_disable_mc_generic,
-       .clear_vfta             = &ixgbe_clear_vfta_generic,
-       .set_vfta               = &ixgbe_set_vfta_generic,
-       .fc_enable              = &ixgbe_fc_enable_generic,
-       .set_fw_drv_ver         = &ixgbe_set_fw_drv_ver_generic,
-       .init_uta_tables        = &ixgbe_init_uta_tables_generic,
-       .setup_sfp              = &ixgbe_setup_sfp_modules_82599,
-       .set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,
-       .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
-       .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
-       .release_swfw_sync      = &ixgbe_release_swfw_sync,
-
-};
-
-static struct ixgbe_eeprom_operations eeprom_ops_82599 = {
-       .init_params            = &ixgbe_init_eeprom_params_generic,
-       .read                   = &ixgbe_read_eeprom_82599,
-       .read_buffer            = &ixgbe_read_eeprom_buffer_82599,
-       .write                  = &ixgbe_write_eeprom_generic,
-       .write_buffer           = &ixgbe_write_eeprom_buffer_bit_bang_generic,
-       .calc_checksum          = &ixgbe_calc_eeprom_checksum_generic,
-       .validate_checksum      = &ixgbe_validate_eeprom_checksum_generic,
-       .update_checksum        = &ixgbe_update_eeprom_checksum_generic,
-};
-
-static struct ixgbe_phy_operations phy_ops_82599 = {
-       .identify               = &ixgbe_identify_phy_82599,
-       .identify_sfp           = &ixgbe_identify_sfp_module_generic,
-       .init                   = &ixgbe_init_phy_ops_82599,
-       .reset                  = &ixgbe_reset_phy_generic,
-       .read_reg               = &ixgbe_read_phy_reg_generic,
-       .write_reg              = &ixgbe_write_phy_reg_generic,
-       .setup_link             = &ixgbe_setup_phy_link_generic,
-       .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
-       .read_i2c_byte          = &ixgbe_read_i2c_byte_generic,
-       .write_i2c_byte         = &ixgbe_write_i2c_byte_generic,
-       .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,
-       .write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,
-       .check_overtemp         = &ixgbe_tn_check_overtemp,
-};
-
-struct ixgbe_info ixgbe_82599_info = {
-       .mac                    = ixgbe_mac_82599EB,
-       .get_invariants         = &ixgbe_get_invariants_82599,
-       .mac_ops                = &mac_ops_82599,
-       .eeprom_ops             = &eeprom_ops_82599,
-       .phy_ops                = &phy_ops_82599,
-       .mbx_ops                = &mbx_ops_generic,
-};
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
deleted file mode 100644 (file)
index fc1375f..0000000
+++ /dev/null
@@ -1,3510 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/netdevice.h>
-
-#include "ixgbe.h"
-#include "ixgbe_common.h"
-#include "ixgbe_phy.h"
-
-static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw);
-static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw);
-static void ixgbe_release_eeprom_semaphore(struct ixgbe_hw *hw);
-static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw);
-static void ixgbe_standby_eeprom(struct ixgbe_hw *hw);
-static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
-                                        u16 count);
-static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count);
-static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
-static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
-static void ixgbe_release_eeprom(struct ixgbe_hw *hw);
-
-static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);
-static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw);
-static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw);
-static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw);
-static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);
-static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
-                             u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);
-static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);
-static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
-static s32 ixgbe_read_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
-                                            u16 words, u16 *data);
-static s32 ixgbe_write_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
-                                            u16 words, u16 *data);
-static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw,
-                                                u16 offset);
-
-/**
- *  ixgbe_start_hw_generic - Prepare hardware for Tx/Rx
- *  @hw: pointer to hardware structure
- *
- *  Starts the hardware by filling the bus info structure and media type, clears
- *  all on chip counters, initializes receive address registers, multicast
- *  table, VLAN filter table, calls routine to set up link and flow control
- *  settings, and leaves transmit and receive units disabled and uninitialized
- **/
-s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)
-{
-       u32 ctrl_ext;
-
-       /* Set the media type */
-       hw->phy.media_type = hw->mac.ops.get_media_type(hw);
-
-       /* Identify the PHY */
-       hw->phy.ops.identify(hw);
-
-       /* Clear the VLAN filter table */
-       hw->mac.ops.clear_vfta(hw);
-
-       /* Clear statistics registers */
-       hw->mac.ops.clear_hw_cntrs(hw);
-
-       /* Set No Snoop Disable */
-       ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
-       ctrl_ext |= IXGBE_CTRL_EXT_NS_DIS;
-       IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Setup flow control */
-       ixgbe_setup_fc(hw, 0);
-
-       /* Clear adapter stopped flag */
-       hw->adapter_stopped = false;
-
-       return 0;
-}
-
-/**
- *  ixgbe_start_hw_gen2 - Init sequence for common device family
- *  @hw: pointer to hw structure
- *
- * Performs the init sequence common to the second generation
- * of 10 GbE devices.
- * Devices in the second generation:
- *     82599
- *     X540
- **/
-s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
-{
-       u32 i;
-       u32 regval;
-
-       /* Clear the rate limiters */
-       for (i = 0; i < hw->mac.max_tx_queues; i++) {
-               IXGBE_WRITE_REG(hw, IXGBE_RTTDQSEL, i);
-               IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRC, 0);
-       }
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Disable relaxed ordering */
-       for (i = 0; i < hw->mac.max_tx_queues; i++) {
-               regval = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(i));
-               regval &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
-               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(i), regval);
-       }
-
-       for (i = 0; i < hw->mac.max_rx_queues; i++) {
-               regval = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
-               regval &= ~(IXGBE_DCA_RXCTRL_DESC_WRO_EN |
-                                       IXGBE_DCA_RXCTRL_DESC_HSRO_EN);
-               IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_init_hw_generic - Generic hardware initialization
- *  @hw: pointer to hardware structure
- *
- *  Initialize the hardware by resetting the hardware, filling the bus info
- *  structure and media type, clears all on chip counters, initializes receive
- *  address registers, multicast table, VLAN filter table, calls routine to set
- *  up link and flow control settings, and leaves transmit and receive units
- *  disabled and uninitialized
- **/
-s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw)
-{
-       s32 status;
-
-       /* Reset the hardware */
-       status = hw->mac.ops.reset_hw(hw);
-
-       if (status == 0) {
-               /* Start the HW */
-               status = hw->mac.ops.start_hw(hw);
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_clear_hw_cntrs_generic - Generic clear hardware counters
- *  @hw: pointer to hardware structure
- *
- *  Clears all hardware statistics counters by reading them from the hardware
- *  Statistics counters are clear on read.
- **/
-s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)
-{
-       u16 i = 0;
-
-       IXGBE_READ_REG(hw, IXGBE_CRCERRS);
-       IXGBE_READ_REG(hw, IXGBE_ILLERRC);
-       IXGBE_READ_REG(hw, IXGBE_ERRBC);
-       IXGBE_READ_REG(hw, IXGBE_MSPDC);
-       for (i = 0; i < 8; i++)
-               IXGBE_READ_REG(hw, IXGBE_MPC(i));
-
-       IXGBE_READ_REG(hw, IXGBE_MLFC);
-       IXGBE_READ_REG(hw, IXGBE_MRFC);
-       IXGBE_READ_REG(hw, IXGBE_RLEC);
-       IXGBE_READ_REG(hw, IXGBE_LXONTXC);
-       IXGBE_READ_REG(hw, IXGBE_LXOFFTXC);
-       if (hw->mac.type >= ixgbe_mac_82599EB) {
-               IXGBE_READ_REG(hw, IXGBE_LXONRXCNT);
-               IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
-       } else {
-               IXGBE_READ_REG(hw, IXGBE_LXONRXC);
-               IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
-       }
-
-       for (i = 0; i < 8; i++) {
-               IXGBE_READ_REG(hw, IXGBE_PXONTXC(i));
-               IXGBE_READ_REG(hw, IXGBE_PXOFFTXC(i));
-               if (hw->mac.type >= ixgbe_mac_82599EB) {
-                       IXGBE_READ_REG(hw, IXGBE_PXONRXCNT(i));
-                       IXGBE_READ_REG(hw, IXGBE_PXOFFRXCNT(i));
-               } else {
-                       IXGBE_READ_REG(hw, IXGBE_PXONRXC(i));
-                       IXGBE_READ_REG(hw, IXGBE_PXOFFRXC(i));
-               }
-       }
-       if (hw->mac.type >= ixgbe_mac_82599EB)
-               for (i = 0; i < 8; i++)
-                       IXGBE_READ_REG(hw, IXGBE_PXON2OFFCNT(i));
-       IXGBE_READ_REG(hw, IXGBE_PRC64);
-       IXGBE_READ_REG(hw, IXGBE_PRC127);
-       IXGBE_READ_REG(hw, IXGBE_PRC255);
-       IXGBE_READ_REG(hw, IXGBE_PRC511);
-       IXGBE_READ_REG(hw, IXGBE_PRC1023);
-       IXGBE_READ_REG(hw, IXGBE_PRC1522);
-       IXGBE_READ_REG(hw, IXGBE_GPRC);
-       IXGBE_READ_REG(hw, IXGBE_BPRC);
-       IXGBE_READ_REG(hw, IXGBE_MPRC);
-       IXGBE_READ_REG(hw, IXGBE_GPTC);
-       IXGBE_READ_REG(hw, IXGBE_GORCL);
-       IXGBE_READ_REG(hw, IXGBE_GORCH);
-       IXGBE_READ_REG(hw, IXGBE_GOTCL);
-       IXGBE_READ_REG(hw, IXGBE_GOTCH);
-       for (i = 0; i < 8; i++)
-               IXGBE_READ_REG(hw, IXGBE_RNBC(i));
-       IXGBE_READ_REG(hw, IXGBE_RUC);
-       IXGBE_READ_REG(hw, IXGBE_RFC);
-       IXGBE_READ_REG(hw, IXGBE_ROC);
-       IXGBE_READ_REG(hw, IXGBE_RJC);
-       IXGBE_READ_REG(hw, IXGBE_MNGPRC);
-       IXGBE_READ_REG(hw, IXGBE_MNGPDC);
-       IXGBE_READ_REG(hw, IXGBE_MNGPTC);
-       IXGBE_READ_REG(hw, IXGBE_TORL);
-       IXGBE_READ_REG(hw, IXGBE_TORH);
-       IXGBE_READ_REG(hw, IXGBE_TPR);
-       IXGBE_READ_REG(hw, IXGBE_TPT);
-       IXGBE_READ_REG(hw, IXGBE_PTC64);
-       IXGBE_READ_REG(hw, IXGBE_PTC127);
-       IXGBE_READ_REG(hw, IXGBE_PTC255);
-       IXGBE_READ_REG(hw, IXGBE_PTC511);
-       IXGBE_READ_REG(hw, IXGBE_PTC1023);
-       IXGBE_READ_REG(hw, IXGBE_PTC1522);
-       IXGBE_READ_REG(hw, IXGBE_MPTC);
-       IXGBE_READ_REG(hw, IXGBE_BPTC);
-       for (i = 0; i < 16; i++) {
-               IXGBE_READ_REG(hw, IXGBE_QPRC(i));
-               IXGBE_READ_REG(hw, IXGBE_QPTC(i));
-               if (hw->mac.type >= ixgbe_mac_82599EB) {
-                       IXGBE_READ_REG(hw, IXGBE_QBRC_L(i));
-                       IXGBE_READ_REG(hw, IXGBE_QBRC_H(i));
-                       IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));
-                       IXGBE_READ_REG(hw, IXGBE_QBTC_H(i));
-                       IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
-               } else {
-                       IXGBE_READ_REG(hw, IXGBE_QBRC(i));
-                       IXGBE_READ_REG(hw, IXGBE_QBTC(i));
-               }
-       }
-
-       if (hw->mac.type == ixgbe_mac_X540) {
-               if (hw->phy.id == 0)
-                       hw->phy.ops.identify(hw);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECL, &i);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECH, &i);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECL, &i);
-               hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECH, &i);
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_read_pba_string_generic - Reads part number string from EEPROM
- *  @hw: pointer to hardware structure
- *  @pba_num: stores the part number string from the EEPROM
- *  @pba_num_size: part number string buffer length
- *
- *  Reads the part number string from the EEPROM.
- **/
-s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,
-                                  u32 pba_num_size)
-{
-       s32 ret_val;
-       u16 data;
-       u16 pba_ptr;
-       u16 offset;
-       u16 length;
-
-       if (pba_num == NULL) {
-               hw_dbg(hw, "PBA string buffer was null\n");
-               return IXGBE_ERR_INVALID_ARGUMENT;
-       }
-
-       ret_val = hw->eeprom.ops.read(hw, IXGBE_PBANUM0_PTR, &data);
-       if (ret_val) {
-               hw_dbg(hw, "NVM Read Error\n");
-               return ret_val;
-       }
-
-       ret_val = hw->eeprom.ops.read(hw, IXGBE_PBANUM1_PTR, &pba_ptr);
-       if (ret_val) {
-               hw_dbg(hw, "NVM Read Error\n");
-               return ret_val;
-       }
-
-       /*
-        * if data is not ptr guard the PBA must be in legacy format which
-        * means pba_ptr is actually our second data word for the PBA number
-        * and we can decode it into an ascii string
-        */
-       if (data != IXGBE_PBANUM_PTR_GUARD) {
-               hw_dbg(hw, "NVM PBA number is not stored as string\n");
-
-               /* we will need 11 characters to store the PBA */
-               if (pba_num_size < 11) {
-                       hw_dbg(hw, "PBA string buffer too small\n");
-                       return IXGBE_ERR_NO_SPACE;
-               }
-
-               /* extract hex string from data and pba_ptr */
-               pba_num[0] = (data >> 12) & 0xF;
-               pba_num[1] = (data >> 8) & 0xF;
-               pba_num[2] = (data >> 4) & 0xF;
-               pba_num[3] = data & 0xF;
-               pba_num[4] = (pba_ptr >> 12) & 0xF;
-               pba_num[5] = (pba_ptr >> 8) & 0xF;
-               pba_num[6] = '-';
-               pba_num[7] = 0;
-               pba_num[8] = (pba_ptr >> 4) & 0xF;
-               pba_num[9] = pba_ptr & 0xF;
-
-               /* put a null character on the end of our string */
-               pba_num[10] = '\0';
-
-               /* switch all the data but the '-' to hex char */
-               for (offset = 0; offset < 10; offset++) {
-                       if (pba_num[offset] < 0xA)
-                               pba_num[offset] += '0';
-                       else if (pba_num[offset] < 0x10)
-                               pba_num[offset] += 'A' - 0xA;
-               }
-
-               return 0;
-       }
-
-       ret_val = hw->eeprom.ops.read(hw, pba_ptr, &length);
-       if (ret_val) {
-               hw_dbg(hw, "NVM Read Error\n");
-               return ret_val;
-       }
-
-       if (length == 0xFFFF || length == 0) {
-               hw_dbg(hw, "NVM PBA number section invalid length\n");
-               return IXGBE_ERR_PBA_SECTION;
-       }
-
-       /* check if pba_num buffer is big enough */
-       if (pba_num_size  < (((u32)length * 2) - 1)) {
-               hw_dbg(hw, "PBA string buffer too small\n");
-               return IXGBE_ERR_NO_SPACE;
-       }
-
-       /* trim pba length from start of string */
-       pba_ptr++;
-       length--;
-
-       for (offset = 0; offset < length; offset++) {
-               ret_val = hw->eeprom.ops.read(hw, pba_ptr + offset, &data);
-               if (ret_val) {
-                       hw_dbg(hw, "NVM Read Error\n");
-                       return ret_val;
-               }
-               pba_num[offset * 2] = (u8)(data >> 8);
-               pba_num[(offset * 2) + 1] = (u8)(data & 0xFF);
-       }
-       pba_num[offset * 2] = '\0';
-
-       return 0;
-}
-
-/**
- *  ixgbe_get_mac_addr_generic - Generic get MAC address
- *  @hw: pointer to hardware structure
- *  @mac_addr: Adapter MAC address
- *
- *  Reads the adapter's MAC address from first Receive Address Register (RAR0)
- *  A reset of the adapter must be performed prior to calling this function
- *  in order for the MAC address to have been loaded from the EEPROM into RAR0
- **/
-s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr)
-{
-       u32 rar_high;
-       u32 rar_low;
-       u16 i;
-
-       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(0));
-       rar_low = IXGBE_READ_REG(hw, IXGBE_RAL(0));
-
-       for (i = 0; i < 4; i++)
-               mac_addr[i] = (u8)(rar_low >> (i*8));
-
-       for (i = 0; i < 2; i++)
-               mac_addr[i+4] = (u8)(rar_high >> (i*8));
-
-       return 0;
-}
-
-/**
- *  ixgbe_get_bus_info_generic - Generic set PCI bus info
- *  @hw: pointer to hardware structure
- *
- *  Sets the PCI bus info (speed, width, type) within the ixgbe_hw structure
- **/
-s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw)
-{
-       struct ixgbe_adapter *adapter = hw->back;
-       struct ixgbe_mac_info *mac = &hw->mac;
-       u16 link_status;
-
-       hw->bus.type = ixgbe_bus_type_pci_express;
-
-       /* Get the negotiated link width and speed from PCI config space */
-       pci_read_config_word(adapter->pdev, IXGBE_PCI_LINK_STATUS,
-                            &link_status);
-
-       switch (link_status & IXGBE_PCI_LINK_WIDTH) {
-       case IXGBE_PCI_LINK_WIDTH_1:
-               hw->bus.width = ixgbe_bus_width_pcie_x1;
-               break;
-       case IXGBE_PCI_LINK_WIDTH_2:
-               hw->bus.width = ixgbe_bus_width_pcie_x2;
-               break;
-       case IXGBE_PCI_LINK_WIDTH_4:
-               hw->bus.width = ixgbe_bus_width_pcie_x4;
-               break;
-       case IXGBE_PCI_LINK_WIDTH_8:
-               hw->bus.width = ixgbe_bus_width_pcie_x8;
-               break;
-       default:
-               hw->bus.width = ixgbe_bus_width_unknown;
-               break;
-       }
-
-       switch (link_status & IXGBE_PCI_LINK_SPEED) {
-       case IXGBE_PCI_LINK_SPEED_2500:
-               hw->bus.speed = ixgbe_bus_speed_2500;
-               break;
-       case IXGBE_PCI_LINK_SPEED_5000:
-               hw->bus.speed = ixgbe_bus_speed_5000;
-               break;
-       default:
-               hw->bus.speed = ixgbe_bus_speed_unknown;
-               break;
-       }
-
-       mac->ops.set_lan_id(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_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.
- **/
-void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw)
-{
-       struct ixgbe_bus_info *bus = &hw->bus;
-       u32 reg;
-
-       reg = IXGBE_READ_REG(hw, IXGBE_STATUS);
-       bus->func = (reg & IXGBE_STATUS_LAN_ID) >> IXGBE_STATUS_LAN_ID_SHIFT;
-       bus->lan_id = bus->func;
-
-       /* check for a port swap */
-       reg = IXGBE_READ_REG(hw, IXGBE_FACTPS);
-       if (reg & IXGBE_FACTPS_LFS)
-               bus->func ^= 0x1;
-}
-
-/**
- *  ixgbe_stop_adapter_generic - Generic stop Tx/Rx units
- *  @hw: pointer to hardware structure
- *
- *  Sets the adapter_stopped flag within ixgbe_hw struct. Clears interrupts,
- *  disables transmit and receive units. The adapter_stopped flag is used by
- *  the shared code and drivers to determine if the adapter is in a stopped
- *  state and should not touch the hardware.
- **/
-s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw)
-{
-       u32 number_of_queues;
-       u32 reg_val;
-       u16 i;
-
-       /*
-        * Set the adapter_stopped flag so other driver functions stop touching
-        * the hardware
-        */
-       hw->adapter_stopped = true;
-
-       /* Disable the receive unit */
-       reg_val = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
-       reg_val &= ~(IXGBE_RXCTRL_RXEN);
-       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg_val);
-       IXGBE_WRITE_FLUSH(hw);
-       usleep_range(2000, 4000);
-
-       /* Clear interrupt mask to stop from interrupts being generated */
-       IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_IRQ_CLEAR_MASK);
-
-       /* Clear any pending interrupts */
-       IXGBE_READ_REG(hw, IXGBE_EICR);
-
-       /* Disable the transmit unit.  Each queue must be disabled. */
-       number_of_queues = hw->mac.max_tx_queues;
-       for (i = 0; i < number_of_queues; i++) {
-               reg_val = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
-               if (reg_val & IXGBE_TXDCTL_ENABLE) {
-                       reg_val &= ~IXGBE_TXDCTL_ENABLE;
-                       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(i), reg_val);
-               }
-       }
-
-       /*
-        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
-        * access and verify no pending requests
-        */
-       ixgbe_disable_pcie_master(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_led_on_generic - Turns on the software controllable LEDs.
- *  @hw: pointer to hardware structure
- *  @index: led number to turn on
- **/
-s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index)
-{
-       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-
-       /* To turn on the LED, set mode to ON. */
-       led_reg &= ~IXGBE_LED_MODE_MASK(index);
-       led_reg |= IXGBE_LED_ON << IXGBE_LED_MODE_SHIFT(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
-       IXGBE_WRITE_FLUSH(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_led_off_generic - Turns off the software controllable LEDs.
- *  @hw: pointer to hardware structure
- *  @index: led number to turn off
- **/
-s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index)
-{
-       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-
-       /* To turn off the LED, set mode to OFF. */
-       led_reg &= ~IXGBE_LED_MODE_MASK(index);
-       led_reg |= IXGBE_LED_OFF << IXGBE_LED_MODE_SHIFT(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
-       IXGBE_WRITE_FLUSH(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_init_eeprom_params_generic - Initialize EEPROM params
- *  @hw: pointer to hardware structure
- *
- *  Initializes the EEPROM parameters ixgbe_eeprom_info within the
- *  ixgbe_hw struct in order to set up EEPROM access.
- **/
-s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw)
-{
-       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
-       u32 eec;
-       u16 eeprom_size;
-
-       if (eeprom->type == ixgbe_eeprom_uninitialized) {
-               eeprom->type = ixgbe_eeprom_none;
-               /* Set default semaphore delay to 10ms which is a well
-                * tested value */
-               eeprom->semaphore_delay = 10;
-               /* Clear EEPROM page size, it will be initialized as needed */
-               eeprom->word_page_size = 0;
-
-               /*
-                * Check for EEPROM present first.
-                * If not present leave as none
-                */
-               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-               if (eec & IXGBE_EEC_PRES) {
-                       eeprom->type = ixgbe_eeprom_spi;
-
-                       /*
-                        * SPI EEPROM is assumed here.  This code would need to
-                        * change if a future EEPROM is not SPI.
-                        */
-                       eeprom_size = (u16)((eec & IXGBE_EEC_SIZE) >>
-                                           IXGBE_EEC_SIZE_SHIFT);
-                       eeprom->word_size = 1 << (eeprom_size +
-                                                 IXGBE_EEPROM_WORD_SIZE_SHIFT);
-               }
-
-               if (eec & IXGBE_EEC_ADDR_SIZE)
-                       eeprom->address_bits = 16;
-               else
-                       eeprom->address_bits = 8;
-               hw_dbg(hw, "Eeprom params: type = %d, size = %d, address bits: "
-                         "%d\n", eeprom->type, eeprom->word_size,
-                         eeprom->address_bits);
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_write_eeprom_buffer_bit_bang_generic - Write EEPROM using bit-bang
- *  @hw: pointer to hardware structure
- *  @offset: offset within the EEPROM to write
- *  @words: number of words
- *  @data: 16 bit word(s) to write to EEPROM
- *
- *  Reads 16 bit word(s) from EEPROM through bit-bang method
- **/
-s32 ixgbe_write_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
-                                              u16 words, u16 *data)
-{
-       s32 status = 0;
-       u16 i, count;
-
-       hw->eeprom.ops.init_params(hw);
-
-       if (words == 0) {
-               status = IXGBE_ERR_INVALID_ARGUMENT;
-               goto out;
-       }
-
-       if (offset + words > hw->eeprom.word_size) {
-               status = IXGBE_ERR_EEPROM;
-               goto out;
-       }
-
-       /*
-        * The EEPROM page size cannot be queried from the chip. We do lazy
-        * initialization. It is worth to do that when we write large buffer.
-        */
-       if ((hw->eeprom.word_page_size == 0) &&
-           (words > IXGBE_EEPROM_PAGE_SIZE_MAX))
-               ixgbe_detect_eeprom_page_size_generic(hw, offset);
-
-       /*
-        * We cannot hold synchronization semaphores for too long
-        * to avoid other entity starvation. However it is more efficient
-        * to read in bursts than synchronizing access for each word.
-        */
-       for (i = 0; i < words; i += IXGBE_EEPROM_RD_BUFFER_MAX_COUNT) {
-               count = (words - i) / IXGBE_EEPROM_RD_BUFFER_MAX_COUNT > 0 ?
-                        IXGBE_EEPROM_RD_BUFFER_MAX_COUNT : (words - i);
-               status = ixgbe_write_eeprom_buffer_bit_bang(hw, offset + i,
-                                                           count, &data[i]);
-
-               if (status != 0)
-                       break;
-       }
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_write_eeprom_buffer_bit_bang - Writes 16 bit word(s) to EEPROM
- *  @hw: pointer to hardware structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of word(s)
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  If ixgbe_eeprom_update_checksum is not called after this function, the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-static s32 ixgbe_write_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
-                                             u16 words, u16 *data)
-{
-       s32 status;
-       u16 word;
-       u16 page_size;
-       u16 i;
-       u8 write_opcode = IXGBE_EEPROM_WRITE_OPCODE_SPI;
-
-       /* Prepare the EEPROM for writing  */
-       status = ixgbe_acquire_eeprom(hw);
-
-       if (status == 0) {
-               if (ixgbe_ready_eeprom(hw) != 0) {
-                       ixgbe_release_eeprom(hw);
-                       status = IXGBE_ERR_EEPROM;
-               }
-       }
-
-       if (status == 0) {
-               for (i = 0; i < words; i++) {
-                       ixgbe_standby_eeprom(hw);
-
-                       /*  Send the WRITE ENABLE command (8 bit opcode )  */
-                       ixgbe_shift_out_eeprom_bits(hw,
-                                                 IXGBE_EEPROM_WREN_OPCODE_SPI,
-                                                 IXGBE_EEPROM_OPCODE_BITS);
-
-                       ixgbe_standby_eeprom(hw);
-
-                       /*
-                        * Some SPI eeproms use the 8th address bit embedded
-                        * in the opcode
-                        */
-                       if ((hw->eeprom.address_bits == 8) &&
-                           ((offset + i) >= 128))
-                               write_opcode |= IXGBE_EEPROM_A8_OPCODE_SPI;
-
-                       /* Send the Write command (8-bit opcode + addr) */
-                       ixgbe_shift_out_eeprom_bits(hw, write_opcode,
-                                                   IXGBE_EEPROM_OPCODE_BITS);
-                       ixgbe_shift_out_eeprom_bits(hw, (u16)((offset + i) * 2),
-                                                   hw->eeprom.address_bits);
-
-                       page_size = hw->eeprom.word_page_size;
-
-                       /* Send the data in burst via SPI*/
-                       do {
-                               word = data[i];
-                               word = (word >> 8) | (word << 8);
-                               ixgbe_shift_out_eeprom_bits(hw, word, 16);
-
-                               if (page_size == 0)
-                                       break;
-
-                               /* do not wrap around page */
-                               if (((offset + i) & (page_size - 1)) ==
-                                   (page_size - 1))
-                                       break;
-                       } while (++i < words);
-
-                       ixgbe_standby_eeprom(hw);
-                       usleep_range(10000, 20000);
-               }
-               /* Done with writing - release the EEPROM */
-               ixgbe_release_eeprom(hw);
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_write_eeprom_generic - Writes 16 bit value to EEPROM
- *  @hw: pointer to hardware structure
- *  @offset: offset within the EEPROM to be written to
- *  @data: 16 bit word to be written to the EEPROM
- *
- *  If ixgbe_eeprom_update_checksum is not called after this function, the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data)
-{
-       s32 status;
-
-       hw->eeprom.ops.init_params(hw);
-
-       if (offset >= hw->eeprom.word_size) {
-               status = IXGBE_ERR_EEPROM;
-               goto out;
-       }
-
-       status = ixgbe_write_eeprom_buffer_bit_bang(hw, offset, 1, &data);
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_read_eeprom_buffer_bit_bang_generic - Read EEPROM using bit-bang
- *  @hw: pointer to hardware structure
- *  @offset: offset within the EEPROM to be read
- *  @words: number of word(s)
- *  @data: read 16 bit words(s) from EEPROM
- *
- *  Reads 16 bit word(s) from EEPROM through bit-bang method
- **/
-s32 ixgbe_read_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
-                                             u16 words, u16 *data)
-{
-       s32 status = 0;
-       u16 i, count;
-
-       hw->eeprom.ops.init_params(hw);
-
-       if (words == 0) {
-               status = IXGBE_ERR_INVALID_ARGUMENT;
-               goto out;
-       }
-
-       if (offset + words > hw->eeprom.word_size) {
-               status = IXGBE_ERR_EEPROM;
-               goto out;
-       }
-
-       /*
-        * We cannot hold synchronization semaphores for too long
-        * to avoid other entity starvation. However it is more efficient
-        * to read in bursts than synchronizing access for each word.
-        */
-       for (i = 0; i < words; i += IXGBE_EEPROM_RD_BUFFER_MAX_COUNT) {
-               count = (words - i) / IXGBE_EEPROM_RD_BUFFER_MAX_COUNT > 0 ?
-                        IXGBE_EEPROM_RD_BUFFER_MAX_COUNT : (words - i);
-
-               status = ixgbe_read_eeprom_buffer_bit_bang(hw, offset + i,
-                                                          count, &data[i]);
-
-               if (status != 0)
-                       break;
-       }
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_read_eeprom_buffer_bit_bang - Read EEPROM using bit-bang
- *  @hw: pointer to hardware structure
- *  @offset: offset within the EEPROM to be read
- *  @words: number of word(s)
- *  @data: read 16 bit word(s) from EEPROM
- *
- *  Reads 16 bit word(s) from EEPROM through bit-bang method
- **/
-static s32 ixgbe_read_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
-                                            u16 words, u16 *data)
-{
-       s32 status;
-       u16 word_in;
-       u8 read_opcode = IXGBE_EEPROM_READ_OPCODE_SPI;
-       u16 i;
-
-       /* Prepare the EEPROM for reading  */
-       status = ixgbe_acquire_eeprom(hw);
-
-       if (status == 0) {
-               if (ixgbe_ready_eeprom(hw) != 0) {
-                       ixgbe_release_eeprom(hw);
-                       status = IXGBE_ERR_EEPROM;
-               }
-       }
-
-       if (status == 0) {
-               for (i = 0; i < words; i++) {
-                       ixgbe_standby_eeprom(hw);
-                       /*
-                        * Some SPI eeproms use the 8th address bit embedded
-                        * in the opcode
-                        */
-                       if ((hw->eeprom.address_bits == 8) &&
-                           ((offset + i) >= 128))
-                               read_opcode |= IXGBE_EEPROM_A8_OPCODE_SPI;
-
-                       /* Send the READ command (opcode + addr) */
-                       ixgbe_shift_out_eeprom_bits(hw, read_opcode,
-                                                   IXGBE_EEPROM_OPCODE_BITS);
-                       ixgbe_shift_out_eeprom_bits(hw, (u16)((offset + i) * 2),
-                                                   hw->eeprom.address_bits);
-
-                       /* Read the data. */
-                       word_in = ixgbe_shift_in_eeprom_bits(hw, 16);
-                       data[i] = (word_in >> 8) | (word_in << 8);
-               }
-
-               /* End this read operation */
-               ixgbe_release_eeprom(hw);
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_read_eeprom_bit_bang_generic - Read EEPROM word using bit-bang
- *  @hw: pointer to hardware structure
- *  @offset: offset within the EEPROM to be read
- *  @data: read 16 bit value from EEPROM
- *
- *  Reads 16 bit value from EEPROM through bit-bang method
- **/
-s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
-                                      u16 *data)
-{
-       s32 status;
-
-       hw->eeprom.ops.init_params(hw);
-
-       if (offset >= hw->eeprom.word_size) {
-               status = IXGBE_ERR_EEPROM;
-               goto out;
-       }
-
-       status = ixgbe_read_eeprom_buffer_bit_bang(hw, offset, 1, data);
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_read_eerd_buffer_generic - Read EEPROM word(s) using EERD
- *  @hw: pointer to hardware structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of word(s)
- *  @data: 16 bit word(s) from the EEPROM
- *
- *  Reads a 16 bit word(s) from the EEPROM using the EERD register.
- **/
-s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset,
-                                  u16 words, u16 *data)
-{
-       u32 eerd;
-       s32 status = 0;
-       u32 i;
-
-       hw->eeprom.ops.init_params(hw);
-
-       if (words == 0) {
-               status = IXGBE_ERR_INVALID_ARGUMENT;
-               goto out;
-       }
-
-       if (offset >= hw->eeprom.word_size) {
-               status = IXGBE_ERR_EEPROM;
-               goto out;
-       }
-
-       for (i = 0; i < words; i++) {
-               eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) +
-                      IXGBE_EEPROM_RW_REG_START;
-
-               IXGBE_WRITE_REG(hw, IXGBE_EERD, eerd);
-               status = ixgbe_poll_eerd_eewr_done(hw, IXGBE_NVM_POLL_READ);
-
-               if (status == 0) {
-                       data[i] = (IXGBE_READ_REG(hw, IXGBE_EERD) >>
-                                  IXGBE_EEPROM_RW_REG_DATA);
-               } else {
-                       hw_dbg(hw, "Eeprom read timed out\n");
-                       goto out;
-               }
-       }
-out:
-       return status;
-}
-
-/**
- *  ixgbe_detect_eeprom_page_size_generic - Detect EEPROM page size
- *  @hw: pointer to hardware structure
- *  @offset: offset within the EEPROM to be used as a scratch pad
- *
- *  Discover EEPROM page size by writing marching data at given offset.
- *  This function is called only when we are writing a new large buffer
- *  at given offset so the data would be overwritten anyway.
- **/
-static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw,
-                                                u16 offset)
-{
-       u16 data[IXGBE_EEPROM_PAGE_SIZE_MAX];
-       s32 status = 0;
-       u16 i;
-
-       for (i = 0; i < IXGBE_EEPROM_PAGE_SIZE_MAX; i++)
-               data[i] = i;
-
-       hw->eeprom.word_page_size = IXGBE_EEPROM_PAGE_SIZE_MAX;
-       status = ixgbe_write_eeprom_buffer_bit_bang(hw, offset,
-                                            IXGBE_EEPROM_PAGE_SIZE_MAX, data);
-       hw->eeprom.word_page_size = 0;
-       if (status != 0)
-               goto out;
-
-       status = ixgbe_read_eeprom_buffer_bit_bang(hw, offset, 1, data);
-       if (status != 0)
-               goto out;
-
-       /*
-        * When writing in burst more than the actual page size
-        * EEPROM address wraps around current page.
-        */
-       hw->eeprom.word_page_size = IXGBE_EEPROM_PAGE_SIZE_MAX - data[0];
-
-       hw_dbg(hw, "Detected EEPROM page size = %d words.",
-              hw->eeprom.word_page_size);
-out:
-       return status;
-}
-
-/**
- *  ixgbe_read_eerd_generic - Read EEPROM word using EERD
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM using the EERD register.
- **/
-s32 ixgbe_read_eerd_generic(struct ixgbe_hw *hw, u16 offset, u16 *data)
-{
-       return ixgbe_read_eerd_buffer_generic(hw, offset, 1, data);
-}
-
-/**
- *  ixgbe_write_eewr_buffer_generic - Write EEPROM word(s) using EEWR
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to write
- *  @words: number of words
- *  @data: word(s) write to the EEPROM
- *
- *  Write a 16 bit word(s) to the EEPROM using the EEWR register.
- **/
-s32 ixgbe_write_eewr_buffer_generic(struct ixgbe_hw *hw, u16 offset,
-                                   u16 words, u16 *data)
-{
-       u32 eewr;
-       s32 status = 0;
-       u16 i;
-
-       hw->eeprom.ops.init_params(hw);
-
-       if (words == 0) {
-               status = IXGBE_ERR_INVALID_ARGUMENT;
-               goto out;
-       }
-
-       if (offset >= hw->eeprom.word_size) {
-               status = IXGBE_ERR_EEPROM;
-               goto out;
-       }
-
-       for (i = 0; i < words; i++) {
-               eewr = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) |
-                      (data[i] << IXGBE_EEPROM_RW_REG_DATA) |
-                      IXGBE_EEPROM_RW_REG_START;
-
-               status = ixgbe_poll_eerd_eewr_done(hw, IXGBE_NVM_POLL_WRITE);
-               if (status != 0) {
-                       hw_dbg(hw, "Eeprom write EEWR timed out\n");
-                       goto out;
-               }
-
-               IXGBE_WRITE_REG(hw, IXGBE_EEWR, eewr);
-
-               status = ixgbe_poll_eerd_eewr_done(hw, IXGBE_NVM_POLL_WRITE);
-               if (status != 0) {
-                       hw_dbg(hw, "Eeprom write EEWR timed out\n");
-                       goto out;
-               }
-       }
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_write_eewr_generic - Write EEPROM word using EEWR
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to write
- *  @data: word write to the EEPROM
- *
- *  Write a 16 bit word to the EEPROM using the EEWR register.
- **/
-s32 ixgbe_write_eewr_generic(struct ixgbe_hw *hw, u16 offset, u16 data)
-{
-       return ixgbe_write_eewr_buffer_generic(hw, offset, 1, &data);
-}
-
-/**
- *  ixgbe_poll_eerd_eewr_done - Poll EERD read or EEWR write status
- *  @hw: pointer to hardware structure
- *  @ee_reg: EEPROM flag for polling
- *
- *  Polls the status bit (bit 1) of the EERD or EEWR to determine when the
- *  read or write is done respectively.
- **/
-static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)
-{
-       u32 i;
-       u32 reg;
-       s32 status = IXGBE_ERR_EEPROM;
-
-       for (i = 0; i < IXGBE_EERD_EEWR_ATTEMPTS; i++) {
-               if (ee_reg == IXGBE_NVM_POLL_READ)
-                       reg = IXGBE_READ_REG(hw, IXGBE_EERD);
-               else
-                       reg = IXGBE_READ_REG(hw, IXGBE_EEWR);
-
-               if (reg & IXGBE_EEPROM_RW_REG_DONE) {
-                       status = 0;
-                       break;
-               }
-               udelay(5);
-       }
-       return status;
-}
-
-/**
- *  ixgbe_acquire_eeprom - Acquire EEPROM using bit-bang
- *  @hw: pointer to hardware structure
- *
- *  Prepares EEPROM for access using bit-bang method. This function should
- *  be called before issuing a command to the EEPROM.
- **/
-static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)
-{
-       s32 status = 0;
-       u32 eec;
-       u32 i;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)
-               status = IXGBE_ERR_SWFW_SYNC;
-
-       if (status == 0) {
-               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-
-               /* Request EEPROM Access */
-               eec |= IXGBE_EEC_REQ;
-               IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-
-               for (i = 0; i < IXGBE_EEPROM_GRANT_ATTEMPTS; i++) {
-                       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-                       if (eec & IXGBE_EEC_GNT)
-                               break;
-                       udelay(5);
-               }
-
-               /* Release if grant not acquired */
-               if (!(eec & IXGBE_EEC_GNT)) {
-                       eec &= ~IXGBE_EEC_REQ;
-                       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-                       hw_dbg(hw, "Could not acquire EEPROM grant\n");
-
-                       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-                       status = IXGBE_ERR_EEPROM;
-               }
-
-               /* Setup EEPROM for Read/Write */
-               if (status == 0) {
-                       /* Clear CS and SK */
-                       eec &= ~(IXGBE_EEC_CS | IXGBE_EEC_SK);
-                       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-                       IXGBE_WRITE_FLUSH(hw);
-                       udelay(1);
-               }
-       }
-       return status;
-}
-
-/**
- *  ixgbe_get_eeprom_semaphore - Get hardware semaphore
- *  @hw: pointer to hardware structure
- *
- *  Sets the hardware semaphores so EEPROM access can occur for bit-bang method
- **/
-static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
-{
-       s32 status = IXGBE_ERR_EEPROM;
-       u32 timeout = 2000;
-       u32 i;
-       u32 swsm;
-
-       /* Get SMBI software semaphore between device drivers first */
-       for (i = 0; i < timeout; i++) {
-               /*
-                * If the SMBI bit is 0 when we read it, then the bit will be
-                * set and we have the semaphore
-                */
-               swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
-               if (!(swsm & IXGBE_SWSM_SMBI)) {
-                       status = 0;
-                       break;
-               }
-               udelay(50);
-       }
-
-       if (i == timeout) {
-               hw_dbg(hw, "Driver can't access the Eeprom - SMBI Semaphore "
-                      "not granted.\n");
-               /*
-                * this release is particularly important because our attempts
-                * above to get the semaphore may have succeeded, and if there
-                * was a timeout, we should unconditionally clear the semaphore
-                * bits to free the driver to make progress
-                */
-               ixgbe_release_eeprom_semaphore(hw);
-
-               udelay(50);
-               /*
-                * one last try
-                * If the SMBI bit is 0 when we read it, then the bit will be
-                * set and we have the semaphore
-                */
-               swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
-               if (!(swsm & IXGBE_SWSM_SMBI))
-                       status = 0;
-       }
-
-       /* Now get the semaphore between SW/FW through the SWESMBI bit */
-       if (status == 0) {
-               for (i = 0; i < timeout; i++) {
-                       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
-
-                       /* Set the SW EEPROM semaphore bit to request access */
-                       swsm |= IXGBE_SWSM_SWESMBI;
-                       IXGBE_WRITE_REG(hw, IXGBE_SWSM, swsm);
-
-                       /*
-                        * If we set the bit successfully then we got the
-                        * semaphore.
-                        */
-                       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
-                       if (swsm & IXGBE_SWSM_SWESMBI)
-                               break;
-
-                       udelay(50);
-               }
-
-               /*
-                * Release semaphores and return error if SW EEPROM semaphore
-                * was not granted because we don't have access to the EEPROM
-                */
-               if (i >= timeout) {
-                       hw_dbg(hw, "SWESMBI Software EEPROM semaphore "
-                              "not granted.\n");
-                       ixgbe_release_eeprom_semaphore(hw);
-                       status = IXGBE_ERR_EEPROM;
-               }
-       } else {
-               hw_dbg(hw, "Software semaphore SMBI between device drivers "
-                      "not granted.\n");
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_release_eeprom_semaphore - Release hardware semaphore
- *  @hw: pointer to hardware structure
- *
- *  This function clears hardware semaphore bits.
- **/
-static void ixgbe_release_eeprom_semaphore(struct ixgbe_hw *hw)
-{
-       u32 swsm;
-
-       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
-
-       /* Release both semaphores by writing 0 to the bits SWESMBI and SMBI */
-       swsm &= ~(IXGBE_SWSM_SWESMBI | IXGBE_SWSM_SMBI);
-       IXGBE_WRITE_REG(hw, IXGBE_SWSM, swsm);
-       IXGBE_WRITE_FLUSH(hw);
-}
-
-/**
- *  ixgbe_ready_eeprom - Polls for EEPROM ready
- *  @hw: pointer to hardware structure
- **/
-static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)
-{
-       s32 status = 0;
-       u16 i;
-       u8 spi_stat_reg;
-
-       /*
-        * 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
-        * 5 milliseconds, then error out.
-        */
-       for (i = 0; i < IXGBE_EEPROM_MAX_RETRY_SPI; i += 5) {
-               ixgbe_shift_out_eeprom_bits(hw, IXGBE_EEPROM_RDSR_OPCODE_SPI,
-                                           IXGBE_EEPROM_OPCODE_BITS);
-               spi_stat_reg = (u8)ixgbe_shift_in_eeprom_bits(hw, 8);
-               if (!(spi_stat_reg & IXGBE_EEPROM_STATUS_RDY_SPI))
-                       break;
-
-               udelay(5);
-               ixgbe_standby_eeprom(hw);
-       }
-
-       /*
-        * On some parts, SPI write time could vary from 0-20mSec on 3.3V
-        * devices (and only 0-5mSec on 5V devices)
-        */
-       if (i >= IXGBE_EEPROM_MAX_RETRY_SPI) {
-               hw_dbg(hw, "SPI EEPROM Status error\n");
-               status = IXGBE_ERR_EEPROM;
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_standby_eeprom - Returns EEPROM to a "standby" state
- *  @hw: pointer to hardware structure
- **/
-static void ixgbe_standby_eeprom(struct ixgbe_hw *hw)
-{
-       u32 eec;
-
-       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-
-       /* Toggle CS to flush commands */
-       eec |= IXGBE_EEC_CS;
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(1);
-       eec &= ~IXGBE_EEC_CS;
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(1);
-}
-
-/**
- *  ixgbe_shift_out_eeprom_bits - Shift data bits out to the EEPROM.
- *  @hw: pointer to hardware structure
- *  @data: data to send to the EEPROM
- *  @count: number of bits to shift out
- **/
-static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
-                                        u16 count)
-{
-       u32 eec;
-       u32 mask;
-       u32 i;
-
-       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-
-       /*
-        * Mask is used to shift "count" bits of "data" out to the EEPROM
-        * one bit at a time.  Determine the starting bit based on count
-        */
-       mask = 0x01 << (count - 1);
-
-       for (i = 0; i < count; i++) {
-               /*
-                * A "1" is shifted out to the EEPROM by setting bit "DI" to a
-                * "1", and then raising and then lowering the clock (the SK
-                * bit controls the clock input to the EEPROM).  A "0" is
-                * shifted out to the EEPROM by setting "DI" to "0" and then
-                * raising and then lowering the clock.
-                */
-               if (data & mask)
-                       eec |= IXGBE_EEC_DI;
-               else
-                       eec &= ~IXGBE_EEC_DI;
-
-               IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-               IXGBE_WRITE_FLUSH(hw);
-
-               udelay(1);
-
-               ixgbe_raise_eeprom_clk(hw, &eec);
-               ixgbe_lower_eeprom_clk(hw, &eec);
-
-               /*
-                * Shift mask to signify next bit of data to shift in to the
-                * EEPROM
-                */
-               mask = mask >> 1;
-       }
-
-       /* We leave the "DI" bit set to "0" when we leave this routine. */
-       eec &= ~IXGBE_EEC_DI;
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-       IXGBE_WRITE_FLUSH(hw);
-}
-
-/**
- *  ixgbe_shift_in_eeprom_bits - Shift data bits in from the EEPROM
- *  @hw: pointer to hardware structure
- **/
-static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count)
-{
-       u32 eec;
-       u32 i;
-       u16 data = 0;
-
-       /*
-        * 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 "DO" bit.  During this "shifting in" process the
-        * "DI" bit should always be clear.
-        */
-       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-
-       eec &= ~(IXGBE_EEC_DO | IXGBE_EEC_DI);
-
-       for (i = 0; i < count; i++) {
-               data = data << 1;
-               ixgbe_raise_eeprom_clk(hw, &eec);
-
-               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-
-               eec &= ~(IXGBE_EEC_DI);
-               if (eec & IXGBE_EEC_DO)
-                       data |= 1;
-
-               ixgbe_lower_eeprom_clk(hw, &eec);
-       }
-
-       return data;
-}
-
-/**
- *  ixgbe_raise_eeprom_clk - Raises the EEPROM's clock input.
- *  @hw: pointer to hardware structure
- *  @eec: EEC register's current value
- **/
-static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)
-{
-       /*
-        * Raise the clock input to the EEPROM
-        * (setting the SK bit), then delay
-        */
-       *eec = *eec | IXGBE_EEC_SK;
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, *eec);
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(1);
-}
-
-/**
- *  ixgbe_lower_eeprom_clk - Lowers the EEPROM's clock input.
- *  @hw: pointer to hardware structure
- *  @eecd: EECD's current value
- **/
-static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)
-{
-       /*
-        * Lower the clock input to the EEPROM (clearing the SK bit), then
-        * delay
-        */
-       *eec = *eec & ~IXGBE_EEC_SK;
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, *eec);
-       IXGBE_WRITE_FLUSH(hw);
-       udelay(1);
-}
-
-/**
- *  ixgbe_release_eeprom - Release EEPROM, release semaphores
- *  @hw: pointer to hardware structure
- **/
-static void ixgbe_release_eeprom(struct ixgbe_hw *hw)
-{
-       u32 eec;
-
-       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-
-       eec |= IXGBE_EEC_CS;  /* Pull CS high */
-       eec &= ~IXGBE_EEC_SK; /* Lower SCK */
-
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-       IXGBE_WRITE_FLUSH(hw);
-
-       udelay(1);
-
-       /* Stop requesting EEPROM access */
-       eec &= ~IXGBE_EEC_REQ;
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-
-       /*
-        * Delay before attempt to obtain semaphore again to allow FW
-        * access. semaphore_delay is in ms we need us for usleep_range
-        */
-       usleep_range(hw->eeprom.semaphore_delay * 1000,
-                    hw->eeprom.semaphore_delay * 2000);
-}
-
-/**
- *  ixgbe_calc_eeprom_checksum_generic - Calculates and returns the checksum
- *  @hw: pointer to hardware structure
- **/
-u16 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw)
-{
-       u16 i;
-       u16 j;
-       u16 checksum = 0;
-       u16 length = 0;
-       u16 pointer = 0;
-       u16 word = 0;
-
-       /* Include 0x0-0x3F in the checksum */
-       for (i = 0; i < IXGBE_EEPROM_CHECKSUM; i++) {
-               if (hw->eeprom.ops.read(hw, i, &word) != 0) {
-                       hw_dbg(hw, "EEPROM read failed\n");
-                       break;
-               }
-               checksum += word;
-       }
-
-       /* Include all data from pointers except for the fw pointer */
-       for (i = IXGBE_PCIE_ANALOG_PTR; i < IXGBE_FW_PTR; i++) {
-               hw->eeprom.ops.read(hw, i, &pointer);
-
-               /* Make sure the pointer seems valid */
-               if (pointer != 0xFFFF && pointer != 0) {
-                       hw->eeprom.ops.read(hw, pointer, &length);
-
-                       if (length != 0xFFFF && length != 0) {
-                               for (j = pointer+1; j <= pointer+length; j++) {
-                                       hw->eeprom.ops.read(hw, j, &word);
-                                       checksum += word;
-                               }
-                       }
-               }
-       }
-
-       checksum = (u16)IXGBE_EEPROM_SUM - checksum;
-
-       return checksum;
-}
-
-/**
- *  ixgbe_validate_eeprom_checksum_generic - Validate EEPROM checksum
- *  @hw: pointer to hardware structure
- *  @checksum_val: calculated checksum
- *
- *  Performs checksum calculation and validates the EEPROM checksum.  If the
- *  caller does not need checksum_val, the value can be NULL.
- **/
-s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,
-                                           u16 *checksum_val)
-{
-       s32 status;
-       u16 checksum;
-       u16 read_checksum = 0;
-
-       /*
-        * Read the first word from the EEPROM. If this times out or fails, do
-        * not continue or we could be in for a very long wait while every
-        * EEPROM read fails
-        */
-       status = hw->eeprom.ops.read(hw, 0, &checksum);
-
-       if (status == 0) {
-               checksum = hw->eeprom.ops.calc_checksum(hw);
-
-               hw->eeprom.ops.read(hw, IXGBE_EEPROM_CHECKSUM, &read_checksum);
-
-               /*
-                * Verify read checksum from EEPROM is the same as
-                * calculated checksum
-                */
-               if (read_checksum != checksum)
-                       status = IXGBE_ERR_EEPROM_CHECKSUM;
-
-               /* If the user cares, return the calculated checksum */
-               if (checksum_val)
-                       *checksum_val = checksum;
-       } else {
-               hw_dbg(hw, "EEPROM read failed\n");
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_update_eeprom_checksum_generic - Updates the EEPROM checksum
- *  @hw: pointer to hardware structure
- **/
-s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw)
-{
-       s32 status;
-       u16 checksum;
-
-       /*
-        * Read the first word from the EEPROM. If this times out or fails, do
-        * not continue or we could be in for a very long wait while every
-        * EEPROM read fails
-        */
-       status = hw->eeprom.ops.read(hw, 0, &checksum);
-
-       if (status == 0) {
-               checksum = hw->eeprom.ops.calc_checksum(hw);
-               status = hw->eeprom.ops.write(hw, IXGBE_EEPROM_CHECKSUM,
-                                             checksum);
-       } else {
-               hw_dbg(hw, "EEPROM read failed\n");
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_validate_mac_addr - Validate MAC address
- *  @mac_addr: pointer to MAC address.
- *
- *  Tests a MAC address to ensure it is a valid Individual Address
- **/
-s32 ixgbe_validate_mac_addr(u8 *mac_addr)
-{
-       s32 status = 0;
-
-       /* Make sure it is not a multicast address */
-       if (IXGBE_IS_MULTICAST(mac_addr))
-               status = IXGBE_ERR_INVALID_MAC_ADDR;
-       /* Not a broadcast address */
-       else if (IXGBE_IS_BROADCAST(mac_addr))
-               status = IXGBE_ERR_INVALID_MAC_ADDR;
-       /* Reject the zero address */
-       else if (mac_addr[0] == 0 && mac_addr[1] == 0 && mac_addr[2] == 0 &&
-                mac_addr[3] == 0 && mac_addr[4] == 0 && mac_addr[5] == 0)
-               status = IXGBE_ERR_INVALID_MAC_ADDR;
-
-       return status;
-}
-
-/**
- *  ixgbe_set_rar_generic - Set Rx address register
- *  @hw: pointer to hardware structure
- *  @index: Receive address register to write
- *  @addr: Address to put into receive address register
- *  @vmdq: VMDq "set" or "pool" index
- *  @enable_addr: set flag that address is active
- *
- *  Puts an ethernet address into a receive address register.
- **/
-s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
-                          u32 enable_addr)
-{
-       u32 rar_low, rar_high;
-       u32 rar_entries = hw->mac.num_rar_entries;
-
-       /* Make sure we are using a valid rar index range */
-       if (index >= rar_entries) {
-               hw_dbg(hw, "RAR index %d is out of range.\n", index);
-               return IXGBE_ERR_INVALID_ARGUMENT;
-       }
-
-       /* setup VMDq pool selection before this RAR gets enabled */
-       hw->mac.ops.set_vmdq(hw, index, vmdq);
-
-       /*
-        * 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));
-       /*
-        * Some parts put the VMDq setting in the extra RAH bits,
-        * so save everything except the lower 16 bits that hold part
-        * of the address and the address valid bit.
-        */
-       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
-       rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
-       rar_high |= ((u32)addr[4] | ((u32)addr[5] << 8));
-
-       if (enable_addr != 0)
-               rar_high |= IXGBE_RAH_AV;
-
-       IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);
-       IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
-
-       return 0;
-}
-
-/**
- *  ixgbe_clear_rar_generic - Remove Rx address register
- *  @hw: pointer to hardware structure
- *  @index: Receive address register to write
- *
- *  Clears an ethernet address from a receive address register.
- **/
-s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index)
-{
-       u32 rar_high;
-       u32 rar_entries = hw->mac.num_rar_entries;
-
-       /* Make sure we are using a valid rar index range */
-       if (index >= rar_entries) {
-               hw_dbg(hw, "RAR index %d is out of range.\n", index);
-               return IXGBE_ERR_INVALID_ARGUMENT;
-       }
-
-       /*
-        * Some parts put the VMDq setting in the extra RAH bits,
-        * so save everything except the lower 16 bits that hold part
-        * of the address and the address valid bit.
-        */
-       rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
-       rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
-
-       IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
-       IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
-
-       /* clear VMDq pool/queue selection for this RAR */
-       hw->mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);
-
-       return 0;
-}
-
-/**
- *  ixgbe_init_rx_addrs_generic - Initializes receive address filters.
- *  @hw: pointer to hardware structure
- *
- *  Places the MAC address in receive address register 0 and clears the rest
- *  of the receive address registers. Clears the multicast table. Assumes
- *  the receiver is in reset when the routine is called.
- **/
-s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
-{
-       u32 i;
-       u32 rar_entries = hw->mac.num_rar_entries;
-
-       /*
-        * If the current mac address is valid, assume it is a software override
-        * to the permanent address.
-        * Otherwise, use the permanent address from the eeprom.
-        */
-       if (ixgbe_validate_mac_addr(hw->mac.addr) ==
-           IXGBE_ERR_INVALID_MAC_ADDR) {
-               /* Get the MAC address from the RAR0 for later reference */
-               hw->mac.ops.get_mac_addr(hw, hw->mac.addr);
-
-               hw_dbg(hw, " Keeping Current RAR0 Addr =%pM\n", hw->mac.addr);
-       } else {
-               /* Setup the receive address. */
-               hw_dbg(hw, "Overriding MAC Address in RAR[0]\n");
-               hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);
-
-               hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
-
-               /*  clear VMDq pool/queue selection for RAR 0 */
-               hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL);
-       }
-       hw->addr_ctrl.overflow_promisc = 0;
-
-       hw->addr_ctrl.rar_used_count = 1;
-
-       /* Zero out the other receive addresses. */
-       hw_dbg(hw, "Clearing RAR[1-%d]\n", rar_entries - 1);
-       for (i = 1; i < rar_entries; i++) {
-               IXGBE_WRITE_REG(hw, IXGBE_RAL(i), 0);
-               IXGBE_WRITE_REG(hw, IXGBE_RAH(i), 0);
-       }
-
-       /* Clear the MTA */
-       hw->addr_ctrl.mta_in_use = 0;
-       IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw->mac.mc_filter_type);
-
-       hw_dbg(hw, " Clearing MTA\n");
-       for (i = 0; i < hw->mac.mcft_size; i++)
-               IXGBE_WRITE_REG(hw, IXGBE_MTA(i), 0);
-
-       if (hw->mac.ops.init_uta_tables)
-               hw->mac.ops.init_uta_tables(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_mta_vector - Determines bit-vector in multicast table to set
- *  @hw: pointer to hardware structure
- *  @mc_addr: the multicast address
- *
- *  Extracts the 12 bits, from a multicast address, to determine which
- *  bit-vector to set in the multicast table. The hardware uses 12 bits, from
- *  incoming rx multicast addresses, to determine the bit-vector to check in
- *  the MTA. Which of the 4 combination, of 12-bits, the hardware uses is set
- *  by the MO field of the MCSTCTRL. The MO field is set during initialization
- *  to mc_filter_type.
- **/
-static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)
-{
-       u32 vector = 0;
-
-       switch (hw->mac.mc_filter_type) {
-       case 0:   /* use bits [47:36] of the address */
-               vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
-               break;
-       case 1:   /* use bits [46:35] of the address */
-               vector = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
-               break;
-       case 2:   /* use bits [45:34] of the address */
-               vector = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
-               break;
-       case 3:   /* use bits [43:32] of the address */
-               vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
-               break;
-       default:  /* Invalid mc_filter_type */
-               hw_dbg(hw, "MC filter type param set incorrectly\n");
-               break;
-       }
-
-       /* vector can only be 12-bits or boundary will be exceeded */
-       vector &= 0xFFF;
-       return vector;
-}
-
-/**
- *  ixgbe_set_mta - Set bit-vector in multicast table
- *  @hw: pointer to hardware structure
- *  @hash_value: Multicast address hash value
- *
- *  Sets the bit-vector in the multicast table.
- **/
-static void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr)
-{
-       u32 vector;
-       u32 vector_bit;
-       u32 vector_reg;
-
-       hw->addr_ctrl.mta_in_use++;
-
-       vector = ixgbe_mta_vector(hw, mc_addr);
-       hw_dbg(hw, " bit-vector = 0x%03X\n", vector);
-
-       /*
-        * The MTA is a register array of 128 32-bit registers. It is treated
-        * like an array of 4096 bits.  We want to set bit
-        * BitArray[vector_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
-        * register is determined by the upper 7 bits of the vector value and
-        * the bit within that register are determined by the lower 5 bits of
-        * the value.
-        */
-       vector_reg = (vector >> 5) & 0x7F;
-       vector_bit = vector & 0x1F;
-       hw->mac.mta_shadow[vector_reg] |= (1 << vector_bit);
-}
-
-/**
- *  ixgbe_update_mc_addr_list_generic - Updates MAC list of multicast addresses
- *  @hw: pointer to hardware structure
- *  @netdev: pointer to net device structure
- *
- *  The given list replaces any existing list. Clears the MC addrs from receive
- *  address registers and the multicast table. Uses unused receive address
- *  registers for the first multicast addresses, and hashes the rest into the
- *  multicast table.
- **/
-s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
-                                     struct net_device *netdev)
-{
-       struct netdev_hw_addr *ha;
-       u32 i;
-
-       /*
-        * Set the new number of MC addresses that we are being requested to
-        * use.
-        */
-       hw->addr_ctrl.num_mc_addrs = netdev_mc_count(netdev);
-       hw->addr_ctrl.mta_in_use = 0;
-
-       /* Clear mta_shadow */
-       hw_dbg(hw, " Clearing MTA\n");
-       memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
-
-       /* Update mta shadow */
-       netdev_for_each_mc_addr(ha, netdev) {
-               hw_dbg(hw, " Adding the multicast addresses:\n");
-               ixgbe_set_mta(hw, ha->addr);
-       }
-
-       /* Enable mta */
-       for (i = 0; i < hw->mac.mcft_size; i++)
-               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_MTA(0), i,
-                                     hw->mac.mta_shadow[i]);
-
-       if (hw->addr_ctrl.mta_in_use > 0)
-               IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,
-                               IXGBE_MCSTCTRL_MFE | hw->mac.mc_filter_type);
-
-       hw_dbg(hw, "ixgbe_update_mc_addr_list_generic Complete\n");
-       return 0;
-}
-
-/**
- *  ixgbe_enable_mc_generic - Enable multicast address in RAR
- *  @hw: pointer to hardware structure
- *
- *  Enables multicast address in RAR and the use of the multicast hash table.
- **/
-s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw)
-{
-       struct ixgbe_addr_filter_info *a = &hw->addr_ctrl;
-
-       if (a->mta_in_use > 0)
-               IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, IXGBE_MCSTCTRL_MFE |
-                               hw->mac.mc_filter_type);
-
-       return 0;
-}
-
-/**
- *  ixgbe_disable_mc_generic - Disable multicast address in RAR
- *  @hw: pointer to hardware structure
- *
- *  Disables multicast address in RAR and the use of the multicast hash table.
- **/
-s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw)
-{
-       struct ixgbe_addr_filter_info *a = &hw->addr_ctrl;
-
-       if (a->mta_in_use > 0)
-               IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw->mac.mc_filter_type);
-
-       return 0;
-}
-
-/**
- *  ixgbe_fc_enable_generic - Enable flow control
- *  @hw: pointer to hardware structure
- *  @packetbuf_num: packet buffer number (0-7)
- *
- *  Enable flow control according to the current settings.
- **/
-s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
-{
-       s32 ret_val = 0;
-       u32 mflcn_reg, fccfg_reg;
-       u32 reg;
-       u32 rx_pba_size;
-       u32 fcrtl, fcrth;
-
-#ifdef CONFIG_DCB
-       if (hw->fc.requested_mode == ixgbe_fc_pfc)
-               goto out;
-
-#endif /* CONFIG_DCB */
-       /* Negotiate the fc mode to use */
-       ret_val = ixgbe_fc_autoneg(hw);
-       if (ret_val == IXGBE_ERR_FLOW_CONTROL)
-               goto out;
-
-       /* Disable any previous flow control settings */
-       mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-       mflcn_reg &= ~(IXGBE_MFLCN_RFCE | IXGBE_MFLCN_RPFCE);
-
-       fccfg_reg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
-       fccfg_reg &= ~(IXGBE_FCCFG_TFCE_802_3X | IXGBE_FCCFG_TFCE_PRIORITY);
-
-       /*
-        * The possible values of fc.current_mode 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.
-#ifdef CONFIG_DCB
-        * 4: Priority Flow Control is enabled.
-#endif
-        * other: Invalid.
-        */
-       switch (hw->fc.current_mode) {
-       case ixgbe_fc_none:
-               /*
-                * Flow control is disabled by software override or autoneg.
-                * The code below will actually disable it in the HW.
-                */
-               break;
-       case ixgbe_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled and Tx Flow control is
-                * disabled by software override. 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.
-                */
-               mflcn_reg |= IXGBE_MFLCN_RFCE;
-               break;
-       case ixgbe_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is
-                * disabled by software override.
-                */
-               fccfg_reg |= IXGBE_FCCFG_TFCE_802_3X;
-               break;
-       case ixgbe_fc_full:
-               /* Flow control (both Rx and Tx) is enabled by SW override. */
-               mflcn_reg |= IXGBE_MFLCN_RFCE;
-               fccfg_reg |= IXGBE_FCCFG_TFCE_802_3X;
-               break;
-#ifdef CONFIG_DCB
-       case ixgbe_fc_pfc:
-               goto out;
-               break;
-#endif /* CONFIG_DCB */
-       default:
-               hw_dbg(hw, "Flow control param set incorrectly\n");
-               ret_val = IXGBE_ERR_CONFIG;
-               goto out;
-               break;
-       }
-
-       /* Set 802.3x based flow control settings. */
-       mflcn_reg |= IXGBE_MFLCN_DPF;
-       IXGBE_WRITE_REG(hw, IXGBE_MFLCN, mflcn_reg);
-       IXGBE_WRITE_REG(hw, IXGBE_FCCFG, fccfg_reg);
-
-       rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num));
-       rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
-
-       fcrth = (rx_pba_size - hw->fc.high_water) << 10;
-       fcrtl = (rx_pba_size - hw->fc.low_water) << 10;
-
-       if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
-               fcrth |= IXGBE_FCRTH_FCEN;
-               if (hw->fc.send_xon)
-                       fcrtl |= IXGBE_FCRTL_XONE;
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(packetbuf_num), fcrth);
-       IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(packetbuf_num), fcrtl);
-
-       /* Configure pause time (2 TCs per register) */
-       reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
-       if ((packetbuf_num & 1) == 0)
-               reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
-       else
-               reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
-       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
-
-       IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
-
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_fc_autoneg - Configure flow control
- *  @hw: pointer to hardware structure
- *
- *  Compares our advertised flow control capabilities to those advertised by
- *  our link partner, and determines the proper flow control mode to use.
- **/
-s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
-{
-       s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
-       ixgbe_link_speed speed;
-       bool link_up;
-
-       if (hw->fc.disable_fc_autoneg)
-               goto out;
-
-       /*
-        * AN should have completed when the cable was plugged in.
-        * Look for reasons to bail out.  Bail out if:
-        * - FC autoneg is disabled, or if
-        * - link is not up.
-        *
-        * Since we're being called from an LSC, link is already known to be up.
-        * So use link_up_wait_to_complete=false.
-        */
-       hw->mac.ops.check_link(hw, &speed, &link_up, false);
-       if (!link_up) {
-               ret_val = IXGBE_ERR_FLOW_CONTROL;
-               goto out;
-       }
-
-       switch (hw->phy.media_type) {
-       /* Autoneg flow control on fiber adapters */
-       case ixgbe_media_type_fiber:
-               if (speed == IXGBE_LINK_SPEED_1GB_FULL)
-                       ret_val = ixgbe_fc_autoneg_fiber(hw);
-               break;
-
-       /* Autoneg flow control on backplane adapters */
-       case ixgbe_media_type_backplane:
-               ret_val = ixgbe_fc_autoneg_backplane(hw);
-               break;
-
-       /* Autoneg flow control on copper adapters */
-       case ixgbe_media_type_copper:
-               if (ixgbe_device_supports_autoneg_fc(hw) == 0)
-                       ret_val = ixgbe_fc_autoneg_copper(hw);
-               break;
-
-       default:
-               break;
-       }
-
-out:
-       if (ret_val == 0) {
-               hw->fc.fc_was_autonegged = true;
-       } else {
-               hw->fc.fc_was_autonegged = false;
-               hw->fc.current_mode = hw->fc.requested_mode;
-       }
-       return ret_val;
-}
-
-/**
- *  ixgbe_fc_autoneg_fiber - Enable flow control on 1 gig fiber
- *  @hw: pointer to hardware structure
- *
- *  Enable flow control according on 1 gig fiber.
- **/
-static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
-{
-       u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;
-       s32 ret_val;
-
-       /*
-        * On multispeed fiber at 1g, bail out if
-        * - link is up but AN did not complete, or if
-        * - link is up and AN completed but timed out
-        */
-
-       linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
-       if (((linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
-           ((linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
-               ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
-               goto out;
-       }
-
-       pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
-       pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
-
-       ret_val =  ixgbe_negotiate_fc(hw, pcs_anadv_reg,
-                              pcs_lpab_reg, IXGBE_PCS1GANA_SYM_PAUSE,
-                              IXGBE_PCS1GANA_ASM_PAUSE,
-                              IXGBE_PCS1GANA_SYM_PAUSE,
-                              IXGBE_PCS1GANA_ASM_PAUSE);
-
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_fc_autoneg_backplane - Enable flow control IEEE clause 37
- *  @hw: pointer to hardware structure
- *
- *  Enable flow control according to IEEE clause 37.
- **/
-static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)
-{
-       u32 links2, anlp1_reg, autoc_reg, links;
-       s32 ret_val;
-
-       /*
-        * On backplane, bail out if
-        * - backplane autoneg was not completed, or if
-        * - we are 82599 and link partner is not AN enabled
-        */
-       links = IXGBE_READ_REG(hw, IXGBE_LINKS);
-       if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
-               hw->fc.fc_was_autonegged = false;
-               hw->fc.current_mode = hw->fc.requested_mode;
-               ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
-               goto out;
-       }
-
-       if (hw->mac.type == ixgbe_mac_82599EB) {
-               links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
-               if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
-                       hw->fc.fc_was_autonegged = false;
-                       hw->fc.current_mode = hw->fc.requested_mode;
-                       ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
-                       goto out;
-               }
-       }
-       /*
-        * Read the 10g AN autoc and LP ability registers and resolve
-        * local flow control settings accordingly
-        */
-       autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       anlp1_reg = IXGBE_READ_REG(hw, IXGBE_ANLP1);
-
-       ret_val = ixgbe_negotiate_fc(hw, autoc_reg,
-               anlp1_reg, IXGBE_AUTOC_SYM_PAUSE, IXGBE_AUTOC_ASM_PAUSE,
-               IXGBE_ANLP1_SYM_PAUSE, IXGBE_ANLP1_ASM_PAUSE);
-
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_fc_autoneg_copper - Enable flow control IEEE clause 37
- *  @hw: pointer to hardware structure
- *
- *  Enable flow control according to IEEE clause 37.
- **/
-static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw)
-{
-       u16 technology_ability_reg = 0;
-       u16 lp_technology_ability_reg = 0;
-
-       hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
-                            MDIO_MMD_AN,
-                            &technology_ability_reg);
-       hw->phy.ops.read_reg(hw, MDIO_AN_LPA,
-                            MDIO_MMD_AN,
-                            &lp_technology_ability_reg);
-
-       return ixgbe_negotiate_fc(hw, (u32)technology_ability_reg,
-                                 (u32)lp_technology_ability_reg,
-                                 IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE,
-                                 IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE);
-}
-
-/**
- *  ixgbe_negotiate_fc - Negotiate flow control
- *  @hw: pointer to hardware structure
- *  @adv_reg: flow control advertised settings
- *  @lp_reg: link partner's flow control settings
- *  @adv_sym: symmetric pause bit in advertisement
- *  @adv_asm: asymmetric pause bit in advertisement
- *  @lp_sym: symmetric pause bit in link partner advertisement
- *  @lp_asm: asymmetric pause bit in link partner advertisement
- *
- *  Find the intersection between advertised settings and link partner's
- *  advertised settings
- **/
-static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
-                             u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)
-{
-       if ((!(adv_reg)) ||  (!(lp_reg)))
-               return IXGBE_ERR_FC_NOT_NEGOTIATED;
-
-       if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {
-               /*
-                * 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 == ixgbe_fc_full) {
-                       hw->fc.current_mode = ixgbe_fc_full;
-                       hw_dbg(hw, "Flow Control = FULL.\n");
-               } else {
-                       hw->fc.current_mode = ixgbe_fc_rx_pause;
-                       hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");
-               }
-       } else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
-                  (lp_reg & lp_sym) && (lp_reg & lp_asm)) {
-               hw->fc.current_mode = ixgbe_fc_tx_pause;
-               hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
-       } else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
-                  !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
-               hw->fc.current_mode = ixgbe_fc_rx_pause;
-               hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
-       } else {
-               hw->fc.current_mode = ixgbe_fc_none;
-               hw_dbg(hw, "Flow Control = NONE.\n");
-       }
-       return 0;
-}
-
-/**
- *  ixgbe_setup_fc - Set up flow control
- *  @hw: pointer to hardware structure
- *
- *  Called at init time to set up flow control.
- **/
-static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
-{
-       s32 ret_val = 0;
-       u32 reg = 0, reg_bp = 0;
-       u16 reg_cu = 0;
-
-#ifdef CONFIG_DCB
-       if (hw->fc.requested_mode == ixgbe_fc_pfc) {
-               hw->fc.current_mode = hw->fc.requested_mode;
-               goto out;
-       }
-
-#endif /* CONFIG_DCB */
-       /* Validate the packetbuf configuration */
-       if (packetbuf_num < 0 || packetbuf_num > 7) {
-               hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
-                      "is 0-7\n", packetbuf_num);
-               ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
-               goto out;
-       }
-
-       /*
-        * Validate the water mark configuration.  Zero water marks are invalid
-        * because it causes the controller to just blast out fc packets.
-        */
-       if (!hw->fc.low_water || !hw->fc.high_water || !hw->fc.pause_time) {
-               hw_dbg(hw, "Invalid water mark configuration\n");
-               ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
-               goto out;
-       }
-
-       /*
-        * Validate the requested mode.  Strict IEEE mode does not allow
-        * ixgbe_fc_rx_pause because it will cause us to fail at UNH.
-        */
-       if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
-               hw_dbg(hw, "ixgbe_fc_rx_pause not valid in strict "
-                      "IEEE mode\n");
-               ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
-               goto out;
-       }
-
-       /*
-        * 10gig parts do not have a word in the EEPROM to determine the
-        * default flow control setting, so we explicitly set it to full.
-        */
-       if (hw->fc.requested_mode == ixgbe_fc_default)
-               hw->fc.requested_mode = ixgbe_fc_full;
-
-       /*
-        * Set up the 1G and 10G flow control advertisement registers so the
-        * HW will be able to do fc autoneg once the cable is plugged in.  If
-        * we link at 10G, the 1G advertisement is harmless and vice versa.
-        */
-
-       switch (hw->phy.media_type) {
-       case ixgbe_media_type_fiber:
-       case ixgbe_media_type_backplane:
-               reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
-               reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-               break;
-
-       case ixgbe_media_type_copper:
-               hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
-                                       MDIO_MMD_AN, &reg_cu);
-               break;
-
-       default:
-               ;
-       }
-
-       /*
-        * The possible values of fc.requested_mode 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.
-#ifdef CONFIG_DCB
-        * 4: Priority Flow Control is enabled.
-#endif
-        * other: Invalid.
-        */
-       switch (hw->fc.requested_mode) {
-       case ixgbe_fc_none:
-               /* Flow control completely disabled by software override. */
-               reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-               if (hw->phy.media_type == ixgbe_media_type_backplane)
-                       reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |
-                                   IXGBE_AUTOC_ASM_PAUSE);
-               else if (hw->phy.media_type == ixgbe_media_type_copper)
-                       reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-               break;
-       case ixgbe_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled and Tx Flow control is
-                * disabled by software override. 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.
-                */
-               reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-               if (hw->phy.media_type == ixgbe_media_type_backplane)
-                       reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
-                                  IXGBE_AUTOC_ASM_PAUSE);
-               else if (hw->phy.media_type == ixgbe_media_type_copper)
-                       reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-               break;
-       case ixgbe_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is
-                * disabled by software override.
-                */
-               reg |= (IXGBE_PCS1GANA_ASM_PAUSE);
-               reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE);
-               if (hw->phy.media_type == ixgbe_media_type_backplane) {
-                       reg_bp |= (IXGBE_AUTOC_ASM_PAUSE);
-                       reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE);
-               } else if (hw->phy.media_type == ixgbe_media_type_copper) {
-                       reg_cu |= (IXGBE_TAF_ASM_PAUSE);
-                       reg_cu &= ~(IXGBE_TAF_SYM_PAUSE);
-               }
-               break;
-       case ixgbe_fc_full:
-               /* Flow control (both Rx and Tx) is enabled by SW override. */
-               reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-               if (hw->phy.media_type == ixgbe_media_type_backplane)
-                       reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
-                                  IXGBE_AUTOC_ASM_PAUSE);
-               else if (hw->phy.media_type == ixgbe_media_type_copper)
-                       reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-               break;
-#ifdef CONFIG_DCB
-       case ixgbe_fc_pfc:
-               goto out;
-               break;
-#endif /* CONFIG_DCB */
-       default:
-               hw_dbg(hw, "Flow control param set incorrectly\n");
-               ret_val = IXGBE_ERR_CONFIG;
-               goto out;
-               break;
-       }
-
-       if (hw->mac.type != ixgbe_mac_X540) {
-               /*
-                * Enable auto-negotiation between the MAC & PHY;
-                * the MAC will advertise clause 37 flow control.
-                */
-               IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
-               reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
-
-               /* Disable AN timeout */
-               if (hw->fc.strict_ieee)
-                       reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
-
-               IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
-               hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
-       }
-
-       /*
-        * AUTOC restart handles negotiation of 1G and 10G on backplane
-        * and copper. There is no need to set the PCS1GCTL register.
-        *
-        */
-       if (hw->phy.media_type == ixgbe_media_type_backplane) {
-               reg_bp |= IXGBE_AUTOC_AN_RESTART;
-               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);
-       } else if ((hw->phy.media_type == ixgbe_media_type_copper) &&
-                   (ixgbe_device_supports_autoneg_fc(hw) == 0)) {
-               hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
-                                     MDIO_MMD_AN, reg_cu);
-       }
-
-       hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_disable_pcie_master - Disable PCI-express master access
- *  @hw: pointer to hardware structure
- *
- *  Disables PCI-Express master access and verifies there are no pending
- *  requests. IXGBE_ERR_MASTER_REQUESTS_PENDING is returned if master disable
- *  bit hasn't caused the master requests to be disabled, else 0
- *  is returned signifying master requests disabled.
- **/
-s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)
-{
-       struct ixgbe_adapter *adapter = hw->back;
-       u32 i;
-       u32 reg_val;
-       u32 number_of_queues;
-       s32 status = 0;
-       u16 dev_status = 0;
-
-       /* Just jump out if bus mastering is already disabled */
-       if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO))
-               goto out;
-
-       /* Disable the receive unit by stopping each queue */
-       number_of_queues = hw->mac.max_rx_queues;
-       for (i = 0; i < number_of_queues; i++) {
-               reg_val = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
-               if (reg_val & IXGBE_RXDCTL_ENABLE) {
-                       reg_val &= ~IXGBE_RXDCTL_ENABLE;
-                       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), reg_val);
-               }
-       }
-
-       reg_val = IXGBE_READ_REG(hw, IXGBE_CTRL);
-       reg_val |= IXGBE_CTRL_GIO_DIS;
-       IXGBE_WRITE_REG(hw, IXGBE_CTRL, reg_val);
-
-       for (i = 0; i < IXGBE_PCI_MASTER_DISABLE_TIMEOUT; i++) {
-               if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO))
-                       goto check_device_status;
-               udelay(100);
-       }
-
-       hw_dbg(hw, "GIO Master Disable bit didn't clear - requesting resets\n");
-       status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
-
-       /*
-        * Before proceeding, make sure that the PCIe block does not have
-        * transactions pending.
-        */
-check_device_status:
-       for (i = 0; i < IXGBE_PCI_MASTER_DISABLE_TIMEOUT; i++) {
-               pci_read_config_word(adapter->pdev, IXGBE_PCI_DEVICE_STATUS,
-                                                        &dev_status);
-               if (!(dev_status & IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING))
-                       break;
-               udelay(100);
-       }
-
-       if (i == IXGBE_PCI_MASTER_DISABLE_TIMEOUT)
-               hw_dbg(hw, "PCIe transaction pending bit also did not clear.\n");
-       else
-               goto out;
-
-       /*
-        * Two consecutive resets are required via CTRL.RST per datasheet
-        * 5.2.5.3.2 Master Disable.  We set a flag to inform the reset routine
-        * of this need.  The first reset prevents new master requests from
-        * being issued by our device.  We then must wait 1usec for any
-        * remaining completions from the PCIe bus to trickle in, and then reset
-        * again to clear out any effects they may have had on our device.
-        */
-        hw->mac.flags |= IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
-
-out:
-       return status;
-}
-
-
-/**
- *  ixgbe_acquire_swfw_sync - Acquire SWFW semaphore
- *  @hw: pointer to hardware structure
- *  @mask: Mask to specify which semaphore to acquire
- *
- *  Acquires the SWFW semaphore through the GSSR register for the specified
- *  function (CSR, PHY0, PHY1, EEPROM, Flash)
- **/
-s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)
-{
-       u32 gssr;
-       u32 swmask = mask;
-       u32 fwmask = mask << 5;
-       s32 timeout = 200;
-
-       while (timeout) {
-               /*
-                * SW EEPROM semaphore bit is used for access to all
-                * SW_FW_SYNC/GSSR bits (not just EEPROM)
-                */
-               if (ixgbe_get_eeprom_semaphore(hw))
-                       return IXGBE_ERR_SWFW_SYNC;
-
-               gssr = IXGBE_READ_REG(hw, IXGBE_GSSR);
-               if (!(gssr & (fwmask | swmask)))
-                       break;
-
-               /*
-                * Firmware currently using resource (fwmask) or other software
-                * thread currently using resource (swmask)
-                */
-               ixgbe_release_eeprom_semaphore(hw);
-               usleep_range(5000, 10000);
-               timeout--;
-       }
-
-       if (!timeout) {
-               hw_dbg(hw, "Driver can't access resource, SW_FW_SYNC timeout.\n");
-               return IXGBE_ERR_SWFW_SYNC;
-       }
-
-       gssr |= swmask;
-       IXGBE_WRITE_REG(hw, IXGBE_GSSR, gssr);
-
-       ixgbe_release_eeprom_semaphore(hw);
-       return 0;
-}
-
-/**
- *  ixgbe_release_swfw_sync - Release SWFW semaphore
- *  @hw: pointer to hardware structure
- *  @mask: Mask to specify which semaphore to release
- *
- *  Releases the SWFW semaphore through the GSSR register for the specified
- *  function (CSR, PHY0, PHY1, EEPROM, Flash)
- **/
-void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask)
-{
-       u32 gssr;
-       u32 swmask = mask;
-
-       ixgbe_get_eeprom_semaphore(hw);
-
-       gssr = IXGBE_READ_REG(hw, IXGBE_GSSR);
-       gssr &= ~swmask;
-       IXGBE_WRITE_REG(hw, IXGBE_GSSR, gssr);
-
-       ixgbe_release_eeprom_semaphore(hw);
-}
-
-/**
- *  ixgbe_enable_rx_dma_generic - Enable the Rx DMA unit
- *  @hw: pointer to hardware structure
- *  @regval: register value to write to RXCTRL
- *
- *  Enables the Rx DMA unit
- **/
-s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval)
-{
-       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, regval);
-
-       return 0;
-}
-
-/**
- *  ixgbe_blink_led_start_generic - Blink LED based on index.
- *  @hw: pointer to hardware structure
- *  @index: led number to blink
- **/
-s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index)
-{
-       ixgbe_link_speed speed = 0;
-       bool link_up = 0;
-       u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-
-       /*
-        * Link must be up to auto-blink the LEDs;
-        * Force it if link is down.
-        */
-       hw->mac.ops.check_link(hw, &speed, &link_up, false);
-
-       if (!link_up) {
-               autoc_reg |= IXGBE_AUTOC_AN_RESTART;
-               autoc_reg |= IXGBE_AUTOC_FLU;
-               IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
-               IXGBE_WRITE_FLUSH(hw);
-               usleep_range(10000, 20000);
-       }
-
-       led_reg &= ~IXGBE_LED_MODE_MASK(index);
-       led_reg |= IXGBE_LED_BLINK(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
-       IXGBE_WRITE_FLUSH(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_blink_led_stop_generic - Stop blinking LED based on index.
- *  @hw: pointer to hardware structure
- *  @index: led number to stop blinking
- **/
-s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index)
-{
-       u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-
-       autoc_reg &= ~IXGBE_AUTOC_FLU;
-       autoc_reg |= IXGBE_AUTOC_AN_RESTART;
-       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);
-
-       led_reg &= ~IXGBE_LED_MODE_MASK(index);
-       led_reg &= ~IXGBE_LED_BLINK(index);
-       led_reg |= IXGBE_LED_LINK_ACTIVE << IXGBE_LED_MODE_SHIFT(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);
-       IXGBE_WRITE_FLUSH(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_get_san_mac_addr_offset - Get SAN MAC address offset from the EEPROM
- *  @hw: pointer to hardware structure
- *  @san_mac_offset: SAN MAC address offset
- *
- *  This function will read the EEPROM location for the SAN MAC address
- *  pointer, and returns the value at that location.  This is used in both
- *  get and set mac_addr routines.
- **/
-static s32 ixgbe_get_san_mac_addr_offset(struct ixgbe_hw *hw,
-                                        u16 *san_mac_offset)
-{
-       /*
-        * First read the EEPROM pointer to see if the MAC addresses are
-        * available.
-        */
-       hw->eeprom.ops.read(hw, IXGBE_SAN_MAC_ADDR_PTR, san_mac_offset);
-
-       return 0;
-}
-
-/**
- *  ixgbe_get_san_mac_addr_generic - SAN MAC address retrieval from the EEPROM
- *  @hw: pointer to hardware structure
- *  @san_mac_addr: SAN MAC address
- *
- *  Reads the SAN MAC address from the EEPROM, if it's available.  This is
- *  per-port, so set_lan_id() must be called before reading the addresses.
- *  set_lan_id() is called by identify_sfp(), but this cannot be relied
- *  upon for non-SFP connections, so we must call it here.
- **/
-s32 ixgbe_get_san_mac_addr_generic(struct ixgbe_hw *hw, u8 *san_mac_addr)
-{
-       u16 san_mac_data, san_mac_offset;
-       u8 i;
-
-       /*
-        * First read the EEPROM pointer to see if the MAC addresses are
-        * available.  If they're not, no point in calling set_lan_id() here.
-        */
-       ixgbe_get_san_mac_addr_offset(hw, &san_mac_offset);
-
-       if ((san_mac_offset == 0) || (san_mac_offset == 0xFFFF)) {
-               /*
-                * No addresses available in this EEPROM.  It's not an
-                * error though, so just wipe the local address and return.
-                */
-               for (i = 0; i < 6; i++)
-                       san_mac_addr[i] = 0xFF;
-
-               goto san_mac_addr_out;
-       }
-
-       /* make sure we know which port we need to program */
-       hw->mac.ops.set_lan_id(hw);
-       /* apply the port offset to the address offset */
-       (hw->bus.func) ? (san_mac_offset += IXGBE_SAN_MAC_ADDR_PORT1_OFFSET) :
-                        (san_mac_offset += IXGBE_SAN_MAC_ADDR_PORT0_OFFSET);
-       for (i = 0; i < 3; i++) {
-               hw->eeprom.ops.read(hw, san_mac_offset, &san_mac_data);
-               san_mac_addr[i * 2] = (u8)(san_mac_data);
-               san_mac_addr[i * 2 + 1] = (u8)(san_mac_data >> 8);
-               san_mac_offset++;
-       }
-
-san_mac_addr_out:
-       return 0;
-}
-
-/**
- *  ixgbe_get_pcie_msix_count_generic - Gets MSI-X vector count
- *  @hw: pointer to hardware structure
- *
- *  Read PCIe configuration space, and get the MSI-X vector count from
- *  the capabilities table.
- **/
-u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw)
-{
-       struct ixgbe_adapter *adapter = hw->back;
-       u16 msix_count;
-       pci_read_config_word(adapter->pdev, IXGBE_PCIE_MSIX_82599_CAPS,
-                            &msix_count);
-       msix_count &= IXGBE_PCIE_MSIX_TBL_SZ_MASK;
-
-       /* MSI-X count is zero-based in HW, so increment to give proper value */
-       msix_count++;
-
-       return msix_count;
-}
-
-/**
- *  ixgbe_clear_vmdq_generic - Disassociate a VMDq pool index from a rx address
- *  @hw: pointer to hardware struct
- *  @rar: receive address register index to disassociate
- *  @vmdq: VMDq pool index to remove from the rar
- **/
-s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
-{
-       u32 mpsar_lo, mpsar_hi;
-       u32 rar_entries = hw->mac.num_rar_entries;
-
-       /* Make sure we are using a valid rar index range */
-       if (rar >= rar_entries) {
-               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
-               return IXGBE_ERR_INVALID_ARGUMENT;
-       }
-
-       mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
-       mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
-
-       if (!mpsar_lo && !mpsar_hi)
-               goto done;
-
-       if (vmdq == IXGBE_CLEAR_VMDQ_ALL) {
-               if (mpsar_lo) {
-                       IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0);
-                       mpsar_lo = 0;
-               }
-               if (mpsar_hi) {
-                       IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0);
-                       mpsar_hi = 0;
-               }
-       } else if (vmdq < 32) {
-               mpsar_lo &= ~(1 << vmdq);
-               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar_lo);
-       } else {
-               mpsar_hi &= ~(1 << (vmdq - 32));
-               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar_hi);
-       }
-
-       /* was that the last pool using this rar? */
-       if (mpsar_lo == 0 && mpsar_hi == 0 && rar != 0)
-               hw->mac.ops.clear_rar(hw, rar);
-done:
-       return 0;
-}
-
-/**
- *  ixgbe_set_vmdq_generic - Associate a VMDq pool index with a rx address
- *  @hw: pointer to hardware struct
- *  @rar: receive address register index to associate with a VMDq index
- *  @vmdq: VMDq pool index
- **/
-s32 ixgbe_set_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
-{
-       u32 mpsar;
-       u32 rar_entries = hw->mac.num_rar_entries;
-
-       /* Make sure we are using a valid rar index range */
-       if (rar >= rar_entries) {
-               hw_dbg(hw, "RAR index %d is out of range.\n", rar);
-               return IXGBE_ERR_INVALID_ARGUMENT;
-       }
-
-       if (vmdq < 32) {
-               mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
-               mpsar |= 1 << vmdq;
-               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar);
-       } else {
-               mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
-               mpsar |= 1 << (vmdq - 32);
-               IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar);
-       }
-       return 0;
-}
-
-/**
- *  ixgbe_init_uta_tables_generic - Initialize the Unicast Table Array
- *  @hw: pointer to hardware structure
- **/
-s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw)
-{
-       int i;
-
-       for (i = 0; i < 128; i++)
-               IXGBE_WRITE_REG(hw, IXGBE_UTA(i), 0);
-
-       return 0;
-}
-
-/**
- *  ixgbe_find_vlvf_slot - find the vlanid or the first empty slot
- *  @hw: pointer to hardware structure
- *  @vlan: VLAN id to write to VLAN filter
- *
- *  return the VLVF index where this VLAN id should be placed
- *
- **/
-static s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan)
-{
-       u32 bits = 0;
-       u32 first_empty_slot = 0;
-       s32 regindex;
-
-       /* short cut the special case */
-       if (vlan == 0)
-               return 0;
-
-       /*
-         * Search for the vlan id in the VLVF entries. Save off the first empty
-         * slot found along the way
-         */
-       for (regindex = 1; regindex < IXGBE_VLVF_ENTRIES; regindex++) {
-               bits = IXGBE_READ_REG(hw, IXGBE_VLVF(regindex));
-               if (!bits && !(first_empty_slot))
-                       first_empty_slot = regindex;
-               else if ((bits & 0x0FFF) == vlan)
-                       break;
-       }
-
-       /*
-         * If regindex is less than IXGBE_VLVF_ENTRIES, then we found the vlan
-         * in the VLVF. Else use the first empty VLVF register for this
-         * vlan id.
-         */
-       if (regindex >= IXGBE_VLVF_ENTRIES) {
-               if (first_empty_slot)
-                       regindex = first_empty_slot;
-               else {
-                       hw_dbg(hw, "No space in VLVF.\n");
-                       regindex = IXGBE_ERR_NO_SPACE;
-               }
-       }
-
-       return regindex;
-}
-
-/**
- *  ixgbe_set_vfta_generic - Set VLAN filter table
- *  @hw: pointer to hardware structure
- *  @vlan: VLAN id to write to VLAN filter
- *  @vind: VMDq output index that maps queue to VLAN id in VFVFB
- *  @vlan_on: boolean flag to turn on/off VLAN in VFVF
- *
- *  Turn on/off specified VLAN in the VLAN filter table.
- **/
-s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
-                           bool vlan_on)
-{
-       s32 regindex;
-       u32 bitindex;
-       u32 vfta;
-       u32 bits;
-       u32 vt;
-       u32 targetbit;
-       bool vfta_changed = false;
-
-       if (vlan > 4095)
-               return IXGBE_ERR_PARAM;
-
-       /*
-        * this is a 2 part operation - first the VFTA, then the
-        * VLVF and VLVFB if VT Mode is set
-        * We don't write the VFTA until we know the VLVF part succeeded.
-        */
-
-       /* Part 1
-        * The VFTA is a bitstring made up of 128 32-bit registers
-        * that enable the particular VLAN id, much like the MTA:
-        *    bits[11-5]: which register
-        *    bits[4-0]:  which bit in the register
-        */
-       regindex = (vlan >> 5) & 0x7F;
-       bitindex = vlan & 0x1F;
-       targetbit = (1 << bitindex);
-       vfta = IXGBE_READ_REG(hw, IXGBE_VFTA(regindex));
-
-       if (vlan_on) {
-               if (!(vfta & targetbit)) {
-                       vfta |= targetbit;
-                       vfta_changed = true;
-               }
-       } else {
-               if ((vfta & targetbit)) {
-                       vfta &= ~targetbit;
-                       vfta_changed = true;
-               }
-       }
-
-       /* Part 2
-        * If VT Mode is set
-        *   Either vlan_on
-        *     make sure the vlan is in VLVF
-        *     set the vind bit in the matching VLVFB
-        *   Or !vlan_on
-        *     clear the pool bit and possibly the vind
-        */
-       vt = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
-       if (vt & IXGBE_VT_CTL_VT_ENABLE) {
-               s32 vlvf_index;
-
-               vlvf_index = ixgbe_find_vlvf_slot(hw, vlan);
-               if (vlvf_index < 0)
-                       return vlvf_index;
-
-               if (vlan_on) {
-                       /* set the pool bit */
-                       if (vind < 32) {
-                               bits = IXGBE_READ_REG(hw,
-                                               IXGBE_VLVFB(vlvf_index*2));
-                               bits |= (1 << vind);
-                               IXGBE_WRITE_REG(hw,
-                                               IXGBE_VLVFB(vlvf_index*2),
-                                               bits);
-                       } else {
-                               bits = IXGBE_READ_REG(hw,
-                                               IXGBE_VLVFB((vlvf_index*2)+1));
-                               bits |= (1 << (vind-32));
-                               IXGBE_WRITE_REG(hw,
-                                               IXGBE_VLVFB((vlvf_index*2)+1),
-                                               bits);
-                       }
-               } else {
-                       /* clear the pool bit */
-                       if (vind < 32) {
-                               bits = IXGBE_READ_REG(hw,
-                                               IXGBE_VLVFB(vlvf_index*2));
-                               bits &= ~(1 << vind);
-                               IXGBE_WRITE_REG(hw,
-                                               IXGBE_VLVFB(vlvf_index*2),
-                                               bits);
-                               bits |= IXGBE_READ_REG(hw,
-                                               IXGBE_VLVFB((vlvf_index*2)+1));
-                       } else {
-                               bits = IXGBE_READ_REG(hw,
-                                               IXGBE_VLVFB((vlvf_index*2)+1));
-                               bits &= ~(1 << (vind-32));
-                               IXGBE_WRITE_REG(hw,
-                                               IXGBE_VLVFB((vlvf_index*2)+1),
-                                               bits);
-                               bits |= IXGBE_READ_REG(hw,
-                                               IXGBE_VLVFB(vlvf_index*2));
-                       }
-               }
-
-               /*
-                * If there are still bits set in the VLVFB registers
-                * for the VLAN ID indicated we need to see if the
-                * caller is requesting that we clear the VFTA entry bit.
-                * If the caller has requested that we clear the VFTA
-                * entry bit but there are still pools/VFs using this VLAN
-                * ID entry then ignore the request.  We're not worried
-                * about the case where we're turning the VFTA VLAN ID
-                * entry bit on, only when requested to turn it off as
-                * there may be multiple pools and/or VFs using the
-                * VLAN ID entry.  In that case we cannot clear the
-                * VFTA bit until all pools/VFs using that VLAN ID have also
-                * been cleared.  This will be indicated by "bits" being
-                * zero.
-                */
-               if (bits) {
-                       IXGBE_WRITE_REG(hw, IXGBE_VLVF(vlvf_index),
-                                       (IXGBE_VLVF_VIEN | vlan));
-                       if (!vlan_on) {
-                               /* someone wants to clear the vfta entry
-                                * but some pools/VFs are still using it.
-                                * Ignore it. */
-                               vfta_changed = false;
-                       }
-               }
-               else
-                       IXGBE_WRITE_REG(hw, IXGBE_VLVF(vlvf_index), 0);
-       }
-
-       if (vfta_changed)
-               IXGBE_WRITE_REG(hw, IXGBE_VFTA(regindex), vfta);
-
-       return 0;
-}
-
-/**
- *  ixgbe_clear_vfta_generic - Clear VLAN filter table
- *  @hw: pointer to hardware structure
- *
- *  Clears the VLAN filer table, and the VMDq index associated with the filter
- **/
-s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw)
-{
-       u32 offset;
-
-       for (offset = 0; offset < hw->mac.vft_size; offset++)
-               IXGBE_WRITE_REG(hw, IXGBE_VFTA(offset), 0);
-
-       for (offset = 0; offset < IXGBE_VLVF_ENTRIES; offset++) {
-               IXGBE_WRITE_REG(hw, IXGBE_VLVF(offset), 0);
-               IXGBE_WRITE_REG(hw, IXGBE_VLVFB(offset*2), 0);
-               IXGBE_WRITE_REG(hw, IXGBE_VLVFB((offset*2)+1), 0);
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_check_mac_link_generic - Determine link and speed status
- *  @hw: pointer to hardware structure
- *  @speed: pointer to link speed
- *  @link_up: true when link is up
- *  @link_up_wait_to_complete: bool used to wait for link up or not
- *
- *  Reads the links register to determine if link is up and the current speed
- **/
-s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
-                                bool *link_up, bool link_up_wait_to_complete)
-{
-       u32 links_reg, links_orig;
-       u32 i;
-
-       /* clear the old state */
-       links_orig = IXGBE_READ_REG(hw, IXGBE_LINKS);
-
-       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
-
-       if (links_orig != links_reg) {
-               hw_dbg(hw, "LINKS changed from %08X to %08X\n",
-                      links_orig, links_reg);
-       }
-
-       if (link_up_wait_to_complete) {
-               for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
-                       if (links_reg & IXGBE_LINKS_UP) {
-                               *link_up = true;
-                               break;
-                       } else {
-                               *link_up = false;
-                       }
-                       msleep(100);
-                       links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
-               }
-       } else {
-               if (links_reg & IXGBE_LINKS_UP)
-                       *link_up = true;
-               else
-                       *link_up = false;
-       }
-
-       if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
-           IXGBE_LINKS_SPEED_10G_82599)
-               *speed = IXGBE_LINK_SPEED_10GB_FULL;
-       else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
-                IXGBE_LINKS_SPEED_1G_82599)
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-       else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
-                IXGBE_LINKS_SPEED_100_82599)
-               *speed = IXGBE_LINK_SPEED_100_FULL;
-       else
-               *speed = IXGBE_LINK_SPEED_UNKNOWN;
-
-       /* if link is down, zero out the current_mode */
-       if (*link_up == false) {
-               hw->fc.current_mode = ixgbe_fc_none;
-               hw->fc.fc_was_autonegged = false;
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_get_wwn_prefix_generic Get alternative WWNN/WWPN prefix from
- *  the EEPROM
- *  @hw: pointer to hardware structure
- *  @wwnn_prefix: the alternative WWNN prefix
- *  @wwpn_prefix: the alternative WWPN prefix
- *
- *  This function will read the EEPROM from the alternative SAN MAC address
- *  block to check the support for the alternative WWNN/WWPN prefix support.
- **/
-s32 ixgbe_get_wwn_prefix_generic(struct ixgbe_hw *hw, u16 *wwnn_prefix,
-                                        u16 *wwpn_prefix)
-{
-       u16 offset, caps;
-       u16 alt_san_mac_blk_offset;
-
-       /* clear output first */
-       *wwnn_prefix = 0xFFFF;
-       *wwpn_prefix = 0xFFFF;
-
-       /* check if alternative SAN MAC is supported */
-       hw->eeprom.ops.read(hw, IXGBE_ALT_SAN_MAC_ADDR_BLK_PTR,
-                           &alt_san_mac_blk_offset);
-
-       if ((alt_san_mac_blk_offset == 0) ||
-           (alt_san_mac_blk_offset == 0xFFFF))
-               goto wwn_prefix_out;
-
-       /* check capability in alternative san mac address block */
-       offset = alt_san_mac_blk_offset + IXGBE_ALT_SAN_MAC_ADDR_CAPS_OFFSET;
-       hw->eeprom.ops.read(hw, offset, &caps);
-       if (!(caps & IXGBE_ALT_SAN_MAC_ADDR_CAPS_ALTWWN))
-               goto wwn_prefix_out;
-
-       /* get the corresponding prefix for WWNN/WWPN */
-       offset = alt_san_mac_blk_offset + IXGBE_ALT_SAN_MAC_ADDR_WWNN_OFFSET;
-       hw->eeprom.ops.read(hw, offset, wwnn_prefix);
-
-       offset = alt_san_mac_blk_offset + IXGBE_ALT_SAN_MAC_ADDR_WWPN_OFFSET;
-       hw->eeprom.ops.read(hw, offset, wwpn_prefix);
-
-wwn_prefix_out:
-       return 0;
-}
-
-/**
- *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow
- *  control
- *  @hw: pointer to hardware structure
- *
- *  There are several phys that do not support autoneg flow control. This
- *  function check the device id to see if the associated phy supports
- *  autoneg flow control.
- **/
-static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
-{
-
-       switch (hw->device_id) {
-       case IXGBE_DEV_ID_X540T:
-               return 0;
-       case IXGBE_DEV_ID_82599_T3_LOM:
-               return 0;
-       default:
-               return IXGBE_ERR_FC_NOT_SUPPORTED;
-       }
-}
-
-/**
- *  ixgbe_set_mac_anti_spoofing - Enable/Disable MAC anti-spoofing
- *  @hw: pointer to hardware structure
- *  @enable: enable or disable switch for anti-spoofing
- *  @pf: Physical Function pool - do not enable anti-spoofing for the PF
- *
- **/
-void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf)
-{
-       int j;
-       int pf_target_reg = pf >> 3;
-       int pf_target_shift = pf % 8;
-       u32 pfvfspoof = 0;
-
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               return;
-
-       if (enable)
-               pfvfspoof = IXGBE_SPOOF_MACAS_MASK;
-
-       /*
-        * PFVFSPOOF register array is size 8 with 8 bits assigned to
-        * MAC anti-spoof enables in each register array element.
-        */
-       for (j = 0; j < IXGBE_PFVFSPOOF_REG_COUNT; j++)
-               IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(j), pfvfspoof);
-
-       /* If not enabling anti-spoofing then done */
-       if (!enable)
-               return;
-
-       /*
-        * The PF should be allowed to spoof so that it can support
-        * emulation mode NICs.  Reset the bit assigned to the PF
-        */
-       pfvfspoof = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(pf_target_reg));
-       pfvfspoof ^= (1 << pf_target_shift);
-       IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(pf_target_reg), pfvfspoof);
-}
-
-/**
- *  ixgbe_set_vlan_anti_spoofing - Enable/Disable VLAN anti-spoofing
- *  @hw: pointer to hardware structure
- *  @enable: enable or disable switch for VLAN anti-spoofing
- *  @pf: Virtual Function pool - VF Pool to set for VLAN anti-spoofing
- *
- **/
-void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf)
-{
-       int vf_target_reg = vf >> 3;
-       int vf_target_shift = vf % 8 + IXGBE_SPOOF_VLANAS_SHIFT;
-       u32 pfvfspoof;
-
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               return;
-
-       pfvfspoof = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg));
-       if (enable)
-               pfvfspoof |= (1 << vf_target_shift);
-       else
-               pfvfspoof &= ~(1 << vf_target_shift);
-       IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), pfvfspoof);
-}
-
-/**
- *  ixgbe_get_device_caps_generic - Get additional device capabilities
- *  @hw: pointer to hardware structure
- *  @device_caps: the EEPROM word with the extra device capabilities
- *
- *  This function will read the EEPROM location for the device capabilities,
- *  and return the word through device_caps.
- **/
-s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps)
-{
-       hw->eeprom.ops.read(hw, IXGBE_DEVICE_CAPS, device_caps);
-
-       return 0;
-}
-
-/**
- * ixgbe_set_rxpba_generic - Initialize RX packet buffer
- * @hw: pointer to hardware structure
- * @num_pb: number of packet buffers to allocate
- * @headroom: reserve n KB of headroom
- * @strategy: packet buffer allocation strategy
- **/
-void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw,
-                            int num_pb,
-                            u32 headroom,
-                            int strategy)
-{
-       u32 pbsize = hw->mac.rx_pb_size;
-       int i = 0;
-       u32 rxpktsize, txpktsize, txpbthresh;
-
-       /* Reserve headroom */
-       pbsize -= headroom;
-
-       if (!num_pb)
-               num_pb = 1;
-
-       /* Divide remaining packet buffer space amongst the number
-        * of packet buffers requested using supplied strategy.
-        */
-       switch (strategy) {
-       case (PBA_STRATEGY_WEIGHTED):
-               /* pba_80_48 strategy weight first half of packet buffer with
-                * 5/8 of the packet buffer space.
-                */
-               rxpktsize = ((pbsize * 5 * 2) / (num_pb * 8));
-               pbsize -= rxpktsize * (num_pb / 2);
-               rxpktsize <<= IXGBE_RXPBSIZE_SHIFT;
-               for (; i < (num_pb / 2); i++)
-                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
-               /* Fall through to configure remaining packet buffers */
-       case (PBA_STRATEGY_EQUAL):
-               /* Divide the remaining Rx packet buffer evenly among the TCs */
-               rxpktsize = (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT;
-               for (; i < num_pb; i++)
-                       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
-               break;
-       default:
-               break;
-       }
-
-       /*
-        * Setup Tx packet buffer and threshold equally for all TCs
-        * TXPBTHRESH register is set in K so divide by 1024 and subtract
-        * 10 since the largest packet we support is just over 9K.
-        */
-       txpktsize = IXGBE_TXPBSIZE_MAX / num_pb;
-       txpbthresh = (txpktsize / 1024) - IXGBE_TXPKT_SIZE_MAX;
-       for (i = 0; i < num_pb; i++) {
-               IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), txpktsize);
-               IXGBE_WRITE_REG(hw, IXGBE_TXPBTHRESH(i), txpbthresh);
-       }
-
-       /* Clear unused TCs, if any, to zero buffer size*/
-       for (; i < IXGBE_MAX_PB; i++) {
-               IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), 0);
-               IXGBE_WRITE_REG(hw, IXGBE_TXPBSIZE(i), 0);
-               IXGBE_WRITE_REG(hw, IXGBE_TXPBTHRESH(i), 0);
-       }
-}
-
-/**
- *  ixgbe_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 ixgbe_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);
-}
-
-/**
- *  ixgbe_host_interface_command - Issue command to manageability block
- *  @hw: pointer to the HW structure
- *  @buffer: contains the command to write and where the return status will
- *           be placed
- *  @lenght: lenght of buffer, must be multiple of 4 bytes
- *
- *  Communicates with the manageability block.  On success return 0
- *  else return IXGBE_ERR_HOST_INTERFACE_COMMAND.
- **/
-static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u8 *buffer,
-                                       u32 length)
-{
-       u32 hicr, i;
-       u32 hdr_size = sizeof(struct ixgbe_hic_hdr);
-       u8 buf_len, dword_len;
-
-       s32 ret_val = 0;
-
-       if (length == 0 || length & 0x3 ||
-           length > IXGBE_HI_MAX_BLOCK_BYTE_LENGTH) {
-               hw_dbg(hw, "Buffer length failure.\n");
-               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-
-       /* Check that the host interface is enabled. */
-       hicr = IXGBE_READ_REG(hw, IXGBE_HICR);
-       if ((hicr & IXGBE_HICR_EN) == 0) {
-               hw_dbg(hw, "IXGBE_HOST_EN bit disabled.\n");
-               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-
-       /* Calculate length in DWORDs */
-       dword_len = length >> 2;
-
-       /*
-        * The device driver writes the relevant command block
-        * into the ram area.
-        */
-       for (i = 0; i < dword_len; i++)
-               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_FLEX_MNG,
-                                     i, *((u32 *)buffer + i));
-
-       /* Setting this bit tells the ARC that a new command is pending. */
-       IXGBE_WRITE_REG(hw, IXGBE_HICR, hicr | IXGBE_HICR_C);
-
-       for (i = 0; i < IXGBE_HI_COMMAND_TIMEOUT; i++) {
-               hicr = IXGBE_READ_REG(hw, IXGBE_HICR);
-               if (!(hicr & IXGBE_HICR_C))
-                       break;
-               usleep_range(1000, 2000);
-       }
-
-       /* Check command successful completion. */
-       if (i == IXGBE_HI_COMMAND_TIMEOUT ||
-           (!(IXGBE_READ_REG(hw, IXGBE_HICR) & IXGBE_HICR_SV))) {
-               hw_dbg(hw, "Command has failed with no status valid.\n");
-               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-
-       /* Calculate length in DWORDs */
-       dword_len = hdr_size >> 2;
-
-       /* first pull in the header so we know the buffer length */
-       for (i = 0; i < dword_len; i++)
-               *((u32 *)buffer + i) =
-                       IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
-
-       /* If there is any thing in data position pull it in */
-       buf_len = ((struct ixgbe_hic_hdr *)buffer)->buf_len;
-       if (buf_len == 0)
-               goto out;
-
-       if (length < (buf_len + hdr_size)) {
-               hw_dbg(hw, "Buffer not large enough for reply message.\n");
-               ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-
-       /* Calculate length in DWORDs, add one for odd lengths */
-       dword_len = (buf_len + 1) >> 2;
-
-       /* Pull in the rest of the buffer (i is where we left off)*/
-       for (; i < buf_len; i++)
-               *((u32 *)buffer + i) =
-                       IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
-
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_set_fw_drv_ver_generic - Sends driver version to firmware
- *  @hw: pointer to the HW structure
- *  @maj: driver version major number
- *  @min: driver version minor number
- *  @build: driver version build number
- *  @sub: driver version sub build number
- *
- *  Sends driver version number to firmware through the manageability
- *  block.  On success return 0
- *  else returns IXGBE_ERR_SWFW_SYNC when encountering an error acquiring
- *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.
- **/
-s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,
-                                u8 build, u8 sub)
-{
-       struct ixgbe_hic_drv_info fw_cmd;
-       int i;
-       s32 ret_val = 0;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_SW_MNG_SM) != 0) {
-               ret_val = IXGBE_ERR_SWFW_SYNC;
-               goto out;
-       }
-
-       fw_cmd.hdr.cmd = FW_CEM_CMD_DRIVER_INFO;
-       fw_cmd.hdr.buf_len = FW_CEM_CMD_DRIVER_INFO_LEN;
-       fw_cmd.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
-       fw_cmd.port_num = (u8)hw->bus.func;
-       fw_cmd.ver_maj = maj;
-       fw_cmd.ver_min = min;
-       fw_cmd.ver_build = build;
-       fw_cmd.ver_sub = sub;
-       fw_cmd.hdr.checksum = 0;
-       fw_cmd.hdr.checksum = ixgbe_calculate_checksum((u8 *)&fw_cmd,
-                               (FW_CEM_HDR_LEN + fw_cmd.hdr.buf_len));
-       fw_cmd.pad = 0;
-       fw_cmd.pad2 = 0;
-
-       for (i = 0; i <= FW_CEM_MAX_RETRIES; i++) {
-               ret_val = ixgbe_host_interface_command(hw, (u8 *)&fw_cmd,
-                                                      sizeof(fw_cmd));
-               if (ret_val != 0)
-                       continue;
-
-               if (fw_cmd.hdr.cmd_or_resp.ret_status ==
-                   FW_CEM_RESP_STATUS_SUCCESS)
-                       ret_val = 0;
-               else
-                       ret_val = IXGBE_ERR_HOST_INTERFACE_COMMAND;
-
-               break;
-       }
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_SW_MNG_SM);
-out:
-       return ret_val;
-}
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
deleted file mode 100644 (file)
index f24fd64..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_COMMON_H_
-#define _IXGBE_COMMON_H_
-
-#include "ixgbe_type.h"
-#include "ixgbe.h"
-
-u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
-s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
-s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw);
-s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw);
-s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw);
-s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw);
-s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,
-                                  u32 pba_num_size);
-s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr);
-s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw);
-void ixgbe_set_lan_id_multi_port_pcie(struct ixgbe_hw *hw);
-s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);
-
-s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index);
-s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);
-
-s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw);
-s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data);
-s32 ixgbe_write_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
-                                              u16 words, u16 *data);
-s32 ixgbe_read_eerd_generic(struct ixgbe_hw *hw, u16 offset, u16 *data);
-s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset,
-                                  u16 words, u16 *data);
-s32 ixgbe_write_eewr_generic(struct ixgbe_hw *hw, u16 offset, u16 data);
-s32 ixgbe_write_eewr_buffer_generic(struct ixgbe_hw *hw, u16 offset,
-                                   u16 words, u16 *data);
-s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
-                                       u16 *data);
-s32 ixgbe_read_eeprom_buffer_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
-                                             u16 words, u16 *data);
-u16 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw);
-s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,
-                                           u16 *checksum_val);
-s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);
-
-s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
-                          u32 enable_addr);
-s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index);
-s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw);
-s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
-                                     struct net_device *netdev);
-s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw);
-s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);
-s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval);
-s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packtetbuf_num);
-s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw);
-
-s32 ixgbe_validate_mac_addr(u8 *mac_addr);
-s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask);
-void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask);
-s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw);
-s32 ixgbe_get_san_mac_addr_generic(struct ixgbe_hw *hw, u8 *san_mac_addr);
-s32 ixgbe_set_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq);
-s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq);
-s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw);
-s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan,
-                           u32 vind, bool vlan_on);
-s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw);
-s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw,
-                                 ixgbe_link_speed *speed,
-                                 bool *link_up, bool link_up_wait_to_complete);
-s32 ixgbe_get_wwn_prefix_generic(struct ixgbe_hw *hw, u16 *wwnn_prefix,
-                                 u16 *wwpn_prefix);
-s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index);
-s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index);
-void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf);
-void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);
-s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps);
-s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,
-                                u8 build, u8 ver);
-
-void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int num_pb,
-                            u32 headroom, int strategy);
-
-#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
-
-#ifndef writeq
-#define writeq(val, addr) writel((u32) (val), addr); \
-    writel((u32) (val >> 32), (addr + 4));
-#endif
-
-#define IXGBE_WRITE_REG64(a, reg, value) writeq((value), ((a)->hw_addr + (reg)))
-
-#define IXGBE_READ_REG(a, reg) readl((a)->hw_addr + (reg))
-
-#define IXGBE_WRITE_REG_ARRAY(a, reg, offset, value) (\
-    writel((value), ((a)->hw_addr + (reg) + ((offset) << 2))))
-
-#define IXGBE_READ_REG_ARRAY(a, reg, offset) (\
-    readl((a)->hw_addr + (reg) + ((offset) << 2)))
-
-#define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
-
-#define hw_dbg(hw, format, arg...) \
-       netdev_dbg(((struct ixgbe_adapter *)(hw->back))->netdev, format, ##arg)
-#define e_dev_info(format, arg...) \
-       dev_info(&adapter->pdev->dev, format, ## arg)
-#define e_dev_warn(format, arg...) \
-       dev_warn(&adapter->pdev->dev, format, ## arg)
-#define e_dev_err(format, arg...) \
-       dev_err(&adapter->pdev->dev, format, ## arg)
-#define e_dev_notice(format, arg...) \
-       dev_notice(&adapter->pdev->dev, format, ## arg)
-#define e_info(msglvl, format, arg...) \
-       netif_info(adapter, msglvl, adapter->netdev, format, ## arg)
-#define e_err(msglvl, format, arg...) \
-       netif_err(adapter, msglvl, adapter->netdev, format, ## arg)
-#define e_warn(msglvl, format, arg...) \
-       netif_warn(adapter, msglvl, adapter->netdev, format, ## arg)
-#define e_crit(msglvl, format, arg...) \
-       netif_crit(adapter, msglvl, adapter->netdev, format, ## arg)
-#endif /* IXGBE_COMMON */
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c
deleted file mode 100644 (file)
index 9d88c31..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-
-#include "ixgbe.h"
-#include "ixgbe_type.h"
-#include "ixgbe_dcb.h"
-#include "ixgbe_dcb_82598.h"
-#include "ixgbe_dcb_82599.h"
-
-/**
- * ixgbe_ieee_credits - This calculates the ieee traffic class
- * credits from the configured bandwidth percentages. Credits
- * are the smallest unit programmable into the underlying
- * hardware. The IEEE 802.1Qaz specification do not use bandwidth
- * groups so this is much simplified from the CEE case.
- */
-s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame)
-{
-       int min_percent = 100;
-       int min_credit, multiplier;
-       int i;
-
-       min_credit = ((max_frame / 2) + DCB_CREDIT_QUANTUM - 1) /
-                       DCB_CREDIT_QUANTUM;
-
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               if (bw[i] < min_percent && bw[i])
-                       min_percent = bw[i];
-       }
-
-       multiplier = (min_credit / min_percent) + 1;
-
-       /* Find out the hw credits for each TC */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               int val = min(bw[i] * multiplier, MAX_CREDIT_REFILL);
-
-               if (val < min_credit)
-                       val = min_credit;
-               refill[i] = val;
-
-               max[i] = bw[i] ? (bw[i] * MAX_CREDIT)/100 : min_credit;
-       }
-       return 0;
-}
-
-/**
- * ixgbe_dcb_calculate_tc_credits - Calculates traffic class credits
- * @ixgbe_dcb_config: Struct containing DCB settings.
- * @direction: Configuring either Tx or Rx.
- *
- * This function calculates the credits allocated to each traffic class.
- * It should be called only after the rules are checked by
- * ixgbe_dcb_check_config().
- */
-s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *hw,
-                                  struct ixgbe_dcb_config *dcb_config,
-                                  int max_frame, u8 direction)
-{
-       struct tc_bw_alloc *p;
-       int min_credit;
-       int min_multiplier;
-       int min_percent = 100;
-       s32 ret_val = 0;
-       /* Initialization values default for Tx settings */
-       u32 credit_refill       = 0;
-       u32 credit_max          = 0;
-       u16 link_percentage     = 0;
-       u8  bw_percent          = 0;
-       u8  i;
-
-       if (dcb_config == NULL) {
-               ret_val = DCB_ERR_CONFIG;
-               goto out;
-       }
-
-       min_credit = ((max_frame / 2) + DCB_CREDIT_QUANTUM - 1) /
-                       DCB_CREDIT_QUANTUM;
-
-       /* Find smallest link percentage */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               p = &dcb_config->tc_config[i].path[direction];
-               bw_percent = dcb_config->bw_percentage[direction][p->bwg_id];
-               link_percentage = p->bwg_percent;
-
-               link_percentage = (link_percentage * bw_percent) / 100;
-
-               if (link_percentage && link_percentage < min_percent)
-                       min_percent = link_percentage;
-       }
-
-       /*
-        * The ratio between traffic classes will control the bandwidth
-        * percentages seen on the wire. To calculate this ratio we use
-        * a multiplier. It is required that the refill credits must be
-        * larger than the max frame size so here we find the smallest
-        * multiplier that will allow all bandwidth percentages to be
-        * greater than the max frame size.
-        */
-       min_multiplier = (min_credit / min_percent) + 1;
-
-       /* Find out the link percentage for each TC first */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               p = &dcb_config->tc_config[i].path[direction];
-               bw_percent = dcb_config->bw_percentage[direction][p->bwg_id];
-
-               link_percentage = p->bwg_percent;
-               /* Must be careful of integer division for very small nums */
-               link_percentage = (link_percentage * bw_percent) / 100;
-               if (p->bwg_percent > 0 && link_percentage == 0)
-                       link_percentage = 1;
-
-               /* Save link_percentage for reference */
-               p->link_percent = (u8)link_percentage;
-
-               /* Calculate credit refill ratio using multiplier */
-               credit_refill = min(link_percentage * min_multiplier,
-                                   MAX_CREDIT_REFILL);
-               p->data_credits_refill = (u16)credit_refill;
-
-               /* Calculate maximum credit for the TC */
-               credit_max = (link_percentage * MAX_CREDIT) / 100;
-
-               /*
-                * Adjustment based on rule checking, if the percentage
-                * of a TC is too small, the maximum credit may not be
-                * enough to send out a jumbo frame in data plane arbitration.
-                */
-               if (credit_max && (credit_max < min_credit))
-                       credit_max = min_credit;
-
-               if (direction == DCB_TX_CONFIG) {
-                       /*
-                        * Adjustment based on rule checking, if the
-                        * percentage of a TC is too small, the maximum
-                        * credit may not be enough to send out a TSO
-                        * packet in descriptor plane arbitration.
-                        */
-                       if ((hw->mac.type == ixgbe_mac_82598EB) &&
-                           credit_max &&
-                           (credit_max < MINIMUM_CREDIT_FOR_TSO))
-                               credit_max = MINIMUM_CREDIT_FOR_TSO;
-
-                       dcb_config->tc_config[i].desc_credits_max =
-                               (u16)credit_max;
-               }
-
-               p->data_credits_max = (u16)credit_max;
-       }
-
-out:
-       return ret_val;
-}
-
-void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en)
-{
-       int i;
-
-       *pfc_en = 0;
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-               *pfc_en |= (cfg->tc_config[i].dcb_pfc & 0xF) << i;
-}
-
-void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *cfg, int direction,
-                            u16 *refill)
-{
-       struct tc_bw_alloc *p;
-       int i;
-
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               p = &cfg->tc_config[i].path[direction];
-               refill[i] = p->data_credits_refill;
-       }
-}
-
-void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *cfg, u16 *max)
-{
-       int i;
-
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-               max[i] = cfg->tc_config[i].desc_credits_max;
-}
-
-void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *cfg, int direction,
-                           u8 *bwgid)
-{
-       struct tc_bw_alloc *p;
-       int i;
-
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               p = &cfg->tc_config[i].path[direction];
-               bwgid[i] = p->bwg_id;
-       }
-}
-
-void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *cfg, int direction,
-                           u8 *ptype)
-{
-       struct tc_bw_alloc *p;
-       int i;
-
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               p = &cfg->tc_config[i].path[direction];
-               ptype[i] = p->prio_type;
-       }
-}
-
-/**
- * ixgbe_dcb_hw_config - Config and enable DCB
- * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
- *
- * Configure dcb settings and enable dcb mode.
- */
-s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
-                        struct ixgbe_dcb_config *dcb_config)
-{
-       s32 ret = 0;
-       u8 pfc_en;
-       u8 ptype[MAX_TRAFFIC_CLASS];
-       u8 bwgid[MAX_TRAFFIC_CLASS];
-       u16 refill[MAX_TRAFFIC_CLASS];
-       u16 max[MAX_TRAFFIC_CLASS];
-       /* CEE does not define a priority to tc mapping so map 1:1 */
-       u8 prio_tc[MAX_TRAFFIC_CLASS] = {0, 1, 2, 3, 4, 5, 6, 7};
-
-       /* Unpack CEE standard containers */
-       ixgbe_dcb_unpack_pfc(dcb_config, &pfc_en);
-       ixgbe_dcb_unpack_refill(dcb_config, DCB_TX_CONFIG, refill);
-       ixgbe_dcb_unpack_max(dcb_config, max);
-       ixgbe_dcb_unpack_bwgid(dcb_config, DCB_TX_CONFIG, bwgid);
-       ixgbe_dcb_unpack_prio(dcb_config, DCB_TX_CONFIG, ptype);
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               ret = ixgbe_dcb_hw_config_82598(hw, pfc_en, refill, max,
-                                               bwgid, ptype);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               ret = ixgbe_dcb_hw_config_82599(hw, pfc_en, refill, max,
-                                               bwgid, ptype, prio_tc);
-               break;
-       default:
-               break;
-       }
-       return ret;
-}
-
-/* Helper routines to abstract HW specifics from DCB netlink ops */
-s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en)
-{
-       int ret = -EINVAL;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               ret = ixgbe_dcb_config_pfc_82598(hw, pfc_en);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               ret = ixgbe_dcb_config_pfc_82599(hw, pfc_en);
-               break;
-       default:
-               break;
-       }
-       return ret;
-}
-
-s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw,
-                           u16 *refill, u16 *max, u8 *bwg_id,
-                           u8 *prio_type, u8 *prio_tc)
-{
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max,
-                                                       prio_type);
-               ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
-                                                            bwg_id, prio_type);
-               ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
-                                                            bwg_id, prio_type);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max,
-                                                 bwg_id, prio_type, prio_tc);
-               ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
-                                                      bwg_id, prio_type);
-               ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max, bwg_id,
-                                                      prio_type, prio_tc);
-               break;
-       default:
-               break;
-       }
-       return 0;
-}
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h
deleted file mode 100644 (file)
index e85826a..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _DCB_CONFIG_H_
-#define _DCB_CONFIG_H_
-
-#include "ixgbe_type.h"
-
-/* DCB data structures */
-
-#define IXGBE_MAX_PACKET_BUFFERS 8
-#define MAX_USER_PRIORITY        8
-#define MAX_TRAFFIC_CLASS        8
-#define MAX_BW_GROUP             8
-#define BW_PERCENT               100
-
-#define DCB_TX_CONFIG            0
-#define DCB_RX_CONFIG            1
-
-/* DCB error Codes */
-#define DCB_SUCCESS              0
-#define DCB_ERR_CONFIG           -1
-#define DCB_ERR_PARAM            -2
-
-/* Transmit and receive Errors */
-/* Error in bandwidth group allocation */
-#define DCB_ERR_BW_GROUP        -3
-/* Error in traffic class bandwidth allocation */
-#define DCB_ERR_TC_BW           -4
-/* Traffic class has both link strict and group strict enabled */
-#define DCB_ERR_LS_GS           -5
-/* Link strict traffic class has non zero bandwidth */
-#define DCB_ERR_LS_BW_NONZERO   -6
-/* Link strict bandwidth group has non zero bandwidth */
-#define DCB_ERR_LS_BWG_NONZERO  -7
-/*  Traffic class has zero bandwidth */
-#define DCB_ERR_TC_BW_ZERO      -8
-
-#define DCB_NOT_IMPLEMENTED      0x7FFFFFFF
-
-struct dcb_pfc_tc_debug {
-       u8  tc;
-       u8  pause_status;
-       u64 pause_quanta;
-};
-
-enum strict_prio_type {
-       prio_none = 0,
-       prio_group,
-       prio_link
-};
-
-/* DCB capability definitions */
-#define IXGBE_DCB_PG_SUPPORT        0x00000001
-#define IXGBE_DCB_PFC_SUPPORT       0x00000002
-#define IXGBE_DCB_BCN_SUPPORT       0x00000004
-#define IXGBE_DCB_UP2TC_SUPPORT     0x00000008
-#define IXGBE_DCB_GSP_SUPPORT       0x00000010
-
-#define IXGBE_DCB_8_TC_SUPPORT      0x80
-
-struct dcb_support {
-       /* DCB capabilities */
-       u32 capabilities;
-
-       /* Each bit represents a number of TCs configurable in the hw.
-        * If 8 traffic classes can be configured, the value is 0x80.
-        */
-       u8  traffic_classes;
-       u8  pfc_traffic_classes;
-};
-
-/* Traffic class bandwidth allocation per direction */
-struct tc_bw_alloc {
-       u8 bwg_id;                /* Bandwidth Group (BWG) ID */
-       u8 bwg_percent;           /* % of BWG's bandwidth */
-       u8 link_percent;          /* % of link bandwidth */
-       u8 up_to_tc_bitmap;       /* User Priority to Traffic Class mapping */
-       u16 data_credits_refill;  /* Credit refill amount in 64B granularity */
-       u16 data_credits_max;     /* Max credits for a configured packet buffer
-                                  * in 64B granularity.*/
-       enum strict_prio_type prio_type; /* Link or Group Strict Priority */
-};
-
-enum dcb_pfc_type {
-       pfc_disabled = 0,
-       pfc_enabled_full,
-       pfc_enabled_tx,
-       pfc_enabled_rx
-};
-
-/* Traffic class configuration */
-struct tc_configuration {
-       struct tc_bw_alloc path[2]; /* One each for Tx/Rx */
-       enum dcb_pfc_type  dcb_pfc; /* Class based flow control setting */
-
-       u16 desc_credits_max; /* For Tx Descriptor arbitration */
-       u8 tc; /* Traffic class (TC) */
-};
-
-struct dcb_num_tcs {
-       u8 pg_tcs;
-       u8 pfc_tcs;
-};
-
-struct ixgbe_dcb_config {
-       struct dcb_support support;
-       struct dcb_num_tcs num_tcs;
-       struct tc_configuration tc_config[MAX_TRAFFIC_CLASS];
-       u8     bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */
-       bool   pfc_mode_enable;
-
-       u32  dcb_cfg_version; /* Not used...OS-specific? */
-       u32  link_speed; /* For bandwidth allocation validation purpose */
-};
-
-/* DCB driver APIs */
-void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en);
-void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *, int, u16 *);
-void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *, u16 *);
-void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *, int, u8 *);
-void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *, int, u8 *);
-
-/* DCB credits calculation */
-s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame);
-s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *,
-                                  struct ixgbe_dcb_config *, int, u8);
-
-/* DCB hw initialization */
-s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw, u16 *refill, u16 *max,
-                           u8 *bwg_id, u8 *prio_type, u8 *tc_prio);
-s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en);
-s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *);
-
-/* DCB definitions for credit calculation */
-#define DCB_CREDIT_QUANTUM     64   /* DCB Quantum */
-#define MAX_CREDIT_REFILL       511  /* 0x1FF * 64B = 32704B */
-#define DCB_MAX_TSO_SIZE        (32*1024) /* MAX TSO packet size supported in DCB mode */
-#define MINIMUM_CREDIT_FOR_TSO  (DCB_MAX_TSO_SIZE/64 + 1) /* 513 for 32KB TSO packet */
-#define MAX_CREDIT              4095 /* Maximum credit supported: 256KB * 1204 / 64B */
-
-#endif /* _DCB_CONFIG_H */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/ixgbe_dcb_82598.c
deleted file mode 100644 (file)
index 2288c3c..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include "ixgbe.h"
-#include "ixgbe_type.h"
-#include "ixgbe_dcb.h"
-#include "ixgbe_dcb_82598.h"
-
-/**
- * ixgbe_dcb_config_rx_arbiter_82598 - Config Rx data arbiter
- * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
- *
- * Configure Rx Data Arbiter and credits for each traffic class.
- */
-s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
-                                       u16 *refill,
-                                       u16 *max,
-                                       u8 *prio_type)
-{
-       u32    reg           = 0;
-       u32    credit_refill = 0;
-       u32    credit_max    = 0;
-       u8     i             = 0;
-
-       reg = IXGBE_READ_REG(hw, IXGBE_RUPPBMR) | IXGBE_RUPPBMR_MQA;
-       IXGBE_WRITE_REG(hw, IXGBE_RUPPBMR, reg);
-
-       reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
-       /* Enable Arbiter */
-       reg &= ~IXGBE_RMCS_ARBDIS;
-       /* Enable Receive Recycle within the BWG */
-       reg |= IXGBE_RMCS_RRM;
-       /* Enable Deficit Fixed Priority arbitration*/
-       reg |= IXGBE_RMCS_DFP;
-
-       IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
-
-       /* Configure traffic class credits and priority */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               credit_refill = refill[i];
-               credit_max    = max[i];
-
-               reg = credit_refill | (credit_max << IXGBE_RT2CR_MCL_SHIFT);
-
-               if (prio_type[i] == prio_link)
-                       reg |= IXGBE_RT2CR_LSP;
-
-               IXGBE_WRITE_REG(hw, IXGBE_RT2CR(i), reg);
-       }
-
-       reg = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);
-       reg |= IXGBE_RDRXCTL_RDMTS_1_2;
-       reg |= IXGBE_RDRXCTL_MPBEN;
-       reg |= IXGBE_RDRXCTL_MCEN;
-       IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, reg);
-
-       reg = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
-       /* Make sure there is enough descriptors before arbitration */
-       reg &= ~IXGBE_RXCTRL_DMBYPS;
-       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg);
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_tx_desc_arbiter_82598 - Config Tx Desc. arbiter
- * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
- *
- * Configure Tx Descriptor Arbiter and credits for each traffic class.
- */
-s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
-                                               u16 *refill,
-                                               u16 *max,
-                                               u8 *bwg_id,
-                                               u8 *prio_type)
-{
-       u32    reg, max_credits;
-       u8     i;
-
-       reg = IXGBE_READ_REG(hw, IXGBE_DPMCS);
-
-       /* Enable arbiter */
-       reg &= ~IXGBE_DPMCS_ARBDIS;
-       /* Enable DFP and Recycle mode */
-       reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);
-       reg |= IXGBE_DPMCS_TSOEF;
-       /* Configure Max TSO packet size 34KB including payload and headers */
-       reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT);
-
-       IXGBE_WRITE_REG(hw, IXGBE_DPMCS, reg);
-
-       /* Configure traffic class credits and priority */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               max_credits = max[i];
-               reg = max_credits << IXGBE_TDTQ2TCCR_MCL_SHIFT;
-               reg |= refill[i];
-               reg |= (u32)(bwg_id[i]) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
-
-               if (prio_type[i] == prio_group)
-                       reg |= IXGBE_TDTQ2TCCR_GSP;
-
-               if (prio_type[i] == prio_link)
-                       reg |= IXGBE_TDTQ2TCCR_LSP;
-
-               IXGBE_WRITE_REG(hw, IXGBE_TDTQ2TCCR(i), reg);
-       }
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_tx_data_arbiter_82598 - Config Tx data arbiter
- * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
- *
- * Configure Tx Data Arbiter and credits for each traffic class.
- */
-s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
-                                               u16 *refill,
-                                               u16 *max,
-                                               u8 *bwg_id,
-                                               u8 *prio_type)
-{
-       u32 reg;
-       u8 i;
-
-       reg = IXGBE_READ_REG(hw, IXGBE_PDPMCS);
-       /* Enable Data Plane Arbiter */
-       reg &= ~IXGBE_PDPMCS_ARBDIS;
-       /* Enable DFP and Transmit Recycle Mode */
-       reg |= (IXGBE_PDPMCS_TPPAC | IXGBE_PDPMCS_TRM);
-
-       IXGBE_WRITE_REG(hw, IXGBE_PDPMCS, reg);
-
-       /* Configure traffic class credits and priority */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               reg = refill[i];
-               reg |= (u32)(max[i]) << IXGBE_TDPT2TCCR_MCL_SHIFT;
-               reg |= (u32)(bwg_id[i]) << IXGBE_TDPT2TCCR_BWG_SHIFT;
-
-               if (prio_type[i] == prio_group)
-                       reg |= IXGBE_TDPT2TCCR_GSP;
-
-               if (prio_type[i] == prio_link)
-                       reg |= IXGBE_TDPT2TCCR_LSP;
-
-               IXGBE_WRITE_REG(hw, IXGBE_TDPT2TCCR(i), reg);
-       }
-
-       /* Enable Tx packet buffer division */
-       reg = IXGBE_READ_REG(hw, IXGBE_DTXCTL);
-       reg |= IXGBE_DTXCTL_ENDBUBD;
-       IXGBE_WRITE_REG(hw, IXGBE_DTXCTL, reg);
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_pfc_82598 - Config priority flow control
- * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
- *
- * Configure Priority Flow Control for each traffic class.
- */
-s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, u8 pfc_en)
-{
-       u32 reg, rx_pba_size;
-       u8  i;
-
-       if (pfc_en) {
-               /* Enable Transmit Priority Flow Control */
-               reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
-               reg &= ~IXGBE_RMCS_TFCE_802_3X;
-               /* correct the reporting of our flow control status */
-               reg |= IXGBE_RMCS_TFCE_PRIORITY;
-               IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
-
-               /* Enable Receive Priority Flow Control */
-               reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-               reg &= ~IXGBE_FCTRL_RFCE;
-               reg |= IXGBE_FCTRL_RPFCE;
-               IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg);
-
-               /* Configure pause time */
-               for (i = 0; i < (MAX_TRAFFIC_CLASS >> 1); i++)
-                       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), 0x68006800);
-
-               /* Configure flow control refresh threshold value */
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTV, 0x3400);
-       }
-
-       /*
-        * Configure flow control thresholds and enable priority flow control
-        * for each traffic class.
-        */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               int enabled = pfc_en & (1 << i);
-               rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
-               rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
-               reg = (rx_pba_size - hw->fc.low_water) << 10;
-
-               if (enabled == pfc_enabled_tx ||
-                   enabled == pfc_enabled_full)
-                       reg |= IXGBE_FCRTL_XONE;
-
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), reg);
-
-               reg = (rx_pba_size - hw->fc.high_water) << 10;
-               if (enabled == pfc_enabled_tx ||
-                   enabled == pfc_enabled_full)
-                       reg |= IXGBE_FCRTH_FCEN;
-
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg);
-       }
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_tc_stats_82598 - Configure traffic class statistics
- * @hw: pointer to hardware structure
- *
- * Configure queue statistics registers, all queues belonging to same traffic
- * class uses a single set of queue statistics counters.
- */
-static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
-{
-       u32 reg = 0;
-       u8  i   = 0;
-       u8  j   = 0;
-
-       /* Receive Queues stats setting -  8 queues per statistics reg */
-       for (i = 0, j = 0; i < 15 && j < 8; i = i + 2, j++) {
-               reg = IXGBE_READ_REG(hw, IXGBE_RQSMR(i));
-               reg |= ((0x1010101) * j);
-               IXGBE_WRITE_REG(hw, IXGBE_RQSMR(i), reg);
-               reg = IXGBE_READ_REG(hw, IXGBE_RQSMR(i + 1));
-               reg |= ((0x1010101) * j);
-               IXGBE_WRITE_REG(hw, IXGBE_RQSMR(i + 1), reg);
-       }
-       /* Transmit Queues stats setting -  4 queues per statistics reg */
-       for (i = 0; i < 8; i++) {
-               reg = IXGBE_READ_REG(hw, IXGBE_TQSMR(i));
-               reg |= ((0x1010101) * i);
-               IXGBE_WRITE_REG(hw, IXGBE_TQSMR(i), reg);
-       }
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_hw_config_82598 - Config and enable DCB
- * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
- *
- * Configure dcb settings and enable dcb mode.
- */
-s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
-                             u16 *max, u8 *bwg_id, u8 *prio_type)
-{
-       ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max, prio_type);
-       ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
-                                              bwg_id, prio_type);
-       ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
-                                              bwg_id, prio_type);
-       ixgbe_dcb_config_pfc_82598(hw, pfc_en);
-       ixgbe_dcb_config_tc_stats_82598(hw);
-
-       return 0;
-}
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ixgbe/ixgbe_dcb_82598.h
deleted file mode 100644 (file)
index 2f31893..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _DCB_82598_CONFIG_H_
-#define _DCB_82598_CONFIG_H_
-
-/* DCB register definitions */
-
-#define IXGBE_DPMCS_MTSOS_SHIFT 16
-#define IXGBE_DPMCS_TDPAC       0x00000001 /* 0 Round Robin, 1 DFP - Deficit Fixed Priority */
-#define IXGBE_DPMCS_TRM         0x00000010 /* Transmit Recycle Mode */
-#define IXGBE_DPMCS_ARBDIS      0x00000040 /* DCB arbiter disable */
-#define IXGBE_DPMCS_TSOEF       0x00080000 /* TSO Expand Factor: 0=x4, 1=x2 */
-
-#define IXGBE_RUPPBMR_MQA       0x80000000 /* Enable UP to queue mapping */
-
-#define IXGBE_RT2CR_MCL_SHIFT   12 /* Offset to Max Credit Limit setting */
-#define IXGBE_RT2CR_LSP         0x80000000 /* LSP enable bit */
-
-#define IXGBE_RDRXCTL_MPBEN     0x00000010 /* DMA config for multiple packet buffers enable */
-#define IXGBE_RDRXCTL_MCEN      0x00000040 /* DMA config for multiple cores (RSS) enable */
-
-#define IXGBE_TDTQ2TCCR_MCL_SHIFT   12
-#define IXGBE_TDTQ2TCCR_BWG_SHIFT   9
-#define IXGBE_TDTQ2TCCR_GSP     0x40000000
-#define IXGBE_TDTQ2TCCR_LSP     0x80000000
-
-#define IXGBE_TDPT2TCCR_MCL_SHIFT   12
-#define IXGBE_TDPT2TCCR_BWG_SHIFT   9
-#define IXGBE_TDPT2TCCR_GSP     0x40000000
-#define IXGBE_TDPT2TCCR_LSP     0x80000000
-
-#define IXGBE_PDPMCS_TPPAC      0x00000020 /* 0 Round Robin, 1 for DFP - Deficit Fixed Priority */
-#define IXGBE_PDPMCS_ARBDIS     0x00000040 /* Arbiter disable */
-#define IXGBE_PDPMCS_TRM        0x00000100 /* Transmit Recycle Mode enable */
-
-#define IXGBE_DTXCTL_ENDBUBD    0x00000004 /* Enable DBU buffer division */
-
-#define IXGBE_TXPBSIZE_40KB     0x0000A000 /* 40KB Packet Buffer */
-#define IXGBE_RXPBSIZE_48KB     0x0000C000 /* 48KB Packet Buffer */
-#define IXGBE_RXPBSIZE_64KB     0x00010000 /* 64KB Packet Buffer */
-#define IXGBE_RXPBSIZE_80KB     0x00014000 /* 80KB Packet Buffer */
-
-#define IXGBE_RDRXCTL_RDMTS_1_2 0x00000000
-
-/* DCB hardware-specific driver APIs */
-
-/* DCB PFC functions */
-s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, u8 pfc_en);
-
-/* DCB hw initialization */
-s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
-                                       u16 *refill,
-                                       u16 *max,
-                                       u8 *prio_type);
-
-s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
-                                               u16 *refill,
-                                               u16 *max,
-                                               u8 *bwg_id,
-                                               u8 *prio_type);
-
-s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
-                                               u16 *refill,
-                                               u16 *max,
-                                               u8 *bwg_id,
-                                               u8 *prio_type);
-
-s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
-                             u16 *max, u8 *bwg_id, u8 *prio_type);
-
-#endif /* _DCB_82598_CONFIG_H */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
deleted file mode 100644 (file)
index ade9820..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include "ixgbe.h"
-#include "ixgbe_type.h"
-#include "ixgbe_dcb.h"
-#include "ixgbe_dcb_82599.h"
-
-/**
- * ixgbe_dcb_config_rx_arbiter_82599 - Config Rx Data arbiter
- * @hw: pointer to hardware structure
- * @refill: refill credits index by traffic class
- * @max: max credits index by traffic class
- * @bwg_id: bandwidth grouping indexed by traffic class
- * @prio_type: priority type indexed by traffic class
- *
- * Configure Rx Packet Arbiter and credits for each traffic class.
- */
-s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
-                                     u16 *refill,
-                                     u16 *max,
-                                     u8 *bwg_id,
-                                     u8 *prio_type,
-                                     u8 *prio_tc)
-{
-       u32    reg           = 0;
-       u32    credit_refill = 0;
-       u32    credit_max    = 0;
-       u8     i             = 0;
-
-       /*
-        * Disable the arbiter before changing parameters
-        * (always enable recycle mode; WSP)
-        */
-       reg = IXGBE_RTRPCS_RRM | IXGBE_RTRPCS_RAC | IXGBE_RTRPCS_ARBDIS;
-       IXGBE_WRITE_REG(hw, IXGBE_RTRPCS, reg);
-
-       /* Map all traffic classes to their UP, 1 to 1 */
-       reg = 0;
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-               reg |= (prio_tc[i] << (i * IXGBE_RTRUP2TC_UP_SHIFT));
-       IXGBE_WRITE_REG(hw, IXGBE_RTRUP2TC, reg);
-
-       /* Configure traffic class credits and priority */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               credit_refill = refill[i];
-               credit_max    = max[i];
-               reg = credit_refill | (credit_max << IXGBE_RTRPT4C_MCL_SHIFT);
-
-               reg |= (u32)(bwg_id[i]) << IXGBE_RTRPT4C_BWG_SHIFT;
-
-               if (prio_type[i] == prio_link)
-                       reg |= IXGBE_RTRPT4C_LSP;
-
-               IXGBE_WRITE_REG(hw, IXGBE_RTRPT4C(i), reg);
-       }
-
-       /*
-        * Configure Rx packet plane (recycle mode; WSP) and
-        * enable arbiter
-        */
-       reg = IXGBE_RTRPCS_RRM | IXGBE_RTRPCS_RAC;
-       IXGBE_WRITE_REG(hw, IXGBE_RTRPCS, reg);
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_tx_desc_arbiter_82599 - Config Tx Desc. arbiter
- * @hw: pointer to hardware structure
- * @refill: refill credits index by traffic class
- * @max: max credits index by traffic class
- * @bwg_id: bandwidth grouping indexed by traffic class
- * @prio_type: priority type indexed by traffic class
- *
- * Configure Tx Descriptor Arbiter and credits for each traffic class.
- */
-s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
-                                          u16 *refill,
-                                          u16 *max,
-                                          u8 *bwg_id,
-                                          u8 *prio_type)
-{
-       u32    reg, max_credits;
-       u8     i;
-
-       /* Clear the per-Tx queue credits; we use per-TC instead */
-       for (i = 0; i < 128; i++) {
-               IXGBE_WRITE_REG(hw, IXGBE_RTTDQSEL, i);
-               IXGBE_WRITE_REG(hw, IXGBE_RTTDT1C, 0);
-       }
-
-       /* Configure traffic class credits and priority */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               max_credits = max[i];
-               reg = max_credits << IXGBE_RTTDT2C_MCL_SHIFT;
-               reg |= refill[i];
-               reg |= (u32)(bwg_id[i]) << IXGBE_RTTDT2C_BWG_SHIFT;
-
-               if (prio_type[i] == prio_group)
-                       reg |= IXGBE_RTTDT2C_GSP;
-
-               if (prio_type[i] == prio_link)
-                       reg |= IXGBE_RTTDT2C_LSP;
-
-               IXGBE_WRITE_REG(hw, IXGBE_RTTDT2C(i), reg);
-       }
-
-       /*
-        * Configure Tx descriptor plane (recycle mode; WSP) and
-        * enable arbiter
-        */
-       reg = IXGBE_RTTDCS_TDPAC | IXGBE_RTTDCS_TDRM;
-       IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, reg);
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_tx_data_arbiter_82599 - Config Tx Data arbiter
- * @hw: pointer to hardware structure
- * @refill: refill credits index by traffic class
- * @max: max credits index by traffic class
- * @bwg_id: bandwidth grouping indexed by traffic class
- * @prio_type: priority type indexed by traffic class
- *
- * Configure Tx Packet Arbiter and credits for each traffic class.
- */
-s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
-                                          u16 *refill,
-                                          u16 *max,
-                                          u8 *bwg_id,
-                                          u8 *prio_type,
-                                          u8 *prio_tc)
-{
-       u32 reg;
-       u8 i;
-
-       /*
-        * Disable the arbiter before changing parameters
-        * (always enable recycle mode; SP; arb delay)
-        */
-       reg = IXGBE_RTTPCS_TPPAC | IXGBE_RTTPCS_TPRM |
-             (IXGBE_RTTPCS_ARBD_DCB << IXGBE_RTTPCS_ARBD_SHIFT) |
-             IXGBE_RTTPCS_ARBDIS;
-       IXGBE_WRITE_REG(hw, IXGBE_RTTPCS, reg);
-
-       /* Map all traffic classes to their UP, 1 to 1 */
-       reg = 0;
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-               reg |= (prio_tc[i] << (i * IXGBE_RTTUP2TC_UP_SHIFT));
-       IXGBE_WRITE_REG(hw, IXGBE_RTTUP2TC, reg);
-
-       /* Configure traffic class credits and priority */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               reg = refill[i];
-               reg |= (u32)(max[i]) << IXGBE_RTTPT2C_MCL_SHIFT;
-               reg |= (u32)(bwg_id[i]) << IXGBE_RTTPT2C_BWG_SHIFT;
-
-               if (prio_type[i] == prio_group)
-                       reg |= IXGBE_RTTPT2C_GSP;
-
-               if (prio_type[i] == prio_link)
-                       reg |= IXGBE_RTTPT2C_LSP;
-
-               IXGBE_WRITE_REG(hw, IXGBE_RTTPT2C(i), reg);
-       }
-
-       /*
-        * Configure Tx packet plane (recycle mode; SP; arb delay) and
-        * enable arbiter
-        */
-       reg = IXGBE_RTTPCS_TPPAC | IXGBE_RTTPCS_TPRM |
-             (IXGBE_RTTPCS_ARBD_DCB << IXGBE_RTTPCS_ARBD_SHIFT);
-       IXGBE_WRITE_REG(hw, IXGBE_RTTPCS, reg);
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_pfc_82599 - Configure priority flow control
- * @hw: pointer to hardware structure
- * @pfc_en: enabled pfc bitmask
- *
- * Configure Priority Flow Control (PFC) for each traffic class.
- */
-s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en)
-{
-       u32 i, reg, rx_pba_size;
-
-       /* Configure PFC Tx thresholds per TC */
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               int enabled = pfc_en & (1 << i);
-               rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
-               rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
-
-               reg = (rx_pba_size - hw->fc.low_water) << 10;
-
-               if (enabled)
-                       reg |= IXGBE_FCRTL_XONE;
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg);
-
-               reg = (rx_pba_size - hw->fc.high_water) << 10;
-               if (enabled)
-                       reg |= IXGBE_FCRTH_FCEN;
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg);
-       }
-
-       if (pfc_en) {
-               /* Configure pause time (2 TCs per register) */
-               reg = hw->fc.pause_time | (hw->fc.pause_time << 16);
-               for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
-                       IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
-
-               /* Configure flow control refresh threshold value */
-               IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
-
-
-               reg = IXGBE_FCCFG_TFCE_PRIORITY;
-               IXGBE_WRITE_REG(hw, IXGBE_FCCFG, reg);
-               /*
-                * Enable Receive PFC
-                * 82599 will always honor XOFF frames we receive when
-                * we are in PFC mode however X540 only honors enabled
-                * traffic classes.
-                */
-               reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-               reg &= ~IXGBE_MFLCN_RFCE;
-               reg |= IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_DPF;
-
-               if (hw->mac.type == ixgbe_mac_X540)
-                       reg |= pfc_en << IXGBE_MFLCN_RPFCE_SHIFT;
-
-               IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
-
-       } else {
-               for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                       hw->mac.ops.fc_enable(hw, i);
-       }
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_config_tc_stats_82599 - Config traffic class statistics
- * @hw: pointer to hardware structure
- *
- * Configure queue statistics registers, all queues belonging to same traffic
- * class uses a single set of queue statistics counters.
- */
-static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
-{
-       u32 reg = 0;
-       u8  i   = 0;
-
-       /*
-        * Receive Queues stats setting
-        * 32 RQSMR registers, each configuring 4 queues.
-        * Set all 16 queues of each TC to the same stat
-        * with TC 'n' going to stat 'n'.
-        */
-       for (i = 0; i < 32; i++) {
-               reg = 0x01010101 * (i / 4);
-               IXGBE_WRITE_REG(hw, IXGBE_RQSMR(i), reg);
-       }
-       /*
-        * Transmit Queues stats setting
-        * 32 TQSM registers, each controlling 4 queues.
-        * Set all queues of each TC to the same stat
-        * with TC 'n' going to stat 'n'.
-        * Tx queues are allocated non-uniformly to TCs:
-        * 32, 32, 16, 16, 8, 8, 8, 8.
-        */
-       for (i = 0; i < 32; i++) {
-               if (i < 8)
-                       reg = 0x00000000;
-               else if (i < 16)
-                       reg = 0x01010101;
-               else if (i < 20)
-                       reg = 0x02020202;
-               else if (i < 24)
-                       reg = 0x03030303;
-               else if (i < 26)
-                       reg = 0x04040404;
-               else if (i < 28)
-                       reg = 0x05050505;
-               else if (i < 30)
-                       reg = 0x06060606;
-               else
-                       reg = 0x07070707;
-               IXGBE_WRITE_REG(hw, IXGBE_TQSM(i), reg);
-       }
-
-       return 0;
-}
-
-/**
- * ixgbe_dcb_hw_config_82599 - Configure and enable DCB
- * @hw: pointer to hardware structure
- * @refill: refill credits index by traffic class
- * @max: max credits index by traffic class
- * @bwg_id: bandwidth grouping indexed by traffic class
- * @prio_type: priority type indexed by traffic class
- * @pfc_en: enabled pfc bitmask
- *
- * Configure dcb settings and enable dcb mode.
- */
-s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
-                             u16 *max, u8 *bwg_id, u8 *prio_type, u8 *prio_tc)
-{
-       ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max, bwg_id,
-                                         prio_type, prio_tc);
-       ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
-                                              bwg_id, prio_type);
-       ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max,
-                                              bwg_id, prio_type, prio_tc);
-       ixgbe_dcb_config_pfc_82599(hw, pfc_en);
-       ixgbe_dcb_config_tc_stats_82599(hw);
-
-       return 0;
-}
-
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ixgbe/ixgbe_dcb_82599.h
deleted file mode 100644 (file)
index 08d1749..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _DCB_82599_CONFIG_H_
-#define _DCB_82599_CONFIG_H_
-
-/* DCB register definitions */
-#define IXGBE_RTTDCS_TDPAC      0x00000001 /* 0 Round Robin,
-                                            * 1 WSP - Weighted Strict Priority
-                                            */
-#define IXGBE_RTTDCS_VMPAC      0x00000002 /* 0 Round Robin,
-                                            * 1 WRR - Weighted Round Robin
-                                            */
-#define IXGBE_RTTDCS_TDRM       0x00000010 /* Transmit Recycle Mode */
-#define IXGBE_RTTDCS_ARBDIS     0x00000040 /* DCB arbiter disable */
-#define IXGBE_RTTDCS_BDPM       0x00400000 /* Bypass Data Pipe - must clear! */
-#define IXGBE_RTTDCS_BPBFSM     0x00800000 /* Bypass PB Free Space - must
-                                             * clear!
-                                             */
-#define IXGBE_RTTDCS_SPEED_CHG  0x80000000 /* Link speed change */
-
-/* Receive UP2TC mapping */
-#define IXGBE_RTRUP2TC_UP_SHIFT 3
-/* Transmit UP2TC mapping */
-#define IXGBE_RTTUP2TC_UP_SHIFT 3
-
-#define IXGBE_RTRPT4C_MCL_SHIFT 12 /* Offset to Max Credit Limit setting */
-#define IXGBE_RTRPT4C_BWG_SHIFT 9  /* Offset to BWG index */
-#define IXGBE_RTRPT4C_GSP       0x40000000 /* GSP enable bit */
-#define IXGBE_RTRPT4C_LSP       0x80000000 /* LSP enable bit */
-
-#define IXGBE_RDRXCTL_MPBEN     0x00000010 /* DMA config for multiple packet
-                                            * buffers enable
-                                            */
-#define IXGBE_RDRXCTL_MCEN      0x00000040 /* DMA config for multiple cores
-                                            * (RSS) enable
-                                            */
-
-/* RTRPCS Bit Masks */
-#define IXGBE_RTRPCS_RRM        0x00000002 /* Receive Recycle Mode enable */
-/* Receive Arbitration Control: 0 Round Robin, 1 DFP */
-#define IXGBE_RTRPCS_RAC        0x00000004
-#define IXGBE_RTRPCS_ARBDIS     0x00000040 /* Arbitration disable bit */
-
-/* RTTDT2C Bit Masks */
-#define IXGBE_RTTDT2C_MCL_SHIFT 12
-#define IXGBE_RTTDT2C_BWG_SHIFT 9
-#define IXGBE_RTTDT2C_GSP       0x40000000
-#define IXGBE_RTTDT2C_LSP       0x80000000
-
-#define IXGBE_RTTPT2C_MCL_SHIFT 12
-#define IXGBE_RTTPT2C_BWG_SHIFT 9
-#define IXGBE_RTTPT2C_GSP       0x40000000
-#define IXGBE_RTTPT2C_LSP       0x80000000
-
-/* RTTPCS Bit Masks */
-#define IXGBE_RTTPCS_TPPAC      0x00000020 /* 0 Round Robin,
-                                            * 1 SP - Strict Priority
-                                            */
-#define IXGBE_RTTPCS_ARBDIS     0x00000040 /* Arbiter disable */
-#define IXGBE_RTTPCS_TPRM       0x00000100 /* Transmit Recycle Mode enable */
-#define IXGBE_RTTPCS_ARBD_SHIFT 22
-#define IXGBE_RTTPCS_ARBD_DCB   0x4        /* Arbitration delay in DCB mode */
-
-/* SECTXMINIFG DCB */
-#define IXGBE_SECTX_DCB                0x00001F00 /* DCB TX Buffer IFG */
-
-
-/* DCB hardware-specific driver APIs */
-
-/* DCB PFC functions */
-s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en);
-
-/* DCB hw initialization */
-s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
-                                       u16 *refill,
-                                       u16 *max,
-                                       u8 *bwg_id,
-                                       u8 *prio_type,
-                                       u8 *prio_tc);
-
-s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
-                                               u16 *refill,
-                                               u16 *max,
-                                               u8 *bwg_id,
-                                               u8 *prio_type);
-
-s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
-                                               u16 *refill,
-                                               u16 *max,
-                                               u8 *bwg_id,
-                                               u8 *prio_type,
-                                               u8 *prio_tc);
-
-s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw, u8 pfc_en, u16 *refill,
-                             u16 *max, u8 *bwg_id, u8 *prio_type,
-                             u8 *prio_tc);
-
-#endif /* _DCB_82599_CONFIG_H */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
deleted file mode 100644 (file)
index 0ace6ce..0000000
+++ /dev/null
@@ -1,816 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include "ixgbe.h"
-#include <linux/dcbnl.h>
-#include "ixgbe_dcb_82598.h"
-#include "ixgbe_dcb_82599.h"
-
-/* Callbacks for DCB netlink in the kernel */
-#define BIT_DCB_MODE   0x01
-#define BIT_PFC                0x02
-#define BIT_PG_RX      0x04
-#define BIT_PG_TX      0x08
-#define BIT_APP_UPCHG  0x10
-#define BIT_LINKSPEED   0x80
-
-/* Responses for the DCB_C_SET_ALL command */
-#define DCB_HW_CHG_RST  0  /* DCB configuration changed with reset */
-#define DCB_NO_HW_CHG   1  /* DCB configuration did not change */
-#define DCB_HW_CHG      2  /* DCB configuration changed, no reset */
-
-int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
-                       struct ixgbe_dcb_config *dst_dcb_cfg, int tc_max)
-{
-       struct tc_configuration *src_tc_cfg = NULL;
-       struct tc_configuration *dst_tc_cfg = NULL;
-       int i;
-
-       if (!src_dcb_cfg || !dst_dcb_cfg)
-               return -EINVAL;
-
-       for (i = DCB_PG_ATTR_TC_0; i < tc_max + DCB_PG_ATTR_TC_0; i++) {
-               src_tc_cfg = &src_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
-               dst_tc_cfg = &dst_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
-
-               dst_tc_cfg->path[DCB_TX_CONFIG].prio_type =
-                               src_tc_cfg->path[DCB_TX_CONFIG].prio_type;
-
-               dst_tc_cfg->path[DCB_TX_CONFIG].bwg_id =
-                               src_tc_cfg->path[DCB_TX_CONFIG].bwg_id;
-
-               dst_tc_cfg->path[DCB_TX_CONFIG].bwg_percent =
-                               src_tc_cfg->path[DCB_TX_CONFIG].bwg_percent;
-
-               dst_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap =
-                               src_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap;
-
-               dst_tc_cfg->path[DCB_RX_CONFIG].prio_type =
-                               src_tc_cfg->path[DCB_RX_CONFIG].prio_type;
-
-               dst_tc_cfg->path[DCB_RX_CONFIG].bwg_id =
-                               src_tc_cfg->path[DCB_RX_CONFIG].bwg_id;
-
-               dst_tc_cfg->path[DCB_RX_CONFIG].bwg_percent =
-                               src_tc_cfg->path[DCB_RX_CONFIG].bwg_percent;
-
-               dst_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap =
-                               src_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap;
-       }
-
-       for (i = DCB_PG_ATTR_BW_ID_0; i < DCB_PG_ATTR_BW_ID_MAX; i++) {
-               dst_dcb_cfg->bw_percentage[DCB_TX_CONFIG]
-                       [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
-                               [DCB_TX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
-               dst_dcb_cfg->bw_percentage[DCB_RX_CONFIG]
-                       [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
-                               [DCB_RX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
-       }
-
-       for (i = DCB_PFC_UP_ATTR_0; i < DCB_PFC_UP_ATTR_MAX; i++) {
-               dst_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc =
-                       src_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc;
-       }
-
-       dst_dcb_cfg->pfc_mode_enable = src_dcb_cfg->pfc_mode_enable;
-
-       return 0;
-}
-
-static u8 ixgbe_dcbnl_get_state(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       return !!(adapter->flags & IXGBE_FLAG_DCB_ENABLED);
-}
-
-static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
-{
-       u8 err = 0;
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       /* verify there is something to do, if not then exit */
-       if (!!state != !(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
-               return err;
-
-       if (state > 0) {
-               /* Turn on DCB */
-               if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
-                       e_err(drv, "Enable failed, needs MSI-X\n");
-                       err = 1;
-                       goto out;
-               }
-
-               adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
-
-               switch (adapter->hw.mac.type) {
-               case ixgbe_mac_82598EB:
-                       adapter->last_lfc_mode = adapter->hw.fc.current_mode;
-                       adapter->hw.fc.requested_mode = ixgbe_fc_none;
-                       break;
-               case ixgbe_mac_82599EB:
-               case ixgbe_mac_X540:
-                       adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
-                       break;
-               default:
-                       break;
-               }
-
-               ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);
-       } else {
-               /* Turn off DCB */
-               adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
-               adapter->temp_dcb_cfg.pfc_mode_enable = false;
-               adapter->dcb_cfg.pfc_mode_enable = false;
-               adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
-               switch (adapter->hw.mac.type) {
-               case ixgbe_mac_82599EB:
-               case ixgbe_mac_X540:
-                       if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
-                               adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
-                       break;
-               default:
-                       break;
-               }
-               ixgbe_setup_tc(netdev, 0);
-       }
-
-out:
-       return err;
-}
-
-static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev,
-                                        u8 *perm_addr)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       int i, j;
-
-       memset(perm_addr, 0xff, MAX_ADDR_LEN);
-
-       for (i = 0; i < netdev->addr_len; i++)
-               perm_addr[i] = adapter->hw.mac.perm_addr[i];
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               for (j = 0; j < netdev->addr_len; j++, i++)
-                       perm_addr[i] = adapter->hw.mac.san_addr[j];
-               break;
-       default:
-               break;
-       }
-}
-
-static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
-                                         u8 prio, u8 bwg_id, u8 bw_pct,
-                                         u8 up_map)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       if (prio != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type = prio;
-       if (bwg_id != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_id = bwg_id;
-       if (bw_pct != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent =
-                       bw_pct;
-       if (up_map != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap =
-                       up_map;
-
-       if ((adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type !=
-            adapter->dcb_cfg.tc_config[tc].path[0].prio_type) ||
-           (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_id !=
-            adapter->dcb_cfg.tc_config[tc].path[0].bwg_id) ||
-           (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent !=
-            adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent) ||
-           (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
-            adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap))
-               adapter->dcb_set_bitmap |= BIT_PG_TX;
-}
-
-static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
-                                          u8 bw_pct)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;
-
-       if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] !=
-           adapter->dcb_cfg.bw_percentage[0][bwg_id])
-               adapter->dcb_set_bitmap |= BIT_PG_TX;
-}
-
-static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
-                                         u8 prio, u8 bwg_id, u8 bw_pct,
-                                         u8 up_map)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       if (prio != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type = prio;
-       if (bwg_id != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_id = bwg_id;
-       if (bw_pct != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent =
-                       bw_pct;
-       if (up_map != DCB_ATTR_VALUE_UNDEFINED)
-               adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap =
-                       up_map;
-
-       if ((adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type !=
-            adapter->dcb_cfg.tc_config[tc].path[1].prio_type) ||
-           (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_id !=
-            adapter->dcb_cfg.tc_config[tc].path[1].bwg_id) ||
-           (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent !=
-            adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent) ||
-           (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
-            adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap))
-               adapter->dcb_set_bitmap |= BIT_PG_RX;
-}
-
-static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
-                                          u8 bw_pct)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;
-
-       if (adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] !=
-           adapter->dcb_cfg.bw_percentage[1][bwg_id])
-               adapter->dcb_set_bitmap |= BIT_PG_RX;
-}
-
-static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
-                                         u8 *prio, u8 *bwg_id, u8 *bw_pct,
-                                         u8 *up_map)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       *prio = adapter->dcb_cfg.tc_config[tc].path[0].prio_type;
-       *bwg_id = adapter->dcb_cfg.tc_config[tc].path[0].bwg_id;
-       *bw_pct = adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent;
-       *up_map = adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap;
-}
-
-static void ixgbe_dcbnl_get_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
-                                          u8 *bw_pct)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       *bw_pct = adapter->dcb_cfg.bw_percentage[0][bwg_id];
-}
-
-static void ixgbe_dcbnl_get_pg_tc_cfg_rx(struct net_device *netdev, int tc,
-                                         u8 *prio, u8 *bwg_id, u8 *bw_pct,
-                                         u8 *up_map)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       *prio = adapter->dcb_cfg.tc_config[tc].path[1].prio_type;
-       *bwg_id = adapter->dcb_cfg.tc_config[tc].path[1].bwg_id;
-       *bw_pct = adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent;
-       *up_map = adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap;
-}
-
-static void ixgbe_dcbnl_get_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
-                                          u8 *bw_pct)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       *bw_pct = adapter->dcb_cfg.bw_percentage[1][bwg_id];
-}
-
-static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,
-                                    u8 setting)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc = setting;
-       if (adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc !=
-           adapter->dcb_cfg.tc_config[priority].dcb_pfc) {
-               adapter->dcb_set_bitmap |= BIT_PFC;
-               adapter->temp_dcb_cfg.pfc_mode_enable = true;
-       }
-}
-
-static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,
-                                    u8 *setting)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       *setting = adapter->dcb_cfg.tc_config[priority].dcb_pfc;
-}
-
-static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       int ret;
-#ifdef IXGBE_FCOE
-       struct dcb_app app = {
-                             .selector = DCB_APP_IDTYPE_ETHTYPE,
-                             .protocol = ETH_P_FCOE,
-                            };
-       u8 up = dcb_getapp(netdev, &app);
-#endif
-
-       ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
-                                MAX_TRAFFIC_CLASS);
-       if (ret)
-               return DCB_NO_HW_CHG;
-
-#ifdef IXGBE_FCOE
-       if (up && (up != (1 << adapter->fcoe.up)))
-               adapter->dcb_set_bitmap |= BIT_APP_UPCHG;
-
-       /*
-        * Only take down the adapter if an app change occurred. FCoE
-        * may shuffle tx rings in this case and this can not be done
-        * without a reset currently.
-        */
-       if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
-               while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
-                       usleep_range(1000, 2000);
-
-               adapter->fcoe.up = ffs(up) - 1;
-
-               if (netif_running(netdev))
-                       netdev->netdev_ops->ndo_stop(netdev);
-               ixgbe_clear_interrupt_scheme(adapter);
-       }
-#endif
-
-       if (adapter->dcb_cfg.pfc_mode_enable) {
-               switch (adapter->hw.mac.type) {
-               case ixgbe_mac_82599EB:
-               case ixgbe_mac_X540:
-                       if (adapter->hw.fc.current_mode != ixgbe_fc_pfc)
-                               adapter->last_lfc_mode =
-                                                 adapter->hw.fc.current_mode;
-                       break;
-               default:
-                       break;
-               }
-               adapter->hw.fc.requested_mode = ixgbe_fc_pfc;
-       } else {
-               switch (adapter->hw.mac.type) {
-               case ixgbe_mac_82598EB:
-                       adapter->hw.fc.requested_mode = ixgbe_fc_none;
-                       break;
-               case ixgbe_mac_82599EB:
-               case ixgbe_mac_X540:
-                       adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-#ifdef IXGBE_FCOE
-       if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
-               ixgbe_init_interrupt_scheme(adapter);
-               if (netif_running(netdev))
-                       netdev->netdev_ops->ndo_open(netdev);
-               ret = DCB_HW_CHG_RST;
-       }
-#endif
-
-       if (adapter->dcb_set_bitmap & BIT_PFC) {
-               u8 pfc_en;
-               ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
-               ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc_en);
-               ret = DCB_HW_CHG;
-       }
-
-       if (adapter->dcb_set_bitmap & (BIT_PG_TX|BIT_PG_RX)) {
-               u16 refill[MAX_TRAFFIC_CLASS], max[MAX_TRAFFIC_CLASS];
-               u8 bwg_id[MAX_TRAFFIC_CLASS], prio_type[MAX_TRAFFIC_CLASS];
-               /* Priority to TC mapping in CEE case default to 1:1 */
-               u8 prio_tc[MAX_TRAFFIC_CLASS] = {0, 1, 2, 3, 4, 5, 6, 7};
-               int max_frame = adapter->netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-
-#ifdef CONFIG_FCOE
-               if (adapter->netdev->features & NETIF_F_FCOE_MTU)
-                       max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
-#endif
-
-               ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
-                                              max_frame, DCB_TX_CONFIG);
-               ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
-                                              max_frame, DCB_RX_CONFIG);
-
-               ixgbe_dcb_unpack_refill(&adapter->dcb_cfg,
-                                       DCB_TX_CONFIG, refill);
-               ixgbe_dcb_unpack_max(&adapter->dcb_cfg, max);
-               ixgbe_dcb_unpack_bwgid(&adapter->dcb_cfg,
-                                      DCB_TX_CONFIG, bwg_id);
-               ixgbe_dcb_unpack_prio(&adapter->dcb_cfg,
-                                     DCB_TX_CONFIG, prio_type);
-
-               ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
-                                       bwg_id, prio_type, prio_tc);
-       }
-
-       if (adapter->dcb_cfg.pfc_mode_enable)
-               adapter->hw.fc.current_mode = ixgbe_fc_pfc;
-
-       if (adapter->dcb_set_bitmap & BIT_APP_UPCHG)
-               clear_bit(__IXGBE_RESETTING, &adapter->state);
-       adapter->dcb_set_bitmap = 0x00;
-       return ret;
-}
-
-static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       switch (capid) {
-       case DCB_CAP_ATTR_PG:
-               *cap = true;
-               break;
-       case DCB_CAP_ATTR_PFC:
-               *cap = true;
-               break;
-       case DCB_CAP_ATTR_UP2TC:
-               *cap = false;
-               break;
-       case DCB_CAP_ATTR_PG_TCS:
-               *cap = 0x80;
-               break;
-       case DCB_CAP_ATTR_PFC_TCS:
-               *cap = 0x80;
-               break;
-       case DCB_CAP_ATTR_GSP:
-               *cap = true;
-               break;
-       case DCB_CAP_ATTR_BCN:
-               *cap = false;
-               break;
-       case DCB_CAP_ATTR_DCBX:
-               *cap = adapter->dcbx_cap;
-               break;
-       default:
-               *cap = false;
-               break;
-       }
-
-       return 0;
-}
-
-static u8 ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       u8 rval = 0;
-
-       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-               switch (tcid) {
-               case DCB_NUMTCS_ATTR_PG:
-                       *num = MAX_TRAFFIC_CLASS;
-                       break;
-               case DCB_NUMTCS_ATTR_PFC:
-                       *num = MAX_TRAFFIC_CLASS;
-                       break;
-               default:
-                       rval = -EINVAL;
-                       break;
-               }
-       } else {
-               rval = -EINVAL;
-       }
-
-       return rval;
-}
-
-static u8 ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num)
-{
-       return -EINVAL;
-}
-
-static u8 ixgbe_dcbnl_getpfcstate(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       return adapter->dcb_cfg.pfc_mode_enable;
-}
-
-static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       adapter->temp_dcb_cfg.pfc_mode_enable = state;
-       if (adapter->temp_dcb_cfg.pfc_mode_enable !=
-               adapter->dcb_cfg.pfc_mode_enable)
-               adapter->dcb_set_bitmap |= BIT_PFC;
-}
-
-/**
- * ixgbe_dcbnl_getapp - retrieve the DCBX application user priority
- * @netdev : the corresponding netdev
- * @idtype : identifies the id as ether type or TCP/UDP port number
- * @id: id is either ether type or TCP/UDP port number
- *
- * Returns : on success, returns a non-zero 802.1p user priority bitmap
- * otherwise returns 0 as the invalid user priority bitmap to indicate an
- * error.
- */
-static u8 ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct dcb_app app = {
-                               .selector = idtype,
-                               .protocol = id,
-                            };
-
-       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
-               return 0;
-
-       return dcb_getapp(netdev, &app);
-}
-
-static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
-                                  struct ieee_ets *ets)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
-
-       /* No IEEE PFC settings available */
-       if (!my_ets)
-               return -EINVAL;
-
-       ets->ets_cap = MAX_TRAFFIC_CLASS;
-       ets->cbs = my_ets->cbs;
-       memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
-       memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw));
-       memcpy(ets->tc_tsa, my_ets->tc_tsa, sizeof(ets->tc_tsa));
-       memcpy(ets->prio_tc, my_ets->prio_tc, sizeof(ets->prio_tc));
-       return 0;
-}
-
-static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,
-                                  struct ieee_ets *ets)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       __u16 refill[IEEE_8021QAZ_MAX_TCS], max[IEEE_8021QAZ_MAX_TCS];
-       __u8 prio_type[IEEE_8021QAZ_MAX_TCS];
-       int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
-       int i, err;
-       __u64 *p = (__u64 *) ets->prio_tc;
-       /* naively give each TC a bwg to map onto CEE hardware */
-       __u8 bwg_id[IEEE_8021QAZ_MAX_TCS] = {0, 1, 2, 3, 4, 5, 6, 7};
-
-       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
-               return -EINVAL;
-
-       if (!adapter->ixgbe_ieee_ets) {
-               adapter->ixgbe_ieee_ets = kmalloc(sizeof(struct ieee_ets),
-                                                 GFP_KERNEL);
-               if (!adapter->ixgbe_ieee_ets)
-                       return -ENOMEM;
-       }
-
-       memcpy(adapter->ixgbe_ieee_ets, ets, sizeof(*adapter->ixgbe_ieee_ets));
-
-       /* Map TSA onto CEE prio type */
-       for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
-               switch (ets->tc_tsa[i]) {
-               case IEEE_8021QAZ_TSA_STRICT:
-                       prio_type[i] = 2;
-                       break;
-               case IEEE_8021QAZ_TSA_ETS:
-                       prio_type[i] = 0;
-                       break;
-               default:
-                       /* Hardware only supports priority strict or
-                        * ETS transmission selection algorithms if
-                        * we receive some other value from dcbnl
-                        * throw an error
-                        */
-                       return -EINVAL;
-               }
-       }
-
-       if (*p)
-               ixgbe_dcbnl_set_state(dev, 1);
-       else
-               ixgbe_dcbnl_set_state(dev, 0);
-
-       ixgbe_ieee_credits(ets->tc_tx_bw, refill, max, max_frame);
-       err = ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
-                                     bwg_id, prio_type, ets->prio_tc);
-       return err;
-}
-
-static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
-                                  struct ieee_pfc *pfc)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
-       int i;
-
-       /* No IEEE PFC settings available */
-       if (!my_pfc)
-               return -EINVAL;
-
-       pfc->pfc_cap = MAX_TRAFFIC_CLASS;
-       pfc->pfc_en = my_pfc->pfc_en;
-       pfc->mbc = my_pfc->mbc;
-       pfc->delay = my_pfc->delay;
-
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               pfc->requests[i] = adapter->stats.pxoffrxc[i];
-               pfc->indications[i] = adapter->stats.pxofftxc[i];
-       }
-
-       return 0;
-}
-
-static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
-                                  struct ieee_pfc *pfc)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       int err;
-
-       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
-               return -EINVAL;
-
-       if (!adapter->ixgbe_ieee_pfc) {
-               adapter->ixgbe_ieee_pfc = kmalloc(sizeof(struct ieee_pfc),
-                                                 GFP_KERNEL);
-               if (!adapter->ixgbe_ieee_pfc)
-                       return -ENOMEM;
-       }
-
-       memcpy(adapter->ixgbe_ieee_pfc, pfc, sizeof(*adapter->ixgbe_ieee_pfc));
-       err = ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en);
-       return err;
-}
-
-#ifdef IXGBE_FCOE
-static void ixgbe_dcbnl_devreset(struct net_device *dev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-
-       if (netif_running(dev))
-               dev->netdev_ops->ndo_stop(dev);
-
-       ixgbe_clear_interrupt_scheme(adapter);
-       ixgbe_init_interrupt_scheme(adapter);
-
-       if (netif_running(dev))
-               dev->netdev_ops->ndo_open(dev);
-}
-#endif
-
-static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,
-                                  struct dcb_app *app)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       int err = -EINVAL;
-
-       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
-               return err;
-
-       err = dcb_ieee_setapp(dev, app);
-
-#ifdef IXGBE_FCOE
-       if (!err && app->selector == IEEE_8021QAZ_APP_SEL_ETHERTYPE &&
-           app->protocol == ETH_P_FCOE) {
-               u8 app_mask = dcb_ieee_getapp_mask(dev, app);
-
-               if (app_mask & (1 << adapter->fcoe.up))
-                       return err;
-
-               adapter->fcoe.up = app->priority;
-               ixgbe_dcbnl_devreset(dev);
-       }
-#endif
-       return 0;
-}
-
-static int ixgbe_dcbnl_ieee_delapp(struct net_device *dev,
-                                  struct dcb_app *app)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       int err;
-
-       if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
-               return -EINVAL;
-
-       err = dcb_ieee_delapp(dev, app);
-
-#ifdef IXGBE_FCOE
-       if (!err && app->selector == IEEE_8021QAZ_APP_SEL_ETHERTYPE &&
-           app->protocol == ETH_P_FCOE) {
-               u8 app_mask = dcb_ieee_getapp_mask(dev, app);
-
-               if (app_mask & (1 << adapter->fcoe.up))
-                       return err;
-
-               adapter->fcoe.up = app_mask ?
-                                  ffs(app_mask) - 1 : IXGBE_FCOE_DEFTC;
-               ixgbe_dcbnl_devreset(dev);
-       }
-#endif
-       return err;
-}
-
-static u8 ixgbe_dcbnl_getdcbx(struct net_device *dev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       return adapter->dcbx_cap;
-}
-
-static u8 ixgbe_dcbnl_setdcbx(struct net_device *dev, u8 mode)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       struct ieee_ets ets = {0};
-       struct ieee_pfc pfc = {0};
-
-       /* no support for LLD_MANAGED modes or CEE+IEEE */
-       if ((mode & DCB_CAP_DCBX_LLD_MANAGED) ||
-           ((mode & DCB_CAP_DCBX_VER_IEEE) && (mode & DCB_CAP_DCBX_VER_CEE)) ||
-           !(mode & DCB_CAP_DCBX_HOST))
-               return 1;
-
-       if (mode == adapter->dcbx_cap)
-               return 0;
-
-       adapter->dcbx_cap = mode;
-
-       /* ETS and PFC defaults */
-       ets.ets_cap = 8;
-       pfc.pfc_cap = 8;
-
-       if (mode & DCB_CAP_DCBX_VER_IEEE) {
-               ixgbe_dcbnl_ieee_setets(dev, &ets);
-               ixgbe_dcbnl_ieee_setpfc(dev, &pfc);
-       } else if (mode & DCB_CAP_DCBX_VER_CEE) {
-               adapter->dcb_set_bitmap |= (BIT_PFC & BIT_PG_TX & BIT_PG_RX);
-               ixgbe_dcbnl_set_all(dev);
-       } else {
-               /* Drop into single TC mode strict priority as this
-                * indicates CEE and IEEE versions are disabled
-                */
-               ixgbe_dcbnl_ieee_setets(dev, &ets);
-               ixgbe_dcbnl_ieee_setpfc(dev, &pfc);
-               ixgbe_dcbnl_set_state(dev, 0);
-       }
-
-       return 0;
-}
-
-const struct dcbnl_rtnl_ops dcbnl_ops = {
-       .ieee_getets    = ixgbe_dcbnl_ieee_getets,
-       .ieee_setets    = ixgbe_dcbnl_ieee_setets,
-       .ieee_getpfc    = ixgbe_dcbnl_ieee_getpfc,
-       .ieee_setpfc    = ixgbe_dcbnl_ieee_setpfc,
-       .ieee_setapp    = ixgbe_dcbnl_ieee_setapp,
-       .ieee_delapp    = ixgbe_dcbnl_ieee_delapp,
-       .getstate       = ixgbe_dcbnl_get_state,
-       .setstate       = ixgbe_dcbnl_set_state,
-       .getpermhwaddr  = ixgbe_dcbnl_get_perm_hw_addr,
-       .setpgtccfgtx   = ixgbe_dcbnl_set_pg_tc_cfg_tx,
-       .setpgbwgcfgtx  = ixgbe_dcbnl_set_pg_bwg_cfg_tx,
-       .setpgtccfgrx   = ixgbe_dcbnl_set_pg_tc_cfg_rx,
-       .setpgbwgcfgrx  = ixgbe_dcbnl_set_pg_bwg_cfg_rx,
-       .getpgtccfgtx   = ixgbe_dcbnl_get_pg_tc_cfg_tx,
-       .getpgbwgcfgtx  = ixgbe_dcbnl_get_pg_bwg_cfg_tx,
-       .getpgtccfgrx   = ixgbe_dcbnl_get_pg_tc_cfg_rx,
-       .getpgbwgcfgrx  = ixgbe_dcbnl_get_pg_bwg_cfg_rx,
-       .setpfccfg      = ixgbe_dcbnl_set_pfc_cfg,
-       .getpfccfg      = ixgbe_dcbnl_get_pfc_cfg,
-       .setall         = ixgbe_dcbnl_set_all,
-       .getcap         = ixgbe_dcbnl_getcap,
-       .getnumtcs      = ixgbe_dcbnl_getnumtcs,
-       .setnumtcs      = ixgbe_dcbnl_setnumtcs,
-       .getpfcstate    = ixgbe_dcbnl_getpfcstate,
-       .setpfcstate    = ixgbe_dcbnl_setpfcstate,
-       .getapp         = ixgbe_dcbnl_getapp,
-       .getdcbx        = ixgbe_dcbnl_getdcbx,
-       .setdcbx        = ixgbe_dcbnl_setdcbx,
-};
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
deleted file mode 100644 (file)
index 82d4244..0000000
+++ /dev/null
@@ -1,2592 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-/* ethtool support for ixgbe */
-
-#include <linux/interrupt.h>
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/ethtool.h>
-#include <linux/vmalloc.h>
-#include <linux/uaccess.h>
-
-#include "ixgbe.h"
-
-
-#define IXGBE_ALL_RAR_ENTRIES 16
-
-enum {NETDEV_STATS, IXGBE_STATS};
-
-struct ixgbe_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int type;
-       int sizeof_stat;
-       int stat_offset;
-};
-
-#define IXGBE_STAT(m)          IXGBE_STATS, \
-                               sizeof(((struct ixgbe_adapter *)0)->m), \
-                               offsetof(struct ixgbe_adapter, m)
-#define IXGBE_NETDEV_STAT(m)   NETDEV_STATS, \
-                               sizeof(((struct rtnl_link_stats64 *)0)->m), \
-                               offsetof(struct rtnl_link_stats64, m)
-
-static struct ixgbe_stats ixgbe_gstrings_stats[] = {
-       {"rx_packets", IXGBE_NETDEV_STAT(rx_packets)},
-       {"tx_packets", IXGBE_NETDEV_STAT(tx_packets)},
-       {"rx_bytes", IXGBE_NETDEV_STAT(rx_bytes)},
-       {"tx_bytes", IXGBE_NETDEV_STAT(tx_bytes)},
-       {"rx_pkts_nic", IXGBE_STAT(stats.gprc)},
-       {"tx_pkts_nic", IXGBE_STAT(stats.gptc)},
-       {"rx_bytes_nic", IXGBE_STAT(stats.gorc)},
-       {"tx_bytes_nic", IXGBE_STAT(stats.gotc)},
-       {"lsc_int", IXGBE_STAT(lsc_int)},
-       {"tx_busy", IXGBE_STAT(tx_busy)},
-       {"non_eop_descs", IXGBE_STAT(non_eop_descs)},
-       {"rx_errors", IXGBE_NETDEV_STAT(rx_errors)},
-       {"tx_errors", IXGBE_NETDEV_STAT(tx_errors)},
-       {"rx_dropped", IXGBE_NETDEV_STAT(rx_dropped)},
-       {"tx_dropped", IXGBE_NETDEV_STAT(tx_dropped)},
-       {"multicast", IXGBE_NETDEV_STAT(multicast)},
-       {"broadcast", IXGBE_STAT(stats.bprc)},
-       {"rx_no_buffer_count", IXGBE_STAT(stats.rnbc[0]) },
-       {"collisions", IXGBE_NETDEV_STAT(collisions)},
-       {"rx_over_errors", IXGBE_NETDEV_STAT(rx_over_errors)},
-       {"rx_crc_errors", IXGBE_NETDEV_STAT(rx_crc_errors)},
-       {"rx_frame_errors", IXGBE_NETDEV_STAT(rx_frame_errors)},
-       {"hw_rsc_aggregated", IXGBE_STAT(rsc_total_count)},
-       {"hw_rsc_flushed", IXGBE_STAT(rsc_total_flush)},
-       {"fdir_match", IXGBE_STAT(stats.fdirmatch)},
-       {"fdir_miss", IXGBE_STAT(stats.fdirmiss)},
-       {"fdir_overflow", IXGBE_STAT(fdir_overflow)},
-       {"rx_fifo_errors", IXGBE_NETDEV_STAT(rx_fifo_errors)},
-       {"rx_missed_errors", IXGBE_NETDEV_STAT(rx_missed_errors)},
-       {"tx_aborted_errors", IXGBE_NETDEV_STAT(tx_aborted_errors)},
-       {"tx_carrier_errors", IXGBE_NETDEV_STAT(tx_carrier_errors)},
-       {"tx_fifo_errors", IXGBE_NETDEV_STAT(tx_fifo_errors)},
-       {"tx_heartbeat_errors", IXGBE_NETDEV_STAT(tx_heartbeat_errors)},
-       {"tx_timeout_count", IXGBE_STAT(tx_timeout_count)},
-       {"tx_restart_queue", IXGBE_STAT(restart_queue)},
-       {"rx_long_length_errors", IXGBE_STAT(stats.roc)},
-       {"rx_short_length_errors", IXGBE_STAT(stats.ruc)},
-       {"tx_flow_control_xon", IXGBE_STAT(stats.lxontxc)},
-       {"rx_flow_control_xon", IXGBE_STAT(stats.lxonrxc)},
-       {"tx_flow_control_xoff", IXGBE_STAT(stats.lxofftxc)},
-       {"rx_flow_control_xoff", IXGBE_STAT(stats.lxoffrxc)},
-       {"rx_csum_offload_errors", IXGBE_STAT(hw_csum_rx_error)},
-       {"alloc_rx_page_failed", IXGBE_STAT(alloc_rx_page_failed)},
-       {"alloc_rx_buff_failed", IXGBE_STAT(alloc_rx_buff_failed)},
-       {"rx_no_dma_resources", IXGBE_STAT(hw_rx_no_dma_resources)},
-       {"os2bmc_rx_by_bmc", IXGBE_STAT(stats.o2bgptc)},
-       {"os2bmc_tx_by_bmc", IXGBE_STAT(stats.b2ospc)},
-       {"os2bmc_tx_by_host", IXGBE_STAT(stats.o2bspc)},
-       {"os2bmc_rx_by_host", IXGBE_STAT(stats.b2ogprc)},
-#ifdef IXGBE_FCOE
-       {"fcoe_bad_fccrc", IXGBE_STAT(stats.fccrc)},
-       {"rx_fcoe_dropped", IXGBE_STAT(stats.fcoerpdc)},
-       {"rx_fcoe_packets", IXGBE_STAT(stats.fcoeprc)},
-       {"rx_fcoe_dwords", IXGBE_STAT(stats.fcoedwrc)},
-       {"tx_fcoe_packets", IXGBE_STAT(stats.fcoeptc)},
-       {"tx_fcoe_dwords", IXGBE_STAT(stats.fcoedwtc)},
-#endif /* IXGBE_FCOE */
-};
-
-#define IXGBE_QUEUE_STATS_LEN \
-       ((((struct ixgbe_adapter *)netdev_priv(netdev))->num_tx_queues + \
-       ((struct ixgbe_adapter *)netdev_priv(netdev))->num_rx_queues) * \
-       (sizeof(struct ixgbe_queue_stats) / sizeof(u64)))
-#define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)
-#define IXGBE_PB_STATS_LEN ( \
-                 (((struct ixgbe_adapter *)netdev_priv(netdev))->flags & \
-                 IXGBE_FLAG_DCB_ENABLED) ? \
-                 (sizeof(((struct ixgbe_adapter *)0)->stats.pxonrxc) + \
-                  sizeof(((struct ixgbe_adapter *)0)->stats.pxontxc) + \
-                  sizeof(((struct ixgbe_adapter *)0)->stats.pxoffrxc) + \
-                  sizeof(((struct ixgbe_adapter *)0)->stats.pxofftxc)) \
-                  / sizeof(u64) : 0)
-#define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + \
-                         IXGBE_PB_STATS_LEN + \
-                         IXGBE_QUEUE_STATS_LEN)
-
-static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Register test  (offline)", "Eeprom test    (offline)",
-       "Interrupt test (offline)", "Loopback test  (offline)",
-       "Link test   (on/offline)"
-};
-#define IXGBE_TEST_LEN sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN
-
-static int ixgbe_get_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 link_speed = 0;
-       bool link_up;
-
-       ecmd->supported = SUPPORTED_10000baseT_Full;
-       ecmd->autoneg = AUTONEG_ENABLE;
-       ecmd->transceiver = XCVR_EXTERNAL;
-       if ((hw->phy.media_type == ixgbe_media_type_copper) ||
-           (hw->phy.multispeed_fiber)) {
-               ecmd->supported |= (SUPPORTED_1000baseT_Full |
-                                   SUPPORTED_Autoneg);
-
-               switch (hw->mac.type) {
-               case ixgbe_mac_X540:
-                       ecmd->supported |= SUPPORTED_100baseT_Full;
-                       break;
-               default:
-                       break;
-               }
-
-               ecmd->advertising = ADVERTISED_Autoneg;
-               if (hw->phy.autoneg_advertised) {
-                       if (hw->phy.autoneg_advertised &
-                           IXGBE_LINK_SPEED_100_FULL)
-                               ecmd->advertising |= ADVERTISED_100baseT_Full;
-                       if (hw->phy.autoneg_advertised &
-                           IXGBE_LINK_SPEED_10GB_FULL)
-                               ecmd->advertising |= ADVERTISED_10000baseT_Full;
-                       if (hw->phy.autoneg_advertised &
-                           IXGBE_LINK_SPEED_1GB_FULL)
-                               ecmd->advertising |= ADVERTISED_1000baseT_Full;
-               } else {
-                       /*
-                        * Default advertised modes in case
-                        * phy.autoneg_advertised isn't set.
-                        */
-                       ecmd->advertising |= (ADVERTISED_10000baseT_Full |
-                                             ADVERTISED_1000baseT_Full);
-                       if (hw->mac.type == ixgbe_mac_X540)
-                               ecmd->advertising |= ADVERTISED_100baseT_Full;
-               }
-
-               if (hw->phy.media_type == ixgbe_media_type_copper) {
-                       ecmd->supported |= SUPPORTED_TP;
-                       ecmd->advertising |= ADVERTISED_TP;
-                       ecmd->port = PORT_TP;
-               } else {
-                       ecmd->supported |= SUPPORTED_FIBRE;
-                       ecmd->advertising |= ADVERTISED_FIBRE;
-                       ecmd->port = PORT_FIBRE;
-               }
-       } else if (hw->phy.media_type == ixgbe_media_type_backplane) {
-               /* Set as FIBRE until SERDES defined in kernel */
-               if (hw->device_id == IXGBE_DEV_ID_82598_BX) {
-                       ecmd->supported = (SUPPORTED_1000baseT_Full |
-                                          SUPPORTED_FIBRE);
-                       ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                            ADVERTISED_FIBRE);
-                       ecmd->port = PORT_FIBRE;
-                       ecmd->autoneg = AUTONEG_DISABLE;
-               } else if ((hw->device_id == IXGBE_DEV_ID_82599_COMBO_BACKPLANE) ||
-                          (hw->device_id == IXGBE_DEV_ID_82599_KX4_MEZZ)) {
-                       ecmd->supported |= (SUPPORTED_1000baseT_Full |
-                                           SUPPORTED_Autoneg |
-                                           SUPPORTED_FIBRE);
-                       ecmd->advertising = (ADVERTISED_10000baseT_Full |
-                                            ADVERTISED_1000baseT_Full |
-                                            ADVERTISED_Autoneg |
-                                            ADVERTISED_FIBRE);
-                       ecmd->port = PORT_FIBRE;
-               } else {
-                       ecmd->supported |= (SUPPORTED_1000baseT_Full |
-                                           SUPPORTED_FIBRE);
-                       ecmd->advertising = (ADVERTISED_10000baseT_Full |
-                                            ADVERTISED_1000baseT_Full |
-                                            ADVERTISED_FIBRE);
-                       ecmd->port = PORT_FIBRE;
-               }
-       } else {
-               ecmd->supported |= SUPPORTED_FIBRE;
-               ecmd->advertising = (ADVERTISED_10000baseT_Full |
-                                    ADVERTISED_FIBRE);
-               ecmd->port = PORT_FIBRE;
-               ecmd->autoneg = AUTONEG_DISABLE;
-       }
-
-       /* Get PHY type */
-       switch (adapter->hw.phy.type) {
-       case ixgbe_phy_tn:
-       case ixgbe_phy_aq:
-       case ixgbe_phy_cu_unknown:
-               /* Copper 10G-BASET */
-               ecmd->port = PORT_TP;
-               break;
-       case ixgbe_phy_qt:
-               ecmd->port = PORT_FIBRE;
-               break;
-       case ixgbe_phy_nl:
-       case ixgbe_phy_sfp_passive_tyco:
-       case ixgbe_phy_sfp_passive_unknown:
-       case ixgbe_phy_sfp_ftl:
-       case ixgbe_phy_sfp_avago:
-       case ixgbe_phy_sfp_intel:
-       case ixgbe_phy_sfp_unknown:
-               switch (adapter->hw.phy.sfp_type) {
-               /* SFP+ devices, further checking needed */
-               case ixgbe_sfp_type_da_cu:
-               case ixgbe_sfp_type_da_cu_core0:
-               case ixgbe_sfp_type_da_cu_core1:
-                       ecmd->port = PORT_DA;
-                       break;
-               case ixgbe_sfp_type_sr:
-               case ixgbe_sfp_type_lr:
-               case ixgbe_sfp_type_srlr_core0:
-               case ixgbe_sfp_type_srlr_core1:
-                       ecmd->port = PORT_FIBRE;
-                       break;
-               case ixgbe_sfp_type_not_present:
-                       ecmd->port = PORT_NONE;
-                       break;
-               case ixgbe_sfp_type_1g_cu_core0:
-               case ixgbe_sfp_type_1g_cu_core1:
-                       ecmd->port = PORT_TP;
-                       ecmd->supported = SUPPORTED_TP;
-                       ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                            ADVERTISED_TP);
-                       break;
-               case ixgbe_sfp_type_unknown:
-               default:
-                       ecmd->port = PORT_OTHER;
-                       break;
-               }
-               break;
-       case ixgbe_phy_xaui:
-               ecmd->port = PORT_NONE;
-               break;
-       case ixgbe_phy_unknown:
-       case ixgbe_phy_generic:
-       case ixgbe_phy_sfp_unsupported:
-       default:
-               ecmd->port = PORT_OTHER;
-               break;
-       }
-
-       hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
-       if (link_up) {
-               switch (link_speed) {
-               case IXGBE_LINK_SPEED_10GB_FULL:
-                       ethtool_cmd_speed_set(ecmd, SPEED_10000);
-                       break;
-               case IXGBE_LINK_SPEED_1GB_FULL:
-                       ethtool_cmd_speed_set(ecmd, SPEED_1000);
-                       break;
-               case IXGBE_LINK_SPEED_100_FULL:
-                       ethtool_cmd_speed_set(ecmd, SPEED_100);
-                       break;
-               default:
-                       break;
-               }
-               ecmd->duplex = DUPLEX_FULL;
-       } else {
-               ethtool_cmd_speed_set(ecmd, -1);
-               ecmd->duplex = -1;
-       }
-
-       return 0;
-}
-
-static int ixgbe_set_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 advertised, old;
-       s32 err = 0;
-
-       if ((hw->phy.media_type == ixgbe_media_type_copper) ||
-           (hw->phy.multispeed_fiber)) {
-               /* 10000/copper and 1000/copper must autoneg
-                * this function does not support any duplex forcing, but can
-                * limit the advertising of the adapter to only 10000 or 1000 */
-               if (ecmd->autoneg == AUTONEG_DISABLE)
-                       return -EINVAL;
-
-               old = hw->phy.autoneg_advertised;
-               advertised = 0;
-               if (ecmd->advertising & ADVERTISED_10000baseT_Full)
-                       advertised |= IXGBE_LINK_SPEED_10GB_FULL;
-
-               if (ecmd->advertising & ADVERTISED_1000baseT_Full)
-                       advertised |= IXGBE_LINK_SPEED_1GB_FULL;
-
-               if (ecmd->advertising & ADVERTISED_100baseT_Full)
-                       advertised |= IXGBE_LINK_SPEED_100_FULL;
-
-               if (old == advertised)
-                       return err;
-               /* this sets the link speed and restarts auto-neg */
-               hw->mac.autotry_restart = true;
-               err = hw->mac.ops.setup_link(hw, advertised, true, true);
-               if (err) {
-                       e_info(probe, "setup link failed with code %d\n", err);
-                       hw->mac.ops.setup_link(hw, old, true, true);
-               }
-       } else {
-               /* in this case we currently only support 10Gb/FULL */
-               u32 speed = ethtool_cmd_speed(ecmd);
-               if ((ecmd->autoneg == AUTONEG_ENABLE) ||
-                   (ecmd->advertising != ADVERTISED_10000baseT_Full) ||
-                   (speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL))
-                       return -EINVAL;
-       }
-
-       return err;
-}
-
-static void ixgbe_get_pauseparam(struct net_device *netdev,
-                                 struct ethtool_pauseparam *pause)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       /*
-        * Flow Control Autoneg isn't on if
-        *  - we didn't ask for it OR
-        *  - it failed, we know this by tx & rx being off
-        */
-       if (hw->fc.disable_fc_autoneg ||
-           (hw->fc.current_mode == ixgbe_fc_none))
-               pause->autoneg = 0;
-       else
-               pause->autoneg = 1;
-
-       if (hw->fc.current_mode == ixgbe_fc_rx_pause) {
-               pause->rx_pause = 1;
-       } else if (hw->fc.current_mode == ixgbe_fc_tx_pause) {
-               pause->tx_pause = 1;
-       } else if (hw->fc.current_mode == ixgbe_fc_full) {
-               pause->rx_pause = 1;
-               pause->tx_pause = 1;
-#ifdef CONFIG_DCB
-       } else if (hw->fc.current_mode == ixgbe_fc_pfc) {
-               pause->rx_pause = 0;
-               pause->tx_pause = 0;
-#endif
-       }
-}
-
-static int ixgbe_set_pauseparam(struct net_device *netdev,
-                                struct ethtool_pauseparam *pause)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbe_fc_info fc;
-
-#ifdef CONFIG_DCB
-       if (adapter->dcb_cfg.pfc_mode_enable ||
-               ((hw->mac.type == ixgbe_mac_82598EB) &&
-               (adapter->flags & IXGBE_FLAG_DCB_ENABLED)))
-               return -EINVAL;
-
-#endif
-       fc = hw->fc;
-
-       if (pause->autoneg != AUTONEG_ENABLE)
-               fc.disable_fc_autoneg = true;
-       else
-               fc.disable_fc_autoneg = false;
-
-       if ((pause->rx_pause && pause->tx_pause) || pause->autoneg)
-               fc.requested_mode = ixgbe_fc_full;
-       else if (pause->rx_pause && !pause->tx_pause)
-               fc.requested_mode = ixgbe_fc_rx_pause;
-       else if (!pause->rx_pause && pause->tx_pause)
-               fc.requested_mode = ixgbe_fc_tx_pause;
-       else if (!pause->rx_pause && !pause->tx_pause)
-               fc.requested_mode = ixgbe_fc_none;
-       else
-               return -EINVAL;
-
-#ifdef CONFIG_DCB
-       adapter->last_lfc_mode = fc.requested_mode;
-#endif
-
-       /* if the thing changed then we'll update and use new autoneg */
-       if (memcmp(&fc, &hw->fc, sizeof(struct ixgbe_fc_info))) {
-               hw->fc = fc;
-               if (netif_running(netdev))
-                       ixgbe_reinit_locked(adapter);
-               else
-                       ixgbe_reset(adapter);
-       }
-
-       return 0;
-}
-
-static u32 ixgbe_get_msglevel(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void ixgbe_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-
-static int ixgbe_get_regs_len(struct net_device *netdev)
-{
-#define IXGBE_REGS_LEN  1128
-       return IXGBE_REGS_LEN * sizeof(u32);
-}
-
-#define IXGBE_GET_STAT(_A_, _R_) _A_->stats._R_
-
-static void ixgbe_get_regs(struct net_device *netdev,
-                           struct ethtool_regs *regs, void *p)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 *regs_buff = p;
-       u8 i;
-
-       memset(p, 0, IXGBE_REGS_LEN * sizeof(u32));
-
-       regs->version = (1 << 24) | hw->revision_id << 16 | hw->device_id;
-
-       /* General Registers */
-       regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_CTRL);
-       regs_buff[1] = IXGBE_READ_REG(hw, IXGBE_STATUS);
-       regs_buff[2] = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
-       regs_buff[3] = IXGBE_READ_REG(hw, IXGBE_ESDP);
-       regs_buff[4] = IXGBE_READ_REG(hw, IXGBE_EODSDP);
-       regs_buff[5] = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-       regs_buff[6] = IXGBE_READ_REG(hw, IXGBE_FRTIMER);
-       regs_buff[7] = IXGBE_READ_REG(hw, IXGBE_TCPTIMER);
-
-       /* NVM Register */
-       regs_buff[8] = IXGBE_READ_REG(hw, IXGBE_EEC);
-       regs_buff[9] = IXGBE_READ_REG(hw, IXGBE_EERD);
-       regs_buff[10] = IXGBE_READ_REG(hw, IXGBE_FLA);
-       regs_buff[11] = IXGBE_READ_REG(hw, IXGBE_EEMNGCTL);
-       regs_buff[12] = IXGBE_READ_REG(hw, IXGBE_EEMNGDATA);
-       regs_buff[13] = IXGBE_READ_REG(hw, IXGBE_FLMNGCTL);
-       regs_buff[14] = IXGBE_READ_REG(hw, IXGBE_FLMNGDATA);
-       regs_buff[15] = IXGBE_READ_REG(hw, IXGBE_FLMNGCNT);
-       regs_buff[16] = IXGBE_READ_REG(hw, IXGBE_FLOP);
-       regs_buff[17] = IXGBE_READ_REG(hw, IXGBE_GRC);
-
-       /* Interrupt */
-       /* don't read EICR because it can clear interrupt causes, instead
-        * read EICS which is a shadow but doesn't clear EICR */
-       regs_buff[18] = IXGBE_READ_REG(hw, IXGBE_EICS);
-       regs_buff[19] = IXGBE_READ_REG(hw, IXGBE_EICS);
-       regs_buff[20] = IXGBE_READ_REG(hw, IXGBE_EIMS);
-       regs_buff[21] = IXGBE_READ_REG(hw, IXGBE_EIMC);
-       regs_buff[22] = IXGBE_READ_REG(hw, IXGBE_EIAC);
-       regs_buff[23] = IXGBE_READ_REG(hw, IXGBE_EIAM);
-       regs_buff[24] = IXGBE_READ_REG(hw, IXGBE_EITR(0));
-       regs_buff[25] = IXGBE_READ_REG(hw, IXGBE_IVAR(0));
-       regs_buff[26] = IXGBE_READ_REG(hw, IXGBE_MSIXT);
-       regs_buff[27] = IXGBE_READ_REG(hw, IXGBE_MSIXPBA);
-       regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_PBACL(0));
-       regs_buff[29] = IXGBE_READ_REG(hw, IXGBE_GPIE);
-
-       /* Flow Control */
-       regs_buff[30] = IXGBE_READ_REG(hw, IXGBE_PFCTOP);
-       regs_buff[31] = IXGBE_READ_REG(hw, IXGBE_FCTTV(0));
-       regs_buff[32] = IXGBE_READ_REG(hw, IXGBE_FCTTV(1));
-       regs_buff[33] = IXGBE_READ_REG(hw, IXGBE_FCTTV(2));
-       regs_buff[34] = IXGBE_READ_REG(hw, IXGBE_FCTTV(3));
-       for (i = 0; i < 8; i++) {
-               switch (hw->mac.type) {
-               case ixgbe_mac_82598EB:
-                       regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL(i));
-                       regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH(i));
-                       break;
-               case ixgbe_mac_82599EB:
-                       regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL_82599(i));
-                       regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH_82599(i));
-                       break;
-               default:
-                       break;
-               }
-       }
-       regs_buff[51] = IXGBE_READ_REG(hw, IXGBE_FCRTV);
-       regs_buff[52] = IXGBE_READ_REG(hw, IXGBE_TFCS);
-
-       /* Receive DMA */
-       for (i = 0; i < 64; i++)
-               regs_buff[53 + i] = IXGBE_READ_REG(hw, IXGBE_RDBAL(i));
-       for (i = 0; i < 64; i++)
-               regs_buff[117 + i] = IXGBE_READ_REG(hw, IXGBE_RDBAH(i));
-       for (i = 0; i < 64; i++)
-               regs_buff[181 + i] = IXGBE_READ_REG(hw, IXGBE_RDLEN(i));
-       for (i = 0; i < 64; i++)
-               regs_buff[245 + i] = IXGBE_READ_REG(hw, IXGBE_RDH(i));
-       for (i = 0; i < 64; i++)
-               regs_buff[309 + i] = IXGBE_READ_REG(hw, IXGBE_RDT(i));
-       for (i = 0; i < 64; i++)
-               regs_buff[373 + i] = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
-       for (i = 0; i < 16; i++)
-               regs_buff[437 + i] = IXGBE_READ_REG(hw, IXGBE_SRRCTL(i));
-       for (i = 0; i < 16; i++)
-               regs_buff[453 + i] = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
-       regs_buff[469] = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);
-       for (i = 0; i < 8; i++)
-               regs_buff[470 + i] = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
-       regs_buff[478] = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
-       regs_buff[479] = IXGBE_READ_REG(hw, IXGBE_DROPEN);
-
-       /* Receive */
-       regs_buff[480] = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
-       regs_buff[481] = IXGBE_READ_REG(hw, IXGBE_RFCTL);
-       for (i = 0; i < 16; i++)
-               regs_buff[482 + i] = IXGBE_READ_REG(hw, IXGBE_RAL(i));
-       for (i = 0; i < 16; i++)
-               regs_buff[498 + i] = IXGBE_READ_REG(hw, IXGBE_RAH(i));
-       regs_buff[514] = IXGBE_READ_REG(hw, IXGBE_PSRTYPE(0));
-       regs_buff[515] = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-       regs_buff[516] = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
-       regs_buff[517] = IXGBE_READ_REG(hw, IXGBE_MCSTCTRL);
-       regs_buff[518] = IXGBE_READ_REG(hw, IXGBE_MRQC);
-       regs_buff[519] = IXGBE_READ_REG(hw, IXGBE_VMD_CTL);
-       for (i = 0; i < 8; i++)
-               regs_buff[520 + i] = IXGBE_READ_REG(hw, IXGBE_IMIR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[528 + i] = IXGBE_READ_REG(hw, IXGBE_IMIREXT(i));
-       regs_buff[536] = IXGBE_READ_REG(hw, IXGBE_IMIRVP);
-
-       /* Transmit */
-       for (i = 0; i < 32; i++)
-               regs_buff[537 + i] = IXGBE_READ_REG(hw, IXGBE_TDBAL(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[569 + i] = IXGBE_READ_REG(hw, IXGBE_TDBAH(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[601 + i] = IXGBE_READ_REG(hw, IXGBE_TDLEN(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[633 + i] = IXGBE_READ_REG(hw, IXGBE_TDH(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[665 + i] = IXGBE_READ_REG(hw, IXGBE_TDT(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[697 + i] = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[729 + i] = IXGBE_READ_REG(hw, IXGBE_TDWBAL(i));
-       for (i = 0; i < 32; i++)
-               regs_buff[761 + i] = IXGBE_READ_REG(hw, IXGBE_TDWBAH(i));
-       regs_buff[793] = IXGBE_READ_REG(hw, IXGBE_DTXCTL);
-       for (i = 0; i < 16; i++)
-               regs_buff[794 + i] = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));
-       regs_buff[810] = IXGBE_READ_REG(hw, IXGBE_TIPG);
-       for (i = 0; i < 8; i++)
-               regs_buff[811 + i] = IXGBE_READ_REG(hw, IXGBE_TXPBSIZE(i));
-       regs_buff[819] = IXGBE_READ_REG(hw, IXGBE_MNGTXMAP);
-
-       /* Wake Up */
-       regs_buff[820] = IXGBE_READ_REG(hw, IXGBE_WUC);
-       regs_buff[821] = IXGBE_READ_REG(hw, IXGBE_WUFC);
-       regs_buff[822] = IXGBE_READ_REG(hw, IXGBE_WUS);
-       regs_buff[823] = IXGBE_READ_REG(hw, IXGBE_IPAV);
-       regs_buff[824] = IXGBE_READ_REG(hw, IXGBE_IP4AT);
-       regs_buff[825] = IXGBE_READ_REG(hw, IXGBE_IP6AT);
-       regs_buff[826] = IXGBE_READ_REG(hw, IXGBE_WUPL);
-       regs_buff[827] = IXGBE_READ_REG(hw, IXGBE_WUPM);
-       regs_buff[828] = IXGBE_READ_REG(hw, IXGBE_FHFT(0));
-
-       /* DCB */
-       regs_buff[829] = IXGBE_READ_REG(hw, IXGBE_RMCS);
-       regs_buff[830] = IXGBE_READ_REG(hw, IXGBE_DPMCS);
-       regs_buff[831] = IXGBE_READ_REG(hw, IXGBE_PDPMCS);
-       regs_buff[832] = IXGBE_READ_REG(hw, IXGBE_RUPPBMR);
-       for (i = 0; i < 8; i++)
-               regs_buff[833 + i] = IXGBE_READ_REG(hw, IXGBE_RT2CR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[841 + i] = IXGBE_READ_REG(hw, IXGBE_RT2SR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[849 + i] = IXGBE_READ_REG(hw, IXGBE_TDTQ2TCCR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[857 + i] = IXGBE_READ_REG(hw, IXGBE_TDTQ2TCSR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[865 + i] = IXGBE_READ_REG(hw, IXGBE_TDPT2TCCR(i));
-       for (i = 0; i < 8; i++)
-               regs_buff[873 + i] = IXGBE_READ_REG(hw, IXGBE_TDPT2TCSR(i));
-
-       /* Statistics */
-       regs_buff[881] = IXGBE_GET_STAT(adapter, crcerrs);
-       regs_buff[882] = IXGBE_GET_STAT(adapter, illerrc);
-       regs_buff[883] = IXGBE_GET_STAT(adapter, errbc);
-       regs_buff[884] = IXGBE_GET_STAT(adapter, mspdc);
-       for (i = 0; i < 8; i++)
-               regs_buff[885 + i] = IXGBE_GET_STAT(adapter, mpc[i]);
-       regs_buff[893] = IXGBE_GET_STAT(adapter, mlfc);
-       regs_buff[894] = IXGBE_GET_STAT(adapter, mrfc);
-       regs_buff[895] = IXGBE_GET_STAT(adapter, rlec);
-       regs_buff[896] = IXGBE_GET_STAT(adapter, lxontxc);
-       regs_buff[897] = IXGBE_GET_STAT(adapter, lxonrxc);
-       regs_buff[898] = IXGBE_GET_STAT(adapter, lxofftxc);
-       regs_buff[899] = IXGBE_GET_STAT(adapter, lxoffrxc);
-       for (i = 0; i < 8; i++)
-               regs_buff[900 + i] = IXGBE_GET_STAT(adapter, pxontxc[i]);
-       for (i = 0; i < 8; i++)
-               regs_buff[908 + i] = IXGBE_GET_STAT(adapter, pxonrxc[i]);
-       for (i = 0; i < 8; i++)
-               regs_buff[916 + i] = IXGBE_GET_STAT(adapter, pxofftxc[i]);
-       for (i = 0; i < 8; i++)
-               regs_buff[924 + i] = IXGBE_GET_STAT(adapter, pxoffrxc[i]);
-       regs_buff[932] = IXGBE_GET_STAT(adapter, prc64);
-       regs_buff[933] = IXGBE_GET_STAT(adapter, prc127);
-       regs_buff[934] = IXGBE_GET_STAT(adapter, prc255);
-       regs_buff[935] = IXGBE_GET_STAT(adapter, prc511);
-       regs_buff[936] = IXGBE_GET_STAT(adapter, prc1023);
-       regs_buff[937] = IXGBE_GET_STAT(adapter, prc1522);
-       regs_buff[938] = IXGBE_GET_STAT(adapter, gprc);
-       regs_buff[939] = IXGBE_GET_STAT(adapter, bprc);
-       regs_buff[940] = IXGBE_GET_STAT(adapter, mprc);
-       regs_buff[941] = IXGBE_GET_STAT(adapter, gptc);
-       regs_buff[942] = IXGBE_GET_STAT(adapter, gorc);
-       regs_buff[944] = IXGBE_GET_STAT(adapter, gotc);
-       for (i = 0; i < 8; i++)
-               regs_buff[946 + i] = IXGBE_GET_STAT(adapter, rnbc[i]);
-       regs_buff[954] = IXGBE_GET_STAT(adapter, ruc);
-       regs_buff[955] = IXGBE_GET_STAT(adapter, rfc);
-       regs_buff[956] = IXGBE_GET_STAT(adapter, roc);
-       regs_buff[957] = IXGBE_GET_STAT(adapter, rjc);
-       regs_buff[958] = IXGBE_GET_STAT(adapter, mngprc);
-       regs_buff[959] = IXGBE_GET_STAT(adapter, mngpdc);
-       regs_buff[960] = IXGBE_GET_STAT(adapter, mngptc);
-       regs_buff[961] = IXGBE_GET_STAT(adapter, tor);
-       regs_buff[963] = IXGBE_GET_STAT(adapter, tpr);
-       regs_buff[964] = IXGBE_GET_STAT(adapter, tpt);
-       regs_buff[965] = IXGBE_GET_STAT(adapter, ptc64);
-       regs_buff[966] = IXGBE_GET_STAT(adapter, ptc127);
-       regs_buff[967] = IXGBE_GET_STAT(adapter, ptc255);
-       regs_buff[968] = IXGBE_GET_STAT(adapter, ptc511);
-       regs_buff[969] = IXGBE_GET_STAT(adapter, ptc1023);
-       regs_buff[970] = IXGBE_GET_STAT(adapter, ptc1522);
-       regs_buff[971] = IXGBE_GET_STAT(adapter, mptc);
-       regs_buff[972] = IXGBE_GET_STAT(adapter, bptc);
-       regs_buff[973] = IXGBE_GET_STAT(adapter, xec);
-       for (i = 0; i < 16; i++)
-               regs_buff[974 + i] = IXGBE_GET_STAT(adapter, qprc[i]);
-       for (i = 0; i < 16; i++)
-               regs_buff[990 + i] = IXGBE_GET_STAT(adapter, qptc[i]);
-       for (i = 0; i < 16; i++)
-               regs_buff[1006 + i] = IXGBE_GET_STAT(adapter, qbrc[i]);
-       for (i = 0; i < 16; i++)
-               regs_buff[1022 + i] = IXGBE_GET_STAT(adapter, qbtc[i]);
-
-       /* MAC */
-       regs_buff[1038] = IXGBE_READ_REG(hw, IXGBE_PCS1GCFIG);
-       regs_buff[1039] = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
-       regs_buff[1040] = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
-       regs_buff[1041] = IXGBE_READ_REG(hw, IXGBE_PCS1GDBG0);
-       regs_buff[1042] = IXGBE_READ_REG(hw, IXGBE_PCS1GDBG1);
-       regs_buff[1043] = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
-       regs_buff[1044] = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
-       regs_buff[1045] = IXGBE_READ_REG(hw, IXGBE_PCS1GANNP);
-       regs_buff[1046] = IXGBE_READ_REG(hw, IXGBE_PCS1GANLPNP);
-       regs_buff[1047] = IXGBE_READ_REG(hw, IXGBE_HLREG0);
-       regs_buff[1048] = IXGBE_READ_REG(hw, IXGBE_HLREG1);
-       regs_buff[1049] = IXGBE_READ_REG(hw, IXGBE_PAP);
-       regs_buff[1050] = IXGBE_READ_REG(hw, IXGBE_MACA);
-       regs_buff[1051] = IXGBE_READ_REG(hw, IXGBE_APAE);
-       regs_buff[1052] = IXGBE_READ_REG(hw, IXGBE_ARD);
-       regs_buff[1053] = IXGBE_READ_REG(hw, IXGBE_AIS);
-       regs_buff[1054] = IXGBE_READ_REG(hw, IXGBE_MSCA);
-       regs_buff[1055] = IXGBE_READ_REG(hw, IXGBE_MSRWD);
-       regs_buff[1056] = IXGBE_READ_REG(hw, IXGBE_MLADD);
-       regs_buff[1057] = IXGBE_READ_REG(hw, IXGBE_MHADD);
-       regs_buff[1058] = IXGBE_READ_REG(hw, IXGBE_TREG);
-       regs_buff[1059] = IXGBE_READ_REG(hw, IXGBE_PCSS1);
-       regs_buff[1060] = IXGBE_READ_REG(hw, IXGBE_PCSS2);
-       regs_buff[1061] = IXGBE_READ_REG(hw, IXGBE_XPCSS);
-       regs_buff[1062] = IXGBE_READ_REG(hw, IXGBE_SERDESC);
-       regs_buff[1063] = IXGBE_READ_REG(hw, IXGBE_MACS);
-       regs_buff[1064] = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       regs_buff[1065] = IXGBE_READ_REG(hw, IXGBE_LINKS);
-       regs_buff[1066] = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
-       regs_buff[1067] = IXGBE_READ_REG(hw, IXGBE_AUTOC3);
-       regs_buff[1068] = IXGBE_READ_REG(hw, IXGBE_ANLP1);
-       regs_buff[1069] = IXGBE_READ_REG(hw, IXGBE_ANLP2);
-       regs_buff[1070] = IXGBE_READ_REG(hw, IXGBE_ATLASCTL);
-
-       /* Diagnostic */
-       regs_buff[1071] = IXGBE_READ_REG(hw, IXGBE_RDSTATCTL);
-       for (i = 0; i < 8; i++)
-               regs_buff[1072 + i] = IXGBE_READ_REG(hw, IXGBE_RDSTAT(i));
-       regs_buff[1080] = IXGBE_READ_REG(hw, IXGBE_RDHMPN);
-       for (i = 0; i < 4; i++)
-               regs_buff[1081 + i] = IXGBE_READ_REG(hw, IXGBE_RIC_DW(i));
-       regs_buff[1085] = IXGBE_READ_REG(hw, IXGBE_RDPROBE);
-       regs_buff[1086] = IXGBE_READ_REG(hw, IXGBE_TDSTATCTL);
-       for (i = 0; i < 8; i++)
-               regs_buff[1087 + i] = IXGBE_READ_REG(hw, IXGBE_TDSTAT(i));
-       regs_buff[1095] = IXGBE_READ_REG(hw, IXGBE_TDHMPN);
-       for (i = 0; i < 4; i++)
-               regs_buff[1096 + i] = IXGBE_READ_REG(hw, IXGBE_TIC_DW(i));
-       regs_buff[1100] = IXGBE_READ_REG(hw, IXGBE_TDPROBE);
-       regs_buff[1101] = IXGBE_READ_REG(hw, IXGBE_TXBUFCTRL);
-       regs_buff[1102] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA0);
-       regs_buff[1103] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA1);
-       regs_buff[1104] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA2);
-       regs_buff[1105] = IXGBE_READ_REG(hw, IXGBE_TXBUFDATA3);
-       regs_buff[1106] = IXGBE_READ_REG(hw, IXGBE_RXBUFCTRL);
-       regs_buff[1107] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA0);
-       regs_buff[1108] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA1);
-       regs_buff[1109] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA2);
-       regs_buff[1110] = IXGBE_READ_REG(hw, IXGBE_RXBUFDATA3);
-       for (i = 0; i < 8; i++)
-               regs_buff[1111 + i] = IXGBE_READ_REG(hw, IXGBE_PCIE_DIAG(i));
-       regs_buff[1119] = IXGBE_READ_REG(hw, IXGBE_RFVAL);
-       regs_buff[1120] = IXGBE_READ_REG(hw, IXGBE_MDFTC1);
-       regs_buff[1121] = IXGBE_READ_REG(hw, IXGBE_MDFTC2);
-       regs_buff[1122] = IXGBE_READ_REG(hw, IXGBE_MDFTFIFO1);
-       regs_buff[1123] = IXGBE_READ_REG(hw, IXGBE_MDFTFIFO2);
-       regs_buff[1124] = IXGBE_READ_REG(hw, IXGBE_MDFTS);
-       regs_buff[1125] = IXGBE_READ_REG(hw, IXGBE_PCIEECCCTL);
-       regs_buff[1126] = IXGBE_READ_REG(hw, IXGBE_PBTXECC);
-       regs_buff[1127] = IXGBE_READ_REG(hw, IXGBE_PBRXECC);
-}
-
-static int ixgbe_get_eeprom_len(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       return adapter->hw.eeprom.word_size * 2;
-}
-
-static int ixgbe_get_eeprom(struct net_device *netdev,
-                            struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       int first_word, last_word, eeprom_len;
-       int ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EINVAL;
-
-       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-       eeprom_len = last_word - first_word + 1;
-
-       eeprom_buff = kmalloc(sizeof(u16) * eeprom_len, GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       ret_val = hw->eeprom.ops.read_buffer(hw, first_word, eeprom_len,
-                                            eeprom_buff);
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < eeprom_len; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
-       kfree(eeprom_buff);
-
-       return ret_val;
-}
-
-static void ixgbe_get_drvinfo(struct net_device *netdev,
-                              struct ethtool_drvinfo *drvinfo)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       char firmware_version[32];
-
-       strncpy(drvinfo->driver, ixgbe_driver_name,
-               sizeof(drvinfo->driver) - 1);
-       strncpy(drvinfo->version, ixgbe_driver_version,
-               sizeof(drvinfo->version) - 1);
-
-       snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",
-                (adapter->eeprom_version & 0xF000) >> 12,
-                (adapter->eeprom_version & 0x0FF0) >> 4,
-                adapter->eeprom_version & 0x000F);
-
-       strncpy(drvinfo->fw_version, firmware_version,
-               sizeof(drvinfo->fw_version));
-       strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
-               sizeof(drvinfo->bus_info));
-       drvinfo->n_stats = IXGBE_STATS_LEN;
-       drvinfo->testinfo_len = IXGBE_TEST_LEN;
-       drvinfo->regdump_len = ixgbe_get_regs_len(netdev);
-}
-
-static void ixgbe_get_ringparam(struct net_device *netdev,
-                                struct ethtool_ringparam *ring)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_ring *tx_ring = adapter->tx_ring[0];
-       struct ixgbe_ring *rx_ring = adapter->rx_ring[0];
-
-       ring->rx_max_pending = IXGBE_MAX_RXD;
-       ring->tx_max_pending = IXGBE_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rx_ring->count;
-       ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int ixgbe_set_ringparam(struct net_device *netdev,
-                               struct ethtool_ringparam *ring)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_ring *temp_tx_ring, *temp_rx_ring;
-       int i, err = 0;
-       u32 new_rx_count, new_tx_count;
-       bool need_update = false;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       new_rx_count = max(ring->rx_pending, (u32)IXGBE_MIN_RXD);
-       new_rx_count = min(new_rx_count, (u32)IXGBE_MAX_RXD);
-       new_rx_count = ALIGN(new_rx_count, IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       new_tx_count = max(ring->tx_pending, (u32)IXGBE_MIN_TXD);
-       new_tx_count = min(new_tx_count, (u32)IXGBE_MAX_TXD);
-       new_tx_count = ALIGN(new_tx_count, IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       if ((new_tx_count == adapter->tx_ring[0]->count) &&
-           (new_rx_count == adapter->rx_ring[0]->count)) {
-               /* nothing to do */
-               return 0;
-       }
-
-       while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
-               usleep_range(1000, 2000);
-
-       if (!netif_running(adapter->netdev)) {
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       adapter->tx_ring[i]->count = new_tx_count;
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       adapter->rx_ring[i]->count = new_rx_count;
-               adapter->tx_ring_count = new_tx_count;
-               adapter->rx_ring_count = new_rx_count;
-               goto clear_reset;
-       }
-
-       temp_tx_ring = vmalloc(adapter->num_tx_queues * sizeof(struct ixgbe_ring));
-       if (!temp_tx_ring) {
-               err = -ENOMEM;
-               goto clear_reset;
-       }
-
-       if (new_tx_count != adapter->tx_ring_count) {
-               for (i = 0; i < adapter->num_tx_queues; i++) {
-                       memcpy(&temp_tx_ring[i], adapter->tx_ring[i],
-                              sizeof(struct ixgbe_ring));
-                       temp_tx_ring[i].count = new_tx_count;
-                       err = ixgbe_setup_tx_resources(&temp_tx_ring[i]);
-                       if (err) {
-                               while (i) {
-                                       i--;
-                                       ixgbe_free_tx_resources(&temp_tx_ring[i]);
-                               }
-                               goto clear_reset;
-                       }
-               }
-               need_update = true;
-       }
-
-       temp_rx_ring = vmalloc(adapter->num_rx_queues * sizeof(struct ixgbe_ring));
-       if (!temp_rx_ring) {
-               err = -ENOMEM;
-               goto err_setup;
-       }
-
-       if (new_rx_count != adapter->rx_ring_count) {
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       memcpy(&temp_rx_ring[i], adapter->rx_ring[i],
-                              sizeof(struct ixgbe_ring));
-                       temp_rx_ring[i].count = new_rx_count;
-                       err = ixgbe_setup_rx_resources(&temp_rx_ring[i]);
-                       if (err) {
-                               while (i) {
-                                       i--;
-                                       ixgbe_free_rx_resources(&temp_rx_ring[i]);
-                               }
-                               goto err_setup;
-                       }
-               }
-               need_update = true;
-       }
-
-       /* if rings need to be updated, here's the place to do it in one shot */
-       if (need_update) {
-               ixgbe_down(adapter);
-
-               /* tx */
-               if (new_tx_count != adapter->tx_ring_count) {
-                       for (i = 0; i < adapter->num_tx_queues; i++) {
-                               ixgbe_free_tx_resources(adapter->tx_ring[i]);
-                               memcpy(adapter->tx_ring[i], &temp_tx_ring[i],
-                                      sizeof(struct ixgbe_ring));
-                       }
-                       adapter->tx_ring_count = new_tx_count;
-               }
-
-               /* rx */
-               if (new_rx_count != adapter->rx_ring_count) {
-                       for (i = 0; i < adapter->num_rx_queues; i++) {
-                               ixgbe_free_rx_resources(adapter->rx_ring[i]);
-                               memcpy(adapter->rx_ring[i], &temp_rx_ring[i],
-                                      sizeof(struct ixgbe_ring));
-                       }
-                       adapter->rx_ring_count = new_rx_count;
-               }
-               ixgbe_up(adapter);
-       }
-
-       vfree(temp_rx_ring);
-err_setup:
-       vfree(temp_tx_ring);
-clear_reset:
-       clear_bit(__IXGBE_RESETTING, &adapter->state);
-       return err;
-}
-
-static int ixgbe_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return IXGBE_TEST_LEN;
-       case ETH_SS_STATS:
-               return IXGBE_STATS_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void ixgbe_get_ethtool_stats(struct net_device *netdev,
-                                    struct ethtool_stats *stats, u64 *data)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct rtnl_link_stats64 temp;
-       const struct rtnl_link_stats64 *net_stats;
-       unsigned int start;
-       struct ixgbe_ring *ring;
-       int i, j;
-       char *p = NULL;
-
-       ixgbe_update_stats(adapter);
-       net_stats = dev_get_stats(netdev, &temp);
-       for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
-               switch (ixgbe_gstrings_stats[i].type) {
-               case NETDEV_STATS:
-                       p = (char *) net_stats +
-                                       ixgbe_gstrings_stats[i].stat_offset;
-                       break;
-               case IXGBE_STATS:
-                       p = (char *) adapter +
-                                       ixgbe_gstrings_stats[i].stat_offset;
-                       break;
-               }
-
-               data[i] = (ixgbe_gstrings_stats[i].sizeof_stat ==
-                          sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-       }
-       for (j = 0; j < adapter->num_tx_queues; j++) {
-               ring = adapter->tx_ring[j];
-               do {
-                       start = u64_stats_fetch_begin_bh(&ring->syncp);
-                       data[i]   = ring->stats.packets;
-                       data[i+1] = ring->stats.bytes;
-               } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
-               i += 2;
-       }
-       for (j = 0; j < adapter->num_rx_queues; j++) {
-               ring = adapter->rx_ring[j];
-               do {
-                       start = u64_stats_fetch_begin_bh(&ring->syncp);
-                       data[i]   = ring->stats.packets;
-                       data[i+1] = ring->stats.bytes;
-               } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
-               i += 2;
-       }
-       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-               for (j = 0; j < MAX_TX_PACKET_BUFFERS; j++) {
-                       data[i++] = adapter->stats.pxontxc[j];
-                       data[i++] = adapter->stats.pxofftxc[j];
-               }
-               for (j = 0; j < MAX_RX_PACKET_BUFFERS; j++) {
-                       data[i++] = adapter->stats.pxonrxc[j];
-                       data[i++] = adapter->stats.pxoffrxc[j];
-               }
-       }
-}
-
-static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,
-                              u8 *data)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       char *p = (char *)data;
-       int i;
-
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *ixgbe_gstrings_test,
-                      IXGBE_TEST_LEN * ETH_GSTRING_LEN);
-               break;
-       case ETH_SS_STATS:
-               for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, ixgbe_gstrings_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-               for (i = 0; i < adapter->num_tx_queues; i++) {
-                       sprintf(p, "tx_queue_%u_packets", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "tx_queue_%u_bytes", i);
-                       p += ETH_GSTRING_LEN;
-               }
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       sprintf(p, "rx_queue_%u_packets", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_bytes", i);
-                       p += ETH_GSTRING_LEN;
-               }
-               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                       for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) {
-                               sprintf(p, "tx_pb_%u_pxon", i);
-                               p += ETH_GSTRING_LEN;
-                               sprintf(p, "tx_pb_%u_pxoff", i);
-                               p += ETH_GSTRING_LEN;
-                       }
-                       for (i = 0; i < MAX_RX_PACKET_BUFFERS; i++) {
-                               sprintf(p, "rx_pb_%u_pxon", i);
-                               p += ETH_GSTRING_LEN;
-                               sprintf(p, "rx_pb_%u_pxoff", i);
-                               p += ETH_GSTRING_LEN;
-                       }
-               }
-               /* BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */
-               break;
-       }
-}
-
-static int ixgbe_link_test(struct ixgbe_adapter *adapter, u64 *data)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       bool link_up;
-       u32 link_speed = 0;
-       *data = 0;
-
-       hw->mac.ops.check_link(hw, &link_speed, &link_up, true);
-       if (link_up)
-               return *data;
-       else
-               *data = 1;
-       return *data;
-}
-
-/* ethtool register test data */
-struct ixgbe_reg_test {
-       u16 reg;
-       u8  array_len;
-       u8  test_type;
-       u32 mask;
-       u32 write;
-};
-
-/* In the hardware, registers are laid out either singly, in arrays
- * spaced 0x40 bytes apart, or in contiguous tables.  We assume
- * most tests take place on arrays or single registers (handled
- * as a single-element array) and special-case the tables.
- * Table tests are always pattern tests.
- *
- * We also make provision for some required setup steps by specifying
- * registers to be written without any read-back testing.
- */
-
-#define PATTERN_TEST   1
-#define SET_READ_TEST  2
-#define WRITE_NO_TEST  3
-#define TABLE32_TEST   4
-#define TABLE64_TEST_LO        5
-#define TABLE64_TEST_HI        6
-
-/* default 82599 register test */
-static const struct ixgbe_reg_test reg_test_82599[] = {
-       { IXGBE_FCRTL_82599(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
-       { IXGBE_FCRTH_82599(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
-       { IXGBE_PFCTOP, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_VLNCTRL, 1, PATTERN_TEST, 0x00000000, 0x00000000 },
-       { IXGBE_RDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFF80 },
-       { IXGBE_RDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_RDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, IXGBE_RXDCTL_ENABLE },
-       { IXGBE_RDT(0), 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, 0 },
-       { IXGBE_FCRTH(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
-       { IXGBE_FCTTV(0), 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_TDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { IXGBE_TDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_TDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFF80 },
-       { IXGBE_RXCTRL, 1, SET_READ_TEST, 0x00000001, 0x00000001 },
-       { IXGBE_RAL(0), 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_RAL(0), 16, TABLE64_TEST_HI, 0x8001FFFF, 0x800CFFFF },
-       { IXGBE_MTA(0), 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
-};
-
-/* default 82598 register test */
-static const struct ixgbe_reg_test reg_test_82598[] = {
-       { IXGBE_FCRTL(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
-       { IXGBE_FCRTH(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
-       { IXGBE_PFCTOP, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_VLNCTRL, 1, PATTERN_TEST, 0x00000000, 0x00000000 },
-       { IXGBE_RDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { IXGBE_RDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_RDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       /* Enable all four RX queues before testing. */
-       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, IXGBE_RXDCTL_ENABLE },
-       /* RDH is read-only for 82598, only test RDT. */
-       { IXGBE_RDT(0), 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { IXGBE_RXDCTL(0), 4, WRITE_NO_TEST, 0, 0 },
-       { IXGBE_FCRTH(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
-       { IXGBE_FCTTV(0), 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_TIPG, 1, PATTERN_TEST, 0x000000FF, 0x000000FF },
-       { IXGBE_TDBAL(0), 4, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { IXGBE_TDBAH(0), 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_TDLEN(0), 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       { IXGBE_RXCTRL, 1, SET_READ_TEST, 0x00000003, 0x00000003 },
-       { IXGBE_DTXCTL, 1, SET_READ_TEST, 0x00000005, 0x00000005 },
-       { IXGBE_RAL(0), 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_RAL(0), 16, TABLE64_TEST_HI, 0x800CFFFF, 0x800CFFFF },
-       { IXGBE_MTA(0), 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
-};
-
-static bool reg_pattern_test(struct ixgbe_adapter *adapter, u64 *data, int reg,
-                            u32 mask, u32 write)
-{
-       u32 pat, val, before;
-       static const u32 test_pattern[] = {
-               0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
-
-       for (pat = 0; pat < ARRAY_SIZE(test_pattern); pat++) {
-               before = readl(adapter->hw.hw_addr + reg);
-               writel((test_pattern[pat] & write),
-                      (adapter->hw.hw_addr + reg));
-               val = readl(adapter->hw.hw_addr + reg);
-               if (val != (test_pattern[pat] & write & mask)) {
-                       e_err(drv, "pattern test reg %04X failed: got "
-                             "0x%08X expected 0x%08X\n",
-                             reg, val, (test_pattern[pat] & write & mask));
-                       *data = reg;
-                       writel(before, adapter->hw.hw_addr + reg);
-                       return 1;
-               }
-               writel(before, adapter->hw.hw_addr + reg);
-       }
-       return 0;
-}
-
-static bool reg_set_and_check(struct ixgbe_adapter *adapter, u64 *data, int reg,
-                             u32 mask, u32 write)
-{
-       u32 val, before;
-       before = readl(adapter->hw.hw_addr + reg);
-       writel((write & mask), (adapter->hw.hw_addr + reg));
-       val = readl(adapter->hw.hw_addr + reg);
-       if ((write & mask) != (val & mask)) {
-               e_err(drv, "set/check reg %04X test failed: got 0x%08X "
-                     "expected 0x%08X\n", reg, (val & mask), (write & mask));
-               *data = reg;
-               writel(before, (adapter->hw.hw_addr + reg));
-               return 1;
-       }
-       writel(before, (adapter->hw.hw_addr + reg));
-       return 0;
-}
-
-#define REG_PATTERN_TEST(reg, mask, write)                                   \
-       do {                                                                  \
-               if (reg_pattern_test(adapter, data, reg, mask, write))        \
-                       return 1;                                             \
-       } while (0)                                                           \
-
-
-#define REG_SET_AND_CHECK(reg, mask, write)                                  \
-       do {                                                                  \
-               if (reg_set_and_check(adapter, data, reg, mask, write))       \
-                       return 1;                                             \
-       } while (0)                                                           \
-
-static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data)
-{
-       const struct ixgbe_reg_test *test;
-       u32 value, before, after;
-       u32 i, toggle;
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82598EB:
-               toggle = 0x7FFFF3FF;
-               test = reg_test_82598;
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               toggle = 0x7FFFF30F;
-               test = reg_test_82599;
-               break;
-       default:
-               *data = 1;
-               return 1;
-               break;
-       }
-
-       /*
-        * Because the status register is such a special case,
-        * we handle it separately from the rest of the register
-        * tests.  Some bits are read-only, some toggle, and some
-        * are writeable on newer MACs.
-        */
-       before = IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS);
-       value = (IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS) & toggle);
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_STATUS, toggle);
-       after = IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS) & toggle;
-       if (value != after) {
-               e_err(drv, "failed STATUS register test got: 0x%08X "
-                     "expected: 0x%08X\n", after, value);
-               *data = 1;
-               return 1;
-       }
-       /* restore previous status */
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_STATUS, before);
-
-       /*
-        * Perform the remainder of the register test, looping through
-        * the test table until we either fail or reach the null entry.
-        */
-       while (test->reg) {
-               for (i = 0; i < test->array_len; i++) {
-                       switch (test->test_type) {
-                       case PATTERN_TEST:
-                               REG_PATTERN_TEST(test->reg + (i * 0x40),
-                                                test->mask,
-                                                test->write);
-                               break;
-                       case SET_READ_TEST:
-                               REG_SET_AND_CHECK(test->reg + (i * 0x40),
-                                                 test->mask,
-                                                 test->write);
-                               break;
-                       case WRITE_NO_TEST:
-                               writel(test->write,
-                                      (adapter->hw.hw_addr + test->reg)
-                                      + (i * 0x40));
-                               break;
-                       case TABLE32_TEST:
-                               REG_PATTERN_TEST(test->reg + (i * 4),
-                                                test->mask,
-                                                test->write);
-                               break;
-                       case TABLE64_TEST_LO:
-                               REG_PATTERN_TEST(test->reg + (i * 8),
-                                                test->mask,
-                                                test->write);
-                               break;
-                       case TABLE64_TEST_HI:
-                               REG_PATTERN_TEST((test->reg + 4) + (i * 8),
-                                                test->mask,
-                                                test->write);
-                               break;
-                       }
-               }
-               test++;
-       }
-
-       *data = 0;
-       return 0;
-}
-
-static int ixgbe_eeprom_test(struct ixgbe_adapter *adapter, u64 *data)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       if (hw->eeprom.ops.validate_checksum(hw, NULL))
-               *data = 1;
-       else
-               *data = 0;
-       return *data;
-}
-
-static irqreturn_t ixgbe_test_intr(int irq, void *data)
-{
-       struct net_device *netdev = (struct net_device *) data;
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       adapter->test_icr |= IXGBE_READ_REG(&adapter->hw, IXGBE_EICR);
-
-       return IRQ_HANDLED;
-}
-
-static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data)
-{
-       struct net_device *netdev = adapter->netdev;
-       u32 mask, i = 0, shared_int = true;
-       u32 irq = adapter->pdev->irq;
-
-       *data = 0;
-
-       /* Hook up test interrupt handler just for this test */
-       if (adapter->msix_entries) {
-               /* NOTE: we don't test MSI-X interrupts here, yet */
-               return 0;
-       } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
-               shared_int = false;
-               if (request_irq(irq, ixgbe_test_intr, 0, netdev->name,
-                               netdev)) {
-                       *data = 1;
-                       return -1;
-               }
-       } else if (!request_irq(irq, ixgbe_test_intr, IRQF_PROBE_SHARED,
-                               netdev->name, netdev)) {
-               shared_int = false;
-       } else if (request_irq(irq, ixgbe_test_intr, IRQF_SHARED,
-                              netdev->name, netdev)) {
-               *data = 1;
-               return -1;
-       }
-       e_info(hw, "testing %s interrupt\n", shared_int ?
-              "shared" : "unshared");
-
-       /* Disable all the interrupts */
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);
-       IXGBE_WRITE_FLUSH(&adapter->hw);
-       usleep_range(10000, 20000);
-
-       /* Test each interrupt */
-       for (; i < 10; i++) {
-               /* Interrupt to test */
-               mask = 1 << i;
-
-               if (!shared_int) {
-                       /*
-                        * Disable the interrupts to be reported in
-                        * the cause register and then force the same
-                        * interrupt and see if one gets posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC,
-                                       ~mask & 0x00007FFF);
-                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS,
-                                       ~mask & 0x00007FFF);
-                       IXGBE_WRITE_FLUSH(&adapter->hw);
-                       usleep_range(10000, 20000);
-
-                       if (adapter->test_icr & mask) {
-                               *data = 3;
-                               break;
-                       }
-               }
-
-               /*
-                * Enable the interrupt to be reported in the cause
-                * register and then force the same interrupt and see
-                * if one gets posted.  If an interrupt was not posted
-                * to the bus, the test failed.
-                */
-               adapter->test_icr = 0;
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, mask);
-               IXGBE_WRITE_FLUSH(&adapter->hw);
-               usleep_range(10000, 20000);
-
-               if (!(adapter->test_icr &mask)) {
-                       *data = 4;
-                       break;
-               }
-
-               if (!shared_int) {
-                       /*
-                        * Disable the other interrupts to be reported in
-                        * the cause register and then force the other
-                        * interrupts and see if any get posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC,
-                                       ~mask & 0x00007FFF);
-                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS,
-                                       ~mask & 0x00007FFF);
-                       IXGBE_WRITE_FLUSH(&adapter->hw);
-                       usleep_range(10000, 20000);
-
-                       if (adapter->test_icr) {
-                               *data = 5;
-                               break;
-                       }
-               }
-       }
-
-       /* Disable all the interrupts */
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);
-       IXGBE_WRITE_FLUSH(&adapter->hw);
-       usleep_range(10000, 20000);
-
-       /* Unhook test interrupt handler */
-       free_irq(irq, netdev);
-
-       return *data;
-}
-
-static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_ring *tx_ring = &adapter->test_tx_ring;
-       struct ixgbe_ring *rx_ring = &adapter->test_rx_ring;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 reg_ctl;
-
-       /* shut down the DMA engines now so they can be reinitialized later */
-
-       /* first Rx */
-       reg_ctl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
-       reg_ctl &= ~IXGBE_RXCTRL_RXEN;
-       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, reg_ctl);
-       ixgbe_disable_rx_queue(adapter, rx_ring);
-
-       /* now Tx */
-       reg_ctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(tx_ring->reg_idx));
-       reg_ctl &= ~IXGBE_TXDCTL_ENABLE;
-       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(tx_ring->reg_idx), reg_ctl);
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               reg_ctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);
-               reg_ctl &= ~IXGBE_DMATXCTL_TE;
-               IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, reg_ctl);
-               break;
-       default:
-               break;
-       }
-
-       ixgbe_reset(adapter);
-
-       ixgbe_free_tx_resources(&adapter->test_tx_ring);
-       ixgbe_free_rx_resources(&adapter->test_rx_ring);
-}
-
-static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_ring *tx_ring = &adapter->test_tx_ring;
-       struct ixgbe_ring *rx_ring = &adapter->test_rx_ring;
-       u32 rctl, reg_data;
-       int ret_val;
-       int err;
-
-       /* Setup Tx descriptor ring and Tx buffers */
-       tx_ring->count = IXGBE_DEFAULT_TXD;
-       tx_ring->queue_index = 0;
-       tx_ring->dev = &adapter->pdev->dev;
-       tx_ring->netdev = adapter->netdev;
-       tx_ring->reg_idx = adapter->tx_ring[0]->reg_idx;
-       tx_ring->numa_node = adapter->node;
-
-       err = ixgbe_setup_tx_resources(tx_ring);
-       if (err)
-               return 1;
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_DMATXCTL);
-               reg_data |= IXGBE_DMATXCTL_TE;
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_DMATXCTL, reg_data);
-               break;
-       default:
-               break;
-       }
-
-       ixgbe_configure_tx_ring(adapter, tx_ring);
-
-       /* Setup Rx Descriptor ring and Rx buffers */
-       rx_ring->count = IXGBE_DEFAULT_RXD;
-       rx_ring->queue_index = 0;
-       rx_ring->dev = &adapter->pdev->dev;
-       rx_ring->netdev = adapter->netdev;
-       rx_ring->reg_idx = adapter->rx_ring[0]->reg_idx;
-       rx_ring->rx_buf_len = IXGBE_RXBUFFER_2048;
-       rx_ring->numa_node = adapter->node;
-
-       err = ixgbe_setup_rx_resources(rx_ring);
-       if (err) {
-               ret_val = 4;
-               goto err_nomem;
-       }
-
-       rctl = IXGBE_READ_REG(&adapter->hw, IXGBE_RXCTRL);
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXCTRL, rctl & ~IXGBE_RXCTRL_RXEN);
-
-       ixgbe_configure_rx_ring(adapter, rx_ring);
-
-       rctl |= IXGBE_RXCTRL_RXEN | IXGBE_RXCTRL_DMBYPS;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXCTRL, rctl);
-
-       return 0;
-
-err_nomem:
-       ixgbe_free_desc_rings(adapter);
-       return ret_val;
-}
-
-static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 reg_data;
-
-       /* X540 needs to set the MACC.FLU bit to force link up */
-       if (adapter->hw.mac.type == ixgbe_mac_X540) {
-               reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_MACC);
-               reg_data |= IXGBE_MACC_FLU;
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_MACC, reg_data);
-       }
-
-       /* right now we only support MAC loopback in the driver */
-       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0);
-       /* Setup MAC loopback */
-       reg_data |= IXGBE_HLREG0_LPBK;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_HLREG0, reg_data);
-
-       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_FCTRL);
-       reg_data |= IXGBE_FCTRL_BAM | IXGBE_FCTRL_SBP | IXGBE_FCTRL_MPE;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCTRL, reg_data);
-
-       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_AUTOC);
-       reg_data &= ~IXGBE_AUTOC_LMS_MASK;
-       reg_data |= IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_AUTOC, reg_data);
-       IXGBE_WRITE_FLUSH(&adapter->hw);
-       usleep_range(10000, 20000);
-
-       /* Disable Atlas Tx lanes; re-enabled in reset path */
-       if (hw->mac.type == ixgbe_mac_82598EB) {
-               u8 atlas;
-
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, &atlas);
-               atlas |= IXGBE_ATLAS_PDN_TX_REG_EN;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_LPBK, atlas);
-
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_10G, &atlas);
-               atlas |= IXGBE_ATLAS_PDN_TX_10G_QL_ALL;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_10G, atlas);
-
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_1G, &atlas);
-               atlas |= IXGBE_ATLAS_PDN_TX_1G_QL_ALL;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_1G, atlas);
-
-               hw->mac.ops.read_analog_reg8(hw, IXGBE_ATLAS_PDN_AN, &atlas);
-               atlas |= IXGBE_ATLAS_PDN_TX_AN_QL_ALL;
-               hw->mac.ops.write_analog_reg8(hw, IXGBE_ATLAS_PDN_AN, atlas);
-       }
-
-       return 0;
-}
-
-static void ixgbe_loopback_cleanup(struct ixgbe_adapter *adapter)
-{
-       u32 reg_data;
-
-       reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0);
-       reg_data &= ~IXGBE_HLREG0_LPBK;
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_HLREG0, reg_data);
-}
-
-static void ixgbe_create_lbtest_frame(struct sk_buff *skb,
-                                      unsigned int frame_size)
-{
-       memset(skb->data, 0xFF, frame_size);
-       frame_size &= ~1;
-       memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
-       memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
-       memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
-}
-
-static int ixgbe_check_lbtest_frame(struct sk_buff *skb,
-                                    unsigned int frame_size)
-{
-       frame_size &= ~1;
-       if (*(skb->data + 3) == 0xFF) {
-               if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
-                   (*(skb->data + frame_size / 2 + 12) == 0xAF)) {
-                       return 0;
-               }
-       }
-       return 13;
-}
-
-static u16 ixgbe_clean_test_rings(struct ixgbe_ring *rx_ring,
-                                  struct ixgbe_ring *tx_ring,
-                                  unsigned int size)
-{
-       union ixgbe_adv_rx_desc *rx_desc;
-       struct ixgbe_rx_buffer *rx_buffer_info;
-       struct ixgbe_tx_buffer *tx_buffer_info;
-       const int bufsz = rx_ring->rx_buf_len;
-       u32 staterr;
-       u16 rx_ntc, tx_ntc, count = 0;
-
-       /* initialize next to clean and descriptor values */
-       rx_ntc = rx_ring->next_to_clean;
-       tx_ntc = tx_ring->next_to_clean;
-       rx_desc = IXGBE_RX_DESC_ADV(rx_ring, rx_ntc);
-       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-
-       while (staterr & IXGBE_RXD_STAT_DD) {
-               /* check Rx buffer */
-               rx_buffer_info = &rx_ring->rx_buffer_info[rx_ntc];
-
-               /* unmap Rx buffer, will be remapped by alloc_rx_buffers */
-               dma_unmap_single(rx_ring->dev,
-                                rx_buffer_info->dma,
-                                bufsz,
-                                DMA_FROM_DEVICE);
-               rx_buffer_info->dma = 0;
-
-               /* verify contents of skb */
-               if (!ixgbe_check_lbtest_frame(rx_buffer_info->skb, size))
-                       count++;
-
-               /* unmap buffer on Tx side */
-               tx_buffer_info = &tx_ring->tx_buffer_info[tx_ntc];
-               ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
-
-               /* increment Rx/Tx next to clean counters */
-               rx_ntc++;
-               if (rx_ntc == rx_ring->count)
-                       rx_ntc = 0;
-               tx_ntc++;
-               if (tx_ntc == tx_ring->count)
-                       tx_ntc = 0;
-
-               /* fetch next descriptor */
-               rx_desc = IXGBE_RX_DESC_ADV(rx_ring, rx_ntc);
-               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-       }
-
-       /* re-map buffers to ring, store next to clean values */
-       ixgbe_alloc_rx_buffers(rx_ring, count);
-       rx_ring->next_to_clean = rx_ntc;
-       tx_ring->next_to_clean = tx_ntc;
-
-       return count;
-}
-
-static int ixgbe_run_loopback_test(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_ring *tx_ring = &adapter->test_tx_ring;
-       struct ixgbe_ring *rx_ring = &adapter->test_rx_ring;
-       int i, j, lc, good_cnt, ret_val = 0;
-       unsigned int size = 1024;
-       netdev_tx_t tx_ret_val;
-       struct sk_buff *skb;
-
-       /* allocate test skb */
-       skb = alloc_skb(size, GFP_KERNEL);
-       if (!skb)
-               return 11;
-
-       /* place data into test skb */
-       ixgbe_create_lbtest_frame(skb, size);
-       skb_put(skb, size);
-
-       /*
-        * Calculate the loop count based on the largest descriptor ring
-        * The idea is to wrap the largest ring a number of times using 64
-        * send/receive pairs during each loop
-        */
-
-       if (rx_ring->count <= tx_ring->count)
-               lc = ((tx_ring->count / 64) * 2) + 1;
-       else
-               lc = ((rx_ring->count / 64) * 2) + 1;
-
-       for (j = 0; j <= lc; j++) {
-               /* reset count of good packets */
-               good_cnt = 0;
-
-               /* place 64 packets on the transmit queue*/
-               for (i = 0; i < 64; i++) {
-                       skb_get(skb);
-                       tx_ret_val = ixgbe_xmit_frame_ring(skb,
-                                                          adapter,
-                                                          tx_ring);
-                       if (tx_ret_val == NETDEV_TX_OK)
-                               good_cnt++;
-               }
-
-               if (good_cnt != 64) {
-                       ret_val = 12;
-                       break;
-               }
-
-               /* allow 200 milliseconds for packets to go from Tx to Rx */
-               msleep(200);
-
-               good_cnt = ixgbe_clean_test_rings(rx_ring, tx_ring, size);
-               if (good_cnt != 64) {
-                       ret_val = 13;
-                       break;
-               }
-       }
-
-       /* free the original skb */
-       kfree_skb(skb);
-
-       return ret_val;
-}
-
-static int ixgbe_loopback_test(struct ixgbe_adapter *adapter, u64 *data)
-{
-       *data = ixgbe_setup_desc_rings(adapter);
-       if (*data)
-               goto out;
-       *data = ixgbe_setup_loopback_test(adapter);
-       if (*data)
-               goto err_loopback;
-       *data = ixgbe_run_loopback_test(adapter);
-       ixgbe_loopback_cleanup(adapter);
-
-err_loopback:
-       ixgbe_free_desc_rings(adapter);
-out:
-       return *data;
-}
-
-static void ixgbe_diag_test(struct net_device *netdev,
-                            struct ethtool_test *eth_test, u64 *data)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       bool if_running = netif_running(netdev);
-
-       set_bit(__IXGBE_TESTING, &adapter->state);
-       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
-               /* Offline tests */
-
-               e_info(hw, "offline testing starting\n");
-
-               /* Link test performed before hardware reset so autoneg doesn't
-                * interfere with test result */
-               if (ixgbe_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
-                       int i;
-                       for (i = 0; i < adapter->num_vfs; i++) {
-                               if (adapter->vfinfo[i].clear_to_send) {
-                                       netdev_warn(netdev, "%s",
-                                                   "offline diagnostic is not "
-                                                   "supported when VFs are "
-                                                   "present\n");
-                                       data[0] = 1;
-                                       data[1] = 1;
-                                       data[2] = 1;
-                                       data[3] = 1;
-                                       eth_test->flags |= ETH_TEST_FL_FAILED;
-                                       clear_bit(__IXGBE_TESTING,
-                                                 &adapter->state);
-                                       goto skip_ol_tests;
-                               }
-                       }
-               }
-
-               if (if_running)
-                       /* indicate we're in test mode */
-                       dev_close(netdev);
-               else
-                       ixgbe_reset(adapter);
-
-               e_info(hw, "register testing starting\n");
-               if (ixgbe_reg_test(adapter, &data[0]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               ixgbe_reset(adapter);
-               e_info(hw, "eeprom testing starting\n");
-               if (ixgbe_eeprom_test(adapter, &data[1]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               ixgbe_reset(adapter);
-               e_info(hw, "interrupt testing starting\n");
-               if (ixgbe_intr_test(adapter, &data[2]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* If SRIOV or VMDq is enabled then skip MAC
-                * loopback diagnostic. */
-               if (adapter->flags & (IXGBE_FLAG_SRIOV_ENABLED |
-                                     IXGBE_FLAG_VMDQ_ENABLED)) {
-                       e_info(hw, "Skip MAC loopback diagnostic in VT "
-                              "mode\n");
-                       data[3] = 0;
-                       goto skip_loopback;
-               }
-
-               ixgbe_reset(adapter);
-               e_info(hw, "loopback testing starting\n");
-               if (ixgbe_loopback_test(adapter, &data[3]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-skip_loopback:
-               ixgbe_reset(adapter);
-
-               clear_bit(__IXGBE_TESTING, &adapter->state);
-               if (if_running)
-                       dev_open(netdev);
-       } else {
-               e_info(hw, "online testing starting\n");
-               /* Online tests */
-               if (ixgbe_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* Online tests aren't run; pass by default */
-               data[0] = 0;
-               data[1] = 0;
-               data[2] = 0;
-               data[3] = 0;
-
-               clear_bit(__IXGBE_TESTING, &adapter->state);
-       }
-skip_ol_tests:
-       msleep_interruptible(4 * 1000);
-}
-
-static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter,
-                               struct ethtool_wolinfo *wol)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int retval = 1;
-
-       /* WOL not supported except for the following */
-       switch(hw->device_id) {
-       case IXGBE_DEV_ID_82599_SFP:
-               /* Only this subdevice supports WOL */
-               if (hw->subsystem_device_id != IXGBE_SUBDEV_ID_82599_SFP) {
-                       wol->supported = 0;
-                       break;
-               }
-               retval = 0;
-               break;
-       case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
-               /* All except this subdevice support WOL */
-               if (hw->subsystem_device_id ==
-                   IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ) {
-                       wol->supported = 0;
-                       break;
-               }
-               retval = 0;
-               break;
-       case IXGBE_DEV_ID_82599_KX4:
-               retval = 0;
-               break;
-       default:
-               wol->supported = 0;
-       }
-
-       return retval;
-}
-
-static void ixgbe_get_wol(struct net_device *netdev,
-                          struct ethtool_wolinfo *wol)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       wol->supported = WAKE_UCAST | WAKE_MCAST |
-                        WAKE_BCAST | WAKE_MAGIC;
-       wol->wolopts = 0;
-
-       if (ixgbe_wol_exclusion(adapter, wol) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return;
-
-       if (adapter->wol & IXGBE_WUFC_EX)
-               wol->wolopts |= WAKE_UCAST;
-       if (adapter->wol & IXGBE_WUFC_MC)
-               wol->wolopts |= WAKE_MCAST;
-       if (adapter->wol & IXGBE_WUFC_BC)
-               wol->wolopts |= WAKE_BCAST;
-       if (adapter->wol & IXGBE_WUFC_MAG)
-               wol->wolopts |= WAKE_MAGIC;
-}
-
-static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
-               return -EOPNOTSUPP;
-
-       if (ixgbe_wol_exclusion(adapter, wol))
-               return wol->wolopts ? -EOPNOTSUPP : 0;
-
-       adapter->wol = 0;
-
-       if (wol->wolopts & WAKE_UCAST)
-               adapter->wol |= IXGBE_WUFC_EX;
-       if (wol->wolopts & WAKE_MCAST)
-               adapter->wol |= IXGBE_WUFC_MC;
-       if (wol->wolopts & WAKE_BCAST)
-               adapter->wol |= IXGBE_WUFC_BC;
-       if (wol->wolopts & WAKE_MAGIC)
-               adapter->wol |= IXGBE_WUFC_MAG;
-
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       return 0;
-}
-
-static int ixgbe_nway_reset(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       if (netif_running(netdev))
-               ixgbe_reinit_locked(adapter);
-
-       return 0;
-}
-
-static int ixgbe_set_phys_id(struct net_device *netdev,
-                            enum ethtool_phys_id_state state)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       switch (state) {
-       case ETHTOOL_ID_ACTIVE:
-               adapter->led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-               return 2;
-
-       case ETHTOOL_ID_ON:
-               hw->mac.ops.led_on(hw, IXGBE_LED_ON);
-               break;
-
-       case ETHTOOL_ID_OFF:
-               hw->mac.ops.led_off(hw, IXGBE_LED_ON);
-               break;
-
-       case ETHTOOL_ID_INACTIVE:
-               /* Restore LED settings */
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_LEDCTL, adapter->led_reg);
-               break;
-       }
-
-       return 0;
-}
-
-static int ixgbe_get_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       ec->tx_max_coalesced_frames_irq = adapter->tx_work_limit;
-
-       /* only valid if in constant ITR mode */
-       switch (adapter->rx_itr_setting) {
-       case 0:
-               /* throttling disabled */
-               ec->rx_coalesce_usecs = 0;
-               break;
-       case 1:
-               /* dynamic ITR mode */
-               ec->rx_coalesce_usecs = 1;
-               break;
-       default:
-               /* fixed interrupt rate mode */
-               ec->rx_coalesce_usecs = 1000000/adapter->rx_eitr_param;
-               break;
-       }
-
-       /* if in mixed tx/rx queues per vector mode, report only rx settings */
-       if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count)
-               return 0;
-
-       /* only valid if in constant ITR mode */
-       switch (adapter->tx_itr_setting) {
-       case 0:
-               /* throttling disabled */
-               ec->tx_coalesce_usecs = 0;
-               break;
-       case 1:
-               /* dynamic ITR mode */
-               ec->tx_coalesce_usecs = 1;
-               break;
-       default:
-               ec->tx_coalesce_usecs = 1000000/adapter->tx_eitr_param;
-               break;
-       }
-
-       return 0;
-}
-
-/*
- * this function must be called before setting the new value of
- * rx_itr_setting
- */
-static bool ixgbe_update_rsc(struct ixgbe_adapter *adapter,
-                            struct ethtool_coalesce *ec)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))
-               return false;
-
-       /* if interrupt rate is too high then disable RSC */
-       if (ec->rx_coalesce_usecs != 1 &&
-           ec->rx_coalesce_usecs <= 1000000/IXGBE_MAX_RSC_INT_RATE) {
-               if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
-                       e_info(probe, "rx-usecs set too low, "
-                                     "disabling RSC\n");
-                       adapter->flags2 &= ~IXGBE_FLAG2_RSC_ENABLED;
-                       return true;
-               }
-       } else {
-               /* check the feature flag value and enable RSC if necessary */
-               if ((netdev->features & NETIF_F_LRO) &&
-                   !(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)) {
-                       e_info(probe, "rx-usecs set to %d, "
-                                     "re-enabling RSC\n",
-                              ec->rx_coalesce_usecs);
-                       adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;
-                       return true;
-               }
-       }
-       return false;
-}
-
-static int ixgbe_set_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_q_vector *q_vector;
-       int i;
-       bool need_reset = false;
-
-       /* don't accept tx specific changes if we've got mixed RxTx vectors */
-       if (adapter->q_vector[0]->tx.count && adapter->q_vector[0]->rx.count
-          && ec->tx_coalesce_usecs)
-               return -EINVAL;
-
-       if (ec->tx_max_coalesced_frames_irq)
-               adapter->tx_work_limit = ec->tx_max_coalesced_frames_irq;
-
-       if (ec->rx_coalesce_usecs > 1) {
-               /* check the limits */
-               if ((1000000/ec->rx_coalesce_usecs > IXGBE_MAX_INT_RATE) ||
-                   (1000000/ec->rx_coalesce_usecs < IXGBE_MIN_INT_RATE))
-                       return -EINVAL;
-
-               /* check the old value and enable RSC if necessary */
-               need_reset = ixgbe_update_rsc(adapter, ec);
-
-               /* store the value in ints/second */
-               adapter->rx_eitr_param = 1000000/ec->rx_coalesce_usecs;
-
-               /* static value of interrupt rate */
-               adapter->rx_itr_setting = adapter->rx_eitr_param;
-               /* clear the lower bit as its used for dynamic state */
-               adapter->rx_itr_setting &= ~1;
-       } else if (ec->rx_coalesce_usecs == 1) {
-               /* check the old value and enable RSC if necessary */
-               need_reset = ixgbe_update_rsc(adapter, ec);
-
-               /* 1 means dynamic mode */
-               adapter->rx_eitr_param = 20000;
-               adapter->rx_itr_setting = 1;
-       } else {
-               /* check the old value and enable RSC if necessary */
-               need_reset = ixgbe_update_rsc(adapter, ec);
-               /*
-                * any other value means disable eitr, which is best
-                * served by setting the interrupt rate very high
-                */
-               adapter->rx_eitr_param = IXGBE_MAX_INT_RATE;
-               adapter->rx_itr_setting = 0;
-       }
-
-       if (ec->tx_coalesce_usecs > 1) {
-               /*
-                * don't have to worry about max_int as above because
-                * tx vectors don't do hardware RSC (an rx function)
-                */
-               /* check the limits */
-               if ((1000000/ec->tx_coalesce_usecs > IXGBE_MAX_INT_RATE) ||
-                   (1000000/ec->tx_coalesce_usecs < IXGBE_MIN_INT_RATE))
-                       return -EINVAL;
-
-               /* store the value in ints/second */
-               adapter->tx_eitr_param = 1000000/ec->tx_coalesce_usecs;
-
-               /* static value of interrupt rate */
-               adapter->tx_itr_setting = adapter->tx_eitr_param;
-
-               /* clear the lower bit as its used for dynamic state */
-               adapter->tx_itr_setting &= ~1;
-       } else if (ec->tx_coalesce_usecs == 1) {
-               /* 1 means dynamic mode */
-               adapter->tx_eitr_param = 10000;
-               adapter->tx_itr_setting = 1;
-       } else {
-               adapter->tx_eitr_param = IXGBE_MAX_INT_RATE;
-               adapter->tx_itr_setting = 0;
-       }
-
-       /* MSI/MSIx Interrupt Mode */
-       if (adapter->flags &
-           (IXGBE_FLAG_MSIX_ENABLED | IXGBE_FLAG_MSI_ENABLED)) {
-               int num_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-               for (i = 0; i < num_vectors; i++) {
-                       q_vector = adapter->q_vector[i];
-                       if (q_vector->tx.count && !q_vector->rx.count)
-                               /* tx only */
-                               q_vector->eitr = adapter->tx_eitr_param;
-                       else
-                               /* rx only or mixed */
-                               q_vector->eitr = adapter->rx_eitr_param;
-                       q_vector->tx.work_limit = adapter->tx_work_limit;
-                       ixgbe_write_eitr(q_vector);
-               }
-       /* Legacy Interrupt Mode */
-       } else {
-               q_vector = adapter->q_vector[0];
-               q_vector->eitr = adapter->rx_eitr_param;
-               q_vector->tx.work_limit = adapter->tx_work_limit;
-               ixgbe_write_eitr(q_vector);
-       }
-
-       /*
-        * do reset here at the end to make sure EITR==0 case is handled
-        * correctly w.r.t stopping tx, and changing TXDCTL.WTHRESH settings
-        * also locks in RSC enable/disable which requires reset
-        */
-       if (need_reset)
-               ixgbe_do_reset(netdev);
-
-       return 0;
-}
-
-static int ixgbe_get_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
-                                       struct ethtool_rxnfc *cmd)
-{
-       union ixgbe_atr_input *mask = &adapter->fdir_mask;
-       struct ethtool_rx_flow_spec *fsp =
-               (struct ethtool_rx_flow_spec *)&cmd->fs;
-       struct hlist_node *node, *node2;
-       struct ixgbe_fdir_filter *rule = NULL;
-
-       /* report total rule count */
-       cmd->data = (1024 << adapter->fdir_pballoc) - 2;
-
-       hlist_for_each_entry_safe(rule, node, node2,
-                                 &adapter->fdir_filter_list, fdir_node) {
-               if (fsp->location <= rule->sw_idx)
-                       break;
-       }
-
-       if (!rule || fsp->location != rule->sw_idx)
-               return -EINVAL;
-
-       /* fill out the flow spec entry */
-
-       /* set flow type field */
-       switch (rule->filter.formatted.flow_type) {
-       case IXGBE_ATR_FLOW_TYPE_TCPV4:
-               fsp->flow_type = TCP_V4_FLOW;
-               break;
-       case IXGBE_ATR_FLOW_TYPE_UDPV4:
-               fsp->flow_type = UDP_V4_FLOW;
-               break;
-       case IXGBE_ATR_FLOW_TYPE_SCTPV4:
-               fsp->flow_type = SCTP_V4_FLOW;
-               break;
-       case IXGBE_ATR_FLOW_TYPE_IPV4:
-               fsp->flow_type = IP_USER_FLOW;
-               fsp->h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4;
-               fsp->h_u.usr_ip4_spec.proto = 0;
-               fsp->m_u.usr_ip4_spec.proto = 0;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       fsp->h_u.tcp_ip4_spec.psrc = rule->filter.formatted.src_port;
-       fsp->m_u.tcp_ip4_spec.psrc = mask->formatted.src_port;
-       fsp->h_u.tcp_ip4_spec.pdst = rule->filter.formatted.dst_port;
-       fsp->m_u.tcp_ip4_spec.pdst = mask->formatted.dst_port;
-       fsp->h_u.tcp_ip4_spec.ip4src = rule->filter.formatted.src_ip[0];
-       fsp->m_u.tcp_ip4_spec.ip4src = mask->formatted.src_ip[0];
-       fsp->h_u.tcp_ip4_spec.ip4dst = rule->filter.formatted.dst_ip[0];
-       fsp->m_u.tcp_ip4_spec.ip4dst = mask->formatted.dst_ip[0];
-       fsp->h_ext.vlan_tci = rule->filter.formatted.vlan_id;
-       fsp->m_ext.vlan_tci = mask->formatted.vlan_id;
-       fsp->h_ext.vlan_etype = rule->filter.formatted.flex_bytes;
-       fsp->m_ext.vlan_etype = mask->formatted.flex_bytes;
-       fsp->h_ext.data[1] = htonl(rule->filter.formatted.vm_pool);
-       fsp->m_ext.data[1] = htonl(mask->formatted.vm_pool);
-       fsp->flow_type |= FLOW_EXT;
-
-       /* record action */
-       if (rule->action == IXGBE_FDIR_DROP_QUEUE)
-               fsp->ring_cookie = RX_CLS_FLOW_DISC;
-       else
-               fsp->ring_cookie = rule->action;
-
-       return 0;
-}
-
-static int ixgbe_get_ethtool_fdir_all(struct ixgbe_adapter *adapter,
-                                     struct ethtool_rxnfc *cmd,
-                                     u32 *rule_locs)
-{
-       struct hlist_node *node, *node2;
-       struct ixgbe_fdir_filter *rule;
-       int cnt = 0;
-
-       /* report total rule count */
-       cmd->data = (1024 << adapter->fdir_pballoc) - 2;
-
-       hlist_for_each_entry_safe(rule, node, node2,
-                                 &adapter->fdir_filter_list, fdir_node) {
-               if (cnt == cmd->rule_cnt)
-                       return -EMSGSIZE;
-               rule_locs[cnt] = rule->sw_idx;
-               cnt++;
-       }
-
-       return 0;
-}
-
-static int ixgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
-                          void *rule_locs)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       int ret = -EOPNOTSUPP;
-
-       switch (cmd->cmd) {
-       case ETHTOOL_GRXRINGS:
-               cmd->data = adapter->num_rx_queues;
-               ret = 0;
-               break;
-       case ETHTOOL_GRXCLSRLCNT:
-               cmd->rule_cnt = adapter->fdir_filter_count;
-               ret = 0;
-               break;
-       case ETHTOOL_GRXCLSRULE:
-               ret = ixgbe_get_ethtool_fdir_entry(adapter, cmd);
-               break;
-       case ETHTOOL_GRXCLSRLALL:
-               ret = ixgbe_get_ethtool_fdir_all(adapter, cmd,
-                                                (u32 *)rule_locs);
-               break;
-       default:
-               break;
-       }
-
-       return ret;
-}
-
-static int ixgbe_update_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
-                                          struct ixgbe_fdir_filter *input,
-                                          u16 sw_idx)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct hlist_node *node, *node2, *parent;
-       struct ixgbe_fdir_filter *rule;
-       int err = -EINVAL;
-
-       parent = NULL;
-       rule = NULL;
-
-       hlist_for_each_entry_safe(rule, node, node2,
-                                 &adapter->fdir_filter_list, fdir_node) {
-               /* hash found, or no matching entry */
-               if (rule->sw_idx >= sw_idx)
-                       break;
-               parent = node;
-       }
-
-       /* if there is an old rule occupying our place remove it */
-       if (rule && (rule->sw_idx == sw_idx)) {
-               if (!input || (rule->filter.formatted.bkt_hash !=
-                              input->filter.formatted.bkt_hash)) {
-                       err = ixgbe_fdir_erase_perfect_filter_82599(hw,
-                                                               &rule->filter,
-                                                               sw_idx);
-               }
-
-               hlist_del(&rule->fdir_node);
-               kfree(rule);
-               adapter->fdir_filter_count--;
-       }
-
-       /*
-        * If no input this was a delete, err should be 0 if a rule was
-        * successfully found and removed from the list else -EINVAL
-        */
-       if (!input)
-               return err;
-
-       /* initialize node and set software index */
-       INIT_HLIST_NODE(&input->fdir_node);
-
-       /* add filter to the list */
-       if (parent)
-               hlist_add_after(parent, &input->fdir_node);
-       else
-               hlist_add_head(&input->fdir_node,
-                              &adapter->fdir_filter_list);
-
-       /* update counts */
-       adapter->fdir_filter_count++;
-
-       return 0;
-}
-
-static int ixgbe_flowspec_to_flow_type(struct ethtool_rx_flow_spec *fsp,
-                                      u8 *flow_type)
-{
-       switch (fsp->flow_type & ~FLOW_EXT) {
-       case TCP_V4_FLOW:
-               *flow_type = IXGBE_ATR_FLOW_TYPE_TCPV4;
-               break;
-       case UDP_V4_FLOW:
-               *flow_type = IXGBE_ATR_FLOW_TYPE_UDPV4;
-               break;
-       case SCTP_V4_FLOW:
-               *flow_type = IXGBE_ATR_FLOW_TYPE_SCTPV4;
-               break;
-       case IP_USER_FLOW:
-               switch (fsp->h_u.usr_ip4_spec.proto) {
-               case IPPROTO_TCP:
-                       *flow_type = IXGBE_ATR_FLOW_TYPE_TCPV4;
-                       break;
-               case IPPROTO_UDP:
-                       *flow_type = IXGBE_ATR_FLOW_TYPE_UDPV4;
-                       break;
-               case IPPROTO_SCTP:
-                       *flow_type = IXGBE_ATR_FLOW_TYPE_SCTPV4;
-                       break;
-               case 0:
-                       if (!fsp->m_u.usr_ip4_spec.proto) {
-                               *flow_type = IXGBE_ATR_FLOW_TYPE_IPV4;
-                               break;
-                       }
-               default:
-                       return 0;
-               }
-               break;
-       default:
-               return 0;
-       }
-
-       return 1;
-}
-
-static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
-                                       struct ethtool_rxnfc *cmd)
-{
-       struct ethtool_rx_flow_spec *fsp =
-               (struct ethtool_rx_flow_spec *)&cmd->fs;
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbe_fdir_filter *input;
-       union ixgbe_atr_input mask;
-       int err;
-
-       if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
-               return -EOPNOTSUPP;
-
-       /*
-        * Don't allow programming if the action is a queue greater than
-        * the number of online Rx queues.
-        */
-       if ((fsp->ring_cookie != RX_CLS_FLOW_DISC) &&
-           (fsp->ring_cookie >= adapter->num_rx_queues))
-               return -EINVAL;
-
-       /* Don't allow indexes to exist outside of available space */
-       if (fsp->location >= ((1024 << adapter->fdir_pballoc) - 2)) {
-               e_err(drv, "Location out of range\n");
-               return -EINVAL;
-       }
-
-       input = kzalloc(sizeof(*input), GFP_ATOMIC);
-       if (!input)
-               return -ENOMEM;
-
-       memset(&mask, 0, sizeof(union ixgbe_atr_input));
-
-       /* set SW index */
-       input->sw_idx = fsp->location;
-
-       /* record flow type */
-       if (!ixgbe_flowspec_to_flow_type(fsp,
-                                        &input->filter.formatted.flow_type)) {
-               e_err(drv, "Unrecognized flow type\n");
-               goto err_out;
-       }
-
-       mask.formatted.flow_type = IXGBE_ATR_L4TYPE_IPV6_MASK |
-                                  IXGBE_ATR_L4TYPE_MASK;
-
-       if (input->filter.formatted.flow_type == IXGBE_ATR_FLOW_TYPE_IPV4)
-               mask.formatted.flow_type &= IXGBE_ATR_L4TYPE_IPV6_MASK;
-
-       /* Copy input into formatted structures */
-       input->filter.formatted.src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4src;
-       mask.formatted.src_ip[0] = fsp->m_u.tcp_ip4_spec.ip4src;
-       input->filter.formatted.dst_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;
-       mask.formatted.dst_ip[0] = fsp->m_u.tcp_ip4_spec.ip4dst;
-       input->filter.formatted.src_port = fsp->h_u.tcp_ip4_spec.psrc;
-       mask.formatted.src_port = fsp->m_u.tcp_ip4_spec.psrc;
-       input->filter.formatted.dst_port = fsp->h_u.tcp_ip4_spec.pdst;
-       mask.formatted.dst_port = fsp->m_u.tcp_ip4_spec.pdst;
-
-       if (fsp->flow_type & FLOW_EXT) {
-               input->filter.formatted.vm_pool =
-                               (unsigned char)ntohl(fsp->h_ext.data[1]);
-               mask.formatted.vm_pool =
-                               (unsigned char)ntohl(fsp->m_ext.data[1]);
-               input->filter.formatted.vlan_id = fsp->h_ext.vlan_tci;
-               mask.formatted.vlan_id = fsp->m_ext.vlan_tci;
-               input->filter.formatted.flex_bytes =
-                                               fsp->h_ext.vlan_etype;
-               mask.formatted.flex_bytes = fsp->m_ext.vlan_etype;
-       }
-
-       /* determine if we need to drop or route the packet */
-       if (fsp->ring_cookie == RX_CLS_FLOW_DISC)
-               input->action = IXGBE_FDIR_DROP_QUEUE;
-       else
-               input->action = fsp->ring_cookie;
-
-       spin_lock(&adapter->fdir_perfect_lock);
-
-       if (hlist_empty(&adapter->fdir_filter_list)) {
-               /* save mask and program input mask into HW */
-               memcpy(&adapter->fdir_mask, &mask, sizeof(mask));
-               err = ixgbe_fdir_set_input_mask_82599(hw, &mask);
-               if (err) {
-                       e_err(drv, "Error writing mask\n");
-                       goto err_out_w_lock;
-               }
-       } else if (memcmp(&adapter->fdir_mask, &mask, sizeof(mask))) {
-               e_err(drv, "Only one mask supported per port\n");
-               goto err_out_w_lock;
-       }
-
-       /* apply mask and compute/store hash */
-       ixgbe_atr_compute_perfect_hash_82599(&input->filter, &mask);
-
-       /* program filters to filter memory */
-       err = ixgbe_fdir_write_perfect_filter_82599(hw,
-                               &input->filter, input->sw_idx,
-                               (input->action == IXGBE_FDIR_DROP_QUEUE) ?
-                               IXGBE_FDIR_DROP_QUEUE :
-                               adapter->rx_ring[input->action]->reg_idx);
-       if (err)
-               goto err_out_w_lock;
-
-       ixgbe_update_ethtool_fdir_entry(adapter, input, input->sw_idx);
-
-       spin_unlock(&adapter->fdir_perfect_lock);
-
-       return err;
-err_out_w_lock:
-       spin_unlock(&adapter->fdir_perfect_lock);
-err_out:
-       kfree(input);
-       return -EINVAL;
-}
-
-static int ixgbe_del_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
-                                       struct ethtool_rxnfc *cmd)
-{
-       struct ethtool_rx_flow_spec *fsp =
-               (struct ethtool_rx_flow_spec *)&cmd->fs;
-       int err;
-
-       spin_lock(&adapter->fdir_perfect_lock);
-       err = ixgbe_update_ethtool_fdir_entry(adapter, NULL, fsp->location);
-       spin_unlock(&adapter->fdir_perfect_lock);
-
-       return err;
-}
-
-static int ixgbe_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       int ret = -EOPNOTSUPP;
-
-       switch (cmd->cmd) {
-       case ETHTOOL_SRXCLSRLINS:
-               ret = ixgbe_add_ethtool_fdir_entry(adapter, cmd);
-               break;
-       case ETHTOOL_SRXCLSRLDEL:
-               ret = ixgbe_del_ethtool_fdir_entry(adapter, cmd);
-               break;
-       default:
-               break;
-       }
-
-       return ret;
-}
-
-static const struct ethtool_ops ixgbe_ethtool_ops = {
-       .get_settings           = ixgbe_get_settings,
-       .set_settings           = ixgbe_set_settings,
-       .get_drvinfo            = ixgbe_get_drvinfo,
-       .get_regs_len           = ixgbe_get_regs_len,
-       .get_regs               = ixgbe_get_regs,
-       .get_wol                = ixgbe_get_wol,
-       .set_wol                = ixgbe_set_wol,
-       .nway_reset             = ixgbe_nway_reset,
-       .get_link               = ethtool_op_get_link,
-       .get_eeprom_len         = ixgbe_get_eeprom_len,
-       .get_eeprom             = ixgbe_get_eeprom,
-       .get_ringparam          = ixgbe_get_ringparam,
-       .set_ringparam          = ixgbe_set_ringparam,
-       .get_pauseparam         = ixgbe_get_pauseparam,
-       .set_pauseparam         = ixgbe_set_pauseparam,
-       .get_msglevel           = ixgbe_get_msglevel,
-       .set_msglevel           = ixgbe_set_msglevel,
-       .self_test              = ixgbe_diag_test,
-       .get_strings            = ixgbe_get_strings,
-       .set_phys_id            = ixgbe_set_phys_id,
-       .get_sset_count         = ixgbe_get_sset_count,
-       .get_ethtool_stats      = ixgbe_get_ethtool_stats,
-       .get_coalesce           = ixgbe_get_coalesce,
-       .set_coalesce           = ixgbe_set_coalesce,
-       .get_rxnfc              = ixgbe_get_rxnfc,
-       .set_rxnfc              = ixgbe_set_rxnfc,
-};
-
-void ixgbe_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &ixgbe_ethtool_ops);
-}
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
deleted file mode 100644 (file)
index 824edae..0000000
+++ /dev/null
@@ -1,836 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include "ixgbe.h"
-#include <linux/if_ether.h>
-#include <linux/gfp.h>
-#include <linux/if_vlan.h>
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/fc/fc_fs.h>
-#include <scsi/fc/fc_fcoe.h>
-#include <scsi/libfc.h>
-#include <scsi/libfcoe.h>
-
-/**
- * ixgbe_fcoe_clear_ddp - clear the given ddp context
- * @ddp - ptr to the ixgbe_fcoe_ddp
- *
- * Returns : none
- *
- */
-static inline void ixgbe_fcoe_clear_ddp(struct ixgbe_fcoe_ddp *ddp)
-{
-       ddp->len = 0;
-       ddp->err = 1;
-       ddp->udl = NULL;
-       ddp->udp = 0UL;
-       ddp->sgl = NULL;
-       ddp->sgc = 0;
-}
-
-/**
- * ixgbe_fcoe_ddp_put - free the ddp context for a given xid
- * @netdev: the corresponding net_device
- * @xid: the xid that corresponding ddp will be freed
- *
- * This is the implementation of net_device_ops.ndo_fcoe_ddp_done
- * and it is expected to be called by ULD, i.e., FCP layer of libfc
- * to release the corresponding ddp context when the I/O is done.
- *
- * Returns : data length already ddp-ed in bytes
- */
-int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid)
-{
-       int len = 0;
-       struct ixgbe_fcoe *fcoe;
-       struct ixgbe_adapter *adapter;
-       struct ixgbe_fcoe_ddp *ddp;
-       u32 fcbuff;
-
-       if (!netdev)
-               goto out_ddp_put;
-
-       if (xid >= IXGBE_FCOE_DDP_MAX)
-               goto out_ddp_put;
-
-       adapter = netdev_priv(netdev);
-       fcoe = &adapter->fcoe;
-       ddp = &fcoe->ddp[xid];
-       if (!ddp->udl)
-               goto out_ddp_put;
-
-       len = ddp->len;
-       /* if there an error, force to invalidate ddp context */
-       if (ddp->err) {
-               spin_lock_bh(&fcoe->lock);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCFLT, 0);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCFLTRW,
-                               (xid | IXGBE_FCFLTRW_WE));
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCBUFF, 0);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCDMARW,
-                               (xid | IXGBE_FCDMARW_WE));
-
-               /* guaranteed to be invalidated after 100us */
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCDMARW,
-                               (xid | IXGBE_FCDMARW_RE));
-               fcbuff = IXGBE_READ_REG(&adapter->hw, IXGBE_FCBUFF);
-               spin_unlock_bh(&fcoe->lock);
-               if (fcbuff & IXGBE_FCBUFF_VALID)
-                       udelay(100);
-       }
-       if (ddp->sgl)
-               pci_unmap_sg(adapter->pdev, ddp->sgl, ddp->sgc,
-                            DMA_FROM_DEVICE);
-       if (ddp->pool) {
-               pci_pool_free(ddp->pool, ddp->udl, ddp->udp);
-               ddp->pool = NULL;
-       }
-
-       ixgbe_fcoe_clear_ddp(ddp);
-
-out_ddp_put:
-       return len;
-}
-
-/**
- * ixgbe_fcoe_ddp_setup - called to set up ddp context
- * @netdev: the corresponding net_device
- * @xid: the exchange id requesting ddp
- * @sgl: the scatter-gather list for this request
- * @sgc: the number of scatter-gather items
- *
- * Returns : 1 for success and 0 for no ddp
- */
-static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid,
-                               struct scatterlist *sgl, unsigned int sgc,
-                               int target_mode)
-{
-       struct ixgbe_adapter *adapter;
-       struct ixgbe_hw *hw;
-       struct ixgbe_fcoe *fcoe;
-       struct ixgbe_fcoe_ddp *ddp;
-       struct scatterlist *sg;
-       unsigned int i, j, dmacount;
-       unsigned int len;
-       static const unsigned int bufflen = IXGBE_FCBUFF_MIN;
-       unsigned int firstoff = 0;
-       unsigned int lastsize;
-       unsigned int thisoff = 0;
-       unsigned int thislen = 0;
-       u32 fcbuff, fcdmarw, fcfltrw, fcrxctl;
-       dma_addr_t addr = 0;
-       struct pci_pool *pool;
-
-       if (!netdev || !sgl)
-               return 0;
-
-       adapter = netdev_priv(netdev);
-       if (xid >= IXGBE_FCOE_DDP_MAX) {
-               e_warn(drv, "xid=0x%x out-of-range\n", xid);
-               return 0;
-       }
-
-       /* no DDP if we are already down or resetting */
-       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
-           test_bit(__IXGBE_RESETTING, &adapter->state))
-               return 0;
-
-       fcoe = &adapter->fcoe;
-       if (!fcoe->pool) {
-               e_warn(drv, "xid=0x%x no ddp pool for fcoe\n", xid);
-               return 0;
-       }
-
-       ddp = &fcoe->ddp[xid];
-       if (ddp->sgl) {
-               e_err(drv, "xid 0x%x w/ non-null sgl=%p nents=%d\n",
-                     xid, ddp->sgl, ddp->sgc);
-               return 0;
-       }
-       ixgbe_fcoe_clear_ddp(ddp);
-
-       /* setup dma from scsi command sgl */
-       dmacount = pci_map_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);
-       if (dmacount == 0) {
-               e_err(drv, "xid 0x%x DMA map error\n", xid);
-               return 0;
-       }
-
-       /* alloc the udl from per cpu ddp pool */
-       pool = *per_cpu_ptr(fcoe->pool, get_cpu());
-       ddp->udl = pci_pool_alloc(pool, GFP_ATOMIC, &ddp->udp);
-       if (!ddp->udl) {
-               e_err(drv, "failed allocated ddp context\n");
-               goto out_noddp_unmap;
-       }
-       ddp->pool = pool;
-       ddp->sgl = sgl;
-       ddp->sgc = sgc;
-
-       j = 0;
-       for_each_sg(sgl, sg, dmacount, i) {
-               addr = sg_dma_address(sg);
-               len = sg_dma_len(sg);
-               while (len) {
-                       /* max number of buffers allowed in one DDP context */
-                       if (j >= IXGBE_BUFFCNT_MAX) {
-                               e_err(drv, "xid=%x:%d,%d,%d:addr=%llx "
-                                     "not enough descriptors\n",
-                                     xid, i, j, dmacount, (u64)addr);
-                               goto out_noddp_free;
-                       }
-
-                       /* get the offset of length of current buffer */
-                       thisoff = addr & ((dma_addr_t)bufflen - 1);
-                       thislen = min((bufflen - thisoff), len);
-                       /*
-                        * all but the 1st buffer (j == 0)
-                        * must be aligned on bufflen
-                        */
-                       if ((j != 0) && (thisoff))
-                               goto out_noddp_free;
-                       /*
-                        * all but the last buffer
-                        * ((i == (dmacount - 1)) && (thislen == len))
-                        * must end at bufflen
-                        */
-                       if (((i != (dmacount - 1)) || (thislen != len))
-                           && ((thislen + thisoff) != bufflen))
-                               goto out_noddp_free;
-
-                       ddp->udl[j] = (u64)(addr - thisoff);
-                       /* only the first buffer may have none-zero offset */
-                       if (j == 0)
-                               firstoff = thisoff;
-                       len -= thislen;
-                       addr += thislen;
-                       j++;
-               }
-       }
-       /* only the last buffer may have non-full bufflen */
-       lastsize = thisoff + thislen;
-
-       /*
-        * lastsize can not be buffer len.
-        * If it is then adding another buffer with lastsize = 1.
-        */
-       if (lastsize == bufflen) {
-               if (j >= IXGBE_BUFFCNT_MAX) {
-                       e_err(drv, "xid=%x:%d,%d,%d:addr=%llx "
-                               "not enough user buffers. We need an extra "
-                               "buffer because lastsize is bufflen.\n",
-                               xid, i, j, dmacount, (u64)addr);
-                       goto out_noddp_free;
-               }
-
-               ddp->udl[j] = (u64)(fcoe->extra_ddp_buffer_dma);
-               j++;
-               lastsize = 1;
-       }
-       put_cpu();
-
-       fcbuff = (IXGBE_FCBUFF_4KB << IXGBE_FCBUFF_BUFFSIZE_SHIFT);
-       fcbuff |= ((j & 0xff) << IXGBE_FCBUFF_BUFFCNT_SHIFT);
-       fcbuff |= (firstoff << IXGBE_FCBUFF_OFFSET_SHIFT);
-       /* Set WRCONTX bit to allow DDP for target */
-       if (target_mode)
-               fcbuff |= (IXGBE_FCBUFF_WRCONTX);
-       fcbuff |= (IXGBE_FCBUFF_VALID);
-
-       fcdmarw = xid;
-       fcdmarw |= IXGBE_FCDMARW_WE;
-       fcdmarw |= (lastsize << IXGBE_FCDMARW_LASTSIZE_SHIFT);
-
-       fcfltrw = xid;
-       fcfltrw |= IXGBE_FCFLTRW_WE;
-
-       /* program DMA context */
-       hw = &adapter->hw;
-       spin_lock_bh(&fcoe->lock);
-
-       /* turn on last frame indication for target mode as FCP_RSPtarget is
-        * supposed to send FCP_RSP when it is done. */
-       if (target_mode && !test_bit(__IXGBE_FCOE_TARGET, &fcoe->mode)) {
-               set_bit(__IXGBE_FCOE_TARGET, &fcoe->mode);
-               fcrxctl = IXGBE_READ_REG(hw, IXGBE_FCRXCTRL);
-               fcrxctl |= IXGBE_FCRXCTRL_LASTSEQH;
-               IXGBE_WRITE_REG(hw, IXGBE_FCRXCTRL, fcrxctl);
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_FCPTRL, ddp->udp & DMA_BIT_MASK(32));
-       IXGBE_WRITE_REG(hw, IXGBE_FCPTRH, (u64)ddp->udp >> 32);
-       IXGBE_WRITE_REG(hw, IXGBE_FCBUFF, fcbuff);
-       IXGBE_WRITE_REG(hw, IXGBE_FCDMARW, fcdmarw);
-       /* program filter context */
-       IXGBE_WRITE_REG(hw, IXGBE_FCPARAM, 0);
-       IXGBE_WRITE_REG(hw, IXGBE_FCFLT, IXGBE_FCFLT_VALID);
-       IXGBE_WRITE_REG(hw, IXGBE_FCFLTRW, fcfltrw);
-
-       spin_unlock_bh(&fcoe->lock);
-
-       return 1;
-
-out_noddp_free:
-       pci_pool_free(pool, ddp->udl, ddp->udp);
-       ixgbe_fcoe_clear_ddp(ddp);
-
-out_noddp_unmap:
-       pci_unmap_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);
-       put_cpu();
-       return 0;
-}
-
-/**
- * ixgbe_fcoe_ddp_get - called to set up ddp context in initiator mode
- * @netdev: the corresponding net_device
- * @xid: the exchange id requesting ddp
- * @sgl: the scatter-gather list for this request
- * @sgc: the number of scatter-gather items
- *
- * This is the implementation of net_device_ops.ndo_fcoe_ddp_setup
- * and is expected to be called from ULD, e.g., FCP layer of libfc
- * to set up ddp for the corresponding xid of the given sglist for
- * the corresponding I/O.
- *
- * Returns : 1 for success and 0 for no ddp
- */
-int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
-                      struct scatterlist *sgl, unsigned int sgc)
-{
-       return ixgbe_fcoe_ddp_setup(netdev, xid, sgl, sgc, 0);
-}
-
-/**
- * ixgbe_fcoe_ddp_target - called to set up ddp context in target mode
- * @netdev: the corresponding net_device
- * @xid: the exchange id requesting ddp
- * @sgl: the scatter-gather list for this request
- * @sgc: the number of scatter-gather items
- *
- * This is the implementation of net_device_ops.ndo_fcoe_ddp_target
- * and is expected to be called from ULD, e.g., FCP layer of libfc
- * to set up ddp for the corresponding xid of the given sglist for
- * the corresponding I/O. The DDP in target mode is a write I/O request
- * from the initiator.
- *
- * Returns : 1 for success and 0 for no ddp
- */
-int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,
-                           struct scatterlist *sgl, unsigned int sgc)
-{
-       return ixgbe_fcoe_ddp_setup(netdev, xid, sgl, sgc, 1);
-}
-
-/**
- * ixgbe_fcoe_ddp - check ddp status and mark it done
- * @adapter: ixgbe adapter
- * @rx_desc: advanced rx descriptor
- * @skb: the skb holding the received data
- *
- * This checks ddp status.
- *
- * Returns : < 0 indicates an error or not a FCiE ddp, 0 indicates
- * not passing the skb to ULD, > 0 indicates is the length of data
- * being ddped.
- */
-int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
-                  union ixgbe_adv_rx_desc *rx_desc,
-                  struct sk_buff *skb,
-                  u32 staterr)
-{
-       u16 xid;
-       u32 fctl;
-       u32 fceofe, fcerr, fcstat;
-       int rc = -EINVAL;
-       struct ixgbe_fcoe *fcoe;
-       struct ixgbe_fcoe_ddp *ddp;
-       struct fc_frame_header *fh;
-       struct fcoe_crc_eof *crc;
-
-       fcerr = (staterr & IXGBE_RXDADV_ERR_FCERR);
-       fceofe = (staterr & IXGBE_RXDADV_ERR_FCEOFE);
-       if (fcerr == IXGBE_FCERR_BADCRC)
-               skb_checksum_none_assert(skb);
-       else
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-
-       if (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q))
-               fh = (struct fc_frame_header *)(skb->data +
-                       sizeof(struct vlan_hdr) + sizeof(struct fcoe_hdr));
-       else
-               fh = (struct fc_frame_header *)(skb->data +
-                       sizeof(struct fcoe_hdr));
-       fctl = ntoh24(fh->fh_f_ctl);
-       if (fctl & FC_FC_EX_CTX)
-               xid =  be16_to_cpu(fh->fh_ox_id);
-       else
-               xid =  be16_to_cpu(fh->fh_rx_id);
-
-       if (xid >= IXGBE_FCOE_DDP_MAX)
-               goto ddp_out;
-
-       fcoe = &adapter->fcoe;
-       ddp = &fcoe->ddp[xid];
-       if (!ddp->udl)
-               goto ddp_out;
-
-       if (fcerr | fceofe)
-               goto ddp_out;
-
-       fcstat = (staterr & IXGBE_RXDADV_STAT_FCSTAT);
-       if (fcstat) {
-               /* update length of DDPed data */
-               ddp->len = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
-               /* unmap the sg list when FCP_RSP is received */
-               if (fcstat == IXGBE_RXDADV_STAT_FCSTAT_FCPRSP) {
-                       pci_unmap_sg(adapter->pdev, ddp->sgl,
-                                    ddp->sgc, DMA_FROM_DEVICE);
-                       ddp->err = (fcerr | fceofe);
-                       ddp->sgl = NULL;
-                       ddp->sgc = 0;
-               }
-               /* return 0 to bypass going to ULD for DDPed data */
-               if (fcstat == IXGBE_RXDADV_STAT_FCSTAT_DDP)
-                       rc = 0;
-               else if (ddp->len)
-                       rc = ddp->len;
-       }
-       /* In target mode, check the last data frame of the sequence.
-        * For DDP in target mode, data is already DDPed but the header
-        * indication of the last data frame ould allow is to tell if we
-        * got all the data and the ULP can send FCP_RSP back, as this is
-        * not a full fcoe frame, we fill the trailer here so it won't be
-        * dropped by the ULP stack.
-        */
-       if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&
-           (fctl & FC_FC_END_SEQ)) {
-               crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));
-               crc->fcoe_eof = FC_EOF_T;
-       }
-ddp_out:
-       return rc;
-}
-
-/**
- * ixgbe_fso - ixgbe FCoE Sequence Offload (FSO)
- * @adapter: ixgbe adapter
- * @tx_ring: tx desc ring
- * @skb: associated skb
- * @tx_flags: tx flags
- * @hdr_len: hdr_len to be returned
- *
- * This sets up large send offload for FCoE
- *
- * Returns : 0 indicates no FSO, > 0 for FSO, < 0 for error
- */
-int ixgbe_fso(struct ixgbe_ring *tx_ring, struct sk_buff *skb,
-              u32 tx_flags, u8 *hdr_len)
-{
-       struct fc_frame_header *fh;
-       u32 vlan_macip_lens;
-       u32 fcoe_sof_eof = 0;
-       u32 mss_l4len_idx;
-       u8 sof, eof;
-
-       if (skb_is_gso(skb) && (skb_shinfo(skb)->gso_type != SKB_GSO_FCOE)) {
-               dev_err(tx_ring->dev, "Wrong gso type %d:expecting SKB_GSO_FCOE\n",
-                       skb_shinfo(skb)->gso_type);
-               return -EINVAL;
-       }
-
-       /* resets the header to point fcoe/fc */
-       skb_set_network_header(skb, skb->mac_len);
-       skb_set_transport_header(skb, skb->mac_len +
-                                sizeof(struct fcoe_hdr));
-
-       /* sets up SOF and ORIS */
-       sof = ((struct fcoe_hdr *)skb_network_header(skb))->fcoe_sof;
-       switch (sof) {
-       case FC_SOF_I2:
-               fcoe_sof_eof = IXGBE_ADVTXD_FCOEF_ORIS;
-               break;
-       case FC_SOF_I3:
-               fcoe_sof_eof = IXGBE_ADVTXD_FCOEF_SOF |
-                              IXGBE_ADVTXD_FCOEF_ORIS;
-               break;
-       case FC_SOF_N2:
-               break;
-       case FC_SOF_N3:
-               fcoe_sof_eof = IXGBE_ADVTXD_FCOEF_SOF;
-               break;
-       default:
-               dev_warn(tx_ring->dev, "unknown sof = 0x%x\n", sof);
-               return -EINVAL;
-       }
-
-       /* the first byte of the last dword is EOF */
-       skb_copy_bits(skb, skb->len - 4, &eof, 1);
-       /* sets up EOF and ORIE */
-       switch (eof) {
-       case FC_EOF_N:
-               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_N;
-               break;
-       case FC_EOF_T:
-               /* lso needs ORIE */
-               if (skb_is_gso(skb))
-                       fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_N |
-                                       IXGBE_ADVTXD_FCOEF_ORIE;
-               else
-                       fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_T;
-               break;
-       case FC_EOF_NI:
-               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_NI;
-               break;
-       case FC_EOF_A:
-               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_EOF_A;
-               break;
-       default:
-               dev_warn(tx_ring->dev, "unknown eof = 0x%x\n", eof);
-               return -EINVAL;
-       }
-
-       /* sets up PARINC indicating data offset */
-       fh = (struct fc_frame_header *)skb_transport_header(skb);
-       if (fh->fh_f_ctl[2] & FC_FC_REL_OFF)
-               fcoe_sof_eof |= IXGBE_ADVTXD_FCOEF_PARINC;
-
-       /* include trailer in headlen as it is replicated per frame */
-       *hdr_len = sizeof(struct fcoe_crc_eof);
-
-       /* hdr_len includes fc_hdr if FCoE LSO is enabled */
-       if (skb_is_gso(skb))
-               *hdr_len += (skb_transport_offset(skb) +
-                            sizeof(struct fc_frame_header));
-
-       /* mss_l4len_id: use 1 for FSO as TSO, no need for L4LEN */
-       mss_l4len_idx = skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT;
-       mss_l4len_idx |= 1 << IXGBE_ADVTXD_IDX_SHIFT;
-
-       /* vlan_macip_lens: HEADLEN, MACLEN, VLAN tag */
-       vlan_macip_lens = skb_transport_offset(skb) +
-                         sizeof(struct fc_frame_header);
-       vlan_macip_lens |= (skb_transport_offset(skb) - 4)
-                          << IXGBE_ADVTXD_MACLEN_SHIFT;
-       vlan_macip_lens |= tx_flags & IXGBE_TX_FLAGS_VLAN_MASK;
-
-       /* write context desc */
-       ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, fcoe_sof_eof,
-                         IXGBE_ADVTXT_TUCMD_FCOE, mss_l4len_idx);
-
-       return skb_is_gso(skb);
-}
-
-static void ixgbe_fcoe_ddp_pools_free(struct ixgbe_fcoe *fcoe)
-{
-       unsigned int cpu;
-       struct pci_pool **pool;
-
-       for_each_possible_cpu(cpu) {
-               pool = per_cpu_ptr(fcoe->pool, cpu);
-               if (*pool)
-                       pci_pool_destroy(*pool);
-       }
-       free_percpu(fcoe->pool);
-       fcoe->pool = NULL;
-}
-
-static void ixgbe_fcoe_ddp_pools_alloc(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
-       unsigned int cpu;
-       struct pci_pool **pool;
-       char pool_name[32];
-
-       fcoe->pool = alloc_percpu(struct pci_pool *);
-       if (!fcoe->pool)
-               return;
-
-       /* allocate pci pool for each cpu */
-       for_each_possible_cpu(cpu) {
-               snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%d", cpu);
-               pool = per_cpu_ptr(fcoe->pool, cpu);
-               *pool = pci_pool_create(pool_name,
-                                       adapter->pdev, IXGBE_FCPTR_MAX,
-                                       IXGBE_FCPTR_ALIGN, PAGE_SIZE);
-               if (!*pool) {
-                       e_err(drv, "failed to alloc DDP pool on cpu:%d\n", cpu);
-                       ixgbe_fcoe_ddp_pools_free(fcoe);
-                       return;
-               }
-       }
-}
-
-/**
- * ixgbe_configure_fcoe - configures registers for fcoe at start
- * @adapter: ptr to ixgbe adapter
- *
- * This sets up FCoE related registers
- *
- * Returns : none
- */
-void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
-{
-       int i, fcoe_q, fcoe_i;
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
-       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
-
-       if (!fcoe->pool) {
-               spin_lock_init(&fcoe->lock);
-
-               ixgbe_fcoe_ddp_pools_alloc(adapter);
-               if (!fcoe->pool) {
-                       e_err(drv, "failed to alloc percpu fcoe DDP pools\n");
-                       return;
-               }
-
-               /* Extra buffer to be shared by all DDPs for HW work around */
-               fcoe->extra_ddp_buffer = kmalloc(IXGBE_FCBUFF_MIN, GFP_ATOMIC);
-               if (fcoe->extra_ddp_buffer == NULL) {
-                       e_err(drv, "failed to allocated extra DDP buffer\n");
-                       goto out_ddp_pools;
-               }
-
-               fcoe->extra_ddp_buffer_dma =
-                       dma_map_single(&adapter->pdev->dev,
-                                      fcoe->extra_ddp_buffer,
-                                      IXGBE_FCBUFF_MIN,
-                                      DMA_FROM_DEVICE);
-               if (dma_mapping_error(&adapter->pdev->dev,
-                                     fcoe->extra_ddp_buffer_dma)) {
-                       e_err(drv, "failed to map extra DDP buffer\n");
-                       goto out_extra_ddp_buffer;
-               }
-       }
-
-       /* Enable L2 eth type filter for FCoE */
-       IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FCOE),
-                       (ETH_P_FCOE | IXGBE_ETQF_FCOE | IXGBE_ETQF_FILTER_EN));
-       /* Enable L2 eth type filter for FIP */
-       IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FIP),
-                       (ETH_P_FIP | IXGBE_ETQF_FILTER_EN));
-       if (adapter->ring_feature[RING_F_FCOE].indices) {
-               /* Use multiple rx queues for FCoE by redirection table */
-               for (i = 0; i < IXGBE_FCRETA_SIZE; i++) {
-                       fcoe_i = f->mask + i % f->indices;
-                       fcoe_i &= IXGBE_FCRETA_ENTRY_MASK;
-                       fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;
-                       IXGBE_WRITE_REG(hw, IXGBE_FCRETA(i), fcoe_q);
-               }
-               IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, IXGBE_FCRECTL_ENA);
-               IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE), 0);
-       } else  {
-               /* Use single rx queue for FCoE */
-               fcoe_i = f->mask;
-               fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;
-               IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, 0);
-               IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE),
-                               IXGBE_ETQS_QUEUE_EN |
-                               (fcoe_q << IXGBE_ETQS_RX_QUEUE_SHIFT));
-       }
-       /* send FIP frames to the first FCoE queue */
-       fcoe_i = f->mask;
-       fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;
-       IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FIP),
-                       IXGBE_ETQS_QUEUE_EN |
-                       (fcoe_q << IXGBE_ETQS_RX_QUEUE_SHIFT));
-
-       IXGBE_WRITE_REG(hw, IXGBE_FCRXCTRL,
-                       IXGBE_FCRXCTRL_FCOELLI |
-                       IXGBE_FCRXCTRL_FCCRCBO |
-                       (FC_FCOE_VER << IXGBE_FCRXCTRL_FCOEVER_SHIFT));
-       return;
-
-out_extra_ddp_buffer:
-       kfree(fcoe->extra_ddp_buffer);
-out_ddp_pools:
-       ixgbe_fcoe_ddp_pools_free(fcoe);
-}
-
-/**
- * ixgbe_cleanup_fcoe - release all fcoe ddp context resources
- * @adapter : ixgbe adapter
- *
- * Cleans up outstanding ddp context resources
- *
- * Returns : none
- */
-void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter)
-{
-       int i;
-       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
-
-       if (!fcoe->pool)
-               return;
-
-       for (i = 0; i < IXGBE_FCOE_DDP_MAX; i++)
-               ixgbe_fcoe_ddp_put(adapter->netdev, i);
-       dma_unmap_single(&adapter->pdev->dev,
-                        fcoe->extra_ddp_buffer_dma,
-                        IXGBE_FCBUFF_MIN,
-                        DMA_FROM_DEVICE);
-       kfree(fcoe->extra_ddp_buffer);
-       ixgbe_fcoe_ddp_pools_free(fcoe);
-}
-
-/**
- * ixgbe_fcoe_enable - turn on FCoE offload feature
- * @netdev: the corresponding netdev
- *
- * Turns on FCoE offload feature in 82599.
- *
- * Returns : 0 indicates success or -EINVAL on failure
- */
-int ixgbe_fcoe_enable(struct net_device *netdev)
-{
-       int rc = -EINVAL;
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
-
-
-       if (!(adapter->flags & IXGBE_FLAG_FCOE_CAPABLE))
-               goto out_enable;
-
-       atomic_inc(&fcoe->refcnt);
-       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
-               goto out_enable;
-
-       e_info(drv, "Enabling FCoE offload features.\n");
-       if (netif_running(netdev))
-               netdev->netdev_ops->ndo_stop(netdev);
-
-       ixgbe_clear_interrupt_scheme(adapter);
-
-       adapter->flags |= IXGBE_FLAG_FCOE_ENABLED;
-       adapter->ring_feature[RING_F_FCOE].indices = IXGBE_FCRETA_SIZE;
-       netdev->features |= NETIF_F_FCOE_CRC;
-       netdev->features |= NETIF_F_FSO;
-       netdev->features |= NETIF_F_FCOE_MTU;
-       netdev->fcoe_ddp_xid = IXGBE_FCOE_DDP_MAX - 1;
-
-       ixgbe_init_interrupt_scheme(adapter);
-       netdev_features_change(netdev);
-
-       if (netif_running(netdev))
-               netdev->netdev_ops->ndo_open(netdev);
-       rc = 0;
-
-out_enable:
-       return rc;
-}
-
-/**
- * ixgbe_fcoe_disable - turn off FCoE offload feature
- * @netdev: the corresponding netdev
- *
- * Turns off FCoE offload feature in 82599.
- *
- * Returns : 0 indicates success or -EINVAL on failure
- */
-int ixgbe_fcoe_disable(struct net_device *netdev)
-{
-       int rc = -EINVAL;
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_fcoe *fcoe = &adapter->fcoe;
-
-       if (!(adapter->flags & IXGBE_FLAG_FCOE_CAPABLE))
-               goto out_disable;
-
-       if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
-               goto out_disable;
-
-       if (!atomic_dec_and_test(&fcoe->refcnt))
-               goto out_disable;
-
-       e_info(drv, "Disabling FCoE offload features.\n");
-       netdev->features &= ~NETIF_F_FCOE_CRC;
-       netdev->features &= ~NETIF_F_FSO;
-       netdev->features &= ~NETIF_F_FCOE_MTU;
-       netdev->fcoe_ddp_xid = 0;
-       netdev_features_change(netdev);
-
-       if (netif_running(netdev))
-               netdev->netdev_ops->ndo_stop(netdev);
-
-       ixgbe_clear_interrupt_scheme(adapter);
-       adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED;
-       adapter->ring_feature[RING_F_FCOE].indices = 0;
-       ixgbe_cleanup_fcoe(adapter);
-       ixgbe_init_interrupt_scheme(adapter);
-
-       if (netif_running(netdev))
-               netdev->netdev_ops->ndo_open(netdev);
-       rc = 0;
-
-out_disable:
-       return rc;
-}
-
-/**
- * ixgbe_fcoe_get_wwn - get world wide name for the node or the port
- * @netdev : ixgbe adapter
- * @wwn : the world wide name
- * @type: the type of world wide name
- *
- * Returns the node or port world wide name if both the prefix and the san
- * mac address are valid, then the wwn is formed based on the NAA-2 for
- * IEEE Extended name identifier (ref. to T10 FC-LS Spec., Sec. 15.3).
- *
- * Returns : 0 on success
- */
-int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type)
-{
-       int rc = -EINVAL;
-       u16 prefix = 0xffff;
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_mac_info *mac = &adapter->hw.mac;
-
-       switch (type) {
-       case NETDEV_FCOE_WWNN:
-               prefix = mac->wwnn_prefix;
-               break;
-       case NETDEV_FCOE_WWPN:
-               prefix = mac->wwpn_prefix;
-               break;
-       default:
-               break;
-       }
-
-       if ((prefix != 0xffff) &&
-           is_valid_ether_addr(mac->san_addr)) {
-               *wwn = ((u64) prefix << 48) |
-                      ((u64) mac->san_addr[0] << 40) |
-                      ((u64) mac->san_addr[1] << 32) |
-                      ((u64) mac->san_addr[2] << 24) |
-                      ((u64) mac->san_addr[3] << 16) |
-                      ((u64) mac->san_addr[4] << 8)  |
-                      ((u64) mac->san_addr[5]);
-               rc = 0;
-       }
-       return rc;
-}
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
deleted file mode 100644 (file)
index 99de145..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_FCOE_H
-#define _IXGBE_FCOE_H
-
-#include <scsi/fc/fc_fs.h>
-#include <scsi/fc/fc_fcoe.h>
-
-/* shift bits within STAT fo FCSTAT */
-#define IXGBE_RXDADV_FCSTAT_SHIFT      4
-
-/* ddp user buffer */
-#define IXGBE_BUFFCNT_MAX      256     /* 8 bits bufcnt */
-#define IXGBE_FCPTR_ALIGN      16
-#define IXGBE_FCPTR_MAX        (IXGBE_BUFFCNT_MAX * sizeof(dma_addr_t))
-#define IXGBE_FCBUFF_4KB       0x0
-#define IXGBE_FCBUFF_8KB       0x1
-#define IXGBE_FCBUFF_16KB      0x2
-#define IXGBE_FCBUFF_64KB      0x3
-#define IXGBE_FCBUFF_MAX       65536   /* 64KB max */
-#define IXGBE_FCBUFF_MIN       4096    /* 4KB min */
-#define IXGBE_FCOE_DDP_MAX     512     /* 9 bits xid */
-
-/* Default traffic class to use for FCoE */
-#define IXGBE_FCOE_DEFTC       3
-
-/* fcerr */
-#define IXGBE_FCERR_BADCRC       0x00100000
-
-/* FCoE DDP for target mode */
-#define __IXGBE_FCOE_TARGET    1
-
-struct ixgbe_fcoe_ddp {
-       int len;
-       u32 err;
-       unsigned int sgc;
-       struct scatterlist *sgl;
-       dma_addr_t udp;
-       u64 *udl;
-       struct pci_pool *pool;
-};
-
-struct ixgbe_fcoe {
-       struct pci_pool **pool;
-       atomic_t refcnt;
-       spinlock_t lock;
-       struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];
-       unsigned char *extra_ddp_buffer;
-       dma_addr_t extra_ddp_buffer_dma;
-       unsigned long mode;
-#ifdef CONFIG_IXGBE_DCB
-       u8 up;
-#endif
-};
-
-#endif /* _IXGBE_FCOE_H */
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
deleted file mode 100644 (file)
index e86297b..0000000
+++ /dev/null
@@ -1,7934 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/vmalloc.h>
-#include <linux/string.h>
-#include <linux/in.h>
-#include <linux/interrupt.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/sctp.h>
-#include <linux/pkt_sched.h>
-#include <linux/ipv6.h>
-#include <linux/slab.h>
-#include <net/checksum.h>
-#include <net/ip6_checksum.h>
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-#include <linux/prefetch.h>
-#include <scsi/fc/fc_fcoe.h>
-
-#include "ixgbe.h"
-#include "ixgbe_common.h"
-#include "ixgbe_dcb_82599.h"
-#include "ixgbe_sriov.h"
-
-char ixgbe_driver_name[] = "ixgbe";
-static const char ixgbe_driver_string[] =
-                             "Intel(R) 10 Gigabit PCI Express Network Driver";
-#define MAJ 3
-#define MIN 4
-#define BUILD 8
-#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
-       __stringify(BUILD) "-k"
-const char ixgbe_driver_version[] = DRV_VERSION;
-static const char ixgbe_copyright[] =
-                               "Copyright (c) 1999-2011 Intel Corporation.";
-
-static const struct ixgbe_info *ixgbe_info_tbl[] = {
-       [board_82598] = &ixgbe_82598_info,
-       [board_82599] = &ixgbe_82599_info,
-       [board_X540] = &ixgbe_X540_info,
-};
-
-/* ixgbe_pci_tbl - PCI Device ID Table
- *
- * Wildcard entries (PCI_ANY_ID) should come last
- * Last entry must be all 0s
- *
- * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
- *   Class, Class Mask, private data (not used) }
- */
-static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT2),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_XF_LR),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX),
-        board_82598 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_FCOE),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T),
-        board_X540 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2),
-        board_82599 },
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS),
-        board_82599 },
-
-       /* required last entry */
-       {0, }
-};
-MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);
-
-#ifdef CONFIG_IXGBE_DCA
-static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,
-                           void *p);
-static struct notifier_block dca_notifier = {
-       .notifier_call = ixgbe_notify_dca,
-       .next          = NULL,
-       .priority      = 0
-};
-#endif
-
-#ifdef CONFIG_PCI_IOV
-static unsigned int max_vfs;
-module_param(max_vfs, uint, 0);
-MODULE_PARM_DESC(max_vfs,
-                "Maximum number of virtual functions to allocate per physical function");
-#endif /* CONFIG_PCI_IOV */
-
-MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
-MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-#define DEFAULT_DEBUG_LEVEL_SHIFT 3
-
-static inline void ixgbe_disable_sriov(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 gcr;
-       u32 gpie;
-       u32 vmdctl;
-
-#ifdef CONFIG_PCI_IOV
-       /* disable iov and allow time for transactions to clear */
-       pci_disable_sriov(adapter->pdev);
-#endif
-
-       /* turn off device IOV mode */
-       gcr = IXGBE_READ_REG(hw, IXGBE_GCR_EXT);
-       gcr &= ~(IXGBE_GCR_EXT_SRIOV);
-       IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr);
-       gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
-       gpie &= ~IXGBE_GPIE_VTMODE_MASK;
-       IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
-
-       /* set default pool back to 0 */
-       vmdctl = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
-       vmdctl &= ~IXGBE_VT_CTL_POOL_MASK;
-       IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vmdctl);
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* take a breather then clean up driver data */
-       msleep(100);
-
-       kfree(adapter->vfinfo);
-       adapter->vfinfo = NULL;
-
-       adapter->num_vfs = 0;
-       adapter->flags &= ~IXGBE_FLAG_SRIOV_ENABLED;
-}
-
-static void ixgbe_service_event_schedule(struct ixgbe_adapter *adapter)
-{
-       if (!test_bit(__IXGBE_DOWN, &adapter->state) &&
-           !test_and_set_bit(__IXGBE_SERVICE_SCHED, &adapter->state))
-               schedule_work(&adapter->service_task);
-}
-
-static void ixgbe_service_event_complete(struct ixgbe_adapter *adapter)
-{
-       BUG_ON(!test_bit(__IXGBE_SERVICE_SCHED, &adapter->state));
-
-       /* flush memory to make sure state is correct before next watchog */
-       smp_mb__before_clear_bit();
-       clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state);
-}
-
-struct ixgbe_reg_info {
-       u32 ofs;
-       char *name;
-};
-
-static const struct ixgbe_reg_info ixgbe_reg_info_tbl[] = {
-
-       /* General Registers */
-       {IXGBE_CTRL, "CTRL"},
-       {IXGBE_STATUS, "STATUS"},
-       {IXGBE_CTRL_EXT, "CTRL_EXT"},
-
-       /* Interrupt Registers */
-       {IXGBE_EICR, "EICR"},
-
-       /* RX Registers */
-       {IXGBE_SRRCTL(0), "SRRCTL"},
-       {IXGBE_DCA_RXCTRL(0), "DRXCTL"},
-       {IXGBE_RDLEN(0), "RDLEN"},
-       {IXGBE_RDH(0), "RDH"},
-       {IXGBE_RDT(0), "RDT"},
-       {IXGBE_RXDCTL(0), "RXDCTL"},
-       {IXGBE_RDBAL(0), "RDBAL"},
-       {IXGBE_RDBAH(0), "RDBAH"},
-
-       /* TX Registers */
-       {IXGBE_TDBAL(0), "TDBAL"},
-       {IXGBE_TDBAH(0), "TDBAH"},
-       {IXGBE_TDLEN(0), "TDLEN"},
-       {IXGBE_TDH(0), "TDH"},
-       {IXGBE_TDT(0), "TDT"},
-       {IXGBE_TXDCTL(0), "TXDCTL"},
-
-       /* List Terminator */
-       {}
-};
-
-
-/*
- * ixgbe_regdump - register printout routine
- */
-static void ixgbe_regdump(struct ixgbe_hw *hw, struct ixgbe_reg_info *reginfo)
-{
-       int i = 0, j = 0;
-       char rname[16];
-       u32 regs[64];
-
-       switch (reginfo->ofs) {
-       case IXGBE_SRRCTL(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_SRRCTL(i));
-               break;
-       case IXGBE_DCA_RXCTRL(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));
-               break;
-       case IXGBE_RDLEN(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDLEN(i));
-               break;
-       case IXGBE_RDH(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDH(i));
-               break;
-       case IXGBE_RDT(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDT(i));
-               break;
-       case IXGBE_RXDCTL(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
-               break;
-       case IXGBE_RDBAL(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDBAL(i));
-               break;
-       case IXGBE_RDBAH(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_RDBAH(i));
-               break;
-       case IXGBE_TDBAL(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDBAL(i));
-               break;
-       case IXGBE_TDBAH(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDBAH(i));
-               break;
-       case IXGBE_TDLEN(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDLEN(i));
-               break;
-       case IXGBE_TDH(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDH(i));
-               break;
-       case IXGBE_TDT(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TDT(i));
-               break;
-       case IXGBE_TXDCTL(0):
-               for (i = 0; i < 64; i++)
-                       regs[i] = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
-               break;
-       default:
-               pr_info("%-15s %08x\n", reginfo->name,
-                       IXGBE_READ_REG(hw, reginfo->ofs));
-               return;
-       }
-
-       for (i = 0; i < 8; i++) {
-               snprintf(rname, 16, "%s[%d-%d]", reginfo->name, i*8, i*8+7);
-               pr_err("%-15s", rname);
-               for (j = 0; j < 8; j++)
-                       pr_cont(" %08x", regs[i*8+j]);
-               pr_cont("\n");
-       }
-
-}
-
-/*
- * ixgbe_dump - Print registers, tx-rings and rx-rings
- */
-static void ixgbe_dump(struct ixgbe_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbe_reg_info *reginfo;
-       int n = 0;
-       struct ixgbe_ring *tx_ring;
-       struct ixgbe_tx_buffer *tx_buffer_info;
-       union ixgbe_adv_tx_desc *tx_desc;
-       struct my_u0 { u64 a; u64 b; } *u0;
-       struct ixgbe_ring *rx_ring;
-       union ixgbe_adv_rx_desc *rx_desc;
-       struct ixgbe_rx_buffer *rx_buffer_info;
-       u32 staterr;
-       int i = 0;
-
-       if (!netif_msg_hw(adapter))
-               return;
-
-       /* Print netdevice Info */
-       if (netdev) {
-               dev_info(&adapter->pdev->dev, "Net device Info\n");
-               pr_info("Device Name     state            "
-                       "trans_start      last_rx\n");
-               pr_info("%-15s %016lX %016lX %016lX\n",
-                       netdev->name,
-                       netdev->state,
-                       netdev->trans_start,
-                       netdev->last_rx);
-       }
-
-       /* Print Registers */
-       dev_info(&adapter->pdev->dev, "Register Dump\n");
-       pr_info(" Register Name   Value\n");
-       for (reginfo = (struct ixgbe_reg_info *)ixgbe_reg_info_tbl;
-            reginfo->name; reginfo++) {
-               ixgbe_regdump(hw, reginfo);
-       }
-
-       /* Print TX Ring Summary */
-       if (!netdev || !netif_running(netdev))
-               goto exit;
-
-       dev_info(&adapter->pdev->dev, "TX Rings Summary\n");
-       pr_info("Queue [NTU] [NTC] [bi(ntc)->dma  ] leng ntw timestamp\n");
-       for (n = 0; n < adapter->num_tx_queues; n++) {
-               tx_ring = adapter->tx_ring[n];
-               tx_buffer_info =
-                       &tx_ring->tx_buffer_info[tx_ring->next_to_clean];
-               pr_info(" %5d %5X %5X %016llX %04X %3X %016llX\n",
-                          n, tx_ring->next_to_use, tx_ring->next_to_clean,
-                          (u64)tx_buffer_info->dma,
-                          tx_buffer_info->length,
-                          tx_buffer_info->next_to_watch,
-                          (u64)tx_buffer_info->time_stamp);
-       }
-
-       /* Print TX Rings */
-       if (!netif_msg_tx_done(adapter))
-               goto rx_ring_summary;
-
-       dev_info(&adapter->pdev->dev, "TX Rings Dump\n");
-
-       /* Transmit Descriptor Formats
-        *
-        * Advanced Transmit Descriptor
-        *   +--------------------------------------------------------------+
-        * 0 |         Buffer Address [63:0]                                |
-        *   +--------------------------------------------------------------+
-        * 8 |  PAYLEN  | PORTS  | IDX | STA | DCMD  |DTYP |  RSV |  DTALEN |
-        *   +--------------------------------------------------------------+
-        *   63       46 45    40 39 36 35 32 31   24 23 20 19              0
-        */
-
-       for (n = 0; n < adapter->num_tx_queues; n++) {
-               tx_ring = adapter->tx_ring[n];
-               pr_info("------------------------------------\n");
-               pr_info("TX QUEUE INDEX = %d\n", tx_ring->queue_index);
-               pr_info("------------------------------------\n");
-               pr_info("T [desc]     [address 63:0  ] "
-                       "[PlPOIdStDDt Ln] [bi->dma       ] "
-                       "leng  ntw timestamp        bi->skb\n");
-
-               for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
-                       tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
-                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
-                       u0 = (struct my_u0 *)tx_desc;
-                       pr_info("T [0x%03X]    %016llX %016llX %016llX"
-                               " %04X  %3X %016llX %p", i,
-                               le64_to_cpu(u0->a),
-                               le64_to_cpu(u0->b),
-                               (u64)tx_buffer_info->dma,
-                               tx_buffer_info->length,
-                               tx_buffer_info->next_to_watch,
-                               (u64)tx_buffer_info->time_stamp,
-                               tx_buffer_info->skb);
-                       if (i == tx_ring->next_to_use &&
-                               i == tx_ring->next_to_clean)
-                               pr_cont(" NTC/U\n");
-                       else if (i == tx_ring->next_to_use)
-                               pr_cont(" NTU\n");
-                       else if (i == tx_ring->next_to_clean)
-                               pr_cont(" NTC\n");
-                       else
-                               pr_cont("\n");
-
-                       if (netif_msg_pktdata(adapter) &&
-                               tx_buffer_info->dma != 0)
-                               print_hex_dump(KERN_INFO, "",
-                                       DUMP_PREFIX_ADDRESS, 16, 1,
-                                       phys_to_virt(tx_buffer_info->dma),
-                                       tx_buffer_info->length, true);
-               }
-       }
-
-       /* Print RX Rings Summary */
-rx_ring_summary:
-       dev_info(&adapter->pdev->dev, "RX Rings Summary\n");
-       pr_info("Queue [NTU] [NTC]\n");
-       for (n = 0; n < adapter->num_rx_queues; n++) {
-               rx_ring = adapter->rx_ring[n];
-               pr_info("%5d %5X %5X\n",
-                       n, rx_ring->next_to_use, rx_ring->next_to_clean);
-       }
-
-       /* Print RX Rings */
-       if (!netif_msg_rx_status(adapter))
-               goto exit;
-
-       dev_info(&adapter->pdev->dev, "RX Rings Dump\n");
-
-       /* Advanced Receive Descriptor (Read) Format
-        *    63                                           1        0
-        *    +-----------------------------------------------------+
-        *  0 |       Packet Buffer Address [63:1]           |A0/NSE|
-        *    +----------------------------------------------+------+
-        *  8 |       Header Buffer Address [63:1]           |  DD  |
-        *    +-----------------------------------------------------+
-        *
-        *
-        * Advanced Receive Descriptor (Write-Back) Format
-        *
-        *   63       48 47    32 31  30      21 20 16 15   4 3     0
-        *   +------------------------------------------------------+
-        * 0 | Packet     IP     |SPH| HDR_LEN   | RSV|Packet|  RSS |
-        *   | Checksum   Ident  |   |           |    | Type | Type |
-        *   +------------------------------------------------------+
-        * 8 | VLAN Tag | Length | Extended Error | Extended Status |
-        *   +------------------------------------------------------+
-        *   63       48 47    32 31            20 19               0
-        */
-       for (n = 0; n < adapter->num_rx_queues; n++) {
-               rx_ring = adapter->rx_ring[n];
-               pr_info("------------------------------------\n");
-               pr_info("RX QUEUE INDEX = %d\n", rx_ring->queue_index);
-               pr_info("------------------------------------\n");
-               pr_info("R  [desc]      [ PktBuf     A0] "
-                       "[  HeadBuf   DD] [bi->dma       ] [bi->skb] "
-                       "<-- Adv Rx Read format\n");
-               pr_info("RWB[desc]      [PcsmIpSHl PtRs] "
-                       "[vl er S cks ln] ---------------- [bi->skb] "
-                       "<-- Adv Rx Write-Back format\n");
-
-               for (i = 0; i < rx_ring->count; i++) {
-                       rx_buffer_info = &rx_ring->rx_buffer_info[i];
-                       rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);
-                       u0 = (struct my_u0 *)rx_desc;
-                       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-                       if (staterr & IXGBE_RXD_STAT_DD) {
-                               /* Descriptor Done */
-                               pr_info("RWB[0x%03X]     %016llX "
-                                       "%016llX ---------------- %p", i,
-                                       le64_to_cpu(u0->a),
-                                       le64_to_cpu(u0->b),
-                                       rx_buffer_info->skb);
-                       } else {
-                               pr_info("R  [0x%03X]     %016llX "
-                                       "%016llX %016llX %p", i,
-                                       le64_to_cpu(u0->a),
-                                       le64_to_cpu(u0->b),
-                                       (u64)rx_buffer_info->dma,
-                                       rx_buffer_info->skb);
-
-                               if (netif_msg_pktdata(adapter)) {
-                                       print_hex_dump(KERN_INFO, "",
-                                          DUMP_PREFIX_ADDRESS, 16, 1,
-                                          phys_to_virt(rx_buffer_info->dma),
-                                          rx_ring->rx_buf_len, true);
-
-                                       if (rx_ring->rx_buf_len
-                                               < IXGBE_RXBUFFER_2048)
-                                               print_hex_dump(KERN_INFO, "",
-                                                 DUMP_PREFIX_ADDRESS, 16, 1,
-                                                 phys_to_virt(
-                                                   rx_buffer_info->page_dma +
-                                                   rx_buffer_info->page_offset
-                                                 ),
-                                                 PAGE_SIZE/2, true);
-                               }
-                       }
-
-                       if (i == rx_ring->next_to_use)
-                               pr_cont(" NTU\n");
-                       else if (i == rx_ring->next_to_clean)
-                               pr_cont(" NTC\n");
-                       else
-                               pr_cont("\n");
-
-               }
-       }
-
-exit:
-       return;
-}
-
-static void ixgbe_release_hw_control(struct ixgbe_adapter *adapter)
-{
-       u32 ctrl_ext;
-
-       /* Let firmware take over control of h/w */
-       ctrl_ext = IXGBE_READ_REG(&adapter->hw, IXGBE_CTRL_EXT);
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_CTRL_EXT,
-                       ctrl_ext & ~IXGBE_CTRL_EXT_DRV_LOAD);
-}
-
-static void ixgbe_get_hw_control(struct ixgbe_adapter *adapter)
-{
-       u32 ctrl_ext;
-
-       /* Let firmware know the driver has taken over */
-       ctrl_ext = IXGBE_READ_REG(&adapter->hw, IXGBE_CTRL_EXT);
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_CTRL_EXT,
-                       ctrl_ext | IXGBE_CTRL_EXT_DRV_LOAD);
-}
-
-/*
- * ixgbe_set_ivar - set the IVAR registers, mapping interrupt causes to vectors
- * @adapter: pointer to adapter struct
- * @direction: 0 for Rx, 1 for Tx, -1 for other causes
- * @queue: queue to map the corresponding interrupt to
- * @msix_vector: the vector to map to the corresponding queue
- *
- */
-static void ixgbe_set_ivar(struct ixgbe_adapter *adapter, s8 direction,
-                          u8 queue, u8 msix_vector)
-{
-       u32 ivar, index;
-       struct ixgbe_hw *hw = &adapter->hw;
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               msix_vector |= IXGBE_IVAR_ALLOC_VAL;
-               if (direction == -1)
-                       direction = 0;
-               index = (((direction * 64) + queue) >> 2) & 0x1F;
-               ivar = IXGBE_READ_REG(hw, IXGBE_IVAR(index));
-               ivar &= ~(0xFF << (8 * (queue & 0x3)));
-               ivar |= (msix_vector << (8 * (queue & 0x3)));
-               IXGBE_WRITE_REG(hw, IXGBE_IVAR(index), ivar);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               if (direction == -1) {
-                       /* other causes */
-                       msix_vector |= IXGBE_IVAR_ALLOC_VAL;
-                       index = ((queue & 1) * 8);
-                       ivar = IXGBE_READ_REG(&adapter->hw, IXGBE_IVAR_MISC);
-                       ivar &= ~(0xFF << index);
-                       ivar |= (msix_vector << index);
-                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_IVAR_MISC, ivar);
-                       break;
-               } else {
-                       /* tx or rx causes */
-                       msix_vector |= IXGBE_IVAR_ALLOC_VAL;
-                       index = ((16 * (queue & 1)) + (8 * direction));
-                       ivar = IXGBE_READ_REG(hw, IXGBE_IVAR(queue >> 1));
-                       ivar &= ~(0xFF << index);
-                       ivar |= (msix_vector << index);
-                       IXGBE_WRITE_REG(hw, IXGBE_IVAR(queue >> 1), ivar);
-                       break;
-               }
-       default:
-               break;
-       }
-}
-
-static inline void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter,
-                                         u64 qmask)
-{
-       u32 mask;
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82598EB:
-               mask = (IXGBE_EIMS_RTX_QUEUE & qmask);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS, mask);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               mask = (qmask & 0xFFFFFFFF);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(0), mask);
-               mask = (qmask >> 32);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(1), mask);
-               break;
-       default:
-               break;
-       }
-}
-
-void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *tx_ring,
-                                     struct ixgbe_tx_buffer *tx_buffer_info)
-{
-       if (tx_buffer_info->dma) {
-               if (tx_buffer_info->mapped_as_page)
-                       dma_unmap_page(tx_ring->dev,
-                                      tx_buffer_info->dma,
-                                      tx_buffer_info->length,
-                                      DMA_TO_DEVICE);
-               else
-                       dma_unmap_single(tx_ring->dev,
-                                        tx_buffer_info->dma,
-                                        tx_buffer_info->length,
-                                        DMA_TO_DEVICE);
-               tx_buffer_info->dma = 0;
-       }
-       if (tx_buffer_info->skb) {
-               dev_kfree_skb_any(tx_buffer_info->skb);
-               tx_buffer_info->skb = NULL;
-       }
-       tx_buffer_info->time_stamp = 0;
-       /* tx_buffer_info must be completely set up in the transmit path */
-}
-
-static void ixgbe_update_xoff_received(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbe_hw_stats *hwstats = &adapter->stats;
-       u32 data = 0;
-       u32 xoff[8] = {0};
-       int i;
-
-       if ((hw->fc.current_mode == ixgbe_fc_full) ||
-           (hw->fc.current_mode == ixgbe_fc_rx_pause)) {
-               switch (hw->mac.type) {
-               case ixgbe_mac_82598EB:
-                       data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
-                       break;
-               default:
-                       data = IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
-               }
-               hwstats->lxoffrxc += data;
-
-               /* refill credits (no tx hang) if we received xoff */
-               if (!data)
-                       return;
-
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       clear_bit(__IXGBE_HANG_CHECK_ARMED,
-                                 &adapter->tx_ring[i]->state);
-               return;
-       } else if (!(adapter->dcb_cfg.pfc_mode_enable))
-               return;
-
-       /* update stats for each tc, only valid with PFC enabled */
-       for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) {
-               switch (hw->mac.type) {
-               case ixgbe_mac_82598EB:
-                       xoff[i] = IXGBE_READ_REG(hw, IXGBE_PXOFFRXC(i));
-                       break;
-               default:
-                       xoff[i] = IXGBE_READ_REG(hw, IXGBE_PXOFFRXCNT(i));
-               }
-               hwstats->pxoffrxc[i] += xoff[i];
-       }
-
-       /* disarm tx queues that have received xoff frames */
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               struct ixgbe_ring *tx_ring = adapter->tx_ring[i];
-               u8 tc = tx_ring->dcb_tc;
-
-               if (xoff[tc])
-                       clear_bit(__IXGBE_HANG_CHECK_ARMED, &tx_ring->state);
-       }
-}
-
-static u64 ixgbe_get_tx_completed(struct ixgbe_ring *ring)
-{
-       return ring->tx_stats.completed;
-}
-
-static u64 ixgbe_get_tx_pending(struct ixgbe_ring *ring)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(ring->netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       u32 head = IXGBE_READ_REG(hw, IXGBE_TDH(ring->reg_idx));
-       u32 tail = IXGBE_READ_REG(hw, IXGBE_TDT(ring->reg_idx));
-
-       if (head != tail)
-               return (head < tail) ?
-                       tail - head : (tail + ring->count - head);
-
-       return 0;
-}
-
-static inline bool ixgbe_check_tx_hang(struct ixgbe_ring *tx_ring)
-{
-       u32 tx_done = ixgbe_get_tx_completed(tx_ring);
-       u32 tx_done_old = tx_ring->tx_stats.tx_done_old;
-       u32 tx_pending = ixgbe_get_tx_pending(tx_ring);
-       bool ret = false;
-
-       clear_check_for_tx_hang(tx_ring);
-
-       /*
-        * Check for a hung queue, but be thorough. This verifies
-        * that a transmit has been completed since the previous
-        * check AND there is at least one packet pending. The
-        * ARMED bit is set to indicate a potential hang. The
-        * bit is cleared if a pause frame is received to remove
-        * false hang detection due to PFC or 802.3x frames. By
-        * requiring this to fail twice we avoid races with
-        * pfc clearing the ARMED bit and conditions where we
-        * run the check_tx_hang logic with a transmit completion
-        * pending but without time to complete it yet.
-        */
-       if ((tx_done_old == tx_done) && tx_pending) {
-               /* make sure it is true for two checks in a row */
-               ret = test_and_set_bit(__IXGBE_HANG_CHECK_ARMED,
-                                      &tx_ring->state);
-       } else {
-               /* update completed stats and continue */
-               tx_ring->tx_stats.tx_done_old = tx_done;
-               /* reset the countdown */
-               clear_bit(__IXGBE_HANG_CHECK_ARMED, &tx_ring->state);
-       }
-
-       return ret;
-}
-
-/**
- * ixgbe_tx_timeout_reset - initiate reset due to Tx timeout
- * @adapter: driver private struct
- **/
-static void ixgbe_tx_timeout_reset(struct ixgbe_adapter *adapter)
-{
-
-       /* Do the reset outside of interrupt context */
-       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-               adapter->flags2 |= IXGBE_FLAG2_RESET_REQUESTED;
-               ixgbe_service_event_schedule(adapter);
-       }
-}
-
-/**
- * ixgbe_clean_tx_irq - Reclaim resources after transmit completes
- * @q_vector: structure containing interrupt and ring information
- * @tx_ring: tx ring to clean
- **/
-static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
-                              struct ixgbe_ring *tx_ring)
-{
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       union ixgbe_adv_tx_desc *tx_desc, *eop_desc;
-       struct ixgbe_tx_buffer *tx_buffer_info;
-       unsigned int total_bytes = 0, total_packets = 0;
-       u16 i, eop, count = 0;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->tx_buffer_info[i].next_to_watch;
-       eop_desc = IXGBE_TX_DESC_ADV(tx_ring, eop);
-
-       while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
-              (count < q_vector->tx.work_limit)) {
-               bool cleaned = false;
-               rmb(); /* read buffer_info after eop_desc */
-               for ( ; !cleaned; count++) {
-                       tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
-                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
-
-                       tx_desc->wb.status = 0;
-                       cleaned = (i == eop);
-
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-
-                       if (cleaned && tx_buffer_info->skb) {
-                               total_bytes += tx_buffer_info->bytecount;
-                               total_packets += tx_buffer_info->gso_segs;
-                       }
-
-                       ixgbe_unmap_and_free_tx_resource(tx_ring,
-                                                        tx_buffer_info);
-               }
-
-               tx_ring->tx_stats.completed++;
-               eop = tx_ring->tx_buffer_info[i].next_to_watch;
-               eop_desc = IXGBE_TX_DESC_ADV(tx_ring, eop);
-       }
-
-       tx_ring->next_to_clean = i;
-       tx_ring->stats.bytes += total_bytes;
-       tx_ring->stats.packets += total_packets;
-       u64_stats_update_begin(&tx_ring->syncp);
-       q_vector->tx.total_bytes += total_bytes;
-       q_vector->tx.total_packets += total_packets;
-       u64_stats_update_end(&tx_ring->syncp);
-
-       if (check_for_tx_hang(tx_ring) && ixgbe_check_tx_hang(tx_ring)) {
-               /* schedule immediate reset if we believe we hung */
-               struct ixgbe_hw *hw = &adapter->hw;
-               tx_desc = IXGBE_TX_DESC_ADV(tx_ring, eop);
-               e_err(drv, "Detected Tx Unit Hang\n"
-                       "  Tx Queue             <%d>\n"
-                       "  TDH, TDT             <%x>, <%x>\n"
-                       "  next_to_use          <%x>\n"
-                       "  next_to_clean        <%x>\n"
-                       "tx_buffer_info[next_to_clean]\n"
-                       "  time_stamp           <%lx>\n"
-                       "  jiffies              <%lx>\n",
-                       tx_ring->queue_index,
-                       IXGBE_READ_REG(hw, IXGBE_TDH(tx_ring->reg_idx)),
-                       IXGBE_READ_REG(hw, IXGBE_TDT(tx_ring->reg_idx)),
-                       tx_ring->next_to_use, eop,
-                       tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
-
-               netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
-
-               e_info(probe,
-                      "tx hang %d detected on queue %d, resetting adapter\n",
-                       adapter->tx_timeout_count + 1, tx_ring->queue_index);
-
-               /* schedule immediate reset if we believe we hung */
-               ixgbe_tx_timeout_reset(adapter);
-
-               /* the adapter is about to reset, no point in enabling stuff */
-               return true;
-       }
-
-#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
-       if (unlikely(count && netif_carrier_ok(tx_ring->netdev) &&
-                    (ixgbe_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD))) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean.
-                */
-               smp_mb();
-               if (__netif_subqueue_stopped(tx_ring->netdev, tx_ring->queue_index) &&
-                   !test_bit(__IXGBE_DOWN, &adapter->state)) {
-                       netif_wake_subqueue(tx_ring->netdev, tx_ring->queue_index);
-                       ++tx_ring->tx_stats.restart_queue;
-               }
-       }
-
-       return count < q_vector->tx.work_limit;
-}
-
-#ifdef CONFIG_IXGBE_DCA
-static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
-                               struct ixgbe_ring *rx_ring,
-                               int cpu)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 rxctrl;
-       u8 reg_idx = rx_ring->reg_idx;
-
-       rxctrl = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(reg_idx));
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK;
-               rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK_82599;
-               rxctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
-                          IXGBE_DCA_RXCTRL_CPUID_SHIFT_82599);
-               break;
-       default:
-               break;
-       }
-       rxctrl |= IXGBE_DCA_RXCTRL_DESC_DCA_EN;
-       rxctrl |= IXGBE_DCA_RXCTRL_HEAD_DCA_EN;
-       rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_RRO_EN);
-       IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(reg_idx), rxctrl);
-}
-
-static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,
-                               struct ixgbe_ring *tx_ring,
-                               int cpu)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 txctrl;
-       u8 reg_idx = tx_ring->reg_idx;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(reg_idx));
-               txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK;
-               txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
-               txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
-               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(reg_idx), txctrl);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(reg_idx));
-               txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK_82599;
-               txctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
-                          IXGBE_DCA_TXCTRL_CPUID_SHIFT_82599);
-               txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
-               IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(reg_idx), txctrl);
-               break;
-       default:
-               break;
-       }
-}
-
-static void ixgbe_update_dca(struct ixgbe_q_vector *q_vector)
-{
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       int cpu = get_cpu();
-       long r_idx;
-       int i;
-
-       if (q_vector->cpu == cpu)
-               goto out_no_update;
-
-       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-       for (i = 0; i < q_vector->tx.count; i++) {
-               ixgbe_update_tx_dca(adapter, adapter->tx_ring[r_idx], cpu);
-               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                     r_idx + 1);
-       }
-
-       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-       for (i = 0; i < q_vector->rx.count; i++) {
-               ixgbe_update_rx_dca(adapter, adapter->rx_ring[r_idx], cpu);
-               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                     r_idx + 1);
-       }
-
-       q_vector->cpu = cpu;
-out_no_update:
-       put_cpu();
-}
-
-static void ixgbe_setup_dca(struct ixgbe_adapter *adapter)
-{
-       int num_q_vectors;
-       int i;
-
-       if (!(adapter->flags & IXGBE_FLAG_DCA_ENABLED))
-               return;
-
-       /* always use CB2 mode, difference is masked in the CB driver */
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 2);
-
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
-               num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-       else
-               num_q_vectors = 1;
-
-       for (i = 0; i < num_q_vectors; i++) {
-               adapter->q_vector[i]->cpu = -1;
-               ixgbe_update_dca(adapter->q_vector[i]);
-       }
-}
-
-static int __ixgbe_notify_dca(struct device *dev, void *data)
-{
-       struct ixgbe_adapter *adapter = dev_get_drvdata(dev);
-       unsigned long event = *(unsigned long *)data;
-
-       if (!(adapter->flags & IXGBE_FLAG_DCA_CAPABLE))
-               return 0;
-
-       switch (event) {
-       case DCA_PROVIDER_ADD:
-               /* if we're already enabled, don't do it again */
-               if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-                       break;
-               if (dca_add_requester(dev) == 0) {
-                       adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
-                       ixgbe_setup_dca(adapter);
-                       break;
-               }
-               /* Fall Through since DCA is disabled. */
-       case DCA_PROVIDER_REMOVE:
-               if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
-                       dca_remove_requester(dev);
-                       adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
-                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 1);
-               }
-               break;
-       }
-
-       return 0;
-}
-#endif /* CONFIG_IXGBE_DCA */
-
-static inline void ixgbe_rx_hash(union ixgbe_adv_rx_desc *rx_desc,
-                                struct sk_buff *skb)
-{
-       skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
-}
-
-/**
- * ixgbe_rx_is_fcoe - check the rx desc for incoming pkt type
- * @adapter: address of board private structure
- * @rx_desc: advanced rx descriptor
- *
- * Returns : true if it is FCoE pkt
- */
-static inline bool ixgbe_rx_is_fcoe(struct ixgbe_adapter *adapter,
-                                   union ixgbe_adv_rx_desc *rx_desc)
-{
-       __le16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
-
-       return (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
-              ((pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_ETQF_MASK)) ==
-               (cpu_to_le16(IXGBE_ETQF_FILTER_FCOE <<
-                            IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT)));
-}
-
-/**
- * ixgbe_receive_skb - Send a completed packet up the stack
- * @adapter: board private structure
- * @skb: packet to send up
- * @status: hardware indication of status of receive
- * @rx_ring: rx descriptor ring (for a specific queue) to setup
- * @rx_desc: rx descriptor
- **/
-static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
-                             struct sk_buff *skb, u8 status,
-                             struct ixgbe_ring *ring,
-                             union ixgbe_adv_rx_desc *rx_desc)
-{
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       struct napi_struct *napi = &q_vector->napi;
-       bool is_vlan = (status & IXGBE_RXD_STAT_VP);
-       u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
-
-       if (is_vlan && (tag & VLAN_VID_MASK))
-               __vlan_hwaccel_put_tag(skb, tag);
-
-       if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))
-               napi_gro_receive(napi, skb);
-       else
-               netif_rx(skb);
-}
-
-/**
- * ixgbe_rx_checksum - indicate in skb if hw indicated a good cksum
- * @adapter: address of board private structure
- * @status_err: hardware indication of status of receive
- * @skb: skb currently being received and modified
- * @status_err: status error value of last descriptor in packet
- **/
-static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,
-                                    union ixgbe_adv_rx_desc *rx_desc,
-                                    struct sk_buff *skb,
-                                    u32 status_err)
-{
-       skb->ip_summed = CHECKSUM_NONE;
-
-       /* Rx csum disabled */
-       if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED))
-               return;
-
-       /* if IP and error */
-       if ((status_err & IXGBE_RXD_STAT_IPCS) &&
-           (status_err & IXGBE_RXDADV_ERR_IPE)) {
-               adapter->hw_csum_rx_error++;
-               return;
-       }
-
-       if (!(status_err & IXGBE_RXD_STAT_L4CS))
-               return;
-
-       if (status_err & IXGBE_RXDADV_ERR_TCPE) {
-               u16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
-
-               /*
-                * 82599 errata, UDP frames with a 0 checksum can be marked as
-                * checksum errors.
-                */
-               if ((pkt_info & IXGBE_RXDADV_PKTTYPE_UDP) &&
-                   (adapter->hw.mac.type == ixgbe_mac_82599EB))
-                       return;
-
-               adapter->hw_csum_rx_error++;
-               return;
-       }
-
-       /* It must be a TCP or UDP packet with a valid checksum */
-       skb->ip_summed = CHECKSUM_UNNECESSARY;
-}
-
-static inline void ixgbe_release_rx_desc(struct ixgbe_ring *rx_ring, u32 val)
-{
-       /*
-        * Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64).
-        */
-       wmb();
-       writel(val, rx_ring->tail);
-}
-
-/**
- * ixgbe_alloc_rx_buffers - Replace used receive buffers; packet split
- * @rx_ring: ring to place buffers on
- * @cleaned_count: number of buffers to replace
- **/
-void ixgbe_alloc_rx_buffers(struct ixgbe_ring *rx_ring, u16 cleaned_count)
-{
-       union ixgbe_adv_rx_desc *rx_desc;
-       struct ixgbe_rx_buffer *bi;
-       struct sk_buff *skb;
-       u16 i = rx_ring->next_to_use;
-
-       /* do nothing if no valid netdev defined */
-       if (!rx_ring->netdev)
-               return;
-
-       while (cleaned_count--) {
-               rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);
-               bi = &rx_ring->rx_buffer_info[i];
-               skb = bi->skb;
-
-               if (!skb) {
-                       skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
-                                                       rx_ring->rx_buf_len);
-                       if (!skb) {
-                               rx_ring->rx_stats.alloc_rx_buff_failed++;
-                               goto no_buffers;
-                       }
-                       /* initialize queue mapping */
-                       skb_record_rx_queue(skb, rx_ring->queue_index);
-                       bi->skb = skb;
-               }
-
-               if (!bi->dma) {
-                       bi->dma = dma_map_single(rx_ring->dev,
-                                                skb->data,
-                                                rx_ring->rx_buf_len,
-                                                DMA_FROM_DEVICE);
-                       if (dma_mapping_error(rx_ring->dev, bi->dma)) {
-                               rx_ring->rx_stats.alloc_rx_buff_failed++;
-                               bi->dma = 0;
-                               goto no_buffers;
-                       }
-               }
-
-               if (ring_is_ps_enabled(rx_ring)) {
-                       if (!bi->page) {
-                               bi->page = netdev_alloc_page(rx_ring->netdev);
-                               if (!bi->page) {
-                                       rx_ring->rx_stats.alloc_rx_page_failed++;
-                                       goto no_buffers;
-                               }
-                       }
-
-                       if (!bi->page_dma) {
-                               /* use a half page if we're re-using */
-                               bi->page_offset ^= PAGE_SIZE / 2;
-                               bi->page_dma = dma_map_page(rx_ring->dev,
-                                                           bi->page,
-                                                           bi->page_offset,
-                                                           PAGE_SIZE / 2,
-                                                           DMA_FROM_DEVICE);
-                               if (dma_mapping_error(rx_ring->dev,
-                                                     bi->page_dma)) {
-                                       rx_ring->rx_stats.alloc_rx_page_failed++;
-                                       bi->page_dma = 0;
-                                       goto no_buffers;
-                               }
-                       }
-
-                       /* Refresh the desc even if buffer_addrs didn't change
-                        * because each write-back erases this info. */
-                       rx_desc->read.pkt_addr = cpu_to_le64(bi->page_dma);
-                       rx_desc->read.hdr_addr = cpu_to_le64(bi->dma);
-               } else {
-                       rx_desc->read.pkt_addr = cpu_to_le64(bi->dma);
-                       rx_desc->read.hdr_addr = 0;
-               }
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-       }
-
-no_buffers:
-       if (rx_ring->next_to_use != i) {
-               rx_ring->next_to_use = i;
-               ixgbe_release_rx_desc(rx_ring, i);
-       }
-}
-
-static inline u16 ixgbe_get_hlen(union ixgbe_adv_rx_desc *rx_desc)
-{
-       /* HW will not DMA in data larger than the given buffer, even if it
-        * parses the (NFS, of course) header to be larger.  In that case, it
-        * fills the header buffer and spills the rest into the page.
-        */
-       u16 hdr_info = le16_to_cpu(rx_desc->wb.lower.lo_dword.hs_rss.hdr_info);
-       u16 hlen = (hdr_info &  IXGBE_RXDADV_HDRBUFLEN_MASK) >>
-                   IXGBE_RXDADV_HDRBUFLEN_SHIFT;
-       if (hlen > IXGBE_RX_HDR_SIZE)
-               hlen = IXGBE_RX_HDR_SIZE;
-       return hlen;
-}
-
-/**
- * ixgbe_transform_rsc_queue - change rsc queue into a full packet
- * @skb: pointer to the last skb in the rsc queue
- *
- * This function changes a queue full of hw rsc buffers into a completed
- * packet.  It uses the ->prev pointers to find the first packet and then
- * turns it into the frag list owner.
- **/
-static inline struct sk_buff *ixgbe_transform_rsc_queue(struct sk_buff *skb)
-{
-       unsigned int frag_list_size = 0;
-       unsigned int skb_cnt = 1;
-
-       while (skb->prev) {
-               struct sk_buff *prev = skb->prev;
-               frag_list_size += skb->len;
-               skb->prev = NULL;
-               skb = prev;
-               skb_cnt++;
-       }
-
-       skb_shinfo(skb)->frag_list = skb->next;
-       skb->next = NULL;
-       skb->len += frag_list_size;
-       skb->data_len += frag_list_size;
-       skb->truesize += frag_list_size;
-       IXGBE_RSC_CB(skb)->skb_cnt = skb_cnt;
-
-       return skb;
-}
-
-static inline bool ixgbe_get_rsc_state(union ixgbe_adv_rx_desc *rx_desc)
-{
-       return !!(le32_to_cpu(rx_desc->wb.lower.lo_dword.data) &
-               IXGBE_RXDADV_RSCCNT_MASK);
-}
-
-static void ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
-                              struct ixgbe_ring *rx_ring,
-                              int *work_done, int work_to_do)
-{
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       union ixgbe_adv_rx_desc *rx_desc, *next_rxd;
-       struct ixgbe_rx_buffer *rx_buffer_info, *next_buffer;
-       struct sk_buff *skb;
-       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
-       const int current_node = numa_node_id();
-#ifdef IXGBE_FCOE
-       int ddp_bytes = 0;
-#endif /* IXGBE_FCOE */
-       u32 staterr;
-       u16 i;
-       u16 cleaned_count = 0;
-       bool pkt_is_rsc = false;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);
-       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-
-       while (staterr & IXGBE_RXD_STAT_DD) {
-               u32 upper_len = 0;
-
-               rmb(); /* read descriptor and rx_buffer_info after status DD */
-
-               rx_buffer_info = &rx_ring->rx_buffer_info[i];
-
-               skb = rx_buffer_info->skb;
-               rx_buffer_info->skb = NULL;
-               prefetch(skb->data);
-
-               if (ring_is_rsc_enabled(rx_ring))
-                       pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
-
-               /* if this is a skb from previous receive DMA will be 0 */
-               if (rx_buffer_info->dma) {
-                       u16 hlen;
-                       if (pkt_is_rsc &&
-                           !(staterr & IXGBE_RXD_STAT_EOP) &&
-                           !skb->prev) {
-                               /*
-                                * When HWRSC is enabled, delay unmapping
-                                * of the first packet. It carries the
-                                * header information, HW may still
-                                * access the header after the writeback.
-                                * Only unmap it when EOP is reached
-                                */
-                               IXGBE_RSC_CB(skb)->delay_unmap = true;
-                               IXGBE_RSC_CB(skb)->dma = rx_buffer_info->dma;
-                       } else {
-                               dma_unmap_single(rx_ring->dev,
-                                                rx_buffer_info->dma,
-                                                rx_ring->rx_buf_len,
-                                                DMA_FROM_DEVICE);
-                       }
-                       rx_buffer_info->dma = 0;
-
-                       if (ring_is_ps_enabled(rx_ring)) {
-                               hlen = ixgbe_get_hlen(rx_desc);
-                               upper_len = le16_to_cpu(rx_desc->wb.upper.length);
-                       } else {
-                               hlen = le16_to_cpu(rx_desc->wb.upper.length);
-                       }
-
-                       skb_put(skb, hlen);
-               } else {
-                       /* assume packet split since header is unmapped */
-                       upper_len = le16_to_cpu(rx_desc->wb.upper.length);
-               }
-
-               if (upper_len) {
-                       dma_unmap_page(rx_ring->dev,
-                                      rx_buffer_info->page_dma,
-                                      PAGE_SIZE / 2,
-                                      DMA_FROM_DEVICE);
-                       rx_buffer_info->page_dma = 0;
-                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
-                                          rx_buffer_info->page,
-                                          rx_buffer_info->page_offset,
-                                          upper_len);
-
-                       if ((page_count(rx_buffer_info->page) == 1) &&
-                           (page_to_nid(rx_buffer_info->page) == current_node))
-                               get_page(rx_buffer_info->page);
-                       else
-                               rx_buffer_info->page = NULL;
-
-                       skb->len += upper_len;
-                       skb->data_len += upper_len;
-                       skb->truesize += upper_len;
-               }
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-
-               next_rxd = IXGBE_RX_DESC_ADV(rx_ring, i);
-               prefetch(next_rxd);
-               cleaned_count++;
-
-               if (pkt_is_rsc) {
-                       u32 nextp = (staterr & IXGBE_RXDADV_NEXTP_MASK) >>
-                                    IXGBE_RXDADV_NEXTP_SHIFT;
-                       next_buffer = &rx_ring->rx_buffer_info[nextp];
-               } else {
-                       next_buffer = &rx_ring->rx_buffer_info[i];
-               }
-
-               if (!(staterr & IXGBE_RXD_STAT_EOP)) {
-                       if (ring_is_ps_enabled(rx_ring)) {
-                               rx_buffer_info->skb = next_buffer->skb;
-                               rx_buffer_info->dma = next_buffer->dma;
-                               next_buffer->skb = skb;
-                               next_buffer->dma = 0;
-                       } else {
-                               skb->next = next_buffer->skb;
-                               skb->next->prev = skb;
-                       }
-                       rx_ring->rx_stats.non_eop_descs++;
-                       goto next_desc;
-               }
-
-               if (skb->prev) {
-                       skb = ixgbe_transform_rsc_queue(skb);
-                       /* if we got here without RSC the packet is invalid */
-                       if (!pkt_is_rsc) {
-                               __pskb_trim(skb, 0);
-                               rx_buffer_info->skb = skb;
-                               goto next_desc;
-                       }
-               }
-
-               if (ring_is_rsc_enabled(rx_ring)) {
-                       if (IXGBE_RSC_CB(skb)->delay_unmap) {
-                               dma_unmap_single(rx_ring->dev,
-                                                IXGBE_RSC_CB(skb)->dma,
-                                                rx_ring->rx_buf_len,
-                                                DMA_FROM_DEVICE);
-                               IXGBE_RSC_CB(skb)->dma = 0;
-                               IXGBE_RSC_CB(skb)->delay_unmap = false;
-                       }
-               }
-               if (pkt_is_rsc) {
-                       if (ring_is_ps_enabled(rx_ring))
-                               rx_ring->rx_stats.rsc_count +=
-                                       skb_shinfo(skb)->nr_frags;
-                       else
-                               rx_ring->rx_stats.rsc_count +=
-                                       IXGBE_RSC_CB(skb)->skb_cnt;
-                       rx_ring->rx_stats.rsc_flush++;
-               }
-
-               /* ERR_MASK will only have valid bits if EOP set */
-               if (unlikely(staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK)) {
-                       dev_kfree_skb_any(skb);
-                       goto next_desc;
-               }
-
-               ixgbe_rx_checksum(adapter, rx_desc, skb, staterr);
-               if (adapter->netdev->features & NETIF_F_RXHASH)
-                       ixgbe_rx_hash(rx_desc, skb);
-
-               /* probably a little skewed due to removing CRC */
-               total_rx_bytes += skb->len;
-               total_rx_packets++;
-
-               skb->protocol = eth_type_trans(skb, rx_ring->netdev);
-#ifdef IXGBE_FCOE
-               /* if ddp, not passing to ULD unless for FCP_RSP or error */
-               if (ixgbe_rx_is_fcoe(adapter, rx_desc)) {
-                       ddp_bytes = ixgbe_fcoe_ddp(adapter, rx_desc, skb,
-                                                  staterr);
-                       if (!ddp_bytes)
-                               goto next_desc;
-               }
-#endif /* IXGBE_FCOE */
-               ixgbe_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc);
-
-next_desc:
-               rx_desc->wb.upper.status_error = 0;
-
-               (*work_done)++;
-               if (*work_done >= work_to_do)
-                       break;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (cleaned_count >= IXGBE_RX_BUFFER_WRITE) {
-                       ixgbe_alloc_rx_buffers(rx_ring, cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-       }
-
-       rx_ring->next_to_clean = i;
-       cleaned_count = ixgbe_desc_unused(rx_ring);
-
-       if (cleaned_count)
-               ixgbe_alloc_rx_buffers(rx_ring, cleaned_count);
-
-#ifdef IXGBE_FCOE
-       /* include DDPed FCoE data */
-       if (ddp_bytes > 0) {
-               unsigned int mss;
-
-               mss = rx_ring->netdev->mtu - sizeof(struct fcoe_hdr) -
-                       sizeof(struct fc_frame_header) -
-                       sizeof(struct fcoe_crc_eof);
-               if (mss > 512)
-                       mss &= ~511;
-               total_rx_bytes += ddp_bytes;
-               total_rx_packets += DIV_ROUND_UP(ddp_bytes, mss);
-       }
-#endif /* IXGBE_FCOE */
-
-       u64_stats_update_begin(&rx_ring->syncp);
-       rx_ring->stats.packets += total_rx_packets;
-       rx_ring->stats.bytes += total_rx_bytes;
-       u64_stats_update_end(&rx_ring->syncp);
-       q_vector->rx.total_packets += total_rx_packets;
-       q_vector->rx.total_bytes += total_rx_bytes;
-}
-
-static int ixgbe_clean_rxonly(struct napi_struct *, int);
-/**
- * ixgbe_configure_msix - Configure MSI-X hardware
- * @adapter: board private structure
- *
- * ixgbe_configure_msix sets up the hardware to properly generate MSI-X
- * interrupts.
- **/
-static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_q_vector *q_vector;
-       int i, q_vectors, v_idx, r_idx;
-       u32 mask;
-
-       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       /*
-        * Populate the IVAR table and set the ITR values to the
-        * corresponding register.
-        */
-       for (v_idx = 0; v_idx < q_vectors; v_idx++) {
-               q_vector = adapter->q_vector[v_idx];
-               /* XXX for_each_set_bit(...) */
-               r_idx = find_first_bit(q_vector->rx.idx,
-                                      adapter->num_rx_queues);
-
-               for (i = 0; i < q_vector->rx.count; i++) {
-                       u8 reg_idx = adapter->rx_ring[r_idx]->reg_idx;
-                       ixgbe_set_ivar(adapter, 0, reg_idx, v_idx);
-                       r_idx = find_next_bit(q_vector->rx.idx,
-                                             adapter->num_rx_queues,
-                                             r_idx + 1);
-               }
-               r_idx = find_first_bit(q_vector->tx.idx,
-                                      adapter->num_tx_queues);
-
-               for (i = 0; i < q_vector->tx.count; i++) {
-                       u8 reg_idx = adapter->tx_ring[r_idx]->reg_idx;
-                       ixgbe_set_ivar(adapter, 1, reg_idx, v_idx);
-                       r_idx = find_next_bit(q_vector->tx.idx,
-                                             adapter->num_tx_queues,
-                                             r_idx + 1);
-               }
-
-               if (q_vector->tx.count && !q_vector->rx.count)
-                       /* tx only */
-                       q_vector->eitr = adapter->tx_eitr_param;
-               else if (q_vector->rx.count)
-                       /* rx or mixed */
-                       q_vector->eitr = adapter->rx_eitr_param;
-
-               ixgbe_write_eitr(q_vector);
-               /* If ATR is enabled, set interrupt affinity */
-               if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
-                       /*
-                        * Allocate the affinity_hint cpumask, assign the mask
-                        * for this vector, and set our affinity_hint for
-                        * this irq.
-                        */
-                       if (!alloc_cpumask_var(&q_vector->affinity_mask,
-                                              GFP_KERNEL))
-                               return;
-                       cpumask_set_cpu(v_idx, q_vector->affinity_mask);
-                       irq_set_affinity_hint(adapter->msix_entries[v_idx].vector,
-                                             q_vector->affinity_mask);
-               }
-       }
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82598EB:
-               ixgbe_set_ivar(adapter, -1, IXGBE_IVAR_OTHER_CAUSES_INDEX,
-                              v_idx);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               ixgbe_set_ivar(adapter, -1, 1, v_idx);
-               break;
-
-       default:
-               break;
-       }
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITR(v_idx), 1950);
-
-       /* set up to autoclear timer, and the vectors */
-       mask = IXGBE_EIMS_ENABLE_MASK;
-       if (adapter->num_vfs)
-               mask &= ~(IXGBE_EIMS_OTHER |
-                         IXGBE_EIMS_MAILBOX |
-                         IXGBE_EIMS_LSC);
-       else
-               mask &= ~(IXGBE_EIMS_OTHER | IXGBE_EIMS_LSC);
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIAC, mask);
-}
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-/**
- * ixgbe_update_itr - update the dynamic ITR value based on statistics
- * @q_vector: structure containing interrupt and ring information
- * @ring_container: structure containing ring performance data
- *
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.
- *      this functionality is controlled by the InterruptThrottleRate module
- *      parameter (see ixgbe_param.c)
- **/
-static void ixgbe_update_itr(struct ixgbe_q_vector *q_vector,
-                            struct ixgbe_ring_container *ring_container)
-{
-       u64 bytes_perint;
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       int bytes = ring_container->total_bytes;
-       int packets = ring_container->total_packets;
-       u32 timepassed_us;
-       u8 itr_setting = ring_container->itr;
-
-       if (packets == 0)
-               return;
-
-       /* simple throttlerate management
-        *    0-20MB/s lowest (100000 ints/s)
-        *   20-100MB/s low   (20000 ints/s)
-        *  100-1249MB/s bulk (8000 ints/s)
-        */
-       /* what was last interrupt timeslice? */
-       timepassed_us = 1000000/q_vector->eitr;
-       bytes_perint = bytes / timepassed_us; /* bytes/usec */
-
-       switch (itr_setting) {
-       case lowest_latency:
-               if (bytes_perint > adapter->eitr_low)
-                       itr_setting = low_latency;
-               break;
-       case low_latency:
-               if (bytes_perint > adapter->eitr_high)
-                       itr_setting = bulk_latency;
-               else if (bytes_perint <= adapter->eitr_low)
-                       itr_setting = lowest_latency;
-               break;
-       case bulk_latency:
-               if (bytes_perint <= adapter->eitr_high)
-                       itr_setting = low_latency;
-               break;
-       }
-
-       /* clear work counters since we have the values we need */
-       ring_container->total_bytes = 0;
-       ring_container->total_packets = 0;
-
-       /* write updated itr to ring container */
-       ring_container->itr = itr_setting;
-}
-
-/**
- * ixgbe_write_eitr - write EITR register in hardware specific way
- * @q_vector: structure containing interrupt and ring information
- *
- * This function is made to be called by ethtool and by the driver
- * when it needs to update EITR registers at runtime.  Hardware
- * specific quirks/differences are taken care of here.
- */
-void ixgbe_write_eitr(struct ixgbe_q_vector *q_vector)
-{
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       struct ixgbe_hw *hw = &adapter->hw;
-       int v_idx = q_vector->v_idx;
-       u32 itr_reg = EITR_INTS_PER_SEC_TO_REG(q_vector->eitr);
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82598EB:
-               /* must write high and low 16 bits to reset counter */
-               itr_reg |= (itr_reg << 16);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               /*
-                * 82599 and X540 can support a value of zero, so allow it for
-                * max interrupt rate, but there is an errata where it can
-                * not be zero with RSC
-                */
-               if (itr_reg == 8 &&
-                   !(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED))
-                       itr_reg = 0;
-
-               /*
-                * set the WDIS bit to not clear the timer bits and cause an
-                * immediate assertion of the interrupt
-                */
-               itr_reg |= IXGBE_EITR_CNT_WDIS;
-               break;
-       default:
-               break;
-       }
-       IXGBE_WRITE_REG(hw, IXGBE_EITR(v_idx), itr_reg);
-}
-
-static void ixgbe_set_itr(struct ixgbe_q_vector *q_vector)
-{
-       u32 new_itr = q_vector->eitr;
-       u8 current_itr;
-
-       ixgbe_update_itr(q_vector, &q_vector->tx);
-       ixgbe_update_itr(q_vector, &q_vector->rx);
-
-       current_itr = max(q_vector->rx.itr, q_vector->tx.itr);
-
-       switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
-       case lowest_latency:
-               new_itr = 100000;
-               break;
-       case low_latency:
-               new_itr = 20000; /* aka hwitr = ~200 */
-               break;
-       case bulk_latency:
-               new_itr = 8000;
-               break;
-       default:
-               break;
-       }
-
-       if (new_itr != q_vector->eitr) {
-               /* do an exponential smoothing */
-               new_itr = ((q_vector->eitr * 9) + new_itr)/10;
-
-               /* save the algorithm value here */
-               q_vector->eitr = new_itr;
-
-               ixgbe_write_eitr(q_vector);
-       }
-}
-
-/**
- * ixgbe_check_overtemp_subtask - check for over tempurature
- * @adapter: pointer to adapter
- **/
-static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 eicr = adapter->interrupt_event;
-
-       if (test_bit(__IXGBE_DOWN, &adapter->state))
-               return;
-
-       if (!(adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&
-           !(adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_EVENT))
-               return;
-
-       adapter->flags2 &= ~IXGBE_FLAG2_TEMP_SENSOR_EVENT;
-
-       switch (hw->device_id) {
-       case IXGBE_DEV_ID_82599_T3_LOM:
-               /*
-                * Since the warning interrupt is for both ports
-                * we don't have to check if:
-                *  - This interrupt wasn't for our port.
-                *  - We may have missed the interrupt so always have to
-                *    check if we  got a LSC
-                */
-               if (!(eicr & IXGBE_EICR_GPI_SDP0) &&
-                   !(eicr & IXGBE_EICR_LSC))
-                       return;
-
-               if (!(eicr & IXGBE_EICR_LSC) && hw->mac.ops.check_link) {
-                       u32 autoneg;
-                       bool link_up = false;
-
-                       hw->mac.ops.check_link(hw, &autoneg, &link_up, false);
-
-                       if (link_up)
-                               return;
-               }
-
-               /* Check if this is not due to overtemp */
-               if (hw->phy.ops.check_overtemp(hw) != IXGBE_ERR_OVERTEMP)
-                       return;
-
-               break;
-       default:
-               if (!(eicr & IXGBE_EICR_GPI_SDP0))
-                       return;
-               break;
-       }
-       e_crit(drv,
-              "Network adapter has been stopped because it has over heated. "
-              "Restart the computer. If the problem persists, "
-              "power off the system and replace the adapter\n");
-
-       adapter->interrupt_event = 0;
-}
-
-static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       if ((adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) &&
-           (eicr & IXGBE_EICR_GPI_SDP1)) {
-               e_crit(probe, "Fan has stopped, replace the adapter\n");
-               /* write to clear the interrupt */
-               IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1);
-       }
-}
-
-static void ixgbe_check_sfp_event(struct ixgbe_adapter *adapter, u32 eicr)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       if (eicr & IXGBE_EICR_GPI_SDP2) {
-               /* Clear the interrupt */
-               IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP2);
-               if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-                       adapter->flags2 |= IXGBE_FLAG2_SFP_NEEDS_RESET;
-                       ixgbe_service_event_schedule(adapter);
-               }
-       }
-
-       if (eicr & IXGBE_EICR_GPI_SDP1) {
-               /* Clear the interrupt */
-               IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1);
-               if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-                       adapter->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
-                       ixgbe_service_event_schedule(adapter);
-               }
-       }
-}
-
-static void ixgbe_check_lsc(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       adapter->lsc_int++;
-       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
-       adapter->link_check_timeout = jiffies;
-       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-               IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_LSC);
-               IXGBE_WRITE_FLUSH(hw);
-               ixgbe_service_event_schedule(adapter);
-       }
-}
-
-static irqreturn_t ixgbe_msix_lsc(int irq, void *data)
-{
-       struct ixgbe_adapter *adapter = data;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 eicr;
-
-       /*
-        * Workaround for Silicon errata.  Use clear-by-write instead
-        * of clear-by-read.  Reading with EICS will return the
-        * interrupt causes without clearing, which later be done
-        * with the write to EICR.
-        */
-       eicr = IXGBE_READ_REG(hw, IXGBE_EICS);
-       IXGBE_WRITE_REG(hw, IXGBE_EICR, eicr);
-
-       if (eicr & IXGBE_EICR_LSC)
-               ixgbe_check_lsc(adapter);
-
-       if (eicr & IXGBE_EICR_MAILBOX)
-               ixgbe_msg_task(adapter);
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               /* Handle Flow Director Full threshold interrupt */
-               if (eicr & IXGBE_EICR_FLOW_DIR) {
-                       int reinit_count = 0;
-                       int i;
-                       for (i = 0; i < adapter->num_tx_queues; i++) {
-                               struct ixgbe_ring *ring = adapter->tx_ring[i];
-                               if (test_and_clear_bit(__IXGBE_TX_FDIR_INIT_DONE,
-                                                      &ring->state))
-                                       reinit_count++;
-                       }
-                       if (reinit_count) {
-                               /* no more flow director interrupts until after init */
-                               IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_FLOW_DIR);
-                               eicr &= ~IXGBE_EICR_FLOW_DIR;
-                               adapter->flags2 |= IXGBE_FLAG2_FDIR_REQUIRES_REINIT;
-                               ixgbe_service_event_schedule(adapter);
-                       }
-               }
-               ixgbe_check_sfp_event(adapter, eicr);
-               if ((adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&
-                   ((eicr & IXGBE_EICR_GPI_SDP0) || (eicr & IXGBE_EICR_LSC))) {
-                       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-                               adapter->interrupt_event = eicr;
-                               adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_EVENT;
-                               ixgbe_service_event_schedule(adapter);
-                       }
-               }
-               break;
-       default:
-               break;
-       }
-
-       ixgbe_check_fan_failure(adapter, eicr);
-
-       /* re-enable the original interrupt state, no lsc, no queues */
-       if (!test_bit(__IXGBE_DOWN, &adapter->state))
-               IXGBE_WRITE_REG(hw, IXGBE_EIMS, eicr &
-                               ~(IXGBE_EIMS_LSC | IXGBE_EIMS_RTX_QUEUE));
-
-       return IRQ_HANDLED;
-}
-
-static inline void ixgbe_irq_enable_queues(struct ixgbe_adapter *adapter,
-                                          u64 qmask)
-{
-       u32 mask;
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               mask = (IXGBE_EIMS_RTX_QUEUE & qmask);
-               IXGBE_WRITE_REG(hw, IXGBE_EIMS, mask);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               mask = (qmask & 0xFFFFFFFF);
-               if (mask)
-                       IXGBE_WRITE_REG(hw, IXGBE_EIMS_EX(0), mask);
-               mask = (qmask >> 32);
-               if (mask)
-                       IXGBE_WRITE_REG(hw, IXGBE_EIMS_EX(1), mask);
-               break;
-       default:
-               break;
-       }
-       /* skip the flush */
-}
-
-static inline void ixgbe_irq_disable_queues(struct ixgbe_adapter *adapter,
-                                           u64 qmask)
-{
-       u32 mask;
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               mask = (IXGBE_EIMS_RTX_QUEUE & qmask);
-               IXGBE_WRITE_REG(hw, IXGBE_EIMC, mask);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               mask = (qmask & 0xFFFFFFFF);
-               if (mask)
-                       IXGBE_WRITE_REG(hw, IXGBE_EIMC_EX(0), mask);
-               mask = (qmask >> 32);
-               if (mask)
-                       IXGBE_WRITE_REG(hw, IXGBE_EIMC_EX(1), mask);
-               break;
-       default:
-               break;
-       }
-       /* skip the flush */
-}
-
-static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
-{
-       struct ixgbe_q_vector *q_vector = data;
-       struct ixgbe_adapter  *adapter = q_vector->adapter;
-       struct ixgbe_ring     *tx_ring;
-       int i, r_idx;
-
-       if (!q_vector->tx.count)
-               return IRQ_HANDLED;
-
-       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-       for (i = 0; i < q_vector->tx.count; i++) {
-               tx_ring = adapter->tx_ring[r_idx];
-               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                     r_idx + 1);
-       }
-
-       /* EIAM disabled interrupts (on this vector) for us */
-       napi_schedule(&q_vector->napi);
-
-       return IRQ_HANDLED;
-}
-
-/**
- * ixgbe_msix_clean_rx - single unshared vector rx clean (all queues)
- * @irq: unused
- * @data: pointer to our q_vector struct for this interrupt vector
- **/
-static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
-{
-       struct ixgbe_q_vector *q_vector = data;
-       struct ixgbe_adapter  *adapter = q_vector->adapter;
-       struct ixgbe_ring  *rx_ring;
-       int r_idx;
-       int i;
-
-#ifdef CONFIG_IXGBE_DCA
-       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-               ixgbe_update_dca(q_vector);
-#endif
-
-       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-       for (i = 0; i < q_vector->rx.count; i++) {
-               rx_ring = adapter->rx_ring[r_idx];
-               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                     r_idx + 1);
-       }
-
-       if (!q_vector->rx.count)
-               return IRQ_HANDLED;
-
-       /* EIAM disabled interrupts (on this vector) for us */
-       napi_schedule(&q_vector->napi);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t ixgbe_msix_clean_many(int irq, void *data)
-{
-       struct ixgbe_q_vector *q_vector = data;
-       struct ixgbe_adapter  *adapter = q_vector->adapter;
-       struct ixgbe_ring  *ring;
-       int r_idx;
-       int i;
-
-       if (!q_vector->tx.count && !q_vector->rx.count)
-               return IRQ_HANDLED;
-
-       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-       for (i = 0; i < q_vector->tx.count; i++) {
-               ring = adapter->tx_ring[r_idx];
-               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                     r_idx + 1);
-       }
-
-       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-       for (i = 0; i < q_vector->rx.count; i++) {
-               ring = adapter->rx_ring[r_idx];
-               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                     r_idx + 1);
-       }
-
-       /* EIAM disabled interrupts (on this vector) for us */
-       napi_schedule(&q_vector->napi);
-
-       return IRQ_HANDLED;
-}
-
-/**
- * ixgbe_clean_rxonly - msix (aka one shot) rx clean routine
- * @napi: napi struct with our devices info in it
- * @budget: amount of work driver is allowed to do this pass, in packets
- *
- * This function is optimized for cleaning one queue only on a single
- * q_vector!!!
- **/
-static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
-{
-       struct ixgbe_q_vector *q_vector =
-                              container_of(napi, struct ixgbe_q_vector, napi);
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       struct ixgbe_ring *rx_ring = NULL;
-       int work_done = 0;
-       long r_idx;
-
-#ifdef CONFIG_IXGBE_DCA
-       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-               ixgbe_update_dca(q_vector);
-#endif
-
-       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-       rx_ring = adapter->rx_ring[r_idx];
-
-       ixgbe_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
-
-       /* If all Rx work done, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               if (adapter->rx_itr_setting & 1)
-                       ixgbe_set_itr(q_vector);
-               if (!test_bit(__IXGBE_DOWN, &adapter->state))
-                       ixgbe_irq_enable_queues(adapter,
-                                               ((u64)1 << q_vector->v_idx));
-       }
-
-       return work_done;
-}
-
-/**
- * ixgbe_clean_rxtx_many - msix (aka one shot) rx clean routine
- * @napi: napi struct with our devices info in it
- * @budget: amount of work driver is allowed to do this pass, in packets
- *
- * This function will clean more than one rx queue associated with a
- * q_vector.
- **/
-static int ixgbe_clean_rxtx_many(struct napi_struct *napi, int budget)
-{
-       struct ixgbe_q_vector *q_vector =
-                              container_of(napi, struct ixgbe_q_vector, napi);
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       struct ixgbe_ring *ring = NULL;
-       int work_done = 0, i;
-       long r_idx;
-       bool tx_clean_complete = true;
-
-#ifdef CONFIG_IXGBE_DCA
-       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-               ixgbe_update_dca(q_vector);
-#endif
-
-       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-       for (i = 0; i < q_vector->tx.count; i++) {
-               ring = adapter->tx_ring[r_idx];
-               tx_clean_complete &= ixgbe_clean_tx_irq(q_vector, ring);
-               r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                     r_idx + 1);
-       }
-
-       /* attempt to distribute budget to each queue fairly, but don't allow
-        * the budget to go below 1 because we'll exit polling */
-       budget /= (q_vector->rx.count ?: 1);
-       budget = max(budget, 1);
-       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-       for (i = 0; i < q_vector->rx.count; i++) {
-               ring = adapter->rx_ring[r_idx];
-               ixgbe_clean_rx_irq(q_vector, ring, &work_done, budget);
-               r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                     r_idx + 1);
-       }
-
-       r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-       ring = adapter->rx_ring[r_idx];
-       /* If all Rx work done, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               if (adapter->rx_itr_setting & 1)
-                       ixgbe_set_itr(q_vector);
-               if (!test_bit(__IXGBE_DOWN, &adapter->state))
-                       ixgbe_irq_enable_queues(adapter,
-                                               ((u64)1 << q_vector->v_idx));
-               return 0;
-       }
-
-       return work_done;
-}
-
-/**
- * ixgbe_clean_txonly - msix (aka one shot) tx clean routine
- * @napi: napi struct with our devices info in it
- * @budget: amount of work driver is allowed to do this pass, in packets
- *
- * This function is optimized for cleaning one queue only on a single
- * q_vector!!!
- **/
-static int ixgbe_clean_txonly(struct napi_struct *napi, int budget)
-{
-       struct ixgbe_q_vector *q_vector =
-                              container_of(napi, struct ixgbe_q_vector, napi);
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       struct ixgbe_ring *tx_ring = NULL;
-       int work_done = 0;
-       long r_idx;
-
-#ifdef CONFIG_IXGBE_DCA
-       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-               ixgbe_update_dca(q_vector);
-#endif
-
-       r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-       tx_ring = adapter->tx_ring[r_idx];
-
-       if (!ixgbe_clean_tx_irq(q_vector, tx_ring))
-               work_done = budget;
-
-       /* If all Tx work done, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               if (adapter->tx_itr_setting & 1)
-                       ixgbe_set_itr(q_vector);
-               if (!test_bit(__IXGBE_DOWN, &adapter->state))
-                       ixgbe_irq_enable_queues(adapter,
-                                               ((u64)1 << q_vector->v_idx));
-       }
-
-       return work_done;
-}
-
-static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,
-                                    int r_idx)
-{
-       struct ixgbe_q_vector *q_vector = a->q_vector[v_idx];
-       struct ixgbe_ring *rx_ring = a->rx_ring[r_idx];
-
-       set_bit(r_idx, q_vector->rx.idx);
-       q_vector->rx.count++;
-       rx_ring->q_vector = q_vector;
-}
-
-static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,
-                                    int t_idx)
-{
-       struct ixgbe_q_vector *q_vector = a->q_vector[v_idx];
-       struct ixgbe_ring *tx_ring = a->tx_ring[t_idx];
-
-       set_bit(t_idx, q_vector->tx.idx);
-       q_vector->tx.count++;
-       tx_ring->q_vector = q_vector;
-       q_vector->tx.work_limit = a->tx_work_limit;
-}
-
-/**
- * ixgbe_map_rings_to_vectors - Maps descriptor rings to vectors
- * @adapter: board private structure to initialize
- *
- * This function maps descriptor rings to the queue-specific vectors
- * we were allotted through the MSI-X enabling code.  Ideally, we'd have
- * one vector per ring/queue, but on a constrained vector budget, we
- * group the rings as "efficiently" as possible.  You would add new
- * mapping configurations in here.
- **/
-static int ixgbe_map_rings_to_vectors(struct ixgbe_adapter *adapter)
-{
-       int q_vectors;
-       int v_start = 0;
-       int rxr_idx = 0, txr_idx = 0;
-       int rxr_remaining = adapter->num_rx_queues;
-       int txr_remaining = adapter->num_tx_queues;
-       int i, j;
-       int rqpv, tqpv;
-       int err = 0;
-
-       /* No mapping required if MSI-X is disabled. */
-       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
-               goto out;
-
-       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       /*
-        * The ideal configuration...
-        * We have enough vectors to map one per queue.
-        */
-       if (q_vectors == adapter->num_rx_queues + adapter->num_tx_queues) {
-               for (; rxr_idx < rxr_remaining; v_start++, rxr_idx++)
-                       map_vector_to_rxq(adapter, v_start, rxr_idx);
-
-               for (; txr_idx < txr_remaining; v_start++, txr_idx++)
-                       map_vector_to_txq(adapter, v_start, txr_idx);
-
-               goto out;
-       }
-
-       /*
-        * If we don't have enough vectors for a 1-to-1
-        * mapping, we'll have to group them so there are
-        * multiple queues per vector.
-        */
-       /* Re-adjusting *qpv takes care of the remainder. */
-       for (i = v_start; i < q_vectors; i++) {
-               rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors - i);
-               for (j = 0; j < rqpv; j++) {
-                       map_vector_to_rxq(adapter, i, rxr_idx);
-                       rxr_idx++;
-                       rxr_remaining--;
-               }
-               tqpv = DIV_ROUND_UP(txr_remaining, q_vectors - i);
-               for (j = 0; j < tqpv; j++) {
-                       map_vector_to_txq(adapter, i, txr_idx);
-                       txr_idx++;
-                       txr_remaining--;
-               }
-       }
-out:
-       return err;
-}
-
-/**
- * ixgbe_request_msix_irqs - Initialize MSI-X interrupts
- * @adapter: board private structure
- *
- * ixgbe_request_msix_irqs allocates MSI-X vectors and requests
- * interrupts from the kernel.
- **/
-static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       irqreturn_t (*handler)(int, void *);
-       int i, vector, q_vectors, err;
-       int ri = 0, ti = 0;
-
-       /* Decrement for Other and TCP Timer vectors */
-       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       err = ixgbe_map_rings_to_vectors(adapter);
-       if (err)
-               return err;
-
-#define SET_HANDLER(_v) (((_v)->rx.count && (_v)->tx.count)        \
-                                         ? &ixgbe_msix_clean_many : \
-                         (_v)->rx.count ? &ixgbe_msix_clean_rx   : \
-                         (_v)->tx.count ? &ixgbe_msix_clean_tx   : \
-                         NULL)
-       for (vector = 0; vector < q_vectors; vector++) {
-               struct ixgbe_q_vector *q_vector = adapter->q_vector[vector];
-               handler = SET_HANDLER(q_vector);
-
-               if (handler == &ixgbe_msix_clean_rx) {
-                       snprintf(q_vector->name, sizeof(q_vector->name) - 1,
-                                "%s-%s-%d", netdev->name, "rx", ri++);
-               } else if (handler == &ixgbe_msix_clean_tx) {
-                       snprintf(q_vector->name, sizeof(q_vector->name) - 1,
-                                "%s-%s-%d", netdev->name, "tx", ti++);
-               } else if (handler == &ixgbe_msix_clean_many) {
-                       snprintf(q_vector->name, sizeof(q_vector->name) - 1,
-                                "%s-%s-%d", netdev->name, "TxRx", ri++);
-                       ti++;
-               } else {
-                       /* skip this unused q_vector */
-                       continue;
-               }
-               err = request_irq(adapter->msix_entries[vector].vector,
-                                 handler, 0, q_vector->name,
-                                 q_vector);
-               if (err) {
-                       e_err(probe, "request_irq failed for MSIX interrupt "
-                             "Error: %d\n", err);
-                       goto free_queue_irqs;
-               }
-       }
-
-       sprintf(adapter->lsc_int_name, "%s:lsc", netdev->name);
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         ixgbe_msix_lsc, 0, adapter->lsc_int_name, adapter);
-       if (err) {
-               e_err(probe, "request_irq for msix_lsc failed: %d\n", err);
-               goto free_queue_irqs;
-       }
-
-       return 0;
-
-free_queue_irqs:
-       for (i = vector - 1; i >= 0; i--)
-               free_irq(adapter->msix_entries[--vector].vector,
-                        adapter->q_vector[i]);
-       adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
-       pci_disable_msix(adapter->pdev);
-       kfree(adapter->msix_entries);
-       adapter->msix_entries = NULL;
-       return err;
-}
-
-/**
- * ixgbe_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- **/
-static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues,
-                                   bool flush)
-{
-       u32 mask;
-
-       mask = (IXGBE_EIMS_ENABLE_MASK & ~IXGBE_EIMS_RTX_QUEUE);
-       if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)
-               mask |= IXGBE_EIMS_GPI_SDP0;
-       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)
-               mask |= IXGBE_EIMS_GPI_SDP1;
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               mask |= IXGBE_EIMS_ECC;
-               mask |= IXGBE_EIMS_GPI_SDP1;
-               mask |= IXGBE_EIMS_GPI_SDP2;
-               if (adapter->num_vfs)
-                       mask |= IXGBE_EIMS_MAILBOX;
-               break;
-       default:
-               break;
-       }
-       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)
-               mask |= IXGBE_EIMS_FLOW_DIR;
-
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);
-       if (queues)
-               ixgbe_irq_enable_queues(adapter, ~0);
-       if (flush)
-               IXGBE_WRITE_FLUSH(&adapter->hw);
-
-       if (adapter->num_vfs > 32) {
-               u32 eitrsel = (1 << (adapter->num_vfs - 32)) - 1;
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITRSEL, eitrsel);
-       }
-}
-
-/**
- * ixgbe_intr - legacy mode Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-static irqreturn_t ixgbe_intr(int irq, void *data)
-{
-       struct ixgbe_adapter *adapter = data;
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbe_q_vector *q_vector = adapter->q_vector[0];
-       u32 eicr;
-
-       /*
-        * Workaround for silicon errata on 82598.  Mask the interrupts
-        * before the read of EICR.
-        */
-       IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_IRQ_CLEAR_MASK);
-
-       /* for NAPI, using EIAM to auto-mask tx/rx interrupt bits on read
-        * therefore no explict interrupt disable is necessary */
-       eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
-       if (!eicr) {
-               /*
-                * shared interrupt alert!
-                * make sure interrupts are enabled because the read will
-                * have disabled interrupts due to EIAM
-                * finish the workaround of silicon errata on 82598.  Unmask
-                * the interrupt that we masked before the EICR read.
-                */
-               if (!test_bit(__IXGBE_DOWN, &adapter->state))
-                       ixgbe_irq_enable(adapter, true, true);
-               return IRQ_NONE;        /* Not our interrupt */
-       }
-
-       if (eicr & IXGBE_EICR_LSC)
-               ixgbe_check_lsc(adapter);
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82599EB:
-               ixgbe_check_sfp_event(adapter, eicr);
-               if ((adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&
-                   ((eicr & IXGBE_EICR_GPI_SDP0) || (eicr & IXGBE_EICR_LSC))) {
-                       if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-                               adapter->interrupt_event = eicr;
-                               adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_EVENT;
-                               ixgbe_service_event_schedule(adapter);
-                       }
-               }
-               break;
-       default:
-               break;
-       }
-
-       ixgbe_check_fan_failure(adapter, eicr);
-
-       if (napi_schedule_prep(&(q_vector->napi))) {
-               /* would disable interrupts here but EIAM disabled it */
-               __napi_schedule(&(q_vector->napi));
-       }
-
-       /*
-        * re-enable link(maybe) and non-queue interrupts, no flush.
-        * ixgbe_poll will re-enable the queue interrupts
-        */
-
-       if (!test_bit(__IXGBE_DOWN, &adapter->state))
-               ixgbe_irq_enable(adapter, false, false);
-
-       return IRQ_HANDLED;
-}
-
-static inline void ixgbe_reset_q_vectors(struct ixgbe_adapter *adapter)
-{
-       int i, q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       for (i = 0; i < q_vectors; i++) {
-               struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
-               bitmap_zero(q_vector->rx.idx, MAX_RX_QUEUES);
-               bitmap_zero(q_vector->tx.idx, MAX_TX_QUEUES);
-               q_vector->rx.count = 0;
-               q_vector->tx.count = 0;
-       }
-}
-
-/**
- * ixgbe_request_irq - initialize interrupts
- * @adapter: board private structure
- *
- * Attempts to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-static int ixgbe_request_irq(struct ixgbe_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int err;
-
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-               err = ixgbe_request_msix_irqs(adapter);
-       } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
-               err = request_irq(adapter->pdev->irq, ixgbe_intr, 0,
-                                 netdev->name, adapter);
-       } else {
-               err = request_irq(adapter->pdev->irq, ixgbe_intr, IRQF_SHARED,
-                                 netdev->name, adapter);
-       }
-
-       if (err)
-               e_err(probe, "request_irq failed, Error %d\n", err);
-
-       return err;
-}
-
-static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
-{
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-               int i, q_vectors;
-
-               q_vectors = adapter->num_msix_vectors;
-
-               i = q_vectors - 1;
-               free_irq(adapter->msix_entries[i].vector, adapter);
-
-               i--;
-               for (; i >= 0; i--) {
-                       /* free only the irqs that were actually requested */
-                       if (!adapter->q_vector[i]->rx.count &&
-                           !adapter->q_vector[i]->tx.count)
-                               continue;
-
-                       free_irq(adapter->msix_entries[i].vector,
-                                adapter->q_vector[i]);
-               }
-
-               ixgbe_reset_q_vectors(adapter);
-       } else {
-               free_irq(adapter->pdev->irq, adapter);
-       }
-}
-
-/**
- * ixgbe_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- **/
-static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
-{
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82598EB:
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFF0000);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(0), ~0);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(1), ~0);
-               if (adapter->num_vfs > 32)
-                       IXGBE_WRITE_REG(&adapter->hw, IXGBE_EITRSEL, 0);
-               break;
-       default:
-               break;
-       }
-       IXGBE_WRITE_FLUSH(&adapter->hw);
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-               int i;
-               for (i = 0; i < adapter->num_msix_vectors; i++)
-                       synchronize_irq(adapter->msix_entries[i].vector);
-       } else {
-               synchronize_irq(adapter->pdev->irq);
-       }
-}
-
-/**
- * ixgbe_configure_msi_and_legacy - Initialize PIN (INTA...) and MSI interrupts
- *
- **/
-static void ixgbe_configure_msi_and_legacy(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       IXGBE_WRITE_REG(hw, IXGBE_EITR(0),
-                       EITR_INTS_PER_SEC_TO_REG(adapter->rx_eitr_param));
-
-       ixgbe_set_ivar(adapter, 0, 0, 0);
-       ixgbe_set_ivar(adapter, 1, 0, 0);
-
-       map_vector_to_rxq(adapter, 0, 0);
-       map_vector_to_txq(adapter, 0, 0);
-
-       e_info(hw, "Legacy interrupt IVAR setup done\n");
-}
-
-/**
- * ixgbe_configure_tx_ring - Configure 8259x Tx ring after Reset
- * @adapter: board private structure
- * @ring: structure containing ring specific data
- *
- * Configure the Tx descriptor ring after a reset.
- **/
-void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
-                            struct ixgbe_ring *ring)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u64 tdba = ring->dma;
-       int wait_loop = 10;
-       u32 txdctl;
-       u8 reg_idx = ring->reg_idx;
-
-       /* disable queue to avoid issues while updating state */
-       txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));
-       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx),
-                       txdctl & ~IXGBE_TXDCTL_ENABLE);
-       IXGBE_WRITE_FLUSH(hw);
-
-       IXGBE_WRITE_REG(hw, IXGBE_TDBAL(reg_idx),
-                       (tdba & DMA_BIT_MASK(32)));
-       IXGBE_WRITE_REG(hw, IXGBE_TDBAH(reg_idx), (tdba >> 32));
-       IXGBE_WRITE_REG(hw, IXGBE_TDLEN(reg_idx),
-                       ring->count * sizeof(union ixgbe_adv_tx_desc));
-       IXGBE_WRITE_REG(hw, IXGBE_TDH(reg_idx), 0);
-       IXGBE_WRITE_REG(hw, IXGBE_TDT(reg_idx), 0);
-       ring->tail = hw->hw_addr + IXGBE_TDT(reg_idx);
-
-       /* configure fetching thresholds */
-       if (adapter->rx_itr_setting == 0) {
-               /* cannot set wthresh when itr==0 */
-               txdctl &= ~0x007F0000;
-       } else {
-               /* enable WTHRESH=8 descriptors, to encourage burst writeback */
-               txdctl |= (8 << 16);
-       }
-       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-               /* PThresh workaround for Tx hang with DFP enabled. */
-               txdctl |= 32;
-       }
-
-       /* reinitialize flowdirector state */
-       if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) &&
-           adapter->atr_sample_rate) {
-               ring->atr_sample_rate = adapter->atr_sample_rate;
-               ring->atr_count = 0;
-               set_bit(__IXGBE_TX_FDIR_INIT_DONE, &ring->state);
-       } else {
-               ring->atr_sample_rate = 0;
-       }
-
-       clear_bit(__IXGBE_HANG_CHECK_ARMED, &ring->state);
-
-       /* enable queue */
-       txdctl |= IXGBE_TXDCTL_ENABLE;
-       IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), txdctl);
-
-       /* TXDCTL.EN will return 0 on 82598 if link is down, so skip it */
-       if (hw->mac.type == ixgbe_mac_82598EB &&
-           !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
-               return;
-
-       /* poll to verify queue is enabled */
-       do {
-               usleep_range(1000, 2000);
-               txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));
-       } while (--wait_loop && !(txdctl & IXGBE_TXDCTL_ENABLE));
-       if (!wait_loop)
-               e_err(drv, "Could not enable Tx Queue %d\n", reg_idx);
-}
-
-static void ixgbe_setup_mtqc(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 rttdcs;
-       u32 reg;
-       u8 tcs = netdev_get_num_tc(adapter->netdev);
-
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               return;
-
-       /* disable the arbiter while setting MTQC */
-       rttdcs = IXGBE_READ_REG(hw, IXGBE_RTTDCS);
-       rttdcs |= IXGBE_RTTDCS_ARBDIS;
-       IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
-
-       /* set transmit pool layout */
-       switch (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
-       case (IXGBE_FLAG_SRIOV_ENABLED):
-               IXGBE_WRITE_REG(hw, IXGBE_MTQC,
-                               (IXGBE_MTQC_VT_ENA | IXGBE_MTQC_64VF));
-               break;
-       default:
-               if (!tcs)
-                       reg = IXGBE_MTQC_64Q_1PB;
-               else if (tcs <= 4)
-                       reg = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ;
-               else
-                       reg = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_8TC_8TQ;
-
-               IXGBE_WRITE_REG(hw, IXGBE_MTQC, reg);
-
-               /* Enable Security TX Buffer IFG for multiple pb */
-               if (tcs) {
-                       reg = IXGBE_READ_REG(hw, IXGBE_SECTXMINIFG);
-                       reg |= IXGBE_SECTX_DCB;
-                       IXGBE_WRITE_REG(hw, IXGBE_SECTXMINIFG, reg);
-               }
-               break;
-       }
-
-       /* re-enable the arbiter */
-       rttdcs &= ~IXGBE_RTTDCS_ARBDIS;
-       IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
-}
-
-/**
- * ixgbe_configure_tx - Configure 8259x Transmit Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-static void ixgbe_configure_tx(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 dmatxctl;
-       u32 i;
-
-       ixgbe_setup_mtqc(adapter);
-
-       if (hw->mac.type != ixgbe_mac_82598EB) {
-               /* DMATXCTL.EN must be before Tx queues are enabled */
-               dmatxctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);
-               dmatxctl |= IXGBE_DMATXCTL_TE;
-               IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, dmatxctl);
-       }
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               ixgbe_configure_tx_ring(adapter, adapter->tx_ring[i]);
-}
-
-#define IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT 2
-
-static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter,
-                                  struct ixgbe_ring *rx_ring)
-{
-       u32 srrctl;
-       u8 reg_idx = rx_ring->reg_idx;
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82598EB: {
-               struct ixgbe_ring_feature *feature = adapter->ring_feature;
-               const int mask = feature[RING_F_RSS].mask;
-               reg_idx = reg_idx & mask;
-       }
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-       default:
-               break;
-       }
-
-       srrctl = IXGBE_READ_REG(&adapter->hw, IXGBE_SRRCTL(reg_idx));
-
-       srrctl &= ~IXGBE_SRRCTL_BSIZEHDR_MASK;
-       srrctl &= ~IXGBE_SRRCTL_BSIZEPKT_MASK;
-       if (adapter->num_vfs)
-               srrctl |= IXGBE_SRRCTL_DROP_EN;
-
-       srrctl |= (IXGBE_RX_HDR_SIZE << IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) &
-                 IXGBE_SRRCTL_BSIZEHDR_MASK;
-
-       if (ring_is_ps_enabled(rx_ring)) {
-#if (PAGE_SIZE / 2) > IXGBE_MAX_RXBUFFER
-               srrctl |= IXGBE_MAX_RXBUFFER >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
-#else
-               srrctl |= (PAGE_SIZE / 2) >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
-#endif
-               srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
-       } else {
-               srrctl |= ALIGN(rx_ring->rx_buf_len, 1024) >>
-                         IXGBE_SRRCTL_BSIZEPKT_SHIFT;
-               srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF;
-       }
-
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_SRRCTL(reg_idx), srrctl);
-}
-
-static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       static const u32 seed[10] = { 0xE291D73D, 0x1805EC6C, 0x2A94B30D,
-                         0xA54F2BEC, 0xEA49AF7C, 0xE214AD3D, 0xB855AABE,
-                         0x6A3E67EA, 0x14364D17, 0x3BED200D};
-       u32 mrqc = 0, reta = 0;
-       u32 rxcsum;
-       int i, j;
-       u8 tcs = netdev_get_num_tc(adapter->netdev);
-       int maxq = adapter->ring_feature[RING_F_RSS].indices;
-
-       if (tcs)
-               maxq = min(maxq, adapter->num_tx_queues / tcs);
-
-       /* Fill out hash function seeds */
-       for (i = 0; i < 10; i++)
-               IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), seed[i]);
-
-       /* Fill out redirection table */
-       for (i = 0, j = 0; i < 128; i++, j++) {
-               if (j == maxq)
-                       j = 0;
-               /* reta = 4-byte sliding window of
-                * 0x00..(indices-1)(indices-1)00..etc. */
-               reta = (reta << 8) | (j * 0x11);
-               if ((i & 3) == 3)
-                       IXGBE_WRITE_REG(hw, IXGBE_RETA(i >> 2), reta);
-       }
-
-       /* Disable indicating checksum in descriptor, enables RSS hash */
-       rxcsum = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
-       rxcsum |= IXGBE_RXCSUM_PCSD;
-       IXGBE_WRITE_REG(hw, IXGBE_RXCSUM, rxcsum);
-
-       if (adapter->hw.mac.type == ixgbe_mac_82598EB &&
-           (adapter->flags & IXGBE_FLAG_RSS_ENABLED)) {
-               mrqc = IXGBE_MRQC_RSSEN;
-       } else {
-               int mask = adapter->flags & (IXGBE_FLAG_RSS_ENABLED
-                                            | IXGBE_FLAG_SRIOV_ENABLED);
-
-               switch (mask) {
-               case (IXGBE_FLAG_RSS_ENABLED):
-                       if (!tcs)
-                               mrqc = IXGBE_MRQC_RSSEN;
-                       else if (tcs <= 4)
-                               mrqc = IXGBE_MRQC_RTRSS4TCEN;
-                       else
-                               mrqc = IXGBE_MRQC_RTRSS8TCEN;
-                       break;
-               case (IXGBE_FLAG_SRIOV_ENABLED):
-                       mrqc = IXGBE_MRQC_VMDQEN;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       /* Perform hash on these packet types */
-       mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4
-             | IXGBE_MRQC_RSS_FIELD_IPV4_TCP
-             | IXGBE_MRQC_RSS_FIELD_IPV6
-             | IXGBE_MRQC_RSS_FIELD_IPV6_TCP;
-
-       IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);
-}
-
-/**
- * ixgbe_configure_rscctl - enable RSC for the indicated ring
- * @adapter:    address of board private structure
- * @index:      index of ring to set
- **/
-static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,
-                                  struct ixgbe_ring *ring)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 rscctrl;
-       int rx_buf_len;
-       u8 reg_idx = ring->reg_idx;
-
-       if (!ring_is_rsc_enabled(ring))
-               return;
-
-       rx_buf_len = ring->rx_buf_len;
-       rscctrl = IXGBE_READ_REG(hw, IXGBE_RSCCTL(reg_idx));
-       rscctrl |= IXGBE_RSCCTL_RSCEN;
-       /*
-        * we must limit the number of descriptors so that the
-        * total size of max desc * buf_len is not greater
-        * than 65535
-        */
-       if (ring_is_ps_enabled(ring)) {
-#if (MAX_SKB_FRAGS > 16)
-               rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
-#elif (MAX_SKB_FRAGS > 8)
-               rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
-#elif (MAX_SKB_FRAGS > 4)
-               rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
-#else
-               rscctrl |= IXGBE_RSCCTL_MAXDESC_1;
-#endif
-       } else {
-               if (rx_buf_len < IXGBE_RXBUFFER_4096)
-                       rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
-               else if (rx_buf_len < IXGBE_RXBUFFER_8192)
-                       rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
-               else
-                       rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
-       }
-       IXGBE_WRITE_REG(hw, IXGBE_RSCCTL(reg_idx), rscctrl);
-}
-
-/**
- *  ixgbe_set_uta - Set unicast filter table address
- *  @adapter: board private structure
- *
- *  The unicast table address is a register array of 32-bit registers.
- *  The table is meant to be used in a way similar to how the MTA is used
- *  however due to certain limitations in the hardware it is necessary to
- *  set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscuous
- *  enable bit to allow vlan tag stripping when promiscuous mode is enabled
- **/
-static void ixgbe_set_uta(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int i;
-
-       /* The UTA table only exists on 82599 hardware and newer */
-       if (hw->mac.type < ixgbe_mac_82599EB)
-               return;
-
-       /* we only need to do this if VMDq is enabled */
-       if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))
-               return;
-
-       for (i = 0; i < 128; i++)
-               IXGBE_WRITE_REG(hw, IXGBE_UTA(i), ~0);
-}
-
-#define IXGBE_MAX_RX_DESC_POLL 10
-static void ixgbe_rx_desc_queue_enable(struct ixgbe_adapter *adapter,
-                                      struct ixgbe_ring *ring)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int wait_loop = IXGBE_MAX_RX_DESC_POLL;
-       u32 rxdctl;
-       u8 reg_idx = ring->reg_idx;
-
-       /* RXDCTL.EN will return 0 on 82598 if link is down, so skip it */
-       if (hw->mac.type == ixgbe_mac_82598EB &&
-           !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
-               return;
-
-       do {
-               usleep_range(1000, 2000);
-               rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
-       } while (--wait_loop && !(rxdctl & IXGBE_RXDCTL_ENABLE));
-
-       if (!wait_loop) {
-               e_err(drv, "RXDCTL.ENABLE on Rx queue %d not set within "
-                     "the polling period\n", reg_idx);
-       }
-}
-
-void ixgbe_disable_rx_queue(struct ixgbe_adapter *adapter,
-                           struct ixgbe_ring *ring)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int wait_loop = IXGBE_MAX_RX_DESC_POLL;
-       u32 rxdctl;
-       u8 reg_idx = ring->reg_idx;
-
-       rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
-       rxdctl &= ~IXGBE_RXDCTL_ENABLE;
-
-       /* write value back with RXDCTL.ENABLE bit cleared */
-       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(reg_idx), rxdctl);
-
-       if (hw->mac.type == ixgbe_mac_82598EB &&
-           !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
-               return;
-
-       /* the hardware may take up to 100us to really disable the rx queue */
-       do {
-               udelay(10);
-               rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
-       } while (--wait_loop && (rxdctl & IXGBE_RXDCTL_ENABLE));
-
-       if (!wait_loop) {
-               e_err(drv, "RXDCTL.ENABLE on Rx queue %d not cleared within "
-                     "the polling period\n", reg_idx);
-       }
-}
-
-void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,
-                            struct ixgbe_ring *ring)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u64 rdba = ring->dma;
-       u32 rxdctl;
-       u8 reg_idx = ring->reg_idx;
-
-       /* disable queue to avoid issues while updating state */
-       rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
-       ixgbe_disable_rx_queue(adapter, ring);
-
-       IXGBE_WRITE_REG(hw, IXGBE_RDBAL(reg_idx), (rdba & DMA_BIT_MASK(32)));
-       IXGBE_WRITE_REG(hw, IXGBE_RDBAH(reg_idx), (rdba >> 32));
-       IXGBE_WRITE_REG(hw, IXGBE_RDLEN(reg_idx),
-                       ring->count * sizeof(union ixgbe_adv_rx_desc));
-       IXGBE_WRITE_REG(hw, IXGBE_RDH(reg_idx), 0);
-       IXGBE_WRITE_REG(hw, IXGBE_RDT(reg_idx), 0);
-       ring->tail = hw->hw_addr + IXGBE_RDT(reg_idx);
-
-       ixgbe_configure_srrctl(adapter, ring);
-       ixgbe_configure_rscctl(adapter, ring);
-
-       /* If operating in IOV mode set RLPML for X540 */
-       if ((adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) &&
-           hw->mac.type == ixgbe_mac_X540) {
-               rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
-               rxdctl |= ((ring->netdev->mtu + ETH_HLEN +
-                           ETH_FCS_LEN + VLAN_HLEN) | IXGBE_RXDCTL_RLPML_EN);
-       }
-
-       if (hw->mac.type == ixgbe_mac_82598EB) {
-               /*
-                * enable cache line friendly hardware writes:
-                * PTHRESH=32 descriptors (half the internal cache),
-                * this also removes ugly rx_no_buffer_count increment
-                * HTHRESH=4 descriptors (to minimize latency on fetch)
-                * WTHRESH=8 burst writeback up to two cache lines
-                */
-               rxdctl &= ~0x3FFFFF;
-               rxdctl |=  0x080420;
-       }
-
-       /* enable receive descriptor ring */
-       rxdctl |= IXGBE_RXDCTL_ENABLE;
-       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(reg_idx), rxdctl);
-
-       ixgbe_rx_desc_queue_enable(adapter, ring);
-       ixgbe_alloc_rx_buffers(ring, ixgbe_desc_unused(ring));
-}
-
-static void ixgbe_setup_psrtype(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int p;
-
-       /* PSRTYPE must be initialized in non 82598 adapters */
-       u32 psrtype = IXGBE_PSRTYPE_TCPHDR |
-                     IXGBE_PSRTYPE_UDPHDR |
-                     IXGBE_PSRTYPE_IPV4HDR |
-                     IXGBE_PSRTYPE_L2HDR |
-                     IXGBE_PSRTYPE_IPV6HDR;
-
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               return;
-
-       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED)
-               psrtype |= (adapter->num_rx_queues_per_pool << 29);
-
-       for (p = 0; p < adapter->num_rx_pools; p++)
-               IXGBE_WRITE_REG(hw, IXGBE_PSRTYPE(adapter->num_vfs + p),
-                               psrtype);
-}
-
-static void ixgbe_configure_virtualization(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 gcr_ext;
-       u32 vt_reg_bits;
-       u32 reg_offset, vf_shift;
-       u32 vmdctl;
-
-       if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))
-               return;
-
-       vmdctl = IXGBE_READ_REG(hw, IXGBE_VT_CTL);
-       vt_reg_bits = IXGBE_VMD_CTL_VMDQ_EN | IXGBE_VT_CTL_REPLEN;
-       vt_reg_bits |= (adapter->num_vfs << IXGBE_VT_CTL_POOL_SHIFT);
-       IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vmdctl | vt_reg_bits);
-
-       vf_shift = adapter->num_vfs % 32;
-       reg_offset = (adapter->num_vfs > 32) ? 1 : 0;
-
-       /* Enable only the PF's pool for Tx/Rx */
-       IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), (1 << vf_shift));
-       IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset ^ 1), 0);
-       IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), (1 << vf_shift));
-       IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset ^ 1), 0);
-       IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);
-
-       /* Map PF MAC address in RAR Entry 0 to first pool following VFs */
-       hw->mac.ops.set_vmdq(hw, 0, adapter->num_vfs);
-
-       /*
-        * Set up VF register offsets for selected VT Mode,
-        * i.e. 32 or 64 VFs for SR-IOV
-        */
-       gcr_ext = IXGBE_READ_REG(hw, IXGBE_GCR_EXT);
-       gcr_ext |= IXGBE_GCR_EXT_MSIX_EN;
-       gcr_ext |= IXGBE_GCR_EXT_VT_MODE_64;
-       IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);
-
-       /* enable Tx loopback for VF/PF communication */
-       IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);
-       /* Enable MAC Anti-Spoofing */
-       hw->mac.ops.set_mac_anti_spoofing(hw,
-                                         (adapter->antispoofing_enabled =
-                                          (adapter->num_vfs != 0)),
-                                         adapter->num_vfs);
-}
-
-static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-       int rx_buf_len;
-       struct ixgbe_ring *rx_ring;
-       int i;
-       u32 mhadd, hlreg0;
-
-       /* Decide whether to use packet split mode or not */
-       /* On by default */
-       adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
-
-       /* Do not use packet split if we're in SR-IOV Mode */
-       if (adapter->num_vfs)
-               adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
-
-       /* Disable packet split due to 82599 erratum #45 */
-       if (hw->mac.type == ixgbe_mac_82599EB)
-               adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
-
-       /* Set the RX buffer length according to the mode */
-       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
-               rx_buf_len = IXGBE_RX_HDR_SIZE;
-       } else {
-               if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) &&
-                   (netdev->mtu <= ETH_DATA_LEN))
-                       rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-               else
-                       rx_buf_len = ALIGN(max_frame + VLAN_HLEN, 1024);
-       }
-
-#ifdef IXGBE_FCOE
-       /* adjust max frame to be able to do baby jumbo for FCoE */
-       if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
-           (max_frame < IXGBE_FCOE_JUMBO_FRAME_SIZE))
-               max_frame = IXGBE_FCOE_JUMBO_FRAME_SIZE;
-
-#endif /* IXGBE_FCOE */
-       mhadd = IXGBE_READ_REG(hw, IXGBE_MHADD);
-       if (max_frame != (mhadd >> IXGBE_MHADD_MFS_SHIFT)) {
-               mhadd &= ~IXGBE_MHADD_MFS_MASK;
-               mhadd |= max_frame << IXGBE_MHADD_MFS_SHIFT;
-
-               IXGBE_WRITE_REG(hw, IXGBE_MHADD, mhadd);
-       }
-
-       hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
-       /* set jumbo enable since MHADD.MFS is keeping size locked at max_frame */
-       hlreg0 |= IXGBE_HLREG0_JUMBOEN;
-       IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
-
-       /*
-        * Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring
-        */
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               rx_ring = adapter->rx_ring[i];
-               rx_ring->rx_buf_len = rx_buf_len;
-
-               if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED)
-                       set_ring_ps_enabled(rx_ring);
-               else
-                       clear_ring_ps_enabled(rx_ring);
-
-               if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)
-                       set_ring_rsc_enabled(rx_ring);
-               else
-                       clear_ring_rsc_enabled(rx_ring);
-
-#ifdef IXGBE_FCOE
-               if (netdev->features & NETIF_F_FCOE_MTU) {
-                       struct ixgbe_ring_feature *f;
-                       f = &adapter->ring_feature[RING_F_FCOE];
-                       if ((i >= f->mask) && (i < f->mask + f->indices)) {
-                               clear_ring_ps_enabled(rx_ring);
-                               if (rx_buf_len < IXGBE_FCOE_JUMBO_FRAME_SIZE)
-                                       rx_ring->rx_buf_len =
-                                               IXGBE_FCOE_JUMBO_FRAME_SIZE;
-                       } else if (!ring_is_rsc_enabled(rx_ring) &&
-                                  !ring_is_ps_enabled(rx_ring)) {
-                               rx_ring->rx_buf_len =
-                                               IXGBE_FCOE_JUMBO_FRAME_SIZE;
-                       }
-               }
-#endif /* IXGBE_FCOE */
-       }
-}
-
-static void ixgbe_setup_rdrxctl(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 rdrxctl = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               /*
-                * For VMDq support of different descriptor types or
-                * buffer sizes through the use of multiple SRRCTL
-                * registers, RDRXCTL.MVMEN must be set to 1
-                *
-                * also, the manual doesn't mention it clearly but DCA hints
-                * will only use queue 0's tags unless this bit is set.  Side
-                * effects of setting this bit are only that SRRCTL must be
-                * fully programmed [0..15]
-                */
-               rdrxctl |= IXGBE_RDRXCTL_MVMEN;
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               /* Disable RSC for ACK packets */
-               IXGBE_WRITE_REG(hw, IXGBE_RSCDBU,
-                  (IXGBE_RSCDBU_RSCACKDIS | IXGBE_READ_REG(hw, IXGBE_RSCDBU)));
-               rdrxctl &= ~IXGBE_RDRXCTL_RSCFRSTSIZE;
-               /* hardware requires some bits to be set by default */
-               rdrxctl |= (IXGBE_RDRXCTL_RSCACKC | IXGBE_RDRXCTL_FCOE_WRFIX);
-               rdrxctl |= IXGBE_RDRXCTL_CRCSTRIP;
-               break;
-       default:
-               /* We should do nothing since we don't know this hardware */
-               return;
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl);
-}
-
-/**
- * ixgbe_configure_rx - Configure 8259x Receive Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int i;
-       u32 rxctrl;
-
-       /* disable receives while setting up the descriptors */
-       rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
-       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl & ~IXGBE_RXCTRL_RXEN);
-
-       ixgbe_setup_psrtype(adapter);
-       ixgbe_setup_rdrxctl(adapter);
-
-       /* Program registers for the distribution of queues */
-       ixgbe_setup_mrqc(adapter);
-
-       ixgbe_set_uta(adapter);
-
-       /* set_rx_buffer_len must be called before ring initialization */
-       ixgbe_set_rx_buffer_len(adapter);
-
-       /*
-        * Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring
-        */
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               ixgbe_configure_rx_ring(adapter, adapter->rx_ring[i]);
-
-       /* disable drop enable for 82598 parts */
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               rxctrl |= IXGBE_RXCTRL_DMBYPS;
-
-       /* enable all receives */
-       rxctrl |= IXGBE_RXCTRL_RXEN;
-       hw->mac.ops.enable_rx_dma(hw, rxctrl);
-}
-
-static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       int pool_ndx = adapter->num_vfs;
-
-       /* add VID to filter table */
-       hw->mac.ops.set_vfta(&adapter->hw, vid, pool_ndx, true);
-       set_bit(vid, adapter->active_vlans);
-}
-
-static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       int pool_ndx = adapter->num_vfs;
-
-       /* remove VID from filter table */
-       hw->mac.ops.set_vfta(&adapter->hw, vid, pool_ndx, false);
-       clear_bit(vid, adapter->active_vlans);
-}
-
-/**
- * ixgbe_vlan_filter_disable - helper to disable hw vlan filtering
- * @adapter: driver data
- */
-static void ixgbe_vlan_filter_disable(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 vlnctrl;
-
-       vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
-       vlnctrl &= ~(IXGBE_VLNCTRL_VFE | IXGBE_VLNCTRL_CFIEN);
-       IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
-}
-
-/**
- * ixgbe_vlan_filter_enable - helper to enable hw vlan filtering
- * @adapter: driver data
- */
-static void ixgbe_vlan_filter_enable(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 vlnctrl;
-
-       vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
-       vlnctrl |= IXGBE_VLNCTRL_VFE;
-       vlnctrl &= ~IXGBE_VLNCTRL_CFIEN;
-       IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
-}
-
-/**
- * ixgbe_vlan_strip_disable - helper to disable hw vlan stripping
- * @adapter: driver data
- */
-static void ixgbe_vlan_strip_disable(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 vlnctrl;
-       int i, j;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
-               vlnctrl &= ~IXGBE_VLNCTRL_VME;
-               IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       j = adapter->rx_ring[i]->reg_idx;
-                       vlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));
-                       vlnctrl &= ~IXGBE_RXDCTL_VME;
-                       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(j), vlnctrl);
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-/**
- * ixgbe_vlan_strip_enable - helper to enable hw vlan stripping
- * @adapter: driver data
- */
-static void ixgbe_vlan_strip_enable(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 vlnctrl;
-       int i, j;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
-               vlnctrl |= IXGBE_VLNCTRL_VME;
-               IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       j = adapter->rx_ring[i]->reg_idx;
-                       vlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));
-                       vlnctrl |= IXGBE_RXDCTL_VME;
-                       IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(j), vlnctrl);
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
-{
-       u16 vid;
-
-       ixgbe_vlan_rx_add_vid(adapter->netdev, 0);
-
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               ixgbe_vlan_rx_add_vid(adapter->netdev, vid);
-}
-
-/**
- * ixgbe_write_uc_addr_list - write unicast addresses to RAR table
- * @netdev: network interface device structure
- *
- * Writes unicast address list to the RAR table.
- * Returns: -ENOMEM on failure/insufficient address space
- *                0 on no addresses written
- *                X on writing X addresses to the RAR table
- **/
-static int ixgbe_write_uc_addr_list(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       unsigned int vfn = adapter->num_vfs;
-       unsigned int rar_entries = IXGBE_MAX_PF_MACVLANS;
-       int count = 0;
-
-       /* return ENOMEM indicating insufficient memory for addresses */
-       if (netdev_uc_count(netdev) > rar_entries)
-               return -ENOMEM;
-
-       if (!netdev_uc_empty(netdev) && rar_entries) {
-               struct netdev_hw_addr *ha;
-               /* return error if we do not support writing to RAR table */
-               if (!hw->mac.ops.set_rar)
-                       return -ENOMEM;
-
-               netdev_for_each_uc_addr(ha, netdev) {
-                       if (!rar_entries)
-                               break;
-                       hw->mac.ops.set_rar(hw, rar_entries--, ha->addr,
-                                           vfn, IXGBE_RAH_AV);
-                       count++;
-               }
-       }
-       /* write the addresses in reverse order to avoid write combining */
-       for (; rar_entries > 0 ; rar_entries--)
-               hw->mac.ops.clear_rar(hw, rar_entries);
-
-       return count;
-}
-
-/**
- * ixgbe_set_rx_mode - Unicast, Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_rx_method entry point is called whenever the unicast/multicast
- * address list or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper unicast, multicast and
- * promiscuous mode.
- **/
-void ixgbe_set_rx_mode(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 fctrl, vmolr = IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE;
-       int count;
-
-       /* Check for Promiscuous and All Multicast modes */
-
-       fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-
-       /* set all bits that we expect to always be set */
-       fctrl |= IXGBE_FCTRL_BAM;
-       fctrl |= IXGBE_FCTRL_DPF; /* discard pause frames when FC enabled */
-       fctrl |= IXGBE_FCTRL_PMCF;
-
-       /* clear the bits we are changing the status of */
-       fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
-
-       if (netdev->flags & IFF_PROMISC) {
-               hw->addr_ctrl.user_set_promisc = true;
-               fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
-               vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_MPE);
-               /* don't hardware filter vlans in promisc mode */
-               ixgbe_vlan_filter_disable(adapter);
-       } else {
-               if (netdev->flags & IFF_ALLMULTI) {
-                       fctrl |= IXGBE_FCTRL_MPE;
-                       vmolr |= IXGBE_VMOLR_MPE;
-               } else {
-                       /*
-                        * Write addresses to the MTA, if the attempt fails
-                        * then we should just turn on promiscuous mode so
-                        * that we can at least receive multicast traffic
-                        */
-                       hw->mac.ops.update_mc_addr_list(hw, netdev);
-                       vmolr |= IXGBE_VMOLR_ROMPE;
-               }
-               ixgbe_vlan_filter_enable(adapter);
-               hw->addr_ctrl.user_set_promisc = false;
-               /*
-                * Write addresses to available RAR registers, if there is not
-                * sufficient space to store all the addresses then enable
-                * unicast promiscuous mode
-                */
-               count = ixgbe_write_uc_addr_list(netdev);
-               if (count < 0) {
-                       fctrl |= IXGBE_FCTRL_UPE;
-                       vmolr |= IXGBE_VMOLR_ROPE;
-               }
-       }
-
-       if (adapter->num_vfs) {
-               ixgbe_restore_vf_multicasts(adapter);
-               vmolr |= IXGBE_READ_REG(hw, IXGBE_VMOLR(adapter->num_vfs)) &
-                        ~(IXGBE_VMOLR_MPE | IXGBE_VMOLR_ROMPE |
-                          IXGBE_VMOLR_ROPE);
-               IXGBE_WRITE_REG(hw, IXGBE_VMOLR(adapter->num_vfs), vmolr);
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
-
-       if (netdev->features & NETIF_F_HW_VLAN_RX)
-               ixgbe_vlan_strip_enable(adapter);
-       else
-               ixgbe_vlan_strip_disable(adapter);
-}
-
-static void ixgbe_napi_enable_all(struct ixgbe_adapter *adapter)
-{
-       int q_idx;
-       struct ixgbe_q_vector *q_vector;
-       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       /* legacy and MSI only use one vector */
-       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
-               q_vectors = 1;
-
-       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
-               struct napi_struct *napi;
-               q_vector = adapter->q_vector[q_idx];
-               napi = &q_vector->napi;
-               if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-                       if (!q_vector->rx.count || !q_vector->tx.count) {
-                               if (q_vector->tx.count == 1)
-                                       napi->poll = &ixgbe_clean_txonly;
-                               else if (q_vector->rx.count == 1)
-                                       napi->poll = &ixgbe_clean_rxonly;
-                       }
-               }
-
-               napi_enable(napi);
-       }
-}
-
-static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter)
-{
-       int q_idx;
-       struct ixgbe_q_vector *q_vector;
-       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       /* legacy and MSI only use one vector */
-       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
-               q_vectors = 1;
-
-       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
-               q_vector = adapter->q_vector[q_idx];
-               napi_disable(&q_vector->napi);
-       }
-}
-
-#ifdef CONFIG_IXGBE_DCB
-/*
- * ixgbe_configure_dcb - Configure DCB hardware
- * @adapter: ixgbe adapter struct
- *
- * This is called by the driver on open to configure the DCB hardware.
- * This is also called by the gennetlink interface when reconfiguring
- * the DCB state.
- */
-static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int max_frame = adapter->netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-
-       if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED)) {
-               if (hw->mac.type == ixgbe_mac_82598EB)
-                       netif_set_gso_max_size(adapter->netdev, 65536);
-               return;
-       }
-
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               netif_set_gso_max_size(adapter->netdev, 32768);
-
-
-       /* Enable VLAN tag insert/strip */
-       adapter->netdev->features |= NETIF_F_HW_VLAN_RX;
-
-       hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
-
-       /* reconfigure the hardware */
-       if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
-#ifdef CONFIG_FCOE
-               if (adapter->netdev->features & NETIF_F_FCOE_MTU)
-                       max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
-#endif
-               ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
-                                               DCB_TX_CONFIG);
-               ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
-                                               DCB_RX_CONFIG);
-               ixgbe_dcb_hw_config(hw, &adapter->dcb_cfg);
-       } else {
-               struct net_device *dev = adapter->netdev;
-
-               if (adapter->ixgbe_ieee_ets)
-                       dev->dcbnl_ops->ieee_setets(dev,
-                                                   adapter->ixgbe_ieee_ets);
-               if (adapter->ixgbe_ieee_pfc)
-                       dev->dcbnl_ops->ieee_setpfc(dev,
-                                                   adapter->ixgbe_ieee_pfc);
-       }
-
-       /* Enable RSS Hash per TC */
-       if (hw->mac.type != ixgbe_mac_82598EB) {
-               int i;
-               u32 reg = 0;
-
-               for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                       u8 msb = 0;
-                       u8 cnt = adapter->netdev->tc_to_txq[i].count;
-
-                       while (cnt >>= 1)
-                               msb++;
-
-                       reg |= msb << IXGBE_RQTC_SHIFT_TC(i);
-               }
-               IXGBE_WRITE_REG(hw, IXGBE_RQTC, reg);
-       }
-}
-
-#endif
-
-static void ixgbe_configure_pb(struct ixgbe_adapter *adapter)
-{
-       int hdrm = 0;
-       int num_tc = netdev_get_num_tc(adapter->netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE ||
-           adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)
-               hdrm = 64 << adapter->fdir_pballoc;
-
-       hw->mac.ops.set_rxpba(&adapter->hw, num_tc, hdrm, PBA_STRATEGY_EQUAL);
-}
-
-static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct hlist_node *node, *node2;
-       struct ixgbe_fdir_filter *filter;
-
-       spin_lock(&adapter->fdir_perfect_lock);
-
-       if (!hlist_empty(&adapter->fdir_filter_list))
-               ixgbe_fdir_set_input_mask_82599(hw, &adapter->fdir_mask);
-
-       hlist_for_each_entry_safe(filter, node, node2,
-                                 &adapter->fdir_filter_list, fdir_node) {
-               ixgbe_fdir_write_perfect_filter_82599(hw,
-                               &filter->filter,
-                               filter->sw_idx,
-                               (filter->action == IXGBE_FDIR_DROP_QUEUE) ?
-                               IXGBE_FDIR_DROP_QUEUE :
-                               adapter->rx_ring[filter->action]->reg_idx);
-       }
-
-       spin_unlock(&adapter->fdir_perfect_lock);
-}
-
-static void ixgbe_configure(struct ixgbe_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       int i;
-
-       ixgbe_configure_pb(adapter);
-#ifdef CONFIG_IXGBE_DCB
-       ixgbe_configure_dcb(adapter);
-#endif
-
-       ixgbe_set_rx_mode(netdev);
-       ixgbe_restore_vlan(adapter);
-
-#ifdef IXGBE_FCOE
-       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
-               ixgbe_configure_fcoe(adapter);
-
-#endif /* IXGBE_FCOE */
-       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       adapter->tx_ring[i]->atr_sample_rate =
-                                                      adapter->atr_sample_rate;
-               ixgbe_init_fdir_signature_82599(hw, adapter->fdir_pballoc);
-       } else if (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE) {
-               ixgbe_init_fdir_perfect_82599(&adapter->hw,
-                                             adapter->fdir_pballoc);
-               ixgbe_fdir_filter_restore(adapter);
-       }
-       ixgbe_configure_virtualization(adapter);
-
-       ixgbe_configure_tx(adapter);
-       ixgbe_configure_rx(adapter);
-}
-
-static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
-{
-       switch (hw->phy.type) {
-       case ixgbe_phy_sfp_avago:
-       case ixgbe_phy_sfp_ftl:
-       case ixgbe_phy_sfp_intel:
-       case ixgbe_phy_sfp_unknown:
-       case ixgbe_phy_sfp_passive_tyco:
-       case ixgbe_phy_sfp_passive_unknown:
-       case ixgbe_phy_sfp_active_unknown:
-       case ixgbe_phy_sfp_ftl_active:
-               return true;
-       default:
-               return false;
-       }
-}
-
-/**
- * ixgbe_sfp_link_config - set up SFP+ link
- * @adapter: pointer to private adapter struct
- **/
-static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter)
-{
-       /*
-        * We are assuming the worst case scenerio here, and that
-        * is that an SFP was inserted/removed after the reset
-        * but before SFP detection was enabled.  As such the best
-        * solution is to just start searching as soon as we start
-        */
-       if (adapter->hw.mac.type == ixgbe_mac_82598EB)
-               adapter->flags2 |= IXGBE_FLAG2_SEARCH_FOR_SFP;
-
-       adapter->flags2 |= IXGBE_FLAG2_SFP_NEEDS_RESET;
-}
-
-/**
- * ixgbe_non_sfp_link_config - set up non-SFP+ link
- * @hw: pointer to private hardware struct
- *
- * Returns 0 on success, negative on failure
- **/
-static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
-{
-       u32 autoneg;
-       bool negotiation, link_up = false;
-       u32 ret = IXGBE_ERR_LINK_SETUP;
-
-       if (hw->mac.ops.check_link)
-               ret = hw->mac.ops.check_link(hw, &autoneg, &link_up, false);
-
-       if (ret)
-               goto link_cfg_out;
-
-       autoneg = hw->phy.autoneg_advertised;
-       if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
-               ret = hw->mac.ops.get_link_capabilities(hw, &autoneg,
-                                                       &negotiation);
-       if (ret)
-               goto link_cfg_out;
-
-       if (hw->mac.ops.setup_link)
-               ret = hw->mac.ops.setup_link(hw, autoneg, negotiation, link_up);
-link_cfg_out:
-       return ret;
-}
-
-static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 gpie = 0;
-
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-               gpie = IXGBE_GPIE_MSIX_MODE | IXGBE_GPIE_PBA_SUPPORT |
-                      IXGBE_GPIE_OCD;
-               gpie |= IXGBE_GPIE_EIAME;
-               /*
-                * use EIAM to auto-mask when MSI-X interrupt is asserted
-                * this saves a register write for every interrupt
-                */
-               switch (hw->mac.type) {
-               case ixgbe_mac_82598EB:
-                       IXGBE_WRITE_REG(hw, IXGBE_EIAM, IXGBE_EICS_RTX_QUEUE);
-                       break;
-               case ixgbe_mac_82599EB:
-               case ixgbe_mac_X540:
-               default:
-                       IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(0), 0xFFFFFFFF);
-                       IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(1), 0xFFFFFFFF);
-                       break;
-               }
-       } else {
-               /* legacy interrupts, use EIAM to auto-mask when reading EICR,
-                * specifically only auto mask tx and rx interrupts */
-               IXGBE_WRITE_REG(hw, IXGBE_EIAM, IXGBE_EICS_RTX_QUEUE);
-       }
-
-       /* XXX: to interrupt immediately for EICS writes, enable this */
-       /* gpie |= IXGBE_GPIE_EIMEN; */
-
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
-               gpie &= ~IXGBE_GPIE_VTMODE_MASK;
-               gpie |= IXGBE_GPIE_VTMODE_64;
-       }
-
-       /* Enable fan failure interrupt */
-       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)
-               gpie |= IXGBE_SDP1_GPIEN;
-
-       if (hw->mac.type == ixgbe_mac_82599EB) {
-               gpie |= IXGBE_SDP1_GPIEN;
-               gpie |= IXGBE_SDP2_GPIEN;
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
-}
-
-static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int err;
-       u32 ctrl_ext;
-
-       ixgbe_get_hw_control(adapter);
-       ixgbe_setup_gpie(adapter);
-
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
-               ixgbe_configure_msix(adapter);
-       else
-               ixgbe_configure_msi_and_legacy(adapter);
-
-       /* enable the optics for both mult-speed fiber and 82599 SFP+ fiber */
-       if (hw->mac.ops.enable_tx_laser &&
-           ((hw->phy.multispeed_fiber) ||
-            ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
-             (hw->mac.type == ixgbe_mac_82599EB))))
-               hw->mac.ops.enable_tx_laser(hw);
-
-       clear_bit(__IXGBE_DOWN, &adapter->state);
-       ixgbe_napi_enable_all(adapter);
-
-       if (ixgbe_is_sfp(hw)) {
-               ixgbe_sfp_link_config(adapter);
-       } else {
-               err = ixgbe_non_sfp_link_config(hw);
-               if (err)
-                       e_err(probe, "link_config FAILED %d\n", err);
-       }
-
-       /* clear any pending interrupts, may auto mask */
-       IXGBE_READ_REG(hw, IXGBE_EICR);
-       ixgbe_irq_enable(adapter, true, true);
-
-       /*
-        * If this adapter has a fan, check to see if we had a failure
-        * before we enabled the interrupt.
-        */
-       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
-               u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
-               if (esdp & IXGBE_ESDP_SDP1)
-                       e_crit(drv, "Fan has stopped, replace the adapter\n");
-       }
-
-       /* enable transmits */
-       netif_tx_start_all_queues(adapter->netdev);
-
-       /* bring the link up in the watchdog, this could race with our first
-        * link up interrupt but shouldn't be a problem */
-       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
-       adapter->link_check_timeout = jiffies;
-       mod_timer(&adapter->service_timer, jiffies);
-
-       /* Set PF Reset Done bit so PF/VF Mail Ops can work */
-       ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
-       ctrl_ext |= IXGBE_CTRL_EXT_PFRSTD;
-       IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);
-
-       return 0;
-}
-
-void ixgbe_reinit_locked(struct ixgbe_adapter *adapter)
-{
-       WARN_ON(in_interrupt());
-       /* put off any impending NetWatchDogTimeout */
-       adapter->netdev->trans_start = jiffies;
-
-       while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
-               usleep_range(1000, 2000);
-       ixgbe_down(adapter);
-       /*
-        * If SR-IOV enabled then wait a bit before bringing the adapter
-        * back up to give the VFs time to respond to the reset.  The
-        * two second wait is based upon the watchdog timer cycle in
-        * the VF driver.
-        */
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-               msleep(2000);
-       ixgbe_up(adapter);
-       clear_bit(__IXGBE_RESETTING, &adapter->state);
-}
-
-int ixgbe_up(struct ixgbe_adapter *adapter)
-{
-       /* hardware has been reset, we need to reload some things */
-       ixgbe_configure(adapter);
-
-       return ixgbe_up_complete(adapter);
-}
-
-void ixgbe_reset(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int err;
-
-       /* lock SFP init bit to prevent race conditions with the watchdog */
-       while (test_and_set_bit(__IXGBE_IN_SFP_INIT, &adapter->state))
-               usleep_range(1000, 2000);
-
-       /* clear all SFP and link config related flags while holding SFP_INIT */
-       adapter->flags2 &= ~(IXGBE_FLAG2_SEARCH_FOR_SFP |
-                            IXGBE_FLAG2_SFP_NEEDS_RESET);
-       adapter->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
-
-       err = hw->mac.ops.init_hw(hw);
-       switch (err) {
-       case 0:
-       case IXGBE_ERR_SFP_NOT_PRESENT:
-       case IXGBE_ERR_SFP_NOT_SUPPORTED:
-               break;
-       case IXGBE_ERR_MASTER_REQUESTS_PENDING:
-               e_dev_err("master disable timed out\n");
-               break;
-       case IXGBE_ERR_EEPROM_VERSION:
-               /* We are running on a pre-production device, log a warning */
-               e_dev_warn("This device is a pre-production adapter/LOM. "
-                          "Please be aware there may be issuesassociated with "
-                          "your hardware.  If you are experiencing problems "
-                          "please contact your Intel or hardware "
-                          "representative who provided you with this "
-                          "hardware.\n");
-               break;
-       default:
-               e_dev_err("Hardware Error: %d\n", err);
-       }
-
-       clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);
-
-       /* reprogram the RAR[0] in case user changed it. */
-       hw->mac.ops.set_rar(hw, 0, hw->mac.addr, adapter->num_vfs,
-                           IXGBE_RAH_AV);
-}
-
-/**
- * ixgbe_clean_rx_ring - Free Rx Buffers per Queue
- * @rx_ring: ring to free buffers from
- **/
-static void ixgbe_clean_rx_ring(struct ixgbe_ring *rx_ring)
-{
-       struct device *dev = rx_ring->dev;
-       unsigned long size;
-       u16 i;
-
-       /* ring already cleared, nothing to do */
-       if (!rx_ring->rx_buffer_info)
-               return;
-
-       /* Free all the Rx ring sk_buffs */
-       for (i = 0; i < rx_ring->count; i++) {
-               struct ixgbe_rx_buffer *rx_buffer_info;
-
-               rx_buffer_info = &rx_ring->rx_buffer_info[i];
-               if (rx_buffer_info->dma) {
-                       dma_unmap_single(rx_ring->dev, rx_buffer_info->dma,
-                                        rx_ring->rx_buf_len,
-                                        DMA_FROM_DEVICE);
-                       rx_buffer_info->dma = 0;
-               }
-               if (rx_buffer_info->skb) {
-                       struct sk_buff *skb = rx_buffer_info->skb;
-                       rx_buffer_info->skb = NULL;
-                       do {
-                               struct sk_buff *this = skb;
-                               if (IXGBE_RSC_CB(this)->delay_unmap) {
-                                       dma_unmap_single(dev,
-                                                        IXGBE_RSC_CB(this)->dma,
-                                                        rx_ring->rx_buf_len,
-                                                        DMA_FROM_DEVICE);
-                                       IXGBE_RSC_CB(this)->dma = 0;
-                                       IXGBE_RSC_CB(skb)->delay_unmap = false;
-                               }
-                               skb = skb->prev;
-                               dev_kfree_skb(this);
-                       } while (skb);
-               }
-               if (!rx_buffer_info->page)
-                       continue;
-               if (rx_buffer_info->page_dma) {
-                       dma_unmap_page(dev, rx_buffer_info->page_dma,
-                                      PAGE_SIZE / 2, DMA_FROM_DEVICE);
-                       rx_buffer_info->page_dma = 0;
-               }
-               put_page(rx_buffer_info->page);
-               rx_buffer_info->page = NULL;
-               rx_buffer_info->page_offset = 0;
-       }
-
-       size = sizeof(struct ixgbe_rx_buffer) * rx_ring->count;
-       memset(rx_ring->rx_buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-}
-
-/**
- * ixgbe_clean_tx_ring - Free Tx Buffers
- * @tx_ring: ring to be cleaned
- **/
-static void ixgbe_clean_tx_ring(struct ixgbe_ring *tx_ring)
-{
-       struct ixgbe_tx_buffer *tx_buffer_info;
-       unsigned long size;
-       u16 i;
-
-       /* ring already cleared, nothing to do */
-       if (!tx_ring->tx_buffer_info)
-               return;
-
-       /* Free all the Tx ring sk_buffs */
-       for (i = 0; i < tx_ring->count; i++) {
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
-       }
-
-       size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
-       memset(tx_ring->tx_buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-}
-
-/**
- * ixgbe_clean_all_rx_rings - Free Rx Buffers for all queues
- * @adapter: board private structure
- **/
-static void ixgbe_clean_all_rx_rings(struct ixgbe_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               ixgbe_clean_rx_ring(adapter->rx_ring[i]);
-}
-
-/**
- * ixgbe_clean_all_tx_rings - Free Tx Buffers for all queues
- * @adapter: board private structure
- **/
-static void ixgbe_clean_all_tx_rings(struct ixgbe_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               ixgbe_clean_tx_ring(adapter->tx_ring[i]);
-}
-
-static void ixgbe_fdir_filter_exit(struct ixgbe_adapter *adapter)
-{
-       struct hlist_node *node, *node2;
-       struct ixgbe_fdir_filter *filter;
-
-       spin_lock(&adapter->fdir_perfect_lock);
-
-       hlist_for_each_entry_safe(filter, node, node2,
-                                 &adapter->fdir_filter_list, fdir_node) {
-               hlist_del(&filter->fdir_node);
-               kfree(filter);
-       }
-       adapter->fdir_filter_count = 0;
-
-       spin_unlock(&adapter->fdir_perfect_lock);
-}
-
-void ixgbe_down(struct ixgbe_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 rxctrl;
-       int i;
-       int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       /* signal that we are down to the interrupt handler */
-       set_bit(__IXGBE_DOWN, &adapter->state);
-
-       /* disable receives */
-       rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
-       IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl & ~IXGBE_RXCTRL_RXEN);
-
-       /* disable all enabled rx queues */
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               /* this call also flushes the previous write */
-               ixgbe_disable_rx_queue(adapter, adapter->rx_ring[i]);
-
-       usleep_range(10000, 20000);
-
-       netif_tx_stop_all_queues(netdev);
-
-       /* call carrier off first to avoid false dev_watchdog timeouts */
-       netif_carrier_off(netdev);
-       netif_tx_disable(netdev);
-
-       ixgbe_irq_disable(adapter);
-
-       ixgbe_napi_disable_all(adapter);
-
-       adapter->flags2 &= ~(IXGBE_FLAG2_FDIR_REQUIRES_REINIT |
-                            IXGBE_FLAG2_RESET_REQUESTED);
-       adapter->flags &= ~IXGBE_FLAG_NEED_LINK_UPDATE;
-
-       del_timer_sync(&adapter->service_timer);
-
-       /* disable receive for all VFs and wait one second */
-       if (adapter->num_vfs) {
-               /* ping all the active vfs to let them know we are going down */
-               ixgbe_ping_all_vfs(adapter);
-
-               /* Disable all VFTE/VFRE TX/RX */
-               ixgbe_disable_tx_rx(adapter);
-
-               /* Mark all the VFs as inactive */
-               for (i = 0 ; i < adapter->num_vfs; i++)
-                       adapter->vfinfo[i].clear_to_send = 0;
-       }
-
-       /* Cleanup the affinity_hint CPU mask memory and callback */
-       for (i = 0; i < num_q_vectors; i++) {
-               struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
-               /* clear the affinity_mask in the IRQ descriptor */
-               irq_set_affinity_hint(adapter->msix_entries[i]. vector, NULL);
-               /* release the CPU mask memory */
-               free_cpumask_var(q_vector->affinity_mask);
-       }
-
-       /* disable transmits in the hardware now that interrupts are off */
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               u8 reg_idx = adapter->tx_ring[i]->reg_idx;
-               IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), IXGBE_TXDCTL_SWFLSH);
-       }
-
-       /* Disable the Tx DMA engine on 82599 and X540 */
-       switch (hw->mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL,
-                               (IXGBE_READ_REG(hw, IXGBE_DMATXCTL) &
-                                ~IXGBE_DMATXCTL_TE));
-               break;
-       default:
-               break;
-       }
-
-       if (!pci_channel_offline(adapter->pdev))
-               ixgbe_reset(adapter);
-
-       /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
-       if (hw->mac.ops.disable_tx_laser &&
-           ((hw->phy.multispeed_fiber) ||
-            ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
-             (hw->mac.type == ixgbe_mac_82599EB))))
-               hw->mac.ops.disable_tx_laser(hw);
-
-       ixgbe_clean_all_tx_rings(adapter);
-       ixgbe_clean_all_rx_rings(adapter);
-
-#ifdef CONFIG_IXGBE_DCA
-       /* since we reset the hardware DCA settings were cleared */
-       ixgbe_setup_dca(adapter);
-#endif
-}
-
-/**
- * ixgbe_poll - NAPI Rx polling callback
- * @napi: structure for representing this polling device
- * @budget: how many packets driver is allowed to clean
- *
- * This function is used for legacy and MSI, NAPI mode
- **/
-static int ixgbe_poll(struct napi_struct *napi, int budget)
-{
-       struct ixgbe_q_vector *q_vector =
-                               container_of(napi, struct ixgbe_q_vector, napi);
-       struct ixgbe_adapter *adapter = q_vector->adapter;
-       int tx_clean_complete, work_done = 0;
-
-#ifdef CONFIG_IXGBE_DCA
-       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-               ixgbe_update_dca(q_vector);
-#endif
-
-       tx_clean_complete = ixgbe_clean_tx_irq(q_vector, adapter->tx_ring[0]);
-       ixgbe_clean_rx_irq(q_vector, adapter->rx_ring[0], &work_done, budget);
-
-       if (!tx_clean_complete)
-               work_done = budget;
-
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               if (adapter->rx_itr_setting & 1)
-                       ixgbe_set_itr(q_vector);
-               if (!test_bit(__IXGBE_DOWN, &adapter->state))
-                       ixgbe_irq_enable_queues(adapter, IXGBE_EIMS_RTX_QUEUE);
-       }
-       return work_done;
-}
-
-/**
- * ixgbe_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-static void ixgbe_tx_timeout(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       /* Do the reset outside of interrupt context */
-       ixgbe_tx_timeout_reset(adapter);
-}
-
-/**
- * ixgbe_set_rss_queues: Allocate queues for RSS
- * @adapter: board private structure to initialize
- *
- * This is our "base" multiqueue mode.  RSS (Receive Side Scaling) will try
- * to allocate one Rx queue per CPU, and if available, one Tx queue per CPU.
- *
- **/
-static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
-{
-       bool ret = false;
-       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_RSS];
-
-       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
-               f->mask = 0xF;
-               adapter->num_rx_queues = f->indices;
-               adapter->num_tx_queues = f->indices;
-               ret = true;
-       } else {
-               ret = false;
-       }
-
-       return ret;
-}
-
-/**
- * ixgbe_set_fdir_queues: Allocate queues for Flow Director
- * @adapter: board private structure to initialize
- *
- * Flow Director is an advanced Rx filter, attempting to get Rx flows back
- * to the original CPU that initiated the Tx session.  This runs in addition
- * to RSS, so if a packet doesn't match an FDIR filter, we can still spread the
- * Rx load across CPUs using RSS.
- *
- **/
-static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter)
-{
-       bool ret = false;
-       struct ixgbe_ring_feature *f_fdir = &adapter->ring_feature[RING_F_FDIR];
-
-       f_fdir->indices = min((int)num_online_cpus(), f_fdir->indices);
-       f_fdir->mask = 0;
-
-       /* Flow Director must have RSS enabled */
-       if ((adapter->flags & IXGBE_FLAG_RSS_ENABLED) &&
-           (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)) {
-               adapter->num_tx_queues = f_fdir->indices;
-               adapter->num_rx_queues = f_fdir->indices;
-               ret = true;
-       } else {
-               adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
-       }
-       return ret;
-}
-
-#ifdef IXGBE_FCOE
-/**
- * ixgbe_set_fcoe_queues: Allocate queues for Fiber Channel over Ethernet (FCoE)
- * @adapter: board private structure to initialize
- *
- * FCoE RX FCRETA can use up to 8 rx queues for up to 8 different exchanges.
- * The ring feature mask is not used as a mask for FCoE, as it can take any 8
- * rx queues out of the max number of rx queues, instead, it is used as the
- * index of the first rx queue used by FCoE.
- *
- **/
-static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
-
-       if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
-               return false;
-
-       f->indices = min((int)num_online_cpus(), f->indices);
-
-       adapter->num_rx_queues = 1;
-       adapter->num_tx_queues = 1;
-
-       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
-               e_info(probe, "FCoE enabled with RSS\n");
-               if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)
-                       ixgbe_set_fdir_queues(adapter);
-               else
-                       ixgbe_set_rss_queues(adapter);
-       }
-
-       /* adding FCoE rx rings to the end */
-       f->mask = adapter->num_rx_queues;
-       adapter->num_rx_queues += f->indices;
-       adapter->num_tx_queues += f->indices;
-
-       return true;
-}
-#endif /* IXGBE_FCOE */
-
-/* Artificial max queue cap per traffic class in DCB mode */
-#define DCB_QUEUE_CAP 8
-
-#ifdef CONFIG_IXGBE_DCB
-static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter)
-{
-       int per_tc_q, q, i, offset = 0;
-       struct net_device *dev = adapter->netdev;
-       int tcs = netdev_get_num_tc(dev);
-
-       if (!tcs)
-               return false;
-
-       /* Map queue offset and counts onto allocated tx queues */
-       per_tc_q = min(dev->num_tx_queues / tcs, (unsigned int)DCB_QUEUE_CAP);
-       q = min((int)num_online_cpus(), per_tc_q);
-
-       for (i = 0; i < tcs; i++) {
-               netdev_set_prio_tc_map(dev, i, i);
-               netdev_set_tc_queue(dev, i, q, offset);
-               offset += q;
-       }
-
-       adapter->num_tx_queues = q * tcs;
-       adapter->num_rx_queues = q * tcs;
-
-#ifdef IXGBE_FCOE
-       /* FCoE enabled queues require special configuration indexed
-        * by feature specific indices and mask. Here we map FCoE
-        * indices onto the DCB queue pairs allowing FCoE to own
-        * configuration later.
-        */
-       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {
-               int tc;
-               struct ixgbe_ring_feature *f =
-                                       &adapter->ring_feature[RING_F_FCOE];
-
-               tc = netdev_get_prio_tc_map(dev, adapter->fcoe.up);
-               f->indices = dev->tc_to_txq[tc].count;
-               f->mask = dev->tc_to_txq[tc].offset;
-       }
-#endif
-
-       return true;
-}
-#endif
-
-/**
- * ixgbe_set_sriov_queues: Allocate queues for IOV use
- * @adapter: board private structure to initialize
- *
- * IOV doesn't actually use anything, so just NAK the
- * request for now and let the other queue routines
- * figure out what to do.
- */
-static inline bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)
-{
-       return false;
-}
-
-/*
- * ixgbe_set_num_queues: Allocate queues for device, feature dependent
- * @adapter: board private structure to initialize
- *
- * This is the top level queue allocation routine.  The order here is very
- * important, starting with the "most" number of features turned on at once,
- * and ending with the smallest set of features.  This way large combinations
- * can be allocated if they're turned on, and smaller combinations are the
- * fallthrough conditions.
- *
- **/
-static int ixgbe_set_num_queues(struct ixgbe_adapter *adapter)
-{
-       /* Start with base case */
-       adapter->num_rx_queues = 1;
-       adapter->num_tx_queues = 1;
-       adapter->num_rx_pools = adapter->num_rx_queues;
-       adapter->num_rx_queues_per_pool = 1;
-
-       if (ixgbe_set_sriov_queues(adapter))
-               goto done;
-
-#ifdef CONFIG_IXGBE_DCB
-       if (ixgbe_set_dcb_queues(adapter))
-               goto done;
-
-#endif
-#ifdef IXGBE_FCOE
-       if (ixgbe_set_fcoe_queues(adapter))
-               goto done;
-
-#endif /* IXGBE_FCOE */
-       if (ixgbe_set_fdir_queues(adapter))
-               goto done;
-
-       if (ixgbe_set_rss_queues(adapter))
-               goto done;
-
-       /* fallback to base case */
-       adapter->num_rx_queues = 1;
-       adapter->num_tx_queues = 1;
-
-done:
-       /* Notify the stack of the (possibly) reduced queue counts. */
-       netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
-       return netif_set_real_num_rx_queues(adapter->netdev,
-                                           adapter->num_rx_queues);
-}
-
-static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
-                                      int vectors)
-{
-       int err, vector_threshold;
-
-       /* We'll want at least 3 (vector_threshold):
-        * 1) TxQ[0] Cleanup
-        * 2) RxQ[0] Cleanup
-        * 3) Other (Link Status Change, etc.)
-        * 4) TCP Timer (optional)
-        */
-       vector_threshold = MIN_MSIX_COUNT;
-
-       /* The more we get, the more we will assign to Tx/Rx Cleanup
-        * for the separate queues...where Rx Cleanup >= Tx Cleanup.
-        * Right now, we simply care about how many we'll get; we'll
-        * set them up later while requesting irq's.
-        */
-       while (vectors >= vector_threshold) {
-               err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
-                                     vectors);
-               if (!err) /* Success in acquiring all requested vectors. */
-                       break;
-               else if (err < 0)
-                       vectors = 0; /* Nasty failure, quit now */
-               else /* err == number of vectors we should try again with */
-                       vectors = err;
-       }
-
-       if (vectors < vector_threshold) {
-               /* Can't allocate enough MSI-X interrupts?  Oh well.
-                * This just means we'll go with either a single MSI
-                * vector or fall back to legacy interrupts.
-                */
-               netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
-                            "Unable to allocate MSI-X interrupts\n");
-               adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
-               kfree(adapter->msix_entries);
-               adapter->msix_entries = NULL;
-       } else {
-               adapter->flags |= IXGBE_FLAG_MSIX_ENABLED; /* Woot! */
-               /*
-                * Adjust for only the vectors we'll use, which is minimum
-                * of max_msix_q_vectors + NON_Q_VECTORS, or the number of
-                * vectors we were allocated.
-                */
-               adapter->num_msix_vectors = min(vectors,
-                                  adapter->max_msix_q_vectors + NON_Q_VECTORS);
-       }
-}
-
-/**
- * ixgbe_cache_ring_rss - Descriptor ring to register mapping for RSS
- * @adapter: board private structure to initialize
- *
- * Cache the descriptor ring offsets for RSS to the assigned rings.
- *
- **/
-static inline bool ixgbe_cache_ring_rss(struct ixgbe_adapter *adapter)
-{
-       int i;
-
-       if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))
-               return false;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               adapter->rx_ring[i]->reg_idx = i;
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               adapter->tx_ring[i]->reg_idx = i;
-
-       return true;
-}
-
-#ifdef CONFIG_IXGBE_DCB
-
-/* ixgbe_get_first_reg_idx - Return first register index associated with ring */
-static void ixgbe_get_first_reg_idx(struct ixgbe_adapter *adapter, u8 tc,
-                                   unsigned int *tx, unsigned int *rx)
-{
-       struct net_device *dev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u8 num_tcs = netdev_get_num_tc(dev);
-
-       *tx = 0;
-       *rx = 0;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               *tx = tc << 2;
-               *rx = tc << 3;
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               if (num_tcs == 8) {
-                       if (tc < 3) {
-                               *tx = tc << 5;
-                               *rx = tc << 4;
-                       } else if (tc <  5) {
-                               *tx = ((tc + 2) << 4);
-                               *rx = tc << 4;
-                       } else if (tc < num_tcs) {
-                               *tx = ((tc + 8) << 3);
-                               *rx = tc << 4;
-                       }
-               } else if (num_tcs == 4) {
-                       *rx =  tc << 5;
-                       switch (tc) {
-                       case 0:
-                               *tx =  0;
-                               break;
-                       case 1:
-                               *tx = 64;
-                               break;
-                       case 2:
-                               *tx = 96;
-                               break;
-                       case 3:
-                               *tx = 112;
-                               break;
-                       default:
-                               break;
-                       }
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-/**
- * ixgbe_cache_ring_dcb - Descriptor ring to register mapping for DCB
- * @adapter: board private structure to initialize
- *
- * Cache the descriptor ring offsets for DCB to the assigned rings.
- *
- **/
-static inline bool ixgbe_cache_ring_dcb(struct ixgbe_adapter *adapter)
-{
-       struct net_device *dev = adapter->netdev;
-       int i, j, k;
-       u8 num_tcs = netdev_get_num_tc(dev);
-
-       if (!num_tcs)
-               return false;
-
-       for (i = 0, k = 0; i < num_tcs; i++) {
-               unsigned int tx_s, rx_s;
-               u16 count = dev->tc_to_txq[i].count;
-
-               ixgbe_get_first_reg_idx(adapter, i, &tx_s, &rx_s);
-               for (j = 0; j < count; j++, k++) {
-                       adapter->tx_ring[k]->reg_idx = tx_s + j;
-                       adapter->rx_ring[k]->reg_idx = rx_s + j;
-                       adapter->tx_ring[k]->dcb_tc = i;
-                       adapter->rx_ring[k]->dcb_tc = i;
-               }
-       }
-
-       return true;
-}
-#endif
-
-/**
- * ixgbe_cache_ring_fdir - Descriptor ring to register mapping for Flow Director
- * @adapter: board private structure to initialize
- *
- * Cache the descriptor ring offsets for Flow Director to the assigned rings.
- *
- **/
-static inline bool ixgbe_cache_ring_fdir(struct ixgbe_adapter *adapter)
-{
-       int i;
-       bool ret = false;
-
-       if ((adapter->flags & IXGBE_FLAG_RSS_ENABLED) &&
-           (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)) {
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       adapter->rx_ring[i]->reg_idx = i;
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       adapter->tx_ring[i]->reg_idx = i;
-               ret = true;
-       }
-
-       return ret;
-}
-
-#ifdef IXGBE_FCOE
-/**
- * ixgbe_cache_ring_fcoe - Descriptor ring to register mapping for the FCoE
- * @adapter: board private structure to initialize
- *
- * Cache the descriptor ring offsets for FCoE mode to the assigned rings.
- *
- */
-static inline bool ixgbe_cache_ring_fcoe(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
-       int i;
-       u8 fcoe_rx_i = 0, fcoe_tx_i = 0;
-
-       if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
-               return false;
-
-       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
-               if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)
-                       ixgbe_cache_ring_fdir(adapter);
-               else
-                       ixgbe_cache_ring_rss(adapter);
-
-               fcoe_rx_i = f->mask;
-               fcoe_tx_i = f->mask;
-       }
-       for (i = 0; i < f->indices; i++, fcoe_rx_i++, fcoe_tx_i++) {
-               adapter->rx_ring[f->mask + i]->reg_idx = fcoe_rx_i;
-               adapter->tx_ring[f->mask + i]->reg_idx = fcoe_tx_i;
-       }
-       return true;
-}
-
-#endif /* IXGBE_FCOE */
-/**
- * ixgbe_cache_ring_sriov - Descriptor ring to register mapping for sriov
- * @adapter: board private structure to initialize
- *
- * SR-IOV doesn't use any descriptor rings but changes the default if
- * no other mapping is used.
- *
- */
-static inline bool ixgbe_cache_ring_sriov(struct ixgbe_adapter *adapter)
-{
-       adapter->rx_ring[0]->reg_idx = adapter->num_vfs * 2;
-       adapter->tx_ring[0]->reg_idx = adapter->num_vfs * 2;
-       if (adapter->num_vfs)
-               return true;
-       else
-               return false;
-}
-
-/**
- * ixgbe_cache_ring_register - Descriptor ring to register mapping
- * @adapter: board private structure to initialize
- *
- * Once we know the feature-set enabled for the device, we'll cache
- * the register offset the descriptor ring is assigned to.
- *
- * Note, the order the various feature calls is important.  It must start with
- * the "most" features enabled at the same time, then trickle down to the
- * least amount of features turned on at once.
- **/
-static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
-{
-       /* start with default case */
-       adapter->rx_ring[0]->reg_idx = 0;
-       adapter->tx_ring[0]->reg_idx = 0;
-
-       if (ixgbe_cache_ring_sriov(adapter))
-               return;
-
-#ifdef CONFIG_IXGBE_DCB
-       if (ixgbe_cache_ring_dcb(adapter))
-               return;
-#endif
-
-#ifdef IXGBE_FCOE
-       if (ixgbe_cache_ring_fcoe(adapter))
-               return;
-#endif /* IXGBE_FCOE */
-
-       if (ixgbe_cache_ring_fdir(adapter))
-               return;
-
-       if (ixgbe_cache_ring_rss(adapter))
-               return;
-}
-
-/**
- * ixgbe_alloc_queues - Allocate memory for all rings
- * @adapter: board private structure to initialize
- *
- * We allocate one ring per queue at run-time since we don't know the
- * number of queues at compile-time.  The polling_netdev array is
- * intended for Multiqueue, but should work fine with a single queue.
- **/
-static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter)
-{
-       int rx = 0, tx = 0, nid = adapter->node;
-
-       if (nid < 0 || !node_online(nid))
-               nid = first_online_node;
-
-       for (; tx < adapter->num_tx_queues; tx++) {
-               struct ixgbe_ring *ring;
-
-               ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, nid);
-               if (!ring)
-                       ring = kzalloc(sizeof(*ring), GFP_KERNEL);
-               if (!ring)
-                       goto err_allocation;
-               ring->count = adapter->tx_ring_count;
-               ring->queue_index = tx;
-               ring->numa_node = nid;
-               ring->dev = &adapter->pdev->dev;
-               ring->netdev = adapter->netdev;
-
-               adapter->tx_ring[tx] = ring;
-       }
-
-       for (; rx < adapter->num_rx_queues; rx++) {
-               struct ixgbe_ring *ring;
-
-               ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, nid);
-               if (!ring)
-                       ring = kzalloc(sizeof(*ring), GFP_KERNEL);
-               if (!ring)
-                       goto err_allocation;
-               ring->count = adapter->rx_ring_count;
-               ring->queue_index = rx;
-               ring->numa_node = nid;
-               ring->dev = &adapter->pdev->dev;
-               ring->netdev = adapter->netdev;
-
-               adapter->rx_ring[rx] = ring;
-       }
-
-       ixgbe_cache_ring_register(adapter);
-
-       return 0;
-
-err_allocation:
-       while (tx)
-               kfree(adapter->tx_ring[--tx]);
-
-       while (rx)
-               kfree(adapter->rx_ring[--rx]);
-       return -ENOMEM;
-}
-
-/**
- * ixgbe_set_interrupt_capability - set MSI-X or MSI if supported
- * @adapter: board private structure to initialize
- *
- * Attempt to configure the interrupts using the best available
- * capabilities of the hardware and the kernel.
- **/
-static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int err = 0;
-       int vector, v_budget;
-
-       /*
-        * It's easy to be greedy for MSI-X vectors, but it really
-        * doesn't do us much good if we have a lot more vectors
-        * than CPU's.  So let's be conservative and only ask for
-        * (roughly) the same number of vectors as there are CPU's.
-        */
-       v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues,
-                      (int)num_online_cpus()) + NON_Q_VECTORS;
-
-       /*
-        * At the same time, hardware can only support a maximum of
-        * hw.mac->max_msix_vectors vectors.  With features
-        * such as RSS and VMDq, we can easily surpass the number of Rx and Tx
-        * descriptor queues supported by our device.  Thus, we cap it off in
-        * those rare cases where the cpu count also exceeds our vector limit.
-        */
-       v_budget = min(v_budget, (int)hw->mac.max_msix_vectors);
-
-       /* A failure in MSI-X entry allocation isn't fatal, but it does
-        * mean we disable MSI-X capabilities of the adapter. */
-       adapter->msix_entries = kcalloc(v_budget,
-                                       sizeof(struct msix_entry), GFP_KERNEL);
-       if (adapter->msix_entries) {
-               for (vector = 0; vector < v_budget; vector++)
-                       adapter->msix_entries[vector].entry = vector;
-
-               ixgbe_acquire_msix_vectors(adapter, v_budget);
-
-               if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
-                       goto out;
-       }
-
-       adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
-       adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
-       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
-               e_err(probe,
-                     "ATR is not supported while multiple "
-                     "queues are disabled.  Disabling Flow Director\n");
-       }
-       adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
-       adapter->atr_sample_rate = 0;
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-               ixgbe_disable_sriov(adapter);
-
-       err = ixgbe_set_num_queues(adapter);
-       if (err)
-               return err;
-
-       err = pci_enable_msi(adapter->pdev);
-       if (!err) {
-               adapter->flags |= IXGBE_FLAG_MSI_ENABLED;
-       } else {
-               netif_printk(adapter, hw, KERN_DEBUG, adapter->netdev,
-                            "Unable to allocate MSI interrupt, "
-                            "falling back to legacy.  Error: %d\n", err);
-               /* reset err */
-               err = 0;
-       }
-
-out:
-       return err;
-}
-
-/**
- * ixgbe_alloc_q_vectors - Allocate memory for interrupt vectors
- * @adapter: board private structure to initialize
- *
- * We allocate one q_vector per queue interrupt.  If allocation fails we
- * return -ENOMEM.
- **/
-static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
-{
-       int q_idx, num_q_vectors;
-       struct ixgbe_q_vector *q_vector;
-       int (*poll)(struct napi_struct *, int);
-
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-               num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-               poll = &ixgbe_clean_rxtx_many;
-       } else {
-               num_q_vectors = 1;
-               poll = &ixgbe_poll;
-       }
-
-       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
-               q_vector = kzalloc_node(sizeof(struct ixgbe_q_vector),
-                                       GFP_KERNEL, adapter->node);
-               if (!q_vector)
-                       q_vector = kzalloc(sizeof(struct ixgbe_q_vector),
-                                          GFP_KERNEL);
-               if (!q_vector)
-                       goto err_out;
-               q_vector->adapter = adapter;
-               if (q_vector->tx.count && !q_vector->rx.count)
-                       q_vector->eitr = adapter->tx_eitr_param;
-               else
-                       q_vector->eitr = adapter->rx_eitr_param;
-               q_vector->v_idx = q_idx;
-               netif_napi_add(adapter->netdev, &q_vector->napi, (*poll), 64);
-               adapter->q_vector[q_idx] = q_vector;
-       }
-
-       return 0;
-
-err_out:
-       while (q_idx) {
-               q_idx--;
-               q_vector = adapter->q_vector[q_idx];
-               netif_napi_del(&q_vector->napi);
-               kfree(q_vector);
-               adapter->q_vector[q_idx] = NULL;
-       }
-       return -ENOMEM;
-}
-
-/**
- * ixgbe_free_q_vectors - Free memory allocated for interrupt vectors
- * @adapter: board private structure to initialize
- *
- * This function frees the memory allocated to the q_vectors.  In addition if
- * NAPI is enabled it will delete any references to the NAPI struct prior
- * to freeing the q_vector.
- **/
-static void ixgbe_free_q_vectors(struct ixgbe_adapter *adapter)
-{
-       int q_idx, num_q_vectors;
-
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
-               num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-       else
-               num_q_vectors = 1;
-
-       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
-               struct ixgbe_q_vector *q_vector = adapter->q_vector[q_idx];
-               adapter->q_vector[q_idx] = NULL;
-               netif_napi_del(&q_vector->napi);
-               kfree(q_vector);
-       }
-}
-
-static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
-{
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-               adapter->flags &= ~IXGBE_FLAG_MSIX_ENABLED;
-               pci_disable_msix(adapter->pdev);
-               kfree(adapter->msix_entries);
-               adapter->msix_entries = NULL;
-       } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
-               adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
-               pci_disable_msi(adapter->pdev);
-       }
-}
-
-/**
- * ixgbe_init_interrupt_scheme - Determine proper interrupt scheme
- * @adapter: board private structure to initialize
- *
- * We determine which interrupt scheme to use based on...
- * - Kernel support (MSI, MSI-X)
- *   - which can be user-defined (via MODULE_PARAM)
- * - Hardware queue count (num_*_queues)
- *   - defined by miscellaneous hardware support/features (RSS, etc.)
- **/
-int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)
-{
-       int err;
-
-       /* Number of supported queues */
-       err = ixgbe_set_num_queues(adapter);
-       if (err)
-               return err;
-
-       err = ixgbe_set_interrupt_capability(adapter);
-       if (err) {
-               e_dev_err("Unable to setup interrupt capabilities\n");
-               goto err_set_interrupt;
-       }
-
-       err = ixgbe_alloc_q_vectors(adapter);
-       if (err) {
-               e_dev_err("Unable to allocate memory for queue vectors\n");
-               goto err_alloc_q_vectors;
-       }
-
-       err = ixgbe_alloc_queues(adapter);
-       if (err) {
-               e_dev_err("Unable to allocate memory for queues\n");
-               goto err_alloc_queues;
-       }
-
-       e_dev_info("Multiqueue %s: Rx Queue count = %u, Tx Queue count = %u\n",
-                  (adapter->num_rx_queues > 1) ? "Enabled" : "Disabled",
-                  adapter->num_rx_queues, adapter->num_tx_queues);
-
-       set_bit(__IXGBE_DOWN, &adapter->state);
-
-       return 0;
-
-err_alloc_queues:
-       ixgbe_free_q_vectors(adapter);
-err_alloc_q_vectors:
-       ixgbe_reset_interrupt_capability(adapter);
-err_set_interrupt:
-       return err;
-}
-
-/**
- * ixgbe_clear_interrupt_scheme - Clear the current interrupt scheme settings
- * @adapter: board private structure to clear interrupt scheme on
- *
- * We go through and clear interrupt specific resources and reset the structure
- * to pre-load conditions
- **/
-void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               kfree(adapter->tx_ring[i]);
-               adapter->tx_ring[i] = NULL;
-       }
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct ixgbe_ring *ring = adapter->rx_ring[i];
-
-               /* ixgbe_get_stats64() might access this ring, we must wait
-                * a grace period before freeing it.
-                */
-               kfree_rcu(ring, rcu);
-               adapter->rx_ring[i] = NULL;
-       }
-
-       adapter->num_tx_queues = 0;
-       adapter->num_rx_queues = 0;
-
-       ixgbe_free_q_vectors(adapter);
-       ixgbe_reset_interrupt_capability(adapter);
-}
-
-/**
- * ixgbe_sw_init - Initialize general software structures (struct ixgbe_adapter)
- * @adapter: board private structure to initialize
- *
- * ixgbe_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 __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       struct net_device *dev = adapter->netdev;
-       unsigned int rss;
-#ifdef CONFIG_IXGBE_DCB
-       int j;
-       struct tc_configuration *tc;
-#endif
-       int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
-
-       /* PCI config space info */
-
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-       hw->revision_id = pdev->revision;
-       hw->subsystem_vendor_id = pdev->subsystem_vendor;
-       hw->subsystem_device_id = pdev->subsystem_device;
-
-       /* Set capability flags */
-       rss = min(IXGBE_MAX_RSS_INDICES, (int)num_online_cpus());
-       adapter->ring_feature[RING_F_RSS].indices = rss;
-       adapter->flags |= IXGBE_FLAG_RSS_ENABLED;
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               if (hw->device_id == IXGBE_DEV_ID_82598AT)
-                       adapter->flags |= IXGBE_FLAG_FAN_FAIL_CAPABLE;
-               adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82598;
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82599;
-               adapter->flags2 |= IXGBE_FLAG2_RSC_CAPABLE;
-               adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;
-               if (hw->device_id == IXGBE_DEV_ID_82599_T3_LOM)
-                       adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_CAPABLE;
-               /* Flow Director hash filters enabled */
-               adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
-               adapter->atr_sample_rate = 20;
-               adapter->ring_feature[RING_F_FDIR].indices =
-                                                        IXGBE_MAX_FDIR_INDICES;
-               adapter->fdir_pballoc = IXGBE_FDIR_PBALLOC_64K;
-#ifdef IXGBE_FCOE
-               adapter->flags |= IXGBE_FLAG_FCOE_CAPABLE;
-               adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED;
-               adapter->ring_feature[RING_F_FCOE].indices = 0;
-#ifdef CONFIG_IXGBE_DCB
-               /* Default traffic class to use for FCoE */
-               adapter->fcoe.up = IXGBE_FCOE_DEFTC;
-#endif
-#endif /* IXGBE_FCOE */
-               break;
-       default:
-               break;
-       }
-
-       /* n-tuple support exists, always init our spinlock */
-       spin_lock_init(&adapter->fdir_perfect_lock);
-
-#ifdef CONFIG_IXGBE_DCB
-       /* Configure DCB traffic classes */
-       for (j = 0; j < MAX_TRAFFIC_CLASS; j++) {
-               tc = &adapter->dcb_cfg.tc_config[j];
-               tc->path[DCB_TX_CONFIG].bwg_id = 0;
-               tc->path[DCB_TX_CONFIG].bwg_percent = 12 + (j & 1);
-               tc->path[DCB_RX_CONFIG].bwg_id = 0;
-               tc->path[DCB_RX_CONFIG].bwg_percent = 12 + (j & 1);
-               tc->dcb_pfc = pfc_disabled;
-       }
-       adapter->dcb_cfg.bw_percentage[DCB_TX_CONFIG][0] = 100;
-       adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100;
-       adapter->dcb_cfg.pfc_mode_enable = false;
-       adapter->dcb_set_bitmap = 0x00;
-       adapter->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE;
-       ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,
-                          MAX_TRAFFIC_CLASS);
-
-#endif
-
-       /* default flow control settings */
-       hw->fc.requested_mode = ixgbe_fc_full;
-       hw->fc.current_mode = ixgbe_fc_full;    /* init for ethtool output */
-#ifdef CONFIG_DCB
-       adapter->last_lfc_mode = hw->fc.current_mode;
-#endif
-       hw->fc.high_water = FC_HIGH_WATER(max_frame);
-       hw->fc.low_water = FC_LOW_WATER(max_frame);
-       hw->fc.pause_time = IXGBE_DEFAULT_FCPAUSE;
-       hw->fc.send_xon = true;
-       hw->fc.disable_fc_autoneg = false;
-
-       /* enable itr by default in dynamic mode */
-       adapter->rx_itr_setting = 1;
-       adapter->rx_eitr_param = 20000;
-       adapter->tx_itr_setting = 1;
-       adapter->tx_eitr_param = 10000;
-
-       /* set defaults for eitr in MegaBytes */
-       adapter->eitr_low = 10;
-       adapter->eitr_high = 20;
-
-       /* set default ring sizes */
-       adapter->tx_ring_count = IXGBE_DEFAULT_TXD;
-       adapter->rx_ring_count = IXGBE_DEFAULT_RXD;
-
-       /* set default work limits */
-       adapter->tx_work_limit = adapter->tx_ring_count;
-
-       /* initialize eeprom parameters */
-       if (ixgbe_init_eeprom_params_generic(hw)) {
-               e_dev_err("EEPROM initialization failed\n");
-               return -EIO;
-       }
-
-       /* enable rx csum by default */
-       adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
-
-       /* get assigned NUMA node */
-       adapter->node = dev_to_node(&pdev->dev);
-
-       set_bit(__IXGBE_DOWN, &adapter->state);
-
-       return 0;
-}
-
-/**
- * ixgbe_setup_tx_resources - allocate Tx resources (Descriptors)
- * @tx_ring:    tx descriptor ring (for a specific queue) to setup
- *
- * Return 0 on success, negative on failure
- **/
-int ixgbe_setup_tx_resources(struct ixgbe_ring *tx_ring)
-{
-       struct device *dev = tx_ring->dev;
-       int size;
-
-       size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
-       tx_ring->tx_buffer_info = vzalloc_node(size, tx_ring->numa_node);
-       if (!tx_ring->tx_buffer_info)
-               tx_ring->tx_buffer_info = vzalloc(size);
-       if (!tx_ring->tx_buffer_info)
-               goto err;
-
-       /* round up to nearest 4K */
-       tx_ring->size = tx_ring->count * sizeof(union ixgbe_adv_tx_desc);
-       tx_ring->size = ALIGN(tx_ring->size, 4096);
-
-       tx_ring->desc = dma_alloc_coherent(dev, tx_ring->size,
-                                          &tx_ring->dma, GFP_KERNEL);
-       if (!tx_ring->desc)
-               goto err;
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-       return 0;
-
-err:
-       vfree(tx_ring->tx_buffer_info);
-       tx_ring->tx_buffer_info = NULL;
-       dev_err(dev, "Unable to allocate memory for the Tx descriptor ring\n");
-       return -ENOMEM;
-}
-
-/**
- * ixgbe_setup_all_tx_resources - allocate all queues Tx resources
- * @adapter: board private structure
- *
- * If this function returns with an error, then it's possible one or
- * more of the rings is populated (while the rest are not).  It is the
- * callers duty to clean those orphaned rings.
- *
- * Return 0 on success, negative on failure
- **/
-static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               err = ixgbe_setup_tx_resources(adapter->tx_ring[i]);
-               if (!err)
-                       continue;
-               e_err(probe, "Allocation for Tx Queue %u failed\n", i);
-               break;
-       }
-
-       return err;
-}
-
-/**
- * ixgbe_setup_rx_resources - allocate Rx resources (Descriptors)
- * @rx_ring:    rx descriptor ring (for a specific queue) to setup
- *
- * Returns 0 on success, negative on failure
- **/
-int ixgbe_setup_rx_resources(struct ixgbe_ring *rx_ring)
-{
-       struct device *dev = rx_ring->dev;
-       int size;
-
-       size = sizeof(struct ixgbe_rx_buffer) * rx_ring->count;
-       rx_ring->rx_buffer_info = vzalloc_node(size, rx_ring->numa_node);
-       if (!rx_ring->rx_buffer_info)
-               rx_ring->rx_buffer_info = vzalloc(size);
-       if (!rx_ring->rx_buffer_info)
-               goto err;
-
-       /* Round up to nearest 4K */
-       rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
-       rx_ring->size = ALIGN(rx_ring->size, 4096);
-
-       rx_ring->desc = dma_alloc_coherent(dev, rx_ring->size,
-                                          &rx_ring->dma, GFP_KERNEL);
-
-       if (!rx_ring->desc)
-               goto err;
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       return 0;
-err:
-       vfree(rx_ring->rx_buffer_info);
-       rx_ring->rx_buffer_info = NULL;
-       dev_err(dev, "Unable to allocate memory for the Rx descriptor ring\n");
-       return -ENOMEM;
-}
-
-/**
- * ixgbe_setup_all_rx_resources - allocate all queues Rx resources
- * @adapter: board private structure
- *
- * If this function returns with an error, then it's possible one or
- * more of the rings is populated (while the rest are not).  It is the
- * callers duty to clean those orphaned rings.
- *
- * Return 0 on success, negative on failure
- **/
-static int ixgbe_setup_all_rx_resources(struct ixgbe_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               err = ixgbe_setup_rx_resources(adapter->rx_ring[i]);
-               if (!err)
-                       continue;
-               e_err(probe, "Allocation for Rx Queue %u failed\n", i);
-               break;
-       }
-
-       return err;
-}
-
-/**
- * ixgbe_free_tx_resources - Free Tx Resources per Queue
- * @tx_ring: Tx descriptor ring for a specific queue
- *
- * Free all transmit software resources
- **/
-void ixgbe_free_tx_resources(struct ixgbe_ring *tx_ring)
-{
-       ixgbe_clean_tx_ring(tx_ring);
-
-       vfree(tx_ring->tx_buffer_info);
-       tx_ring->tx_buffer_info = NULL;
-
-       /* if not set, then don't free */
-       if (!tx_ring->desc)
-               return;
-
-       dma_free_coherent(tx_ring->dev, tx_ring->size,
-                         tx_ring->desc, tx_ring->dma);
-
-       tx_ring->desc = NULL;
-}
-
-/**
- * ixgbe_free_all_tx_resources - Free Tx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all transmit software resources
- **/
-static void ixgbe_free_all_tx_resources(struct ixgbe_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               if (adapter->tx_ring[i]->desc)
-                       ixgbe_free_tx_resources(adapter->tx_ring[i]);
-}
-
-/**
- * ixgbe_free_rx_resources - Free Rx Resources
- * @rx_ring: ring to clean the resources from
- *
- * Free all receive software resources
- **/
-void ixgbe_free_rx_resources(struct ixgbe_ring *rx_ring)
-{
-       ixgbe_clean_rx_ring(rx_ring);
-
-       vfree(rx_ring->rx_buffer_info);
-       rx_ring->rx_buffer_info = NULL;
-
-       /* if not set, then don't free */
-       if (!rx_ring->desc)
-               return;
-
-       dma_free_coherent(rx_ring->dev, rx_ring->size,
-                         rx_ring->desc, rx_ring->dma);
-
-       rx_ring->desc = NULL;
-}
-
-/**
- * ixgbe_free_all_rx_resources - Free Rx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all receive software resources
- **/
-static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               if (adapter->rx_ring[i]->desc)
-                       ixgbe_free_rx_resources(adapter->rx_ring[i]);
-}
-
-/**
- * ixgbe_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
-
-       /* MTU < 68 is an error and causes problems on some kernels */
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED &&
-           hw->mac.type != ixgbe_mac_X540) {
-               if ((new_mtu < 68) || (max_frame > MAXIMUM_ETHERNET_VLAN_SIZE))
-                       return -EINVAL;
-       } else {
-               if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
-                       return -EINVAL;
-       }
-
-       e_info(probe, "changing MTU from %d to %d\n", netdev->mtu, new_mtu);
-       /* must set new MTU before calling down or up */
-       netdev->mtu = new_mtu;
-
-       hw->fc.high_water = FC_HIGH_WATER(max_frame);
-       hw->fc.low_water = FC_LOW_WATER(max_frame);
-
-       if (netif_running(netdev))
-               ixgbe_reinit_locked(adapter);
-
-       return 0;
-}
-
-/**
- * ixgbe_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-static int ixgbe_open(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       int err;
-
-       /* disallow open during test */
-       if (test_bit(__IXGBE_TESTING, &adapter->state))
-               return -EBUSY;
-
-       netif_carrier_off(netdev);
-
-       /* allocate transmit descriptors */
-       err = ixgbe_setup_all_tx_resources(adapter);
-       if (err)
-               goto err_setup_tx;
-
-       /* allocate receive descriptors */
-       err = ixgbe_setup_all_rx_resources(adapter);
-       if (err)
-               goto err_setup_rx;
-
-       ixgbe_configure(adapter);
-
-       err = ixgbe_request_irq(adapter);
-       if (err)
-               goto err_req_irq;
-
-       err = ixgbe_up_complete(adapter);
-       if (err)
-               goto err_up;
-
-       netif_tx_start_all_queues(netdev);
-
-       return 0;
-
-err_up:
-       ixgbe_release_hw_control(adapter);
-       ixgbe_free_irq(adapter);
-err_req_irq:
-err_setup_rx:
-       ixgbe_free_all_rx_resources(adapter);
-err_setup_tx:
-       ixgbe_free_all_tx_resources(adapter);
-       ixgbe_reset(adapter);
-
-       return err;
-}
-
-/**
- * ixgbe_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-static int ixgbe_close(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       ixgbe_down(adapter);
-       ixgbe_free_irq(adapter);
-
-       ixgbe_fdir_filter_exit(adapter);
-
-       ixgbe_free_all_tx_resources(adapter);
-       ixgbe_free_all_rx_resources(adapter);
-
-       ixgbe_release_hw_control(adapter);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int ixgbe_resume(struct pci_dev *pdev)
-{
-       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
-       struct net_device *netdev = adapter->netdev;
-       u32 err;
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       /*
-        * pci_restore_state clears dev->state_saved so call
-        * pci_save_state to restore it.
-        */
-       pci_save_state(pdev);
-
-       err = pci_enable_device_mem(pdev);
-       if (err) {
-               e_dev_err("Cannot enable PCI device from suspend\n");
-               return err;
-       }
-       pci_set_master(pdev);
-
-       pci_wake_from_d3(pdev, false);
-
-       err = ixgbe_init_interrupt_scheme(adapter);
-       if (err) {
-               e_dev_err("Cannot initialize interrupts for device\n");
-               return err;
-       }
-
-       ixgbe_reset(adapter);
-
-       IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
-
-       if (netif_running(netdev)) {
-               err = ixgbe_open(netdev);
-               if (err)
-                       return err;
-       }
-
-       netif_device_attach(netdev);
-
-       return 0;
-}
-#endif /* CONFIG_PM */
-
-static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
-{
-       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 ctrl, fctrl;
-       u32 wufc = adapter->wol;
-#ifdef CONFIG_PM
-       int retval = 0;
-#endif
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev)) {
-               ixgbe_down(adapter);
-               ixgbe_free_irq(adapter);
-               ixgbe_free_all_tx_resources(adapter);
-               ixgbe_free_all_rx_resources(adapter);
-       }
-
-       ixgbe_clear_interrupt_scheme(adapter);
-#ifdef CONFIG_DCB
-       kfree(adapter->ixgbe_ieee_pfc);
-       kfree(adapter->ixgbe_ieee_ets);
-#endif
-
-#ifdef CONFIG_PM
-       retval = pci_save_state(pdev);
-       if (retval)
-               return retval;
-
-#endif
-       if (wufc) {
-               ixgbe_set_rx_mode(netdev);
-
-               /* turn on all-multi mode if wake on multicast is enabled */
-               if (wufc & IXGBE_WUFC_MC) {
-                       fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-                       fctrl |= IXGBE_FCTRL_MPE;
-                       IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
-               }
-
-               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-               ctrl |= IXGBE_CTRL_GIO_DIS;
-               IXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);
-
-               IXGBE_WRITE_REG(hw, IXGBE_WUFC, wufc);
-       } else {
-               IXGBE_WRITE_REG(hw, IXGBE_WUC, 0);
-               IXGBE_WRITE_REG(hw, IXGBE_WUFC, 0);
-       }
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               pci_wake_from_d3(pdev, false);
-               break;
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               pci_wake_from_d3(pdev, !!wufc);
-               break;
-       default:
-               break;
-       }
-
-       *enable_wake = !!wufc;
-
-       ixgbe_release_hw_control(adapter);
-
-       pci_disable_device(pdev);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int ixgbe_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       int retval;
-       bool wake;
-
-       retval = __ixgbe_shutdown(pdev, &wake);
-       if (retval)
-               return retval;
-
-       if (wake) {
-               pci_prepare_to_sleep(pdev);
-       } else {
-               pci_wake_from_d3(pdev, false);
-               pci_set_power_state(pdev, PCI_D3hot);
-       }
-
-       return 0;
-}
-#endif /* CONFIG_PM */
-
-static void ixgbe_shutdown(struct pci_dev *pdev)
-{
-       bool wake;
-
-       __ixgbe_shutdown(pdev, &wake);
-
-       if (system_state == SYSTEM_POWER_OFF) {
-               pci_wake_from_d3(pdev, wake);
-               pci_set_power_state(pdev, PCI_D3hot);
-       }
-}
-
-/**
- * ixgbe_update_stats - Update the board statistics counters.
- * @adapter: board private structure
- **/
-void ixgbe_update_stats(struct ixgbe_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbe_hw_stats *hwstats = &adapter->stats;
-       u64 total_mpc = 0;
-       u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
-       u64 non_eop_descs = 0, restart_queue = 0, tx_busy = 0;
-       u64 alloc_rx_page_failed = 0, alloc_rx_buff_failed = 0;
-       u64 bytes = 0, packets = 0;
-
-       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
-           test_bit(__IXGBE_RESETTING, &adapter->state))
-               return;
-
-       if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
-               u64 rsc_count = 0;
-               u64 rsc_flush = 0;
-               for (i = 0; i < 16; i++)
-                       adapter->hw_rx_no_dma_resources +=
-                               IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
-               for (i = 0; i < adapter->num_rx_queues; i++) {
-                       rsc_count += adapter->rx_ring[i]->rx_stats.rsc_count;
-                       rsc_flush += adapter->rx_ring[i]->rx_stats.rsc_flush;
-               }
-               adapter->rsc_total_count = rsc_count;
-               adapter->rsc_total_flush = rsc_flush;
-       }
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct ixgbe_ring *rx_ring = adapter->rx_ring[i];
-               non_eop_descs += rx_ring->rx_stats.non_eop_descs;
-               alloc_rx_page_failed += rx_ring->rx_stats.alloc_rx_page_failed;
-               alloc_rx_buff_failed += rx_ring->rx_stats.alloc_rx_buff_failed;
-               bytes += rx_ring->stats.bytes;
-               packets += rx_ring->stats.packets;
-       }
-       adapter->non_eop_descs = non_eop_descs;
-       adapter->alloc_rx_page_failed = alloc_rx_page_failed;
-       adapter->alloc_rx_buff_failed = alloc_rx_buff_failed;
-       netdev->stats.rx_bytes = bytes;
-       netdev->stats.rx_packets = packets;
-
-       bytes = 0;
-       packets = 0;
-       /* gather some stats to the adapter struct that are per queue */
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               struct ixgbe_ring *tx_ring = adapter->tx_ring[i];
-               restart_queue += tx_ring->tx_stats.restart_queue;
-               tx_busy += tx_ring->tx_stats.tx_busy;
-               bytes += tx_ring->stats.bytes;
-               packets += tx_ring->stats.packets;
-       }
-       adapter->restart_queue = restart_queue;
-       adapter->tx_busy = tx_busy;
-       netdev->stats.tx_bytes = bytes;
-       netdev->stats.tx_packets = packets;
-
-       hwstats->crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
-       for (i = 0; i < 8; i++) {
-               /* for packet buffers not used, the register should read 0 */
-               mpc = IXGBE_READ_REG(hw, IXGBE_MPC(i));
-               missed_rx += mpc;
-               hwstats->mpc[i] += mpc;
-               total_mpc += hwstats->mpc[i];
-               if (hw->mac.type == ixgbe_mac_82598EB)
-                       hwstats->rnbc[i] += IXGBE_READ_REG(hw, IXGBE_RNBC(i));
-               hwstats->qptc[i] += IXGBE_READ_REG(hw, IXGBE_QPTC(i));
-               hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC(i));
-               hwstats->qprc[i] += IXGBE_READ_REG(hw, IXGBE_QPRC(i));
-               hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC(i));
-               switch (hw->mac.type) {
-               case ixgbe_mac_82598EB:
-                       hwstats->pxonrxc[i] +=
-                               IXGBE_READ_REG(hw, IXGBE_PXONRXC(i));
-                       break;
-               case ixgbe_mac_82599EB:
-               case ixgbe_mac_X540:
-                       hwstats->pxonrxc[i] +=
-                               IXGBE_READ_REG(hw, IXGBE_PXONRXCNT(i));
-                       break;
-               default:
-                       break;
-               }
-               hwstats->pxontxc[i] += IXGBE_READ_REG(hw, IXGBE_PXONTXC(i));
-               hwstats->pxofftxc[i] += IXGBE_READ_REG(hw, IXGBE_PXOFFTXC(i));
-       }
-       hwstats->gprc += IXGBE_READ_REG(hw, IXGBE_GPRC);
-       /* work around hardware counting issue */
-       hwstats->gprc -= missed_rx;
-
-       ixgbe_update_xoff_received(adapter);
-
-       /* 82598 hardware only has a 32 bit counter in the high register */
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB:
-               hwstats->lxonrxc += IXGBE_READ_REG(hw, IXGBE_LXONRXC);
-               hwstats->gorc += IXGBE_READ_REG(hw, IXGBE_GORCH);
-               hwstats->gotc += IXGBE_READ_REG(hw, IXGBE_GOTCH);
-               hwstats->tor += IXGBE_READ_REG(hw, IXGBE_TORH);
-               break;
-       case ixgbe_mac_X540:
-               /* OS2BMC stats are X540 only*/
-               hwstats->o2bgptc += IXGBE_READ_REG(hw, IXGBE_O2BGPTC);
-               hwstats->o2bspc += IXGBE_READ_REG(hw, IXGBE_O2BSPC);
-               hwstats->b2ospc += IXGBE_READ_REG(hw, IXGBE_B2OSPC);
-               hwstats->b2ogprc += IXGBE_READ_REG(hw, IXGBE_B2OGPRC);
-       case ixgbe_mac_82599EB:
-               hwstats->gorc += IXGBE_READ_REG(hw, IXGBE_GORCL);
-               IXGBE_READ_REG(hw, IXGBE_GORCH); /* to clear */
-               hwstats->gotc += IXGBE_READ_REG(hw, IXGBE_GOTCL);
-               IXGBE_READ_REG(hw, IXGBE_GOTCH); /* to clear */
-               hwstats->tor += IXGBE_READ_REG(hw, IXGBE_TORL);
-               IXGBE_READ_REG(hw, IXGBE_TORH); /* to clear */
-               hwstats->lxonrxc += IXGBE_READ_REG(hw, IXGBE_LXONRXCNT);
-               hwstats->fdirmatch += IXGBE_READ_REG(hw, IXGBE_FDIRMATCH);
-               hwstats->fdirmiss += IXGBE_READ_REG(hw, IXGBE_FDIRMISS);
-#ifdef IXGBE_FCOE
-               hwstats->fccrc += IXGBE_READ_REG(hw, IXGBE_FCCRC);
-               hwstats->fcoerpdc += IXGBE_READ_REG(hw, IXGBE_FCOERPDC);
-               hwstats->fcoeprc += IXGBE_READ_REG(hw, IXGBE_FCOEPRC);
-               hwstats->fcoeptc += IXGBE_READ_REG(hw, IXGBE_FCOEPTC);
-               hwstats->fcoedwrc += IXGBE_READ_REG(hw, IXGBE_FCOEDWRC);
-               hwstats->fcoedwtc += IXGBE_READ_REG(hw, IXGBE_FCOEDWTC);
-#endif /* IXGBE_FCOE */
-               break;
-       default:
-               break;
-       }
-       bprc = IXGBE_READ_REG(hw, IXGBE_BPRC);
-       hwstats->bprc += bprc;
-       hwstats->mprc += IXGBE_READ_REG(hw, IXGBE_MPRC);
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               hwstats->mprc -= bprc;
-       hwstats->roc += IXGBE_READ_REG(hw, IXGBE_ROC);
-       hwstats->prc64 += IXGBE_READ_REG(hw, IXGBE_PRC64);
-       hwstats->prc127 += IXGBE_READ_REG(hw, IXGBE_PRC127);
-       hwstats->prc255 += IXGBE_READ_REG(hw, IXGBE_PRC255);
-       hwstats->prc511 += IXGBE_READ_REG(hw, IXGBE_PRC511);
-       hwstats->prc1023 += IXGBE_READ_REG(hw, IXGBE_PRC1023);
-       hwstats->prc1522 += IXGBE_READ_REG(hw, IXGBE_PRC1522);
-       hwstats->rlec += IXGBE_READ_REG(hw, IXGBE_RLEC);
-       lxon = IXGBE_READ_REG(hw, IXGBE_LXONTXC);
-       hwstats->lxontxc += lxon;
-       lxoff = IXGBE_READ_REG(hw, IXGBE_LXOFFTXC);
-       hwstats->lxofftxc += lxoff;
-       hwstats->ruc += IXGBE_READ_REG(hw, IXGBE_RUC);
-       hwstats->gptc += IXGBE_READ_REG(hw, IXGBE_GPTC);
-       hwstats->mptc += IXGBE_READ_REG(hw, IXGBE_MPTC);
-       /*
-        * 82598 errata - tx of flow control packets is included in tx counters
-        */
-       xon_off_tot = lxon + lxoff;
-       hwstats->gptc -= xon_off_tot;
-       hwstats->mptc -= xon_off_tot;
-       hwstats->gotc -= (xon_off_tot * (ETH_ZLEN + ETH_FCS_LEN));
-       hwstats->ruc += IXGBE_READ_REG(hw, IXGBE_RUC);
-       hwstats->rfc += IXGBE_READ_REG(hw, IXGBE_RFC);
-       hwstats->rjc += IXGBE_READ_REG(hw, IXGBE_RJC);
-       hwstats->tpr += IXGBE_READ_REG(hw, IXGBE_TPR);
-       hwstats->ptc64 += IXGBE_READ_REG(hw, IXGBE_PTC64);
-       hwstats->ptc64 -= xon_off_tot;
-       hwstats->ptc127 += IXGBE_READ_REG(hw, IXGBE_PTC127);
-       hwstats->ptc255 += IXGBE_READ_REG(hw, IXGBE_PTC255);
-       hwstats->ptc511 += IXGBE_READ_REG(hw, IXGBE_PTC511);
-       hwstats->ptc1023 += IXGBE_READ_REG(hw, IXGBE_PTC1023);
-       hwstats->ptc1522 += IXGBE_READ_REG(hw, IXGBE_PTC1522);
-       hwstats->bptc += IXGBE_READ_REG(hw, IXGBE_BPTC);
-
-       /* Fill out the OS statistics structure */
-       netdev->stats.multicast = hwstats->mprc;
-
-       /* Rx Errors */
-       netdev->stats.rx_errors = hwstats->crcerrs + hwstats->rlec;
-       netdev->stats.rx_dropped = 0;
-       netdev->stats.rx_length_errors = hwstats->rlec;
-       netdev->stats.rx_crc_errors = hwstats->crcerrs;
-       netdev->stats.rx_missed_errors = total_mpc;
-}
-
-/**
- * ixgbe_fdir_reinit_subtask - worker thread to reinit FDIR filter table
- * @adapter - pointer to the device adapter structure
- **/
-static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int i;
-
-       if (!(adapter->flags2 & IXGBE_FLAG2_FDIR_REQUIRES_REINIT))
-               return;
-
-       adapter->flags2 &= ~IXGBE_FLAG2_FDIR_REQUIRES_REINIT;
-
-       /* if interface is down do nothing */
-       if (test_bit(__IXGBE_DOWN, &adapter->state))
-               return;
-
-       /* do nothing if we are not using signature filters */
-       if (!(adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE))
-               return;
-
-       adapter->fdir_overflow++;
-
-       if (ixgbe_reinit_fdir_tables_82599(hw) == 0) {
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       set_bit(__IXGBE_TX_FDIR_INIT_DONE,
-                               &(adapter->tx_ring[i]->state));
-               /* re-enable flow director interrupts */
-               IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_FLOW_DIR);
-       } else {
-               e_err(probe, "failed to finish FDIR re-initialization, "
-                     "ignored adding FDIR ATR filters\n");
-       }
-}
-
-/**
- * ixgbe_check_hang_subtask - check for hung queues and dropped interrupts
- * @adapter - pointer to the device adapter structure
- *
- * This function serves two purposes.  First it strobes the interrupt lines
- * in order to make certain interrupts are occuring.  Secondly it sets the
- * bits needed to check for TX hangs.  As a result we should immediately
- * determine if a hang has occured.
- */
-static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u64 eics = 0;
-       int i;
-
-       /* If we're down or resetting, just bail */
-       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
-           test_bit(__IXGBE_RESETTING, &adapter->state))
-               return;
-
-       /* Force detection of hung controller */
-       if (netif_carrier_ok(adapter->netdev)) {
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       set_check_for_tx_hang(adapter->tx_ring[i]);
-       }
-
-       if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
-               /*
-                * for legacy and MSI interrupts don't set any bits
-                * that are enabled for EIAM, because this operation
-                * would set *both* EIMS and EICS for any bit in EIAM
-                */
-               IXGBE_WRITE_REG(hw, IXGBE_EICS,
-                       (IXGBE_EICS_TCP_TIMER | IXGBE_EICS_OTHER));
-       } else {
-               /* get one bit for every active tx/rx interrupt vector */
-               for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) {
-                       struct ixgbe_q_vector *qv = adapter->q_vector[i];
-                       if (qv->rx.count || qv->tx.count)
-                               eics |= ((u64)1 << i);
-               }
-       }
-
-       /* Cause software interrupt to ensure rings are cleaned */
-       ixgbe_irq_rearm_queues(adapter, eics);
-
-}
-
-/**
- * ixgbe_watchdog_update_link - update the link status
- * @adapter - pointer to the device adapter structure
- * @link_speed - pointer to a u32 to store the link_speed
- **/
-static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 link_speed = adapter->link_speed;
-       bool link_up = adapter->link_up;
-       int i;
-
-       if (!(adapter->flags & IXGBE_FLAG_NEED_LINK_UPDATE))
-               return;
-
-       if (hw->mac.ops.check_link) {
-               hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
-       } else {
-               /* always assume link is up, if no check link function */
-               link_speed = IXGBE_LINK_SPEED_10GB_FULL;
-               link_up = true;
-       }
-       if (link_up) {
-               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                       for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                               hw->mac.ops.fc_enable(hw, i);
-               } else {
-                       hw->mac.ops.fc_enable(hw, 0);
-               }
-       }
-
-       if (link_up ||
-           time_after(jiffies, (adapter->link_check_timeout +
-                                IXGBE_TRY_LINK_TIMEOUT))) {
-               adapter->flags &= ~IXGBE_FLAG_NEED_LINK_UPDATE;
-               IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMC_LSC);
-               IXGBE_WRITE_FLUSH(hw);
-       }
-
-       adapter->link_up = link_up;
-       adapter->link_speed = link_speed;
-}
-
-/**
- * ixgbe_watchdog_link_is_up - update netif_carrier status and
- *                             print link up message
- * @adapter - pointer to the device adapter structure
- **/
-static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 link_speed = adapter->link_speed;
-       bool flow_rx, flow_tx;
-
-       /* only continue if link was previously down */
-       if (netif_carrier_ok(netdev))
-               return;
-
-       adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82598EB: {
-               u32 frctl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-               u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS);
-               flow_rx = !!(frctl & IXGBE_FCTRL_RFCE);
-               flow_tx = !!(rmcs & IXGBE_RMCS_TFCE_802_3X);
-       }
-               break;
-       case ixgbe_mac_X540:
-       case ixgbe_mac_82599EB: {
-               u32 mflcn = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-               u32 fccfg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
-               flow_rx = !!(mflcn & IXGBE_MFLCN_RFCE);
-               flow_tx = !!(fccfg & IXGBE_FCCFG_TFCE_802_3X);
-       }
-               break;
-       default:
-               flow_tx = false;
-               flow_rx = false;
-               break;
-       }
-       e_info(drv, "NIC Link is Up %s, Flow Control: %s\n",
-              (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
-              "10 Gbps" :
-              (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-              "1 Gbps" :
-              (link_speed == IXGBE_LINK_SPEED_100_FULL ?
-              "100 Mbps" :
-              "unknown speed"))),
-              ((flow_rx && flow_tx) ? "RX/TX" :
-              (flow_rx ? "RX" :
-              (flow_tx ? "TX" : "None"))));
-
-       netif_carrier_on(netdev);
-       ixgbe_check_vf_rate_limit(adapter);
-}
-
-/**
- * ixgbe_watchdog_link_is_down - update netif_carrier status and
- *                               print link down message
- * @adapter - pointer to the adapter structure
- **/
-static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter* adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       adapter->link_up = false;
-       adapter->link_speed = 0;
-
-       /* only continue if link was up previously */
-       if (!netif_carrier_ok(netdev))
-               return;
-
-       /* poll for SFP+ cable when link is down */
-       if (ixgbe_is_sfp(hw) && hw->mac.type == ixgbe_mac_82598EB)
-               adapter->flags2 |= IXGBE_FLAG2_SEARCH_FOR_SFP;
-
-       e_info(drv, "NIC Link is Down\n");
-       netif_carrier_off(netdev);
-}
-
-/**
- * ixgbe_watchdog_flush_tx - flush queues on link down
- * @adapter - pointer to the device adapter structure
- **/
-static void ixgbe_watchdog_flush_tx(struct ixgbe_adapter *adapter)
-{
-       int i;
-       int some_tx_pending = 0;
-
-       if (!netif_carrier_ok(adapter->netdev)) {
-               for (i = 0; i < adapter->num_tx_queues; i++) {
-                       struct ixgbe_ring *tx_ring = adapter->tx_ring[i];
-                       if (tx_ring->next_to_use != tx_ring->next_to_clean) {
-                               some_tx_pending = 1;
-                               break;
-                       }
-               }
-
-               if (some_tx_pending) {
-                       /* We've lost link, so the controller stops DMA,
-                        * but we've got queued Tx work that's never going
-                        * to get done, so reset controller to flush Tx.
-                        * (Do the reset outside of interrupt context).
-                        */
-                       adapter->flags2 |= IXGBE_FLAG2_RESET_REQUESTED;
-               }
-       }
-}
-
-static void ixgbe_spoof_check(struct ixgbe_adapter *adapter)
-{
-       u32 ssvpc;
-
-       /* Do not perform spoof check for 82598 */
-       if (adapter->hw.mac.type == ixgbe_mac_82598EB)
-               return;
-
-       ssvpc = IXGBE_READ_REG(&adapter->hw, IXGBE_SSVPC);
-
-       /*
-        * ssvpc register is cleared on read, if zero then no
-        * spoofed packets in the last interval.
-        */
-       if (!ssvpc)
-               return;
-
-       e_warn(drv, "%d Spoofed packets detected\n", ssvpc);
-}
-
-/**
- * ixgbe_watchdog_subtask - check and bring link up
- * @adapter - pointer to the device adapter structure
- **/
-static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter)
-{
-       /* if interface is down do nothing */
-       if (test_bit(__IXGBE_DOWN, &adapter->state))
-               return;
-
-       ixgbe_watchdog_update_link(adapter);
-
-       if (adapter->link_up)
-               ixgbe_watchdog_link_is_up(adapter);
-       else
-               ixgbe_watchdog_link_is_down(adapter);
-
-       ixgbe_spoof_check(adapter);
-       ixgbe_update_stats(adapter);
-
-       ixgbe_watchdog_flush_tx(adapter);
-}
-
-/**
- * ixgbe_sfp_detection_subtask - poll for SFP+ cable
- * @adapter - the ixgbe adapter structure
- **/
-static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       s32 err;
-
-       /* not searching for SFP so there is nothing to do here */
-       if (!(adapter->flags2 & IXGBE_FLAG2_SEARCH_FOR_SFP) &&
-           !(adapter->flags2 & IXGBE_FLAG2_SFP_NEEDS_RESET))
-               return;
-
-       /* someone else is in init, wait until next service event */
-       if (test_and_set_bit(__IXGBE_IN_SFP_INIT, &adapter->state))
-               return;
-
-       err = hw->phy.ops.identify_sfp(hw);
-       if (err == IXGBE_ERR_SFP_NOT_SUPPORTED)
-               goto sfp_out;
-
-       if (err == IXGBE_ERR_SFP_NOT_PRESENT) {
-               /* If no cable is present, then we need to reset
-                * the next time we find a good cable. */
-               adapter->flags2 |= IXGBE_FLAG2_SFP_NEEDS_RESET;
-       }
-
-       /* exit on error */
-       if (err)
-               goto sfp_out;
-
-       /* exit if reset not needed */
-       if (!(adapter->flags2 & IXGBE_FLAG2_SFP_NEEDS_RESET))
-               goto sfp_out;
-
-       adapter->flags2 &= ~IXGBE_FLAG2_SFP_NEEDS_RESET;
-
-       /*
-        * A module may be identified correctly, but the EEPROM may not have
-        * support for that module.  setup_sfp() will fail in that case, so
-        * we should not allow that module to load.
-        */
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               err = hw->phy.ops.reset(hw);
-       else
-               err = hw->mac.ops.setup_sfp(hw);
-
-       if (err == IXGBE_ERR_SFP_NOT_SUPPORTED)
-               goto sfp_out;
-
-       adapter->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
-       e_info(probe, "detected SFP+: %d\n", hw->phy.sfp_type);
-
-sfp_out:
-       clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);
-
-       if ((err == IXGBE_ERR_SFP_NOT_SUPPORTED) &&
-           (adapter->netdev->reg_state == NETREG_REGISTERED)) {
-               e_dev_err("failed to initialize because an unsupported "
-                         "SFP+ module type was detected.\n");
-               e_dev_err("Reload the driver after installing a "
-                         "supported module.\n");
-               unregister_netdev(adapter->netdev);
-       }
-}
-
-/**
- * ixgbe_sfp_link_config_subtask - set up link SFP after module install
- * @adapter - the ixgbe adapter structure
- **/
-static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 autoneg;
-       bool negotiation;
-
-       if (!(adapter->flags & IXGBE_FLAG_NEED_LINK_CONFIG))
-               return;
-
-       /* someone else is in init, wait until next service event */
-       if (test_and_set_bit(__IXGBE_IN_SFP_INIT, &adapter->state))
-               return;
-
-       adapter->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
-
-       autoneg = hw->phy.autoneg_advertised;
-       if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
-               hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
-       hw->mac.autotry_restart = false;
-       if (hw->mac.ops.setup_link)
-               hw->mac.ops.setup_link(hw, autoneg, negotiation, true);
-
-       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
-       adapter->link_check_timeout = jiffies;
-       clear_bit(__IXGBE_IN_SFP_INIT, &adapter->state);
-}
-
-/**
- * ixgbe_service_timer - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void ixgbe_service_timer(unsigned long data)
-{
-       struct ixgbe_adapter *adapter = (struct ixgbe_adapter *)data;
-       unsigned long next_event_offset;
-
-       /* poll faster when waiting for link */
-       if (adapter->flags & IXGBE_FLAG_NEED_LINK_UPDATE)
-               next_event_offset = HZ / 10;
-       else
-               next_event_offset = HZ * 2;
-
-       /* Reset the timer */
-       mod_timer(&adapter->service_timer, next_event_offset + jiffies);
-
-       ixgbe_service_event_schedule(adapter);
-}
-
-static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter)
-{
-       if (!(adapter->flags2 & IXGBE_FLAG2_RESET_REQUESTED))
-               return;
-
-       adapter->flags2 &= ~IXGBE_FLAG2_RESET_REQUESTED;
-
-       /* If we're already down or resetting, just bail */
-       if (test_bit(__IXGBE_DOWN, &adapter->state) ||
-           test_bit(__IXGBE_RESETTING, &adapter->state))
-               return;
-
-       ixgbe_dump(adapter);
-       netdev_err(adapter->netdev, "Reset adapter\n");
-       adapter->tx_timeout_count++;
-
-       ixgbe_reinit_locked(adapter);
-}
-
-/**
- * ixgbe_service_task - manages and runs subtasks
- * @work: pointer to work_struct containing our data
- **/
-static void ixgbe_service_task(struct work_struct *work)
-{
-       struct ixgbe_adapter *adapter = container_of(work,
-                                                    struct ixgbe_adapter,
-                                                    service_task);
-
-       ixgbe_reset_subtask(adapter);
-       ixgbe_sfp_detection_subtask(adapter);
-       ixgbe_sfp_link_config_subtask(adapter);
-       ixgbe_check_overtemp_subtask(adapter);
-       ixgbe_watchdog_subtask(adapter);
-       ixgbe_fdir_reinit_subtask(adapter);
-       ixgbe_check_hang_subtask(adapter);
-
-       ixgbe_service_event_complete(adapter);
-}
-
-void ixgbe_tx_ctxtdesc(struct ixgbe_ring *tx_ring, u32 vlan_macip_lens,
-                      u32 fcoe_sof_eof, u32 type_tucmd, u32 mss_l4len_idx)
-{
-       struct ixgbe_adv_tx_context_desc *context_desc;
-       u16 i = tx_ring->next_to_use;
-
-       context_desc = IXGBE_TX_CTXTDESC_ADV(tx_ring, i);
-
-       i++;
-       tx_ring->next_to_use = (i < tx_ring->count) ? i : 0;
-
-       /* set bits to identify this as an advanced context descriptor */
-       type_tucmd |= IXGBE_TXD_CMD_DEXT | IXGBE_ADVTXD_DTYP_CTXT;
-
-       context_desc->vlan_macip_lens   = cpu_to_le32(vlan_macip_lens);
-       context_desc->seqnum_seed       = cpu_to_le32(fcoe_sof_eof);
-       context_desc->type_tucmd_mlhl   = cpu_to_le32(type_tucmd);
-       context_desc->mss_l4len_idx     = cpu_to_le32(mss_l4len_idx);
-}
-
-static int ixgbe_tso(struct ixgbe_ring *tx_ring, struct sk_buff *skb,
-                    u32 tx_flags, __be16 protocol, u8 *hdr_len)
-{
-       int err;
-       u32 vlan_macip_lens, type_tucmd;
-       u32 mss_l4len_idx, l4len;
-
-       if (!skb_is_gso(skb))
-               return 0;
-
-       if (skb_header_cloned(skb)) {
-               err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-               if (err)
-                       return err;
-       }
-
-       /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
-       type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP;
-
-       if (protocol == __constant_htons(ETH_P_IP)) {
-               struct iphdr *iph = ip_hdr(skb);
-               iph->tot_len = 0;
-               iph->check = 0;
-               tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                        iph->daddr, 0,
-                                                        IPPROTO_TCP,
-                                                        0);
-               type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4;
-       } else if (skb_is_gso_v6(skb)) {
-               ipv6_hdr(skb)->payload_len = 0;
-               tcp_hdr(skb)->check =
-                   ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                    &ipv6_hdr(skb)->daddr,
-                                    0, IPPROTO_TCP, 0);
-       }
-
-       l4len = tcp_hdrlen(skb);
-       *hdr_len = skb_transport_offset(skb) + l4len;
-
-       /* mss_l4len_id: use 1 as index for TSO */
-       mss_l4len_idx = l4len << IXGBE_ADVTXD_L4LEN_SHIFT;
-       mss_l4len_idx |= skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT;
-       mss_l4len_idx |= 1 << IXGBE_ADVTXD_IDX_SHIFT;
-
-       /* vlan_macip_lens: HEADLEN, MACLEN, VLAN tag */
-       vlan_macip_lens = skb_network_header_len(skb);
-       vlan_macip_lens |= skb_network_offset(skb) << IXGBE_ADVTXD_MACLEN_SHIFT;
-       vlan_macip_lens |= tx_flags & IXGBE_TX_FLAGS_VLAN_MASK;
-
-       ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, 0, type_tucmd,
-                         mss_l4len_idx);
-
-       return 1;
-}
-
-static bool ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
-                         struct sk_buff *skb, u32 tx_flags,
-                         __be16 protocol)
-{
-       u32 vlan_macip_lens = 0;
-       u32 mss_l4len_idx = 0;
-       u32 type_tucmd = 0;
-
-       if (skb->ip_summed != CHECKSUM_PARTIAL) {
-           if (!(tx_flags & IXGBE_TX_FLAGS_VLAN))
-                       return false;
-       } else {
-               u8 l4_hdr = 0;
-               switch (protocol) {
-               case __constant_htons(ETH_P_IP):
-                       vlan_macip_lens |= skb_network_header_len(skb);
-                       type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4;
-                       l4_hdr = ip_hdr(skb)->protocol;
-                       break;
-               case __constant_htons(ETH_P_IPV6):
-                       vlan_macip_lens |= skb_network_header_len(skb);
-                       l4_hdr = ipv6_hdr(skb)->nexthdr;
-                       break;
-               default:
-                       if (unlikely(net_ratelimit())) {
-                               dev_warn(tx_ring->dev,
-                                "partial checksum but proto=%x!\n",
-                                skb->protocol);
-                       }
-                       break;
-               }
-
-               switch (l4_hdr) {
-               case IPPROTO_TCP:
-                       type_tucmd |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
-                       mss_l4len_idx = tcp_hdrlen(skb) <<
-                                       IXGBE_ADVTXD_L4LEN_SHIFT;
-                       break;
-               case IPPROTO_SCTP:
-                       type_tucmd |= IXGBE_ADVTXD_TUCMD_L4T_SCTP;
-                       mss_l4len_idx = sizeof(struct sctphdr) <<
-                                       IXGBE_ADVTXD_L4LEN_SHIFT;
-                       break;
-               case IPPROTO_UDP:
-                       mss_l4len_idx = sizeof(struct udphdr) <<
-                                       IXGBE_ADVTXD_L4LEN_SHIFT;
-                       break;
-               default:
-                       if (unlikely(net_ratelimit())) {
-                               dev_warn(tx_ring->dev,
-                                "partial checksum but l4 proto=%x!\n",
-                                skb->protocol);
-                       }
-                       break;
-               }
-       }
-
-       vlan_macip_lens |= skb_network_offset(skb) << IXGBE_ADVTXD_MACLEN_SHIFT;
-       vlan_macip_lens |= tx_flags & IXGBE_TX_FLAGS_VLAN_MASK;
-
-       ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, 0,
-                         type_tucmd, mss_l4len_idx);
-
-       return (skb->ip_summed == CHECKSUM_PARTIAL);
-}
-
-static int ixgbe_tx_map(struct ixgbe_adapter *adapter,
-                       struct ixgbe_ring *tx_ring,
-                       struct sk_buff *skb, u32 tx_flags,
-                       unsigned int first, const u8 hdr_len)
-{
-       struct device *dev = tx_ring->dev;
-       struct ixgbe_tx_buffer *tx_buffer_info;
-       unsigned int len;
-       unsigned int total = skb->len;
-       unsigned int offset = 0, size, count = 0;
-       unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
-       unsigned int f;
-       unsigned int bytecount = skb->len;
-       u16 gso_segs = 1;
-       u16 i;
-
-       i = tx_ring->next_to_use;
-
-       if (tx_flags & IXGBE_TX_FLAGS_FCOE)
-               /* excluding fcoe_crc_eof for FCoE */
-               total -= sizeof(struct fcoe_crc_eof);
-
-       len = min(skb_headlen(skb), total);
-       while (len) {
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               size = min(len, (uint)IXGBE_MAX_DATA_PER_TXD);
-
-               tx_buffer_info->length = size;
-               tx_buffer_info->mapped_as_page = false;
-               tx_buffer_info->dma = dma_map_single(dev,
-                                                    skb->data + offset,
-                                                    size, DMA_TO_DEVICE);
-               if (dma_mapping_error(dev, tx_buffer_info->dma))
-                       goto dma_error;
-               tx_buffer_info->time_stamp = jiffies;
-               tx_buffer_info->next_to_watch = i;
-
-               len -= size;
-               total -= size;
-               offset += size;
-               count++;
-
-               if (len) {
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-       }
-
-       for (f = 0; f < nr_frags; f++) {
-               struct skb_frag_struct *frag;
-
-               frag = &skb_shinfo(skb)->frags[f];
-               len = min((unsigned int)frag->size, total);
-               offset = frag->page_offset;
-
-               while (len) {
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-
-                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
-                       size = min(len, (uint)IXGBE_MAX_DATA_PER_TXD);
-
-                       tx_buffer_info->length = size;
-                       tx_buffer_info->dma = dma_map_page(dev,
-                                                          frag->page,
-                                                          offset, size,
-                                                          DMA_TO_DEVICE);
-                       tx_buffer_info->mapped_as_page = true;
-                       if (dma_mapping_error(dev, tx_buffer_info->dma))
-                               goto dma_error;
-                       tx_buffer_info->time_stamp = jiffies;
-                       tx_buffer_info->next_to_watch = i;
-
-                       len -= size;
-                       total -= size;
-                       offset += size;
-                       count++;
-               }
-               if (total == 0)
-                       break;
-       }
-
-       if (tx_flags & IXGBE_TX_FLAGS_TSO)
-               gso_segs = skb_shinfo(skb)->gso_segs;
-#ifdef IXGBE_FCOE
-       /* adjust for FCoE Sequence Offload */
-       else if (tx_flags & IXGBE_TX_FLAGS_FSO)
-               gso_segs = DIV_ROUND_UP(skb->len - hdr_len,
-                                       skb_shinfo(skb)->gso_size);
-#endif /* IXGBE_FCOE */
-       bytecount += (gso_segs - 1) * hdr_len;
-
-       /* multiply data chunks by size of headers */
-       tx_ring->tx_buffer_info[i].bytecount = bytecount;
-       tx_ring->tx_buffer_info[i].gso_segs = gso_segs;
-       tx_ring->tx_buffer_info[i].skb = skb;
-       tx_ring->tx_buffer_info[first].next_to_watch = i;
-
-       return count;
-
-dma_error:
-       e_dev_err("TX DMA map failed\n");
-
-       /* clear timestamp and dma mappings for failed tx_buffer_info map */
-       tx_buffer_info->dma = 0;
-       tx_buffer_info->time_stamp = 0;
-       tx_buffer_info->next_to_watch = 0;
-       if (count)
-               count--;
-
-       /* clear timestamp and dma mappings for remaining portion of packet */
-       while (count--) {
-               if (i == 0)
-                       i += tx_ring->count;
-               i--;
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
-       }
-
-       return 0;
-}
-
-static void ixgbe_tx_queue(struct ixgbe_ring *tx_ring,
-                          int tx_flags, int count, u32 paylen, u8 hdr_len)
-{
-       union ixgbe_adv_tx_desc *tx_desc = NULL;
-       struct ixgbe_tx_buffer *tx_buffer_info;
-       u32 olinfo_status = 0, cmd_type_len = 0;
-       unsigned int i;
-       u32 txd_cmd = IXGBE_TXD_CMD_EOP | IXGBE_TXD_CMD_RS | IXGBE_TXD_CMD_IFCS;
-
-       cmd_type_len |= IXGBE_ADVTXD_DTYP_DATA;
-
-       cmd_type_len |= IXGBE_ADVTXD_DCMD_IFCS | IXGBE_ADVTXD_DCMD_DEXT;
-
-       if (tx_flags & IXGBE_TX_FLAGS_VLAN)
-               cmd_type_len |= IXGBE_ADVTXD_DCMD_VLE;
-
-       if (tx_flags & IXGBE_TX_FLAGS_TSO) {
-               cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
-
-               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
-                                IXGBE_ADVTXD_POPTS_SHIFT;
-
-               /* use index 1 context for tso */
-               olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
-               if (tx_flags & IXGBE_TX_FLAGS_IPV4)
-                       olinfo_status |= IXGBE_TXD_POPTS_IXSM <<
-                                        IXGBE_ADVTXD_POPTS_SHIFT;
-
-       } else if (tx_flags & IXGBE_TX_FLAGS_CSUM)
-               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
-                                IXGBE_ADVTXD_POPTS_SHIFT;
-
-       if (tx_flags & IXGBE_TX_FLAGS_FCOE) {
-               olinfo_status |= IXGBE_ADVTXD_CC;
-               olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
-               if (tx_flags & IXGBE_TX_FLAGS_FSO)
-                       cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
-       }
-
-       olinfo_status |= ((paylen - hdr_len) << IXGBE_ADVTXD_PAYLEN_SHIFT);
-
-       i = tx_ring->next_to_use;
-       while (count--) {
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
-               tx_desc->read.buffer_addr = cpu_to_le64(tx_buffer_info->dma);
-               tx_desc->read.cmd_type_len =
-                       cpu_to_le32(cmd_type_len | tx_buffer_info->length);
-               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-       }
-
-       tx_desc->read.cmd_type_len |= cpu_to_le32(txd_cmd);
-
-       /*
-        * Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64).
-        */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       writel(i, tx_ring->tail);
-}
-
-static void ixgbe_atr(struct ixgbe_ring *ring, struct sk_buff *skb,
-                     u32 tx_flags, __be16 protocol)
-{
-       struct ixgbe_q_vector *q_vector = ring->q_vector;
-       union ixgbe_atr_hash_dword input = { .dword = 0 };
-       union ixgbe_atr_hash_dword common = { .dword = 0 };
-       union {
-               unsigned char *network;
-               struct iphdr *ipv4;
-               struct ipv6hdr *ipv6;
-       } hdr;
-       struct tcphdr *th;
-       __be16 vlan_id;
-
-       /* if ring doesn't have a interrupt vector, cannot perform ATR */
-       if (!q_vector)
-               return;
-
-       /* do nothing if sampling is disabled */
-       if (!ring->atr_sample_rate)
-               return;
-
-       ring->atr_count++;
-
-       /* snag network header to get L4 type and address */
-       hdr.network = skb_network_header(skb);
-
-       /* Currently only IPv4/IPv6 with TCP is supported */
-       if ((protocol != __constant_htons(ETH_P_IPV6) ||
-            hdr.ipv6->nexthdr != IPPROTO_TCP) &&
-           (protocol != __constant_htons(ETH_P_IP) ||
-            hdr.ipv4->protocol != IPPROTO_TCP))
-               return;
-
-       th = tcp_hdr(skb);
-
-       /* skip this packet since the socket is closing */
-       if (th->fin)
-               return;
-
-       /* sample on all syn packets or once every atr sample count */
-       if (!th->syn && (ring->atr_count < ring->atr_sample_rate))
-               return;
-
-       /* reset sample count */
-       ring->atr_count = 0;
-
-       vlan_id = htons(tx_flags >> IXGBE_TX_FLAGS_VLAN_SHIFT);
-
-       /*
-        * src and dst are inverted, think how the receiver sees them
-        *
-        * The input is broken into two sections, a non-compressed section
-        * containing vm_pool, vlan_id, and flow_type.  The rest of the data
-        * is XORed together and stored in the compressed dword.
-        */
-       input.formatted.vlan_id = vlan_id;
-
-       /*
-        * since src port and flex bytes occupy the same word XOR them together
-        * and write the value to source port portion of compressed dword
-        */
-       if (vlan_id)
-               common.port.src ^= th->dest ^ __constant_htons(ETH_P_8021Q);
-       else
-               common.port.src ^= th->dest ^ protocol;
-       common.port.dst ^= th->source;
-
-       if (protocol == __constant_htons(ETH_P_IP)) {
-               input.formatted.flow_type = IXGBE_ATR_FLOW_TYPE_TCPV4;
-               common.ip ^= hdr.ipv4->saddr ^ hdr.ipv4->daddr;
-       } else {
-               input.formatted.flow_type = IXGBE_ATR_FLOW_TYPE_TCPV6;
-               common.ip ^= hdr.ipv6->saddr.s6_addr32[0] ^
-                            hdr.ipv6->saddr.s6_addr32[1] ^
-                            hdr.ipv6->saddr.s6_addr32[2] ^
-                            hdr.ipv6->saddr.s6_addr32[3] ^
-                            hdr.ipv6->daddr.s6_addr32[0] ^
-                            hdr.ipv6->daddr.s6_addr32[1] ^
-                            hdr.ipv6->daddr.s6_addr32[2] ^
-                            hdr.ipv6->daddr.s6_addr32[3];
-       }
-
-       /* This assumes the Rx queue and Tx queue are bound to the same CPU */
-       ixgbe_fdir_add_signature_filter_82599(&q_vector->adapter->hw,
-                                             input, common, ring->queue_index);
-}
-
-static int __ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
-{
-       netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
-       /* Herbert's original patch had:
-        *  smp_mb__after_netif_stop_queue();
-        * but since that doesn't exist yet, just open code it. */
-       smp_mb();
-
-       /* We need to check again in a case another CPU has just
-        * made room available. */
-       if (likely(ixgbe_desc_unused(tx_ring) < size))
-               return -EBUSY;
-
-       /* A reprieve! - use start_queue because it doesn't call schedule */
-       netif_start_subqueue(tx_ring->netdev, tx_ring->queue_index);
-       ++tx_ring->tx_stats.restart_queue;
-       return 0;
-}
-
-static inline int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
-{
-       if (likely(ixgbe_desc_unused(tx_ring) >= size))
-               return 0;
-       return __ixgbe_maybe_stop_tx(tx_ring, size);
-}
-
-static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       int txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) :
-                                              smp_processor_id();
-#ifdef IXGBE_FCOE
-       __be16 protocol = vlan_get_protocol(skb);
-
-       if (((protocol == htons(ETH_P_FCOE)) ||
-           (protocol == htons(ETH_P_FIP))) &&
-           (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)) {
-               txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
-               txq += adapter->ring_feature[RING_F_FCOE].mask;
-               return txq;
-       }
-#endif
-
-       if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
-               while (unlikely(txq >= dev->real_num_tx_queues))
-                       txq -= dev->real_num_tx_queues;
-               return txq;
-       }
-
-       return skb_tx_hash(dev, skb);
-}
-
-netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
-                         struct ixgbe_adapter *adapter,
-                         struct ixgbe_ring *tx_ring)
-{
-       int tso;
-       u32  tx_flags = 0;
-#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD
-       unsigned short f;
-#endif
-       u16 first;
-       u16 count = TXD_USE_COUNT(skb_headlen(skb));
-       __be16 protocol;
-       u8 hdr_len = 0;
-
-       /*
-        * need: 1 descriptor per page * PAGE_SIZE/IXGBE_MAX_DATA_PER_TXD,
-        *       + 1 desc for skb_head_len/IXGBE_MAX_DATA_PER_TXD,
-        *       + 2 desc gap to keep tail from touching head,
-        *       + 1 desc for context descriptor,
-        * otherwise try next time
-        */
-#if PAGE_SIZE > IXGBE_MAX_DATA_PER_TXD
-       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
-               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);
-#else
-       count += skb_shinfo(skb)->nr_frags;
-#endif
-       if (ixgbe_maybe_stop_tx(tx_ring, count + 3)) {
-               tx_ring->tx_stats.tx_busy++;
-               return NETDEV_TX_BUSY;
-       }
-
-       protocol = vlan_get_protocol(skb);
-
-       if (vlan_tx_tag_present(skb)) {
-               tx_flags |= vlan_tx_tag_get(skb);
-               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                       tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK;
-                       tx_flags |= tx_ring->dcb_tc << 13;
-               }
-               tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
-               tx_flags |= IXGBE_TX_FLAGS_VLAN;
-       } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED &&
-                  skb->priority != TC_PRIO_CONTROL) {
-               tx_flags |= tx_ring->dcb_tc << 13;
-               tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
-               tx_flags |= IXGBE_TX_FLAGS_VLAN;
-       }
-
-#ifdef IXGBE_FCOE
-       /* for FCoE with DCB, we force the priority to what
-        * was specified by the switch */
-       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED &&
-           (protocol == htons(ETH_P_FCOE)))
-               tx_flags |= IXGBE_TX_FLAGS_FCOE;
-
-#endif
-       /* record the location of the first descriptor for this packet */
-       first = tx_ring->next_to_use;
-
-       if (tx_flags & IXGBE_TX_FLAGS_FCOE) {
-#ifdef IXGBE_FCOE
-               /* setup tx offload for FCoE */
-               tso = ixgbe_fso(tx_ring, skb, tx_flags, &hdr_len);
-               if (tso < 0)
-                       goto out_drop;
-               else if (tso)
-                       tx_flags |= IXGBE_TX_FLAGS_FSO;
-#endif /* IXGBE_FCOE */
-       } else {
-               if (protocol == htons(ETH_P_IP))
-                       tx_flags |= IXGBE_TX_FLAGS_IPV4;
-               tso = ixgbe_tso(tx_ring, skb, tx_flags, protocol, &hdr_len);
-               if (tso < 0)
-                       goto out_drop;
-               else if (tso)
-                       tx_flags |= IXGBE_TX_FLAGS_TSO;
-               else if (ixgbe_tx_csum(tx_ring, skb, tx_flags, protocol))
-                       tx_flags |= IXGBE_TX_FLAGS_CSUM;
-       }
-
-       count = ixgbe_tx_map(adapter, tx_ring, skb, tx_flags, first, hdr_len);
-       if (count) {
-               /* add the ATR filter if ATR is on */
-               if (test_bit(__IXGBE_TX_FDIR_INIT_DONE, &tx_ring->state))
-                       ixgbe_atr(tx_ring, skb, tx_flags, protocol);
-               ixgbe_tx_queue(tx_ring, tx_flags, count, skb->len, hdr_len);
-               ixgbe_maybe_stop_tx(tx_ring, DESC_NEEDED);
-
-       } else {
-               tx_ring->tx_buffer_info[first].time_stamp = 0;
-               tx_ring->next_to_use = first;
-               goto out_drop;
-       }
-
-       return NETDEV_TX_OK;
-
-out_drop:
-       dev_kfree_skb_any(skb);
-       return NETDEV_TX_OK;
-}
-
-static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_ring *tx_ring;
-
-       tx_ring = adapter->tx_ring[skb->queue_mapping];
-       return ixgbe_xmit_frame_ring(skb, adapter, tx_ring);
-}
-
-/**
- * ixgbe_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-static int ixgbe_set_mac(struct net_device *netdev, void *p)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
-
-       hw->mac.ops.set_rar(hw, 0, hw->mac.addr, adapter->num_vfs,
-                           IXGBE_RAH_AV);
-
-       return 0;
-}
-
-static int
-ixgbe_mdio_read(struct net_device *netdev, int prtad, int devad, u16 addr)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u16 value;
-       int rc;
-
-       if (prtad != hw->phy.mdio.prtad)
-               return -EINVAL;
-       rc = hw->phy.ops.read_reg(hw, addr, devad, &value);
-       if (!rc)
-               rc = value;
-       return rc;
-}
-
-static int ixgbe_mdio_write(struct net_device *netdev, int prtad, int devad,
-                           u16 addr, u16 value)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       if (prtad != hw->phy.mdio.prtad)
-               return -EINVAL;
-       return hw->phy.ops.write_reg(hw, addr, devad, value);
-}
-
-static int ixgbe_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       return mdio_mii_ioctl(&adapter->hw.phy.mdio, if_mii(req), cmd);
-}
-
-/**
- * ixgbe_add_sanmac_netdev - Add the SAN MAC address to the corresponding
- * netdev->dev_addrs
- * @netdev: network interface device structure
- *
- * Returns non-zero on failure
- **/
-static int ixgbe_add_sanmac_netdev(struct net_device *dev)
-{
-       int err = 0;
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       struct ixgbe_mac_info *mac = &adapter->hw.mac;
-
-       if (is_valid_ether_addr(mac->san_addr)) {
-               rtnl_lock();
-               err = dev_addr_add(dev, mac->san_addr, NETDEV_HW_ADDR_T_SAN);
-               rtnl_unlock();
-       }
-       return err;
-}
-
-/**
- * ixgbe_del_sanmac_netdev - Removes the SAN MAC address to the corresponding
- * netdev->dev_addrs
- * @netdev: network interface device structure
- *
- * Returns non-zero on failure
- **/
-static int ixgbe_del_sanmac_netdev(struct net_device *dev)
-{
-       int err = 0;
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       struct ixgbe_mac_info *mac = &adapter->hw.mac;
-
-       if (is_valid_ether_addr(mac->san_addr)) {
-               rtnl_lock();
-               err = dev_addr_del(dev, mac->san_addr, NETDEV_HW_ADDR_T_SAN);
-               rtnl_unlock();
-       }
-       return err;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-static void ixgbe_netpoll(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       int i;
-
-       /* if interface is down do nothing */
-       if (test_bit(__IXGBE_DOWN, &adapter->state))
-               return;
-
-       adapter->flags |= IXGBE_FLAG_IN_NETPOLL;
-       if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
-               int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-               for (i = 0; i < num_q_vectors; i++) {
-                       struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
-                       ixgbe_msix_clean_many(0, q_vector);
-               }
-       } else {
-               ixgbe_intr(adapter->pdev->irq, netdev);
-       }
-       adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL;
-}
-#endif
-
-static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
-                                                  struct rtnl_link_stats64 *stats)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       int i;
-
-       rcu_read_lock();
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct ixgbe_ring *ring = ACCESS_ONCE(adapter->rx_ring[i]);
-               u64 bytes, packets;
-               unsigned int start;
-
-               if (ring) {
-                       do {
-                               start = u64_stats_fetch_begin_bh(&ring->syncp);
-                               packets = ring->stats.packets;
-                               bytes   = ring->stats.bytes;
-                       } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
-                       stats->rx_packets += packets;
-                       stats->rx_bytes   += bytes;
-               }
-       }
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               struct ixgbe_ring *ring = ACCESS_ONCE(adapter->tx_ring[i]);
-               u64 bytes, packets;
-               unsigned int start;
-
-               if (ring) {
-                       do {
-                               start = u64_stats_fetch_begin_bh(&ring->syncp);
-                               packets = ring->stats.packets;
-                               bytes   = ring->stats.bytes;
-                       } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
-                       stats->tx_packets += packets;
-                       stats->tx_bytes   += bytes;
-               }
-       }
-       rcu_read_unlock();
-       /* following stats updated by ixgbe_watchdog_task() */
-       stats->multicast        = netdev->stats.multicast;
-       stats->rx_errors        = netdev->stats.rx_errors;
-       stats->rx_length_errors = netdev->stats.rx_length_errors;
-       stats->rx_crc_errors    = netdev->stats.rx_crc_errors;
-       stats->rx_missed_errors = netdev->stats.rx_missed_errors;
-       return stats;
-}
-
-/* ixgbe_validate_rtr - verify 802.1Qp to Rx packet buffer mapping is valid.
- * #adapter: pointer to ixgbe_adapter
- * @tc: number of traffic classes currently enabled
- *
- * Configure a valid 802.1Qp to Rx packet buffer mapping ie confirm
- * 802.1Q priority maps to a packet buffer that exists.
- */
-static void ixgbe_validate_rtr(struct ixgbe_adapter *adapter, u8 tc)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 reg, rsave;
-       int i;
-
-       /* 82598 have a static priority to TC mapping that can not
-        * be changed so no validation is needed.
-        */
-       if (hw->mac.type == ixgbe_mac_82598EB)
-               return;
-
-       reg = IXGBE_READ_REG(hw, IXGBE_RTRUP2TC);
-       rsave = reg;
-
-       for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-               u8 up2tc = reg >> (i * IXGBE_RTRUP2TC_UP_SHIFT);
-
-               /* If up2tc is out of bounds default to zero */
-               if (up2tc > tc)
-                       reg &= ~(0x7 << IXGBE_RTRUP2TC_UP_SHIFT);
-       }
-
-       if (reg != rsave)
-               IXGBE_WRITE_REG(hw, IXGBE_RTRUP2TC, reg);
-
-       return;
-}
-
-
-/* ixgbe_setup_tc - routine to configure net_device for multiple traffic
- * classes.
- *
- * @netdev: net device to configure
- * @tc: number of traffic classes to enable
- */
-int ixgbe_setup_tc(struct net_device *dev, u8 tc)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(dev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       /* If DCB is anabled do not remove traffic classes, multiple
-        * traffic classes are required to implement DCB
-        */
-       if (!tc && (adapter->flags & IXGBE_FLAG_DCB_ENABLED))
-               return 0;
-
-       /* Hardware supports up to 8 traffic classes */
-       if (tc > MAX_TRAFFIC_CLASS ||
-           (hw->mac.type == ixgbe_mac_82598EB && tc < MAX_TRAFFIC_CLASS))
-               return -EINVAL;
-
-       /* Hardware has to reinitialize queues and interrupts to
-        * match packet buffer alignment. Unfortunantly, the
-        * hardware is not flexible enough to do this dynamically.
-        */
-       if (netif_running(dev))
-               ixgbe_close(dev);
-       ixgbe_clear_interrupt_scheme(adapter);
-
-       if (tc)
-               netdev_set_num_tc(dev, tc);
-       else
-               netdev_reset_tc(dev);
-
-       ixgbe_init_interrupt_scheme(adapter);
-       ixgbe_validate_rtr(adapter, tc);
-       if (netif_running(dev))
-               ixgbe_open(dev);
-
-       return 0;
-}
-
-void ixgbe_do_reset(struct net_device *netdev)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-       if (netif_running(netdev))
-               ixgbe_reinit_locked(adapter);
-       else
-               ixgbe_reset(adapter);
-}
-
-static u32 ixgbe_fix_features(struct net_device *netdev, u32 data)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-
-#ifdef CONFIG_DCB
-       if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
-               data &= ~NETIF_F_HW_VLAN_RX;
-#endif
-
-       /* return error if RXHASH is being enabled when RSS is not supported */
-       if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))
-               data &= ~NETIF_F_RXHASH;
-
-       /* If Rx checksum is disabled, then RSC/LRO should also be disabled */
-       if (!(data & NETIF_F_RXCSUM))
-               data &= ~NETIF_F_LRO;
-
-       /* Turn off LRO if not RSC capable or invalid ITR settings */
-       if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)) {
-               data &= ~NETIF_F_LRO;
-       } else if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) &&
-                  (adapter->rx_itr_setting != 1 &&
-                   adapter->rx_itr_setting > IXGBE_MAX_RSC_INT_RATE)) {
-               data &= ~NETIF_F_LRO;
-               e_info(probe, "rx-usecs set too low, not enabling RSC\n");
-       }
-
-       return data;
-}
-
-static int ixgbe_set_features(struct net_device *netdev, u32 data)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       bool need_reset = false;
-
-       /* If Rx checksum is disabled, then RSC/LRO should also be disabled */
-       if (!(data & NETIF_F_RXCSUM))
-               adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;
-       else
-               adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
-
-       /* Make sure RSC matches LRO, reset if change */
-       if (!!(data & NETIF_F_LRO) !=
-            !!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)) {
-               adapter->flags2 ^= IXGBE_FLAG2_RSC_ENABLED;
-               switch (adapter->hw.mac.type) {
-               case ixgbe_mac_X540:
-               case ixgbe_mac_82599EB:
-                       need_reset = true;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       /*
-        * Check if Flow Director n-tuple support was enabled or disabled.  If
-        * the state changed, we need to reset.
-        */
-       if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)) {
-               /* turn off ATR, enable perfect filters and reset */
-               if (data & NETIF_F_NTUPLE) {
-                       adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
-                       adapter->flags |= IXGBE_FLAG_FDIR_PERFECT_CAPABLE;
-                       need_reset = true;
-               }
-       } else if (!(data & NETIF_F_NTUPLE)) {
-               /* turn off Flow Director, set ATR and reset */
-               adapter->flags &= ~IXGBE_FLAG_FDIR_PERFECT_CAPABLE;
-               if ((adapter->flags &  IXGBE_FLAG_RSS_ENABLED) &&
-                   !(adapter->flags &  IXGBE_FLAG_DCB_ENABLED))
-                       adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
-               need_reset = true;
-       }
-
-       if (need_reset)
-               ixgbe_do_reset(netdev);
-
-       return 0;
-
-}
-
-static const struct net_device_ops ixgbe_netdev_ops = {
-       .ndo_open               = ixgbe_open,
-       .ndo_stop               = ixgbe_close,
-       .ndo_start_xmit         = ixgbe_xmit_frame,
-       .ndo_select_queue       = ixgbe_select_queue,
-       .ndo_set_rx_mode        = ixgbe_set_rx_mode,
-       .ndo_set_multicast_list = ixgbe_set_rx_mode,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_mac_address    = ixgbe_set_mac,
-       .ndo_change_mtu         = ixgbe_change_mtu,
-       .ndo_tx_timeout         = ixgbe_tx_timeout,
-       .ndo_vlan_rx_add_vid    = ixgbe_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = ixgbe_vlan_rx_kill_vid,
-       .ndo_do_ioctl           = ixgbe_ioctl,
-       .ndo_set_vf_mac         = ixgbe_ndo_set_vf_mac,
-       .ndo_set_vf_vlan        = ixgbe_ndo_set_vf_vlan,
-       .ndo_set_vf_tx_rate     = ixgbe_ndo_set_vf_bw,
-       .ndo_get_vf_config      = ixgbe_ndo_get_vf_config,
-       .ndo_get_stats64        = ixgbe_get_stats64,
-       .ndo_setup_tc           = ixgbe_setup_tc,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = ixgbe_netpoll,
-#endif
-#ifdef IXGBE_FCOE
-       .ndo_fcoe_ddp_setup = ixgbe_fcoe_ddp_get,
-       .ndo_fcoe_ddp_target = ixgbe_fcoe_ddp_target,
-       .ndo_fcoe_ddp_done = ixgbe_fcoe_ddp_put,
-       .ndo_fcoe_enable = ixgbe_fcoe_enable,
-       .ndo_fcoe_disable = ixgbe_fcoe_disable,
-       .ndo_fcoe_get_wwn = ixgbe_fcoe_get_wwn,
-#endif /* IXGBE_FCOE */
-       .ndo_set_features = ixgbe_set_features,
-       .ndo_fix_features = ixgbe_fix_features,
-};
-
-static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
-                          const struct ixgbe_info *ii)
-{
-#ifdef CONFIG_PCI_IOV
-       struct ixgbe_hw *hw = &adapter->hw;
-       int err;
-       int num_vf_macvlans, i;
-       struct vf_macvlans *mv_list;
-
-       if (hw->mac.type == ixgbe_mac_82598EB || !max_vfs)
-               return;
-
-       /* The 82599 supports up to 64 VFs per physical function
-        * but this implementation limits allocation to 63 so that
-        * basic networking resources are still available to the
-        * physical function
-        */
-       adapter->num_vfs = (max_vfs > 63) ? 63 : max_vfs;
-       adapter->flags |= IXGBE_FLAG_SRIOV_ENABLED;
-       err = pci_enable_sriov(adapter->pdev, adapter->num_vfs);
-       if (err) {
-               e_err(probe, "Failed to enable PCI sriov: %d\n", err);
-               goto err_novfs;
-       }
-
-       num_vf_macvlans = hw->mac.num_rar_entries -
-               (IXGBE_MAX_PF_MACVLANS + 1 + adapter->num_vfs);
-
-       adapter->mv_list = mv_list = kcalloc(num_vf_macvlans,
-                                            sizeof(struct vf_macvlans),
-                                            GFP_KERNEL);
-       if (mv_list) {
-               /* Initialize list of VF macvlans */
-               INIT_LIST_HEAD(&adapter->vf_mvs.l);
-               for (i = 0; i < num_vf_macvlans; i++) {
-                       mv_list->vf = -1;
-                       mv_list->free = true;
-                       mv_list->rar_entry = hw->mac.num_rar_entries -
-                               (i + adapter->num_vfs + 1);
-                       list_add(&mv_list->l, &adapter->vf_mvs.l);
-                       mv_list++;
-               }
-       }
-
-       /* If call to enable VFs succeeded then allocate memory
-        * for per VF control structures.
-        */
-       adapter->vfinfo =
-               kcalloc(adapter->num_vfs,
-                       sizeof(struct vf_data_storage), GFP_KERNEL);
-       if (adapter->vfinfo) {
-               /* Now that we're sure SR-IOV is enabled
-                * and memory allocated set up the mailbox parameters
-                */
-               ixgbe_init_mbx_params_pf(hw);
-               memcpy(&hw->mbx.ops, ii->mbx_ops,
-                      sizeof(hw->mbx.ops));
-
-               /* Disable RSC when in SR-IOV mode */
-               adapter->flags2 &= ~(IXGBE_FLAG2_RSC_CAPABLE |
-                                    IXGBE_FLAG2_RSC_ENABLED);
-               return;
-       }
-
-       /* Oh oh */
-       e_err(probe, "Unable to allocate memory for VF Data Storage - "
-             "SRIOV disabled\n");
-       pci_disable_sriov(adapter->pdev);
-
-err_novfs:
-       adapter->flags &= ~IXGBE_FLAG_SRIOV_ENABLED;
-       adapter->num_vfs = 0;
-#endif /* CONFIG_PCI_IOV */
-}
-
-/**
- * ixgbe_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in ixgbe_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * ixgbe_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-static int __devinit ixgbe_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct ixgbe_adapter *adapter = NULL;
-       struct ixgbe_hw *hw;
-       const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data];
-       static int cards_found;
-       int i, err, pci_using_dac;
-       u8 part_str[IXGBE_PBANUM_LENGTH];
-       unsigned int indices = num_possible_cpus();
-#ifdef IXGBE_FCOE
-       u16 device_caps;
-#endif
-       u32 eec;
-
-       /* Catch broken hardware that put the wrong VF device ID in
-        * the PCIe SR-IOV capability.
-        */
-       if (pdev->is_virtfn) {
-               WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
-                    pci_name(pdev), pdev->vendor, pdev->device);
-               return -EINVAL;
-       }
-
-       err = pci_enable_device_mem(pdev);
-       if (err)
-               return err;
-
-       if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
-           !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-               pci_using_dac = 1;
-       } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-               if (err) {
-                       err = dma_set_coherent_mask(&pdev->dev,
-                                                   DMA_BIT_MASK(32));
-                       if (err) {
-                               dev_err(&pdev->dev,
-                                       "No usable DMA configuration, aborting\n");
-                               goto err_dma;
-                       }
-               }
-               pci_using_dac = 0;
-       }
-
-       err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
-                                          IORESOURCE_MEM), ixgbe_driver_name);
-       if (err) {
-               dev_err(&pdev->dev,
-                       "pci_request_selected_regions failed 0x%x\n", err);
-               goto err_pci_reg;
-       }
-
-       pci_enable_pcie_error_reporting(pdev);
-
-       pci_set_master(pdev);
-       pci_save_state(pdev);
-
-#ifdef CONFIG_IXGBE_DCB
-       indices *= MAX_TRAFFIC_CLASS;
-#endif
-
-       if (ii->mac == ixgbe_mac_82598EB)
-               indices = min_t(unsigned int, indices, IXGBE_MAX_RSS_INDICES);
-       else
-               indices = min_t(unsigned int, indices, IXGBE_MAX_FDIR_INDICES);
-
-#ifdef IXGBE_FCOE
-       indices += min_t(unsigned int, num_possible_cpus(),
-                        IXGBE_MAX_FCOE_INDICES);
-#endif
-       netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), indices);
-       if (!netdev) {
-               err = -ENOMEM;
-               goto err_alloc_etherdev;
-       }
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       adapter = netdev_priv(netdev);
-       pci_set_drvdata(pdev, adapter);
-
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       hw = &adapter->hw;
-       hw->back = adapter;
-       adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;
-
-       hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
-                             pci_resource_len(pdev, 0));
-       if (!hw->hw_addr) {
-               err = -EIO;
-               goto err_ioremap;
-       }
-
-       for (i = 1; i <= 5; i++) {
-               if (pci_resource_len(pdev, i) == 0)
-                       continue;
-       }
-
-       netdev->netdev_ops = &ixgbe_netdev_ops;
-       ixgbe_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo = 5 * HZ;
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       adapter->bd_number = cards_found;
-
-       /* Setup hw api */
-       memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
-       hw->mac.type  = ii->mac;
-
-       /* EEPROM */
-       memcpy(&hw->eeprom.ops, ii->eeprom_ops, sizeof(hw->eeprom.ops));
-       eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-       /* If EEPROM is valid (bit 8 = 1), use default otherwise use bit bang */
-       if (!(eec & (1 << 8)))
-               hw->eeprom.ops.read = &ixgbe_read_eeprom_bit_bang_generic;
-
-       /* PHY */
-       memcpy(&hw->phy.ops, ii->phy_ops, sizeof(hw->phy.ops));
-       hw->phy.sfp_type = ixgbe_sfp_type_unknown;
-       /* ixgbe_identify_phy_generic will set prtad and mmds properly */
-       hw->phy.mdio.prtad = MDIO_PRTAD_NONE;
-       hw->phy.mdio.mmds = 0;
-       hw->phy.mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
-       hw->phy.mdio.dev = netdev;
-       hw->phy.mdio.mdio_read = ixgbe_mdio_read;
-       hw->phy.mdio.mdio_write = ixgbe_mdio_write;
-
-       ii->get_invariants(hw);
-
-       /* setup the private structure */
-       err = ixgbe_sw_init(adapter);
-       if (err)
-               goto err_sw_init;
-
-       /* Make it possible the adapter to be woken up via WOL */
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
-               break;
-       default:
-               break;
-       }
-
-       /*
-        * If there is a fan on this device and it has failed log the
-        * failure.
-        */
-       if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {
-               u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
-               if (esdp & IXGBE_ESDP_SDP1)
-                       e_crit(probe, "Fan has stopped, replace the adapter\n");
-       }
-
-       /* reset_hw fills in the perm_addr as well */
-       hw->phy.reset_if_overtemp = true;
-       err = hw->mac.ops.reset_hw(hw);
-       hw->phy.reset_if_overtemp = false;
-       if (err == IXGBE_ERR_SFP_NOT_PRESENT &&
-           hw->mac.type == ixgbe_mac_82598EB) {
-               err = 0;
-       } else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-               e_dev_err("failed to load because an unsupported SFP+ "
-                         "module type was detected.\n");
-               e_dev_err("Reload the driver after installing a supported "
-                         "module.\n");
-               goto err_sw_init;
-       } else if (err) {
-               e_dev_err("HW Init failed: %d\n", err);
-               goto err_sw_init;
-       }
-
-       ixgbe_probe_vf(adapter, ii);
-
-       netdev->features = NETIF_F_SG |
-                          NETIF_F_IP_CSUM |
-                          NETIF_F_IPV6_CSUM |
-                          NETIF_F_HW_VLAN_TX |
-                          NETIF_F_HW_VLAN_RX |
-                          NETIF_F_HW_VLAN_FILTER |
-                          NETIF_F_TSO |
-                          NETIF_F_TSO6 |
-                          NETIF_F_GRO |
-                          NETIF_F_RXHASH |
-                          NETIF_F_RXCSUM;
-
-       netdev->hw_features = netdev->features;
-
-       switch (adapter->hw.mac.type) {
-       case ixgbe_mac_82599EB:
-       case ixgbe_mac_X540:
-               netdev->features |= NETIF_F_SCTP_CSUM;
-               netdev->hw_features |= NETIF_F_SCTP_CSUM |
-                                      NETIF_F_NTUPLE;
-               break;
-       default:
-               break;
-       }
-
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_TSO6;
-       netdev->vlan_features |= NETIF_F_IP_CSUM;
-       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
-
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-               adapter->flags &= ~(IXGBE_FLAG_RSS_ENABLED |
-                                   IXGBE_FLAG_DCB_ENABLED);
-
-#ifdef CONFIG_IXGBE_DCB
-       netdev->dcbnl_ops = &dcbnl_ops;
-#endif
-
-#ifdef IXGBE_FCOE
-       if (adapter->flags & IXGBE_FLAG_FCOE_CAPABLE) {
-               if (hw->mac.ops.get_device_caps) {
-                       hw->mac.ops.get_device_caps(hw, &device_caps);
-                       if (device_caps & IXGBE_DEVICE_CAPS_FCOE_OFFLOADS)
-                               adapter->flags &= ~IXGBE_FLAG_FCOE_CAPABLE;
-               }
-       }
-       if (adapter->flags & IXGBE_FLAG_FCOE_CAPABLE) {
-               netdev->vlan_features |= NETIF_F_FCOE_CRC;
-               netdev->vlan_features |= NETIF_F_FSO;
-               netdev->vlan_features |= NETIF_F_FCOE_MTU;
-       }
-#endif /* IXGBE_FCOE */
-       if (pci_using_dac) {
-               netdev->features |= NETIF_F_HIGHDMA;
-               netdev->vlan_features |= NETIF_F_HIGHDMA;
-       }
-
-       if (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)
-               netdev->hw_features |= NETIF_F_LRO;
-       if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)
-               netdev->features |= NETIF_F_LRO;
-
-       /* make sure the EEPROM is good */
-       if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) {
-               e_dev_err("The EEPROM Checksum Is Not Valid\n");
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
-       memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len);
-
-       if (ixgbe_validate_mac_addr(netdev->perm_addr)) {
-               e_dev_err("invalid MAC address\n");
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
-       if (hw->mac.ops.disable_tx_laser &&
-           ((hw->phy.multispeed_fiber) ||
-            ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
-             (hw->mac.type == ixgbe_mac_82599EB))))
-               hw->mac.ops.disable_tx_laser(hw);
-
-       setup_timer(&adapter->service_timer, &ixgbe_service_timer,
-                   (unsigned long) adapter);
-
-       INIT_WORK(&adapter->service_task, ixgbe_service_task);
-       clear_bit(__IXGBE_SERVICE_SCHED, &adapter->state);
-
-       err = ixgbe_init_interrupt_scheme(adapter);
-       if (err)
-               goto err_sw_init;
-
-       if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED)) {
-               netdev->hw_features &= ~NETIF_F_RXHASH;
-               netdev->features &= ~NETIF_F_RXHASH;
-       }
-
-       switch (pdev->device) {
-       case IXGBE_DEV_ID_82599_SFP:
-               /* Only this subdevice supports WOL */
-               if (pdev->subsystem_device == IXGBE_SUBDEV_ID_82599_SFP)
-                       adapter->wol = IXGBE_WUFC_MAG;
-               break;
-       case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
-               /* All except this subdevice support WOL */
-               if (pdev->subsystem_device != IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)
-                       adapter->wol = IXGBE_WUFC_MAG;
-               break;
-       case IXGBE_DEV_ID_82599_KX4:
-               adapter->wol = IXGBE_WUFC_MAG;
-               break;
-       default:
-               adapter->wol = 0;
-               break;
-       }
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       /* pick up the PCI bus settings for reporting later */
-       hw->mac.ops.get_bus_info(hw);
-
-       /* print bus type/speed/width info */
-       e_dev_info("(PCI Express:%s:%s) %pM\n",
-                  (hw->bus.speed == ixgbe_bus_speed_5000 ? "5.0GT/s" :
-                   hw->bus.speed == ixgbe_bus_speed_2500 ? "2.5GT/s" :
-                   "Unknown"),
-                  (hw->bus.width == ixgbe_bus_width_pcie_x8 ? "Width x8" :
-                   hw->bus.width == ixgbe_bus_width_pcie_x4 ? "Width x4" :
-                   hw->bus.width == ixgbe_bus_width_pcie_x1 ? "Width x1" :
-                   "Unknown"),
-                  netdev->dev_addr);
-
-       err = ixgbe_read_pba_string_generic(hw, part_str, IXGBE_PBANUM_LENGTH);
-       if (err)
-               strncpy(part_str, "Unknown", IXGBE_PBANUM_LENGTH);
-       if (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)
-               e_dev_info("MAC: %d, PHY: %d, SFP+: %d, PBA No: %s\n",
-                          hw->mac.type, hw->phy.type, hw->phy.sfp_type,
-                          part_str);
-       else
-               e_dev_info("MAC: %d, PHY: %d, PBA No: %s\n",
-                          hw->mac.type, hw->phy.type, part_str);
-
-       if (hw->bus.width <= ixgbe_bus_width_pcie_x4) {
-               e_dev_warn("PCI-Express bandwidth available for this card is "
-                          "not sufficient for optimal performance.\n");
-               e_dev_warn("For optimal performance a x8 PCI-Express slot "
-                          "is required.\n");
-       }
-
-       /* save off EEPROM version number */
-       hw->eeprom.ops.read(hw, 0x29, &adapter->eeprom_version);
-
-       /* reset the hardware with the new settings */
-       err = hw->mac.ops.start_hw(hw);
-
-       if (err == IXGBE_ERR_EEPROM_VERSION) {
-               /* We are running on a pre-production device, log a warning */
-               e_dev_warn("This device is a pre-production adapter/LOM. "
-                          "Please be aware there may be issues associated "
-                          "with your hardware.  If you are experiencing "
-                          "problems please contact your Intel or hardware "
-                          "representative who provided you with this "
-                          "hardware.\n");
-       }
-       strcpy(netdev->name, "eth%d");
-       err = register_netdev(netdev);
-       if (err)
-               goto err_register;
-
-       /* carrier off reporting is important to ethtool even BEFORE open */
-       netif_carrier_off(netdev);
-
-#ifdef CONFIG_IXGBE_DCA
-       if (dca_add_requester(&pdev->dev) == 0) {
-               adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
-               ixgbe_setup_dca(adapter);
-       }
-#endif
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
-               e_info(probe, "IOV is enabled with %d VFs\n", adapter->num_vfs);
-               for (i = 0; i < adapter->num_vfs; i++)
-                       ixgbe_vf_configuration(pdev, (i | 0x10000000));
-       }
-
-       /* Inform firmware of driver version */
-       if (hw->mac.ops.set_fw_drv_ver)
-               hw->mac.ops.set_fw_drv_ver(hw, MAJ, MIN, BUILD,
-                                          FW_CEM_UNUSED_VER);
-
-       /* add san mac addr to netdev */
-       ixgbe_add_sanmac_netdev(netdev);
-
-       e_dev_info("Intel(R) 10 Gigabit Network Connection\n");
-       cards_found++;
-       return 0;
-
-err_register:
-       ixgbe_release_hw_control(adapter);
-       ixgbe_clear_interrupt_scheme(adapter);
-err_sw_init:
-err_eeprom:
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-               ixgbe_disable_sriov(adapter);
-       adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;
-       iounmap(hw->hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_selected_regions(pdev,
-                                    pci_select_bars(pdev, IORESOURCE_MEM));
-err_pci_reg:
-err_dma:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * ixgbe_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * ixgbe_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-static void __devexit ixgbe_remove(struct pci_dev *pdev)
-{
-       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
-       struct net_device *netdev = adapter->netdev;
-
-       set_bit(__IXGBE_DOWN, &adapter->state);
-       cancel_work_sync(&adapter->service_task);
-
-#ifdef CONFIG_IXGBE_DCA
-       if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
-               adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
-               dca_remove_requester(&pdev->dev);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 1);
-       }
-
-#endif
-#ifdef IXGBE_FCOE
-       if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
-               ixgbe_cleanup_fcoe(adapter);
-
-#endif /* IXGBE_FCOE */
-
-       /* remove the added san mac */
-       ixgbe_del_sanmac_netdev(netdev);
-
-       if (netdev->reg_state == NETREG_REGISTERED)
-               unregister_netdev(netdev);
-
-       if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-               ixgbe_disable_sriov(adapter);
-
-       ixgbe_clear_interrupt_scheme(adapter);
-
-       ixgbe_release_hw_control(adapter);
-
-       iounmap(adapter->hw.hw_addr);
-       pci_release_selected_regions(pdev, pci_select_bars(pdev,
-                                    IORESOURCE_MEM));
-
-       e_dev_info("complete\n");
-
-       free_netdev(netdev);
-
-       pci_disable_pcie_error_reporting(pdev);
-
-       pci_disable_device(pdev);
-}
-
-/**
- * ixgbe_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
-static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
-                                               pci_channel_state_t state)
-{
-       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
-       struct net_device *netdev = adapter->netdev;
-
-       netif_device_detach(netdev);
-
-       if (state == pci_channel_io_perm_failure)
-               return PCI_ERS_RESULT_DISCONNECT;
-
-       if (netif_running(netdev))
-               ixgbe_down(adapter);
-       pci_disable_device(pdev);
-
-       /* Request a slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * ixgbe_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot.
- */
-static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
-{
-       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
-       pci_ers_result_t result;
-       int err;
-
-       if (pci_enable_device_mem(pdev)) {
-               e_err(probe, "Cannot re-enable PCI device after reset.\n");
-               result = PCI_ERS_RESULT_DISCONNECT;
-       } else {
-               pci_set_master(pdev);
-               pci_restore_state(pdev);
-               pci_save_state(pdev);
-
-               pci_wake_from_d3(pdev, false);
-
-               ixgbe_reset(adapter);
-               IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
-               result = PCI_ERS_RESULT_RECOVERED;
-       }
-
-       err = pci_cleanup_aer_uncorrect_error_status(pdev);
-       if (err) {
-               e_dev_err("pci_cleanup_aer_uncorrect_error_status "
-                         "failed 0x%0x\n", err);
-               /* non-fatal, continue */
-       }
-
-       return result;
-}
-
-/**
- * ixgbe_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation.
- */
-static void ixgbe_io_resume(struct pci_dev *pdev)
-{
-       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
-       struct net_device *netdev = adapter->netdev;
-
-       if (netif_running(netdev)) {
-               if (ixgbe_up(adapter)) {
-                       e_info(probe, "ixgbe_up failed after reset\n");
-                       return;
-               }
-       }
-
-       netif_device_attach(netdev);
-}
-
-static struct pci_error_handlers ixgbe_err_handler = {
-       .error_detected = ixgbe_io_error_detected,
-       .slot_reset = ixgbe_io_slot_reset,
-       .resume = ixgbe_io_resume,
-};
-
-static struct pci_driver ixgbe_driver = {
-       .name     = ixgbe_driver_name,
-       .id_table = ixgbe_pci_tbl,
-       .probe    = ixgbe_probe,
-       .remove   = __devexit_p(ixgbe_remove),
-#ifdef CONFIG_PM
-       .suspend  = ixgbe_suspend,
-       .resume   = ixgbe_resume,
-#endif
-       .shutdown = ixgbe_shutdown,
-       .err_handler = &ixgbe_err_handler
-};
-
-/**
- * ixgbe_init_module - Driver Registration Routine
- *
- * ixgbe_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-static int __init ixgbe_init_module(void)
-{
-       int ret;
-       pr_info("%s - version %s\n", ixgbe_driver_string, ixgbe_driver_version);
-       pr_info("%s\n", ixgbe_copyright);
-
-#ifdef CONFIG_IXGBE_DCA
-       dca_register_notify(&dca_notifier);
-#endif
-
-       ret = pci_register_driver(&ixgbe_driver);
-       return ret;
-}
-
-module_init(ixgbe_init_module);
-
-/**
- * ixgbe_exit_module - Driver Exit Cleanup Routine
- *
- * ixgbe_exit_module is called just before the driver is removed
- * from memory.
- **/
-static void __exit ixgbe_exit_module(void)
-{
-#ifdef CONFIG_IXGBE_DCA
-       dca_unregister_notify(&dca_notifier);
-#endif
-       pci_unregister_driver(&ixgbe_driver);
-       rcu_barrier(); /* Wait for completion of call_rcu()'s */
-}
-
-#ifdef CONFIG_IXGBE_DCA
-static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
-                           void *p)
-{
-       int ret_val;
-
-       ret_val = driver_for_each_device(&ixgbe_driver.driver, NULL, &event,
-                                        __ixgbe_notify_dca);
-
-       return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
-}
-
-#endif /* CONFIG_IXGBE_DCA */
-
-module_exit(ixgbe_exit_module);
-
-/* ixgbe_main.c */
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c
deleted file mode 100644 (file)
index 1ff0eef..0000000
+++ /dev/null
@@ -1,471 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include "ixgbe_type.h"
-#include "ixgbe_common.h"
-#include "ixgbe_mbx.h"
-
-/**
- *  ixgbe_read_mbx - Reads a message from the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to read
- *
- *  returns SUCCESS if it successfuly read message from buffer
- **/
-s32 ixgbe_read_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       /* limit read to size of mailbox */
-       if (size > mbx->size)
-               size = mbx->size;
-
-       if (mbx->ops.read)
-               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_write_mbx - Write a message to the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully copied message into the buffer
- **/
-s32 ixgbe_write_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = 0;
-
-       if (size > mbx->size)
-               ret_val = IXGBE_ERR_MBX;
-
-       else if (mbx->ops.write)
-               ret_val = mbx->ops.write(hw, msg, size, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_check_for_msg - checks to see if someone sent us mail
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to check
- *
- *  returns SUCCESS if the Status bit was found or else ERR_MBX
- **/
-s32 ixgbe_check_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (mbx->ops.check_for_msg)
-               ret_val = mbx->ops.check_for_msg(hw, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_check_for_ack - checks to see if someone sent us ACK
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to check
- *
- *  returns SUCCESS if the Status bit was found or else ERR_MBX
- **/
-s32 ixgbe_check_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (mbx->ops.check_for_ack)
-               ret_val = mbx->ops.check_for_ack(hw, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_check_for_rst - checks to see if other side has reset
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to check
- *
- *  returns SUCCESS if the Status bit was found or else ERR_MBX
- **/
-s32 ixgbe_check_for_rst(struct ixgbe_hw *hw, u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (mbx->ops.check_for_rst)
-               ret_val = mbx->ops.check_for_rst(hw, mbx_id);
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_poll_for_msg - Wait for message notification
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully received a message notification
- **/
-static s32 ixgbe_poll_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       if (!countdown || !mbx->ops.check_for_msg)
-               goto out;
-
-       while (countdown && mbx->ops.check_for_msg(hw, mbx_id)) {
-               countdown--;
-               if (!countdown)
-                       break;
-               udelay(mbx->usec_delay);
-       }
-
-out:
-       return countdown ? 0 : IXGBE_ERR_MBX;
-}
-
-/**
- *  ixgbe_poll_for_ack - Wait for message acknowledgement
- *  @hw: pointer to the HW structure
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully received a message acknowledgement
- **/
-static s32 ixgbe_poll_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       if (!countdown || !mbx->ops.check_for_ack)
-               goto out;
-
-       while (countdown && mbx->ops.check_for_ack(hw, mbx_id)) {
-               countdown--;
-               if (!countdown)
-                       break;
-               udelay(mbx->usec_delay);
-       }
-
-out:
-       return countdown ? 0 : IXGBE_ERR_MBX;
-}
-
-/**
- *  ixgbe_read_posted_mbx - Wait for message notification and receive message
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully received a message notification and
- *  copied it into the receive buffer.
- **/
-static s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
-                                u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (!mbx->ops.read)
-               goto out;
-
-       ret_val = ixgbe_poll_for_msg(hw, mbx_id);
-
-       /* if ack received read message, otherwise we timed out */
-       if (!ret_val)
-               ret_val = mbx->ops.read(hw, msg, size, mbx_id);
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_write_posted_mbx - Write a message to the mailbox, wait for ack
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @mbx_id: id of mailbox to write
- *
- *  returns SUCCESS if it successfully copied message into the buffer and
- *  received an ack to that message within delay * timeout period
- **/
-static s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
-                           u16 mbx_id)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       /* exit if either we can't write or there isn't a defined timeout */
-       if (!mbx->ops.write || !mbx->timeout)
-               goto out;
-
-       /* send msg */
-       ret_val = mbx->ops.write(hw, msg, size, mbx_id);
-
-       /* if msg sent wait until we receive an ack */
-       if (!ret_val)
-               ret_val = ixgbe_poll_for_ack(hw, mbx_id);
-out:
-       return ret_val;
-}
-
-static s32 ixgbe_check_for_bit_pf(struct ixgbe_hw *hw, u32 mask, s32 index)
-{
-       u32 mbvficr = IXGBE_READ_REG(hw, IXGBE_MBVFICR(index));
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (mbvficr & mask) {
-               ret_val = 0;
-               IXGBE_WRITE_REG(hw, IXGBE_MBVFICR(index), mask);
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_check_for_msg_pf - checks to see if the VF has sent mail
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
- **/
-static s32 ixgbe_check_for_msg_pf(struct ixgbe_hw *hw, u16 vf_number)
-{
-       s32 ret_val = IXGBE_ERR_MBX;
-       s32 index = IXGBE_MBVFICR_INDEX(vf_number);
-       u32 vf_bit = vf_number % 16;
-
-       if (!ixgbe_check_for_bit_pf(hw, IXGBE_MBVFICR_VFREQ_VF1 << vf_bit,
-                                   index)) {
-               ret_val = 0;
-               hw->mbx.stats.reqs++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_check_for_ack_pf - checks to see if the VF has ACKed
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
- **/
-static s32 ixgbe_check_for_ack_pf(struct ixgbe_hw *hw, u16 vf_number)
-{
-       s32 ret_val = IXGBE_ERR_MBX;
-       s32 index = IXGBE_MBVFICR_INDEX(vf_number);
-       u32 vf_bit = vf_number % 16;
-
-       if (!ixgbe_check_for_bit_pf(hw, IXGBE_MBVFICR_VFACK_VF1 << vf_bit,
-                                   index)) {
-               ret_val = 0;
-               hw->mbx.stats.acks++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_check_for_rst_pf - checks to see if the VF has reset
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if the VF has set the Status bit or else ERR_MBX
- **/
-static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number)
-{
-       u32 reg_offset = (vf_number < 32) ? 0 : 1;
-       u32 vf_shift = vf_number % 32;
-       u32 vflre = 0;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       switch (hw->mac.type) {
-       case ixgbe_mac_82599EB:
-               vflre = IXGBE_READ_REG(hw, IXGBE_VFLRE(reg_offset));
-               break;
-       case ixgbe_mac_X540:
-               vflre = IXGBE_READ_REG(hw, IXGBE_VFLREC(reg_offset));
-               break;
-       default:
-               break;
-       }
-
-       if (vflre & (1 << vf_shift)) {
-               ret_val = 0;
-               IXGBE_WRITE_REG(hw, IXGBE_VFLREC(reg_offset), (1 << vf_shift));
-               hw->mbx.stats.rsts++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_obtain_mbx_lock_pf - obtain mailbox lock
- *  @hw: pointer to the HW structure
- *  @vf_number: the VF index
- *
- *  return SUCCESS if we obtained the mailbox lock
- **/
-static s32 ixgbe_obtain_mbx_lock_pf(struct ixgbe_hw *hw, u16 vf_number)
-{
-       s32 ret_val = IXGBE_ERR_MBX;
-       u32 p2v_mailbox;
-
-       /* Take ownership of the buffer */
-       IXGBE_WRITE_REG(hw, IXGBE_PFMAILBOX(vf_number), IXGBE_PFMAILBOX_PFU);
-
-       /* reserve mailbox for vf use */
-       p2v_mailbox = IXGBE_READ_REG(hw, IXGBE_PFMAILBOX(vf_number));
-       if (p2v_mailbox & IXGBE_PFMAILBOX_PFU)
-               ret_val = 0;
-
-       return ret_val;
-}
-
-/**
- *  ixgbe_write_mbx_pf - Places a message in the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @vf_number: the VF index
- *
- *  returns SUCCESS if it successfully copied message into the buffer
- **/
-static s32 ixgbe_write_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
-                              u16 vf_number)
-{
-       s32 ret_val;
-       u16 i;
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       ret_val = ixgbe_obtain_mbx_lock_pf(hw, vf_number);
-       if (ret_val)
-               goto out_no_write;
-
-       /* flush msg and acks as we are overwriting the message buffer */
-       ixgbe_check_for_msg_pf(hw, vf_number);
-       ixgbe_check_for_ack_pf(hw, vf_number);
-
-       /* copy the caller specified message to the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_PFMBMEM(vf_number), i, msg[i]);
-
-       /* Interrupt VF to tell it a message has been sent and release buffer*/
-       IXGBE_WRITE_REG(hw, IXGBE_PFMAILBOX(vf_number), IXGBE_PFMAILBOX_STS);
-
-       /* update stats */
-       hw->mbx.stats.msgs_tx++;
-
-out_no_write:
-       return ret_val;
-
-}
-
-/**
- *  ixgbe_read_mbx_pf - Read a message from the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *  @vf_number: the VF index
- *
- *  This function copies a message from the mailbox buffer to the caller's
- *  memory buffer.  The presumption is that the caller knows that there was
- *  a message due to a VF request so no polling for message is needed.
- **/
-static s32 ixgbe_read_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
-                             u16 vf_number)
-{
-       s32 ret_val;
-       u16 i;
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       ret_val = ixgbe_obtain_mbx_lock_pf(hw, vf_number);
-       if (ret_val)
-               goto out_no_read;
-
-       /* copy the message to the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               msg[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_PFMBMEM(vf_number), i);
-
-       /* Acknowledge the message and release buffer */
-       IXGBE_WRITE_REG(hw, IXGBE_PFMAILBOX(vf_number), IXGBE_PFMAILBOX_ACK);
-
-       /* update stats */
-       hw->mbx.stats.msgs_rx++;
-
-out_no_read:
-       return ret_val;
-}
-
-#ifdef CONFIG_PCI_IOV
-/**
- *  ixgbe_init_mbx_params_pf - set initial values for pf mailbox
- *  @hw: pointer to the HW structure
- *
- *  Initializes the hw->mbx struct to correct values for pf mailbox
- */
-void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-
-       if (hw->mac.type != ixgbe_mac_82599EB &&
-           hw->mac.type != ixgbe_mac_X540)
-               return;
-
-       mbx->timeout = 0;
-       mbx->usec_delay = 0;
-
-       mbx->stats.msgs_tx = 0;
-       mbx->stats.msgs_rx = 0;
-       mbx->stats.reqs = 0;
-       mbx->stats.acks = 0;
-       mbx->stats.rsts = 0;
-
-       mbx->size = IXGBE_VFMAILBOX_SIZE;
-}
-#endif /* CONFIG_PCI_IOV */
-
-struct ixgbe_mbx_operations mbx_ops_generic = {
-       .read                   = ixgbe_read_mbx_pf,
-       .write                  = ixgbe_write_mbx_pf,
-       .read_posted            = ixgbe_read_posted_mbx,
-       .write_posted           = ixgbe_write_posted_mbx,
-       .check_for_msg          = ixgbe_check_for_msg_pf,
-       .check_for_ack          = ixgbe_check_for_ack_pf,
-       .check_for_rst          = ixgbe_check_for_rst_pf,
-};
-
diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ixgbe/ixgbe_mbx.h
deleted file mode 100644 (file)
index b239bda..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_MBX_H_
-#define _IXGBE_MBX_H_
-
-#include "ixgbe_type.h"
-
-#define IXGBE_VFMAILBOX_SIZE        16 /* 16 32 bit words - 64 bytes */
-#define IXGBE_ERR_MBX               -100
-
-#define IXGBE_VFMAILBOX             0x002FC
-#define IXGBE_VFMBMEM               0x00200
-
-#define IXGBE_PFMAILBOX_STS   0x00000001 /* Initiate message send to VF */
-#define IXGBE_PFMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
-#define IXGBE_PFMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
-#define IXGBE_PFMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
-#define IXGBE_PFMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
-
-#define IXGBE_MBVFICR_VFREQ_MASK 0x0000FFFF /* bits for VF messages */
-#define IXGBE_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
-#define IXGBE_MBVFICR_VFACK_MASK 0xFFFF0000 /* bits for VF acks */
-#define IXGBE_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
-
-
-/* If it's a IXGBE_VF_* msg then it originates in the VF and is sent to the
- * PF.  The reverse is true if it is IXGBE_PF_*.
- * Message ACK's are the value or'd with 0xF0000000
- */
-#define IXGBE_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
-                                               * this are the ACK */
-#define IXGBE_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
-                                               * this are the NACK */
-#define IXGBE_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
-                                                 clear to send requests */
-#define IXGBE_VT_MSGINFO_SHIFT    16
-/* bits 23:16 are used for exra info for certain messages */
-#define IXGBE_VT_MSGINFO_MASK     (0xFF << IXGBE_VT_MSGINFO_SHIFT)
-
-#define IXGBE_VF_RESET            0x01 /* VF requests reset */
-#define IXGBE_VF_SET_MAC_ADDR     0x02 /* VF requests PF to set MAC addr */
-#define IXGBE_VF_SET_MULTICAST    0x03 /* VF requests PF to set MC addr */
-#define IXGBE_VF_SET_VLAN         0x04 /* VF requests PF to set VLAN */
-#define IXGBE_VF_SET_LPE          0x05 /* VF requests PF to set VMOLR.LPE */
-#define IXGBE_VF_SET_MACVLAN      0x06 /* VF requests PF for unicast filter */
-
-/* length of permanent address message returned from PF */
-#define IXGBE_VF_PERMADDR_MSG_LEN 4
-/* word in permanent address message with the current multicast type */
-#define IXGBE_VF_MC_TYPE_WORD     3
-
-#define IXGBE_PF_CONTROL_MSG      0x0100 /* PF control message */
-
-#define IXGBE_VF_MBX_INIT_TIMEOUT 2000 /* number of retries on mailbox */
-#define IXGBE_VF_MBX_INIT_DELAY   500  /* microseconds between retries */
-
-s32 ixgbe_read_mbx(struct ixgbe_hw *, u32 *, u16, u16);
-s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16);
-s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16);
-s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16);
-s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16);
-#ifdef CONFIG_PCI_IOV
-void ixgbe_init_mbx_params_pf(struct ixgbe_hw *);
-#endif /* CONFIG_PCI_IOV */
-
-extern struct ixgbe_mbx_operations mbx_ops_generic;
-
-#endif /* _IXGBE_MBX_H_ */
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
deleted file mode 100644 (file)
index f7ca351..0000000
+++ /dev/null
@@ -1,1725 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-
-#include "ixgbe_common.h"
-#include "ixgbe_phy.h"
-
-static void ixgbe_i2c_start(struct ixgbe_hw *hw);
-static void ixgbe_i2c_stop(struct ixgbe_hw *hw);
-static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data);
-static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data);
-static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw);
-static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data);
-static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data);
-static s32 ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
-static void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
-static s32 ixgbe_set_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl, bool data);
-static bool ixgbe_get_i2c_data(u32 *i2cctl);
-static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw);
-static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id);
-static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw);
-
-/**
- *  ixgbe_identify_phy_generic - Get physical layer module
- *  @hw: pointer to hardware structure
- *
- *  Determines the physical layer module found on the current adapter.
- **/
-s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)
-{
-       s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
-       u32 phy_addr;
-       u16 ext_ability = 0;
-
-       if (hw->phy.type == ixgbe_phy_unknown) {
-               for (phy_addr = 0; phy_addr < IXGBE_MAX_PHY_ADDR; phy_addr++) {
-                       hw->phy.mdio.prtad = phy_addr;
-                       if (mdio45_probe(&hw->phy.mdio, phy_addr) == 0) {
-                               ixgbe_get_phy_id(hw);
-                               hw->phy.type =
-                                       ixgbe_get_phy_type_from_id(hw->phy.id);
-
-                               if (hw->phy.type == ixgbe_phy_unknown) {
-                                       hw->phy.ops.read_reg(hw,
-                                                            MDIO_PMA_EXTABLE,
-                                                            MDIO_MMD_PMAPMD,
-                                                            &ext_ability);
-                                       if (ext_ability &
-                                           (MDIO_PMA_EXTABLE_10GBT |
-                                            MDIO_PMA_EXTABLE_1000BT))
-                                               hw->phy.type =
-                                                        ixgbe_phy_cu_unknown;
-                                       else
-                                               hw->phy.type =
-                                                        ixgbe_phy_generic;
-                               }
-
-                               status = 0;
-                               break;
-                       }
-               }
-               /* clear value if nothing found */
-               if (status != 0)
-                       hw->phy.mdio.prtad = 0;
-       } else {
-               status = 0;
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_get_phy_id - Get the phy type
- *  @hw: pointer to hardware structure
- *
- **/
-static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw)
-{
-       u32 status;
-       u16 phy_id_high = 0;
-       u16 phy_id_low = 0;
-
-       status = hw->phy.ops.read_reg(hw, MDIO_DEVID1, MDIO_MMD_PMAPMD,
-                                     &phy_id_high);
-
-       if (status == 0) {
-               hw->phy.id = (u32)(phy_id_high << 16);
-               status = hw->phy.ops.read_reg(hw, MDIO_DEVID2, MDIO_MMD_PMAPMD,
-                                             &phy_id_low);
-               hw->phy.id |= (u32)(phy_id_low & IXGBE_PHY_REVISION_MASK);
-               hw->phy.revision = (u32)(phy_id_low & ~IXGBE_PHY_REVISION_MASK);
-       }
-       return status;
-}
-
-/**
- *  ixgbe_get_phy_type_from_id - Get the phy type
- *  @hw: pointer to hardware structure
- *
- **/
-static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)
-{
-       enum ixgbe_phy_type phy_type;
-
-       switch (phy_id) {
-       case TN1010_PHY_ID:
-               phy_type = ixgbe_phy_tn;
-               break;
-       case X540_PHY_ID:
-               phy_type = ixgbe_phy_aq;
-               break;
-       case QT2022_PHY_ID:
-               phy_type = ixgbe_phy_qt;
-               break;
-       case ATH_PHY_ID:
-               phy_type = ixgbe_phy_nl;
-               break;
-       default:
-               phy_type = ixgbe_phy_unknown;
-               break;
-       }
-
-       return phy_type;
-}
-
-/**
- *  ixgbe_reset_phy_generic - Performs a PHY reset
- *  @hw: pointer to hardware structure
- **/
-s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)
-{
-       u32 i;
-       u16 ctrl = 0;
-       s32 status = 0;
-
-       if (hw->phy.type == ixgbe_phy_unknown)
-               status = ixgbe_identify_phy_generic(hw);
-
-       if (status != 0 || hw->phy.type == ixgbe_phy_none)
-               goto out;
-
-       /* Don't reset PHY if it's shut down due to overtemp. */
-       if (!hw->phy.reset_if_overtemp &&
-           (IXGBE_ERR_OVERTEMP == hw->phy.ops.check_overtemp(hw)))
-               goto out;
-
-       /*
-        * Perform soft PHY reset to the PHY_XS.
-        * This will cause a soft reset to the PHY
-        */
-       hw->phy.ops.write_reg(hw, MDIO_CTRL1,
-                             MDIO_MMD_PHYXS,
-                             MDIO_CTRL1_RESET);
-
-       /*
-        * Poll for reset bit to self-clear indicating reset is complete.
-        * Some PHYs could take up to 3 seconds to complete and need about
-        * 1.7 usec delay after the reset is complete.
-        */
-       for (i = 0; i < 30; i++) {
-               msleep(100);
-               hw->phy.ops.read_reg(hw, MDIO_CTRL1,
-                                    MDIO_MMD_PHYXS, &ctrl);
-               if (!(ctrl & MDIO_CTRL1_RESET)) {
-                       udelay(2);
-                       break;
-               }
-       }
-
-       if (ctrl & MDIO_CTRL1_RESET) {
-               status = IXGBE_ERR_RESET_FAILED;
-               hw_dbg(hw, "PHY reset polling failed to complete.\n");
-       }
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_read_phy_reg_generic - Reads a value from a specified PHY register
- *  @hw: pointer to hardware structure
- *  @reg_addr: 32 bit address of PHY register to read
- *  @phy_data: Pointer to read data from PHY register
- **/
-s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
-                               u32 device_type, u16 *phy_data)
-{
-       u32 command;
-       u32 i;
-       u32 data;
-       s32 status = 0;
-       u16 gssr;
-
-       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
-               gssr = IXGBE_GSSR_PHY1_SM;
-       else
-               gssr = IXGBE_GSSR_PHY0_SM;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)
-               status = IXGBE_ERR_SWFW_SYNC;
-
-       if (status == 0) {
-               /* Setup and write the address cycle command */
-               command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
-                          (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
-                          (hw->phy.mdio.prtad << IXGBE_MSCA_PHY_ADDR_SHIFT) |
-                          (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));
-
-               IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
-
-               /*
-                * Check every 10 usec to see if the address cycle completed.
-                * The MDI Command bit will clear when the operation is
-                * complete
-                */
-               for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
-                       udelay(10);
-
-                       command = IXGBE_READ_REG(hw, IXGBE_MSCA);
-
-                       if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
-                               break;
-               }
-
-               if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
-                       hw_dbg(hw, "PHY address command did not complete.\n");
-                       status = IXGBE_ERR_PHY;
-               }
-
-               if (status == 0) {
-                       /*
-                        * Address cycle complete, setup and write the read
-                        * command
-                        */
-                       command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
-                                  (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
-                                  (hw->phy.mdio.prtad <<
-                                   IXGBE_MSCA_PHY_ADDR_SHIFT) |
-                                  (IXGBE_MSCA_READ | IXGBE_MSCA_MDI_COMMAND));
-
-                       IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
-
-                       /*
-                        * Check every 10 usec to see if the address cycle
-                        * completed. The MDI Command bit will clear when the
-                        * operation is complete
-                        */
-                       for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
-                               udelay(10);
-
-                               command = IXGBE_READ_REG(hw, IXGBE_MSCA);
-
-                               if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
-                                       break;
-                       }
-
-                       if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
-                               hw_dbg(hw, "PHY read command didn't complete\n");
-                               status = IXGBE_ERR_PHY;
-                       } else {
-                               /*
-                                * Read operation is complete.  Get the data
-                                * from MSRWD
-                                */
-                               data = IXGBE_READ_REG(hw, IXGBE_MSRWD);
-                               data >>= IXGBE_MSRWD_READ_DATA_SHIFT;
-                               *phy_data = (u16)(data);
-                       }
-               }
-
-               hw->mac.ops.release_swfw_sync(hw, gssr);
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_write_phy_reg_generic - Writes a value to specified PHY register
- *  @hw: pointer to hardware structure
- *  @reg_addr: 32 bit PHY register to write
- *  @device_type: 5 bit device type
- *  @phy_data: Data to write to the PHY register
- **/
-s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
-                                u32 device_type, u16 phy_data)
-{
-       u32 command;
-       u32 i;
-       s32 status = 0;
-       u16 gssr;
-
-       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
-               gssr = IXGBE_GSSR_PHY1_SM;
-       else
-               gssr = IXGBE_GSSR_PHY0_SM;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)
-               status = IXGBE_ERR_SWFW_SYNC;
-
-       if (status == 0) {
-               /* Put the data in the MDI single read and write data register*/
-               IXGBE_WRITE_REG(hw, IXGBE_MSRWD, (u32)phy_data);
-
-               /* Setup and write the address cycle command */
-               command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
-                          (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
-                          (hw->phy.mdio.prtad << IXGBE_MSCA_PHY_ADDR_SHIFT) |
-                          (IXGBE_MSCA_ADDR_CYCLE | IXGBE_MSCA_MDI_COMMAND));
-
-               IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
-
-               /*
-                * Check every 10 usec to see if the address cycle completed.
-                * The MDI Command bit will clear when the operation is
-                * complete
-                */
-               for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
-                       udelay(10);
-
-                       command = IXGBE_READ_REG(hw, IXGBE_MSCA);
-
-                       if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
-                               break;
-               }
-
-               if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
-                       hw_dbg(hw, "PHY address cmd didn't complete\n");
-                       status = IXGBE_ERR_PHY;
-               }
-
-               if (status == 0) {
-                       /*
-                        * Address cycle complete, setup and write the write
-                        * command
-                        */
-                       command = ((reg_addr << IXGBE_MSCA_NP_ADDR_SHIFT)  |
-                                  (device_type << IXGBE_MSCA_DEV_TYPE_SHIFT) |
-                                  (hw->phy.mdio.prtad <<
-                                   IXGBE_MSCA_PHY_ADDR_SHIFT) |
-                                  (IXGBE_MSCA_WRITE | IXGBE_MSCA_MDI_COMMAND));
-
-                       IXGBE_WRITE_REG(hw, IXGBE_MSCA, command);
-
-                       /*
-                        * Check every 10 usec to see if the address cycle
-                        * completed. The MDI Command bit will clear when the
-                        * operation is complete
-                        */
-                       for (i = 0; i < IXGBE_MDIO_COMMAND_TIMEOUT; i++) {
-                               udelay(10);
-
-                               command = IXGBE_READ_REG(hw, IXGBE_MSCA);
-
-                               if ((command & IXGBE_MSCA_MDI_COMMAND) == 0)
-                                       break;
-                       }
-
-                       if ((command & IXGBE_MSCA_MDI_COMMAND) != 0) {
-                               hw_dbg(hw, "PHY address cmd didn't complete\n");
-                               status = IXGBE_ERR_PHY;
-                       }
-               }
-
-               hw->mac.ops.release_swfw_sync(hw, gssr);
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_setup_phy_link_generic - Set and restart autoneg
- *  @hw: pointer to hardware structure
- *
- *  Restart autonegotiation and PHY and waits for completion.
- **/
-s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
-{
-       s32 status = 0;
-       u32 time_out;
-       u32 max_time_out = 10;
-       u16 autoneg_reg = IXGBE_MII_AUTONEG_REG;
-       bool autoneg = false;
-       ixgbe_link_speed speed;
-
-       ixgbe_get_copper_link_capabilities_generic(hw, &speed, &autoneg);
-
-       if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
-               /* Set or unset auto-negotiation 10G advertisement */
-               hw->phy.ops.read_reg(hw, MDIO_AN_10GBT_CTRL,
-                                    MDIO_MMD_AN,
-                                    &autoneg_reg);
-
-               autoneg_reg &= ~MDIO_AN_10GBT_CTRL_ADV10G;
-               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
-                       autoneg_reg |= MDIO_AN_10GBT_CTRL_ADV10G;
-
-               hw->phy.ops.write_reg(hw, MDIO_AN_10GBT_CTRL,
-                                     MDIO_MMD_AN,
-                                     autoneg_reg);
-       }
-
-       if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
-               /* Set or unset auto-negotiation 1G advertisement */
-               hw->phy.ops.read_reg(hw,
-                                    IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
-                                    MDIO_MMD_AN,
-                                    &autoneg_reg);
-
-               autoneg_reg &= ~IXGBE_MII_1GBASE_T_ADVERTISE;
-               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
-                       autoneg_reg |= IXGBE_MII_1GBASE_T_ADVERTISE;
-
-               hw->phy.ops.write_reg(hw,
-                                     IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
-                                     MDIO_MMD_AN,
-                                     autoneg_reg);
-       }
-
-       if (speed & IXGBE_LINK_SPEED_100_FULL) {
-               /* Set or unset auto-negotiation 100M advertisement */
-               hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
-                                    MDIO_MMD_AN,
-                                    &autoneg_reg);
-
-               autoneg_reg &= ~(ADVERTISE_100FULL |
-                                ADVERTISE_100HALF);
-               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
-                       autoneg_reg |= ADVERTISE_100FULL;
-
-               hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
-                                     MDIO_MMD_AN,
-                                     autoneg_reg);
-       }
-
-       /* Restart PHY autonegotiation and wait for completion */
-       hw->phy.ops.read_reg(hw, MDIO_CTRL1,
-                            MDIO_MMD_AN, &autoneg_reg);
-
-       autoneg_reg |= MDIO_AN_CTRL1_RESTART;
-
-       hw->phy.ops.write_reg(hw, MDIO_CTRL1,
-                             MDIO_MMD_AN, autoneg_reg);
-
-       /* Wait for autonegotiation to finish */
-       for (time_out = 0; time_out < max_time_out; time_out++) {
-               udelay(10);
-               /* Restart PHY autonegotiation and wait for completion */
-               status = hw->phy.ops.read_reg(hw, MDIO_STAT1,
-                                             MDIO_MMD_AN,
-                                             &autoneg_reg);
-
-               autoneg_reg &= MDIO_AN_STAT1_COMPLETE;
-               if (autoneg_reg == MDIO_AN_STAT1_COMPLETE) {
-                       break;
-               }
-       }
-
-       if (time_out == max_time_out) {
-               status = IXGBE_ERR_LINK_SETUP;
-               hw_dbg(hw, "ixgbe_setup_phy_link_generic: time out");
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_setup_phy_link_speed_generic - Sets the auto advertised capabilities
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
- **/
-s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
-                                       ixgbe_link_speed speed,
-                                       bool autoneg,
-                                       bool autoneg_wait_to_complete)
-{
-
-       /*
-        * Clear autoneg_advertised and set new values based on input link
-        * speed.
-        */
-       hw->phy.autoneg_advertised = 0;
-
-       if (speed & IXGBE_LINK_SPEED_10GB_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_10GB_FULL;
-
-       if (speed & IXGBE_LINK_SPEED_1GB_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
-
-       if (speed & IXGBE_LINK_SPEED_100_FULL)
-               hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_100_FULL;
-
-       /* Setup link based on the new speed settings */
-       hw->phy.ops.setup_link(hw);
-
-       return 0;
-}
-
-/**
- * ixgbe_get_copper_link_capabilities_generic - Determines link capabilities
- * @hw: pointer to hardware structure
- * @speed: pointer to link speed
- * @autoneg: boolean auto-negotiation value
- *
- * Determines the link capabilities by reading the AUTOC register.
- */
-s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
-                                               ixgbe_link_speed *speed,
-                                               bool *autoneg)
-{
-       s32 status = IXGBE_ERR_LINK_SETUP;
-       u16 speed_ability;
-
-       *speed = 0;
-       *autoneg = true;
-
-       status = hw->phy.ops.read_reg(hw, MDIO_SPEED, MDIO_MMD_PMAPMD,
-                                     &speed_ability);
-
-       if (status == 0) {
-               if (speed_ability & MDIO_SPEED_10G)
-                       *speed |= IXGBE_LINK_SPEED_10GB_FULL;
-               if (speed_ability & MDIO_PMA_SPEED_1000)
-                       *speed |= IXGBE_LINK_SPEED_1GB_FULL;
-               if (speed_ability & MDIO_PMA_SPEED_100)
-                       *speed |= IXGBE_LINK_SPEED_100_FULL;
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_check_phy_link_tnx - Determine link and speed status
- *  @hw: pointer to hardware structure
- *
- *  Reads the VS1 register to determine if link is up and the current speed for
- *  the PHY.
- **/
-s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
-                            bool *link_up)
-{
-       s32 status = 0;
-       u32 time_out;
-       u32 max_time_out = 10;
-       u16 phy_link = 0;
-       u16 phy_speed = 0;
-       u16 phy_data = 0;
-
-       /* Initialize speed and link to default case */
-       *link_up = false;
-       *speed = IXGBE_LINK_SPEED_10GB_FULL;
-
-       /*
-        * Check current speed and link status of the PHY register.
-        * This is a vendor specific register and may have to
-        * be changed for other copper PHYs.
-        */
-       for (time_out = 0; time_out < max_time_out; time_out++) {
-               udelay(10);
-               status = hw->phy.ops.read_reg(hw,
-                                             MDIO_STAT1,
-                                             MDIO_MMD_VEND1,
-                                             &phy_data);
-               phy_link = phy_data &
-                           IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS;
-               phy_speed = phy_data &
-                           IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS;
-               if (phy_link == IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS) {
-                       *link_up = true;
-                       if (phy_speed ==
-                           IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS)
-                               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-                       break;
-               }
-       }
-
-       return status;
-}
-
-/**
- *     ixgbe_setup_phy_link_tnx - Set and restart autoneg
- *     @hw: pointer to hardware structure
- *
- *     Restart autonegotiation and PHY and waits for completion.
- **/
-s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
-{
-       s32 status = 0;
-       u32 time_out;
-       u32 max_time_out = 10;
-       u16 autoneg_reg = IXGBE_MII_AUTONEG_REG;
-       bool autoneg = false;
-       ixgbe_link_speed speed;
-
-       ixgbe_get_copper_link_capabilities_generic(hw, &speed, &autoneg);
-
-       if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
-               /* Set or unset auto-negotiation 10G advertisement */
-               hw->phy.ops.read_reg(hw, MDIO_AN_10GBT_CTRL,
-                                    MDIO_MMD_AN,
-                                    &autoneg_reg);
-
-               autoneg_reg &= ~MDIO_AN_10GBT_CTRL_ADV10G;
-               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
-                       autoneg_reg |= MDIO_AN_10GBT_CTRL_ADV10G;
-
-               hw->phy.ops.write_reg(hw, MDIO_AN_10GBT_CTRL,
-                                     MDIO_MMD_AN,
-                                     autoneg_reg);
-       }
-
-       if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
-               /* Set or unset auto-negotiation 1G advertisement */
-               hw->phy.ops.read_reg(hw, IXGBE_MII_AUTONEG_XNP_TX_REG,
-                                    MDIO_MMD_AN,
-                                    &autoneg_reg);
-
-               autoneg_reg &= ~IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX;
-               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
-                       autoneg_reg |= IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX;
-
-               hw->phy.ops.write_reg(hw, IXGBE_MII_AUTONEG_XNP_TX_REG,
-                                     MDIO_MMD_AN,
-                                     autoneg_reg);
-       }
-
-       if (speed & IXGBE_LINK_SPEED_100_FULL) {
-               /* Set or unset auto-negotiation 100M advertisement */
-               hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
-                                    MDIO_MMD_AN,
-                                    &autoneg_reg);
-
-               autoneg_reg &= ~(ADVERTISE_100FULL |
-                                ADVERTISE_100HALF);
-               if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
-                       autoneg_reg |= ADVERTISE_100FULL;
-
-               hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
-                                     MDIO_MMD_AN,
-                                     autoneg_reg);
-       }
-
-       /* Restart PHY autonegotiation and wait for completion */
-       hw->phy.ops.read_reg(hw, MDIO_CTRL1,
-                            MDIO_MMD_AN, &autoneg_reg);
-
-       autoneg_reg |= MDIO_AN_CTRL1_RESTART;
-
-       hw->phy.ops.write_reg(hw, MDIO_CTRL1,
-                             MDIO_MMD_AN, autoneg_reg);
-
-       /* Wait for autonegotiation to finish */
-       for (time_out = 0; time_out < max_time_out; time_out++) {
-               udelay(10);
-               /* Restart PHY autonegotiation and wait for completion */
-               status = hw->phy.ops.read_reg(hw, MDIO_STAT1,
-                                             MDIO_MMD_AN,
-                                             &autoneg_reg);
-
-               autoneg_reg &= MDIO_AN_STAT1_COMPLETE;
-               if (autoneg_reg == MDIO_AN_STAT1_COMPLETE)
-                       break;
-       }
-
-       if (time_out == max_time_out) {
-               status = IXGBE_ERR_LINK_SETUP;
-               hw_dbg(hw, "ixgbe_setup_phy_link_tnx: time out");
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_get_phy_firmware_version_tnx - Gets the PHY Firmware Version
- *  @hw: pointer to hardware structure
- *  @firmware_version: pointer to the PHY Firmware Version
- **/
-s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,
-                                      u16 *firmware_version)
-{
-       s32 status = 0;
-
-       status = hw->phy.ops.read_reg(hw, TNX_FW_REV,
-                                     MDIO_MMD_VEND1,
-                                     firmware_version);
-
-       return status;
-}
-
-/**
- *  ixgbe_get_phy_firmware_version_generic - Gets the PHY Firmware Version
- *  @hw: pointer to hardware structure
- *  @firmware_version: pointer to the PHY Firmware Version
- **/
-s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw,
-                                          u16 *firmware_version)
-{
-       s32 status = 0;
-
-       status = hw->phy.ops.read_reg(hw, AQ_FW_REV,
-                                     MDIO_MMD_VEND1,
-                                     firmware_version);
-
-       return status;
-}
-
-/**
- *  ixgbe_reset_phy_nl - Performs a PHY reset
- *  @hw: pointer to hardware structure
- **/
-s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw)
-{
-       u16 phy_offset, control, eword, edata, block_crc;
-       bool end_data = false;
-       u16 list_offset, data_offset;
-       u16 phy_data = 0;
-       s32 ret_val = 0;
-       u32 i;
-
-       hw->phy.ops.read_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS, &phy_data);
-
-       /* reset the PHY and poll for completion */
-       hw->phy.ops.write_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS,
-                             (phy_data | MDIO_CTRL1_RESET));
-
-       for (i = 0; i < 100; i++) {
-               hw->phy.ops.read_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS,
-                                    &phy_data);
-               if ((phy_data & MDIO_CTRL1_RESET) == 0)
-                       break;
-               usleep_range(10000, 20000);
-       }
-
-       if ((phy_data & MDIO_CTRL1_RESET) != 0) {
-               hw_dbg(hw, "PHY reset did not complete.\n");
-               ret_val = IXGBE_ERR_PHY;
-               goto out;
-       }
-
-       /* Get init offsets */
-       ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,
-                                                     &data_offset);
-       if (ret_val != 0)
-               goto out;
-
-       ret_val = hw->eeprom.ops.read(hw, data_offset, &block_crc);
-       data_offset++;
-       while (!end_data) {
-               /*
-                * Read control word from PHY init contents offset
-                */
-               ret_val = hw->eeprom.ops.read(hw, data_offset, &eword);
-               control = (eword & IXGBE_CONTROL_MASK_NL) >>
-                          IXGBE_CONTROL_SHIFT_NL;
-               edata = eword & IXGBE_DATA_MASK_NL;
-               switch (control) {
-               case IXGBE_DELAY_NL:
-                       data_offset++;
-                       hw_dbg(hw, "DELAY: %d MS\n", edata);
-                       usleep_range(edata * 1000, edata * 2000);
-                       break;
-               case IXGBE_DATA_NL:
-                       hw_dbg(hw, "DATA:\n");
-                       data_offset++;
-                       hw->eeprom.ops.read(hw, data_offset++,
-                                           &phy_offset);
-                       for (i = 0; i < edata; i++) {
-                               hw->eeprom.ops.read(hw, data_offset, &eword);
-                               hw->phy.ops.write_reg(hw, phy_offset,
-                                                     MDIO_MMD_PMAPMD, eword);
-                               hw_dbg(hw, "Wrote %4.4x to %4.4x\n", eword,
-                                      phy_offset);
-                               data_offset++;
-                               phy_offset++;
-                       }
-                       break;
-               case IXGBE_CONTROL_NL:
-                       data_offset++;
-                       hw_dbg(hw, "CONTROL:\n");
-                       if (edata == IXGBE_CONTROL_EOL_NL) {
-                               hw_dbg(hw, "EOL\n");
-                               end_data = true;
-                       } else if (edata == IXGBE_CONTROL_SOL_NL) {
-                               hw_dbg(hw, "SOL\n");
-                       } else {
-                               hw_dbg(hw, "Bad control value\n");
-                               ret_val = IXGBE_ERR_PHY;
-                               goto out;
-                       }
-                       break;
-               default:
-                       hw_dbg(hw, "Bad control type\n");
-                       ret_val = IXGBE_ERR_PHY;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_identify_sfp_module_generic - Identifies SFP modules
- *  @hw: pointer to hardware structure
- *
- *  Searches for and identifies the SFP module and assigns appropriate PHY type.
- **/
-s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
-{
-       s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
-       u32 vendor_oui = 0;
-       enum ixgbe_sfp_type stored_sfp_type = hw->phy.sfp_type;
-       u8 identifier = 0;
-       u8 comp_codes_1g = 0;
-       u8 comp_codes_10g = 0;
-       u8 oui_bytes[3] = {0, 0, 0};
-       u8 cable_tech = 0;
-       u8 cable_spec = 0;
-       u16 enforce_sfp = 0;
-
-       if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_fiber) {
-               hw->phy.sfp_type = ixgbe_sfp_type_not_present;
-               status = IXGBE_ERR_SFP_NOT_PRESENT;
-               goto out;
-       }
-
-       status = hw->phy.ops.read_i2c_eeprom(hw,
-                                            IXGBE_SFF_IDENTIFIER,
-                                            &identifier);
-
-       if (status == IXGBE_ERR_SWFW_SYNC ||
-           status == IXGBE_ERR_I2C ||
-           status == IXGBE_ERR_SFP_NOT_PRESENT)
-               goto err_read_i2c_eeprom;
-
-       /* LAN ID is needed for sfp_type determination */
-       hw->mac.ops.set_lan_id(hw);
-
-       if (identifier != IXGBE_SFF_IDENTIFIER_SFP) {
-               hw->phy.type = ixgbe_phy_sfp_unsupported;
-               status = IXGBE_ERR_SFP_NOT_SUPPORTED;
-       } else {
-               status = hw->phy.ops.read_i2c_eeprom(hw,
-                                                    IXGBE_SFF_1GBE_COMP_CODES,
-                                                    &comp_codes_1g);
-
-               if (status == IXGBE_ERR_SWFW_SYNC ||
-                   status == IXGBE_ERR_I2C ||
-                   status == IXGBE_ERR_SFP_NOT_PRESENT)
-                       goto err_read_i2c_eeprom;
-
-               status = hw->phy.ops.read_i2c_eeprom(hw,
-                                                    IXGBE_SFF_10GBE_COMP_CODES,
-                                                    &comp_codes_10g);
-
-               if (status == IXGBE_ERR_SWFW_SYNC ||
-                   status == IXGBE_ERR_I2C ||
-                   status == IXGBE_ERR_SFP_NOT_PRESENT)
-                       goto err_read_i2c_eeprom;
-               status = hw->phy.ops.read_i2c_eeprom(hw,
-                                                    IXGBE_SFF_CABLE_TECHNOLOGY,
-                                                    &cable_tech);
-
-               if (status == IXGBE_ERR_SWFW_SYNC ||
-                   status == IXGBE_ERR_I2C ||
-                   status == IXGBE_ERR_SFP_NOT_PRESENT)
-                       goto err_read_i2c_eeprom;
-
-                /* ID Module
-                 * =========
-                 * 0   SFP_DA_CU
-                 * 1   SFP_SR
-                 * 2   SFP_LR
-                 * 3   SFP_DA_CORE0 - 82599-specific
-                 * 4   SFP_DA_CORE1 - 82599-specific
-                 * 5   SFP_SR/LR_CORE0 - 82599-specific
-                 * 6   SFP_SR/LR_CORE1 - 82599-specific
-                 * 7   SFP_act_lmt_DA_CORE0 - 82599-specific
-                 * 8   SFP_act_lmt_DA_CORE1 - 82599-specific
-                 * 9   SFP_1g_cu_CORE0 - 82599-specific
-                 * 10  SFP_1g_cu_CORE1 - 82599-specific
-                 */
-               if (hw->mac.type == ixgbe_mac_82598EB) {
-                       if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
-                               hw->phy.sfp_type = ixgbe_sfp_type_da_cu;
-                       else if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
-                               hw->phy.sfp_type = ixgbe_sfp_type_sr;
-                       else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
-                               hw->phy.sfp_type = ixgbe_sfp_type_lr;
-                       else
-                               hw->phy.sfp_type = ixgbe_sfp_type_unknown;
-               } else if (hw->mac.type == ixgbe_mac_82599EB) {
-                       if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE) {
-                               if (hw->bus.lan_id == 0)
-                                       hw->phy.sfp_type =
-                                                    ixgbe_sfp_type_da_cu_core0;
-                               else
-                                       hw->phy.sfp_type =
-                                                    ixgbe_sfp_type_da_cu_core1;
-                       } else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE) {
-                               hw->phy.ops.read_i2c_eeprom(
-                                               hw, IXGBE_SFF_CABLE_SPEC_COMP,
-                                               &cable_spec);
-                               if (cable_spec &
-                                   IXGBE_SFF_DA_SPEC_ACTIVE_LIMITING) {
-                                       if (hw->bus.lan_id == 0)
-                                               hw->phy.sfp_type =
-                                               ixgbe_sfp_type_da_act_lmt_core0;
-                                       else
-                                               hw->phy.sfp_type =
-                                               ixgbe_sfp_type_da_act_lmt_core1;
-                               } else {
-                                       hw->phy.sfp_type =
-                                                       ixgbe_sfp_type_unknown;
-                               }
-                       } else if (comp_codes_10g &
-                                  (IXGBE_SFF_10GBASESR_CAPABLE |
-                                   IXGBE_SFF_10GBASELR_CAPABLE)) {
-                               if (hw->bus.lan_id == 0)
-                                       hw->phy.sfp_type =
-                                                     ixgbe_sfp_type_srlr_core0;
-                               else
-                                       hw->phy.sfp_type =
-                                                     ixgbe_sfp_type_srlr_core1;
-                       } else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE) {
-                               if (hw->bus.lan_id == 0)
-                                       hw->phy.sfp_type =
-                                               ixgbe_sfp_type_1g_cu_core0;
-                               else
-                                       hw->phy.sfp_type =
-                                               ixgbe_sfp_type_1g_cu_core1;
-                       } else {
-                               hw->phy.sfp_type = ixgbe_sfp_type_unknown;
-                       }
-               }
-
-               if (hw->phy.sfp_type != stored_sfp_type)
-                       hw->phy.sfp_setup_needed = true;
-
-               /* Determine if the SFP+ PHY is dual speed or not. */
-               hw->phy.multispeed_fiber = false;
-               if (((comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) &&
-                  (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)) ||
-                  ((comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) &&
-                  (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)))
-                       hw->phy.multispeed_fiber = true;
-
-               /* Determine PHY vendor */
-               if (hw->phy.type != ixgbe_phy_nl) {
-                       hw->phy.id = identifier;
-                       status = hw->phy.ops.read_i2c_eeprom(hw,
-                                                   IXGBE_SFF_VENDOR_OUI_BYTE0,
-                                                   &oui_bytes[0]);
-
-                       if (status == IXGBE_ERR_SWFW_SYNC ||
-                           status == IXGBE_ERR_I2C ||
-                           status == IXGBE_ERR_SFP_NOT_PRESENT)
-                               goto err_read_i2c_eeprom;
-
-                       status = hw->phy.ops.read_i2c_eeprom(hw,
-                                                   IXGBE_SFF_VENDOR_OUI_BYTE1,
-                                                   &oui_bytes[1]);
-
-                       if (status == IXGBE_ERR_SWFW_SYNC ||
-                           status == IXGBE_ERR_I2C ||
-                           status == IXGBE_ERR_SFP_NOT_PRESENT)
-                               goto err_read_i2c_eeprom;
-
-                       status = hw->phy.ops.read_i2c_eeprom(hw,
-                                                   IXGBE_SFF_VENDOR_OUI_BYTE2,
-                                                   &oui_bytes[2]);
-
-                       if (status == IXGBE_ERR_SWFW_SYNC ||
-                           status == IXGBE_ERR_I2C ||
-                           status == IXGBE_ERR_SFP_NOT_PRESENT)
-                               goto err_read_i2c_eeprom;
-
-                       vendor_oui =
-                         ((oui_bytes[0] << IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT) |
-                          (oui_bytes[1] << IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT) |
-                          (oui_bytes[2] << IXGBE_SFF_VENDOR_OUI_BYTE2_SHIFT));
-
-                       switch (vendor_oui) {
-                       case IXGBE_SFF_VENDOR_OUI_TYCO:
-                               if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
-                                       hw->phy.type =
-                                                   ixgbe_phy_sfp_passive_tyco;
-                               break;
-                       case IXGBE_SFF_VENDOR_OUI_FTL:
-                               if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
-                                       hw->phy.type = ixgbe_phy_sfp_ftl_active;
-                               else
-                                       hw->phy.type = ixgbe_phy_sfp_ftl;
-                               break;
-                       case IXGBE_SFF_VENDOR_OUI_AVAGO:
-                               hw->phy.type = ixgbe_phy_sfp_avago;
-                               break;
-                       case IXGBE_SFF_VENDOR_OUI_INTEL:
-                               hw->phy.type = ixgbe_phy_sfp_intel;
-                               break;
-                       default:
-                               if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
-                                       hw->phy.type =
-                                                ixgbe_phy_sfp_passive_unknown;
-                               else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
-                                       hw->phy.type =
-                                               ixgbe_phy_sfp_active_unknown;
-                               else
-                                       hw->phy.type = ixgbe_phy_sfp_unknown;
-                               break;
-                       }
-               }
-
-               /* Allow any DA cable vendor */
-               if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |
-                   IXGBE_SFF_DA_ACTIVE_CABLE)) {
-                       status = 0;
-                       goto out;
-               }
-
-               /* Verify supported 1G SFP modules */
-               if (comp_codes_10g == 0 &&
-                   !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
-                     hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0)) {
-                       hw->phy.type = ixgbe_phy_sfp_unsupported;
-                       status = IXGBE_ERR_SFP_NOT_SUPPORTED;
-                       goto out;
-               }
-
-               /* Anything else 82598-based is supported */
-               if (hw->mac.type == ixgbe_mac_82598EB) {
-                       status = 0;
-                       goto out;
-               }
-
-               hw->mac.ops.get_device_caps(hw, &enforce_sfp);
-               if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&
-                   !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||
-                     (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1))) {
-                       /* Make sure we're a supported PHY type */
-                       if (hw->phy.type == ixgbe_phy_sfp_intel) {
-                               status = 0;
-                       } else {
-                               hw_dbg(hw, "SFP+ module not supported\n");
-                               hw->phy.type = ixgbe_phy_sfp_unsupported;
-                               status = IXGBE_ERR_SFP_NOT_SUPPORTED;
-                       }
-               } else {
-                       status = 0;
-               }
-       }
-
-out:
-       return status;
-
-err_read_i2c_eeprom:
-       hw->phy.sfp_type = ixgbe_sfp_type_not_present;
-       if (hw->phy.type != ixgbe_phy_nl) {
-               hw->phy.id = 0;
-               hw->phy.type = ixgbe_phy_unknown;
-       }
-       return IXGBE_ERR_SFP_NOT_PRESENT;
-}
-
-/**
- *  ixgbe_get_sfp_init_sequence_offsets - Provides offset of PHY init sequence
- *  @hw: pointer to hardware structure
- *  @list_offset: offset to the SFP ID list
- *  @data_offset: offset to the SFP data block
- *
- *  Checks the MAC's EEPROM to see if it supports a given SFP+ module type, if
- *  so it returns the offsets to the phy init sequence block.
- **/
-s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
-                                        u16 *list_offset,
-                                        u16 *data_offset)
-{
-       u16 sfp_id;
-       u16 sfp_type = hw->phy.sfp_type;
-
-       if (hw->phy.sfp_type == ixgbe_sfp_type_unknown)
-               return IXGBE_ERR_SFP_NOT_SUPPORTED;
-
-       if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
-               return IXGBE_ERR_SFP_NOT_PRESENT;
-
-       if ((hw->device_id == IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM) &&
-           (hw->phy.sfp_type == ixgbe_sfp_type_da_cu))
-               return IXGBE_ERR_SFP_NOT_SUPPORTED;
-
-       /*
-        * Limiting active cables and 1G Phys must be initialized as
-        * SR modules
-        */
-       if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
-           sfp_type == ixgbe_sfp_type_1g_cu_core0)
-               sfp_type = ixgbe_sfp_type_srlr_core0;
-       else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
-                sfp_type == ixgbe_sfp_type_1g_cu_core1)
-               sfp_type = ixgbe_sfp_type_srlr_core1;
-
-       /* Read offset to PHY init contents */
-       hw->eeprom.ops.read(hw, IXGBE_PHY_INIT_OFFSET_NL, list_offset);
-
-       if ((!*list_offset) || (*list_offset == 0xFFFF))
-               return IXGBE_ERR_SFP_NO_INIT_SEQ_PRESENT;
-
-       /* Shift offset to first ID word */
-       (*list_offset)++;
-
-       /*
-        * Find the matching SFP ID in the EEPROM
-        * and program the init sequence
-        */
-       hw->eeprom.ops.read(hw, *list_offset, &sfp_id);
-
-       while (sfp_id != IXGBE_PHY_INIT_END_NL) {
-               if (sfp_id == sfp_type) {
-                       (*list_offset)++;
-                       hw->eeprom.ops.read(hw, *list_offset, data_offset);
-                       if ((!*data_offset) || (*data_offset == 0xFFFF)) {
-                               hw_dbg(hw, "SFP+ module not supported\n");
-                               return IXGBE_ERR_SFP_NOT_SUPPORTED;
-                       } else {
-                               break;
-                       }
-               } else {
-                       (*list_offset) += 2;
-                       if (hw->eeprom.ops.read(hw, *list_offset, &sfp_id))
-                               return IXGBE_ERR_PHY;
-               }
-       }
-
-       if (sfp_id == IXGBE_PHY_INIT_END_NL) {
-               hw_dbg(hw, "No matching SFP+ module found\n");
-               return IXGBE_ERR_SFP_NOT_SUPPORTED;
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_read_i2c_eeprom_generic - Reads 8 bit EEPROM word over I2C interface
- *  @hw: pointer to hardware structure
- *  @byte_offset: EEPROM byte offset to read
- *  @eeprom_data: value read
- *
- *  Performs byte read operation to SFP module's EEPROM over I2C interface.
- **/
-s32 ixgbe_read_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                  u8 *eeprom_data)
-{
-       return hw->phy.ops.read_i2c_byte(hw, byte_offset,
-                                        IXGBE_I2C_EEPROM_DEV_ADDR,
-                                        eeprom_data);
-}
-
-/**
- *  ixgbe_write_i2c_eeprom_generic - Writes 8 bit EEPROM word over I2C interface
- *  @hw: pointer to hardware structure
- *  @byte_offset: EEPROM byte offset to write
- *  @eeprom_data: value to write
- *
- *  Performs byte write operation to SFP module's EEPROM over I2C interface.
- **/
-s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                   u8 eeprom_data)
-{
-       return hw->phy.ops.write_i2c_byte(hw, byte_offset,
-                                         IXGBE_I2C_EEPROM_DEV_ADDR,
-                                         eeprom_data);
-}
-
-/**
- *  ixgbe_read_i2c_byte_generic - Reads 8 bit word over I2C
- *  @hw: pointer to hardware structure
- *  @byte_offset: byte offset to read
- *  @data: value read
- *
- *  Performs byte read operation to SFP module's EEPROM over I2C interface at
- *  a specified deivce address.
- **/
-s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                u8 dev_addr, u8 *data)
-{
-       s32 status = 0;
-       u32 max_retry = 10;
-       u32 retry = 0;
-       u16 swfw_mask = 0;
-       bool nack = 1;
-
-       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
-               swfw_mask = IXGBE_GSSR_PHY1_SM;
-       else
-               swfw_mask = IXGBE_GSSR_PHY0_SM;
-
-       do {
-               if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask) != 0) {
-                       status = IXGBE_ERR_SWFW_SYNC;
-                       goto read_byte_out;
-               }
-
-               ixgbe_i2c_start(hw);
-
-               /* Device Address and write indication */
-               status = ixgbe_clock_out_i2c_byte(hw, dev_addr);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_get_i2c_ack(hw);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_clock_out_i2c_byte(hw, byte_offset);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_get_i2c_ack(hw);
-               if (status != 0)
-                       goto fail;
-
-               ixgbe_i2c_start(hw);
-
-               /* Device Address and read indication */
-               status = ixgbe_clock_out_i2c_byte(hw, (dev_addr | 0x1));
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_get_i2c_ack(hw);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_clock_in_i2c_byte(hw, data);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_clock_out_i2c_bit(hw, nack);
-               if (status != 0)
-                       goto fail;
-
-               ixgbe_i2c_stop(hw);
-               break;
-
-fail:
-               hw->mac.ops.release_swfw_sync(hw, swfw_mask);
-               msleep(100);
-               ixgbe_i2c_bus_clear(hw);
-               retry++;
-               if (retry < max_retry)
-                       hw_dbg(hw, "I2C byte read error - Retrying.\n");
-               else
-                       hw_dbg(hw, "I2C byte read error.\n");
-
-       } while (retry < max_retry);
-
-       hw->mac.ops.release_swfw_sync(hw, swfw_mask);
-
-read_byte_out:
-       return status;
-}
-
-/**
- *  ixgbe_write_i2c_byte_generic - Writes 8 bit word over I2C
- *  @hw: pointer to hardware structure
- *  @byte_offset: byte offset to write
- *  @data: value to write
- *
- *  Performs byte write operation to SFP module's EEPROM over I2C interface at
- *  a specified device address.
- **/
-s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                 u8 dev_addr, u8 data)
-{
-       s32 status = 0;
-       u32 max_retry = 1;
-       u32 retry = 0;
-       u16 swfw_mask = 0;
-
-       if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
-               swfw_mask = IXGBE_GSSR_PHY1_SM;
-       else
-               swfw_mask = IXGBE_GSSR_PHY0_SM;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask) != 0) {
-               status = IXGBE_ERR_SWFW_SYNC;
-               goto write_byte_out;
-       }
-
-       do {
-               ixgbe_i2c_start(hw);
-
-               status = ixgbe_clock_out_i2c_byte(hw, dev_addr);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_get_i2c_ack(hw);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_clock_out_i2c_byte(hw, byte_offset);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_get_i2c_ack(hw);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_clock_out_i2c_byte(hw, data);
-               if (status != 0)
-                       goto fail;
-
-               status = ixgbe_get_i2c_ack(hw);
-               if (status != 0)
-                       goto fail;
-
-               ixgbe_i2c_stop(hw);
-               break;
-
-fail:
-               ixgbe_i2c_bus_clear(hw);
-               retry++;
-               if (retry < max_retry)
-                       hw_dbg(hw, "I2C byte write error - Retrying.\n");
-               else
-                       hw_dbg(hw, "I2C byte write error.\n");
-       } while (retry < max_retry);
-
-       hw->mac.ops.release_swfw_sync(hw, swfw_mask);
-
-write_byte_out:
-       return status;
-}
-
-/**
- *  ixgbe_i2c_start - Sets I2C start condition
- *  @hw: pointer to hardware structure
- *
- *  Sets I2C start condition (High -> Low on SDA while SCL is High)
- **/
-static void ixgbe_i2c_start(struct ixgbe_hw *hw)
-{
-       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-
-       /* Start condition must begin with data and clock high */
-       ixgbe_set_i2c_data(hw, &i2cctl, 1);
-       ixgbe_raise_i2c_clk(hw, &i2cctl);
-
-       /* Setup time for start condition (4.7us) */
-       udelay(IXGBE_I2C_T_SU_STA);
-
-       ixgbe_set_i2c_data(hw, &i2cctl, 0);
-
-       /* Hold time for start condition (4us) */
-       udelay(IXGBE_I2C_T_HD_STA);
-
-       ixgbe_lower_i2c_clk(hw, &i2cctl);
-
-       /* Minimum low period of clock is 4.7 us */
-       udelay(IXGBE_I2C_T_LOW);
-
-}
-
-/**
- *  ixgbe_i2c_stop - Sets I2C stop condition
- *  @hw: pointer to hardware structure
- *
- *  Sets I2C stop condition (Low -> High on SDA while SCL is High)
- **/
-static void ixgbe_i2c_stop(struct ixgbe_hw *hw)
-{
-       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-
-       /* Stop condition must begin with data low and clock high */
-       ixgbe_set_i2c_data(hw, &i2cctl, 0);
-       ixgbe_raise_i2c_clk(hw, &i2cctl);
-
-       /* Setup time for stop condition (4us) */
-       udelay(IXGBE_I2C_T_SU_STO);
-
-       ixgbe_set_i2c_data(hw, &i2cctl, 1);
-
-       /* bus free time between stop and start (4.7us)*/
-       udelay(IXGBE_I2C_T_BUF);
-}
-
-/**
- *  ixgbe_clock_in_i2c_byte - Clocks in one byte via I2C
- *  @hw: pointer to hardware structure
- *  @data: data byte to clock in
- *
- *  Clocks in one byte data via I2C data/clock
- **/
-static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)
-{
-       s32 status = 0;
-       s32 i;
-       bool bit = 0;
-
-       for (i = 7; i >= 0; i--) {
-               status = ixgbe_clock_in_i2c_bit(hw, &bit);
-               *data |= bit << i;
-
-               if (status != 0)
-                       break;
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_clock_out_i2c_byte - Clocks out one byte via I2C
- *  @hw: pointer to hardware structure
- *  @data: data byte clocked out
- *
- *  Clocks out one byte data via I2C data/clock
- **/
-static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data)
-{
-       s32 status = 0;
-       s32 i;
-       u32 i2cctl;
-       bool bit = 0;
-
-       for (i = 7; i >= 0; i--) {
-               bit = (data >> i) & 0x1;
-               status = ixgbe_clock_out_i2c_bit(hw, bit);
-
-               if (status != 0)
-                       break;
-       }
-
-       /* Release SDA line (set high) */
-       i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-       i2cctl |= IXGBE_I2C_DATA_OUT;
-       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, i2cctl);
-
-       return status;
-}
-
-/**
- *  ixgbe_get_i2c_ack - Polls for I2C ACK
- *  @hw: pointer to hardware structure
- *
- *  Clocks in/out one bit via I2C data/clock
- **/
-static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)
-{
-       s32 status;
-       u32 i = 0;
-       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-       u32 timeout = 10;
-       bool ack = 1;
-
-       status = ixgbe_raise_i2c_clk(hw, &i2cctl);
-
-       if (status != 0)
-               goto out;
-
-       /* Minimum high period of clock is 4us */
-       udelay(IXGBE_I2C_T_HIGH);
-
-       /* Poll for ACK.  Note that ACK in I2C spec is
-        * transition from 1 to 0 */
-       for (i = 0; i < timeout; i++) {
-               i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-               ack = ixgbe_get_i2c_data(&i2cctl);
-
-               udelay(1);
-               if (ack == 0)
-                       break;
-       }
-
-       if (ack == 1) {
-               hw_dbg(hw, "I2C ack was not received.\n");
-               status = IXGBE_ERR_I2C;
-       }
-
-       ixgbe_lower_i2c_clk(hw, &i2cctl);
-
-       /* Minimum low period of clock is 4.7 us */
-       udelay(IXGBE_I2C_T_LOW);
-
-out:
-       return status;
-}
-
-/**
- *  ixgbe_clock_in_i2c_bit - Clocks in one bit via I2C data/clock
- *  @hw: pointer to hardware structure
- *  @data: read data value
- *
- *  Clocks in one bit via I2C data/clock
- **/
-static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data)
-{
-       s32 status;
-       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-
-       status = ixgbe_raise_i2c_clk(hw, &i2cctl);
-
-       /* Minimum high period of clock is 4us */
-       udelay(IXGBE_I2C_T_HIGH);
-
-       i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-       *data = ixgbe_get_i2c_data(&i2cctl);
-
-       ixgbe_lower_i2c_clk(hw, &i2cctl);
-
-       /* Minimum low period of clock is 4.7 us */
-       udelay(IXGBE_I2C_T_LOW);
-
-       return status;
-}
-
-/**
- *  ixgbe_clock_out_i2c_bit - Clocks in/out one bit via I2C data/clock
- *  @hw: pointer to hardware structure
- *  @data: data value to write
- *
- *  Clocks out one bit via I2C data/clock
- **/
-static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data)
-{
-       s32 status;
-       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-
-       status = ixgbe_set_i2c_data(hw, &i2cctl, data);
-       if (status == 0) {
-               status = ixgbe_raise_i2c_clk(hw, &i2cctl);
-
-               /* Minimum high period of clock is 4us */
-               udelay(IXGBE_I2C_T_HIGH);
-
-               ixgbe_lower_i2c_clk(hw, &i2cctl);
-
-               /* Minimum low period of clock is 4.7 us.
-                * This also takes care of the data hold time.
-                */
-               udelay(IXGBE_I2C_T_LOW);
-       } else {
-               status = IXGBE_ERR_I2C;
-               hw_dbg(hw, "I2C data was not set to %X\n", data);
-       }
-
-       return status;
-}
-/**
- *  ixgbe_raise_i2c_clk - Raises the I2C SCL clock
- *  @hw: pointer to hardware structure
- *  @i2cctl: Current value of I2CCTL register
- *
- *  Raises the I2C clock line '0'->'1'
- **/
-static s32 ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
-{
-       s32 status = 0;
-
-       *i2cctl |= IXGBE_I2C_CLK_OUT;
-
-       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* SCL rise time (1000ns) */
-       udelay(IXGBE_I2C_T_RISE);
-
-       return status;
-}
-
-/**
- *  ixgbe_lower_i2c_clk - Lowers the I2C SCL clock
- *  @hw: pointer to hardware structure
- *  @i2cctl: Current value of I2CCTL register
- *
- *  Lowers the I2C clock line '1'->'0'
- **/
-static void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
-{
-
-       *i2cctl &= ~IXGBE_I2C_CLK_OUT;
-
-       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* SCL fall time (300ns) */
-       udelay(IXGBE_I2C_T_FALL);
-}
-
-/**
- *  ixgbe_set_i2c_data - Sets the I2C data bit
- *  @hw: pointer to hardware structure
- *  @i2cctl: Current value of I2CCTL register
- *  @data: I2C data value (0 or 1) to set
- *
- *  Sets the I2C data bit
- **/
-static s32 ixgbe_set_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl, bool data)
-{
-       s32 status = 0;
-
-       if (data)
-               *i2cctl |= IXGBE_I2C_DATA_OUT;
-       else
-               *i2cctl &= ~IXGBE_I2C_DATA_OUT;
-
-       IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Data rise/fall (1000ns/300ns) and set-up time (250ns) */
-       udelay(IXGBE_I2C_T_RISE + IXGBE_I2C_T_FALL + IXGBE_I2C_T_SU_DATA);
-
-       /* Verify data was set correctly */
-       *i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-       if (data != ixgbe_get_i2c_data(i2cctl)) {
-               status = IXGBE_ERR_I2C;
-               hw_dbg(hw, "Error - I2C data was not set to %X.\n", data);
-       }
-
-       return status;
-}
-
-/**
- *  ixgbe_get_i2c_data - Reads the I2C SDA data bit
- *  @hw: pointer to hardware structure
- *  @i2cctl: Current value of I2CCTL register
- *
- *  Returns the I2C data bit value
- **/
-static bool ixgbe_get_i2c_data(u32 *i2cctl)
-{
-       bool data;
-
-       if (*i2cctl & IXGBE_I2C_DATA_IN)
-               data = 1;
-       else
-               data = 0;
-
-       return data;
-}
-
-/**
- *  ixgbe_i2c_bus_clear - Clears the I2C bus
- *  @hw: pointer to hardware structure
- *
- *  Clears the I2C bus by sending nine clock pulses.
- *  Used when data line is stuck low.
- **/
-static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw)
-{
-       u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
-       u32 i;
-
-       ixgbe_i2c_start(hw);
-
-       ixgbe_set_i2c_data(hw, &i2cctl, 1);
-
-       for (i = 0; i < 9; i++) {
-               ixgbe_raise_i2c_clk(hw, &i2cctl);
-
-               /* Min high period of clock is 4us */
-               udelay(IXGBE_I2C_T_HIGH);
-
-               ixgbe_lower_i2c_clk(hw, &i2cctl);
-
-               /* Min low period of clock is 4.7us*/
-               udelay(IXGBE_I2C_T_LOW);
-       }
-
-       ixgbe_i2c_start(hw);
-
-       /* Put the i2c bus back to default state */
-       ixgbe_i2c_stop(hw);
-}
-
-/**
- *  ixgbe_tn_check_overtemp - Checks if an overtemp occurred.
- *  @hw: pointer to hardware structure
- *
- *  Checks if the LASI temp alarm status was triggered due to overtemp
- **/
-s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw)
-{
-       s32 status = 0;
-       u16 phy_data = 0;
-
-       if (hw->device_id != IXGBE_DEV_ID_82599_T3_LOM)
-               goto out;
-
-       /* Check that the LASI temp alarm status was triggered */
-       hw->phy.ops.read_reg(hw, IXGBE_TN_LASI_STATUS_REG,
-                            MDIO_MMD_PMAPMD, &phy_data);
-
-       if (!(phy_data & IXGBE_TN_LASI_STATUS_TEMP_ALARM))
-               goto out;
-
-       status = IXGBE_ERR_OVERTEMP;
-out:
-       return status;
-}
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h
deleted file mode 100644 (file)
index 197bdd1..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_PHY_H_
-#define _IXGBE_PHY_H_
-
-#include "ixgbe_type.h"
-#define IXGBE_I2C_EEPROM_DEV_ADDR    0xA0
-
-/* EEPROM byte offsets */
-#define IXGBE_SFF_IDENTIFIER         0x0
-#define IXGBE_SFF_IDENTIFIER_SFP     0x3
-#define IXGBE_SFF_VENDOR_OUI_BYTE0   0x25
-#define IXGBE_SFF_VENDOR_OUI_BYTE1   0x26
-#define IXGBE_SFF_VENDOR_OUI_BYTE2   0x27
-#define IXGBE_SFF_1GBE_COMP_CODES    0x6
-#define IXGBE_SFF_10GBE_COMP_CODES   0x3
-#define IXGBE_SFF_CABLE_TECHNOLOGY   0x8
-#define IXGBE_SFF_CABLE_SPEC_COMP    0x3C
-
-/* Bitmasks */
-#define IXGBE_SFF_DA_PASSIVE_CABLE           0x4
-#define IXGBE_SFF_DA_ACTIVE_CABLE            0x8
-#define IXGBE_SFF_DA_SPEC_ACTIVE_LIMITING    0x4
-#define IXGBE_SFF_1GBASESX_CAPABLE           0x1
-#define IXGBE_SFF_1GBASELX_CAPABLE           0x2
-#define IXGBE_SFF_1GBASET_CAPABLE            0x8
-#define IXGBE_SFF_10GBASESR_CAPABLE          0x10
-#define IXGBE_SFF_10GBASELR_CAPABLE          0x20
-#define IXGBE_I2C_EEPROM_READ_MASK           0x100
-#define IXGBE_I2C_EEPROM_STATUS_MASK         0x3
-#define IXGBE_I2C_EEPROM_STATUS_NO_OPERATION 0x0
-#define IXGBE_I2C_EEPROM_STATUS_PASS         0x1
-#define IXGBE_I2C_EEPROM_STATUS_FAIL         0x2
-#define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS  0x3
-
-/* Flow control defines */
-#define IXGBE_TAF_SYM_PAUSE                  0x400
-#define IXGBE_TAF_ASM_PAUSE                  0x800
-
-/* Bit-shift macros */
-#define IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT    24
-#define IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT    16
-#define IXGBE_SFF_VENDOR_OUI_BYTE2_SHIFT    8
-
-/* Vendor OUIs: format of OUI is 0x[byte0][byte1][byte2][00] */
-#define IXGBE_SFF_VENDOR_OUI_TYCO     0x00407600
-#define IXGBE_SFF_VENDOR_OUI_FTL      0x00906500
-#define IXGBE_SFF_VENDOR_OUI_AVAGO    0x00176A00
-#define IXGBE_SFF_VENDOR_OUI_INTEL    0x001B2100
-
-/* I2C SDA and SCL timing parameters for standard mode */
-#define IXGBE_I2C_T_HD_STA  4
-#define IXGBE_I2C_T_LOW     5
-#define IXGBE_I2C_T_HIGH    4
-#define IXGBE_I2C_T_SU_STA  5
-#define IXGBE_I2C_T_HD_DATA 5
-#define IXGBE_I2C_T_SU_DATA 1
-#define IXGBE_I2C_T_RISE    1
-#define IXGBE_I2C_T_FALL    1
-#define IXGBE_I2C_T_SU_STO  4
-#define IXGBE_I2C_T_BUF     5
-
-#define IXGBE_TN_LASI_STATUS_REG        0x9005
-#define IXGBE_TN_LASI_STATUS_TEMP_ALARM 0x0008
-
-s32 ixgbe_init_phy_ops_generic(struct ixgbe_hw *hw);
-s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw);
-s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw);
-s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
-                               u32 device_type, u16 *phy_data);
-s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
-                                u32 device_type, u16 phy_data);
-s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw);
-s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
-                                       ixgbe_link_speed speed,
-                                       bool autoneg,
-                                       bool autoneg_wait_to_complete);
-s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
-                                               ixgbe_link_speed *speed,
-                                               bool *autoneg);
-
-/* PHY specific */
-s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw,
-                             ixgbe_link_speed *speed,
-                             bool *link_up);
-s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw);
-s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,
-                                       u16 *firmware_version);
-s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw,
-                                           u16 *firmware_version);
-
-s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw);
-s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw);
-s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
-                                        u16 *list_offset,
-                                        u16 *data_offset);
-s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw);
-s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                u8 dev_addr, u8 *data);
-s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                 u8 dev_addr, u8 data);
-s32 ixgbe_read_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                  u8 *eeprom_data);
-s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset,
-                                   u8 eeprom_data);
-#endif /* _IXGBE_PHY_H_ */
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
deleted file mode 100644 (file)
index d99d01e..0000000
+++ /dev/null
@@ -1,687 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/vmalloc.h>
-#include <linux/string.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/ipv6.h>
-#ifdef NETIF_F_HW_VLAN_TX
-#include <linux/if_vlan.h>
-#endif
-
-#include "ixgbe.h"
-
-#include "ixgbe_sriov.h"
-
-static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
-                                  int entries, u16 *hash_list, u32 vf)
-{
-       struct vf_data_storage *vfinfo = &adapter->vfinfo[vf];
-       struct ixgbe_hw *hw = &adapter->hw;
-       int i;
-       u32 vector_bit;
-       u32 vector_reg;
-       u32 mta_reg;
-
-       /* only so many hash values supported */
-       entries = min(entries, IXGBE_MAX_VF_MC_ENTRIES);
-
-       /*
-        * salt away the number of multi cast addresses assigned
-        * to this VF for later use to restore when the PF multi cast
-        * list changes
-        */
-       vfinfo->num_vf_mc_hashes = entries;
-
-       /*
-        * VFs are limited to using the MTA hash table for their multicast
-        * addresses
-        */
-       for (i = 0; i < entries; i++) {
-               vfinfo->vf_mc_hashes[i] = hash_list[i];
-       }
-
-       for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
-               vector_reg = (vfinfo->vf_mc_hashes[i] >> 5) & 0x7F;
-               vector_bit = vfinfo->vf_mc_hashes[i] & 0x1F;
-               mta_reg = IXGBE_READ_REG(hw, IXGBE_MTA(vector_reg));
-               mta_reg |= (1 << vector_bit);
-               IXGBE_WRITE_REG(hw, IXGBE_MTA(vector_reg), mta_reg);
-       }
-
-       return 0;
-}
-
-static void ixgbe_restore_vf_macvlans(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct list_head *pos;
-       struct vf_macvlans *entry;
-
-       list_for_each(pos, &adapter->vf_mvs.l) {
-               entry = list_entry(pos, struct vf_macvlans, l);
-               if (entry->free == false)
-                       hw->mac.ops.set_rar(hw, entry->rar_entry,
-                                           entry->vf_macvlan,
-                                           entry->vf, IXGBE_RAH_AV);
-       }
-}
-
-void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct vf_data_storage *vfinfo;
-       int i, j;
-       u32 vector_bit;
-       u32 vector_reg;
-       u32 mta_reg;
-
-       for (i = 0; i < adapter->num_vfs; i++) {
-               vfinfo = &adapter->vfinfo[i];
-               for (j = 0; j < vfinfo->num_vf_mc_hashes; j++) {
-                       hw->addr_ctrl.mta_in_use++;
-                       vector_reg = (vfinfo->vf_mc_hashes[j] >> 5) & 0x7F;
-                       vector_bit = vfinfo->vf_mc_hashes[j] & 0x1F;
-                       mta_reg = IXGBE_READ_REG(hw, IXGBE_MTA(vector_reg));
-                       mta_reg |= (1 << vector_bit);
-                       IXGBE_WRITE_REG(hw, IXGBE_MTA(vector_reg), mta_reg);
-               }
-       }
-
-       /* Restore any VF macvlans */
-       ixgbe_restore_vf_macvlans(adapter);
-}
-
-static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid,
-                            u32 vf)
-{
-       return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add);
-}
-
-static void ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 *msgbuf)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int new_mtu = msgbuf[1];
-       u32 max_frs;
-       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
-
-       /* Only X540 supports jumbo frames in IOV mode */
-       if (adapter->hw.mac.type != ixgbe_mac_X540)
-               return;
-
-       /* MTU < 68 is an error and causes problems on some kernels */
-       if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE)) {
-               e_err(drv, "VF mtu %d out of range\n", new_mtu);
-               return;
-       }
-
-       max_frs = (IXGBE_READ_REG(hw, IXGBE_MAXFRS) &
-                  IXGBE_MHADD_MFS_MASK) >> IXGBE_MHADD_MFS_SHIFT;
-       if (max_frs < new_mtu) {
-               max_frs = new_mtu << IXGBE_MHADD_MFS_SHIFT;
-               IXGBE_WRITE_REG(hw, IXGBE_MAXFRS, max_frs);
-       }
-
-       e_info(hw, "VF requests change max MTU to %d\n", new_mtu);
-}
-
-static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
-{
-       u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
-       vmolr |= (IXGBE_VMOLR_ROMPE |
-                 IXGBE_VMOLR_BAM);
-       if (aupe)
-               vmolr |= IXGBE_VMOLR_AUPE;
-       else
-               vmolr &= ~IXGBE_VMOLR_AUPE;
-       IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
-}
-
-static void ixgbe_set_vmvir(struct ixgbe_adapter *adapter, u32 vid, u32 vf)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       if (vid)
-               IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf),
-                               (vid | IXGBE_VMVIR_VLANA_DEFAULT));
-       else
-               IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf), 0);
-}
-
-static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int rar_entry = hw->mac.num_rar_entries - (vf + 1);
-
-       /* reset offloads to defaults */
-       if (adapter->vfinfo[vf].pf_vlan) {
-               ixgbe_set_vf_vlan(adapter, true,
-                                 adapter->vfinfo[vf].pf_vlan, vf);
-               ixgbe_set_vmvir(adapter,
-                               (adapter->vfinfo[vf].pf_vlan |
-                                (adapter->vfinfo[vf].pf_qos <<
-                                 VLAN_PRIO_SHIFT)), vf);
-               ixgbe_set_vmolr(hw, vf, false);
-       } else {
-               ixgbe_set_vmvir(adapter, 0, vf);
-               ixgbe_set_vmolr(hw, vf, true);
-       }
-
-       /* reset multicast table array for vf */
-       adapter->vfinfo[vf].num_vf_mc_hashes = 0;
-
-       /* Flush and reset the mta with the new values */
-       ixgbe_set_rx_mode(adapter->netdev);
-
-       hw->mac.ops.clear_rar(hw, rar_entry);
-}
-
-static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
-                           int vf, unsigned char *mac_addr)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int rar_entry = hw->mac.num_rar_entries - (vf + 1);
-
-       memcpy(adapter->vfinfo[vf].vf_mac_addresses, mac_addr, 6);
-       hw->mac.ops.set_rar(hw, rar_entry, mac_addr, vf, IXGBE_RAH_AV);
-
-       return 0;
-}
-
-static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter,
-                               int vf, int index, unsigned char *mac_addr)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct list_head *pos;
-       struct vf_macvlans *entry;
-
-       if (index <= 1) {
-               list_for_each(pos, &adapter->vf_mvs.l) {
-                       entry = list_entry(pos, struct vf_macvlans, l);
-                       if (entry->vf == vf) {
-                               entry->vf = -1;
-                               entry->free = true;
-                               entry->is_macvlan = false;
-                               hw->mac.ops.clear_rar(hw, entry->rar_entry);
-                       }
-               }
-       }
-
-       /*
-        * If index was zero then we were asked to clear the uc list
-        * for the VF.  We're done.
-        */
-       if (!index)
-               return 0;
-
-       entry = NULL;
-
-       list_for_each(pos, &adapter->vf_mvs.l) {
-               entry = list_entry(pos, struct vf_macvlans, l);
-               if (entry->free)
-                       break;
-       }
-
-       /*
-        * If we traversed the entire list and didn't find a free entry
-        * then we're out of space on the RAR table.  Also entry may
-        * be NULL because the original memory allocation for the list
-        * failed, which is not fatal but does mean we can't support
-        * VF requests for MACVLAN because we couldn't allocate
-        * memory for the list management required.
-        */
-       if (!entry || !entry->free)
-               return -ENOSPC;
-
-       entry->free = false;
-       entry->is_macvlan = true;
-       entry->vf = vf;
-       memcpy(entry->vf_macvlan, mac_addr, ETH_ALEN);
-
-       hw->mac.ops.set_rar(hw, entry->rar_entry, mac_addr, vf, IXGBE_RAH_AV);
-
-       return 0;
-}
-
-int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
-{
-       unsigned char vf_mac_addr[6];
-       struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
-       unsigned int vfn = (event_mask & 0x3f);
-
-       bool enable = ((event_mask & 0x10000000U) != 0);
-
-       if (enable) {
-               random_ether_addr(vf_mac_addr);
-               e_info(probe, "IOV: VF %d is enabled MAC %pM\n",
-                      vfn, vf_mac_addr);
-               /*
-                * Store away the VF "permananet" MAC address, it will ask
-                * for it later.
-                */
-               memcpy(adapter->vfinfo[vfn].vf_mac_addresses, vf_mac_addr, 6);
-       }
-
-       return 0;
-}
-
-static inline void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 reg;
-       u32 reg_offset, vf_shift;
-
-       vf_shift = vf % 32;
-       reg_offset = vf / 32;
-
-       /* enable transmit and receive for vf */
-       reg = IXGBE_READ_REG(hw, IXGBE_VFTE(reg_offset));
-       reg |= (reg | (1 << vf_shift));
-       IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), reg);
-
-       reg = IXGBE_READ_REG(hw, IXGBE_VFRE(reg_offset));
-       reg |= (reg | (1 << vf_shift));
-       IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), reg);
-
-       /* Enable counting of spoofed packets in the SSVPC register */
-       reg = IXGBE_READ_REG(hw, IXGBE_VMECM(reg_offset));
-       reg |= (1 << vf_shift);
-       IXGBE_WRITE_REG(hw, IXGBE_VMECM(reg_offset), reg);
-
-       ixgbe_vf_reset_event(adapter, vf);
-}
-
-static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
-{
-       u32 mbx_size = IXGBE_VFMAILBOX_SIZE;
-       u32 msgbuf[IXGBE_VFMAILBOX_SIZE];
-       struct ixgbe_hw *hw = &adapter->hw;
-       s32 retval;
-       int entries;
-       u16 *hash_list;
-       int add, vid, index;
-       u8 *new_mac;
-
-       retval = ixgbe_read_mbx(hw, msgbuf, mbx_size, vf);
-
-       if (retval)
-               pr_err("Error receiving message from VF\n");
-
-       /* this is a message we already processed, do nothing */
-       if (msgbuf[0] & (IXGBE_VT_MSGTYPE_ACK | IXGBE_VT_MSGTYPE_NACK))
-               return retval;
-
-       /*
-        * until the vf completes a virtual function reset it should not be
-        * allowed to start any configuration.
-        */
-
-       if (msgbuf[0] == IXGBE_VF_RESET) {
-               unsigned char *vf_mac = adapter->vfinfo[vf].vf_mac_addresses;
-               new_mac = (u8 *)(&msgbuf[1]);
-               e_info(probe, "VF Reset msg received from vf %d\n", vf);
-               adapter->vfinfo[vf].clear_to_send = false;
-               ixgbe_vf_reset_msg(adapter, vf);
-               adapter->vfinfo[vf].clear_to_send = true;
-
-               if (is_valid_ether_addr(new_mac) &&
-                   !adapter->vfinfo[vf].pf_set_mac)
-                       ixgbe_set_vf_mac(adapter, vf, vf_mac);
-               else
-                       ixgbe_set_vf_mac(adapter,
-                                vf, adapter->vfinfo[vf].vf_mac_addresses);
-
-               /* reply to reset with ack and vf mac address */
-               msgbuf[0] = IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK;
-               memcpy(new_mac, vf_mac, IXGBE_ETH_LENGTH_OF_ADDRESS);
-               /*
-                * Piggyback the multicast filter type so VF can compute the
-                * correct vectors
-                */
-               msgbuf[3] = hw->mac.mc_filter_type;
-               ixgbe_write_mbx(hw, msgbuf, IXGBE_VF_PERMADDR_MSG_LEN, vf);
-
-               return retval;
-       }
-
-       if (!adapter->vfinfo[vf].clear_to_send) {
-               msgbuf[0] |= IXGBE_VT_MSGTYPE_NACK;
-               ixgbe_write_mbx(hw, msgbuf, 1, vf);
-               return retval;
-       }
-
-       switch ((msgbuf[0] & 0xFFFF)) {
-       case IXGBE_VF_SET_MAC_ADDR:
-               new_mac = ((u8 *)(&msgbuf[1]));
-               if (is_valid_ether_addr(new_mac) &&
-                   !adapter->vfinfo[vf].pf_set_mac) {
-                       ixgbe_set_vf_mac(adapter, vf, new_mac);
-               } else if (memcmp(adapter->vfinfo[vf].vf_mac_addresses,
-                                 new_mac, ETH_ALEN)) {
-                       e_warn(drv, "VF %d attempted to override "
-                              "administratively set MAC address\nReload "
-                              "the VF driver to resume operations\n", vf);
-                       retval = -1;
-               }
-               break;
-       case IXGBE_VF_SET_MULTICAST:
-               entries = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK)
-                         >> IXGBE_VT_MSGINFO_SHIFT;
-               hash_list = (u16 *)&msgbuf[1];
-               retval = ixgbe_set_vf_multicasts(adapter, entries,
-                                                hash_list, vf);
-               break;
-       case IXGBE_VF_SET_LPE:
-               ixgbe_set_vf_lpe(adapter, msgbuf);
-               break;
-       case IXGBE_VF_SET_VLAN:
-               add = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK)
-                     >> IXGBE_VT_MSGINFO_SHIFT;
-               vid = (msgbuf[1] & IXGBE_VLVF_VLANID_MASK);
-               if (adapter->vfinfo[vf].pf_vlan) {
-                       e_warn(drv, "VF %d attempted to override "
-                              "administratively set VLAN configuration\n"
-                              "Reload the VF driver to resume operations\n",
-                              vf);
-                       retval = -1;
-               } else {
-                       retval = ixgbe_set_vf_vlan(adapter, add, vid, vf);
-               }
-               break;
-       case IXGBE_VF_SET_MACVLAN:
-               index = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK) >>
-                       IXGBE_VT_MSGINFO_SHIFT;
-               /*
-                * If the VF is allowed to set MAC filters then turn off
-                * anti-spoofing to avoid false positives.  An index
-                * greater than 0 will indicate the VF is setting a
-                * macvlan MAC filter.
-                */
-               if (index > 0 && adapter->antispoofing_enabled) {
-                       hw->mac.ops.set_mac_anti_spoofing(hw, false,
-                                                         adapter->num_vfs);
-                       hw->mac.ops.set_vlan_anti_spoofing(hw, false, vf);
-                       adapter->antispoofing_enabled = false;
-               }
-               retval = ixgbe_set_vf_macvlan(adapter, vf, index,
-                                             (unsigned char *)(&msgbuf[1]));
-               break;
-       default:
-               e_err(drv, "Unhandled Msg %8.8x\n", msgbuf[0]);
-               retval = IXGBE_ERR_MBX;
-               break;
-       }
-
-       /* notify the VF of the results of what it sent us */
-       if (retval)
-               msgbuf[0] |= IXGBE_VT_MSGTYPE_NACK;
-       else
-               msgbuf[0] |= IXGBE_VT_MSGTYPE_ACK;
-
-       msgbuf[0] |= IXGBE_VT_MSGTYPE_CTS;
-
-       ixgbe_write_mbx(hw, msgbuf, 1, vf);
-
-       return retval;
-}
-
-static void ixgbe_rcv_ack_from_vf(struct ixgbe_adapter *adapter, u32 vf)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 msg = IXGBE_VT_MSGTYPE_NACK;
-
-       /* if device isn't clear to send it shouldn't be reading either */
-       if (!adapter->vfinfo[vf].clear_to_send)
-               ixgbe_write_mbx(hw, &msg, 1, vf);
-}
-
-void ixgbe_msg_task(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 vf;
-
-       for (vf = 0; vf < adapter->num_vfs; vf++) {
-               /* process any reset requests */
-               if (!ixgbe_check_for_rst(hw, vf))
-                       ixgbe_vf_reset_event(adapter, vf);
-
-               /* process any messages pending */
-               if (!ixgbe_check_for_msg(hw, vf))
-                       ixgbe_rcv_msg_from_vf(adapter, vf);
-
-               /* process any acks */
-               if (!ixgbe_check_for_ack(hw, vf))
-                       ixgbe_rcv_ack_from_vf(adapter, vf);
-       }
-}
-
-void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       /* disable transmit and receive for all vfs */
-       IXGBE_WRITE_REG(hw, IXGBE_VFTE(0), 0);
-       IXGBE_WRITE_REG(hw, IXGBE_VFTE(1), 0);
-
-       IXGBE_WRITE_REG(hw, IXGBE_VFRE(0), 0);
-       IXGBE_WRITE_REG(hw, IXGBE_VFRE(1), 0);
-}
-
-void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 ping;
-       int i;
-
-       for (i = 0 ; i < adapter->num_vfs; i++) {
-               ping = IXGBE_PF_CONTROL_MSG;
-               if (adapter->vfinfo[i].clear_to_send)
-                       ping |= IXGBE_VT_MSGTYPE_CTS;
-               ixgbe_write_mbx(hw, &ping, 1, i);
-       }
-}
-
-int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       if (!is_valid_ether_addr(mac) || (vf >= adapter->num_vfs))
-               return -EINVAL;
-       adapter->vfinfo[vf].pf_set_mac = true;
-       dev_info(&adapter->pdev->dev, "setting MAC %pM on VF %d\n", mac, vf);
-       dev_info(&adapter->pdev->dev, "Reload the VF driver to make this"
-                                     " change effective.");
-       if (test_bit(__IXGBE_DOWN, &adapter->state)) {
-               dev_warn(&adapter->pdev->dev, "The VF MAC address has been set,"
-                        " but the PF device is not up.\n");
-               dev_warn(&adapter->pdev->dev, "Bring the PF device up before"
-                        " attempting to use the VF device.\n");
-       }
-       return ixgbe_set_vf_mac(adapter, vf, mac);
-}
-
-int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)
-{
-       int err = 0;
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       if ((vf >= adapter->num_vfs) || (vlan > 4095) || (qos > 7))
-               return -EINVAL;
-       if (vlan || qos) {
-               err = ixgbe_set_vf_vlan(adapter, true, vlan, vf);
-               if (err)
-                       goto out;
-               ixgbe_set_vmvir(adapter, vlan | (qos << VLAN_PRIO_SHIFT), vf);
-               ixgbe_set_vmolr(hw, vf, false);
-               if (adapter->antispoofing_enabled)
-                       hw->mac.ops.set_vlan_anti_spoofing(hw, true, vf);
-               adapter->vfinfo[vf].pf_vlan = vlan;
-               adapter->vfinfo[vf].pf_qos = qos;
-               dev_info(&adapter->pdev->dev,
-                        "Setting VLAN %d, QOS 0x%x on VF %d\n", vlan, qos, vf);
-               if (test_bit(__IXGBE_DOWN, &adapter->state)) {
-                       dev_warn(&adapter->pdev->dev,
-                                "The VF VLAN has been set,"
-                                " but the PF device is not up.\n");
-                       dev_warn(&adapter->pdev->dev,
-                                "Bring the PF device up before"
-                                " attempting to use the VF device.\n");
-               }
-       } else {
-               err = ixgbe_set_vf_vlan(adapter, false,
-                                       adapter->vfinfo[vf].pf_vlan, vf);
-               ixgbe_set_vmvir(adapter, vlan, vf);
-               ixgbe_set_vmolr(hw, vf, true);
-               hw->mac.ops.set_vlan_anti_spoofing(hw, false, vf);
-               adapter->vfinfo[vf].pf_vlan = 0;
-               adapter->vfinfo[vf].pf_qos = 0;
-       }
-out:
-       return err;
-}
-
-static int ixgbe_link_mbps(int internal_link_speed)
-{
-       switch (internal_link_speed) {
-       case IXGBE_LINK_SPEED_100_FULL:
-               return 100;
-       case IXGBE_LINK_SPEED_1GB_FULL:
-               return 1000;
-       case IXGBE_LINK_SPEED_10GB_FULL:
-               return 10000;
-       default:
-               return 0;
-       }
-}
-
-static void ixgbe_set_vf_rate_limit(struct ixgbe_hw *hw, int vf, int tx_rate,
-                                   int link_speed)
-{
-       int rf_dec, rf_int;
-       u32 bcnrc_val;
-
-       if (tx_rate != 0) {
-               /* Calculate the rate factor values to set */
-               rf_int = link_speed / tx_rate;
-               rf_dec = (link_speed - (rf_int * tx_rate));
-               rf_dec = (rf_dec * (1<<IXGBE_RTTBCNRC_RF_INT_SHIFT)) / tx_rate;
-
-               bcnrc_val = IXGBE_RTTBCNRC_RS_ENA;
-               bcnrc_val |= ((rf_int<<IXGBE_RTTBCNRC_RF_INT_SHIFT) &
-                              IXGBE_RTTBCNRC_RF_INT_MASK);
-               bcnrc_val |= (rf_dec & IXGBE_RTTBCNRC_RF_DEC_MASK);
-       } else {
-               bcnrc_val = 0;
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_RTTDQSEL, 2*vf); /* vf Y uses queue 2*Y */
-       /*
-        * Set global transmit compensation time to the MMW_SIZE in RTTBCNRM
-        * register. Typically MMW_SIZE=0x014 if 9728-byte jumbo is supported
-        * and 0x004 otherwise.
-        */
-       switch (hw->mac.type) {
-       case ixgbe_mac_82599EB:
-               IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRM, 0x4);
-               break;
-       case ixgbe_mac_X540:
-               IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRM, 0x14);
-               break;
-       default:
-               break;
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRC, bcnrc_val);
-}
-
-void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter)
-{
-       int actual_link_speed, i;
-       bool reset_rate = false;
-
-       /* VF Tx rate limit was not set */
-       if (adapter->vf_rate_link_speed == 0)
-               return;
-
-       actual_link_speed = ixgbe_link_mbps(adapter->link_speed);
-       if (actual_link_speed != adapter->vf_rate_link_speed) {
-               reset_rate = true;
-               adapter->vf_rate_link_speed = 0;
-               dev_info(&adapter->pdev->dev,
-                        "Link speed has been changed. VF Transmit rate "
-                        "is disabled\n");
-       }
-
-       for (i = 0; i < adapter->num_vfs; i++) {
-               if (reset_rate)
-                       adapter->vfinfo[i].tx_rate = 0;
-
-               ixgbe_set_vf_rate_limit(&adapter->hw, i,
-                                       adapter->vfinfo[i].tx_rate,
-                                       actual_link_speed);
-       }
-}
-
-int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       int actual_link_speed;
-
-       actual_link_speed = ixgbe_link_mbps(adapter->link_speed);
-       if ((vf >= adapter->num_vfs) || (!adapter->link_up) ||
-           (tx_rate > actual_link_speed) || (actual_link_speed != 10000) ||
-           ((tx_rate != 0) && (tx_rate <= 10)))
-           /* rate limit cannot be set to 10Mb or less in 10Gb adapters */
-               return -EINVAL;
-
-       adapter->vf_rate_link_speed = actual_link_speed;
-       adapter->vfinfo[vf].tx_rate = (u16)tx_rate;
-       ixgbe_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
-
-       return 0;
-}
-
-int ixgbe_ndo_get_vf_config(struct net_device *netdev,
-                           int vf, struct ifla_vf_info *ivi)
-{
-       struct ixgbe_adapter *adapter = netdev_priv(netdev);
-       if (vf >= adapter->num_vfs)
-               return -EINVAL;
-       ivi->vf = vf;
-       memcpy(&ivi->mac, adapter->vfinfo[vf].vf_mac_addresses, ETH_ALEN);
-       ivi->tx_rate = adapter->vfinfo[vf].tx_rate;
-       ivi->vlan = adapter->vfinfo[vf].pf_vlan;
-       ivi->qos = adapter->vfinfo[vf].pf_qos;
-       return 0;
-}
diff --git a/drivers/net/ixgbe/ixgbe_sriov.h b/drivers/net/ixgbe/ixgbe_sriov.h
deleted file mode 100644 (file)
index 3417556..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_SRIOV_H_
-#define _IXGBE_SRIOV_H_
-
-void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter);
-void ixgbe_msg_task(struct ixgbe_adapter *adapter);
-int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask);
-void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter);
-void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);
-void ixgbe_dump_registers(struct ixgbe_adapter *adapter);
-int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac);
-int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan,
-                          u8 qos);
-int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
-int ixgbe_ndo_get_vf_config(struct net_device *netdev,
-                           int vf, struct ifla_vf_info *ivi);
-void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);
-
-#endif /* _IXGBE_SRIOV_H_ */
-
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
deleted file mode 100644 (file)
index e0d970e..0000000
+++ /dev/null
@@ -1,2877 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_TYPE_H_
-#define _IXGBE_TYPE_H_
-
-#include <linux/types.h>
-#include <linux/mdio.h>
-#include <linux/netdevice.h>
-
-/* Vendor ID */
-#define IXGBE_INTEL_VENDOR_ID   0x8086
-
-/* Device IDs */
-#define IXGBE_DEV_ID_82598               0x10B6
-#define IXGBE_DEV_ID_82598_BX            0x1508
-#define IXGBE_DEV_ID_82598AF_DUAL_PORT   0x10C6
-#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
-#define IXGBE_DEV_ID_82598EB_SFP_LOM     0x10DB
-#define IXGBE_DEV_ID_82598AT             0x10C8
-#define IXGBE_DEV_ID_82598AT2            0x150B
-#define IXGBE_DEV_ID_82598EB_CX4         0x10DD
-#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC
-#define IXGBE_DEV_ID_82598_DA_DUAL_PORT  0x10F1
-#define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM      0x10E1
-#define IXGBE_DEV_ID_82598EB_XF_LR       0x10F4
-#define IXGBE_DEV_ID_82599_KX4           0x10F7
-#define IXGBE_DEV_ID_82599_KX4_MEZZ      0x1514
-#define IXGBE_DEV_ID_82599_KR            0x1517
-#define IXGBE_DEV_ID_82599_T3_LOM        0x151C
-#define IXGBE_DEV_ID_82599_CX4           0x10F9
-#define IXGBE_DEV_ID_82599_SFP           0x10FB
-#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE       0x152a
-#define IXGBE_DEV_ID_82599_SFP_FCOE      0x1529
-#define IXGBE_SUBDEV_ID_82599_SFP        0x11A9
-#define IXGBE_DEV_ID_82599_SFP_EM        0x1507
-#define IXGBE_DEV_ID_82599_SFP_SF2       0x154D
-#define IXGBE_DEV_ID_82599_XAUI_LOM      0x10FC
-#define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8
-#define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ  0x000C
-#define IXGBE_DEV_ID_82599_LS            0x154F
-#define IXGBE_DEV_ID_X540T               0x1528
-
-/* General Registers */
-#define IXGBE_CTRL      0x00000
-#define IXGBE_STATUS    0x00008
-#define IXGBE_CTRL_EXT  0x00018
-#define IXGBE_ESDP      0x00020
-#define IXGBE_EODSDP    0x00028
-#define IXGBE_I2CCTL    0x00028
-#define IXGBE_LEDCTL    0x00200
-#define IXGBE_FRTIMER   0x00048
-#define IXGBE_TCPTIMER  0x0004C
-#define IXGBE_CORESPARE 0x00600
-#define IXGBE_EXVET     0x05078
-
-/* NVM Registers */
-#define IXGBE_EEC       0x10010
-#define IXGBE_EERD      0x10014
-#define IXGBE_EEWR      0x10018
-#define IXGBE_FLA       0x1001C
-#define IXGBE_EEMNGCTL  0x10110
-#define IXGBE_EEMNGDATA 0x10114
-#define IXGBE_FLMNGCTL  0x10118
-#define IXGBE_FLMNGDATA 0x1011C
-#define IXGBE_FLMNGCNT  0x10120
-#define IXGBE_FLOP      0x1013C
-#define IXGBE_GRC       0x10200
-
-/* General Receive Control */
-#define IXGBE_GRC_MNG  0x00000001 /* Manageability Enable */
-#define IXGBE_GRC_APME 0x00000002 /* APM enabled in EEPROM */
-
-#define IXGBE_VPDDIAG0  0x10204
-#define IXGBE_VPDDIAG1  0x10208
-
-/* I2CCTL Bit Masks */
-#define IXGBE_I2C_CLK_IN    0x00000001
-#define IXGBE_I2C_CLK_OUT   0x00000002
-#define IXGBE_I2C_DATA_IN   0x00000004
-#define IXGBE_I2C_DATA_OUT  0x00000008
-
-/* Interrupt Registers */
-#define IXGBE_EICR      0x00800
-#define IXGBE_EICS      0x00808
-#define IXGBE_EIMS      0x00880
-#define IXGBE_EIMC      0x00888
-#define IXGBE_EIAC      0x00810
-#define IXGBE_EIAM      0x00890
-#define IXGBE_EICS_EX(_i)   (0x00A90 + (_i) * 4)
-#define IXGBE_EIMS_EX(_i)   (0x00AA0 + (_i) * 4)
-#define IXGBE_EIMC_EX(_i)   (0x00AB0 + (_i) * 4)
-#define IXGBE_EIAM_EX(_i)   (0x00AD0 + (_i) * 4)
-/*
- * 82598 EITR is 16 bits but set the limits based on the max
- * supported by all ixgbe hardware.  82599 EITR is only 12 bits,
- * with the lower 3 always zero.
- */
-#define IXGBE_MAX_INT_RATE 488281
-#define IXGBE_MIN_INT_RATE 956
-#define IXGBE_MAX_EITR     0x00000FF8
-#define IXGBE_MIN_EITR     8
-#define IXGBE_EITR(_i)  (((_i) <= 23) ? (0x00820 + ((_i) * 4)) : \
-                         (0x012300 + (((_i) - 24) * 4)))
-#define IXGBE_EITR_ITR_INT_MASK 0x00000FF8
-#define IXGBE_EITR_LLI_MOD      0x00008000
-#define IXGBE_EITR_CNT_WDIS     0x80000000
-#define IXGBE_IVAR(_i)  (0x00900 + ((_i) * 4)) /* 24 at 0x900-0x960 */
-#define IXGBE_IVAR_MISC 0x00A00 /* misc MSI-X interrupt causes */
-#define IXGBE_EITRSEL   0x00894
-#define IXGBE_MSIXT     0x00000 /* MSI-X Table. 0x0000 - 0x01C */
-#define IXGBE_MSIXPBA   0x02000 /* MSI-X Pending bit array */
-#define IXGBE_PBACL(_i) (((_i) == 0) ? (0x11068) : (0x110C0 + ((_i) * 4)))
-#define IXGBE_GPIE      0x00898
-
-/* Flow Control Registers */
-#define IXGBE_FCADBUL   0x03210
-#define IXGBE_FCADBUH   0x03214
-#define IXGBE_FCAMACL   0x04328
-#define IXGBE_FCAMACH   0x0432C
-#define IXGBE_FCRTH_82599(_i) (0x03260 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_FCRTL_82599(_i) (0x03220 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_PFCTOP    0x03008
-#define IXGBE_FCTTV(_i) (0x03200 + ((_i) * 4)) /* 4 of these (0-3) */
-#define IXGBE_FCRTL(_i) (0x03220 + ((_i) * 8)) /* 8 of these (0-7) */
-#define IXGBE_FCRTH(_i) (0x03260 + ((_i) * 8)) /* 8 of these (0-7) */
-#define IXGBE_FCRTV     0x032A0
-#define IXGBE_FCCFG     0x03D00
-#define IXGBE_TFCS      0x0CE00
-
-/* Receive DMA Registers */
-#define IXGBE_RDBAL(_i) (((_i) < 64) ? (0x01000 + ((_i) * 0x40)) : \
-                         (0x0D000 + ((_i - 64) * 0x40)))
-#define IXGBE_RDBAH(_i) (((_i) < 64) ? (0x01004 + ((_i) * 0x40)) : \
-                         (0x0D004 + ((_i - 64) * 0x40)))
-#define IXGBE_RDLEN(_i) (((_i) < 64) ? (0x01008 + ((_i) * 0x40)) : \
-                         (0x0D008 + ((_i - 64) * 0x40)))
-#define IXGBE_RDH(_i)   (((_i) < 64) ? (0x01010 + ((_i) * 0x40)) : \
-                         (0x0D010 + ((_i - 64) * 0x40)))
-#define IXGBE_RDT(_i)   (((_i) < 64) ? (0x01018 + ((_i) * 0x40)) : \
-                         (0x0D018 + ((_i - 64) * 0x40)))
-#define IXGBE_RXDCTL(_i) (((_i) < 64) ? (0x01028 + ((_i) * 0x40)) : \
-                          (0x0D028 + ((_i - 64) * 0x40)))
-#define IXGBE_RSCCTL(_i) (((_i) < 64) ? (0x0102C + ((_i) * 0x40)) : \
-                          (0x0D02C + ((_i - 64) * 0x40)))
-#define IXGBE_RSCDBU     0x03028
-#define IXGBE_RDDCC      0x02F20
-#define IXGBE_RXMEMWRAP  0x03190
-#define IXGBE_STARCTRL   0x03024
-/*
- * Split and Replication Receive Control Registers
- * 00-15 : 0x02100 + n*4
- * 16-64 : 0x01014 + n*0x40
- * 64-127: 0x0D014 + (n-64)*0x40
- */
-#define IXGBE_SRRCTL(_i) (((_i) <= 15) ? (0x02100 + ((_i) * 4)) : \
-                          (((_i) < 64) ? (0x01014 + ((_i) * 0x40)) : \
-                          (0x0D014 + ((_i - 64) * 0x40))))
-/*
- * Rx DCA Control Register:
- * 00-15 : 0x02200 + n*4
- * 16-64 : 0x0100C + n*0x40
- * 64-127: 0x0D00C + (n-64)*0x40
- */
-#define IXGBE_DCA_RXCTRL(_i)    (((_i) <= 15) ? (0x02200 + ((_i) * 4)) : \
-                                 (((_i) < 64) ? (0x0100C + ((_i) * 0x40)) : \
-                                 (0x0D00C + ((_i - 64) * 0x40))))
-#define IXGBE_RDRXCTL           0x02F00
-#define IXGBE_RXPBSIZE(_i)      (0x03C00 + ((_i) * 4))
-                                             /* 8 of these 0x03C00 - 0x03C1C */
-#define IXGBE_RXCTRL    0x03000
-#define IXGBE_DROPEN    0x03D04
-#define IXGBE_RXPBSIZE_SHIFT 10
-
-/* Receive Registers */
-#define IXGBE_RXCSUM    0x05000
-#define IXGBE_RFCTL     0x05008
-#define IXGBE_DRECCCTL  0x02F08
-#define IXGBE_DRECCCTL_DISABLE 0
-/* Multicast Table Array - 128 entries */
-#define IXGBE_MTA(_i)   (0x05200 + ((_i) * 4))
-#define IXGBE_RAL(_i)   (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \
-                         (0x0A200 + ((_i) * 8)))
-#define IXGBE_RAH(_i)   (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \
-                         (0x0A204 + ((_i) * 8)))
-#define IXGBE_MPSAR_LO(_i) (0x0A600 + ((_i) * 8))
-#define IXGBE_MPSAR_HI(_i) (0x0A604 + ((_i) * 8))
-/* Packet split receive type */
-#define IXGBE_PSRTYPE(_i)    (((_i) <= 15) ? (0x05480 + ((_i) * 4)) : \
-                              (0x0EA00 + ((_i) * 4)))
-/* array of 4096 1-bit vlan filters */
-#define IXGBE_VFTA(_i)  (0x0A000 + ((_i) * 4))
-/*array of 4096 4-bit vlan vmdq indices */
-#define IXGBE_VFTAVIND(_j, _i)  (0x0A200 + ((_j) * 0x200) + ((_i) * 4))
-#define IXGBE_FCTRL     0x05080
-#define IXGBE_VLNCTRL   0x05088
-#define IXGBE_MCSTCTRL  0x05090
-#define IXGBE_MRQC      0x05818
-#define IXGBE_SAQF(_i)  (0x0E000 + ((_i) * 4)) /* Source Address Queue Filter */
-#define IXGBE_DAQF(_i)  (0x0E200 + ((_i) * 4)) /* Dest. Address Queue Filter */
-#define IXGBE_SDPQF(_i) (0x0E400 + ((_i) * 4)) /* Src Dest. Addr Queue Filter */
-#define IXGBE_FTQF(_i)  (0x0E600 + ((_i) * 4)) /* Five Tuple Queue Filter */
-#define IXGBE_ETQF(_i)  (0x05128 + ((_i) * 4)) /* EType Queue Filter */
-#define IXGBE_ETQS(_i)  (0x0EC00 + ((_i) * 4)) /* EType Queue Select */
-#define IXGBE_SYNQF     0x0EC30 /* SYN Packet Queue Filter */
-#define IXGBE_RQTC      0x0EC70
-#define IXGBE_MTQC      0x08120
-#define IXGBE_VLVF(_i)  (0x0F100 + ((_i) * 4))  /* 64 of these (0-63) */
-#define IXGBE_VLVFB(_i) (0x0F200 + ((_i) * 4))  /* 128 of these (0-127) */
-#define IXGBE_VMVIR(_i) (0x08000 + ((_i) * 4))  /* 64 of these (0-63) */
-#define IXGBE_VT_CTL         0x051B0
-#define IXGBE_PFMAILBOX(_i)  (0x04B00 + (4 * (_i))) /* 64 total */
-#define IXGBE_PFMBMEM(_i)    (0x13000 + (64 * (_i))) /* 64 Mailboxes, 16 DW each */
-#define IXGBE_PFMBICR(_i)    (0x00710 + (4 * (_i))) /* 4 total */
-#define IXGBE_PFMBIMR(_i)    (0x00720 + (4 * (_i))) /* 4 total */
-#define IXGBE_VFRE(_i)       (0x051E0 + ((_i) * 4))
-#define IXGBE_VFTE(_i)       (0x08110 + ((_i) * 4))
-#define IXGBE_VMECM(_i)      (0x08790 + ((_i) * 4))
-#define IXGBE_QDE            0x2F04
-#define IXGBE_VMTXSW(_i)     (0x05180 + ((_i) * 4)) /* 2 total */
-#define IXGBE_VMOLR(_i)      (0x0F000 + ((_i) * 4)) /* 64 total */
-#define IXGBE_UTA(_i)        (0x0F400 + ((_i) * 4))
-#define IXGBE_MRCTL(_i)      (0x0F600 + ((_i) * 4))
-#define IXGBE_VMRVLAN(_i)    (0x0F610 + ((_i) * 4))
-#define IXGBE_VMRVM(_i)      (0x0F630 + ((_i) * 4))
-#define IXGBE_L34T_IMIR(_i)  (0x0E800 + ((_i) * 4)) /*128 of these (0-127)*/
-#define IXGBE_RXFECCERR0         0x051B8
-#define IXGBE_LLITHRESH 0x0EC90
-#define IXGBE_IMIR(_i)  (0x05A80 + ((_i) * 4))  /* 8 of these (0-7) */
-#define IXGBE_IMIREXT(_i)       (0x05AA0 + ((_i) * 4))  /* 8 of these (0-7) */
-#define IXGBE_IMIRVP    0x05AC0
-#define IXGBE_VMD_CTL   0x0581C
-#define IXGBE_RETA(_i)  (0x05C00 + ((_i) * 4))  /* 32 of these (0-31) */
-#define IXGBE_RSSRK(_i) (0x05C80 + ((_i) * 4))  /* 10 of these (0-9) */
-
-/* Flow Director registers */
-#define IXGBE_FDIRCTRL  0x0EE00
-#define IXGBE_FDIRHKEY  0x0EE68
-#define IXGBE_FDIRSKEY  0x0EE6C
-#define IXGBE_FDIRDIP4M 0x0EE3C
-#define IXGBE_FDIRSIP4M 0x0EE40
-#define IXGBE_FDIRTCPM  0x0EE44
-#define IXGBE_FDIRUDPM  0x0EE48
-#define IXGBE_FDIRIP6M  0x0EE74
-#define IXGBE_FDIRM     0x0EE70
-
-/* Flow Director Stats registers */
-#define IXGBE_FDIRFREE  0x0EE38
-#define IXGBE_FDIRLEN   0x0EE4C
-#define IXGBE_FDIRUSTAT 0x0EE50
-#define IXGBE_FDIRFSTAT 0x0EE54
-#define IXGBE_FDIRMATCH 0x0EE58
-#define IXGBE_FDIRMISS  0x0EE5C
-
-/* Flow Director Programming registers */
-#define IXGBE_FDIRSIPv6(_i) (0x0EE0C + ((_i) * 4)) /* 3 of these (0-2) */
-#define IXGBE_FDIRIPSA      0x0EE18
-#define IXGBE_FDIRIPDA      0x0EE1C
-#define IXGBE_FDIRPORT      0x0EE20
-#define IXGBE_FDIRVLAN      0x0EE24
-#define IXGBE_FDIRHASH      0x0EE28
-#define IXGBE_FDIRCMD       0x0EE2C
-
-/* Transmit DMA registers */
-#define IXGBE_TDBAL(_i) (0x06000 + ((_i) * 0x40)) /* 32 of these (0-31)*/
-#define IXGBE_TDBAH(_i) (0x06004 + ((_i) * 0x40))
-#define IXGBE_TDLEN(_i) (0x06008 + ((_i) * 0x40))
-#define IXGBE_TDH(_i)   (0x06010 + ((_i) * 0x40))
-#define IXGBE_TDT(_i)   (0x06018 + ((_i) * 0x40))
-#define IXGBE_TXDCTL(_i) (0x06028 + ((_i) * 0x40))
-#define IXGBE_TDWBAL(_i) (0x06038 + ((_i) * 0x40))
-#define IXGBE_TDWBAH(_i) (0x0603C + ((_i) * 0x40))
-#define IXGBE_DTXCTL    0x07E00
-
-#define IXGBE_DMATXCTL      0x04A80
-#define IXGBE_PFVFSPOOF(_i) (0x08200 + ((_i) * 4)) /* 8 of these 0 - 7 */
-#define IXGBE_PFDTXGSWC     0x08220
-#define IXGBE_DTXMXSZRQ     0x08100
-#define IXGBE_DTXTCPFLGL    0x04A88
-#define IXGBE_DTXTCPFLGH    0x04A8C
-#define IXGBE_LBDRPEN       0x0CA00
-#define IXGBE_TXPBTHRESH(_i) (0x04950 + ((_i) * 4)) /* 8 of these 0 - 7 */
-
-#define IXGBE_DMATXCTL_TE       0x1 /* Transmit Enable */
-#define IXGBE_DMATXCTL_NS       0x2 /* No Snoop LSO hdr buffer */
-#define IXGBE_DMATXCTL_GDV      0x8 /* Global Double VLAN */
-#define IXGBE_DMATXCTL_VT_SHIFT 16  /* VLAN EtherType */
-
-#define IXGBE_PFDTXGSWC_VT_LBEN 0x1 /* Local L2 VT switch enable */
-
-/* Anti-spoofing defines */
-#define IXGBE_SPOOF_MACAS_MASK          0xFF
-#define IXGBE_SPOOF_VLANAS_MASK         0xFF00
-#define IXGBE_SPOOF_VLANAS_SHIFT        8
-#define IXGBE_PFVFSPOOF_REG_COUNT       8
-
-#define IXGBE_DCA_TXCTRL(_i)    (0x07200 + ((_i) * 4)) /* 16 of these (0-15) */
-/* Tx DCA Control register : 128 of these (0-127) */
-#define IXGBE_DCA_TXCTRL_82599(_i)  (0x0600C + ((_i) * 0x40))
-#define IXGBE_TIPG      0x0CB00
-#define IXGBE_TXPBSIZE(_i)      (0x0CC00 + ((_i) * 4)) /* 8 of these */
-#define IXGBE_MNGTXMAP  0x0CD10
-#define IXGBE_TIPG_FIBER_DEFAULT 3
-#define IXGBE_TXPBSIZE_SHIFT    10
-
-/* Wake up registers */
-#define IXGBE_WUC       0x05800
-#define IXGBE_WUFC      0x05808
-#define IXGBE_WUS       0x05810
-#define IXGBE_IPAV      0x05838
-#define IXGBE_IP4AT     0x05840 /* IPv4 table 0x5840-0x5858 */
-#define IXGBE_IP6AT     0x05880 /* IPv6 table 0x5880-0x588F */
-
-#define IXGBE_WUPL      0x05900
-#define IXGBE_WUPM      0x05A00 /* wake up pkt memory 0x5A00-0x5A7C */
-#define IXGBE_FHFT(_n)     (0x09000 + (_n * 0x100)) /* Flex host filter table */
-#define IXGBE_FHFT_EXT(_n) (0x09800 + (_n * 0x100)) /* Ext Flexible Host
-                                                     * Filter Table */
-
-#define IXGBE_FLEXIBLE_FILTER_COUNT_MAX         4
-#define IXGBE_EXT_FLEXIBLE_FILTER_COUNT_MAX     2
-
-/* Each Flexible Filter is at most 128 (0x80) bytes in length */
-#define IXGBE_FLEXIBLE_FILTER_SIZE_MAX  128
-#define IXGBE_FHFT_LENGTH_OFFSET        0xFC  /* Length byte in FHFT */
-#define IXGBE_FHFT_LENGTH_MASK          0x0FF /* Length in lower byte */
-
-/* Definitions for power management and wakeup registers */
-/* Wake Up Control */
-#define IXGBE_WUC_PME_EN     0x00000002 /* PME Enable */
-#define IXGBE_WUC_PME_STATUS 0x00000004 /* PME Status */
-#define IXGBE_WUC_WKEN       0x00000010 /* Enable PE_WAKE_N pin assertion  */
-
-/* Wake Up Filter Control */
-#define IXGBE_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
-#define IXGBE_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
-#define IXGBE_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
-#define IXGBE_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
-#define IXGBE_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
-#define IXGBE_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
-#define IXGBE_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
-#define IXGBE_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
-#define IXGBE_WUFC_MNG  0x00000100 /* Directed Mgmt Packet Wakeup Enable */
-
-#define IXGBE_WUFC_IGNORE_TCO   0x00008000 /* Ignore WakeOn TCO packets */
-#define IXGBE_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
-#define IXGBE_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
-#define IXGBE_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
-#define IXGBE_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
-#define IXGBE_WUFC_FLX4 0x00100000 /* Flexible Filter 4 Enable */
-#define IXGBE_WUFC_FLX5 0x00200000 /* Flexible Filter 5 Enable */
-#define IXGBE_WUFC_FLX_FILTERS     0x000F0000 /* Mask for 4 flex filters */
-#define IXGBE_WUFC_EXT_FLX_FILTERS 0x00300000 /* Mask for Ext. flex filters */
-#define IXGBE_WUFC_ALL_FILTERS     0x003F00FF /* Mask for all wakeup filters */
-#define IXGBE_WUFC_FLX_OFFSET      16 /* Offset to the Flexible Filters bits */
-
-/* Wake Up Status */
-#define IXGBE_WUS_LNKC  IXGBE_WUFC_LNKC
-#define IXGBE_WUS_MAG   IXGBE_WUFC_MAG
-#define IXGBE_WUS_EX    IXGBE_WUFC_EX
-#define IXGBE_WUS_MC    IXGBE_WUFC_MC
-#define IXGBE_WUS_BC    IXGBE_WUFC_BC
-#define IXGBE_WUS_ARP   IXGBE_WUFC_ARP
-#define IXGBE_WUS_IPV4  IXGBE_WUFC_IPV4
-#define IXGBE_WUS_IPV6  IXGBE_WUFC_IPV6
-#define IXGBE_WUS_MNG   IXGBE_WUFC_MNG
-#define IXGBE_WUS_FLX0  IXGBE_WUFC_FLX0
-#define IXGBE_WUS_FLX1  IXGBE_WUFC_FLX1
-#define IXGBE_WUS_FLX2  IXGBE_WUFC_FLX2
-#define IXGBE_WUS_FLX3  IXGBE_WUFC_FLX3
-#define IXGBE_WUS_FLX4  IXGBE_WUFC_FLX4
-#define IXGBE_WUS_FLX5  IXGBE_WUFC_FLX5
-#define IXGBE_WUS_FLX_FILTERS  IXGBE_WUFC_FLX_FILTERS
-
-/* Wake Up Packet Length */
-#define IXGBE_WUPL_LENGTH_MASK 0xFFFF
-
-/* DCB registers */
-#define IXGBE_RMCS      0x03D00
-#define IXGBE_DPMCS     0x07F40
-#define IXGBE_PDPMCS    0x0CD00
-#define IXGBE_RUPPBMR   0x050A0
-#define IXGBE_RT2CR(_i) (0x03C20 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_RT2SR(_i) (0x03C40 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_TDTQ2TCCR(_i)     (0x0602C + ((_i) * 0x40)) /* 8 of these (0-7) */
-#define IXGBE_TDTQ2TCSR(_i)     (0x0622C + ((_i) * 0x40)) /* 8 of these (0-7) */
-#define IXGBE_TDPT2TCCR(_i)     (0x0CD20 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_TDPT2TCSR(_i)     (0x0CD40 + ((_i) * 4)) /* 8 of these (0-7) */
-
-
-/* Security Control Registers */
-#define IXGBE_SECTXCTRL         0x08800
-#define IXGBE_SECTXSTAT         0x08804
-#define IXGBE_SECTXBUFFAF       0x08808
-#define IXGBE_SECTXMINIFG       0x08810
-#define IXGBE_SECRXCTRL         0x08D00
-#define IXGBE_SECRXSTAT         0x08D04
-
-/* Security Bit Fields and Masks */
-#define IXGBE_SECTXCTRL_SECTX_DIS       0x00000001
-#define IXGBE_SECTXCTRL_TX_DIS          0x00000002
-#define IXGBE_SECTXCTRL_STORE_FORWARD   0x00000004
-
-#define IXGBE_SECTXSTAT_SECTX_RDY       0x00000001
-#define IXGBE_SECTXSTAT_ECC_TXERR       0x00000002
-
-#define IXGBE_SECRXCTRL_SECRX_DIS       0x00000001
-#define IXGBE_SECRXCTRL_RX_DIS          0x00000002
-
-#define IXGBE_SECRXSTAT_SECRX_RDY       0x00000001
-#define IXGBE_SECRXSTAT_ECC_RXERR       0x00000002
-
-/* LinkSec (MacSec) Registers */
-#define IXGBE_LSECTXCAP         0x08A00
-#define IXGBE_LSECRXCAP         0x08F00
-#define IXGBE_LSECTXCTRL        0x08A04
-#define IXGBE_LSECTXSCL         0x08A08 /* SCI Low */
-#define IXGBE_LSECTXSCH         0x08A0C /* SCI High */
-#define IXGBE_LSECTXSA          0x08A10
-#define IXGBE_LSECTXPN0         0x08A14
-#define IXGBE_LSECTXPN1         0x08A18
-#define IXGBE_LSECTXKEY0(_n)    (0x08A1C + (4 * (_n))) /* 4 of these (0-3) */
-#define IXGBE_LSECTXKEY1(_n)    (0x08A2C + (4 * (_n))) /* 4 of these (0-3) */
-#define IXGBE_LSECRXCTRL        0x08F04
-#define IXGBE_LSECRXSCL         0x08F08
-#define IXGBE_LSECRXSCH         0x08F0C
-#define IXGBE_LSECRXSA(_i)      (0x08F10 + (4 * (_i))) /* 2 of these (0-1) */
-#define IXGBE_LSECRXPN(_i)      (0x08F18 + (4 * (_i))) /* 2 of these (0-1) */
-#define IXGBE_LSECRXKEY(_n, _m) (0x08F20 + ((0x10 * (_n)) + (4 * (_m))))
-#define IXGBE_LSECTXUT          0x08A3C /* OutPktsUntagged */
-#define IXGBE_LSECTXPKTE        0x08A40 /* OutPktsEncrypted */
-#define IXGBE_LSECTXPKTP        0x08A44 /* OutPktsProtected */
-#define IXGBE_LSECTXOCTE        0x08A48 /* OutOctetsEncrypted */
-#define IXGBE_LSECTXOCTP        0x08A4C /* OutOctetsProtected */
-#define IXGBE_LSECRXUT          0x08F40 /* InPktsUntagged/InPktsNoTag */
-#define IXGBE_LSECRXOCTD        0x08F44 /* InOctetsDecrypted */
-#define IXGBE_LSECRXOCTV        0x08F48 /* InOctetsValidated */
-#define IXGBE_LSECRXBAD         0x08F4C /* InPktsBadTag */
-#define IXGBE_LSECRXNOSCI       0x08F50 /* InPktsNoSci */
-#define IXGBE_LSECRXUNSCI       0x08F54 /* InPktsUnknownSci */
-#define IXGBE_LSECRXUNCH        0x08F58 /* InPktsUnchecked */
-#define IXGBE_LSECRXDELAY       0x08F5C /* InPktsDelayed */
-#define IXGBE_LSECRXLATE        0x08F60 /* InPktsLate */
-#define IXGBE_LSECRXOK(_n)      (0x08F64 + (0x04 * (_n))) /* InPktsOk */
-#define IXGBE_LSECRXINV(_n)     (0x08F6C + (0x04 * (_n))) /* InPktsInvalid */
-#define IXGBE_LSECRXNV(_n)      (0x08F74 + (0x04 * (_n))) /* InPktsNotValid */
-#define IXGBE_LSECRXUNSA        0x08F7C /* InPktsUnusedSa */
-#define IXGBE_LSECRXNUSA        0x08F80 /* InPktsNotUsingSa */
-
-/* LinkSec (MacSec) Bit Fields and Masks */
-#define IXGBE_LSECTXCAP_SUM_MASK        0x00FF0000
-#define IXGBE_LSECTXCAP_SUM_SHIFT       16
-#define IXGBE_LSECRXCAP_SUM_MASK        0x00FF0000
-#define IXGBE_LSECRXCAP_SUM_SHIFT       16
-
-#define IXGBE_LSECTXCTRL_EN_MASK        0x00000003
-#define IXGBE_LSECTXCTRL_DISABLE        0x0
-#define IXGBE_LSECTXCTRL_AUTH           0x1
-#define IXGBE_LSECTXCTRL_AUTH_ENCRYPT   0x2
-#define IXGBE_LSECTXCTRL_AISCI          0x00000020
-#define IXGBE_LSECTXCTRL_PNTHRSH_MASK   0xFFFFFF00
-#define IXGBE_LSECTXCTRL_RSV_MASK       0x000000D8
-
-#define IXGBE_LSECRXCTRL_EN_MASK        0x0000000C
-#define IXGBE_LSECRXCTRL_EN_SHIFT       2
-#define IXGBE_LSECRXCTRL_DISABLE        0x0
-#define IXGBE_LSECRXCTRL_CHECK          0x1
-#define IXGBE_LSECRXCTRL_STRICT         0x2
-#define IXGBE_LSECRXCTRL_DROP           0x3
-#define IXGBE_LSECRXCTRL_PLSH           0x00000040
-#define IXGBE_LSECRXCTRL_RP             0x00000080
-#define IXGBE_LSECRXCTRL_RSV_MASK       0xFFFFFF33
-
-/* IpSec Registers */
-#define IXGBE_IPSTXIDX          0x08900
-#define IXGBE_IPSTXSALT         0x08904
-#define IXGBE_IPSTXKEY(_i)      (0x08908 + (4 * (_i))) /* 4 of these (0-3) */
-#define IXGBE_IPSRXIDX          0x08E00
-#define IXGBE_IPSRXIPADDR(_i)   (0x08E04 + (4 * (_i))) /* 4 of these (0-3) */
-#define IXGBE_IPSRXSPI          0x08E14
-#define IXGBE_IPSRXIPIDX        0x08E18
-#define IXGBE_IPSRXKEY(_i)      (0x08E1C + (4 * (_i))) /* 4 of these (0-3) */
-#define IXGBE_IPSRXSALT         0x08E2C
-#define IXGBE_IPSRXMOD          0x08E30
-
-#define IXGBE_SECTXCTRL_STORE_FORWARD_ENABLE    0x4
-
-/* DCB registers */
-#define IXGBE_RTRPCS      0x02430
-#define IXGBE_RTTDCS      0x04900
-#define IXGBE_RTTDCS_ARBDIS     0x00000040 /* DCB arbiter disable */
-#define IXGBE_RTTPCS      0x0CD00
-#define IXGBE_RTRUP2TC    0x03020
-#define IXGBE_RTTUP2TC    0x0C800
-#define IXGBE_RTRPT4C(_i) (0x02140 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_TXLLQ(_i)   (0x082E0 + ((_i) * 4)) /* 4 of these (0-3) */
-#define IXGBE_RTRPT4S(_i) (0x02160 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_RTTDT2C(_i) (0x04910 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_RTTDT2S(_i) (0x04930 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_RTTPT2C(_i) (0x0CD20 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_RTTPT2S(_i) (0x0CD40 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_RTTDQSEL    0x04904
-#define IXGBE_RTTDT1C     0x04908
-#define IXGBE_RTTDT1S     0x0490C
-#define IXGBE_RTTDTECC    0x04990
-#define IXGBE_RTTDTECC_NO_BCN   0x00000100
-#define IXGBE_RTTBCNRC    0x04984
-#define IXGBE_RTTBCNRC_RS_ENA  0x80000000
-#define IXGBE_RTTBCNRC_RF_DEC_MASK     0x00003FFF
-#define IXGBE_RTTBCNRC_RF_INT_SHIFT    14
-#define IXGBE_RTTBCNRC_RF_INT_MASK     \
-       (IXGBE_RTTBCNRC_RF_DEC_MASK << IXGBE_RTTBCNRC_RF_INT_SHIFT)
-#define IXGBE_RTTBCNRM    0x04980
-
-/* FCoE DMA Context Registers */
-#define IXGBE_FCPTRL    0x02410 /* FC User Desc. PTR Low */
-#define IXGBE_FCPTRH    0x02414 /* FC USer Desc. PTR High */
-#define IXGBE_FCBUFF    0x02418 /* FC Buffer Control */
-#define IXGBE_FCDMARW   0x02420 /* FC Receive DMA RW */
-#define IXGBE_FCINVST0  0x03FC0 /* FC Invalid DMA Context Status Reg 0 */
-#define IXGBE_FCINVST(_i)       (IXGBE_FCINVST0 + ((_i) * 4))
-#define IXGBE_FCBUFF_VALID      (1 << 0)   /* DMA Context Valid */
-#define IXGBE_FCBUFF_BUFFSIZE   (3 << 3)   /* User Buffer Size */
-#define IXGBE_FCBUFF_WRCONTX    (1 << 7)   /* 0: Initiator, 1: Target */
-#define IXGBE_FCBUFF_BUFFCNT    0x0000ff00 /* Number of User Buffers */
-#define IXGBE_FCBUFF_OFFSET     0xffff0000 /* User Buffer Offset */
-#define IXGBE_FCBUFF_BUFFSIZE_SHIFT  3
-#define IXGBE_FCBUFF_BUFFCNT_SHIFT   8
-#define IXGBE_FCBUFF_OFFSET_SHIFT    16
-#define IXGBE_FCDMARW_WE        (1 << 14)   /* Write enable */
-#define IXGBE_FCDMARW_RE        (1 << 15)   /* Read enable */
-#define IXGBE_FCDMARW_FCOESEL   0x000001ff  /* FC X_ID: 11 bits */
-#define IXGBE_FCDMARW_LASTSIZE  0xffff0000  /* Last User Buffer Size */
-#define IXGBE_FCDMARW_LASTSIZE_SHIFT 16
-
-/* FCoE SOF/EOF */
-#define IXGBE_TEOFF     0x04A94 /* Tx FC EOF */
-#define IXGBE_TSOFF     0x04A98 /* Tx FC SOF */
-#define IXGBE_REOFF     0x05158 /* Rx FC EOF */
-#define IXGBE_RSOFF     0x051F8 /* Rx FC SOF */
-/* FCoE Filter Context Registers */
-#define IXGBE_FCFLT     0x05108 /* FC FLT Context */
-#define IXGBE_FCFLTRW   0x05110 /* FC Filter RW Control */
-#define IXGBE_FCPARAM   0x051d8 /* FC Offset Parameter */
-#define IXGBE_FCFLT_VALID       (1 << 0)   /* Filter Context Valid */
-#define IXGBE_FCFLT_FIRST       (1 << 1)   /* Filter First */
-#define IXGBE_FCFLT_SEQID       0x00ff0000 /* Sequence ID */
-#define IXGBE_FCFLT_SEQCNT      0xff000000 /* Sequence Count */
-#define IXGBE_FCFLTRW_RVALDT    (1 << 13)  /* Fast Re-Validation */
-#define IXGBE_FCFLTRW_WE        (1 << 14)  /* Write Enable */
-#define IXGBE_FCFLTRW_RE        (1 << 15)  /* Read Enable */
-/* FCoE Receive Control */
-#define IXGBE_FCRXCTRL  0x05100 /* FC Receive Control */
-#define IXGBE_FCRXCTRL_FCOELLI  (1 << 0)   /* Low latency interrupt */
-#define IXGBE_FCRXCTRL_SAVBAD   (1 << 1)   /* Save Bad Frames */
-#define IXGBE_FCRXCTRL_FRSTRDH  (1 << 2)   /* EN 1st Read Header */
-#define IXGBE_FCRXCTRL_LASTSEQH (1 << 3)   /* EN Last Header in Seq */
-#define IXGBE_FCRXCTRL_ALLH     (1 << 4)   /* EN All Headers */
-#define IXGBE_FCRXCTRL_FRSTSEQH (1 << 5)   /* EN 1st Seq. Header */
-#define IXGBE_FCRXCTRL_ICRC     (1 << 6)   /* Ignore Bad FC CRC */
-#define IXGBE_FCRXCTRL_FCCRCBO  (1 << 7)   /* FC CRC Byte Ordering */
-#define IXGBE_FCRXCTRL_FCOEVER  0x00000f00 /* FCoE Version: 4 bits */
-#define IXGBE_FCRXCTRL_FCOEVER_SHIFT 8
-/* FCoE Redirection */
-#define IXGBE_FCRECTL   0x0ED00 /* FC Redirection Control */
-#define IXGBE_FCRETA0   0x0ED10 /* FC Redirection Table 0 */
-#define IXGBE_FCRETA(_i)        (IXGBE_FCRETA0 + ((_i) * 4)) /* FCoE Redir */
-#define IXGBE_FCRECTL_ENA       0x1        /* FCoE Redir Table Enable */
-#define IXGBE_FCRETA_SIZE       8          /* Max entries in FCRETA */
-#define IXGBE_FCRETA_ENTRY_MASK 0x0000007f /* 7 bits for the queue index */
-
-/* Stats registers */
-#define IXGBE_CRCERRS   0x04000
-#define IXGBE_ILLERRC   0x04004
-#define IXGBE_ERRBC     0x04008
-#define IXGBE_MSPDC     0x04010
-#define IXGBE_MPC(_i)   (0x03FA0 + ((_i) * 4)) /* 8 of these 3FA0-3FBC*/
-#define IXGBE_MLFC      0x04034
-#define IXGBE_MRFC      0x04038
-#define IXGBE_RLEC      0x04040
-#define IXGBE_LXONTXC   0x03F60
-#define IXGBE_LXONRXC   0x0CF60
-#define IXGBE_LXOFFTXC  0x03F68
-#define IXGBE_LXOFFRXC  0x0CF68
-#define IXGBE_LXONRXCNT 0x041A4
-#define IXGBE_LXOFFRXCNT 0x041A8
-#define IXGBE_PXONRXCNT(_i)     (0x04140 + ((_i) * 4)) /* 8 of these */
-#define IXGBE_PXOFFRXCNT(_i)    (0x04160 + ((_i) * 4)) /* 8 of these */
-#define IXGBE_PXON2OFFCNT(_i)   (0x03240 + ((_i) * 4)) /* 8 of these */
-#define IXGBE_PXONTXC(_i)       (0x03F00 + ((_i) * 4)) /* 8 of these 3F00-3F1C*/
-#define IXGBE_PXONRXC(_i)       (0x0CF00 + ((_i) * 4)) /* 8 of these CF00-CF1C*/
-#define IXGBE_PXOFFTXC(_i)      (0x03F20 + ((_i) * 4)) /* 8 of these 3F20-3F3C*/
-#define IXGBE_PXOFFRXC(_i)      (0x0CF20 + ((_i) * 4)) /* 8 of these CF20-CF3C*/
-#define IXGBE_PRC64     0x0405C
-#define IXGBE_PRC127    0x04060
-#define IXGBE_PRC255    0x04064
-#define IXGBE_PRC511    0x04068
-#define IXGBE_PRC1023   0x0406C
-#define IXGBE_PRC1522   0x04070
-#define IXGBE_GPRC      0x04074
-#define IXGBE_BPRC      0x04078
-#define IXGBE_MPRC      0x0407C
-#define IXGBE_GPTC      0x04080
-#define IXGBE_GORCL     0x04088
-#define IXGBE_GORCH     0x0408C
-#define IXGBE_GOTCL     0x04090
-#define IXGBE_GOTCH     0x04094
-#define IXGBE_RNBC(_i)  (0x03FC0 + ((_i) * 4)) /* 8 of these 3FC0-3FDC*/
-#define IXGBE_RUC       0x040A4
-#define IXGBE_RFC       0x040A8
-#define IXGBE_ROC       0x040AC
-#define IXGBE_RJC       0x040B0
-#define IXGBE_MNGPRC    0x040B4
-#define IXGBE_MNGPDC    0x040B8
-#define IXGBE_MNGPTC    0x0CF90
-#define IXGBE_TORL      0x040C0
-#define IXGBE_TORH      0x040C4
-#define IXGBE_TPR       0x040D0
-#define IXGBE_TPT       0x040D4
-#define IXGBE_PTC64     0x040D8
-#define IXGBE_PTC127    0x040DC
-#define IXGBE_PTC255    0x040E0
-#define IXGBE_PTC511    0x040E4
-#define IXGBE_PTC1023   0x040E8
-#define IXGBE_PTC1522   0x040EC
-#define IXGBE_MPTC      0x040F0
-#define IXGBE_BPTC      0x040F4
-#define IXGBE_XEC       0x04120
-#define IXGBE_SSVPC     0x08780
-
-#define IXGBE_RQSMR(_i) (0x02300 + ((_i) * 4))
-#define IXGBE_TQSMR(_i) (((_i) <= 7) ? (0x07300 + ((_i) * 4)) : \
-                         (0x08600 + ((_i) * 4)))
-#define IXGBE_TQSM(_i)  (0x08600 + ((_i) * 4))
-
-#define IXGBE_QPRC(_i) (0x01030 + ((_i) * 0x40)) /* 16 of these */
-#define IXGBE_QPTC(_i) (0x06030 + ((_i) * 0x40)) /* 16 of these */
-#define IXGBE_QBRC(_i) (0x01034 + ((_i) * 0x40)) /* 16 of these */
-#define IXGBE_QBTC(_i) (0x06034 + ((_i) * 0x40)) /* 16 of these */
-#define IXGBE_QBRC_L(_i) (0x01034 + ((_i) * 0x40)) /* 16 of these */
-#define IXGBE_QBRC_H(_i) (0x01038 + ((_i) * 0x40)) /* 16 of these */
-#define IXGBE_QPRDC(_i) (0x01430 + ((_i) * 0x40)) /* 16 of these */
-#define IXGBE_QBTC_L(_i) (0x08700 + ((_i) * 0x8)) /* 16 of these */
-#define IXGBE_QBTC_H(_i) (0x08704 + ((_i) * 0x8)) /* 16 of these */
-#define IXGBE_FCCRC     0x05118 /* Count of Good Eth CRC w/ Bad FC CRC */
-#define IXGBE_FCOERPDC  0x0241C /* FCoE Rx Packets Dropped Count */
-#define IXGBE_FCLAST    0x02424 /* FCoE Last Error Count */
-#define IXGBE_FCOEPRC   0x02428 /* Number of FCoE Packets Received */
-#define IXGBE_FCOEDWRC  0x0242C /* Number of FCoE DWords Received */
-#define IXGBE_FCOEPTC   0x08784 /* Number of FCoE Packets Transmitted */
-#define IXGBE_FCOEDWTC  0x08788 /* Number of FCoE DWords Transmitted */
-#define IXGBE_O2BGPTC   0x041C4
-#define IXGBE_O2BSPC    0x087B0
-#define IXGBE_B2OSPC    0x041C0
-#define IXGBE_B2OGPRC   0x02F90
-#define IXGBE_PCRC8ECL  0x0E810
-#define IXGBE_PCRC8ECH  0x0E811
-#define IXGBE_PCRC8ECH_MASK     0x1F
-#define IXGBE_LDPCECL   0x0E820
-#define IXGBE_LDPCECH   0x0E821
-
-/* Management */
-#define IXGBE_MAVTV(_i) (0x05010 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_MFUTP(_i) (0x05030 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_MANC      0x05820
-#define IXGBE_MFVAL     0x05824
-#define IXGBE_MANC2H    0x05860
-#define IXGBE_MDEF(_i)  (0x05890 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_MIPAF     0x058B0
-#define IXGBE_MMAL(_i)  (0x05910 + ((_i) * 8)) /* 4 of these (0-3) */
-#define IXGBE_MMAH(_i)  (0x05914 + ((_i) * 8)) /* 4 of these (0-3) */
-#define IXGBE_FTFT      0x09400 /* 0x9400-0x97FC */
-#define IXGBE_METF(_i)  (0x05190 + ((_i) * 4)) /* 4 of these (0-3) */
-#define IXGBE_MDEF_EXT(_i) (0x05160 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_LSWFW     0x15014
-
-/* ARC Subsystem registers */
-#define IXGBE_HICR      0x15F00
-#define IXGBE_FWSTS     0x15F0C
-#define IXGBE_HSMC0R    0x15F04
-#define IXGBE_HSMC1R    0x15F08
-#define IXGBE_SWSR      0x15F10
-#define IXGBE_HFDR      0x15FE8
-#define IXGBE_FLEX_MNG  0x15800 /* 0x15800 - 0x15EFC */
-
-#define IXGBE_HICR_EN              0x01  /* Enable bit - RO */
-/* Driver sets this bit when done to put command in RAM */
-#define IXGBE_HICR_C               0x02
-#define IXGBE_HICR_SV              0x04  /* Status Validity */
-#define IXGBE_HICR_FW_RESET_ENABLE 0x40
-#define IXGBE_HICR_FW_RESET        0x80
-
-/* PCI-E registers */
-#define IXGBE_GCR       0x11000
-#define IXGBE_GTV       0x11004
-#define IXGBE_FUNCTAG   0x11008
-#define IXGBE_GLT       0x1100C
-#define IXGBE_GSCL_1    0x11010
-#define IXGBE_GSCL_2    0x11014
-#define IXGBE_GSCL_3    0x11018
-#define IXGBE_GSCL_4    0x1101C
-#define IXGBE_GSCN_0    0x11020
-#define IXGBE_GSCN_1    0x11024
-#define IXGBE_GSCN_2    0x11028
-#define IXGBE_GSCN_3    0x1102C
-#define IXGBE_FACTPS    0x10150
-#define IXGBE_PCIEANACTL  0x11040
-#define IXGBE_SWSM      0x10140
-#define IXGBE_FWSM      0x10148
-#define IXGBE_GSSR      0x10160
-#define IXGBE_MREVID    0x11064
-#define IXGBE_DCA_ID    0x11070
-#define IXGBE_DCA_CTRL  0x11074
-#define IXGBE_SWFW_SYNC IXGBE_GSSR
-
-/* PCIe registers 82599-specific */
-#define IXGBE_GCR_EXT           0x11050
-#define IXGBE_GSCL_5_82599      0x11030
-#define IXGBE_GSCL_6_82599      0x11034
-#define IXGBE_GSCL_7_82599      0x11038
-#define IXGBE_GSCL_8_82599      0x1103C
-#define IXGBE_PHYADR_82599      0x11040
-#define IXGBE_PHYDAT_82599      0x11044
-#define IXGBE_PHYCTL_82599      0x11048
-#define IXGBE_PBACLR_82599      0x11068
-#define IXGBE_CIAA_82599        0x11088
-#define IXGBE_CIAD_82599        0x1108C
-#define IXGBE_PICAUSE           0x110B0
-#define IXGBE_PIENA             0x110B8
-#define IXGBE_CDQ_MBR_82599     0x110B4
-#define IXGBE_PCIESPARE         0x110BC
-#define IXGBE_MISC_REG_82599    0x110F0
-#define IXGBE_ECC_CTRL_0_82599  0x11100
-#define IXGBE_ECC_CTRL_1_82599  0x11104
-#define IXGBE_ECC_STATUS_82599  0x110E0
-#define IXGBE_BAR_CTRL_82599    0x110F4
-
-/* PCI Express Control */
-#define IXGBE_GCR_CMPL_TMOUT_MASK       0x0000F000
-#define IXGBE_GCR_CMPL_TMOUT_10ms       0x00001000
-#define IXGBE_GCR_CMPL_TMOUT_RESEND     0x00010000
-#define IXGBE_GCR_CAP_VER2              0x00040000
-
-#define IXGBE_GCR_EXT_MSIX_EN           0x80000000
-#define IXGBE_GCR_EXT_VT_MODE_16        0x00000001
-#define IXGBE_GCR_EXT_VT_MODE_32        0x00000002
-#define IXGBE_GCR_EXT_VT_MODE_64        0x00000003
-#define IXGBE_GCR_EXT_SRIOV             (IXGBE_GCR_EXT_MSIX_EN | \
-                                         IXGBE_GCR_EXT_VT_MODE_64)
-
-/* Time Sync Registers */
-#define IXGBE_TSYNCRXCTL 0x05188 /* Rx Time Sync Control register - RW */
-#define IXGBE_TSYNCTXCTL 0x08C00 /* Tx Time Sync Control register - RW */
-#define IXGBE_RXSTMPL    0x051E8 /* Rx timestamp Low - RO */
-#define IXGBE_RXSTMPH    0x051A4 /* Rx timestamp High - RO */
-#define IXGBE_RXSATRL    0x051A0 /* Rx timestamp attribute low - RO */
-#define IXGBE_RXSATRH    0x051A8 /* Rx timestamp attribute high - RO */
-#define IXGBE_RXMTRL     0x05120 /* RX message type register low - RW */
-#define IXGBE_TXSTMPL    0x08C04 /* Tx timestamp value Low - RO */
-#define IXGBE_TXSTMPH    0x08C08 /* Tx timestamp value High - RO */
-#define IXGBE_SYSTIML    0x08C0C /* System time register Low - RO */
-#define IXGBE_SYSTIMH    0x08C10 /* System time register High - RO */
-#define IXGBE_TIMINCA    0x08C14 /* Increment attributes register - RW */
-#define IXGBE_TIMADJL    0x08C18 /* Time Adjustment Offset register Low - RW */
-#define IXGBE_TIMADJH    0x08C1C /* Time Adjustment Offset register High - RW */
-#define IXGBE_TSAUXC     0x08C20 /* TimeSync Auxiliary Control register - RW */
-#define IXGBE_TRGTTIML0  0x08C24 /* Target Time Register 0 Low - RW */
-#define IXGBE_TRGTTIMH0  0x08C28 /* Target Time Register 0 High - RW */
-#define IXGBE_TRGTTIML1  0x08C2C /* Target Time Register 1 Low - RW */
-#define IXGBE_TRGTTIMH1  0x08C30 /* Target Time Register 1 High - RW */
-#define IXGBE_FREQOUT0   0x08C34 /* Frequency Out 0 Control register - RW */
-#define IXGBE_FREQOUT1   0x08C38 /* Frequency Out 1 Control register - RW */
-#define IXGBE_AUXSTMPL0  0x08C3C /* Auxiliary Time Stamp 0 register Low - RO */
-#define IXGBE_AUXSTMPH0  0x08C40 /* Auxiliary Time Stamp 0 register High - RO */
-#define IXGBE_AUXSTMPL1  0x08C44 /* Auxiliary Time Stamp 1 register Low - RO */
-#define IXGBE_AUXSTMPH1  0x08C48 /* Auxiliary Time Stamp 1 register High - RO */
-
-/* Diagnostic Registers */
-#define IXGBE_RDSTATCTL   0x02C20
-#define IXGBE_RDSTAT(_i)  (0x02C00 + ((_i) * 4)) /* 0x02C00-0x02C1C */
-#define IXGBE_RDHMPN      0x02F08
-#define IXGBE_RIC_DW(_i)  (0x02F10 + ((_i) * 4))
-#define IXGBE_RDPROBE     0x02F20
-#define IXGBE_RDMAM       0x02F30
-#define IXGBE_RDMAD       0x02F34
-#define IXGBE_TDSTATCTL   0x07C20
-#define IXGBE_TDSTAT(_i)  (0x07C00 + ((_i) * 4)) /* 0x07C00 - 0x07C1C */
-#define IXGBE_TDHMPN      0x07F08
-#define IXGBE_TDHMPN2     0x082FC
-#define IXGBE_TXDESCIC    0x082CC
-#define IXGBE_TIC_DW(_i)  (0x07F10 + ((_i) * 4))
-#define IXGBE_TIC_DW2(_i) (0x082B0 + ((_i) * 4))
-#define IXGBE_TDPROBE     0x07F20
-#define IXGBE_TXBUFCTRL   0x0C600
-#define IXGBE_TXBUFDATA0  0x0C610
-#define IXGBE_TXBUFDATA1  0x0C614
-#define IXGBE_TXBUFDATA2  0x0C618
-#define IXGBE_TXBUFDATA3  0x0C61C
-#define IXGBE_RXBUFCTRL   0x03600
-#define IXGBE_RXBUFDATA0  0x03610
-#define IXGBE_RXBUFDATA1  0x03614
-#define IXGBE_RXBUFDATA2  0x03618
-#define IXGBE_RXBUFDATA3  0x0361C
-#define IXGBE_PCIE_DIAG(_i)     (0x11090 + ((_i) * 4)) /* 8 of these */
-#define IXGBE_RFVAL     0x050A4
-#define IXGBE_MDFTC1    0x042B8
-#define IXGBE_MDFTC2    0x042C0
-#define IXGBE_MDFTFIFO1 0x042C4
-#define IXGBE_MDFTFIFO2 0x042C8
-#define IXGBE_MDFTS     0x042CC
-#define IXGBE_RXDATAWRPTR(_i)   (0x03700 + ((_i) * 4)) /* 8 of these 3700-370C*/
-#define IXGBE_RXDESCWRPTR(_i)   (0x03710 + ((_i) * 4)) /* 8 of these 3710-371C*/
-#define IXGBE_RXDATARDPTR(_i)   (0x03720 + ((_i) * 4)) /* 8 of these 3720-372C*/
-#define IXGBE_RXDESCRDPTR(_i)   (0x03730 + ((_i) * 4)) /* 8 of these 3730-373C*/
-#define IXGBE_TXDATAWRPTR(_i)   (0x0C700 + ((_i) * 4)) /* 8 of these C700-C70C*/
-#define IXGBE_TXDESCWRPTR(_i)   (0x0C710 + ((_i) * 4)) /* 8 of these C710-C71C*/
-#define IXGBE_TXDATARDPTR(_i)   (0x0C720 + ((_i) * 4)) /* 8 of these C720-C72C*/
-#define IXGBE_TXDESCRDPTR(_i)   (0x0C730 + ((_i) * 4)) /* 8 of these C730-C73C*/
-#define IXGBE_PCIEECCCTL 0x1106C
-#define IXGBE_RXWRPTR(_i)       (0x03100 + ((_i) * 4)) /* 8 of these 3100-310C*/
-#define IXGBE_RXUSED(_i)        (0x03120 + ((_i) * 4)) /* 8 of these 3120-312C*/
-#define IXGBE_RXRDPTR(_i)       (0x03140 + ((_i) * 4)) /* 8 of these 3140-314C*/
-#define IXGBE_RXRDWRPTR(_i)     (0x03160 + ((_i) * 4)) /* 8 of these 3160-310C*/
-#define IXGBE_TXWRPTR(_i)       (0x0C100 + ((_i) * 4)) /* 8 of these C100-C10C*/
-#define IXGBE_TXUSED(_i)        (0x0C120 + ((_i) * 4)) /* 8 of these C120-C12C*/
-#define IXGBE_TXRDPTR(_i)       (0x0C140 + ((_i) * 4)) /* 8 of these C140-C14C*/
-#define IXGBE_TXRDWRPTR(_i)     (0x0C160 + ((_i) * 4)) /* 8 of these C160-C10C*/
-#define IXGBE_PCIEECCCTL0 0x11100
-#define IXGBE_PCIEECCCTL1 0x11104
-#define IXGBE_RXDBUECC  0x03F70
-#define IXGBE_TXDBUECC  0x0CF70
-#define IXGBE_RXDBUEST 0x03F74
-#define IXGBE_TXDBUEST 0x0CF74
-#define IXGBE_PBTXECC   0x0C300
-#define IXGBE_PBRXECC   0x03300
-#define IXGBE_GHECCR    0x110B0
-
-/* MAC Registers */
-#define IXGBE_PCS1GCFIG 0x04200
-#define IXGBE_PCS1GLCTL 0x04208
-#define IXGBE_PCS1GLSTA 0x0420C
-#define IXGBE_PCS1GDBG0 0x04210
-#define IXGBE_PCS1GDBG1 0x04214
-#define IXGBE_PCS1GANA  0x04218
-#define IXGBE_PCS1GANLP 0x0421C
-#define IXGBE_PCS1GANNP 0x04220
-#define IXGBE_PCS1GANLPNP 0x04224
-#define IXGBE_HLREG0    0x04240
-#define IXGBE_HLREG1    0x04244
-#define IXGBE_PAP       0x04248
-#define IXGBE_MACA      0x0424C
-#define IXGBE_APAE      0x04250
-#define IXGBE_ARD       0x04254
-#define IXGBE_AIS       0x04258
-#define IXGBE_MSCA      0x0425C
-#define IXGBE_MSRWD     0x04260
-#define IXGBE_MLADD     0x04264
-#define IXGBE_MHADD     0x04268
-#define IXGBE_MAXFRS    0x04268
-#define IXGBE_TREG      0x0426C
-#define IXGBE_PCSS1     0x04288
-#define IXGBE_PCSS2     0x0428C
-#define IXGBE_XPCSS     0x04290
-#define IXGBE_MFLCN     0x04294
-#define IXGBE_SERDESC   0x04298
-#define IXGBE_MACS      0x0429C
-#define IXGBE_AUTOC     0x042A0
-#define IXGBE_LINKS     0x042A4
-#define IXGBE_LINKS2    0x04324
-#define IXGBE_AUTOC2    0x042A8
-#define IXGBE_AUTOC3    0x042AC
-#define IXGBE_ANLP1     0x042B0
-#define IXGBE_ANLP2     0x042B4
-#define IXGBE_MACC      0x04330
-#define IXGBE_ATLASCTL  0x04800
-#define IXGBE_MMNGC     0x042D0
-#define IXGBE_ANLPNP1   0x042D4
-#define IXGBE_ANLPNP2   0x042D8
-#define IXGBE_KRPCSFC   0x042E0
-#define IXGBE_KRPCSS    0x042E4
-#define IXGBE_FECS1     0x042E8
-#define IXGBE_FECS2     0x042EC
-#define IXGBE_SMADARCTL 0x14F10
-#define IXGBE_MPVC      0x04318
-#define IXGBE_SGMIIC    0x04314
-
-/* Statistics Registers */
-#define IXGBE_RXNFGPC      0x041B0
-#define IXGBE_RXNFGBCL     0x041B4
-#define IXGBE_RXNFGBCH     0x041B8
-#define IXGBE_RXDGPC       0x02F50
-#define IXGBE_RXDGBCL      0x02F54
-#define IXGBE_RXDGBCH      0x02F58
-#define IXGBE_RXDDGPC      0x02F5C
-#define IXGBE_RXDDGBCL     0x02F60
-#define IXGBE_RXDDGBCH     0x02F64
-#define IXGBE_RXLPBKGPC    0x02F68
-#define IXGBE_RXLPBKGBCL   0x02F6C
-#define IXGBE_RXLPBKGBCH   0x02F70
-#define IXGBE_RXDLPBKGPC   0x02F74
-#define IXGBE_RXDLPBKGBCL  0x02F78
-#define IXGBE_RXDLPBKGBCH  0x02F7C
-#define IXGBE_TXDGPC       0x087A0
-#define IXGBE_TXDGBCL      0x087A4
-#define IXGBE_TXDGBCH      0x087A8
-
-#define IXGBE_RXDSTATCTRL 0x02F40
-
-/* Copper Pond 2 link timeout */
-#define IXGBE_VALIDATE_LINK_READY_TIMEOUT 50
-
-/* Omer CORECTL */
-#define IXGBE_CORECTL           0x014F00
-/* BARCTRL */
-#define IXGBE_BARCTRL               0x110F4
-#define IXGBE_BARCTRL_FLSIZE        0x0700
-#define IXGBE_BARCTRL_FLSIZE_SHIFT  8
-#define IXGBE_BARCTRL_CSRSIZE       0x2000
-
-/* RSCCTL Bit Masks */
-#define IXGBE_RSCCTL_RSCEN          0x01
-#define IXGBE_RSCCTL_MAXDESC_1      0x00
-#define IXGBE_RSCCTL_MAXDESC_4      0x04
-#define IXGBE_RSCCTL_MAXDESC_8      0x08
-#define IXGBE_RSCCTL_MAXDESC_16     0x0C
-
-/* RSCDBU Bit Masks */
-#define IXGBE_RSCDBU_RSCSMALDIS_MASK    0x0000007F
-#define IXGBE_RSCDBU_RSCACKDIS          0x00000080
-
-/* RDRXCTL Bit Masks */
-#define IXGBE_RDRXCTL_RDMTS_1_2     0x00000000 /* Rx Desc Min Threshold Size */
-#define IXGBE_RDRXCTL_CRCSTRIP      0x00000002 /* CRC Strip */
-#define IXGBE_RDRXCTL_MVMEN         0x00000020
-#define IXGBE_RDRXCTL_DMAIDONE      0x00000008 /* DMA init cycle done */
-#define IXGBE_RDRXCTL_AGGDIS        0x00010000 /* Aggregation disable */
-#define IXGBE_RDRXCTL_RSCFRSTSIZE   0x003E0000 /* RSC First packet size */
-#define IXGBE_RDRXCTL_RSCLLIDIS     0x00800000 /* Disable RSC compl on LLI */
-#define IXGBE_RDRXCTL_RSCACKC       0x02000000 /* must set 1 when RSC enabled */
-#define IXGBE_RDRXCTL_FCOE_WRFIX    0x04000000 /* must set 1 when RSC enabled */
-
-/* RQTC Bit Masks and Shifts */
-#define IXGBE_RQTC_SHIFT_TC(_i)     ((_i) * 4)
-#define IXGBE_RQTC_TC0_MASK         (0x7 << 0)
-#define IXGBE_RQTC_TC1_MASK         (0x7 << 4)
-#define IXGBE_RQTC_TC2_MASK         (0x7 << 8)
-#define IXGBE_RQTC_TC3_MASK         (0x7 << 12)
-#define IXGBE_RQTC_TC4_MASK         (0x7 << 16)
-#define IXGBE_RQTC_TC5_MASK         (0x7 << 20)
-#define IXGBE_RQTC_TC6_MASK         (0x7 << 24)
-#define IXGBE_RQTC_TC7_MASK         (0x7 << 28)
-
-/* PSRTYPE.RQPL Bit masks and shift */
-#define IXGBE_PSRTYPE_RQPL_MASK     0x7
-#define IXGBE_PSRTYPE_RQPL_SHIFT    29
-
-/* CTRL Bit Masks */
-#define IXGBE_CTRL_GIO_DIS      0x00000004 /* Global IO Master Disable bit */
-#define IXGBE_CTRL_LNK_RST      0x00000008 /* Link Reset. Resets everything. */
-#define IXGBE_CTRL_RST          0x04000000 /* Reset (SW) */
-
-/* FACTPS */
-#define IXGBE_FACTPS_LFS        0x40000000 /* LAN Function Select */
-
-/* MHADD Bit Masks */
-#define IXGBE_MHADD_MFS_MASK    0xFFFF0000
-#define IXGBE_MHADD_MFS_SHIFT   16
-
-/* Extended Device Control */
-#define IXGBE_CTRL_EXT_PFRSTD   0x00004000 /* Physical Function Reset Done */
-#define IXGBE_CTRL_EXT_NS_DIS   0x00010000 /* No Snoop disable */
-#define IXGBE_CTRL_EXT_RO_DIS   0x00020000 /* Relaxed Ordering disable */
-#define IXGBE_CTRL_EXT_DRV_LOAD 0x10000000 /* Driver loaded bit for FW */
-
-/* Direct Cache Access (DCA) definitions */
-#define IXGBE_DCA_CTRL_DCA_ENABLE  0x00000000 /* DCA Enable */
-#define IXGBE_DCA_CTRL_DCA_DISABLE 0x00000001 /* DCA Disable */
-
-#define IXGBE_DCA_CTRL_DCA_MODE_CB1 0x00 /* DCA Mode CB1 */
-#define IXGBE_DCA_CTRL_DCA_MODE_CB2 0x02 /* DCA Mode CB2 */
-
-#define IXGBE_DCA_RXCTRL_CPUID_MASK 0x0000001F /* Rx CPUID Mask */
-#define IXGBE_DCA_RXCTRL_CPUID_MASK_82599  0xFF000000 /* Rx CPUID Mask */
-#define IXGBE_DCA_RXCTRL_CPUID_SHIFT_82599 24 /* Rx CPUID Shift */
-#define IXGBE_DCA_RXCTRL_DESC_DCA_EN (1 << 5) /* DCA Rx Desc enable */
-#define IXGBE_DCA_RXCTRL_HEAD_DCA_EN (1 << 6) /* DCA Rx Desc header enable */
-#define IXGBE_DCA_RXCTRL_DATA_DCA_EN (1 << 7) /* DCA Rx Desc payload enable */
-#define IXGBE_DCA_RXCTRL_DESC_RRO_EN (1 << 9) /* DCA Rx rd Desc Relax Order */
-#define IXGBE_DCA_RXCTRL_DESC_WRO_EN (1 << 13) /* DCA Rx wr Desc Relax Order */
-#define IXGBE_DCA_RXCTRL_DESC_HSRO_EN (1 << 15) /* DCA Rx Split Header RO */
-
-#define IXGBE_DCA_TXCTRL_CPUID_MASK 0x0000001F /* Tx CPUID Mask */
-#define IXGBE_DCA_TXCTRL_CPUID_MASK_82599  0xFF000000 /* Tx CPUID Mask */
-#define IXGBE_DCA_TXCTRL_CPUID_SHIFT_82599 24 /* Tx CPUID Shift */
-#define IXGBE_DCA_TXCTRL_DESC_DCA_EN (1 << 5) /* DCA Tx Desc enable */
-#define IXGBE_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
-#define IXGBE_DCA_MAX_QUEUES_82598   16 /* DCA regs only on 16 queues */
-
-/* MSCA Bit Masks */
-#define IXGBE_MSCA_NP_ADDR_MASK      0x0000FFFF /* MDI Address (new protocol) */
-#define IXGBE_MSCA_NP_ADDR_SHIFT     0
-#define IXGBE_MSCA_DEV_TYPE_MASK     0x001F0000 /* Device Type (new protocol) */
-#define IXGBE_MSCA_DEV_TYPE_SHIFT    16 /* Register Address (old protocol */
-#define IXGBE_MSCA_PHY_ADDR_MASK     0x03E00000 /* PHY Address mask */
-#define IXGBE_MSCA_PHY_ADDR_SHIFT    21 /* PHY Address shift*/
-#define IXGBE_MSCA_OP_CODE_MASK      0x0C000000 /* OP CODE mask */
-#define IXGBE_MSCA_OP_CODE_SHIFT     26 /* OP CODE shift */
-#define IXGBE_MSCA_ADDR_CYCLE        0x00000000 /* OP CODE 00 (addr cycle) */
-#define IXGBE_MSCA_WRITE             0x04000000 /* OP CODE 01 (write) */
-#define IXGBE_MSCA_READ              0x0C000000 /* OP CODE 11 (read) */
-#define IXGBE_MSCA_READ_AUTOINC      0x08000000 /* OP CODE 10 (read, auto inc)*/
-#define IXGBE_MSCA_ST_CODE_MASK      0x30000000 /* ST Code mask */
-#define IXGBE_MSCA_ST_CODE_SHIFT     28 /* ST Code shift */
-#define IXGBE_MSCA_NEW_PROTOCOL      0x00000000 /* ST CODE 00 (new protocol) */
-#define IXGBE_MSCA_OLD_PROTOCOL      0x10000000 /* ST CODE 01 (old protocol) */
-#define IXGBE_MSCA_MDI_COMMAND       0x40000000 /* Initiate MDI command */
-#define IXGBE_MSCA_MDI_IN_PROG_EN    0x80000000 /* MDI in progress enable */
-
-/* MSRWD bit masks */
-#define IXGBE_MSRWD_WRITE_DATA_MASK     0x0000FFFF
-#define IXGBE_MSRWD_WRITE_DATA_SHIFT    0
-#define IXGBE_MSRWD_READ_DATA_MASK      0xFFFF0000
-#define IXGBE_MSRWD_READ_DATA_SHIFT     16
-
-/* Atlas registers */
-#define IXGBE_ATLAS_PDN_LPBK    0x24
-#define IXGBE_ATLAS_PDN_10G     0xB
-#define IXGBE_ATLAS_PDN_1G      0xC
-#define IXGBE_ATLAS_PDN_AN      0xD
-
-/* Atlas bit masks */
-#define IXGBE_ATLASCTL_WRITE_CMD        0x00010000
-#define IXGBE_ATLAS_PDN_TX_REG_EN       0x10
-#define IXGBE_ATLAS_PDN_TX_10G_QL_ALL   0xF0
-#define IXGBE_ATLAS_PDN_TX_1G_QL_ALL    0xF0
-#define IXGBE_ATLAS_PDN_TX_AN_QL_ALL    0xF0
-
-/* Omer bit masks */
-#define IXGBE_CORECTL_WRITE_CMD         0x00010000
-
-/* MDIO definitions */
-
-#define IXGBE_MDIO_COMMAND_TIMEOUT     100 /* PHY Timeout for 1 GB mode */
-
-#define IXGBE_MDIO_VENDOR_SPECIFIC_1_CONTROL      0x0    /* VS1 Control Reg */
-#define IXGBE_MDIO_VENDOR_SPECIFIC_1_STATUS       0x1    /* VS1 Status Reg */
-#define IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS  0x0008 /* 1 = Link Up */
-#define IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS 0x0010 /* 0 - 10G, 1 - 1G */
-#define IXGBE_MDIO_VENDOR_SPECIFIC_1_10G_SPEED    0x0018
-#define IXGBE_MDIO_VENDOR_SPECIFIC_1_1G_SPEED     0x0010
-
-#define IXGBE_MDIO_PMA_PMD_SDA_SCL_ADDR     0xC30A /* PHY_XS SDA/SCL Addr Reg */
-#define IXGBE_MDIO_PMA_PMD_SDA_SCL_DATA     0xC30B /* PHY_XS SDA/SCL Data Reg */
-#define IXGBE_MDIO_PMA_PMD_SDA_SCL_STAT     0xC30C /* PHY_XS SDA/SCL Status Reg */
-
-/* MII clause 22/28 definitions */
-#define IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG 0xC400 /* 1G Provisioning 1 */
-#define IXGBE_MII_AUTONEG_XNP_TX_REG             0x17   /* 1G XNP Transmit */
-#define IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX      0x4000 /* full duplex, bit:14*/
-#define IXGBE_MII_1GBASE_T_ADVERTISE             0x8000 /* full duplex, bit:15*/
-#define IXGBE_MII_AUTONEG_REG                    0x0
-
-#define IXGBE_PHY_REVISION_MASK        0xFFFFFFF0
-#define IXGBE_MAX_PHY_ADDR             32
-
-/* PHY IDs*/
-#define TN1010_PHY_ID    0x00A19410
-#define TNX_FW_REV       0xB
-#define X540_PHY_ID      0x01540200
-#define QT2022_PHY_ID    0x0043A400
-#define ATH_PHY_ID       0x03429050
-#define AQ_FW_REV        0x20
-
-/* PHY Types */
-#define IXGBE_M88E1145_E_PHY_ID  0x01410CD0
-
-/* Special PHY Init Routine */
-#define IXGBE_PHY_INIT_OFFSET_NL 0x002B
-#define IXGBE_PHY_INIT_END_NL    0xFFFF
-#define IXGBE_CONTROL_MASK_NL    0xF000
-#define IXGBE_DATA_MASK_NL       0x0FFF
-#define IXGBE_CONTROL_SHIFT_NL   12
-#define IXGBE_DELAY_NL           0
-#define IXGBE_DATA_NL            1
-#define IXGBE_CONTROL_NL         0x000F
-#define IXGBE_CONTROL_EOL_NL     0x0FFF
-#define IXGBE_CONTROL_SOL_NL     0x0000
-
-/* General purpose Interrupt Enable */
-#define IXGBE_SDP0_GPIEN         0x00000001 /* SDP0 */
-#define IXGBE_SDP1_GPIEN         0x00000002 /* SDP1 */
-#define IXGBE_SDP2_GPIEN         0x00000004 /* SDP2 */
-#define IXGBE_GPIE_MSIX_MODE     0x00000010 /* MSI-X mode */
-#define IXGBE_GPIE_OCD           0x00000020 /* Other Clear Disable */
-#define IXGBE_GPIE_EIMEN         0x00000040 /* Immediate Interrupt Enable */
-#define IXGBE_GPIE_EIAME         0x40000000
-#define IXGBE_GPIE_PBA_SUPPORT   0x80000000
-#define IXGBE_GPIE_RSC_DELAY_SHIFT 11
-#define IXGBE_GPIE_VTMODE_MASK   0x0000C000 /* VT Mode Mask */
-#define IXGBE_GPIE_VTMODE_16     0x00004000 /* 16 VFs 8 queues per VF */
-#define IXGBE_GPIE_VTMODE_32     0x00008000 /* 32 VFs 4 queues per VF */
-#define IXGBE_GPIE_VTMODE_64     0x0000C000 /* 64 VFs 2 queues per VF */
-
-/* Packet Buffer Initialization */
-#define IXGBE_TXPBSIZE_20KB     0x00005000 /* 20KB Packet Buffer */
-#define IXGBE_TXPBSIZE_40KB     0x0000A000 /* 40KB Packet Buffer */
-#define IXGBE_RXPBSIZE_48KB     0x0000C000 /* 48KB Packet Buffer */
-#define IXGBE_RXPBSIZE_64KB     0x00010000 /* 64KB Packet Buffer */
-#define IXGBE_RXPBSIZE_80KB     0x00014000 /* 80KB Packet Buffer */
-#define IXGBE_RXPBSIZE_128KB    0x00020000 /* 128KB Packet Buffer */
-#define IXGBE_RXPBSIZE_MAX      0x00080000 /* 512KB Packet Buffer*/
-#define IXGBE_TXPBSIZE_MAX      0x00028000 /* 160KB Packet Buffer*/
-
-#define IXGBE_TXPKT_SIZE_MAX    0xA        /* Max Tx Packet size  */
-#define IXGBE_MAX_PB           8
-
-/* Packet buffer allocation strategies */
-enum {
-       PBA_STRATEGY_EQUAL      = 0,    /* Distribute PB space equally */
-#define PBA_STRATEGY_EQUAL     PBA_STRATEGY_EQUAL
-       PBA_STRATEGY_WEIGHTED   = 1,    /* Weight front half of TCs */
-#define PBA_STRATEGY_WEIGHTED  PBA_STRATEGY_WEIGHTED
-};
-
-/* Transmit Flow Control status */
-#define IXGBE_TFCS_TXOFF         0x00000001
-#define IXGBE_TFCS_TXOFF0        0x00000100
-#define IXGBE_TFCS_TXOFF1        0x00000200
-#define IXGBE_TFCS_TXOFF2        0x00000400
-#define IXGBE_TFCS_TXOFF3        0x00000800
-#define IXGBE_TFCS_TXOFF4        0x00001000
-#define IXGBE_TFCS_TXOFF5        0x00002000
-#define IXGBE_TFCS_TXOFF6        0x00004000
-#define IXGBE_TFCS_TXOFF7        0x00008000
-
-/* TCP Timer */
-#define IXGBE_TCPTIMER_KS            0x00000100
-#define IXGBE_TCPTIMER_COUNT_ENABLE  0x00000200
-#define IXGBE_TCPTIMER_COUNT_FINISH  0x00000400
-#define IXGBE_TCPTIMER_LOOP          0x00000800
-#define IXGBE_TCPTIMER_DURATION_MASK 0x000000FF
-
-/* HLREG0 Bit Masks */
-#define IXGBE_HLREG0_TXCRCEN      0x00000001   /* bit  0 */
-#define IXGBE_HLREG0_RXCRCSTRP    0x00000002   /* bit  1 */
-#define IXGBE_HLREG0_JUMBOEN      0x00000004   /* bit  2 */
-#define IXGBE_HLREG0_TXPADEN      0x00000400   /* bit 10 */
-#define IXGBE_HLREG0_TXPAUSEEN    0x00001000   /* bit 12 */
-#define IXGBE_HLREG0_RXPAUSEEN    0x00004000   /* bit 14 */
-#define IXGBE_HLREG0_LPBK         0x00008000   /* bit 15 */
-#define IXGBE_HLREG0_MDCSPD       0x00010000   /* bit 16 */
-#define IXGBE_HLREG0_CONTMDC      0x00020000   /* bit 17 */
-#define IXGBE_HLREG0_CTRLFLTR     0x00040000   /* bit 18 */
-#define IXGBE_HLREG0_PREPEND      0x00F00000   /* bits 20-23 */
-#define IXGBE_HLREG0_PRIPAUSEEN   0x01000000   /* bit 24 */
-#define IXGBE_HLREG0_RXPAUSERECDA 0x06000000   /* bits 25-26 */
-#define IXGBE_HLREG0_RXLNGTHERREN 0x08000000   /* bit 27 */
-#define IXGBE_HLREG0_RXPADSTRIPEN 0x10000000   /* bit 28 */
-
-/* VMD_CTL bitmasks */
-#define IXGBE_VMD_CTL_VMDQ_EN     0x00000001
-#define IXGBE_VMD_CTL_VMDQ_FILTER 0x00000002
-
-/* VT_CTL bitmasks */
-#define IXGBE_VT_CTL_DIS_DEFPL  0x20000000 /* disable default pool */
-#define IXGBE_VT_CTL_REPLEN     0x40000000 /* replication enabled */
-#define IXGBE_VT_CTL_VT_ENABLE  0x00000001  /* Enable VT Mode */
-#define IXGBE_VT_CTL_POOL_SHIFT 7
-#define IXGBE_VT_CTL_POOL_MASK  (0x3F << IXGBE_VT_CTL_POOL_SHIFT)
-
-/* VMOLR bitmasks */
-#define IXGBE_VMOLR_AUPE        0x01000000 /* accept untagged packets */
-#define IXGBE_VMOLR_ROMPE       0x02000000 /* accept packets in MTA tbl */
-#define IXGBE_VMOLR_ROPE        0x04000000 /* accept packets in UC tbl */
-#define IXGBE_VMOLR_BAM         0x08000000 /* accept broadcast packets */
-#define IXGBE_VMOLR_MPE         0x10000000 /* multicast promiscuous */
-
-/* VFRE bitmask */
-#define IXGBE_VFRE_ENABLE_ALL   0xFFFFFFFF
-
-#define IXGBE_VF_INIT_TIMEOUT   200 /* Number of retries to clear RSTI */
-
-/* RDHMPN and TDHMPN bitmasks */
-#define IXGBE_RDHMPN_RDICADDR       0x007FF800
-#define IXGBE_RDHMPN_RDICRDREQ      0x00800000
-#define IXGBE_RDHMPN_RDICADDR_SHIFT 11
-#define IXGBE_TDHMPN_TDICADDR       0x003FF800
-#define IXGBE_TDHMPN_TDICRDREQ      0x00800000
-#define IXGBE_TDHMPN_TDICADDR_SHIFT 11
-
-#define IXGBE_RDMAM_MEM_SEL_SHIFT   13
-#define IXGBE_RDMAM_DWORD_SHIFT     9
-#define IXGBE_RDMAM_DESC_COMP_FIFO  1
-#define IXGBE_RDMAM_DFC_CMD_FIFO    2
-#define IXGBE_RDMAM_TCN_STATUS_RAM  4
-#define IXGBE_RDMAM_WB_COLL_FIFO    5
-#define IXGBE_RDMAM_QSC_CNT_RAM     6
-#define IXGBE_RDMAM_QSC_QUEUE_CNT   8
-#define IXGBE_RDMAM_QSC_QUEUE_RAM   0xA
-#define IXGBE_RDMAM_DESC_COM_FIFO_RANGE     135
-#define IXGBE_RDMAM_DESC_COM_FIFO_COUNT     4
-#define IXGBE_RDMAM_DFC_CMD_FIFO_RANGE      48
-#define IXGBE_RDMAM_DFC_CMD_FIFO_COUNT      7
-#define IXGBE_RDMAM_TCN_STATUS_RAM_RANGE    256
-#define IXGBE_RDMAM_TCN_STATUS_RAM_COUNT    9
-#define IXGBE_RDMAM_WB_COLL_FIFO_RANGE      8
-#define IXGBE_RDMAM_WB_COLL_FIFO_COUNT      4
-#define IXGBE_RDMAM_QSC_CNT_RAM_RANGE       64
-#define IXGBE_RDMAM_QSC_CNT_RAM_COUNT       4
-#define IXGBE_RDMAM_QSC_QUEUE_CNT_RANGE     32
-#define IXGBE_RDMAM_QSC_QUEUE_CNT_COUNT     4
-#define IXGBE_RDMAM_QSC_QUEUE_RAM_RANGE     128
-#define IXGBE_RDMAM_QSC_QUEUE_RAM_COUNT     8
-
-#define IXGBE_TXDESCIC_READY        0x80000000
-
-/* Receive Checksum Control */
-#define IXGBE_RXCSUM_IPPCSE     0x00001000   /* IP payload checksum enable */
-#define IXGBE_RXCSUM_PCSD       0x00002000   /* packet checksum disabled */
-
-/* FCRTL Bit Masks */
-#define IXGBE_FCRTL_XONE        0x80000000  /* XON enable */
-#define IXGBE_FCRTH_FCEN        0x80000000  /* Packet buffer fc enable */
-
-/* PAP bit masks*/
-#define IXGBE_PAP_TXPAUSECNT_MASK   0x0000FFFF /* Pause counter mask */
-
-/* RMCS Bit Masks */
-#define IXGBE_RMCS_RRM          0x00000002 /* Receive Recycle Mode enable */
-/* Receive Arbitration Control: 0 Round Robin, 1 DFP */
-#define IXGBE_RMCS_RAC          0x00000004
-#define IXGBE_RMCS_DFP          IXGBE_RMCS_RAC /* Deficit Fixed Priority ena */
-#define IXGBE_RMCS_TFCE_802_3X         0x00000008 /* Tx Priority FC ena */
-#define IXGBE_RMCS_TFCE_PRIORITY       0x00000010 /* Tx Priority FC ena */
-#define IXGBE_RMCS_ARBDIS       0x00000040 /* Arbitration disable bit */
-
-/* FCCFG Bit Masks */
-#define IXGBE_FCCFG_TFCE_802_3X         0x00000008 /* Tx link FC enable */
-#define IXGBE_FCCFG_TFCE_PRIORITY       0x00000010 /* Tx priority FC enable */
-
-/* Interrupt register bitmasks */
-
-/* Extended Interrupt Cause Read */
-#define IXGBE_EICR_RTX_QUEUE    0x0000FFFF /* RTx Queue Interrupt */
-#define IXGBE_EICR_FLOW_DIR     0x00010000 /* FDir Exception */
-#define IXGBE_EICR_RX_MISS      0x00020000 /* Packet Buffer Overrun */
-#define IXGBE_EICR_PCI          0x00040000 /* PCI Exception */
-#define IXGBE_EICR_MAILBOX      0x00080000 /* VF to PF Mailbox Interrupt */
-#define IXGBE_EICR_LSC          0x00100000 /* Link Status Change */
-#define IXGBE_EICR_LINKSEC      0x00200000 /* PN Threshold */
-#define IXGBE_EICR_MNG          0x00400000 /* Manageability Event Interrupt */
-#define IXGBE_EICR_GPI_SDP0     0x01000000 /* Gen Purpose Interrupt on SDP0 */
-#define IXGBE_EICR_GPI_SDP1     0x02000000 /* Gen Purpose Interrupt on SDP1 */
-#define IXGBE_EICR_GPI_SDP2     0x04000000 /* Gen Purpose Interrupt on SDP2 */
-#define IXGBE_EICR_ECC          0x10000000 /* ECC Error */
-#define IXGBE_EICR_PBUR         0x10000000 /* Packet Buffer Handler Error */
-#define IXGBE_EICR_DHER         0x20000000 /* Descriptor Handler Error */
-#define IXGBE_EICR_TCP_TIMER    0x40000000 /* TCP Timer */
-#define IXGBE_EICR_OTHER        0x80000000 /* Interrupt Cause Active */
-
-/* Extended Interrupt Cause Set */
-#define IXGBE_EICS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
-#define IXGBE_EICS_FLOW_DIR     IXGBE_EICR_FLOW_DIR  /* FDir Exception */
-#define IXGBE_EICS_RX_MISS      IXGBE_EICR_RX_MISS   /* Pkt Buffer Overrun */
-#define IXGBE_EICS_PCI          IXGBE_EICR_PCI       /* PCI Exception */
-#define IXGBE_EICS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
-#define IXGBE_EICS_LSC          IXGBE_EICR_LSC       /* Link Status Change */
-#define IXGBE_EICS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
-#define IXGBE_EICS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
-#define IXGBE_EICS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
-#define IXGBE_EICS_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
-#define IXGBE_EICS_ECC          IXGBE_EICR_ECC       /* ECC Error */
-#define IXGBE_EICS_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */
-#define IXGBE_EICS_DHER         IXGBE_EICR_DHER      /* Desc Handler Error */
-#define IXGBE_EICS_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */
-#define IXGBE_EICS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
-
-/* Extended Interrupt Mask Set */
-#define IXGBE_EIMS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
-#define IXGBE_EIMS_FLOW_DIR     IXGBE_EICR_FLOW_DIR  /* FDir Exception */
-#define IXGBE_EIMS_RX_MISS      IXGBE_EICR_RX_MISS   /* Packet Buffer Overrun */
-#define IXGBE_EIMS_PCI          IXGBE_EICR_PCI       /* PCI Exception */
-#define IXGBE_EIMS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
-#define IXGBE_EIMS_LSC          IXGBE_EICR_LSC       /* Link Status Change */
-#define IXGBE_EIMS_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
-#define IXGBE_EIMS_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
-#define IXGBE_EIMS_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
-#define IXGBE_EIMS_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
-#define IXGBE_EIMS_ECC          IXGBE_EICR_ECC       /* ECC Error */
-#define IXGBE_EIMS_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */
-#define IXGBE_EIMS_DHER         IXGBE_EICR_DHER      /* Descr Handler Error */
-#define IXGBE_EIMS_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */
-#define IXGBE_EIMS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
-
-/* Extended Interrupt Mask Clear */
-#define IXGBE_EIMC_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
-#define IXGBE_EIMC_FLOW_DIR     IXGBE_EICR_FLOW_DIR  /* FDir Exception */
-#define IXGBE_EIMC_RX_MISS      IXGBE_EICR_RX_MISS   /* Packet Buffer Overrun */
-#define IXGBE_EIMC_PCI          IXGBE_EICR_PCI       /* PCI Exception */
-#define IXGBE_EIMC_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
-#define IXGBE_EIMC_LSC          IXGBE_EICR_LSC       /* Link Status Change */
-#define IXGBE_EIMC_MNG          IXGBE_EICR_MNG       /* MNG Event Interrupt */
-#define IXGBE_EIMC_GPI_SDP0     IXGBE_EICR_GPI_SDP0  /* SDP0 Gen Purpose Int */
-#define IXGBE_EIMC_GPI_SDP1     IXGBE_EICR_GPI_SDP1  /* SDP1 Gen Purpose Int */
-#define IXGBE_EIMC_GPI_SDP2     IXGBE_EICR_GPI_SDP2  /* SDP2 Gen Purpose Int */
-#define IXGBE_EIMC_ECC          IXGBE_EICR_ECC       /* ECC Error */
-#define IXGBE_EIMC_PBUR         IXGBE_EICR_PBUR      /* Pkt Buf Handler Err */
-#define IXGBE_EIMC_DHER         IXGBE_EICR_DHER      /* Desc Handler Err */
-#define IXGBE_EIMC_TCP_TIMER    IXGBE_EICR_TCP_TIMER /* TCP Timer */
-#define IXGBE_EIMC_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
-
-#define IXGBE_EIMS_ENABLE_MASK ( \
-                                IXGBE_EIMS_RTX_QUEUE       | \
-                                IXGBE_EIMS_LSC             | \
-                                IXGBE_EIMS_TCP_TIMER       | \
-                                IXGBE_EIMS_OTHER)
-
-/* Immediate Interrupt Rx (A.K.A. Low Latency Interrupt) */
-#define IXGBE_IMIR_PORT_IM_EN     0x00010000  /* TCP port enable */
-#define IXGBE_IMIR_PORT_BP        0x00020000  /* TCP port check bypass */
-#define IXGBE_IMIREXT_SIZE_BP     0x00001000  /* Packet size bypass */
-#define IXGBE_IMIREXT_CTRL_URG    0x00002000  /* Check URG bit in header */
-#define IXGBE_IMIREXT_CTRL_ACK    0x00004000  /* Check ACK bit in header */
-#define IXGBE_IMIREXT_CTRL_PSH    0x00008000  /* Check PSH bit in header */
-#define IXGBE_IMIREXT_CTRL_RST    0x00010000  /* Check RST bit in header */
-#define IXGBE_IMIREXT_CTRL_SYN    0x00020000  /* Check SYN bit in header */
-#define IXGBE_IMIREXT_CTRL_FIN    0x00040000  /* Check FIN bit in header */
-#define IXGBE_IMIREXT_CTRL_BP     0x00080000  /* Bypass check of control bits */
-#define IXGBE_IMIR_SIZE_BP_82599  0x00001000 /* Packet size bypass */
-#define IXGBE_IMIR_CTRL_URG_82599 0x00002000 /* Check URG bit in header */
-#define IXGBE_IMIR_CTRL_ACK_82599 0x00004000 /* Check ACK bit in header */
-#define IXGBE_IMIR_CTRL_PSH_82599 0x00008000 /* Check PSH bit in header */
-#define IXGBE_IMIR_CTRL_RST_82599 0x00010000 /* Check RST bit in header */
-#define IXGBE_IMIR_CTRL_SYN_82599 0x00020000 /* Check SYN bit in header */
-#define IXGBE_IMIR_CTRL_FIN_82599 0x00040000 /* Check FIN bit in header */
-#define IXGBE_IMIR_CTRL_BP_82599  0x00080000 /* Bypass check of control bits */
-#define IXGBE_IMIR_LLI_EN_82599   0x00100000 /* Enables low latency Int */
-#define IXGBE_IMIR_RX_QUEUE_MASK_82599  0x0000007F /* Rx Queue Mask */
-#define IXGBE_IMIR_RX_QUEUE_SHIFT_82599 21 /* Rx Queue Shift */
-#define IXGBE_IMIRVP_PRIORITY_MASK      0x00000007 /* VLAN priority mask */
-#define IXGBE_IMIRVP_PRIORITY_EN        0x00000008 /* VLAN priority enable */
-
-#define IXGBE_MAX_FTQF_FILTERS          128
-#define IXGBE_FTQF_PROTOCOL_MASK        0x00000003
-#define IXGBE_FTQF_PROTOCOL_TCP         0x00000000
-#define IXGBE_FTQF_PROTOCOL_UDP         0x00000001
-#define IXGBE_FTQF_PROTOCOL_SCTP        2
-#define IXGBE_FTQF_PRIORITY_MASK        0x00000007
-#define IXGBE_FTQF_PRIORITY_SHIFT       2
-#define IXGBE_FTQF_POOL_MASK            0x0000003F
-#define IXGBE_FTQF_POOL_SHIFT           8
-#define IXGBE_FTQF_5TUPLE_MASK_MASK     0x0000001F
-#define IXGBE_FTQF_5TUPLE_MASK_SHIFT    25
-#define IXGBE_FTQF_SOURCE_ADDR_MASK     0x1E
-#define IXGBE_FTQF_DEST_ADDR_MASK       0x1D
-#define IXGBE_FTQF_SOURCE_PORT_MASK     0x1B
-#define IXGBE_FTQF_DEST_PORT_MASK       0x17
-#define IXGBE_FTQF_PROTOCOL_COMP_MASK   0x0F
-#define IXGBE_FTQF_POOL_MASK_EN         0x40000000
-#define IXGBE_FTQF_QUEUE_ENABLE         0x80000000
-
-/* Interrupt clear mask */
-#define IXGBE_IRQ_CLEAR_MASK    0xFFFFFFFF
-
-/* Interrupt Vector Allocation Registers */
-#define IXGBE_IVAR_REG_NUM      25
-#define IXGBE_IVAR_REG_NUM_82599       64
-#define IXGBE_IVAR_TXRX_ENTRY   96
-#define IXGBE_IVAR_RX_ENTRY     64
-#define IXGBE_IVAR_RX_QUEUE(_i)    (0 + (_i))
-#define IXGBE_IVAR_TX_QUEUE(_i)    (64 + (_i))
-#define IXGBE_IVAR_TX_ENTRY     32
-
-#define IXGBE_IVAR_TCP_TIMER_INDEX       96 /* 0 based index */
-#define IXGBE_IVAR_OTHER_CAUSES_INDEX    97 /* 0 based index */
-
-#define IXGBE_MSIX_VECTOR(_i)   (0 + (_i))
-
-#define IXGBE_IVAR_ALLOC_VAL    0x80 /* Interrupt Allocation valid */
-
-/* ETYPE Queue Filter/Select Bit Masks */
-#define IXGBE_MAX_ETQF_FILTERS  8
-#define IXGBE_ETQF_FCOE         0x08000000 /* bit 27 */
-#define IXGBE_ETQF_BCN          0x10000000 /* bit 28 */
-#define IXGBE_ETQF_1588         0x40000000 /* bit 30 */
-#define IXGBE_ETQF_FILTER_EN    0x80000000 /* bit 31 */
-#define IXGBE_ETQF_POOL_ENABLE   (1 << 26) /* bit 26 */
-
-#define IXGBE_ETQS_RX_QUEUE     0x007F0000 /* bits 22:16 */
-#define IXGBE_ETQS_RX_QUEUE_SHIFT       16
-#define IXGBE_ETQS_LLI          0x20000000 /* bit 29 */
-#define IXGBE_ETQS_QUEUE_EN     0x80000000 /* bit 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
- *    FCoE (0x8906):         Filter 2
- *    1588 (0x88f7):         Filter 3
- *    FIP  (0x8914):         Filter 4
- */
-#define IXGBE_ETQF_FILTER_EAPOL          0
-#define IXGBE_ETQF_FILTER_FCOE           2
-#define IXGBE_ETQF_FILTER_1588           3
-#define IXGBE_ETQF_FILTER_FIP            4
-/* VLAN Control Bit Masks */
-#define IXGBE_VLNCTRL_VET       0x0000FFFF  /* bits 0-15 */
-#define IXGBE_VLNCTRL_CFI       0x10000000  /* bit 28 */
-#define IXGBE_VLNCTRL_CFIEN     0x20000000  /* bit 29 */
-#define IXGBE_VLNCTRL_VFE       0x40000000  /* bit 30 */
-#define IXGBE_VLNCTRL_VME       0x80000000  /* bit 31 */
-
-/* VLAN pool filtering masks */
-#define IXGBE_VLVF_VIEN         0x80000000  /* filter is valid */
-#define IXGBE_VLVF_ENTRIES      64
-#define IXGBE_VLVF_VLANID_MASK  0x00000FFF
-
-/* Per VF Port VLAN insertion rules */
-#define IXGBE_VMVIR_VLANA_DEFAULT 0x40000000 /* Always use default VLAN */
-#define IXGBE_VMVIR_VLANA_NEVER   0x80000000 /* Never insert VLAN tag */
-
-#define IXGBE_ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.1q protocol */
-
-/* STATUS Bit Masks */
-#define IXGBE_STATUS_LAN_ID         0x0000000C /* LAN ID */
-#define IXGBE_STATUS_LAN_ID_SHIFT   2          /* LAN ID Shift*/
-#define IXGBE_STATUS_GIO            0x00080000 /* GIO Master Enable Status */
-
-#define IXGBE_STATUS_LAN_ID_0   0x00000000 /* LAN ID 0 */
-#define IXGBE_STATUS_LAN_ID_1   0x00000004 /* LAN ID 1 */
-
-/* ESDP Bit Masks */
-#define IXGBE_ESDP_SDP0 0x00000001 /* SDP0 Data Value */
-#define IXGBE_ESDP_SDP1 0x00000002 /* SDP1 Data Value */
-#define IXGBE_ESDP_SDP2 0x00000004 /* SDP2 Data Value */
-#define IXGBE_ESDP_SDP3 0x00000008 /* SDP3 Data Value */
-#define IXGBE_ESDP_SDP4 0x00000010 /* SDP4 Data Value */
-#define IXGBE_ESDP_SDP5 0x00000020 /* SDP5 Data Value */
-#define IXGBE_ESDP_SDP6 0x00000040 /* SDP6 Data Value */
-#define IXGBE_ESDP_SDP4_DIR     0x00000004 /* SDP4 IO direction */
-#define IXGBE_ESDP_SDP5_DIR     0x00002000 /* SDP5 IO direction */
-
-/* LEDCTL Bit Masks */
-#define IXGBE_LED_IVRT_BASE      0x00000040
-#define IXGBE_LED_BLINK_BASE     0x00000080
-#define IXGBE_LED_MODE_MASK_BASE 0x0000000F
-#define IXGBE_LED_OFFSET(_base, _i) (_base << (8 * (_i)))
-#define IXGBE_LED_MODE_SHIFT(_i) (8*(_i))
-#define IXGBE_LED_IVRT(_i)       IXGBE_LED_OFFSET(IXGBE_LED_IVRT_BASE, _i)
-#define IXGBE_LED_BLINK(_i)      IXGBE_LED_OFFSET(IXGBE_LED_BLINK_BASE, _i)
-#define IXGBE_LED_MODE_MASK(_i)  IXGBE_LED_OFFSET(IXGBE_LED_MODE_MASK_BASE, _i)
-
-/* LED modes */
-#define IXGBE_LED_LINK_UP       0x0
-#define IXGBE_LED_LINK_10G      0x1
-#define IXGBE_LED_MAC           0x2
-#define IXGBE_LED_FILTER        0x3
-#define IXGBE_LED_LINK_ACTIVE   0x4
-#define IXGBE_LED_LINK_1G       0x5
-#define IXGBE_LED_ON            0xE
-#define IXGBE_LED_OFF           0xF
-
-/* AUTOC Bit Masks */
-#define IXGBE_AUTOC_KX4_KX_SUPP_MASK 0xC0000000
-#define IXGBE_AUTOC_KX4_SUPP    0x80000000
-#define IXGBE_AUTOC_KX_SUPP     0x40000000
-#define IXGBE_AUTOC_PAUSE       0x30000000
-#define IXGBE_AUTOC_ASM_PAUSE   0x20000000
-#define IXGBE_AUTOC_SYM_PAUSE   0x10000000
-#define IXGBE_AUTOC_RF          0x08000000
-#define IXGBE_AUTOC_PD_TMR      0x06000000
-#define IXGBE_AUTOC_AN_RX_LOOSE 0x01000000
-#define IXGBE_AUTOC_AN_RX_DRIFT 0x00800000
-#define IXGBE_AUTOC_AN_RX_ALIGN 0x007C0000
-#define IXGBE_AUTOC_FECA        0x00040000
-#define IXGBE_AUTOC_FECR        0x00020000
-#define IXGBE_AUTOC_KR_SUPP     0x00010000
-#define IXGBE_AUTOC_AN_RESTART  0x00001000
-#define IXGBE_AUTOC_FLU         0x00000001
-#define IXGBE_AUTOC_LMS_SHIFT   13
-#define IXGBE_AUTOC_LMS_10G_SERIAL      (0x3 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_KX4_KX_KR       (0x4 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_SGMII_1G_100M   (0x5 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN (0x6 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII (0x7 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_MASK            (0x7 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_1G_LINK_NO_AN   (0x0 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_10G_LINK_NO_AN  (0x1 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_1G_AN           (0x2 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_KX4_AN          (0x4 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_KX4_AN_1G_AN    (0x6 << IXGBE_AUTOC_LMS_SHIFT)
-#define IXGBE_AUTOC_LMS_ATTACH_TYPE     (0x7 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
-
-#define IXGBE_AUTOC_1G_PMA_PMD_MASK    0x00000200
-#define IXGBE_AUTOC_1G_PMA_PMD_SHIFT   9
-#define IXGBE_AUTOC_10G_PMA_PMD_MASK   0x00000180
-#define IXGBE_AUTOC_10G_PMA_PMD_SHIFT  7
-#define IXGBE_AUTOC_10G_XAUI   (0x0 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC_10G_KX4    (0x1 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC_10G_CX4    (0x2 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC_1G_BX      (0x0 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC_1G_KX      (0x1 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC_1G_SFI     (0x0 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC_1G_KX_BX   (0x1 << IXGBE_AUTOC_1G_PMA_PMD_SHIFT)
-
-#define IXGBE_AUTOC2_UPPER_MASK  0xFFFF0000
-#define IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_MASK  0x00030000
-#define IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT 16
-#define IXGBE_AUTOC2_10G_KR  (0x0 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC2_10G_XFI (0x1 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
-#define IXGBE_AUTOC2_10G_SFI (0x2 << IXGBE_AUTOC2_10G_SERIAL_PMA_PMD_SHIFT)
-
-#define IXGBE_MACC_FLU       0x00000001
-#define IXGBE_MACC_FSV_10G   0x00030000
-#define IXGBE_MACC_FS        0x00040000
-#define IXGBE_MAC_RX2TX_LPBK 0x00000002
-
-/* LINKS Bit Masks */
-#define IXGBE_LINKS_KX_AN_COMP  0x80000000
-#define IXGBE_LINKS_UP          0x40000000
-#define IXGBE_LINKS_SPEED       0x20000000
-#define IXGBE_LINKS_MODE        0x18000000
-#define IXGBE_LINKS_RX_MODE     0x06000000
-#define IXGBE_LINKS_TX_MODE     0x01800000
-#define IXGBE_LINKS_XGXS_EN     0x00400000
-#define IXGBE_LINKS_SGMII_EN    0x02000000
-#define IXGBE_LINKS_PCS_1G_EN   0x00200000
-#define IXGBE_LINKS_1G_AN_EN    0x00100000
-#define IXGBE_LINKS_KX_AN_IDLE  0x00080000
-#define IXGBE_LINKS_1G_SYNC     0x00040000
-#define IXGBE_LINKS_10G_ALIGN   0x00020000
-#define IXGBE_LINKS_10G_LANE_SYNC 0x00017000
-#define IXGBE_LINKS_TL_FAULT    0x00001000
-#define IXGBE_LINKS_SIGNAL      0x00000F00
-
-#define IXGBE_LINKS_SPEED_82599     0x30000000
-#define IXGBE_LINKS_SPEED_10G_82599 0x30000000
-#define IXGBE_LINKS_SPEED_1G_82599  0x20000000
-#define IXGBE_LINKS_SPEED_100_82599 0x10000000
-#define IXGBE_LINK_UP_TIME      90 /* 9.0 Seconds */
-#define IXGBE_AUTO_NEG_TIME     45 /* 4.5 Seconds */
-
-#define IXGBE_LINKS2_AN_SUPPORTED   0x00000040
-
-/* PCS1GLSTA Bit Masks */
-#define IXGBE_PCS1GLSTA_LINK_OK         1
-#define IXGBE_PCS1GLSTA_SYNK_OK         0x10
-#define IXGBE_PCS1GLSTA_AN_COMPLETE     0x10000
-#define IXGBE_PCS1GLSTA_AN_PAGE_RX      0x20000
-#define IXGBE_PCS1GLSTA_AN_TIMED_OUT    0x40000
-#define IXGBE_PCS1GLSTA_AN_REMOTE_FAULT 0x80000
-#define IXGBE_PCS1GLSTA_AN_ERROR_RWS    0x100000
-
-#define IXGBE_PCS1GANA_SYM_PAUSE        0x80
-#define IXGBE_PCS1GANA_ASM_PAUSE        0x100
-
-/* PCS1GLCTL Bit Masks */
-#define IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN  0x00040000 /* PCS 1G autoneg to en */
-#define IXGBE_PCS1GLCTL_FLV_LINK_UP     1
-#define IXGBE_PCS1GLCTL_FORCE_LINK      0x20
-#define IXGBE_PCS1GLCTL_LOW_LINK_LATCH  0x40
-#define IXGBE_PCS1GLCTL_AN_ENABLE       0x10000
-#define IXGBE_PCS1GLCTL_AN_RESTART      0x20000
-
-/* ANLP1 Bit Masks */
-#define IXGBE_ANLP1_PAUSE               0x0C00
-#define IXGBE_ANLP1_SYM_PAUSE           0x0400
-#define IXGBE_ANLP1_ASM_PAUSE           0x0800
-#define IXGBE_ANLP1_AN_STATE_MASK       0x000f0000
-
-/* SW Semaphore Register bitmasks */
-#define IXGBE_SWSM_SMBI 0x00000001 /* Driver Semaphore bit */
-#define IXGBE_SWSM_SWESMBI 0x00000002 /* FW Semaphore bit */
-#define IXGBE_SWSM_WMNG 0x00000004 /* Wake MNG Clock */
-#define IXGBE_SWFW_REGSMP 0x80000000 /* Register Semaphore bit 31 */
-
-/* SW_FW_SYNC/GSSR definitions */
-#define IXGBE_GSSR_EEP_SM     0x0001
-#define IXGBE_GSSR_PHY0_SM    0x0002
-#define IXGBE_GSSR_PHY1_SM    0x0004
-#define IXGBE_GSSR_MAC_CSR_SM 0x0008
-#define IXGBE_GSSR_FLASH_SM   0x0010
-#define IXGBE_GSSR_SW_MNG_SM  0x0400
-
-/* FW Status register bitmask */
-#define IXGBE_FWSTS_FWRI    0x00000200 /* Firmware Reset Indication */
-
-/* EEC Register */
-#define IXGBE_EEC_SK        0x00000001 /* EEPROM Clock */
-#define IXGBE_EEC_CS        0x00000002 /* EEPROM Chip Select */
-#define IXGBE_EEC_DI        0x00000004 /* EEPROM Data In */
-#define IXGBE_EEC_DO        0x00000008 /* EEPROM Data Out */
-#define IXGBE_EEC_FWE_MASK  0x00000030 /* FLASH Write Enable */
-#define IXGBE_EEC_FWE_DIS   0x00000010 /* Disable FLASH writes */
-#define IXGBE_EEC_FWE_EN    0x00000020 /* Enable FLASH writes */
-#define IXGBE_EEC_FWE_SHIFT 4
-#define IXGBE_EEC_REQ       0x00000040 /* EEPROM Access Request */
-#define IXGBE_EEC_GNT       0x00000080 /* EEPROM Access Grant */
-#define IXGBE_EEC_PRES      0x00000100 /* EEPROM Present */
-#define IXGBE_EEC_ARD       0x00000200 /* EEPROM Auto Read Done */
-#define IXGBE_EEC_FLUP      0x00800000 /* Flash update command */
-#define IXGBE_EEC_SEC1VAL   0x02000000 /* Sector 1 Valid */
-#define IXGBE_EEC_FLUDONE   0x04000000 /* Flash update done */
-/* EEPROM Addressing bits based on type (0-small, 1-large) */
-#define IXGBE_EEC_ADDR_SIZE 0x00000400
-#define IXGBE_EEC_SIZE      0x00007800 /* EEPROM Size */
-#define IXGBE_EERD_MAX_ADDR 0x00003FFF /* EERD alows 14 bits for addr. */
-
-#define IXGBE_EEC_SIZE_SHIFT          11
-#define IXGBE_EEPROM_WORD_SIZE_SHIFT  6
-#define IXGBE_EEPROM_OPCODE_BITS      8
-
-/* Part Number String Length */
-#define IXGBE_PBANUM_LENGTH 11
-
-/* Checksum and EEPROM pointers */
-#define IXGBE_PBANUM_PTR_GUARD  0xFAFA
-#define IXGBE_EEPROM_CHECKSUM   0x3F
-#define IXGBE_EEPROM_SUM        0xBABA
-#define IXGBE_PCIE_ANALOG_PTR   0x03
-#define IXGBE_ATLAS0_CONFIG_PTR 0x04
-#define IXGBE_PHY_PTR           0x04
-#define IXGBE_ATLAS1_CONFIG_PTR 0x05
-#define IXGBE_OPTION_ROM_PTR    0x05
-#define IXGBE_PCIE_GENERAL_PTR  0x06
-#define IXGBE_PCIE_CONFIG0_PTR  0x07
-#define IXGBE_PCIE_CONFIG1_PTR  0x08
-#define IXGBE_CORE0_PTR         0x09
-#define IXGBE_CORE1_PTR         0x0A
-#define IXGBE_MAC0_PTR          0x0B
-#define IXGBE_MAC1_PTR          0x0C
-#define IXGBE_CSR0_CONFIG_PTR   0x0D
-#define IXGBE_CSR1_CONFIG_PTR   0x0E
-#define IXGBE_FW_PTR            0x0F
-#define IXGBE_PBANUM0_PTR       0x15
-#define IXGBE_PBANUM1_PTR       0x16
-#define IXGBE_FREE_SPACE_PTR    0X3E
-#define IXGBE_SAN_MAC_ADDR_PTR  0x28
-#define IXGBE_DEVICE_CAPS       0x2C
-#define IXGBE_SERIAL_NUMBER_MAC_ADDR 0x11
-#define IXGBE_PCIE_MSIX_82599_CAPS  0x72
-#define IXGBE_PCIE_MSIX_82598_CAPS  0x62
-
-/* MSI-X capability fields masks */
-#define IXGBE_PCIE_MSIX_TBL_SZ_MASK     0x7FF
-
-/* Legacy EEPROM word offsets */
-#define IXGBE_ISCSI_BOOT_CAPS           0x0033
-#define IXGBE_ISCSI_SETUP_PORT_0        0x0030
-#define IXGBE_ISCSI_SETUP_PORT_1        0x0034
-
-/* EEPROM Commands - SPI */
-#define IXGBE_EEPROM_MAX_RETRY_SPI      5000 /* Max wait 5ms for RDY signal */
-#define IXGBE_EEPROM_STATUS_RDY_SPI     0x01
-#define IXGBE_EEPROM_READ_OPCODE_SPI    0x03  /* EEPROM read opcode */
-#define IXGBE_EEPROM_WRITE_OPCODE_SPI   0x02  /* EEPROM write opcode */
-#define IXGBE_EEPROM_A8_OPCODE_SPI      0x08  /* opcode bit-3 = addr bit-8 */
-#define IXGBE_EEPROM_WREN_OPCODE_SPI    0x06  /* EEPROM set Write Ena latch */
-/* EEPROM reset Write Enable latch */
-#define IXGBE_EEPROM_WRDI_OPCODE_SPI    0x04
-#define IXGBE_EEPROM_RDSR_OPCODE_SPI    0x05  /* EEPROM read Status reg */
-#define IXGBE_EEPROM_WRSR_OPCODE_SPI    0x01  /* EEPROM write Status reg */
-#define IXGBE_EEPROM_ERASE4K_OPCODE_SPI 0x20  /* EEPROM ERASE 4KB */
-#define IXGBE_EEPROM_ERASE64K_OPCODE_SPI  0xD8  /* EEPROM ERASE 64KB */
-#define IXGBE_EEPROM_ERASE256_OPCODE_SPI  0xDB  /* EEPROM ERASE 256B */
-
-/* EEPROM Read Register */
-#define IXGBE_EEPROM_RW_REG_DATA   16 /* data offset in EEPROM read reg */
-#define IXGBE_EEPROM_RW_REG_DONE   2  /* Offset to READ done bit */
-#define IXGBE_EEPROM_RW_REG_START  1  /* First bit to start operation */
-#define IXGBE_EEPROM_RW_ADDR_SHIFT 2  /* Shift to the address bits */
-#define IXGBE_NVM_POLL_WRITE       1  /* Flag for polling for write complete */
-#define IXGBE_NVM_POLL_READ        0  /* Flag for polling for read complete */
-
-#define IXGBE_ETH_LENGTH_OF_ADDRESS   6
-
-#define IXGBE_EEPROM_PAGE_SIZE_MAX       128
-#define IXGBE_EEPROM_RD_BUFFER_MAX_COUNT 512 /* EEPROM words # read in burst */
-#define IXGBE_EEPROM_WR_BUFFER_MAX_COUNT 256 /* EEPROM words # wr in burst */
-
-#ifndef IXGBE_EEPROM_GRANT_ATTEMPTS
-#define IXGBE_EEPROM_GRANT_ATTEMPTS 1000 /* EEPROM # attempts to gain grant */
-#endif
-
-#ifndef IXGBE_EERD_EEWR_ATTEMPTS
-/* Number of 5 microseconds we wait for EERD read and
- * EERW write to complete */
-#define IXGBE_EERD_EEWR_ATTEMPTS 100000
-#endif
-
-#ifndef IXGBE_FLUDONE_ATTEMPTS
-/* # attempts we wait for flush update to complete */
-#define IXGBE_FLUDONE_ATTEMPTS 20000
-#endif
-
-#define IXGBE_PCIE_CTRL2                 0x5   /* PCIe Control 2 Offset */
-#define IXGBE_PCIE_CTRL2_DUMMY_ENABLE    0x8   /* Dummy Function Enable */
-#define IXGBE_PCIE_CTRL2_LAN_DISABLE     0x2   /* LAN PCI Disable */
-#define IXGBE_PCIE_CTRL2_DISABLE_SELECT  0x1   /* LAN Disable Select */
-
-#define IXGBE_SAN_MAC_ADDR_PORT0_OFFSET  0x0
-#define IXGBE_SAN_MAC_ADDR_PORT1_OFFSET  0x3
-#define IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP  0x1
-#define IXGBE_DEVICE_CAPS_FCOE_OFFLOADS  0x2
-#define IXGBE_FW_LESM_PARAMETERS_PTR     0x2
-#define IXGBE_FW_LESM_STATE_1            0x1
-#define IXGBE_FW_LESM_STATE_ENABLED      0x8000 /* LESM Enable bit */
-#define IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR   0x4
-#define IXGBE_FW_PATCH_VERSION_4         0x7
-#define IXGBE_FCOE_IBA_CAPS_BLK_PTR         0x33 /* iSCSI/FCOE block */
-#define IXGBE_FCOE_IBA_CAPS_FCOE            0x20 /* FCOE flags */
-#define IXGBE_ISCSI_FCOE_BLK_PTR            0x17 /* iSCSI/FCOE block */
-#define IXGBE_ISCSI_FCOE_FLAGS_OFFSET       0x0  /* FCOE flags */
-#define IXGBE_ISCSI_FCOE_FLAGS_ENABLE       0x1  /* FCOE flags enable bit */
-#define IXGBE_ALT_SAN_MAC_ADDR_BLK_PTR      0x27 /* Alt. SAN MAC block */
-#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_OFFSET  0x0 /* Alt. SAN MAC capability */
-#define IXGBE_ALT_SAN_MAC_ADDR_PORT0_OFFSET 0x1 /* Alt. SAN MAC 0 offset */
-#define IXGBE_ALT_SAN_MAC_ADDR_PORT1_OFFSET 0x4 /* Alt. SAN MAC 1 offset */
-#define IXGBE_ALT_SAN_MAC_ADDR_WWNN_OFFSET  0x7 /* Alt. WWNN prefix offset */
-#define IXGBE_ALT_SAN_MAC_ADDR_WWPN_OFFSET  0x8 /* Alt. WWPN prefix offset */
-#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_SANMAC  0x0 /* Alt. SAN MAC exists */
-#define IXGBE_ALT_SAN_MAC_ADDR_CAPS_ALTWWN  0x1 /* Alt. WWN base exists */
-
-/* PCI Bus Info */
-#define IXGBE_PCI_DEVICE_STATUS   0xAA
-#define IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING   0x0020
-#define IXGBE_PCI_LINK_STATUS     0xB2
-#define IXGBE_PCI_DEVICE_CONTROL2 0xC8
-#define IXGBE_PCI_LINK_WIDTH      0x3F0
-#define IXGBE_PCI_LINK_WIDTH_1    0x10
-#define IXGBE_PCI_LINK_WIDTH_2    0x20
-#define IXGBE_PCI_LINK_WIDTH_4    0x40
-#define IXGBE_PCI_LINK_WIDTH_8    0x80
-#define IXGBE_PCI_LINK_SPEED      0xF
-#define IXGBE_PCI_LINK_SPEED_2500 0x1
-#define IXGBE_PCI_LINK_SPEED_5000 0x2
-#define IXGBE_PCI_HEADER_TYPE_REGISTER  0x0E
-#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
-#define IXGBE_PCI_DEVICE_CONTROL2_16ms  0x0005
-
-/* Number of 100 microseconds we wait for PCI Express master disable */
-#define IXGBE_PCI_MASTER_DISABLE_TIMEOUT 800
-
-/* Check whether address is multicast.  This is little-endian specific check.*/
-#define IXGBE_IS_MULTICAST(Address) \
-                (bool)(((u8 *)(Address))[0] & ((u8)0x01))
-
-/* Check whether an address is broadcast. */
-#define IXGBE_IS_BROADCAST(Address)                      \
-                ((((u8 *)(Address))[0] == ((u8)0xff)) && \
-                (((u8 *)(Address))[1] == ((u8)0xff)))
-
-/* RAH */
-#define IXGBE_RAH_VIND_MASK     0x003C0000
-#define IXGBE_RAH_VIND_SHIFT    18
-#define IXGBE_RAH_AV            0x80000000
-#define IXGBE_CLEAR_VMDQ_ALL    0xFFFFFFFF
-
-/* Header split receive */
-#define IXGBE_RFCTL_ISCSI_DIS       0x00000001
-#define IXGBE_RFCTL_ISCSI_DWC_MASK  0x0000003E
-#define IXGBE_RFCTL_ISCSI_DWC_SHIFT 1
-#define IXGBE_RFCTL_NFSW_DIS        0x00000040
-#define IXGBE_RFCTL_NFSR_DIS        0x00000080
-#define IXGBE_RFCTL_NFS_VER_MASK    0x00000300
-#define IXGBE_RFCTL_NFS_VER_SHIFT   8
-#define IXGBE_RFCTL_NFS_VER_2       0
-#define IXGBE_RFCTL_NFS_VER_3       1
-#define IXGBE_RFCTL_NFS_VER_4       2
-#define IXGBE_RFCTL_IPV6_DIS        0x00000400
-#define IXGBE_RFCTL_IPV6_XSUM_DIS   0x00000800
-#define IXGBE_RFCTL_IPFRSP_DIS      0x00004000
-#define IXGBE_RFCTL_IPV6_EX_DIS     0x00010000
-#define IXGBE_RFCTL_NEW_IPV6_EXT_DIS 0x00020000
-
-/* Transmit Config masks */
-#define IXGBE_TXDCTL_ENABLE     0x02000000 /* Enable specific Tx Queue */
-#define IXGBE_TXDCTL_SWFLSH     0x04000000 /* Tx Desc. write-back flushing */
-#define IXGBE_TXDCTL_WTHRESH_SHIFT      16 /* shift to WTHRESH bits */
-/* Enable short packet padding to 64 bytes */
-#define IXGBE_TX_PAD_ENABLE     0x00000400
-#define IXGBE_JUMBO_FRAME_ENABLE 0x00000004  /* Allow jumbo frames */
-/* This allows for 16K packets + 4k for vlan */
-#define IXGBE_MAX_FRAME_SZ      0x40040000
-
-#define IXGBE_TDWBAL_HEAD_WB_ENABLE   0x1      /* Tx head write-back enable */
-#define IXGBE_TDWBAL_SEQNUM_WB_ENABLE 0x2      /* Tx seq# write-back enable */
-
-/* Receive Config masks */
-#define IXGBE_RXCTRL_RXEN       0x00000001  /* Enable Receiver */
-#define IXGBE_RXCTRL_DMBYPS     0x00000002  /* Descriptor Monitor Bypass */
-#define IXGBE_RXDCTL_ENABLE     0x02000000  /* Enable specific Rx Queue */
-#define IXGBE_RXDCTL_RLPMLMASK  0x00003FFF  /* Only supported on the X540 */
-#define IXGBE_RXDCTL_RLPML_EN   0x00008000
-#define IXGBE_RXDCTL_VME        0x40000000  /* VLAN mode enable */
-
-#define IXGBE_FCTRL_SBP 0x00000002 /* Store Bad Packet */
-#define IXGBE_FCTRL_MPE 0x00000100 /* Multicast Promiscuous Ena*/
-#define IXGBE_FCTRL_UPE 0x00000200 /* Unicast Promiscuous Ena */
-#define IXGBE_FCTRL_BAM 0x00000400 /* Broadcast Accept Mode */
-#define IXGBE_FCTRL_PMCF 0x00001000 /* Pass MAC Control Frames */
-#define IXGBE_FCTRL_DPF 0x00002000 /* Discard Pause Frame */
-/* Receive Priority Flow Control Enable */
-#define IXGBE_FCTRL_RPFCE 0x00004000
-#define IXGBE_FCTRL_RFCE 0x00008000 /* Receive Flow Control Ena */
-#define IXGBE_MFLCN_PMCF        0x00000001 /* Pass MAC Control Frames */
-#define IXGBE_MFLCN_DPF         0x00000002 /* Discard Pause Frame */
-#define IXGBE_MFLCN_RPFCE       0x00000004 /* Receive Priority FC Enable */
-#define IXGBE_MFLCN_RFCE        0x00000008 /* Receive FC Enable */
-
-#define IXGBE_MFLCN_RPFCE_SHIFT                 4
-
-/* Multiple Receive Queue Control */
-#define IXGBE_MRQC_RSSEN                 0x00000001  /* RSS Enable */
-#define IXGBE_MRQC_MRQE_MASK                    0xF /* Bits 3:0 */
-#define IXGBE_MRQC_RT8TCEN               0x00000002 /* 8 TC no RSS */
-#define IXGBE_MRQC_RT4TCEN               0x00000003 /* 4 TC no RSS */
-#define IXGBE_MRQC_RTRSS8TCEN            0x00000004 /* 8 TC w/ RSS */
-#define IXGBE_MRQC_RTRSS4TCEN            0x00000005 /* 4 TC w/ RSS */
-#define IXGBE_MRQC_VMDQEN                0x00000008 /* VMDq2 64 pools no RSS */
-#define IXGBE_MRQC_VMDQRSS32EN           0x0000000A /* VMDq2 32 pools w/ RSS */
-#define IXGBE_MRQC_VMDQRSS64EN           0x0000000B /* VMDq2 64 pools w/ RSS */
-#define IXGBE_MRQC_VMDQRT8TCEN           0x0000000C /* VMDq2/RT 16 pool 8 TC */
-#define IXGBE_MRQC_VMDQRT4TCEN           0x0000000D /* VMDq2/RT 32 pool 4 TC */
-#define IXGBE_MRQC_RSS_FIELD_MASK        0xFFFF0000
-#define IXGBE_MRQC_RSS_FIELD_IPV4_TCP    0x00010000
-#define IXGBE_MRQC_RSS_FIELD_IPV4        0x00020000
-#define IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP 0x00040000
-#define IXGBE_MRQC_RSS_FIELD_IPV6_EX     0x00080000
-#define IXGBE_MRQC_RSS_FIELD_IPV6        0x00100000
-#define IXGBE_MRQC_RSS_FIELD_IPV6_TCP    0x00200000
-#define IXGBE_MRQC_RSS_FIELD_IPV4_UDP    0x00400000
-#define IXGBE_MRQC_RSS_FIELD_IPV6_UDP    0x00800000
-#define IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP 0x01000000
-#define IXGBE_MRQC_L3L4TXSWEN            0x00008000
-
-/* Queue Drop Enable */
-#define IXGBE_QDE_ENABLE     0x00000001
-#define IXGBE_QDE_IDX_MASK   0x00007F00
-#define IXGBE_QDE_IDX_SHIFT           8
-
-#define IXGBE_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define IXGBE_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define IXGBE_TXD_CMD_EOP    0x01000000 /* End of Packet */
-#define IXGBE_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
-#define IXGBE_TXD_CMD_IC     0x04000000 /* Insert Checksum */
-#define IXGBE_TXD_CMD_RS     0x08000000 /* Report Status */
-#define IXGBE_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define IXGBE_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
-#define IXGBE_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-
-#define IXGBE_RXDADV_IPSEC_STATUS_SECP                  0x00020000
-#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_PROTOCOL       0x08000000
-#define IXGBE_RXDADV_IPSEC_ERROR_INVALID_LENGTH         0x10000000
-#define IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED            0x18000000
-#define IXGBE_RXDADV_IPSEC_ERROR_BIT_MASK               0x18000000
-/* Multiple Transmit Queue Command Register */
-#define IXGBE_MTQC_RT_ENA       0x1 /* DCB Enable */
-#define IXGBE_MTQC_VT_ENA       0x2 /* VMDQ2 Enable */
-#define IXGBE_MTQC_64Q_1PB      0x0 /* 64 queues 1 pack buffer */
-#define IXGBE_MTQC_32VF         0x8 /* 4 TX Queues per pool w/32VF's */
-#define IXGBE_MTQC_64VF         0x4 /* 2 TX Queues per pool w/64VF's */
-#define IXGBE_MTQC_8TC_8TQ      0xC /* 8 TC if RT_ENA or 8 TQ if VT_ENA */
-#define IXGBE_MTQC_4TC_4TQ     0x8 /* 4 TC if RT_ENA or 4 TQ if VT_ENA */
-
-/* Receive Descriptor bit definitions */
-#define IXGBE_RXD_STAT_DD       0x01    /* Descriptor Done */
-#define IXGBE_RXD_STAT_EOP      0x02    /* End of Packet */
-#define IXGBE_RXD_STAT_FLM      0x04    /* FDir Match */
-#define IXGBE_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-#define IXGBE_RXDADV_NEXTP_MASK   0x000FFFF0 /* Next Descriptor Index */
-#define IXGBE_RXDADV_NEXTP_SHIFT  0x00000004
-#define IXGBE_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */
-#define IXGBE_RXD_STAT_L4CS     0x20    /* L4 xsum calculated */
-#define IXGBE_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
-#define IXGBE_RXD_STAT_PIF      0x80    /* passed in-exact filter */
-#define IXGBE_RXD_STAT_CRCV     0x100   /* Speculative CRC Valid */
-#define IXGBE_RXD_STAT_VEXT     0x200   /* 1st VLAN found */
-#define IXGBE_RXD_STAT_UDPV     0x400   /* Valid UDP checksum */
-#define IXGBE_RXD_STAT_DYNINT   0x800   /* Pkt caused INT via DYNINT */
-#define IXGBE_RXD_STAT_LLINT    0x800   /* Pkt caused Low Latency Interrupt */
-#define IXGBE_RXD_STAT_TS       0x10000 /* Time Stamp */
-#define IXGBE_RXD_STAT_SECP     0x20000 /* Security Processing */
-#define IXGBE_RXD_STAT_LB       0x40000 /* Loopback Status */
-#define IXGBE_RXD_STAT_ACK      0x8000  /* ACK Packet indication */
-#define IXGBE_RXD_ERR_CE        0x01    /* CRC Error */
-#define IXGBE_RXD_ERR_LE        0x02    /* Length Error */
-#define IXGBE_RXD_ERR_PE        0x08    /* Packet Error */
-#define IXGBE_RXD_ERR_OSE       0x10    /* Oversize Error */
-#define IXGBE_RXD_ERR_USE       0x20    /* Undersize Error */
-#define IXGBE_RXD_ERR_TCPE      0x40    /* TCP/UDP Checksum Error */
-#define IXGBE_RXD_ERR_IPE       0x80    /* IP Checksum Error */
-#define IXGBE_RXDADV_ERR_MASK           0xfff00000 /* RDESC.ERRORS mask */
-#define IXGBE_RXDADV_ERR_SHIFT          20         /* RDESC.ERRORS shift */
-#define IXGBE_RXDADV_ERR_FCEOFE         0x80000000 /* FCoEFe/IPE */
-#define IXGBE_RXDADV_ERR_FCERR          0x00700000 /* FCERR/FDIRERR */
-#define IXGBE_RXDADV_ERR_FDIR_LEN       0x00100000 /* FDIR Length error */
-#define IXGBE_RXDADV_ERR_FDIR_DROP      0x00200000 /* FDIR Drop error */
-#define IXGBE_RXDADV_ERR_FDIR_COLL      0x00400000 /* FDIR Collision error */
-#define IXGBE_RXDADV_ERR_HBO    0x00800000 /*Header Buffer Overflow */
-#define IXGBE_RXDADV_ERR_CE     0x01000000 /* CRC Error */
-#define IXGBE_RXDADV_ERR_LE     0x02000000 /* Length Error */
-#define IXGBE_RXDADV_ERR_PE     0x08000000 /* Packet Error */
-#define IXGBE_RXDADV_ERR_OSE    0x10000000 /* Oversize Error */
-#define IXGBE_RXDADV_ERR_USE    0x20000000 /* Undersize Error */
-#define IXGBE_RXDADV_ERR_TCPE   0x40000000 /* TCP/UDP Checksum Error */
-#define IXGBE_RXDADV_ERR_IPE    0x80000000 /* IP Checksum Error */
-#define IXGBE_RXD_VLAN_ID_MASK  0x0FFF  /* VLAN ID is in lower 12 bits */
-#define IXGBE_RXD_PRI_MASK      0xE000  /* Priority is in upper 3 bits */
-#define IXGBE_RXD_PRI_SHIFT     13
-#define IXGBE_RXD_CFI_MASK      0x1000  /* CFI is bit 12 */
-#define IXGBE_RXD_CFI_SHIFT     12
-
-#define IXGBE_RXDADV_STAT_DD            IXGBE_RXD_STAT_DD  /* Done */
-#define IXGBE_RXDADV_STAT_EOP           IXGBE_RXD_STAT_EOP /* End of Packet */
-#define IXGBE_RXDADV_STAT_FLM           IXGBE_RXD_STAT_FLM /* FDir Match */
-#define IXGBE_RXDADV_STAT_VP            IXGBE_RXD_STAT_VP  /* IEEE VLAN Pkt */
-#define IXGBE_RXDADV_STAT_MASK          0x000fffff /* Stat/NEXTP: bit 0-19 */
-#define IXGBE_RXDADV_STAT_FCEOFS        0x00000040 /* FCoE EOF/SOF Stat */
-#define IXGBE_RXDADV_STAT_FCSTAT        0x00000030 /* FCoE Pkt Stat */
-#define IXGBE_RXDADV_STAT_FCSTAT_NOMTCH 0x00000000 /* 00: No Ctxt Match */
-#define IXGBE_RXDADV_STAT_FCSTAT_NODDP  0x00000010 /* 01: Ctxt w/o DDP */
-#define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
-#define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
-
-/* PSRTYPE bit definitions */
-#define IXGBE_PSRTYPE_TCPHDR    0x00000010
-#define IXGBE_PSRTYPE_UDPHDR    0x00000020
-#define IXGBE_PSRTYPE_IPV4HDR   0x00000100
-#define IXGBE_PSRTYPE_IPV6HDR   0x00000200
-#define IXGBE_PSRTYPE_L2HDR     0x00001000
-
-/* SRRCTL bit definitions */
-#define IXGBE_SRRCTL_BSIZEPKT_SHIFT     10     /* so many KBs */
-#define IXGBE_SRRCTL_RDMTS_SHIFT        22
-#define IXGBE_SRRCTL_RDMTS_MASK         0x01C00000
-#define IXGBE_SRRCTL_DROP_EN            0x10000000
-#define IXGBE_SRRCTL_BSIZEPKT_MASK      0x0000007F
-#define IXGBE_SRRCTL_BSIZEHDR_MASK      0x00003F00
-#define IXGBE_SRRCTL_DESCTYPE_LEGACY    0x00000000
-#define IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000
-#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT  0x04000000
-#define IXGBE_SRRCTL_DESCTYPE_HDR_REPLICATION_LARGE_PKT 0x08000000
-#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS 0x0A000000
-#define IXGBE_SRRCTL_DESCTYPE_MASK      0x0E000000
-
-#define IXGBE_RXDPS_HDRSTAT_HDRSP       0x00008000
-#define IXGBE_RXDPS_HDRSTAT_HDRLEN_MASK 0x000003FF
-
-#define IXGBE_RXDADV_RSSTYPE_MASK       0x0000000F
-#define IXGBE_RXDADV_PKTTYPE_MASK       0x0000FFF0
-#define IXGBE_RXDADV_PKTTYPE_MASK_EX    0x0001FFF0
-#define IXGBE_RXDADV_HDRBUFLEN_MASK     0x00007FE0
-#define IXGBE_RXDADV_RSCCNT_MASK        0x001E0000
-#define IXGBE_RXDADV_RSCCNT_SHIFT       17
-#define IXGBE_RXDADV_HDRBUFLEN_SHIFT    5
-#define IXGBE_RXDADV_SPLITHEADER_EN     0x00001000
-#define IXGBE_RXDADV_SPH                0x8000
-
-/* RSS Hash results */
-#define IXGBE_RXDADV_RSSTYPE_NONE       0x00000000
-#define IXGBE_RXDADV_RSSTYPE_IPV4_TCP   0x00000001
-#define IXGBE_RXDADV_RSSTYPE_IPV4       0x00000002
-#define IXGBE_RXDADV_RSSTYPE_IPV6_TCP   0x00000003
-#define IXGBE_RXDADV_RSSTYPE_IPV6_EX    0x00000004
-#define IXGBE_RXDADV_RSSTYPE_IPV6       0x00000005
-#define IXGBE_RXDADV_RSSTYPE_IPV6_TCP_EX 0x00000006
-#define IXGBE_RXDADV_RSSTYPE_IPV4_UDP   0x00000007
-#define IXGBE_RXDADV_RSSTYPE_IPV6_UDP   0x00000008
-#define IXGBE_RXDADV_RSSTYPE_IPV6_UDP_EX 0x00000009
-
-/* RSS Packet Types as indicated in the receive descriptor. */
-#define IXGBE_RXDADV_PKTTYPE_NONE       0x00000000
-#define IXGBE_RXDADV_PKTTYPE_IPV4       0x00000010 /* IPv4 hdr present */
-#define IXGBE_RXDADV_PKTTYPE_IPV4_EX    0x00000020 /* IPv4 hdr + extensions */
-#define IXGBE_RXDADV_PKTTYPE_IPV6       0x00000040 /* IPv6 hdr present */
-#define IXGBE_RXDADV_PKTTYPE_IPV6_EX    0x00000080 /* IPv6 hdr + extensions */
-#define IXGBE_RXDADV_PKTTYPE_TCP        0x00000100 /* TCP hdr present */
-#define IXGBE_RXDADV_PKTTYPE_UDP        0x00000200 /* UDP hdr present */
-#define IXGBE_RXDADV_PKTTYPE_SCTP       0x00000400 /* SCTP hdr present */
-#define IXGBE_RXDADV_PKTTYPE_NFS        0x00000800 /* NFS hdr present */
-#define IXGBE_RXDADV_PKTTYPE_IPSEC_ESP  0x00001000 /* IPSec ESP */
-#define IXGBE_RXDADV_PKTTYPE_IPSEC_AH   0x00002000 /* IPSec AH */
-#define IXGBE_RXDADV_PKTTYPE_LINKSEC    0x00004000 /* LinkSec Encap */
-#define IXGBE_RXDADV_PKTTYPE_ETQF       0x00008000 /* PKTTYPE is ETQF index */
-#define IXGBE_RXDADV_PKTTYPE_ETQF_MASK  0x00000070 /* ETQF has 8 indices */
-#define IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT 4          /* Right-shift 4 bits */
-
-/* Security Processing bit Indication */
-#define IXGBE_RXDADV_LNKSEC_STATUS_SECP         0x00020000
-#define IXGBE_RXDADV_LNKSEC_ERROR_NO_SA_MATCH   0x08000000
-#define IXGBE_RXDADV_LNKSEC_ERROR_REPLAY_ERROR  0x10000000
-#define IXGBE_RXDADV_LNKSEC_ERROR_BIT_MASK      0x18000000
-#define IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG       0x18000000
-
-/* Masks to determine if packets should be dropped due to frame errors */
-#define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \
-                                      IXGBE_RXD_ERR_CE | \
-                                      IXGBE_RXD_ERR_LE | \
-                                      IXGBE_RXD_ERR_PE | \
-                                      IXGBE_RXD_ERR_OSE | \
-                                      IXGBE_RXD_ERR_USE)
-
-#define IXGBE_RXDADV_ERR_FRAME_ERR_MASK ( \
-                                      IXGBE_RXDADV_ERR_CE | \
-                                      IXGBE_RXDADV_ERR_LE | \
-                                      IXGBE_RXDADV_ERR_PE | \
-                                      IXGBE_RXDADV_ERR_OSE | \
-                                      IXGBE_RXDADV_ERR_USE)
-
-/* Multicast bit mask */
-#define IXGBE_MCSTCTRL_MFE      0x4
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE  8
-#define IXGBE_REQ_TX_BUFFER_GRANULARITY   1024
-
-/* Vlan-specific macros */
-#define IXGBE_RX_DESC_SPECIAL_VLAN_MASK  0x0FFF /* VLAN ID in lower 12 bits */
-#define IXGBE_RX_DESC_SPECIAL_PRI_MASK   0xE000 /* Priority in upper 3 bits */
-#define IXGBE_RX_DESC_SPECIAL_PRI_SHIFT  0x000D /* Priority in upper 3 of 16 */
-#define IXGBE_TX_DESC_SPECIAL_PRI_SHIFT  IXGBE_RX_DESC_SPECIAL_PRI_SHIFT
-
-/* SR-IOV specific macros */
-#define IXGBE_MBVFICR_INDEX(vf_number)   (vf_number >> 4)
-#define IXGBE_MBVFICR(_i)                (0x00710 + (_i * 4))
-#define IXGBE_VFLRE(_i)                  (((_i & 1) ? 0x001C0 : 0x00600))
-#define IXGBE_VFLREC(_i)                 (0x00700 + (_i * 4))
-
-enum ixgbe_fdir_pballoc_type {
-       IXGBE_FDIR_PBALLOC_NONE = 0,
-       IXGBE_FDIR_PBALLOC_64K  = 1,
-       IXGBE_FDIR_PBALLOC_128K = 2,
-       IXGBE_FDIR_PBALLOC_256K = 3,
-};
-#define IXGBE_FDIR_PBALLOC_SIZE_SHIFT           16
-
-/* Flow Director register values */
-#define IXGBE_FDIRCTRL_PBALLOC_64K              0x00000001
-#define IXGBE_FDIRCTRL_PBALLOC_128K             0x00000002
-#define IXGBE_FDIRCTRL_PBALLOC_256K             0x00000003
-#define IXGBE_FDIRCTRL_INIT_DONE                0x00000008
-#define IXGBE_FDIRCTRL_PERFECT_MATCH            0x00000010
-#define IXGBE_FDIRCTRL_REPORT_STATUS            0x00000020
-#define IXGBE_FDIRCTRL_REPORT_STATUS_ALWAYS     0x00000080
-#define IXGBE_FDIRCTRL_DROP_Q_SHIFT             8
-#define IXGBE_FDIRCTRL_FLEX_SHIFT               16
-#define IXGBE_FDIRCTRL_SEARCHLIM                0x00800000
-#define IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT         24
-#define IXGBE_FDIRCTRL_FULL_THRESH_MASK         0xF0000000
-#define IXGBE_FDIRCTRL_FULL_THRESH_SHIFT        28
-
-#define IXGBE_FDIRTCPM_DPORTM_SHIFT             16
-#define IXGBE_FDIRUDPM_DPORTM_SHIFT             16
-#define IXGBE_FDIRIP6M_DIPM_SHIFT               16
-#define IXGBE_FDIRM_VLANID                      0x00000001
-#define IXGBE_FDIRM_VLANP                       0x00000002
-#define IXGBE_FDIRM_POOL                        0x00000004
-#define IXGBE_FDIRM_L4P                         0x00000008
-#define IXGBE_FDIRM_FLEX                        0x00000010
-#define IXGBE_FDIRM_DIPv6                       0x00000020
-
-#define IXGBE_FDIRFREE_FREE_MASK                0xFFFF
-#define IXGBE_FDIRFREE_FREE_SHIFT               0
-#define IXGBE_FDIRFREE_COLL_MASK                0x7FFF0000
-#define IXGBE_FDIRFREE_COLL_SHIFT               16
-#define IXGBE_FDIRLEN_MAXLEN_MASK               0x3F
-#define IXGBE_FDIRLEN_MAXLEN_SHIFT              0
-#define IXGBE_FDIRLEN_MAXHASH_MASK              0x7FFF0000
-#define IXGBE_FDIRLEN_MAXHASH_SHIFT             16
-#define IXGBE_FDIRUSTAT_ADD_MASK                0xFFFF
-#define IXGBE_FDIRUSTAT_ADD_SHIFT               0
-#define IXGBE_FDIRUSTAT_REMOVE_MASK             0xFFFF0000
-#define IXGBE_FDIRUSTAT_REMOVE_SHIFT            16
-#define IXGBE_FDIRFSTAT_FADD_MASK               0x00FF
-#define IXGBE_FDIRFSTAT_FADD_SHIFT              0
-#define IXGBE_FDIRFSTAT_FREMOVE_MASK            0xFF00
-#define IXGBE_FDIRFSTAT_FREMOVE_SHIFT           8
-#define IXGBE_FDIRPORT_DESTINATION_SHIFT        16
-#define IXGBE_FDIRVLAN_FLEX_SHIFT               16
-#define IXGBE_FDIRHASH_BUCKET_VALID_SHIFT       15
-#define IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT       16
-
-#define IXGBE_FDIRCMD_CMD_MASK                  0x00000003
-#define IXGBE_FDIRCMD_CMD_ADD_FLOW              0x00000001
-#define IXGBE_FDIRCMD_CMD_REMOVE_FLOW           0x00000002
-#define IXGBE_FDIRCMD_CMD_QUERY_REM_FILT        0x00000003
-#define IXGBE_FDIRCMD_FILTER_VALID              0x00000004
-#define IXGBE_FDIRCMD_FILTER_UPDATE             0x00000008
-#define IXGBE_FDIRCMD_IPv6DMATCH                0x00000010
-#define IXGBE_FDIRCMD_L4TYPE_UDP                0x00000020
-#define IXGBE_FDIRCMD_L4TYPE_TCP                0x00000040
-#define IXGBE_FDIRCMD_L4TYPE_SCTP               0x00000060
-#define IXGBE_FDIRCMD_IPV6                      0x00000080
-#define IXGBE_FDIRCMD_CLEARHT                   0x00000100
-#define IXGBE_FDIRCMD_DROP                      0x00000200
-#define IXGBE_FDIRCMD_INT                       0x00000400
-#define IXGBE_FDIRCMD_LAST                      0x00000800
-#define IXGBE_FDIRCMD_COLLISION                 0x00001000
-#define IXGBE_FDIRCMD_QUEUE_EN                  0x00008000
-#define IXGBE_FDIRCMD_FLOW_TYPE_SHIFT           5
-#define IXGBE_FDIRCMD_RX_QUEUE_SHIFT            16
-#define IXGBE_FDIRCMD_VT_POOL_SHIFT             24
-#define IXGBE_FDIR_INIT_DONE_POLL               10
-#define IXGBE_FDIRCMD_CMD_POLL                  10
-
-#define IXGBE_FDIR_DROP_QUEUE                   127
-
-/* Manageablility Host Interface defines */
-#define IXGBE_HI_MAX_BLOCK_BYTE_LENGTH       1792 /* Num of bytes in range */
-#define IXGBE_HI_MAX_BLOCK_DWORD_LENGTH      448 /* Num of dwords in range */
-#define IXGBE_HI_COMMAND_TIMEOUT             500 /* Process HI command limit */
-
-/* CEM Support */
-#define FW_CEM_HDR_LEN                0x4
-#define FW_CEM_CMD_DRIVER_INFO        0xDD
-#define FW_CEM_CMD_DRIVER_INFO_LEN    0x5
-#define FW_CEM_CMD_RESERVED           0x0
-#define FW_CEM_UNUSED_VER             0x0
-#define FW_CEM_MAX_RETRIES            3
-#define FW_CEM_RESP_STATUS_SUCCESS    0x1
-
-/* Host Interface Command Structures */
-struct ixgbe_hic_hdr {
-       u8 cmd;
-       u8 buf_len;
-       union {
-               u8 cmd_resv;
-               u8 ret_status;
-       } cmd_or_resp;
-       u8 checksum;
-};
-
-struct ixgbe_hic_drv_info {
-       struct ixgbe_hic_hdr hdr;
-       u8 port_num;
-       u8 ver_sub;
-       u8 ver_build;
-       u8 ver_min;
-       u8 ver_maj;
-       u8 pad; /* end spacing to ensure length is mult. of dword */
-       u16 pad2; /* end spacing to ensure length is mult. of dword2 */
-};
-
-/* Transmit Descriptor - Advanced */
-union ixgbe_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;
-};
-
-/* Receive Descriptor - Advanced */
-union ixgbe_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, Pkt type */
-                                       __le16 hdr_info; /* Splithdr, hdrlen */
-                               } 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 */
-};
-
-/* Context descriptors */
-struct ixgbe_adv_tx_context_desc {
-       __le32 vlan_macip_lens;
-       __le32 seqnum_seed;
-       __le32 type_tucmd_mlhl;
-       __le32 mss_l4len_idx;
-};
-
-/* Adv Transmit Descriptor Config Masks */
-#define IXGBE_ADVTXD_DTALEN_MASK      0x0000FFFF /* Data buf length(bytes) */
-#define IXGBE_ADVTXD_MAC_LINKSEC      0x00040000 /* Insert LinkSec */
-#define IXGBE_ADVTXD_IPSEC_SA_INDEX_MASK   0x000003FF /* IPSec SA index */
-#define IXGBE_ADVTXD_IPSEC_ESP_LEN_MASK    0x000001FF /* IPSec ESP length */
-#define IXGBE_ADVTXD_DTYP_MASK  0x00F00000 /* DTYP mask */
-#define IXGBE_ADVTXD_DTYP_CTXT  0x00200000 /* Advanced Context Desc */
-#define IXGBE_ADVTXD_DTYP_DATA  0x00300000 /* Advanced Data Descriptor */
-#define IXGBE_ADVTXD_DCMD_EOP   IXGBE_TXD_CMD_EOP  /* End of Packet */
-#define IXGBE_ADVTXD_DCMD_IFCS  IXGBE_TXD_CMD_IFCS /* Insert FCS */
-#define IXGBE_ADVTXD_DCMD_RS    IXGBE_TXD_CMD_RS   /* Report Status */
-#define IXGBE_ADVTXD_DCMD_DDTYP_ISCSI 0x10000000    /* DDP hdr type or iSCSI */
-#define IXGBE_ADVTXD_DCMD_DEXT  IXGBE_TXD_CMD_DEXT /* Desc ext (1=Adv) */
-#define IXGBE_ADVTXD_DCMD_VLE   IXGBE_TXD_CMD_VLE  /* VLAN pkt enable */
-#define IXGBE_ADVTXD_DCMD_TSE   0x80000000 /* TCP Seg enable */
-#define IXGBE_ADVTXD_STAT_DD    IXGBE_TXD_STAT_DD  /* Descriptor Done */
-#define IXGBE_ADVTXD_STAT_SN_CRC      0x00000002 /* NXTSEQ/SEED pres in WB */
-#define IXGBE_ADVTXD_STAT_RSV   0x0000000C /* STA Reserved */
-#define IXGBE_ADVTXD_IDX_SHIFT  4 /* Adv desc Index shift */
-#define IXGBE_ADVTXD_CC         0x00000080 /* Check Context */
-#define IXGBE_ADVTXD_POPTS_SHIFT      8  /* Adv desc POPTS shift */
-#define IXGBE_ADVTXD_POPTS_IXSM (IXGBE_TXD_POPTS_IXSM << \
-                                 IXGBE_ADVTXD_POPTS_SHIFT)
-#define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM << \
-                                 IXGBE_ADVTXD_POPTS_SHIFT)
-#define IXGBE_ADVTXD_POPTS_ISCO_1ST  0x00000000 /* 1st TSO of iSCSI PDU */
-#define IXGBE_ADVTXD_POPTS_ISCO_MDL  0x00000800 /* Middle TSO of iSCSI PDU */
-#define IXGBE_ADVTXD_POPTS_ISCO_LAST 0x00001000 /* Last TSO of iSCSI PDU */
-#define IXGBE_ADVTXD_POPTS_ISCO_FULL 0x00001800 /* 1st&Last TSO-full iSCSI PDU */
-#define IXGBE_ADVTXD_POPTS_RSV       0x00002000 /* POPTS Reserved */
-#define IXGBE_ADVTXD_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
-#define IXGBE_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
-#define IXGBE_ADVTXD_VLAN_SHIFT      16  /* Adv ctxt vlan tag shift */
-#define IXGBE_ADVTXD_TUCMD_IPV4      0x00000400  /* IP Packet Type: 1=IPv4 */
-#define IXGBE_ADVTXD_TUCMD_IPV6      0x00000000  /* IP Packet Type: 0=IPv6 */
-#define IXGBE_ADVTXD_TUCMD_L4T_UDP   0x00000000  /* L4 Packet TYPE of UDP */
-#define IXGBE_ADVTXD_TUCMD_L4T_TCP   0x00000800  /* L4 Packet TYPE of TCP */
-#define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */
-#define IXGBE_ADVTXD_TUCMD_MKRREQ    0x00002000 /*Req requires Markers and CRC*/
-#define IXGBE_ADVTXD_POPTS_IPSEC      0x00000400 /* IPSec offload request */
-#define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000 /* IPSec Type ESP */
-#define IXGBE_ADVTXD_TUCMD_IPSEC_ENCRYPT_EN 0x00004000/* ESP Encrypt Enable */
-#define IXGBE_ADVTXT_TUCMD_FCOE      0x00008000       /* FCoE Frame Type */
-#define IXGBE_ADVTXD_FCOEF_EOF_MASK  (0x3 << 10)      /* FC EOF index */
-#define IXGBE_ADVTXD_FCOEF_SOF       ((1 << 2) << 10) /* FC SOF index */
-#define IXGBE_ADVTXD_FCOEF_PARINC    ((1 << 3) << 10) /* Rel_Off in F_CTL */
-#define IXGBE_ADVTXD_FCOEF_ORIE      ((1 << 4) << 10) /* Orientation: End */
-#define IXGBE_ADVTXD_FCOEF_ORIS      ((1 << 5) << 10) /* Orientation: Start */
-#define IXGBE_ADVTXD_FCOEF_EOF_N     (0x0 << 10)      /* 00: EOFn */
-#define IXGBE_ADVTXD_FCOEF_EOF_T     (0x1 << 10)      /* 01: EOFt */
-#define IXGBE_ADVTXD_FCOEF_EOF_NI    (0x2 << 10)      /* 10: EOFni */
-#define IXGBE_ADVTXD_FCOEF_EOF_A     (0x3 << 10)      /* 11: EOFa */
-#define IXGBE_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
-#define IXGBE_ADVTXD_MSS_SHIFT       16  /* Adv ctxt MSS shift */
-
-/* Autonegotiation advertised speeds */
-typedef u32 ixgbe_autoneg_advertised;
-/* Link speed */
-typedef u32 ixgbe_link_speed;
-#define IXGBE_LINK_SPEED_UNKNOWN   0
-#define IXGBE_LINK_SPEED_100_FULL  0x0008
-#define IXGBE_LINK_SPEED_1GB_FULL  0x0020
-#define IXGBE_LINK_SPEED_10GB_FULL 0x0080
-#define IXGBE_LINK_SPEED_82598_AUTONEG (IXGBE_LINK_SPEED_1GB_FULL | \
-                                        IXGBE_LINK_SPEED_10GB_FULL)
-#define IXGBE_LINK_SPEED_82599_AUTONEG (IXGBE_LINK_SPEED_100_FULL | \
-                                        IXGBE_LINK_SPEED_1GB_FULL | \
-                                        IXGBE_LINK_SPEED_10GB_FULL)
-
-
-/* Physical layer type */
-typedef u32 ixgbe_physical_layer;
-#define IXGBE_PHYSICAL_LAYER_UNKNOWN      0
-#define IXGBE_PHYSICAL_LAYER_10GBASE_T    0x0001
-#define IXGBE_PHYSICAL_LAYER_1000BASE_T   0x0002
-#define IXGBE_PHYSICAL_LAYER_100BASE_TX   0x0004
-#define IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU  0x0008
-#define IXGBE_PHYSICAL_LAYER_10GBASE_LR   0x0010
-#define IXGBE_PHYSICAL_LAYER_10GBASE_LRM  0x0020
-#define IXGBE_PHYSICAL_LAYER_10GBASE_SR   0x0040
-#define IXGBE_PHYSICAL_LAYER_10GBASE_KX4  0x0080
-#define IXGBE_PHYSICAL_LAYER_10GBASE_CX4  0x0100
-#define IXGBE_PHYSICAL_LAYER_1000BASE_KX  0x0200
-#define IXGBE_PHYSICAL_LAYER_1000BASE_BX  0x0400
-#define IXGBE_PHYSICAL_LAYER_10GBASE_KR   0x0800
-#define IXGBE_PHYSICAL_LAYER_10GBASE_XAUI 0x1000
-#define IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA 0x2000
-
-/* Flow Control Macros */
-#define PAUSE_RTT      8
-#define PAUSE_MTU(MTU) ((MTU + 1024 - 1) / 1024)
-
-#define FC_HIGH_WATER(MTU) ((((PAUSE_RTT + PAUSE_MTU(MTU)) * 144) + 99) / 100 +\
-                               PAUSE_MTU(MTU))
-#define FC_LOW_WATER(MTU)  (2 * (2 * PAUSE_MTU(MTU) + PAUSE_RTT))
-
-/* Software ATR hash keys */
-#define IXGBE_ATR_BUCKET_HASH_KEY    0x3DAD14E2
-#define IXGBE_ATR_SIGNATURE_HASH_KEY 0x174D3614
-
-/* Software ATR input stream values and masks */
-#define IXGBE_ATR_HASH_MASK     0x7fff
-#define IXGBE_ATR_L4TYPE_MASK      0x3
-#define IXGBE_ATR_L4TYPE_UDP       0x1
-#define IXGBE_ATR_L4TYPE_TCP       0x2
-#define IXGBE_ATR_L4TYPE_SCTP      0x3
-#define IXGBE_ATR_L4TYPE_IPV6_MASK 0x4
-enum ixgbe_atr_flow_type {
-       IXGBE_ATR_FLOW_TYPE_IPV4   = 0x0,
-       IXGBE_ATR_FLOW_TYPE_UDPV4  = 0x1,
-       IXGBE_ATR_FLOW_TYPE_TCPV4  = 0x2,
-       IXGBE_ATR_FLOW_TYPE_SCTPV4 = 0x3,
-       IXGBE_ATR_FLOW_TYPE_IPV6   = 0x4,
-       IXGBE_ATR_FLOW_TYPE_UDPV6  = 0x5,
-       IXGBE_ATR_FLOW_TYPE_TCPV6  = 0x6,
-       IXGBE_ATR_FLOW_TYPE_SCTPV6 = 0x7,
-};
-
-/* Flow Director ATR input struct. */
-union ixgbe_atr_input {
-       /*
-        * Byte layout in order, all values with MSB first:
-        *
-        * vm_pool    - 1 byte
-        * flow_type  - 1 byte
-        * vlan_id    - 2 bytes
-        * src_ip     - 16 bytes
-        * dst_ip     - 16 bytes
-        * src_port   - 2 bytes
-        * dst_port   - 2 bytes
-        * flex_bytes - 2 bytes
-        * bkt_hash   - 2 bytes
-        */
-       struct {
-               u8     vm_pool;
-               u8     flow_type;
-               __be16 vlan_id;
-               __be32 dst_ip[4];
-               __be32 src_ip[4];
-               __be16 src_port;
-               __be16 dst_port;
-               __be16 flex_bytes;
-               __be16 bkt_hash;
-       } formatted;
-       __be32 dword_stream[11];
-};
-
-/* Flow Director compressed ATR hash input struct */
-union ixgbe_atr_hash_dword {
-       struct {
-               u8 vm_pool;
-               u8 flow_type;
-               __be16 vlan_id;
-       } formatted;
-       __be32 ip;
-       struct {
-               __be16 src;
-               __be16 dst;
-       } port;
-       __be16 flex_bytes;
-       __be32 dword;
-};
-
-enum ixgbe_eeprom_type {
-       ixgbe_eeprom_uninitialized = 0,
-       ixgbe_eeprom_spi,
-       ixgbe_flash,
-       ixgbe_eeprom_none /* No NVM support */
-};
-
-enum ixgbe_mac_type {
-       ixgbe_mac_unknown = 0,
-       ixgbe_mac_82598EB,
-       ixgbe_mac_82599EB,
-       ixgbe_mac_X540,
-       ixgbe_num_macs
-};
-
-enum ixgbe_phy_type {
-       ixgbe_phy_unknown = 0,
-       ixgbe_phy_none,
-       ixgbe_phy_tn,
-       ixgbe_phy_aq,
-       ixgbe_phy_cu_unknown,
-       ixgbe_phy_qt,
-       ixgbe_phy_xaui,
-       ixgbe_phy_nl,
-       ixgbe_phy_sfp_passive_tyco,
-       ixgbe_phy_sfp_passive_unknown,
-       ixgbe_phy_sfp_active_unknown,
-       ixgbe_phy_sfp_avago,
-       ixgbe_phy_sfp_ftl,
-       ixgbe_phy_sfp_ftl_active,
-       ixgbe_phy_sfp_unknown,
-       ixgbe_phy_sfp_intel,
-       ixgbe_phy_sfp_unsupported,
-       ixgbe_phy_generic
-};
-
-/*
- * SFP+ module type IDs:
- *
- * ID   Module Type
- * =============
- * 0    SFP_DA_CU
- * 1    SFP_SR
- * 2    SFP_LR
- * 3    SFP_DA_CU_CORE0 - 82599-specific
- * 4    SFP_DA_CU_CORE1 - 82599-specific
- * 5    SFP_SR/LR_CORE0 - 82599-specific
- * 6    SFP_SR/LR_CORE1 - 82599-specific
- */
-enum ixgbe_sfp_type {
-       ixgbe_sfp_type_da_cu = 0,
-       ixgbe_sfp_type_sr = 1,
-       ixgbe_sfp_type_lr = 2,
-       ixgbe_sfp_type_da_cu_core0 = 3,
-       ixgbe_sfp_type_da_cu_core1 = 4,
-       ixgbe_sfp_type_srlr_core0 = 5,
-       ixgbe_sfp_type_srlr_core1 = 6,
-       ixgbe_sfp_type_da_act_lmt_core0 = 7,
-       ixgbe_sfp_type_da_act_lmt_core1 = 8,
-       ixgbe_sfp_type_1g_cu_core0 = 9,
-       ixgbe_sfp_type_1g_cu_core1 = 10,
-       ixgbe_sfp_type_not_present = 0xFFFE,
-       ixgbe_sfp_type_unknown = 0xFFFF
-};
-
-enum ixgbe_media_type {
-       ixgbe_media_type_unknown = 0,
-       ixgbe_media_type_fiber,
-       ixgbe_media_type_fiber_lco,
-       ixgbe_media_type_copper,
-       ixgbe_media_type_backplane,
-       ixgbe_media_type_cx4,
-       ixgbe_media_type_virtual
-};
-
-/* Flow Control Settings */
-enum ixgbe_fc_mode {
-       ixgbe_fc_none = 0,
-       ixgbe_fc_rx_pause,
-       ixgbe_fc_tx_pause,
-       ixgbe_fc_full,
-#ifdef CONFIG_DCB
-       ixgbe_fc_pfc,
-#endif
-       ixgbe_fc_default
-};
-
-/* Smart Speed Settings */
-#define IXGBE_SMARTSPEED_MAX_RETRIES   3
-enum ixgbe_smart_speed {
-       ixgbe_smart_speed_auto = 0,
-       ixgbe_smart_speed_on,
-       ixgbe_smart_speed_off
-};
-
-/* PCI bus types */
-enum ixgbe_bus_type {
-       ixgbe_bus_type_unknown = 0,
-       ixgbe_bus_type_pci,
-       ixgbe_bus_type_pcix,
-       ixgbe_bus_type_pci_express,
-       ixgbe_bus_type_reserved
-};
-
-/* PCI bus speeds */
-enum ixgbe_bus_speed {
-       ixgbe_bus_speed_unknown = 0,
-       ixgbe_bus_speed_33      = 33,
-       ixgbe_bus_speed_66      = 66,
-       ixgbe_bus_speed_100     = 100,
-       ixgbe_bus_speed_120     = 120,
-       ixgbe_bus_speed_133     = 133,
-       ixgbe_bus_speed_2500    = 2500,
-       ixgbe_bus_speed_5000    = 5000,
-       ixgbe_bus_speed_reserved
-};
-
-/* PCI bus widths */
-enum ixgbe_bus_width {
-       ixgbe_bus_width_unknown = 0,
-       ixgbe_bus_width_pcie_x1 = 1,
-       ixgbe_bus_width_pcie_x2 = 2,
-       ixgbe_bus_width_pcie_x4 = 4,
-       ixgbe_bus_width_pcie_x8 = 8,
-       ixgbe_bus_width_32      = 32,
-       ixgbe_bus_width_64      = 64,
-       ixgbe_bus_width_reserved
-};
-
-struct ixgbe_addr_filter_info {
-       u32 num_mc_addrs;
-       u32 rar_used_count;
-       u32 mta_in_use;
-       u32 overflow_promisc;
-       bool uc_set_promisc;
-       bool user_set_promisc;
-};
-
-/* Bus parameters */
-struct ixgbe_bus_info {
-       enum ixgbe_bus_speed speed;
-       enum ixgbe_bus_width width;
-       enum ixgbe_bus_type type;
-
-       u16 func;
-       u16 lan_id;
-};
-
-/* Flow control parameters */
-struct ixgbe_fc_info {
-       u32 high_water; /* Flow Control High-water */
-       u32 low_water; /* Flow Control Low-water */
-       u16 pause_time; /* Flow Control Pause timer */
-       bool send_xon; /* Flow control send XON */
-       bool strict_ieee; /* Strict IEEE mode */
-       bool disable_fc_autoneg; /* Do not autonegotiate FC */
-       bool fc_was_autonegged; /* Is current_mode the result of autonegging? */
-       enum ixgbe_fc_mode current_mode; /* FC mode in effect */
-       enum ixgbe_fc_mode requested_mode; /* FC mode requested by caller */
-};
-
-/* Statistics counters collected by the MAC */
-struct ixgbe_hw_stats {
-       u64 crcerrs;
-       u64 illerrc;
-       u64 errbc;
-       u64 mspdc;
-       u64 mpctotal;
-       u64 mpc[8];
-       u64 mlfc;
-       u64 mrfc;
-       u64 rlec;
-       u64 lxontxc;
-       u64 lxonrxc;
-       u64 lxofftxc;
-       u64 lxoffrxc;
-       u64 pxontxc[8];
-       u64 pxonrxc[8];
-       u64 pxofftxc[8];
-       u64 pxoffrxc[8];
-       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[8];
-       u64 ruc;
-       u64 rfc;
-       u64 roc;
-       u64 rjc;
-       u64 mngprc;
-       u64 mngpdc;
-       u64 mngptc;
-       u64 tor;
-       u64 tpr;
-       u64 tpt;
-       u64 ptc64;
-       u64 ptc127;
-       u64 ptc255;
-       u64 ptc511;
-       u64 ptc1023;
-       u64 ptc1522;
-       u64 mptc;
-       u64 bptc;
-       u64 xec;
-       u64 rqsmr[16];
-       u64 tqsmr[8];
-       u64 qprc[16];
-       u64 qptc[16];
-       u64 qbrc[16];
-       u64 qbtc[16];
-       u64 qprdc[16];
-       u64 pxon2offc[8];
-       u64 fdirustat_add;
-       u64 fdirustat_remove;
-       u64 fdirfstat_fadd;
-       u64 fdirfstat_fremove;
-       u64 fdirmatch;
-       u64 fdirmiss;
-       u64 fccrc;
-       u64 fcoerpdc;
-       u64 fcoeprc;
-       u64 fcoeptc;
-       u64 fcoedwrc;
-       u64 fcoedwtc;
-       u64 b2ospc;
-       u64 b2ogprc;
-       u64 o2bgptc;
-       u64 o2bspc;
-};
-
-/* forward declaration */
-struct ixgbe_hw;
-
-/* iterator type for walking multicast address lists */
-typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr,
-                                  u32 *vmdq);
-
-/* Function pointer table */
-struct ixgbe_eeprom_operations {
-       s32 (*init_params)(struct ixgbe_hw *);
-       s32 (*read)(struct ixgbe_hw *, u16, u16 *);
-       s32 (*read_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
-       s32 (*write)(struct ixgbe_hw *, u16, u16);
-       s32 (*write_buffer)(struct ixgbe_hw *, u16, u16, u16 *);
-       s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
-       s32 (*update_checksum)(struct ixgbe_hw *);
-       u16 (*calc_checksum)(struct ixgbe_hw *);
-};
-
-struct ixgbe_mac_operations {
-       s32 (*init_hw)(struct ixgbe_hw *);
-       s32 (*reset_hw)(struct ixgbe_hw *);
-       s32 (*start_hw)(struct ixgbe_hw *);
-       s32 (*clear_hw_cntrs)(struct ixgbe_hw *);
-       enum ixgbe_media_type (*get_media_type)(struct ixgbe_hw *);
-       u32 (*get_supported_physical_layer)(struct ixgbe_hw *);
-       s32 (*get_mac_addr)(struct ixgbe_hw *, u8 *);
-       s32 (*get_san_mac_addr)(struct ixgbe_hw *, u8 *);
-       s32 (*get_device_caps)(struct ixgbe_hw *, u16 *);
-       s32 (*get_wwn_prefix)(struct ixgbe_hw *, u16 *, u16 *);
-       s32 (*stop_adapter)(struct ixgbe_hw *);
-       s32 (*get_bus_info)(struct ixgbe_hw *);
-       void (*set_lan_id)(struct ixgbe_hw *);
-       s32 (*read_analog_reg8)(struct ixgbe_hw*, u32, u8*);
-       s32 (*write_analog_reg8)(struct ixgbe_hw*, u32, u8);
-       s32 (*setup_sfp)(struct ixgbe_hw *);
-       s32 (*enable_rx_dma)(struct ixgbe_hw *, u32);
-       s32 (*acquire_swfw_sync)(struct ixgbe_hw *, u16);
-       void (*release_swfw_sync)(struct ixgbe_hw *, u16);
-
-       /* Link */
-       void (*disable_tx_laser)(struct ixgbe_hw *);
-       void (*enable_tx_laser)(struct ixgbe_hw *);
-       void (*flap_tx_laser)(struct ixgbe_hw *);
-       s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool, bool);
-       s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool);
-       s32 (*get_link_capabilities)(struct ixgbe_hw *, ixgbe_link_speed *,
-                                    bool *);
-
-       /* Packet Buffer Manipulation */
-       void (*set_rxpba)(struct ixgbe_hw *, int, u32, int);
-
-       /* LED */
-       s32 (*led_on)(struct ixgbe_hw *, u32);
-       s32 (*led_off)(struct ixgbe_hw *, u32);
-       s32 (*blink_led_start)(struct ixgbe_hw *, u32);
-       s32 (*blink_led_stop)(struct ixgbe_hw *, u32);
-
-       /* RAR, Multicast, VLAN */
-       s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32, u32);
-       s32 (*clear_rar)(struct ixgbe_hw *, u32);
-       s32 (*set_vmdq)(struct ixgbe_hw *, u32, u32);
-       s32 (*clear_vmdq)(struct ixgbe_hw *, u32, u32);
-       s32 (*init_rx_addrs)(struct ixgbe_hw *);
-       s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
-       s32 (*enable_mc)(struct ixgbe_hw *);
-       s32 (*disable_mc)(struct ixgbe_hw *);
-       s32 (*clear_vfta)(struct ixgbe_hw *);
-       s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
-       s32 (*init_uta_tables)(struct ixgbe_hw *);
-       void (*set_mac_anti_spoofing)(struct ixgbe_hw *, bool, int);
-       void (*set_vlan_anti_spoofing)(struct ixgbe_hw *, bool, int);
-
-       /* Flow Control */
-       s32 (*fc_enable)(struct ixgbe_hw *, s32);
-
-       /* Manageability interface */
-       s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
-};
-
-struct ixgbe_phy_operations {
-       s32 (*identify)(struct ixgbe_hw *);
-       s32 (*identify_sfp)(struct ixgbe_hw *);
-       s32 (*init)(struct ixgbe_hw *);
-       s32 (*reset)(struct ixgbe_hw *);
-       s32 (*read_reg)(struct ixgbe_hw *, u32, u32, u16 *);
-       s32 (*write_reg)(struct ixgbe_hw *, u32, u32, u16);
-       s32 (*setup_link)(struct ixgbe_hw *);
-       s32 (*setup_link_speed)(struct ixgbe_hw *, ixgbe_link_speed, bool,
-                               bool);
-       s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *);
-       s32 (*get_firmware_version)(struct ixgbe_hw *, u16 *);
-       s32 (*read_i2c_byte)(struct ixgbe_hw *, u8, u8, u8 *);
-       s32 (*write_i2c_byte)(struct ixgbe_hw *, u8, u8, u8);
-       s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *);
-       s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
-       s32 (*check_overtemp)(struct ixgbe_hw *);
-};
-
-struct ixgbe_eeprom_info {
-       struct ixgbe_eeprom_operations  ops;
-       enum ixgbe_eeprom_type          type;
-       u32                             semaphore_delay;
-       u16                             word_size;
-       u16                             address_bits;
-       u16                             word_page_size;
-};
-
-#define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED      0x01
-struct ixgbe_mac_info {
-       struct ixgbe_mac_operations     ops;
-       enum ixgbe_mac_type             type;
-       u8                              addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
-       u8                              perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
-       u8                              san_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
-       /* prefix for World Wide Node Name (WWNN) */
-       u16                             wwnn_prefix;
-       /* prefix for World Wide Port Name (WWPN) */
-       u16                             wwpn_prefix;
-#define IXGBE_MAX_MTA                  128
-       u32                             mta_shadow[IXGBE_MAX_MTA];
-       s32                             mc_filter_type;
-       u32                             mcft_size;
-       u32                             vft_size;
-       u32                             num_rar_entries;
-       u32                             rar_highwater;
-       u32                             rx_pb_size;
-       u32                             max_tx_queues;
-       u32                             max_rx_queues;
-       u32                             max_msix_vectors;
-       u32                             orig_autoc;
-       u32                             orig_autoc2;
-       bool                            orig_link_settings_stored;
-       bool                            autotry_restart;
-       u8                              flags;
-};
-
-struct ixgbe_phy_info {
-       struct ixgbe_phy_operations     ops;
-       struct mdio_if_info             mdio;
-       enum ixgbe_phy_type             type;
-       u32                             id;
-       enum ixgbe_sfp_type             sfp_type;
-       bool                            sfp_setup_needed;
-       u32                             revision;
-       enum ixgbe_media_type           media_type;
-       bool                            reset_disable;
-       ixgbe_autoneg_advertised        autoneg_advertised;
-       enum ixgbe_smart_speed          smart_speed;
-       bool                            smart_speed_active;
-       bool                            multispeed_fiber;
-       bool                            reset_if_overtemp;
-};
-
-#include "ixgbe_mbx.h"
-
-struct ixgbe_mbx_operations {
-       s32 (*init_params)(struct ixgbe_hw *hw);
-       s32 (*read)(struct ixgbe_hw *, u32 *, u16,  u16);
-       s32 (*write)(struct ixgbe_hw *, u32 *, u16, u16);
-       s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16,  u16);
-       s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16, u16);
-       s32 (*check_for_msg)(struct ixgbe_hw *, u16);
-       s32 (*check_for_ack)(struct ixgbe_hw *, u16);
-       s32 (*check_for_rst)(struct ixgbe_hw *, u16);
-};
-
-struct ixgbe_mbx_stats {
-       u32 msgs_tx;
-       u32 msgs_rx;
-
-       u32 acks;
-       u32 reqs;
-       u32 rsts;
-};
-
-struct ixgbe_mbx_info {
-       struct ixgbe_mbx_operations ops;
-       struct ixgbe_mbx_stats stats;
-       u32 timeout;
-       u32 usec_delay;
-       u32 v2p_mailbox;
-       u16 size;
-};
-
-struct ixgbe_hw {
-       u8 __iomem                      *hw_addr;
-       void                            *back;
-       struct ixgbe_mac_info           mac;
-       struct ixgbe_addr_filter_info   addr_ctrl;
-       struct ixgbe_fc_info            fc;
-       struct ixgbe_phy_info           phy;
-       struct ixgbe_eeprom_info        eeprom;
-       struct ixgbe_bus_info           bus;
-       struct ixgbe_mbx_info           mbx;
-       u16                             device_id;
-       u16                             vendor_id;
-       u16                             subsystem_device_id;
-       u16                             subsystem_vendor_id;
-       u8                              revision_id;
-       bool                            adapter_stopped;
-       bool                            force_full_reset;
-};
-
-struct ixgbe_info {
-       enum ixgbe_mac_type             mac;
-       s32                             (*get_invariants)(struct ixgbe_hw *);
-       struct ixgbe_mac_operations     *mac_ops;
-       struct ixgbe_eeprom_operations  *eeprom_ops;
-       struct ixgbe_phy_operations     *phy_ops;
-       struct ixgbe_mbx_operations     *mbx_ops;
-};
-
-
-/* Error Codes */
-#define IXGBE_ERR_EEPROM                        -1
-#define IXGBE_ERR_EEPROM_CHECKSUM               -2
-#define IXGBE_ERR_PHY                           -3
-#define IXGBE_ERR_CONFIG                        -4
-#define IXGBE_ERR_PARAM                         -5
-#define IXGBE_ERR_MAC_TYPE                      -6
-#define IXGBE_ERR_UNKNOWN_PHY                   -7
-#define IXGBE_ERR_LINK_SETUP                    -8
-#define IXGBE_ERR_ADAPTER_STOPPED               -9
-#define IXGBE_ERR_INVALID_MAC_ADDR              -10
-#define IXGBE_ERR_DEVICE_NOT_SUPPORTED          -11
-#define IXGBE_ERR_MASTER_REQUESTS_PENDING       -12
-#define IXGBE_ERR_INVALID_LINK_SETTINGS         -13
-#define IXGBE_ERR_AUTONEG_NOT_COMPLETE          -14
-#define IXGBE_ERR_RESET_FAILED                  -15
-#define IXGBE_ERR_SWFW_SYNC                     -16
-#define IXGBE_ERR_PHY_ADDR_INVALID              -17
-#define IXGBE_ERR_I2C                           -18
-#define IXGBE_ERR_SFP_NOT_SUPPORTED             -19
-#define IXGBE_ERR_SFP_NOT_PRESENT               -20
-#define IXGBE_ERR_SFP_NO_INIT_SEQ_PRESENT       -21
-#define IXGBE_ERR_NO_SAN_ADDR_PTR               -22
-#define IXGBE_ERR_FDIR_REINIT_FAILED            -23
-#define IXGBE_ERR_EEPROM_VERSION                -24
-#define IXGBE_ERR_NO_SPACE                      -25
-#define IXGBE_ERR_OVERTEMP                      -26
-#define IXGBE_ERR_FC_NOT_NEGOTIATED             -27
-#define IXGBE_ERR_FC_NOT_SUPPORTED              -28
-#define IXGBE_ERR_FLOW_CONTROL                  -29
-#define IXGBE_ERR_SFP_SETUP_NOT_COMPLETE        -30
-#define IXGBE_ERR_PBA_SECTION                   -31
-#define IXGBE_ERR_INVALID_ARGUMENT              -32
-#define IXGBE_ERR_HOST_INTERFACE_COMMAND        -33
-#define IXGBE_NOT_IMPLEMENTED                   0x7FFFFFFF
-
-#endif /* _IXGBE_TYPE_H_ */
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/ixgbe_x540.c
deleted file mode 100644 (file)
index 2696c78..0000000
+++ /dev/null
@@ -1,941 +0,0 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 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
-
-*******************************************************************************/
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-
-#include "ixgbe.h"
-#include "ixgbe_phy.h"
-
-#define IXGBE_X540_MAX_TX_QUEUES 128
-#define IXGBE_X540_MAX_RX_QUEUES 128
-#define IXGBE_X540_RAR_ENTRIES   128
-#define IXGBE_X540_MC_TBL_SIZE   128
-#define IXGBE_X540_VFT_TBL_SIZE  128
-#define IXGBE_X540_RX_PB_SIZE   384
-
-static s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw);
-static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw);
-static s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
-static void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask);
-static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw);
-static void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw);
-
-static enum ixgbe_media_type ixgbe_get_media_type_X540(struct ixgbe_hw *hw)
-{
-       return ixgbe_media_type_copper;
-}
-
-static s32 ixgbe_get_invariants_X540(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mac_info *mac = &hw->mac;
-
-       /* Call PHY identify routine to get the phy type */
-       ixgbe_identify_phy_generic(hw);
-
-       mac->mcft_size = IXGBE_X540_MC_TBL_SIZE;
-       mac->vft_size = IXGBE_X540_VFT_TBL_SIZE;
-       mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES;
-       mac->max_rx_queues = IXGBE_X540_MAX_RX_QUEUES;
-       mac->max_tx_queues = IXGBE_X540_MAX_TX_QUEUES;
-       mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
-
-       return 0;
-}
-
-/**
- *  ixgbe_setup_mac_link_X540 - Set the auto advertised capabilitires
- *  @hw: pointer to hardware structure
- *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
- *  @autoneg_wait_to_complete: true when waiting for completion is needed
- **/
-static s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw,
-                                     ixgbe_link_speed speed, bool autoneg,
-                                     bool autoneg_wait_to_complete)
-{
-       return hw->phy.ops.setup_link_speed(hw, speed, autoneg,
-                                           autoneg_wait_to_complete);
-}
-
-/**
- *  ixgbe_reset_hw_X540 - Perform hardware reset
- *  @hw: pointer to hardware structure
- *
- *  Resets the hardware by resetting the transmit and receive units, masks
- *  and clears all interrupts, perform a PHY reset, and perform a link (MAC)
- *  reset.
- **/
-static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
-{
-       ixgbe_link_speed link_speed;
-       s32 status = 0;
-       u32 ctrl;
-       u32 ctrl_ext;
-       u32 reset_bit;
-       u32 i;
-       u32 autoc;
-       u32 autoc2;
-       bool link_up = false;
-
-       /* Call adapter stop to disable tx/rx and clear interrupts */
-       hw->mac.ops.stop_adapter(hw);
-
-       /*
-        * Prevent the PCI-E bus from from hanging by disabling PCI-E master
-        * access and verify no pending requests before reset
-        */
-       ixgbe_disable_pcie_master(hw);
-
-mac_reset_top:
-       /*
-        * Issue global reset to the MAC.  Needs to be SW reset if link is up.
-        * If link reset is used when link is up, it might reset the PHY when
-        * mng is using it.  If link is down or the flag to force full link
-        * reset is set, then perform link reset.
-        */
-       if (hw->force_full_reset) {
-               reset_bit = IXGBE_CTRL_LNK_RST;
-       } else {
-               hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
-               if (!link_up)
-                       reset_bit = IXGBE_CTRL_LNK_RST;
-               else
-                       reset_bit = IXGBE_CTRL_RST;
-       }
-
-       ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-       IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | reset_bit));
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Poll for reset bit to self-clear indicating reset is complete */
-       for (i = 0; i < 10; i++) {
-               udelay(1);
-               ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-               if (!(ctrl & reset_bit))
-                       break;
-       }
-       if (ctrl & reset_bit) {
-               status = IXGBE_ERR_RESET_FAILED;
-               hw_dbg(hw, "Reset polling failed to complete.\n");
-       }
-
-       /*
-        * Double resets are required for recovery from certain error
-        * conditions.  Between resets, it is necessary to stall to allow time
-        * for any pending HW events to complete.  We use 1usec since that is
-        * what is needed for ixgbe_disable_pcie_master().  The second reset
-        * then clears out any effects of those events.
-        */
-       if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
-               hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
-               udelay(1);
-               goto mac_reset_top;
-       }
-
-       /* Clear PF Reset Done bit so PF/VF Mail Ops can work */
-       ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
-       ctrl_ext |= IXGBE_CTRL_EXT_PFRSTD;
-       IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);
-       IXGBE_WRITE_FLUSH(hw);
-
-       msleep(50);
-
-       /* Set the Rx packet buffer size. */
-       IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0), 384 << IXGBE_RXPBSIZE_SHIFT);
-
-       /* Store the permanent mac address */
-       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
-
-       /*
-        * Store the original AUTOC/AUTOC2 values if they have not been
-        * stored off yet.  Otherwise restore the stored original
-        * values since the reset operation sets back to defaults.
-        */
-       autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-       autoc2 = IXGBE_READ_REG(hw, IXGBE_AUTOC2);
-       if (hw->mac.orig_link_settings_stored == false) {
-               hw->mac.orig_autoc = autoc;
-               hw->mac.orig_autoc2 = autoc2;
-               hw->mac.orig_link_settings_stored = true;
-       } else {
-               if (autoc != hw->mac.orig_autoc)
-                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (hw->mac.orig_autoc |
-                                       IXGBE_AUTOC_AN_RESTART));
-
-               if ((autoc2 & IXGBE_AUTOC2_UPPER_MASK) !=
-                   (hw->mac.orig_autoc2 & IXGBE_AUTOC2_UPPER_MASK)) {
-                       autoc2 &= ~IXGBE_AUTOC2_UPPER_MASK;
-                       autoc2 |= (hw->mac.orig_autoc2 &
-                                  IXGBE_AUTOC2_UPPER_MASK);
-                       IXGBE_WRITE_REG(hw, IXGBE_AUTOC2, autoc2);
-               }
-       }
-
-       /*
-        * Store MAC address from RAR0, clear receive address registers, and
-        * clear the multicast table.  Also reset num_rar_entries to 128,
-        * since we modify this value when programming the SAN MAC address.
-        */
-       hw->mac.num_rar_entries = IXGBE_X540_MAX_TX_QUEUES;
-       hw->mac.ops.init_rx_addrs(hw);
-
-       /* Store the permanent mac address */
-       hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
-
-       /* Store the permanent SAN mac address */
-       hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
-
-       /* Add the SAN MAC address to the RAR only if it's a valid address */
-       if (ixgbe_validate_mac_addr(hw->mac.san_addr) == 0) {
-               hw->mac.ops.set_rar(hw, hw->mac.num_rar_entries - 1,
-                                   hw->mac.san_addr, 0, IXGBE_RAH_AV);
-
-               /* Reserve the last RAR for the SAN MAC address */
-               hw->mac.num_rar_entries--;
-       }
-
-       /* Store the alternative WWNN/WWPN prefix */
-       hw->mac.ops.get_wwn_prefix(hw, &hw->mac.wwnn_prefix,
-                                  &hw->mac.wwpn_prefix);
-
-       return status;
-}
-
-/**
- *  ixgbe_start_hw_X540 - Prepare hardware for Tx/Rx
- *  @hw: pointer to hardware structure
- *
- *  Starts the hardware using the generic start_hw function
- *  and the generation start_hw function.
- *  Then performs revision-specific operations, if any.
- **/
-static s32 ixgbe_start_hw_X540(struct ixgbe_hw *hw)
-{
-       s32 ret_val = 0;
-
-       ret_val = ixgbe_start_hw_generic(hw);
-       if (ret_val != 0)
-               goto out;
-
-       ret_val = ixgbe_start_hw_gen2(hw);
-       hw->mac.rx_pb_size = IXGBE_X540_RX_PB_SIZE;
-out:
-       return ret_val;
-}
-
-/**
- *  ixgbe_get_supported_physical_layer_X540 - Returns physical layer type
- *  @hw: pointer to hardware structure
- *
- *  Determines physical layer capabilities of the current configuration.
- **/
-static u32 ixgbe_get_supported_physical_layer_X540(struct ixgbe_hw *hw)
-{
-       u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;
-       u16 ext_ability = 0;
-
-       hw->phy.ops.identify(hw);
-
-       hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
-                            &ext_ability);
-       if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
-               physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
-       if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
-               physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
-       if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
-               physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
-
-       return physical_layer;
-}
-
-/**
- *  ixgbe_init_eeprom_params_X540 - Initialize EEPROM params
- *  @hw: pointer to hardware structure
- *
- *  Initializes the EEPROM parameters ixgbe_eeprom_info within the
- *  ixgbe_hw struct in order to set up EEPROM access.
- **/
-static s32 ixgbe_init_eeprom_params_X540(struct ixgbe_hw *hw)
-{
-       struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
-       u32 eec;
-       u16 eeprom_size;
-
-       if (eeprom->type == ixgbe_eeprom_uninitialized) {
-               eeprom->semaphore_delay = 10;
-               eeprom->type = ixgbe_flash;
-
-               eec = IXGBE_READ_REG(hw, IXGBE_EEC);
-               eeprom_size = (u16)((eec & IXGBE_EEC_SIZE) >>
-                                   IXGBE_EEC_SIZE_SHIFT);
-               eeprom->word_size = 1 << (eeprom_size +
-                                         IXGBE_EEPROM_WORD_SIZE_SHIFT);
-
-               hw_dbg(hw, "Eeprom params: type = %d, size = %d\n",
-                      eeprom->type, eeprom->word_size);
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbe_read_eerd_X540- Read EEPROM word using EERD
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM using the EERD register.
- **/
-static s32 ixgbe_read_eerd_X540(struct ixgbe_hw *hw, u16 offset, u16 *data)
-{
-       s32 status = 0;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           0)
-               status = ixgbe_read_eerd_generic(hw, offset, data);
-       else
-               status = IXGBE_ERR_SWFW_SYNC;
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-       return status;
-}
-
-/**
- *  ixgbe_read_eerd_buffer_X540 - Read EEPROM word(s) using EERD
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to read
- *  @words: number of words
- *  @data: word(s) read from the EEPROM
- *
- *  Reads a 16 bit word(s) from the EEPROM using the EERD register.
- **/
-static s32 ixgbe_read_eerd_buffer_X540(struct ixgbe_hw *hw,
-                                      u16 offset, u16 words, u16 *data)
-{
-       s32 status = 0;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           0)
-               status = ixgbe_read_eerd_buffer_generic(hw, offset,
-                                                       words, data);
-       else
-               status = IXGBE_ERR_SWFW_SYNC;
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-       return status;
-}
-
-/**
- *  ixgbe_write_eewr_X540 - Write EEPROM word using EEWR
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to write
- *  @data: word write to the EEPROM
- *
- *  Write a 16 bit word to the EEPROM using the EEWR register.
- **/
-static s32 ixgbe_write_eewr_X540(struct ixgbe_hw *hw, u16 offset, u16 data)
-{
-       s32 status = 0;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0)
-               status = ixgbe_write_eewr_generic(hw, offset, data);
-       else
-               status = IXGBE_ERR_SWFW_SYNC;
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-       return status;
-}
-
-/**
- *  ixgbe_write_eewr_buffer_X540 - Write EEPROM word(s) using EEWR
- *  @hw: pointer to hardware structure
- *  @offset: offset of  word in the EEPROM to write
- *  @words: number of words
- *  @data: word(s) write to the EEPROM
- *
- *  Write a 16 bit word(s) to the EEPROM using the EEWR register.
- **/
-static s32 ixgbe_write_eewr_buffer_X540(struct ixgbe_hw *hw,
-                                       u16 offset, u16 words, u16 *data)
-{
-       s32 status = 0;
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) ==
-           0)
-               status = ixgbe_write_eewr_buffer_generic(hw, offset,
-                                                        words, data);
-       else
-               status = IXGBE_ERR_SWFW_SYNC;
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-       return status;
-}
-
-/**
- *  ixgbe_calc_eeprom_checksum_X540 - Calculates and returns the checksum
- *
- *  This function does not use synchronization for EERD and EEWR. It can
- *  be used internally by function which utilize ixgbe_acquire_swfw_sync_X540.
- *
- *  @hw: pointer to hardware structure
- **/
-static u16 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
-{
-       u16 i;
-       u16 j;
-       u16 checksum = 0;
-       u16 length = 0;
-       u16 pointer = 0;
-       u16 word = 0;
-
-       /*
-        * Do not use hw->eeprom.ops.read because we do not want to take
-        * the synchronization semaphores here. Instead use
-        * ixgbe_read_eerd_generic
-        */
-
-       /* Include 0x0-0x3F in the checksum */
-       for (i = 0; i < IXGBE_EEPROM_CHECKSUM; i++) {
-               if (ixgbe_read_eerd_generic(hw, i, &word) != 0) {
-                       hw_dbg(hw, "EEPROM read failed\n");
-                       break;
-               }
-               checksum += word;
-       }
-
-       /*
-        * Include all data from pointers 0x3, 0x6-0xE.  This excludes the
-        * FW, PHY module, and PCIe Expansion/Option ROM pointers.
-        */
-       for (i = IXGBE_PCIE_ANALOG_PTR; i < IXGBE_FW_PTR; i++) {
-               if (i == IXGBE_PHY_PTR || i == IXGBE_OPTION_ROM_PTR)
-                       continue;
-
-               if (ixgbe_read_eerd_generic(hw, i, &pointer) != 0) {
-                       hw_dbg(hw, "EEPROM read failed\n");
-                       break;
-               }
-
-               /* Skip pointer section if the pointer is invalid. */
-               if (pointer == 0xFFFF || pointer == 0 ||
-                   pointer >= hw->eeprom.word_size)
-                       continue;
-
-               if (ixgbe_read_eerd_generic(hw, pointer, &length) != 0) {
-                       hw_dbg(hw, "EEPROM read failed\n");
-                       break;
-               }
-
-               /* Skip pointer section if length is invalid. */
-               if (length == 0xFFFF || length == 0 ||
-                   (pointer + length) >= hw->eeprom.word_size)
-                       continue;
-
-               for (j = pointer+1; j <= pointer+length; j++) {
-                       if (ixgbe_read_eerd_generic(hw, j, &word) != 0) {
-                               hw_dbg(hw, "EEPROM read failed\n");
-                               break;
-                       }
-                       checksum += word;
-               }
-       }
-
-       checksum = (u16)IXGBE_EEPROM_SUM - checksum;
-
-       return checksum;
-}
-
-/**
- *  ixgbe_validate_eeprom_checksum_X540 - Validate EEPROM checksum
- *  @hw: pointer to hardware structure
- *  @checksum_val: calculated checksum
- *
- *  Performs checksum calculation and validates the EEPROM checksum.  If the
- *  caller does not need checksum_val, the value can be NULL.
- **/
-static s32 ixgbe_validate_eeprom_checksum_X540(struct ixgbe_hw *hw,
-                                              u16 *checksum_val)
-{
-       s32 status;
-       u16 checksum;
-       u16 read_checksum = 0;
-
-       /*
-        * Read the first word from the EEPROM. If this times out or fails, do
-        * not continue or we could be in for a very long wait while every
-        * EEPROM read fails
-        */
-       status = hw->eeprom.ops.read(hw, 0, &checksum);
-
-       if (status != 0) {
-               hw_dbg(hw, "EEPROM read failed\n");
-               goto out;
-       }
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0) {
-               checksum = hw->eeprom.ops.calc_checksum(hw);
-
-               /*
-                * Do not use hw->eeprom.ops.read because we do not want to take
-                * the synchronization semaphores twice here.
-                */
-               ixgbe_read_eerd_generic(hw, IXGBE_EEPROM_CHECKSUM,
-                                       &read_checksum);
-
-               /*
-                * Verify read checksum from EEPROM is the same as
-                * calculated checksum
-                */
-               if (read_checksum != checksum)
-                       status = IXGBE_ERR_EEPROM_CHECKSUM;
-
-               /* If the user cares, return the calculated checksum */
-               if (checksum_val)
-                       *checksum_val = checksum;
-       } else {
-               status = IXGBE_ERR_SWFW_SYNC;
-       }
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-out:
-       return status;
-}
-
-/**
- * ixgbe_update_eeprom_checksum_X540 - Updates the EEPROM checksum and flash
- * @hw: pointer to hardware structure
- *
- * After writing EEPROM to shadow RAM using EEWR register, software calculates
- * checksum and updates the EEPROM and instructs the hardware to update
- * the flash.
- **/
-static s32 ixgbe_update_eeprom_checksum_X540(struct ixgbe_hw *hw)
-{
-       s32 status;
-       u16 checksum;
-
-       /*
-        * Read the first word from the EEPROM. If this times out or fails, do
-        * not continue or we could be in for a very long wait while every
-        * EEPROM read fails
-        */
-       status = hw->eeprom.ops.read(hw, 0, &checksum);
-
-       if (status != 0)
-               hw_dbg(hw, "EEPROM read failed\n");
-
-       if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0) {
-               checksum = hw->eeprom.ops.calc_checksum(hw);
-
-               /*
-                * Do not use hw->eeprom.ops.write because we do not want to
-                * take the synchronization semaphores twice here.
-                */
-               status = ixgbe_write_eewr_generic(hw, IXGBE_EEPROM_CHECKSUM,
-                                                 checksum);
-
-       if (status == 0)
-               status = ixgbe_update_flash_X540(hw);
-       else
-               status = IXGBE_ERR_SWFW_SYNC;
-       }
-
-       hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
-
-       return status;
-}
-
-/**
- * ixgbe_update_flash_X540 - Instruct HW to copy EEPROM to Flash device
- * @hw: pointer to hardware structure
- *
- * Set FLUP (bit 23) of the EEC register to instruct Hardware to copy
- * EEPROM from shadow RAM to the flash device.
- **/
-static s32 ixgbe_update_flash_X540(struct ixgbe_hw *hw)
-{
-       u32 flup;
-       s32 status = IXGBE_ERR_EEPROM;
-
-       status = ixgbe_poll_flash_update_done_X540(hw);
-       if (status == IXGBE_ERR_EEPROM) {
-               hw_dbg(hw, "Flash update time out\n");
-               goto out;
-       }
-
-       flup = IXGBE_READ_REG(hw, IXGBE_EEC) | IXGBE_EEC_FLUP;
-       IXGBE_WRITE_REG(hw, IXGBE_EEC, flup);
-
-       status = ixgbe_poll_flash_update_done_X540(hw);
-       if (status == 0)
-               hw_dbg(hw, "Flash update complete\n");
-       else
-               hw_dbg(hw, "Flash update time out\n");
-
-       if (hw->revision_id == 0) {
-               flup = IXGBE_READ_REG(hw, IXGBE_EEC);
-
-               if (flup & IXGBE_EEC_SEC1VAL) {
-                       flup |= IXGBE_EEC_FLUP;
-                       IXGBE_WRITE_REG(hw, IXGBE_EEC, flup);
-               }
-
-               status = ixgbe_poll_flash_update_done_X540(hw);
-               if (status == 0)
-                       hw_dbg(hw, "Flash update complete\n");
-               else
-                       hw_dbg(hw, "Flash update time out\n");
-       }
-out:
-       return status;
-}
-
-/**
- * ixgbe_poll_flash_update_done_X540 - Poll flash update status
- * @hw: pointer to hardware structure
- *
- * Polls the FLUDONE (bit 26) of the EEC Register to determine when the
- * flash update is done.
- **/
-static s32 ixgbe_poll_flash_update_done_X540(struct ixgbe_hw *hw)
-{
-       u32 i;
-       u32 reg;
-       s32 status = IXGBE_ERR_EEPROM;
-
-       for (i = 0; i < IXGBE_FLUDONE_ATTEMPTS; i++) {
-               reg = IXGBE_READ_REG(hw, IXGBE_EEC);
-               if (reg & IXGBE_EEC_FLUDONE) {
-                       status = 0;
-                       break;
-               }
-               udelay(5);
-       }
-       return status;
-}
-
-/**
- * ixgbe_acquire_swfw_sync_X540 - Acquire SWFW semaphore
- * @hw: pointer to hardware structure
- * @mask: Mask to specify which semaphore to acquire
- *
- * Acquires the SWFW semaphore thought the SW_FW_SYNC register for
- * the specified function (CSR, PHY0, PHY1, NVM, Flash)
- **/
-static s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-       u32 swmask = mask;
-       u32 fwmask = mask << 5;
-       u32 hwmask = 0;
-       u32 timeout = 200;
-       u32 i;
-
-       if (swmask == IXGBE_GSSR_EEP_SM)
-               hwmask = IXGBE_GSSR_FLASH_SM;
-
-       for (i = 0; i < timeout; i++) {
-               /*
-                * SW NVM semaphore bit is used for access to all
-                * SW_FW_SYNC bits (not just NVM)
-                */
-               if (ixgbe_get_swfw_sync_semaphore(hw))
-                       return IXGBE_ERR_SWFW_SYNC;
-
-               swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
-               if (!(swfw_sync & (fwmask | swmask | hwmask))) {
-                       swfw_sync |= swmask;
-                       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
-                       ixgbe_release_swfw_sync_semaphore(hw);
-                       break;
-               } else {
-                       /*
-                        * Firmware currently using resource (fwmask),
-                        * hardware currently using resource (hwmask),
-                        * or other software thread currently using
-                        * resource (swmask)
-                        */
-                       ixgbe_release_swfw_sync_semaphore(hw);
-                       usleep_range(5000, 10000);
-               }
-       }
-
-       /*
-        * If the resource is not released by the FW/HW the SW can assume that
-        * the FW/HW malfunctions. In that case the SW should sets the
-        * SW bit(s) of the requested resource(s) while ignoring the
-        * corresponding FW/HW bits in the SW_FW_SYNC register.
-        */
-       if (i >= timeout) {
-               swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
-               if (swfw_sync & (fwmask | hwmask)) {
-                       if (ixgbe_get_swfw_sync_semaphore(hw))
-                               return IXGBE_ERR_SWFW_SYNC;
-
-                       swfw_sync |= swmask;
-                       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
-                       ixgbe_release_swfw_sync_semaphore(hw);
-               }
-       }
-
-       usleep_range(5000, 10000);
-       return 0;
-}
-
-/**
- * ixgbe_release_swfw_sync_X540 - Release SWFW semaphore
- * @hw: pointer to hardware structure
- * @mask: Mask to specify which semaphore to release
- *
- * Releases the SWFW semaphore through the SW_FW_SYNC register
- * for the specified function (CSR, PHY0, PHY1, EVM, Flash)
- **/
-static void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-       u32 swmask = mask;
-
-       ixgbe_get_swfw_sync_semaphore(hw);
-
-       swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
-       swfw_sync &= ~swmask;
-       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);
-
-       ixgbe_release_swfw_sync_semaphore(hw);
-       usleep_range(5000, 10000);
-}
-
-/**
- * ixgbe_get_nvm_semaphore - Get hardware semaphore
- * @hw: pointer to hardware structure
- *
- * Sets the hardware semaphores so SW/FW can gain control of shared resources
- **/
-static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
-{
-       s32 status = IXGBE_ERR_EEPROM;
-       u32 timeout = 2000;
-       u32 i;
-       u32 swsm;
-
-       /* Get SMBI software semaphore between device drivers first */
-       for (i = 0; i < timeout; i++) {
-               /*
-                * If the SMBI bit is 0 when we read it, then the bit will be
-                * set and we have the semaphore
-                */
-               swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
-               if (!(swsm & IXGBE_SWSM_SMBI)) {
-                       status = 0;
-                       break;
-               }
-               udelay(50);
-       }
-
-       /* Now get the semaphore between SW/FW through the REGSMP bit */
-       if (status) {
-               for (i = 0; i < timeout; i++) {
-                       swsm = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
-                       if (!(swsm & IXGBE_SWFW_REGSMP))
-                               break;
-
-                       udelay(50);
-               }
-       } else {
-               hw_dbg(hw, "Software semaphore SMBI between device drivers "
-                          "not granted.\n");
-       }
-
-       return status;
-}
-
-/**
- * ixgbe_release_nvm_semaphore - Release hardware semaphore
- * @hw: pointer to hardware structure
- *
- * This function clears hardware semaphore bits.
- **/
-static void ixgbe_release_swfw_sync_semaphore(struct ixgbe_hw *hw)
-{
-        u32 swsm;
-
-       /* Release both semaphores by writing 0 to the bits REGSMP and SMBI */
-
-       swsm = IXGBE_READ_REG(hw, IXGBE_SWSM);
-       swsm &= ~IXGBE_SWSM_SMBI;
-       IXGBE_WRITE_REG(hw, IXGBE_SWSM, swsm);
-
-       swsm = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC);
-       swsm &= ~IXGBE_SWFW_REGSMP;
-       IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swsm);
-
-       IXGBE_WRITE_FLUSH(hw);
-}
-
-/**
- * ixgbe_blink_led_start_X540 - Blink LED based on index.
- * @hw: pointer to hardware structure
- * @index: led number to blink
- *
- * Devices that implement the version 2 interface:
- *   X540
- **/
-static s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index)
-{
-       u32 macc_reg;
-       u32 ledctl_reg;
-
-       /*
-        * In order for the blink bit in the LED control register
-        * to work, link and speed must be forced in the MAC. We
-        * will reverse this when we stop the blinking.
-        */
-       macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);
-       macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS;
-       IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
-
-       /* Set the LED to LINK_UP + BLINK. */
-       ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-       ledctl_reg &= ~IXGBE_LED_MODE_MASK(index);
-       ledctl_reg |= IXGBE_LED_BLINK(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, ledctl_reg);
-       IXGBE_WRITE_FLUSH(hw);
-
-       return 0;
-}
-
-/**
- * ixgbe_blink_led_stop_X540 - Stop blinking LED based on index.
- * @hw: pointer to hardware structure
- * @index: led number to stop blinking
- *
- * Devices that implement the version 2 interface:
- *   X540
- **/
-static s32 ixgbe_blink_led_stop_X540(struct ixgbe_hw *hw, u32 index)
-{
-       u32 macc_reg;
-       u32 ledctl_reg;
-
-       /* Restore the LED to its default value. */
-       ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
-       ledctl_reg &= ~IXGBE_LED_MODE_MASK(index);
-       ledctl_reg |= IXGBE_LED_LINK_ACTIVE << IXGBE_LED_MODE_SHIFT(index);
-       ledctl_reg &= ~IXGBE_LED_BLINK(index);
-       IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, ledctl_reg);
-
-       /* Unforce link and speed in the MAC. */
-       macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);
-       macc_reg &= ~(IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS);
-       IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
-       IXGBE_WRITE_FLUSH(hw);
-
-       return 0;
-}
-static struct ixgbe_mac_operations mac_ops_X540 = {
-       .init_hw                = &ixgbe_init_hw_generic,
-       .reset_hw               = &ixgbe_reset_hw_X540,
-       .start_hw               = &ixgbe_start_hw_X540,
-       .clear_hw_cntrs         = &ixgbe_clear_hw_cntrs_generic,
-       .get_media_type         = &ixgbe_get_media_type_X540,
-       .get_supported_physical_layer =
-                                  &ixgbe_get_supported_physical_layer_X540,
-       .enable_rx_dma          = &ixgbe_enable_rx_dma_generic,
-       .get_mac_addr           = &ixgbe_get_mac_addr_generic,
-       .get_san_mac_addr       = &ixgbe_get_san_mac_addr_generic,
-       .get_device_caps        = &ixgbe_get_device_caps_generic,
-       .get_wwn_prefix         = &ixgbe_get_wwn_prefix_generic,
-       .stop_adapter           = &ixgbe_stop_adapter_generic,
-       .get_bus_info           = &ixgbe_get_bus_info_generic,
-       .set_lan_id             = &ixgbe_set_lan_id_multi_port_pcie,
-       .read_analog_reg8       = NULL,
-       .write_analog_reg8      = NULL,
-       .setup_link             = &ixgbe_setup_mac_link_X540,
-       .set_rxpba              = &ixgbe_set_rxpba_generic,
-       .check_link             = &ixgbe_check_mac_link_generic,
-       .get_link_capabilities  = &ixgbe_get_copper_link_capabilities_generic,
-       .led_on                 = &ixgbe_led_on_generic,
-       .led_off                = &ixgbe_led_off_generic,
-       .blink_led_start        = &ixgbe_blink_led_start_X540,
-       .blink_led_stop         = &ixgbe_blink_led_stop_X540,
-       .set_rar                = &ixgbe_set_rar_generic,
-       .clear_rar              = &ixgbe_clear_rar_generic,
-       .set_vmdq               = &ixgbe_set_vmdq_generic,
-       .clear_vmdq             = &ixgbe_clear_vmdq_generic,
-       .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
-       .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
-       .enable_mc              = &ixgbe_enable_mc_generic,
-       .disable_mc             = &ixgbe_disable_mc_generic,
-       .clear_vfta             = &ixgbe_clear_vfta_generic,
-       .set_vfta               = &ixgbe_set_vfta_generic,
-       .fc_enable              = &ixgbe_fc_enable_generic,
-       .set_fw_drv_ver         = &ixgbe_set_fw_drv_ver_generic,
-       .init_uta_tables        = &ixgbe_init_uta_tables_generic,
-       .setup_sfp              = NULL,
-       .set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,
-       .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
-       .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync_X540,
-       .release_swfw_sync      = &ixgbe_release_swfw_sync_X540,
-};
-
-static struct ixgbe_eeprom_operations eeprom_ops_X540 = {
-       .init_params            = &ixgbe_init_eeprom_params_X540,
-       .read                   = &ixgbe_read_eerd_X540,
-       .read_buffer            = &ixgbe_read_eerd_buffer_X540,
-       .write                  = &ixgbe_write_eewr_X540,
-       .write_buffer           = &ixgbe_write_eewr_buffer_X540,
-       .calc_checksum          = &ixgbe_calc_eeprom_checksum_X540,
-       .validate_checksum      = &ixgbe_validate_eeprom_checksum_X540,
-       .update_checksum        = &ixgbe_update_eeprom_checksum_X540,
-};
-
-static struct ixgbe_phy_operations phy_ops_X540 = {
-       .identify               = &ixgbe_identify_phy_generic,
-       .identify_sfp           = &ixgbe_identify_sfp_module_generic,
-       .init                   = NULL,
-       .reset                  = NULL,
-       .read_reg               = &ixgbe_read_phy_reg_generic,
-       .write_reg              = &ixgbe_write_phy_reg_generic,
-       .setup_link             = &ixgbe_setup_phy_link_generic,
-       .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
-       .read_i2c_byte          = &ixgbe_read_i2c_byte_generic,
-       .write_i2c_byte         = &ixgbe_write_i2c_byte_generic,
-       .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,
-       .write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,
-       .check_overtemp         = &ixgbe_tn_check_overtemp,
-};
-
-struct ixgbe_info ixgbe_X540_info = {
-       .mac                    = ixgbe_mac_X540,
-       .get_invariants         = &ixgbe_get_invariants_X540,
-       .mac_ops                = &mac_ops_X540,
-       .eeprom_ops             = &eeprom_ops_X540,
-       .phy_ops                = &phy_ops_X540,
-       .mbx_ops                = &mbx_ops_generic,
-};
diff --git a/drivers/net/ixgbevf/Makefile b/drivers/net/ixgbevf/Makefile
deleted file mode 100644 (file)
index 1f35d22..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#
-# Intel 82599 Virtual Function driver
-# Copyright(c) 1999 - 2010 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
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) 82599 VF ethernet driver
-#
-
-obj-$(CONFIG_IXGBEVF) += ixgbevf.o
-
-ixgbevf-objs := vf.o \
-                mbx.o \
-                ethtool.o \
-                ixgbevf_main.o
-
diff --git a/drivers/net/ixgbevf/defines.h b/drivers/net/ixgbevf/defines.h
deleted file mode 100644 (file)
index 78abb6f..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#ifndef _IXGBEVF_DEFINES_H_
-#define _IXGBEVF_DEFINES_H_
-
-/* Device IDs */
-#define IXGBE_DEV_ID_82599_VF           0x10ED
-#define IXGBE_DEV_ID_X540_VF            0x1515
-
-#define IXGBE_VF_IRQ_CLEAR_MASK         7
-#define IXGBE_VF_MAX_TX_QUEUES          1
-#define IXGBE_VF_MAX_RX_QUEUES          1
-#define IXGBE_ETH_LENGTH_OF_ADDRESS     6
-
-/* Link speed */
-typedef u32 ixgbe_link_speed;
-#define IXGBE_LINK_SPEED_1GB_FULL       0x0020
-#define IXGBE_LINK_SPEED_10GB_FULL      0x0080
-
-#define IXGBE_CTRL_RST              0x04000000 /* Reset (SW) */
-#define IXGBE_RXDCTL_ENABLE         0x02000000 /* Enable specific Rx Queue */
-#define IXGBE_TXDCTL_ENABLE         0x02000000 /* Enable specific Tx Queue */
-#define IXGBE_LINKS_UP              0x40000000
-#define IXGBE_LINKS_SPEED_82599     0x30000000
-#define IXGBE_LINKS_SPEED_10G_82599 0x30000000
-#define IXGBE_LINKS_SPEED_1G_82599  0x20000000
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE  8
-#define IXGBE_REQ_TX_BUFFER_GRANULARITY   1024
-
-/* Interrupt Vector Allocation Registers */
-#define IXGBE_IVAR_ALLOC_VAL    0x80 /* Interrupt Allocation valid */
-
-#define IXGBE_VF_INIT_TIMEOUT   200 /* Number of retries to clear RSTI */
-
-/* Receive Config masks */
-#define IXGBE_RXCTRL_RXEN       0x00000001  /* Enable Receiver */
-#define IXGBE_RXCTRL_DMBYPS     0x00000002  /* Descriptor Monitor Bypass */
-#define IXGBE_RXDCTL_ENABLE     0x02000000  /* Enable specific Rx Queue */
-#define IXGBE_RXDCTL_VME        0x40000000  /* VLAN mode enable */
-#define IXGBE_RXDCTL_RLPMLMASK  0x00003FFF  /* Only supported on the X540 */
-#define IXGBE_RXDCTL_RLPML_EN   0x00008000
-
-/* DCA Control */
-#define IXGBE_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
-
-/* PSRTYPE bit definitions */
-#define IXGBE_PSRTYPE_TCPHDR    0x00000010
-#define IXGBE_PSRTYPE_UDPHDR    0x00000020
-#define IXGBE_PSRTYPE_IPV4HDR   0x00000100
-#define IXGBE_PSRTYPE_IPV6HDR   0x00000200
-#define IXGBE_PSRTYPE_L2HDR     0x00001000
-
-/* SRRCTL bit definitions */
-#define IXGBE_SRRCTL_BSIZEPKT_SHIFT     10     /* so many KBs */
-#define IXGBE_SRRCTL_RDMTS_SHIFT        22
-#define IXGBE_SRRCTL_RDMTS_MASK         0x01C00000
-#define IXGBE_SRRCTL_DROP_EN            0x10000000
-#define IXGBE_SRRCTL_BSIZEPKT_MASK      0x0000007F
-#define IXGBE_SRRCTL_BSIZEHDR_MASK      0x00003F00
-#define IXGBE_SRRCTL_DESCTYPE_LEGACY    0x00000000
-#define IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000
-#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT  0x04000000
-#define IXGBE_SRRCTL_DESCTYPE_HDR_REPLICATION_LARGE_PKT 0x08000000
-#define IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS 0x0A000000
-#define IXGBE_SRRCTL_DESCTYPE_MASK      0x0E000000
-
-/* Receive Descriptor bit definitions */
-#define IXGBE_RXD_STAT_DD         0x01    /* Descriptor Done */
-#define IXGBE_RXD_STAT_EOP        0x02    /* End of Packet */
-#define IXGBE_RXD_STAT_FLM        0x04    /* FDir Match */
-#define IXGBE_RXD_STAT_VP         0x08    /* IEEE VLAN Packet */
-#define IXGBE_RXDADV_NEXTP_MASK   0x000FFFF0 /* Next Descriptor Index */
-#define IXGBE_RXDADV_NEXTP_SHIFT  0x00000004
-#define IXGBE_RXD_STAT_UDPCS      0x10    /* UDP xsum calculated */
-#define IXGBE_RXD_STAT_L4CS       0x20    /* L4 xsum calculated */
-#define IXGBE_RXD_STAT_IPCS       0x40    /* IP xsum calculated */
-#define IXGBE_RXD_STAT_PIF        0x80    /* passed in-exact filter */
-#define IXGBE_RXD_STAT_CRCV       0x100   /* Speculative CRC Valid */
-#define IXGBE_RXD_STAT_VEXT       0x200   /* 1st VLAN found */
-#define IXGBE_RXD_STAT_UDPV       0x400   /* Valid UDP checksum */
-#define IXGBE_RXD_STAT_DYNINT     0x800   /* Pkt caused INT via DYNINT */
-#define IXGBE_RXD_STAT_TS         0x10000 /* Time Stamp */
-#define IXGBE_RXD_STAT_SECP       0x20000 /* Security Processing */
-#define IXGBE_RXD_STAT_LB         0x40000 /* Loopback Status */
-#define IXGBE_RXD_STAT_ACK        0x8000  /* ACK Packet indication */
-#define IXGBE_RXD_ERR_CE          0x01    /* CRC Error */
-#define IXGBE_RXD_ERR_LE          0x02    /* Length Error */
-#define IXGBE_RXD_ERR_PE          0x08    /* Packet Error */
-#define IXGBE_RXD_ERR_OSE         0x10    /* Oversize Error */
-#define IXGBE_RXD_ERR_USE         0x20    /* Undersize Error */
-#define IXGBE_RXD_ERR_TCPE        0x40    /* TCP/UDP Checksum Error */
-#define IXGBE_RXD_ERR_IPE         0x80    /* IP Checksum Error */
-#define IXGBE_RXDADV_ERR_MASK     0xFFF00000 /* RDESC.ERRORS mask */
-#define IXGBE_RXDADV_ERR_SHIFT    20         /* RDESC.ERRORS shift */
-#define IXGBE_RXDADV_ERR_HBO      0x00800000 /*Header Buffer Overflow */
-#define IXGBE_RXDADV_ERR_CE       0x01000000 /* CRC Error */
-#define IXGBE_RXDADV_ERR_LE       0x02000000 /* Length Error */
-#define IXGBE_RXDADV_ERR_PE       0x08000000 /* Packet Error */
-#define IXGBE_RXDADV_ERR_OSE      0x10000000 /* Oversize Error */
-#define IXGBE_RXDADV_ERR_USE      0x20000000 /* Undersize Error */
-#define IXGBE_RXDADV_ERR_TCPE     0x40000000 /* TCP/UDP Checksum Error */
-#define IXGBE_RXDADV_ERR_IPE      0x80000000 /* IP Checksum Error */
-#define IXGBE_RXD_VLAN_ID_MASK    0x0FFF  /* VLAN ID is in lower 12 bits */
-#define IXGBE_RXD_PRI_MASK        0xE000  /* Priority is in upper 3 bits */
-#define IXGBE_RXD_PRI_SHIFT       13
-#define IXGBE_RXD_CFI_MASK        0x1000  /* CFI is bit 12 */
-#define IXGBE_RXD_CFI_SHIFT       12
-
-#define IXGBE_RXDADV_STAT_DD            IXGBE_RXD_STAT_DD  /* Done */
-#define IXGBE_RXDADV_STAT_EOP           IXGBE_RXD_STAT_EOP /* End of Packet */
-#define IXGBE_RXDADV_STAT_FLM           IXGBE_RXD_STAT_FLM /* FDir Match */
-#define IXGBE_RXDADV_STAT_VP            IXGBE_RXD_STAT_VP  /* IEEE VLAN Pkt */
-#define IXGBE_RXDADV_STAT_MASK          0x000FFFFF /* Stat/NEXTP: bit 0-19 */
-#define IXGBE_RXDADV_STAT_FCEOFS        0x00000040 /* FCoE EOF/SOF Stat */
-#define IXGBE_RXDADV_STAT_FCSTAT        0x00000030 /* FCoE Pkt Stat */
-#define IXGBE_RXDADV_STAT_FCSTAT_NOMTCH 0x00000000 /* 00: No Ctxt Match */
-#define IXGBE_RXDADV_STAT_FCSTAT_NODDP  0x00000010 /* 01: Ctxt w/o DDP */
-#define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020 /* 10: Recv. FCP_RSP */
-#define IXGBE_RXDADV_STAT_FCSTAT_DDP    0x00000030 /* 11: Ctxt w/ DDP */
-
-#define IXGBE_RXDADV_RSSTYPE_MASK       0x0000000F
-#define IXGBE_RXDADV_PKTTYPE_MASK       0x0000FFF0
-#define IXGBE_RXDADV_PKTTYPE_MASK_EX    0x0001FFF0
-#define IXGBE_RXDADV_HDRBUFLEN_MASK     0x00007FE0
-#define IXGBE_RXDADV_RSCCNT_MASK        0x001E0000
-#define IXGBE_RXDADV_RSCCNT_SHIFT       17
-#define IXGBE_RXDADV_HDRBUFLEN_SHIFT    5
-#define IXGBE_RXDADV_SPLITHEADER_EN     0x00001000
-#define IXGBE_RXDADV_SPH                0x8000
-
-#define IXGBE_RXD_ERR_FRAME_ERR_MASK ( \
-                                     IXGBE_RXD_ERR_CE |  \
-                                     IXGBE_RXD_ERR_LE |  \
-                                     IXGBE_RXD_ERR_PE |  \
-                                     IXGBE_RXD_ERR_OSE | \
-                                     IXGBE_RXD_ERR_USE)
-
-#define IXGBE_RXDADV_ERR_FRAME_ERR_MASK ( \
-                                        IXGBE_RXDADV_ERR_CE |  \
-                                        IXGBE_RXDADV_ERR_LE |  \
-                                        IXGBE_RXDADV_ERR_PE |  \
-                                        IXGBE_RXDADV_ERR_OSE | \
-                                        IXGBE_RXDADV_ERR_USE)
-
-#define IXGBE_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define IXGBE_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define IXGBE_TXD_CMD_EOP    0x01000000 /* End of Packet */
-#define IXGBE_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
-#define IXGBE_TXD_CMD_IC     0x04000000 /* Insert Checksum */
-#define IXGBE_TXD_CMD_RS     0x08000000 /* Report Status */
-#define IXGBE_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define IXGBE_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
-#define IXGBE_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-
-/* Transmit Descriptor - Advanced */
-union ixgbe_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;
-};
-
-/* Receive Descriptor - Advanced */
-union ixgbe_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, Pkt type */
-                                       __le16 hdr_info; /* Splithdr, hdrlen */
-                               } 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 */
-};
-
-/* Context descriptors */
-struct ixgbe_adv_tx_context_desc {
-       __le32 vlan_macip_lens;
-       __le32 seqnum_seed;
-       __le32 type_tucmd_mlhl;
-       __le32 mss_l4len_idx;
-};
-
-/* Adv Transmit Descriptor Config Masks */
-#define IXGBE_ADVTXD_DTYP_MASK  0x00F00000 /* DTYP mask */
-#define IXGBE_ADVTXD_DTYP_CTXT  0x00200000 /* Advanced Context Desc */
-#define IXGBE_ADVTXD_DTYP_DATA  0x00300000 /* Advanced Data Descriptor */
-#define IXGBE_ADVTXD_DCMD_EOP   IXGBE_TXD_CMD_EOP  /* End of Packet */
-#define IXGBE_ADVTXD_DCMD_IFCS  IXGBE_TXD_CMD_IFCS /* Insert FCS */
-#define IXGBE_ADVTXD_DCMD_RS    IXGBE_TXD_CMD_RS   /* Report Status */
-#define IXGBE_ADVTXD_DCMD_DEXT  IXGBE_TXD_CMD_DEXT /* Desc ext (1=Adv) */
-#define IXGBE_ADVTXD_DCMD_VLE   IXGBE_TXD_CMD_VLE  /* VLAN pkt enable */
-#define IXGBE_ADVTXD_DCMD_TSE   0x80000000 /* TCP Seg enable */
-#define IXGBE_ADVTXD_STAT_DD    IXGBE_TXD_STAT_DD  /* Descriptor Done */
-#define IXGBE_ADVTXD_TUCMD_IPV4      0x00000400  /* IP Packet Type: 1=IPv4 */
-#define IXGBE_ADVTXD_TUCMD_IPV6      0x00000000  /* IP Packet Type: 0=IPv6 */
-#define IXGBE_ADVTXD_TUCMD_L4T_UDP   0x00000000  /* L4 Packet TYPE of UDP */
-#define IXGBE_ADVTXD_TUCMD_L4T_TCP   0x00000800  /* L4 Packet TYPE of TCP */
-#define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */
-#define IXGBE_ADVTXD_IDX_SHIFT  4 /* Adv desc Index shift */
-#define IXGBE_ADVTXD_POPTS_SHIFT      8  /* Adv desc POPTS shift */
-#define IXGBE_ADVTXD_POPTS_IXSM (IXGBE_TXD_POPTS_IXSM << \
-                                IXGBE_ADVTXD_POPTS_SHIFT)
-#define IXGBE_ADVTXD_POPTS_TXSM (IXGBE_TXD_POPTS_TXSM << \
-                                IXGBE_ADVTXD_POPTS_SHIFT)
-#define IXGBE_ADVTXD_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
-#define IXGBE_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
-#define IXGBE_ADVTXD_VLAN_SHIFT      16  /* Adv ctxt vlan tag shift */
-#define IXGBE_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
-#define IXGBE_ADVTXD_MSS_SHIFT       16  /* Adv ctxt MSS shift */
-
-/* Interrupt register bitmasks */
-
-/* Extended Interrupt Cause Read */
-#define IXGBE_EICR_RTX_QUEUE    0x0000FFFF /* RTx Queue Interrupt */
-#define IXGBE_EICR_MAILBOX      0x00080000 /* VF to PF Mailbox Interrupt */
-#define IXGBE_EICR_OTHER        0x80000000 /* Interrupt Cause Active */
-
-/* Extended Interrupt Cause Set */
-#define IXGBE_EICS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
-#define IXGBE_EICS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
-#define IXGBE_EICS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
-
-/* Extended Interrupt Mask Set */
-#define IXGBE_EIMS_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
-#define IXGBE_EIMS_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
-#define IXGBE_EIMS_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
-
-/* Extended Interrupt Mask Clear */
-#define IXGBE_EIMC_RTX_QUEUE    IXGBE_EICR_RTX_QUEUE /* RTx Queue Interrupt */
-#define IXGBE_EIMC_MAILBOX      IXGBE_EICR_MAILBOX   /* VF to PF Mailbox Int */
-#define IXGBE_EIMC_OTHER        IXGBE_EICR_OTHER     /* INT Cause Active */
-
-#define IXGBE_EIMS_ENABLE_MASK ( \
-                               IXGBE_EIMS_RTX_QUEUE       | \
-                               IXGBE_EIMS_MAILBOX         | \
-                               IXGBE_EIMS_OTHER)
-
-#define IXGBE_EITR_CNT_WDIS     0x80000000
-
-/* Error Codes */
-#define IXGBE_ERR_INVALID_MAC_ADDR              -1
-#define IXGBE_ERR_RESET_FAILED                  -2
-
-#endif /* _IXGBEVF_DEFINES_H_ */
diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ixgbevf/ethtool.c
deleted file mode 100644 (file)
index deee375..0000000
+++ /dev/null
@@ -1,742 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function 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:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-/* ethtool support for ixgbevf */
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/ethtool.h>
-#include <linux/vmalloc.h>
-#include <linux/if_vlan.h>
-#include <linux/uaccess.h>
-
-#include "ixgbevf.h"
-
-#define IXGBE_ALL_RAR_ENTRIES 16
-
-#ifdef ETHTOOL_GSTATS
-struct ixgbe_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int sizeof_stat;
-       int stat_offset;
-       int base_stat_offset;
-       int saved_reset_offset;
-};
-
-#define IXGBEVF_STAT(m, b, r)  sizeof(((struct ixgbevf_adapter *)0)->m), \
-                           offsetof(struct ixgbevf_adapter, m),         \
-                           offsetof(struct ixgbevf_adapter, b),         \
-                           offsetof(struct ixgbevf_adapter, r)
-static struct ixgbe_stats ixgbe_gstrings_stats[] = {
-       {"rx_packets", IXGBEVF_STAT(stats.vfgprc, stats.base_vfgprc,
-                                   stats.saved_reset_vfgprc)},
-       {"tx_packets", IXGBEVF_STAT(stats.vfgptc, stats.base_vfgptc,
-                                   stats.saved_reset_vfgptc)},
-       {"rx_bytes", IXGBEVF_STAT(stats.vfgorc, stats.base_vfgorc,
-                                 stats.saved_reset_vfgorc)},
-       {"tx_bytes", IXGBEVF_STAT(stats.vfgotc, stats.base_vfgotc,
-                                 stats.saved_reset_vfgotc)},
-       {"tx_busy", IXGBEVF_STAT(tx_busy, zero_base, zero_base)},
-       {"multicast", IXGBEVF_STAT(stats.vfmprc, stats.base_vfmprc,
-                                  stats.saved_reset_vfmprc)},
-       {"rx_csum_offload_good", IXGBEVF_STAT(hw_csum_rx_good, zero_base,
-                                             zero_base)},
-       {"rx_csum_offload_errors", IXGBEVF_STAT(hw_csum_rx_error, zero_base,
-                                               zero_base)},
-       {"tx_csum_offload_ctxt", IXGBEVF_STAT(hw_csum_tx_good, zero_base,
-                                             zero_base)},
-       {"rx_header_split", IXGBEVF_STAT(rx_hdr_split, zero_base, zero_base)},
-};
-
-#define IXGBE_QUEUE_STATS_LEN 0
-#define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)
-
-#define IXGBEVF_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN)
-#endif /* ETHTOOL_GSTATS */
-#ifdef ETHTOOL_TEST
-static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Register test  (offline)",
-       "Link test   (on/offline)"
-};
-#define IXGBE_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN)
-#endif /* ETHTOOL_TEST */
-
-static int ixgbevf_get_settings(struct net_device *netdev,
-                               struct ethtool_cmd *ecmd)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 link_speed = 0;
-       bool link_up;
-
-       ecmd->supported = SUPPORTED_10000baseT_Full;
-       ecmd->autoneg = AUTONEG_DISABLE;
-       ecmd->transceiver = XCVR_DUMMY1;
-       ecmd->port = -1;
-
-       hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
-
-       if (link_up) {
-               ethtool_cmd_speed_set(
-                       ecmd,
-                       (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
-                       SPEED_10000 : SPEED_1000);
-               ecmd->duplex = DUPLEX_FULL;
-       } else {
-               ethtool_cmd_speed_set(ecmd, -1);
-               ecmd->duplex = -1;
-       }
-
-       return 0;
-}
-
-static u32 ixgbevf_get_rx_csum(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       return adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED;
-}
-
-static int ixgbevf_set_rx_csum(struct net_device *netdev, u32 data)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       if (data)
-               adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
-       else
-               adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;
-
-       if (netif_running(netdev)) {
-               if (!adapter->dev_closed)
-                       ixgbevf_reinit_locked(adapter);
-       } else {
-               ixgbevf_reset(adapter);
-       }
-
-       return 0;
-}
-
-static int ixgbevf_set_tso(struct net_device *netdev, u32 data)
-{
-       if (data) {
-               netdev->features |= NETIF_F_TSO;
-               netdev->features |= NETIF_F_TSO6;
-       } else {
-               netif_tx_stop_all_queues(netdev);
-               netdev->features &= ~NETIF_F_TSO;
-               netdev->features &= ~NETIF_F_TSO6;
-               netif_tx_start_all_queues(netdev);
-       }
-       return 0;
-}
-
-static u32 ixgbevf_get_msglevel(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void ixgbevf_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-
-#define IXGBE_GET_STAT(_A_, _R_) (_A_->stats._R_)
-
-static char *ixgbevf_reg_names[] = {
-       "IXGBE_VFCTRL",
-       "IXGBE_VFSTATUS",
-       "IXGBE_VFLINKS",
-       "IXGBE_VFRXMEMWRAP",
-       "IXGBE_VFFRTIMER",
-       "IXGBE_VTEICR",
-       "IXGBE_VTEICS",
-       "IXGBE_VTEIMS",
-       "IXGBE_VTEIMC",
-       "IXGBE_VTEIAC",
-       "IXGBE_VTEIAM",
-       "IXGBE_VTEITR",
-       "IXGBE_VTIVAR",
-       "IXGBE_VTIVAR_MISC",
-       "IXGBE_VFRDBAL0",
-       "IXGBE_VFRDBAL1",
-       "IXGBE_VFRDBAH0",
-       "IXGBE_VFRDBAH1",
-       "IXGBE_VFRDLEN0",
-       "IXGBE_VFRDLEN1",
-       "IXGBE_VFRDH0",
-       "IXGBE_VFRDH1",
-       "IXGBE_VFRDT0",
-       "IXGBE_VFRDT1",
-       "IXGBE_VFRXDCTL0",
-       "IXGBE_VFRXDCTL1",
-       "IXGBE_VFSRRCTL0",
-       "IXGBE_VFSRRCTL1",
-       "IXGBE_VFPSRTYPE",
-       "IXGBE_VFTDBAL0",
-       "IXGBE_VFTDBAL1",
-       "IXGBE_VFTDBAH0",
-       "IXGBE_VFTDBAH1",
-       "IXGBE_VFTDLEN0",
-       "IXGBE_VFTDLEN1",
-       "IXGBE_VFTDH0",
-       "IXGBE_VFTDH1",
-       "IXGBE_VFTDT0",
-       "IXGBE_VFTDT1",
-       "IXGBE_VFTXDCTL0",
-       "IXGBE_VFTXDCTL1",
-       "IXGBE_VFTDWBAL0",
-       "IXGBE_VFTDWBAL1",
-       "IXGBE_VFTDWBAH0",
-       "IXGBE_VFTDWBAH1"
-};
-
-
-static int ixgbevf_get_regs_len(struct net_device *netdev)
-{
-       return (ARRAY_SIZE(ixgbevf_reg_names)) * sizeof(u32);
-}
-
-static void ixgbevf_get_regs(struct net_device *netdev,
-                            struct ethtool_regs *regs,
-                            void *p)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 *regs_buff = p;
-       u32 regs_len = ixgbevf_get_regs_len(netdev);
-       u8 i;
-
-       memset(p, 0, regs_len);
-
-       regs->version = (1 << 24) | hw->revision_id << 16 | hw->device_id;
-
-       /* General Registers */
-       regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_VFCTRL);
-       regs_buff[1] = IXGBE_READ_REG(hw, IXGBE_VFSTATUS);
-       regs_buff[2] = IXGBE_READ_REG(hw, IXGBE_VFLINKS);
-       regs_buff[3] = IXGBE_READ_REG(hw, IXGBE_VFRXMEMWRAP);
-       regs_buff[4] = IXGBE_READ_REG(hw, IXGBE_VFFRTIMER);
-
-       /* Interrupt */
-       /* don't read EICR because it can clear interrupt causes, instead
-        * read EICS which is a shadow but doesn't clear EICR */
-       regs_buff[5] = IXGBE_READ_REG(hw, IXGBE_VTEICS);
-       regs_buff[6] = IXGBE_READ_REG(hw, IXGBE_VTEICS);
-       regs_buff[7] = IXGBE_READ_REG(hw, IXGBE_VTEIMS);
-       regs_buff[8] = IXGBE_READ_REG(hw, IXGBE_VTEIMC);
-       regs_buff[9] = IXGBE_READ_REG(hw, IXGBE_VTEIAC);
-       regs_buff[10] = IXGBE_READ_REG(hw, IXGBE_VTEIAM);
-       regs_buff[11] = IXGBE_READ_REG(hw, IXGBE_VTEITR(0));
-       regs_buff[12] = IXGBE_READ_REG(hw, IXGBE_VTIVAR(0));
-       regs_buff[13] = IXGBE_READ_REG(hw, IXGBE_VTIVAR_MISC);
-
-       /* Receive DMA */
-       for (i = 0; i < 2; i++)
-               regs_buff[14 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDBAL(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[16 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDBAH(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[18 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDLEN(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[20 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDH(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[22 + i] = IXGBE_READ_REG(hw, IXGBE_VFRDT(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[24 + i] = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[26 + i] = IXGBE_READ_REG(hw, IXGBE_VFSRRCTL(i));
-
-       /* Receive */
-       regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_VFPSRTYPE);
-
-       /* Transmit */
-       for (i = 0; i < 2; i++)
-               regs_buff[29 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDBAL(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[31 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDBAH(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[33 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDLEN(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDH(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[37 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDT(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[39 + i] = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[41 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDWBAL(i));
-       for (i = 0; i < 2; i++)
-               regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_VFTDWBAH(i));
-
-       for (i = 0; i < ARRAY_SIZE(ixgbevf_reg_names); i++)
-               hw_dbg(hw, "%s\t%8.8x\n", ixgbevf_reg_names[i], regs_buff[i]);
-}
-
-static void ixgbevf_get_drvinfo(struct net_device *netdev,
-                               struct ethtool_drvinfo *drvinfo)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-
-       strlcpy(drvinfo->driver, ixgbevf_driver_name, 32);
-       strlcpy(drvinfo->version, ixgbevf_driver_version, 32);
-
-       strlcpy(drvinfo->fw_version, "N/A", 4);
-       strlcpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-}
-
-static void ixgbevf_get_ringparam(struct net_device *netdev,
-                                 struct ethtool_ringparam *ring)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbevf_ring *tx_ring = adapter->tx_ring;
-       struct ixgbevf_ring *rx_ring = adapter->rx_ring;
-
-       ring->rx_max_pending = IXGBEVF_MAX_RXD;
-       ring->tx_max_pending = IXGBEVF_MAX_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rx_ring->count;
-       ring->tx_pending = tx_ring->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int ixgbevf_set_ringparam(struct net_device *netdev,
-                                struct ethtool_ringparam *ring)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbevf_ring *tx_ring = NULL, *rx_ring = NULL;
-       int i, err = 0;
-       u32 new_rx_count, new_tx_count;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       new_rx_count = max(ring->rx_pending, (u32)IXGBEVF_MIN_RXD);
-       new_rx_count = min(new_rx_count, (u32)IXGBEVF_MAX_RXD);
-       new_rx_count = ALIGN(new_rx_count, IXGBE_REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       new_tx_count = max(ring->tx_pending, (u32)IXGBEVF_MIN_TXD);
-       new_tx_count = min(new_tx_count, (u32)IXGBEVF_MAX_TXD);
-       new_tx_count = ALIGN(new_tx_count, IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       if ((new_tx_count == adapter->tx_ring->count) &&
-           (new_rx_count == adapter->rx_ring->count)) {
-               /* nothing to do */
-               return 0;
-       }
-
-       while (test_and_set_bit(__IXGBEVF_RESETTING, &adapter->state))
-               msleep(1);
-
-       /*
-        * If the adapter isn't up and running then just set the
-        * new parameters and scurry for the exits.
-        */
-       if (!netif_running(adapter->netdev)) {
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       adapter->tx_ring[i].count = new_tx_count;
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       adapter->rx_ring[i].count = new_rx_count;
-               adapter->tx_ring_count = new_tx_count;
-               adapter->rx_ring_count = new_rx_count;
-               goto clear_reset;
-       }
-
-       tx_ring = kcalloc(adapter->num_tx_queues,
-                         sizeof(struct ixgbevf_ring), GFP_KERNEL);
-       if (!tx_ring) {
-               err = -ENOMEM;
-               goto clear_reset;
-       }
-
-       rx_ring = kcalloc(adapter->num_rx_queues,
-                         sizeof(struct ixgbevf_ring), GFP_KERNEL);
-       if (!rx_ring) {
-               err = -ENOMEM;
-               goto err_rx_setup;
-       }
-
-       ixgbevf_down(adapter);
-
-       memcpy(tx_ring, adapter->tx_ring,
-              adapter->num_tx_queues * sizeof(struct ixgbevf_ring));
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               tx_ring[i].count = new_tx_count;
-               err = ixgbevf_setup_tx_resources(adapter, &tx_ring[i]);
-               if (err) {
-                       while (i) {
-                               i--;
-                               ixgbevf_free_tx_resources(adapter,
-                                                         &tx_ring[i]);
-                       }
-                       goto err_tx_ring_setup;
-               }
-               tx_ring[i].v_idx = adapter->tx_ring[i].v_idx;
-       }
-
-       memcpy(rx_ring, adapter->rx_ring,
-              adapter->num_rx_queues * sizeof(struct ixgbevf_ring));
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               rx_ring[i].count = new_rx_count;
-               err = ixgbevf_setup_rx_resources(adapter, &rx_ring[i]);
-               if (err) {
-                       while (i) {
-                               i--;
-                               ixgbevf_free_rx_resources(adapter,
-                                                         &rx_ring[i]);
-                       }
-                               goto err_rx_ring_setup;
-               }
-               rx_ring[i].v_idx = adapter->rx_ring[i].v_idx;
-       }
-
-       /*
-        * Only switch to new rings if all the prior allocations
-        * and ring setups have succeeded.
-        */
-       kfree(adapter->tx_ring);
-       adapter->tx_ring = tx_ring;
-       adapter->tx_ring_count = new_tx_count;
-
-       kfree(adapter->rx_ring);
-       adapter->rx_ring = rx_ring;
-       adapter->rx_ring_count = new_rx_count;
-
-       /* success! */
-       ixgbevf_up(adapter);
-
-       goto clear_reset;
-
-err_rx_ring_setup:
-       for(i = 0; i < adapter->num_tx_queues; i++)
-               ixgbevf_free_tx_resources(adapter, &tx_ring[i]);
-
-err_tx_ring_setup:
-       kfree(rx_ring);
-
-err_rx_setup:
-       kfree(tx_ring);
-
-clear_reset:
-       clear_bit(__IXGBEVF_RESETTING, &adapter->state);
-       return err;
-}
-
-static int ixgbevf_get_sset_count(struct net_device *dev, int stringset)
-{
-       switch (stringset) {
-       case ETH_SS_TEST:
-              return IXGBE_TEST_LEN;
-       case ETH_SS_STATS:
-              return IXGBE_GLOBAL_STATS_LEN;
-       default:
-              return -EINVAL;
-       }
-}
-
-static void ixgbevf_get_ethtool_stats(struct net_device *netdev,
-                                     struct ethtool_stats *stats, u64 *data)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       int i;
-
-       ixgbevf_update_stats(adapter);
-       for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
-               char *p = (char *)adapter +
-                       ixgbe_gstrings_stats[i].stat_offset;
-               char *b = (char *)adapter +
-                       ixgbe_gstrings_stats[i].base_stat_offset;
-               char *r = (char *)adapter +
-                       ixgbe_gstrings_stats[i].saved_reset_offset;
-               data[i] = ((ixgbe_gstrings_stats[i].sizeof_stat ==
-                           sizeof(u64)) ? *(u64 *)p : *(u32 *)p) -
-                         ((ixgbe_gstrings_stats[i].sizeof_stat ==
-                           sizeof(u64)) ? *(u64 *)b : *(u32 *)b) +
-                         ((ixgbe_gstrings_stats[i].sizeof_stat ==
-                           sizeof(u64)) ? *(u64 *)r : *(u32 *)r);
-       }
-}
-
-static void ixgbevf_get_strings(struct net_device *netdev, u32 stringset,
-                               u8 *data)
-{
-       char *p = (char *)data;
-       int i;
-
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *ixgbe_gstrings_test,
-                      IXGBE_TEST_LEN * ETH_GSTRING_LEN);
-               break;
-       case ETH_SS_STATS:
-               for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, ixgbe_gstrings_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-               break;
-       }
-}
-
-static int ixgbevf_link_test(struct ixgbevf_adapter *adapter, u64 *data)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       bool link_up;
-       u32 link_speed = 0;
-       *data = 0;
-
-       hw->mac.ops.check_link(hw, &link_speed, &link_up, true);
-       if (!link_up)
-               *data = 1;
-
-       return *data;
-}
-
-/* ethtool register test data */
-struct ixgbevf_reg_test {
-       u16 reg;
-       u8  array_len;
-       u8  test_type;
-       u32 mask;
-       u32 write;
-};
-
-/* In the hardware, registers are laid out either singly, in arrays
- * spaced 0x40 bytes apart, or in contiguous tables.  We assume
- * most tests take place on arrays or single registers (handled
- * as a single-element array) and special-case the tables.
- * Table tests are always pattern tests.
- *
- * We also make provision for some required setup steps by specifying
- * registers to be written without any read-back testing.
- */
-
-#define PATTERN_TEST   1
-#define SET_READ_TEST  2
-#define WRITE_NO_TEST  3
-#define TABLE32_TEST   4
-#define TABLE64_TEST_LO        5
-#define TABLE64_TEST_HI        6
-
-/* default VF register test */
-static const struct ixgbevf_reg_test reg_test_vf[] = {
-       { IXGBE_VFRDBAL(0), 2, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFF80 },
-       { IXGBE_VFRDBAH(0), 2, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_VFRDLEN(0), 2, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
-       { IXGBE_VFRXDCTL(0), 2, WRITE_NO_TEST, 0, IXGBE_RXDCTL_ENABLE },
-       { IXGBE_VFRDT(0), 2, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
-       { IXGBE_VFRXDCTL(0), 2, WRITE_NO_TEST, 0, 0 },
-       { IXGBE_VFTDBAL(0), 2, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFFFF },
-       { IXGBE_VFTDBAH(0), 2, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { IXGBE_VFTDLEN(0), 2, PATTERN_TEST, 0x000FFF80, 0x000FFF80 },
-       { 0, 0, 0, 0 }
-};
-
-static const u32 register_test_patterns[] = {
-       0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF
-};
-
-#define REG_PATTERN_TEST(R, M, W)                                             \
-{                                                                             \
-       u32 pat, val, before;                                                 \
-       for (pat = 0; pat < ARRAY_SIZE(register_test_patterns); pat++) {      \
-               before = readl(adapter->hw.hw_addr + R);                      \
-               writel((register_test_patterns[pat] & W),                     \
-                      (adapter->hw.hw_addr + R));                            \
-               val = readl(adapter->hw.hw_addr + R);                         \
-               if (val != (register_test_patterns[pat] & W & M)) {           \
-                       hw_dbg(&adapter->hw,                                  \
-                       "pattern test reg %04X failed: got "                  \
-                       "0x%08X expected 0x%08X\n",                           \
-                       R, val, (register_test_patterns[pat] & W & M));       \
-                       *data = R;                                            \
-                       writel(before, adapter->hw.hw_addr + R);              \
-                       return 1;                                             \
-               }                                                             \
-               writel(before, adapter->hw.hw_addr + R);                      \
-       }                                                                     \
-}
-
-#define REG_SET_AND_CHECK(R, M, W)                                            \
-{                                                                             \
-       u32 val, before;                                                      \
-       before = readl(adapter->hw.hw_addr + R);                              \
-       writel((W & M), (adapter->hw.hw_addr + R));                           \
-       val = readl(adapter->hw.hw_addr + R);                                 \
-       if ((W & M) != (val & M)) {                                           \
-               printk(KERN_ERR "set/check reg %04X test failed: got 0x%08X " \
-                                "expected 0x%08X\n", R, (val & M), (W & M)); \
-               *data = R;                                                    \
-               writel(before, (adapter->hw.hw_addr + R));                    \
-               return 1;                                                     \
-       }                                                                     \
-       writel(before, (adapter->hw.hw_addr + R));                            \
-}
-
-static int ixgbevf_reg_test(struct ixgbevf_adapter *adapter, u64 *data)
-{
-       const struct ixgbevf_reg_test *test;
-       u32 i;
-
-       test = reg_test_vf;
-
-       /*
-        * Perform the register test, looping through the test table
-        * until we either fail or reach the null entry.
-        */
-       while (test->reg) {
-               for (i = 0; i < test->array_len; i++) {
-                       switch (test->test_type) {
-                       case PATTERN_TEST:
-                               REG_PATTERN_TEST(test->reg + (i * 0x40),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case SET_READ_TEST:
-                               REG_SET_AND_CHECK(test->reg + (i * 0x40),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case WRITE_NO_TEST:
-                               writel(test->write,
-                                      (adapter->hw.hw_addr + test->reg)
-                                      + (i * 0x40));
-                               break;
-                       case TABLE32_TEST:
-                               REG_PATTERN_TEST(test->reg + (i * 4),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case TABLE64_TEST_LO:
-                               REG_PATTERN_TEST(test->reg + (i * 8),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       case TABLE64_TEST_HI:
-                               REG_PATTERN_TEST((test->reg + 4) + (i * 8),
-                                               test->mask,
-                                               test->write);
-                               break;
-                       }
-               }
-               test++;
-       }
-
-       *data = 0;
-       return *data;
-}
-
-static void ixgbevf_diag_test(struct net_device *netdev,
-                             struct ethtool_test *eth_test, u64 *data)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       bool if_running = netif_running(netdev);
-
-       set_bit(__IXGBEVF_TESTING, &adapter->state);
-       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
-               /* Offline tests */
-
-               hw_dbg(&adapter->hw, "offline testing starting\n");
-
-               /* Link test performed before hardware reset so autoneg doesn't
-                * interfere with test result */
-               if (ixgbevf_link_test(adapter, &data[1]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               if (if_running)
-                       /* indicate we're in test mode */
-                       dev_close(netdev);
-               else
-                       ixgbevf_reset(adapter);
-
-               hw_dbg(&adapter->hw, "register testing starting\n");
-               if (ixgbevf_reg_test(adapter, &data[0]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               ixgbevf_reset(adapter);
-
-               clear_bit(__IXGBEVF_TESTING, &adapter->state);
-               if (if_running)
-                       dev_open(netdev);
-       } else {
-               hw_dbg(&adapter->hw, "online testing starting\n");
-               /* Online tests */
-               if (ixgbevf_link_test(adapter, &data[1]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* Online tests aren't run; pass by default */
-               data[0] = 0;
-
-               clear_bit(__IXGBEVF_TESTING, &adapter->state);
-       }
-       msleep_interruptible(4 * 1000);
-}
-
-static int ixgbevf_nway_reset(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-
-       if (netif_running(netdev)) {
-               if (!adapter->dev_closed)
-                       ixgbevf_reinit_locked(adapter);
-       }
-
-       return 0;
-}
-
-static struct ethtool_ops ixgbevf_ethtool_ops = {
-       .get_settings           = ixgbevf_get_settings,
-       .get_drvinfo            = ixgbevf_get_drvinfo,
-       .get_regs_len           = ixgbevf_get_regs_len,
-       .get_regs               = ixgbevf_get_regs,
-       .nway_reset             = ixgbevf_nway_reset,
-       .get_link               = ethtool_op_get_link,
-       .get_ringparam          = ixgbevf_get_ringparam,
-       .set_ringparam          = ixgbevf_set_ringparam,
-       .get_rx_csum            = ixgbevf_get_rx_csum,
-       .set_rx_csum            = ixgbevf_set_rx_csum,
-       .get_tx_csum            = ethtool_op_get_tx_csum,
-       .set_tx_csum            = ethtool_op_set_tx_ipv6_csum,
-       .get_sg                 = ethtool_op_get_sg,
-       .set_sg                 = ethtool_op_set_sg,
-       .get_msglevel           = ixgbevf_get_msglevel,
-       .set_msglevel           = ixgbevf_set_msglevel,
-       .get_tso                = ethtool_op_get_tso,
-       .set_tso                = ixgbevf_set_tso,
-       .self_test              = ixgbevf_diag_test,
-       .get_sset_count         = ixgbevf_get_sset_count,
-       .get_strings            = ixgbevf_get_strings,
-       .get_ethtool_stats      = ixgbevf_get_ethtool_stats,
-};
-
-void ixgbevf_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &ixgbevf_ethtool_ops);
-}
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ixgbevf/ixgbevf.h
deleted file mode 100644 (file)
index 8857df4..0000000
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#ifndef _IXGBEVF_H_
-#define _IXGBEVF_H_
-
-#include <linux/types.h>
-#include <linux/bitops.h>
-#include <linux/timer.h>
-#include <linux/io.h>
-#include <linux/netdevice.h>
-#include <linux/if_vlan.h>
-
-#include "vf.h"
-
-/* wrapper around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer */
-struct ixgbevf_tx_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       unsigned long time_stamp;
-       u16 length;
-       u16 next_to_watch;
-       u16 mapped_as_page;
-};
-
-struct ixgbevf_rx_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       struct page *page;
-       dma_addr_t page_dma;
-       unsigned int page_offset;
-};
-
-struct ixgbevf_ring {
-       struct ixgbevf_adapter *adapter;  /* backlink */
-       void *desc;                     /* descriptor ring memory */
-       dma_addr_t dma;                 /* phys. address of descriptor ring */
-       unsigned int size;              /* length in bytes */
-       unsigned int count;             /* amount of descriptors */
-       unsigned int next_to_use;
-       unsigned int next_to_clean;
-
-       int queue_index; /* needed for multiqueue queue management */
-       union {
-               struct ixgbevf_tx_buffer *tx_buffer_info;
-               struct ixgbevf_rx_buffer *rx_buffer_info;
-       };
-
-       u16 head;
-       u16 tail;
-
-       unsigned int total_bytes;
-       unsigned int total_packets;
-
-       u16 reg_idx; /* holds the special value that gets the hardware register
-                     * offset associated with this ring, which is different
-                     * for DCB and RSS modes */
-
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
-       /* cpu for tx queue */
-       int cpu;
-#endif
-
-       u64 v_idx; /* maps directly to the index for this ring in the hardware
-                   * vector array, can also be used for finding the bit in EICR
-                   * and friends that represents the vector for this ring */
-
-       u16 work_limit;                /* max work per interrupt */
-       u16 rx_buf_len;
-};
-
-enum ixgbevf_ring_f_enum {
-       RING_F_NONE = 0,
-       RING_F_ARRAY_SIZE      /* must be last in enum set */
-};
-
-struct ixgbevf_ring_feature {
-       int indices;
-       int mask;
-};
-
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IXGBEVF_RX_BUFFER_WRITE        16      /* Must be power of 2 */
-
-#define MAX_RX_QUEUES 1
-#define MAX_TX_QUEUES 1
-
-#define IXGBEVF_DEFAULT_TXD   1024
-#define IXGBEVF_DEFAULT_RXD   512
-#define IXGBEVF_MAX_TXD       4096
-#define IXGBEVF_MIN_TXD       64
-#define IXGBEVF_MAX_RXD       4096
-#define IXGBEVF_MIN_RXD       64
-
-/* Supported Rx Buffer Sizes */
-#define IXGBEVF_RXBUFFER_64    64     /* Used for packet split */
-#define IXGBEVF_RXBUFFER_128   128    /* Used for packet split */
-#define IXGBEVF_RXBUFFER_256   256    /* Used for packet split */
-#define IXGBEVF_RXBUFFER_2048  2048
-#define IXGBEVF_MAX_RXBUFFER   16384  /* largest size for single descriptor */
-
-#define IXGBEVF_RX_HDR_SIZE IXGBEVF_RXBUFFER_256
-
-#define MAXIMUM_ETHERNET_VLAN_SIZE (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN)
-
-#define IXGBE_TX_FLAGS_CSUM            (u32)(1)
-#define IXGBE_TX_FLAGS_VLAN            (u32)(1 << 1)
-#define IXGBE_TX_FLAGS_TSO             (u32)(1 << 2)
-#define IXGBE_TX_FLAGS_IPV4            (u32)(1 << 3)
-#define IXGBE_TX_FLAGS_FCOE            (u32)(1 << 4)
-#define IXGBE_TX_FLAGS_FSO             (u32)(1 << 5)
-#define IXGBE_TX_FLAGS_VLAN_MASK       0xffff0000
-#define IXGBE_TX_FLAGS_VLAN_PRIO_MASK  0x0000e000
-#define IXGBE_TX_FLAGS_VLAN_SHIFT      16
-
-/* MAX_MSIX_Q_VECTORS of these are allocated,
- * but we only use one per queue-specific vector.
- */
-struct ixgbevf_q_vector {
-       struct ixgbevf_adapter *adapter;
-       struct napi_struct napi;
-       DECLARE_BITMAP(rxr_idx, MAX_RX_QUEUES); /* Rx ring indices */
-       DECLARE_BITMAP(txr_idx, MAX_TX_QUEUES); /* Tx ring indices */
-       u8 rxr_count;     /* Rx ring count assigned to this vector */
-       u8 txr_count;     /* Tx ring count assigned to this vector */
-       u8 tx_itr;
-       u8 rx_itr;
-       u32 eitr;
-       int v_idx;        /* vector index in list */
-};
-
-/* Helper macros to switch between ints/sec and what the register uses.
- * And yes, it's the same math going both ways.  The lowest value
- * supported by all of the ixgbe hardware is 8.
- */
-#define EITR_INTS_PER_SEC_TO_REG(_eitr) \
-       ((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8)
-#define EITR_REG_TO_INTS_PER_SEC EITR_INTS_PER_SEC_TO_REG
-
-#define IXGBE_DESC_UNUSED(R) \
-       ((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
-       (R)->next_to_clean - (R)->next_to_use - 1)
-
-#define IXGBE_RX_DESC_ADV(R, i)            \
-       (&(((union ixgbe_adv_rx_desc *)((R).desc))[i]))
-#define IXGBE_TX_DESC_ADV(R, i)            \
-       (&(((union ixgbe_adv_tx_desc *)((R).desc))[i]))
-#define IXGBE_TX_CTXTDESC_ADV(R, i)        \
-       (&(((struct ixgbe_adv_tx_context_desc *)((R).desc))[i]))
-
-#define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
-
-#define OTHER_VECTOR 1
-#define NON_Q_VECTORS (OTHER_VECTOR)
-
-#define MAX_MSIX_Q_VECTORS 2
-#define MAX_MSIX_COUNT 2
-
-#define MIN_MSIX_Q_VECTORS 2
-#define MIN_MSIX_COUNT (MIN_MSIX_Q_VECTORS + NON_Q_VECTORS)
-
-/* board specific private data structure */
-struct ixgbevf_adapter {
-       struct timer_list watchdog_timer;
-       unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-       u16 bd_number;
-       struct work_struct reset_task;
-       struct ixgbevf_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
-       char name[MAX_MSIX_COUNT][IFNAMSIZ + 9];
-
-       /* Interrupt Throttle Rate */
-       u32 itr_setting;
-       u16 eitr_low;
-       u16 eitr_high;
-
-       /* TX */
-       struct ixgbevf_ring *tx_ring;   /* One per active queue */
-       int num_tx_queues;
-       u64 restart_queue;
-       u64 hw_csum_tx_good;
-       u64 lsc_int;
-       u64 hw_tso_ctxt;
-       u64 hw_tso6_ctxt;
-       u32 tx_timeout_count;
-
-       /* RX */
-       struct ixgbevf_ring *rx_ring;   /* One per active queue */
-       int num_rx_queues;
-       int num_rx_pools;               /* == num_rx_queues in 82598 */
-       int num_rx_queues_per_pool;     /* 1 if 82598, can be many if 82599 */
-       u64 hw_csum_rx_error;
-       u64 hw_rx_no_dma_resources;
-       u64 hw_csum_rx_good;
-       u64 non_eop_descs;
-       int num_msix_vectors;
-       int max_msix_q_vectors;         /* true count of q_vectors for device */
-       struct ixgbevf_ring_feature ring_feature[RING_F_ARRAY_SIZE];
-       struct msix_entry *msix_entries;
-
-       u64 rx_hdr_split;
-       u32 alloc_rx_page_failed;
-       u32 alloc_rx_buff_failed;
-
-       /* Some features need tri-state capability,
-        * thus the additional *_CAPABLE flags.
-        */
-       u32 flags;
-#define IXGBE_FLAG_RX_CSUM_ENABLED              (u32)(1)
-#define IXGBE_FLAG_RX_1BUF_CAPABLE              (u32)(1 << 1)
-#define IXGBE_FLAG_RX_PS_CAPABLE                (u32)(1 << 2)
-#define IXGBE_FLAG_RX_PS_ENABLED                (u32)(1 << 3)
-#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 << 4)
-#define IXGBE_FLAG_IMIR_ENABLED                 (u32)(1 << 5)
-#define IXGBE_FLAG_MQ_CAPABLE                   (u32)(1 << 6)
-#define IXGBE_FLAG_NEED_LINK_UPDATE             (u32)(1 << 7)
-#define IXGBE_FLAG_IN_WATCHDOG_TASK             (u32)(1 << 8)
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-
-       /* structs defined in ixgbe_vf.h */
-       struct ixgbe_hw hw;
-       u16 msg_enable;
-       struct ixgbevf_hw_stats stats;
-       u64 zero_base;
-       /* Interrupt Throttle Rate */
-       u32 eitr_param;
-
-       unsigned long state;
-       u32 *config_space;
-       u64 tx_busy;
-       unsigned int tx_ring_count;
-       unsigned int rx_ring_count;
-
-       u32 link_speed;
-       bool link_up;
-       unsigned long link_check_timeout;
-
-       struct work_struct watchdog_task;
-       bool netdev_registered;
-       bool dev_closed;
-};
-
-enum ixbgevf_state_t {
-       __IXGBEVF_TESTING,
-       __IXGBEVF_RESETTING,
-       __IXGBEVF_DOWN
-};
-
-enum ixgbevf_boards {
-       board_82599_vf,
-       board_X540_vf,
-};
-
-extern struct ixgbevf_info ixgbevf_82599_vf_info;
-extern struct ixgbevf_info ixgbevf_X540_vf_info;
-extern struct ixgbe_mbx_operations ixgbevf_mbx_ops;
-
-/* needed by ethtool.c */
-extern char ixgbevf_driver_name[];
-extern const char ixgbevf_driver_version[];
-
-extern int ixgbevf_up(struct ixgbevf_adapter *adapter);
-extern void ixgbevf_down(struct ixgbevf_adapter *adapter);
-extern void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter);
-extern void ixgbevf_reset(struct ixgbevf_adapter *adapter);
-extern void ixgbevf_set_ethtool_ops(struct net_device *netdev);
-extern int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *,
-                                     struct ixgbevf_ring *);
-extern int ixgbevf_setup_tx_resources(struct ixgbevf_adapter *,
-                                     struct ixgbevf_ring *);
-extern void ixgbevf_free_rx_resources(struct ixgbevf_adapter *,
-                                     struct ixgbevf_ring *);
-extern void ixgbevf_free_tx_resources(struct ixgbevf_adapter *,
-                                     struct ixgbevf_ring *);
-extern void ixgbevf_update_stats(struct ixgbevf_adapter *adapter);
-
-#ifdef ETHTOOL_OPS_COMPAT
-extern int ethtool_ioctl(struct ifreq *ifr);
-
-#endif
-extern void ixgbe_napi_add_all(struct ixgbevf_adapter *adapter);
-extern void ixgbe_napi_del_all(struct ixgbevf_adapter *adapter);
-
-#ifdef DEBUG
-extern char *ixgbevf_get_hw_dev_name(struct ixgbe_hw *hw);
-#define hw_dbg(hw, format, arg...) \
-       printk(KERN_DEBUG "%s: " format, ixgbevf_get_hw_dev_name(hw), ##arg)
-#else
-#define hw_dbg(hw, format, arg...) do {} while (0)
-#endif
-
-#endif /* _IXGBEVF_H_ */
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
deleted file mode 100644 (file)
index 3b880a2..0000000
+++ /dev/null
@@ -1,3523 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-
-/******************************************************************************
- Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code
-******************************************************************************/
-#include <linux/types.h>
-#include <linux/bitops.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/vmalloc.h>
-#include <linux/string.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/ipv6.h>
-#include <linux/slab.h>
-#include <net/checksum.h>
-#include <net/ip6_checksum.h>
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-#include <linux/prefetch.h>
-
-#include "ixgbevf.h"
-
-char ixgbevf_driver_name[] = "ixgbevf";
-static const char ixgbevf_driver_string[] =
-       "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
-
-#define DRV_VERSION "2.1.0-k"
-const char ixgbevf_driver_version[] = DRV_VERSION;
-static char ixgbevf_copyright[] =
-       "Copyright (c) 2009 - 2010 Intel Corporation.";
-
-static const struct ixgbevf_info *ixgbevf_info_tbl[] = {
-       [board_82599_vf] = &ixgbevf_82599_vf_info,
-       [board_X540_vf]  = &ixgbevf_X540_vf_info,
-};
-
-/* ixgbevf_pci_tbl - PCI Device ID Table
- *
- * Wildcard entries (PCI_ANY_ID) should come last
- * Last entry must be all 0s
- *
- * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
- *   Class, Class Mask, private data (not used) }
- */
-static struct pci_device_id ixgbevf_pci_tbl[] = {
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF),
-       board_82599_vf},
-       {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF),
-       board_X540_vf},
-
-       /* required last entry */
-       {0, }
-};
-MODULE_DEVICE_TABLE(pci, ixgbevf_pci_tbl);
-
-MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
-MODULE_DESCRIPTION("Intel(R) 82599 Virtual Function Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-#define DEFAULT_DEBUG_LEVEL_SHIFT 3
-
-/* forward decls */
-static void ixgbevf_set_itr_msix(struct ixgbevf_q_vector *q_vector);
-static void ixgbevf_write_eitr(struct ixgbevf_adapter *adapter, int v_idx,
-                              u32 itr_reg);
-
-static inline void ixgbevf_release_rx_desc(struct ixgbe_hw *hw,
-                                          struct ixgbevf_ring *rx_ring,
-                                          u32 val)
-{
-       /*
-        * Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64).
-        */
-       wmb();
-       IXGBE_WRITE_REG(hw, IXGBE_VFRDT(rx_ring->reg_idx), val);
-}
-
-/*
- * ixgbevf_set_ivar - set IVAR registers - maps interrupt causes to vectors
- * @adapter: pointer to adapter struct
- * @direction: 0 for Rx, 1 for Tx, -1 for other causes
- * @queue: queue to map the corresponding interrupt to
- * @msix_vector: the vector to map to the corresponding queue
- *
- */
-static void ixgbevf_set_ivar(struct ixgbevf_adapter *adapter, s8 direction,
-                            u8 queue, u8 msix_vector)
-{
-       u32 ivar, index;
-       struct ixgbe_hw *hw = &adapter->hw;
-       if (direction == -1) {
-               /* other causes */
-               msix_vector |= IXGBE_IVAR_ALLOC_VAL;
-               ivar = IXGBE_READ_REG(hw, IXGBE_VTIVAR_MISC);
-               ivar &= ~0xFF;
-               ivar |= msix_vector;
-               IXGBE_WRITE_REG(hw, IXGBE_VTIVAR_MISC, ivar);
-       } else {
-               /* tx or rx causes */
-               msix_vector |= IXGBE_IVAR_ALLOC_VAL;
-               index = ((16 * (queue & 1)) + (8 * direction));
-               ivar = IXGBE_READ_REG(hw, IXGBE_VTIVAR(queue >> 1));
-               ivar &= ~(0xFF << index);
-               ivar |= (msix_vector << index);
-               IXGBE_WRITE_REG(hw, IXGBE_VTIVAR(queue >> 1), ivar);
-       }
-}
-
-static void ixgbevf_unmap_and_free_tx_resource(struct ixgbevf_adapter *adapter,
-                                              struct ixgbevf_tx_buffer
-                                              *tx_buffer_info)
-{
-       if (tx_buffer_info->dma) {
-               if (tx_buffer_info->mapped_as_page)
-                       dma_unmap_page(&adapter->pdev->dev,
-                                      tx_buffer_info->dma,
-                                      tx_buffer_info->length,
-                                      DMA_TO_DEVICE);
-               else
-                       dma_unmap_single(&adapter->pdev->dev,
-                                        tx_buffer_info->dma,
-                                        tx_buffer_info->length,
-                                        DMA_TO_DEVICE);
-               tx_buffer_info->dma = 0;
-       }
-       if (tx_buffer_info->skb) {
-               dev_kfree_skb_any(tx_buffer_info->skb);
-               tx_buffer_info->skb = NULL;
-       }
-       tx_buffer_info->time_stamp = 0;
-       /* tx_buffer_info must be completely set up in the transmit path */
-}
-
-#define IXGBE_MAX_TXD_PWR      14
-#define IXGBE_MAX_DATA_PER_TXD (1 << IXGBE_MAX_TXD_PWR)
-
-/* Tx Descriptors needed, worst case */
-#define TXD_USE_COUNT(S) (((S) >> IXGBE_MAX_TXD_PWR) + \
-                        (((S) & (IXGBE_MAX_DATA_PER_TXD - 1)) ? 1 : 0))
-#ifdef MAX_SKB_FRAGS
-#define DESC_NEEDED (TXD_USE_COUNT(IXGBE_MAX_DATA_PER_TXD) /* skb->data */ + \
-       MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1)      /* for context */
-#else
-#define DESC_NEEDED TXD_USE_COUNT(IXGBE_MAX_DATA_PER_TXD)
-#endif
-
-static void ixgbevf_tx_timeout(struct net_device *netdev);
-
-/**
- * ixgbevf_clean_tx_irq - Reclaim resources after transmit completes
- * @adapter: board private structure
- * @tx_ring: tx ring to clean
- **/
-static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter,
-                                struct ixgbevf_ring *tx_ring)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       union ixgbe_adv_tx_desc *tx_desc, *eop_desc;
-       struct ixgbevf_tx_buffer *tx_buffer_info;
-       unsigned int i, eop, count = 0;
-       unsigned int total_bytes = 0, total_packets = 0;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->tx_buffer_info[i].next_to_watch;
-       eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
-
-       while ((eop_desc->wb.status & cpu_to_le32(IXGBE_TXD_STAT_DD)) &&
-              (count < tx_ring->work_limit)) {
-               bool cleaned = false;
-               rmb(); /* read buffer_info after eop_desc */
-               for ( ; !cleaned; count++) {
-                       struct sk_buff *skb;
-                       tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, i);
-                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
-                       cleaned = (i == eop);
-                       skb = tx_buffer_info->skb;
-
-                       if (cleaned && skb) {
-                               unsigned int segs, bytecount;
-
-                               /* gso_segs is currently only valid for tcp */
-                               segs = skb_shinfo(skb)->gso_segs ?: 1;
-                               /* multiply data chunks by size of headers */
-                               bytecount = ((segs - 1) * skb_headlen(skb)) +
-                                           skb->len;
-                               total_packets += segs;
-                               total_bytes += bytecount;
-                       }
-
-                       ixgbevf_unmap_and_free_tx_resource(adapter,
-                                                          tx_buffer_info);
-
-                       tx_desc->wb.status = 0;
-
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-
-               eop = tx_ring->tx_buffer_info[i].next_to_watch;
-               eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
-       }
-
-       tx_ring->next_to_clean = i;
-
-#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
-       if (unlikely(count && netif_carrier_ok(netdev) &&
-                    (IXGBE_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD))) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean.
-                */
-               smp_mb();
-#ifdef HAVE_TX_MQ
-               if (__netif_subqueue_stopped(netdev, tx_ring->queue_index) &&
-                   !test_bit(__IXGBEVF_DOWN, &adapter->state)) {
-                       netif_wake_subqueue(netdev, tx_ring->queue_index);
-                       ++adapter->restart_queue;
-               }
-#else
-               if (netif_queue_stopped(netdev) &&
-                   !test_bit(__IXGBEVF_DOWN, &adapter->state)) {
-                       netif_wake_queue(netdev);
-                       ++adapter->restart_queue;
-               }
-#endif
-       }
-
-       /* re-arm the interrupt */
-       if ((count >= tx_ring->work_limit) &&
-           (!test_bit(__IXGBEVF_DOWN, &adapter->state))) {
-               IXGBE_WRITE_REG(hw, IXGBE_VTEICS, tx_ring->v_idx);
-       }
-
-       tx_ring->total_bytes += total_bytes;
-       tx_ring->total_packets += total_packets;
-
-       netdev->stats.tx_bytes += total_bytes;
-       netdev->stats.tx_packets += total_packets;
-
-       return count < tx_ring->work_limit;
-}
-
-/**
- * ixgbevf_receive_skb - Send a completed packet up the stack
- * @q_vector: structure containing interrupt and ring information
- * @skb: packet to send up
- * @status: hardware indication of status of receive
- * @rx_ring: rx descriptor ring (for a specific queue) to setup
- * @rx_desc: rx descriptor
- **/
-static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
-                               struct sk_buff *skb, u8 status,
-                               struct ixgbevf_ring *ring,
-                               union ixgbe_adv_rx_desc *rx_desc)
-{
-       struct ixgbevf_adapter *adapter = q_vector->adapter;
-       bool is_vlan = (status & IXGBE_RXD_STAT_VP);
-
-       if (is_vlan) {
-               u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
-
-               __vlan_hwaccel_put_tag(skb, tag);
-       }
-
-       if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))
-                       napi_gro_receive(&q_vector->napi, skb);
-       else
-                       netif_rx(skb);
-}
-
-/**
- * ixgbevf_rx_checksum - indicate in skb if hw indicated a good cksum
- * @adapter: address of board private structure
- * @status_err: hardware indication of status of receive
- * @skb: skb currently being received and modified
- **/
-static inline void ixgbevf_rx_checksum(struct ixgbevf_adapter *adapter,
-                                      u32 status_err, struct sk_buff *skb)
-{
-       skb_checksum_none_assert(skb);
-
-       /* Rx csum disabled */
-       if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED))
-               return;
-
-       /* if IP and error */
-       if ((status_err & IXGBE_RXD_STAT_IPCS) &&
-           (status_err & IXGBE_RXDADV_ERR_IPE)) {
-               adapter->hw_csum_rx_error++;
-               return;
-       }
-
-       if (!(status_err & IXGBE_RXD_STAT_L4CS))
-               return;
-
-       if (status_err & IXGBE_RXDADV_ERR_TCPE) {
-               adapter->hw_csum_rx_error++;
-               return;
-       }
-
-       /* It must be a TCP or UDP packet with a valid checksum */
-       skb->ip_summed = CHECKSUM_UNNECESSARY;
-       adapter->hw_csum_rx_good++;
-}
-
-/**
- * ixgbevf_alloc_rx_buffers - Replace used receive buffers; packet split
- * @adapter: address of board private structure
- **/
-static void ixgbevf_alloc_rx_buffers(struct ixgbevf_adapter *adapter,
-                                    struct ixgbevf_ring *rx_ring,
-                                    int cleaned_count)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       union ixgbe_adv_rx_desc *rx_desc;
-       struct ixgbevf_rx_buffer *bi;
-       struct sk_buff *skb;
-       unsigned int i;
-       unsigned int bufsz = rx_ring->rx_buf_len + NET_IP_ALIGN;
-
-       i = rx_ring->next_to_use;
-       bi = &rx_ring->rx_buffer_info[i];
-
-       while (cleaned_count--) {
-               rx_desc = IXGBE_RX_DESC_ADV(*rx_ring, i);
-
-               if (!bi->page_dma &&
-                   (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED)) {
-                       if (!bi->page) {
-                               bi->page = netdev_alloc_page(adapter->netdev);
-                               if (!bi->page) {
-                                       adapter->alloc_rx_page_failed++;
-                                       goto no_buffers;
-                               }
-                               bi->page_offset = 0;
-                       } else {
-                               /* use a half page if we're re-using */
-                               bi->page_offset ^= (PAGE_SIZE / 2);
-                       }
-
-                       bi->page_dma = dma_map_page(&pdev->dev, bi->page,
-                                                   bi->page_offset,
-                                                   (PAGE_SIZE / 2),
-                                                   DMA_FROM_DEVICE);
-               }
-
-               skb = bi->skb;
-               if (!skb) {
-                       skb = netdev_alloc_skb(adapter->netdev,
-                                                              bufsz);
-
-                       if (!skb) {
-                               adapter->alloc_rx_buff_failed++;
-                               goto no_buffers;
-                       }
-
-                       /*
-                        * Make buffer alignment 2 beyond a 16 byte boundary
-                        * this will result in a 16 byte aligned IP header after
-                        * the 14 byte MAC header is removed
-                        */
-                       skb_reserve(skb, NET_IP_ALIGN);
-
-                       bi->skb = skb;
-               }
-               if (!bi->dma) {
-                       bi->dma = dma_map_single(&pdev->dev, skb->data,
-                                                rx_ring->rx_buf_len,
-                                                DMA_FROM_DEVICE);
-               }
-               /* Refresh the desc even if buffer_addrs didn't change because
-                * each write-back erases this info. */
-               if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
-                       rx_desc->read.pkt_addr = cpu_to_le64(bi->page_dma);
-                       rx_desc->read.hdr_addr = cpu_to_le64(bi->dma);
-               } else {
-                       rx_desc->read.pkt_addr = cpu_to_le64(bi->dma);
-               }
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-               bi = &rx_ring->rx_buffer_info[i];
-       }
-
-no_buffers:
-       if (rx_ring->next_to_use != i) {
-               rx_ring->next_to_use = i;
-               if (i-- == 0)
-                       i = (rx_ring->count - 1);
-
-               ixgbevf_release_rx_desc(&adapter->hw, rx_ring, i);
-       }
-}
-
-static inline void ixgbevf_irq_enable_queues(struct ixgbevf_adapter *adapter,
-                                            u64 qmask)
-{
-       u32 mask;
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       mask = (qmask & 0xFFFFFFFF);
-       IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, mask);
-}
-
-static inline u16 ixgbevf_get_hdr_info(union ixgbe_adv_rx_desc *rx_desc)
-{
-       return rx_desc->wb.lower.lo_dword.hs_rss.hdr_info;
-}
-
-static inline u16 ixgbevf_get_pkt_info(union ixgbe_adv_rx_desc *rx_desc)
-{
-       return rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
-}
-
-static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector,
-                                struct ixgbevf_ring *rx_ring,
-                                int *work_done, int work_to_do)
-{
-       struct ixgbevf_adapter *adapter = q_vector->adapter;
-       struct pci_dev *pdev = adapter->pdev;
-       union ixgbe_adv_rx_desc *rx_desc, *next_rxd;
-       struct ixgbevf_rx_buffer *rx_buffer_info, *next_buffer;
-       struct sk_buff *skb;
-       unsigned int i;
-       u32 len, staterr;
-       u16 hdr_info;
-       bool cleaned = false;
-       int cleaned_count = 0;
-       unsigned int total_rx_bytes = 0, total_rx_packets = 0;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = IXGBE_RX_DESC_ADV(*rx_ring, i);
-       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-       rx_buffer_info = &rx_ring->rx_buffer_info[i];
-
-       while (staterr & IXGBE_RXD_STAT_DD) {
-               u32 upper_len = 0;
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-
-               rmb(); /* read descriptor and rx_buffer_info after status DD */
-               if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
-                       hdr_info = le16_to_cpu(ixgbevf_get_hdr_info(rx_desc));
-                       len = (hdr_info & IXGBE_RXDADV_HDRBUFLEN_MASK) >>
-                              IXGBE_RXDADV_HDRBUFLEN_SHIFT;
-                       if (hdr_info & IXGBE_RXDADV_SPH)
-                               adapter->rx_hdr_split++;
-                       if (len > IXGBEVF_RX_HDR_SIZE)
-                               len = IXGBEVF_RX_HDR_SIZE;
-                       upper_len = le16_to_cpu(rx_desc->wb.upper.length);
-               } else {
-                       len = le16_to_cpu(rx_desc->wb.upper.length);
-               }
-               cleaned = true;
-               skb = rx_buffer_info->skb;
-               prefetch(skb->data - NET_IP_ALIGN);
-               rx_buffer_info->skb = NULL;
-
-               if (rx_buffer_info->dma) {
-                       dma_unmap_single(&pdev->dev, rx_buffer_info->dma,
-                                        rx_ring->rx_buf_len,
-                                        DMA_FROM_DEVICE);
-                       rx_buffer_info->dma = 0;
-                       skb_put(skb, len);
-               }
-
-               if (upper_len) {
-                       dma_unmap_page(&pdev->dev, rx_buffer_info->page_dma,
-                                      PAGE_SIZE / 2, DMA_FROM_DEVICE);
-                       rx_buffer_info->page_dma = 0;
-                       skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
-                                          rx_buffer_info->page,
-                                          rx_buffer_info->page_offset,
-                                          upper_len);
-
-                       if ((rx_ring->rx_buf_len > (PAGE_SIZE / 2)) ||
-                           (page_count(rx_buffer_info->page) != 1))
-                               rx_buffer_info->page = NULL;
-                       else
-                               get_page(rx_buffer_info->page);
-
-                       skb->len += upper_len;
-                       skb->data_len += upper_len;
-                       skb->truesize += upper_len;
-               }
-
-               i++;
-               if (i == rx_ring->count)
-                       i = 0;
-
-               next_rxd = IXGBE_RX_DESC_ADV(*rx_ring, i);
-               prefetch(next_rxd);
-               cleaned_count++;
-
-               next_buffer = &rx_ring->rx_buffer_info[i];
-
-               if (!(staterr & IXGBE_RXD_STAT_EOP)) {
-                       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
-                               rx_buffer_info->skb = next_buffer->skb;
-                               rx_buffer_info->dma = next_buffer->dma;
-                               next_buffer->skb = skb;
-                               next_buffer->dma = 0;
-                       } else {
-                               skb->next = next_buffer->skb;
-                               skb->next->prev = skb;
-                       }
-                       adapter->non_eop_descs++;
-                       goto next_desc;
-               }
-
-               /* ERR_MASK will only have valid bits if EOP set */
-               if (unlikely(staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK)) {
-                       dev_kfree_skb_irq(skb);
-                       goto next_desc;
-               }
-
-               ixgbevf_rx_checksum(adapter, staterr, skb);
-
-               /* probably a little skewed due to removing CRC */
-               total_rx_bytes += skb->len;
-               total_rx_packets++;
-
-               /*
-                * Work around issue of some types of VM to VM loop back
-                * packets not getting split correctly
-                */
-               if (staterr & IXGBE_RXD_STAT_LB) {
-                       u32 header_fixup_len = skb_headlen(skb);
-                       if (header_fixup_len < 14)
-                               skb_push(skb, header_fixup_len);
-               }
-               skb->protocol = eth_type_trans(skb, adapter->netdev);
-
-               ixgbevf_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc);
-
-next_desc:
-               rx_desc->wb.upper.status_error = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (cleaned_count >= IXGBEVF_RX_BUFFER_WRITE) {
-                       ixgbevf_alloc_rx_buffers(adapter, rx_ring,
-                                                cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               rx_buffer_info = &rx_ring->rx_buffer_info[i];
-
-               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
-       }
-
-       rx_ring->next_to_clean = i;
-       cleaned_count = IXGBE_DESC_UNUSED(rx_ring);
-
-       if (cleaned_count)
-               ixgbevf_alloc_rx_buffers(adapter, rx_ring, cleaned_count);
-
-       rx_ring->total_packets += total_rx_packets;
-       rx_ring->total_bytes += total_rx_bytes;
-       adapter->netdev->stats.rx_bytes += total_rx_bytes;
-       adapter->netdev->stats.rx_packets += total_rx_packets;
-
-       return cleaned;
-}
-
-/**
- * ixgbevf_clean_rxonly - msix (aka one shot) rx clean routine
- * @napi: napi struct with our devices info in it
- * @budget: amount of work driver is allowed to do this pass, in packets
- *
- * This function is optimized for cleaning one queue only on a single
- * q_vector!!!
- **/
-static int ixgbevf_clean_rxonly(struct napi_struct *napi, int budget)
-{
-       struct ixgbevf_q_vector *q_vector =
-               container_of(napi, struct ixgbevf_q_vector, napi);
-       struct ixgbevf_adapter *adapter = q_vector->adapter;
-       struct ixgbevf_ring *rx_ring = NULL;
-       int work_done = 0;
-       long r_idx;
-
-       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-       rx_ring = &(adapter->rx_ring[r_idx]);
-
-       ixgbevf_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
-
-       /* If all Rx work done, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               if (adapter->itr_setting & 1)
-                       ixgbevf_set_itr_msix(q_vector);
-               if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
-                       ixgbevf_irq_enable_queues(adapter, rx_ring->v_idx);
-       }
-
-       return work_done;
-}
-
-/**
- * ixgbevf_clean_rxonly_many - msix (aka one shot) rx clean routine
- * @napi: napi struct with our devices info in it
- * @budget: amount of work driver is allowed to do this pass, in packets
- *
- * This function will clean more than one rx queue associated with a
- * q_vector.
- **/
-static int ixgbevf_clean_rxonly_many(struct napi_struct *napi, int budget)
-{
-       struct ixgbevf_q_vector *q_vector =
-               container_of(napi, struct ixgbevf_q_vector, napi);
-       struct ixgbevf_adapter *adapter = q_vector->adapter;
-       struct ixgbevf_ring *rx_ring = NULL;
-       int work_done = 0, i;
-       long r_idx;
-       u64 enable_mask = 0;
-
-       /* attempt to distribute budget to each queue fairly, but don't allow
-        * the budget to go below 1 because we'll exit polling */
-       budget /= (q_vector->rxr_count ?: 1);
-       budget = max(budget, 1);
-       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-       for (i = 0; i < q_vector->rxr_count; i++) {
-               rx_ring = &(adapter->rx_ring[r_idx]);
-               ixgbevf_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
-               enable_mask |= rx_ring->v_idx;
-               r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
-                                     r_idx + 1);
-       }
-
-#ifndef HAVE_NETDEV_NAPI_LIST
-       if (!netif_running(adapter->netdev))
-               work_done = 0;
-
-#endif
-       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-       rx_ring = &(adapter->rx_ring[r_idx]);
-
-       /* If all Rx work done, exit the polling mode */
-       if (work_done < budget) {
-               napi_complete(napi);
-               if (adapter->itr_setting & 1)
-                       ixgbevf_set_itr_msix(q_vector);
-               if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
-                       ixgbevf_irq_enable_queues(adapter, enable_mask);
-       }
-
-       return work_done;
-}
-
-
-/**
- * ixgbevf_configure_msix - Configure MSI-X hardware
- * @adapter: board private structure
- *
- * ixgbevf_configure_msix sets up the hardware to properly generate MSI-X
- * interrupts.
- **/
-static void ixgbevf_configure_msix(struct ixgbevf_adapter *adapter)
-{
-       struct ixgbevf_q_vector *q_vector;
-       struct ixgbe_hw *hw = &adapter->hw;
-       int i, j, q_vectors, v_idx, r_idx;
-       u32 mask;
-
-       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       /*
-        * Populate the IVAR table and set the ITR values to the
-        * corresponding register.
-        */
-       for (v_idx = 0; v_idx < q_vectors; v_idx++) {
-               q_vector = adapter->q_vector[v_idx];
-               /* XXX for_each_set_bit(...) */
-               r_idx = find_first_bit(q_vector->rxr_idx,
-                                      adapter->num_rx_queues);
-
-               for (i = 0; i < q_vector->rxr_count; i++) {
-                       j = adapter->rx_ring[r_idx].reg_idx;
-                       ixgbevf_set_ivar(adapter, 0, j, v_idx);
-                       r_idx = find_next_bit(q_vector->rxr_idx,
-                                             adapter->num_rx_queues,
-                                             r_idx + 1);
-               }
-               r_idx = find_first_bit(q_vector->txr_idx,
-                                      adapter->num_tx_queues);
-
-               for (i = 0; i < q_vector->txr_count; i++) {
-                       j = adapter->tx_ring[r_idx].reg_idx;
-                       ixgbevf_set_ivar(adapter, 1, j, v_idx);
-                       r_idx = find_next_bit(q_vector->txr_idx,
-                                             adapter->num_tx_queues,
-                                             r_idx + 1);
-               }
-
-               /* if this is a tx only vector halve the interrupt rate */
-               if (q_vector->txr_count && !q_vector->rxr_count)
-                       q_vector->eitr = (adapter->eitr_param >> 1);
-               else if (q_vector->rxr_count)
-                       /* rx only */
-                       q_vector->eitr = adapter->eitr_param;
-
-               ixgbevf_write_eitr(adapter, v_idx, q_vector->eitr);
-       }
-
-       ixgbevf_set_ivar(adapter, -1, 1, v_idx);
-
-       /* set up to autoclear timer, and the vectors */
-       mask = IXGBE_EIMS_ENABLE_MASK;
-       mask &= ~IXGBE_EIMS_OTHER;
-       IXGBE_WRITE_REG(hw, IXGBE_VTEIAC, mask);
-}
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-/**
- * ixgbevf_update_itr - update the dynamic ITR value based on statistics
- * @adapter: pointer to adapter
- * @eitr: eitr setting (ints per sec) to give last timeslice
- * @itr_setting: current throttle rate in ints/second
- * @packets: the number of packets during this measurement interval
- * @bytes: the number of bytes during this measurement interval
- *
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.
- **/
-static u8 ixgbevf_update_itr(struct ixgbevf_adapter *adapter,
-                            u32 eitr, u8 itr_setting,
-                            int packets, int bytes)
-{
-       unsigned int retval = itr_setting;
-       u32 timepassed_us;
-       u64 bytes_perint;
-
-       if (packets == 0)
-               goto update_itr_done;
-
-
-       /* simple throttlerate management
-        *    0-20MB/s lowest (100000 ints/s)
-        *   20-100MB/s low   (20000 ints/s)
-        *  100-1249MB/s bulk (8000 ints/s)
-        */
-       /* what was last interrupt timeslice? */
-       timepassed_us = 1000000/eitr;
-       bytes_perint = bytes / timepassed_us; /* bytes/usec */
-
-       switch (itr_setting) {
-       case lowest_latency:
-               if (bytes_perint > adapter->eitr_low)
-                       retval = low_latency;
-               break;
-       case low_latency:
-               if (bytes_perint > adapter->eitr_high)
-                       retval = bulk_latency;
-               else if (bytes_perint <= adapter->eitr_low)
-                       retval = lowest_latency;
-               break;
-       case bulk_latency:
-               if (bytes_perint <= adapter->eitr_high)
-                       retval = low_latency;
-               break;
-       }
-
-update_itr_done:
-       return retval;
-}
-
-/**
- * ixgbevf_write_eitr - write VTEITR register in hardware specific way
- * @adapter: pointer to adapter struct
- * @v_idx: vector index into q_vector array
- * @itr_reg: new value to be written in *register* format, not ints/s
- *
- * This function is made to be called by ethtool and by the driver
- * when it needs to update VTEITR registers at runtime.  Hardware
- * specific quirks/differences are taken care of here.
- */
-static void ixgbevf_write_eitr(struct ixgbevf_adapter *adapter, int v_idx,
-                              u32 itr_reg)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       itr_reg = EITR_INTS_PER_SEC_TO_REG(itr_reg);
-
-       /*
-        * set the WDIS bit to not clear the timer bits and cause an
-        * immediate assertion of the interrupt
-        */
-       itr_reg |= IXGBE_EITR_CNT_WDIS;
-
-       IXGBE_WRITE_REG(hw, IXGBE_VTEITR(v_idx), itr_reg);
-}
-
-static void ixgbevf_set_itr_msix(struct ixgbevf_q_vector *q_vector)
-{
-       struct ixgbevf_adapter *adapter = q_vector->adapter;
-       u32 new_itr;
-       u8 current_itr, ret_itr;
-       int i, r_idx, v_idx = q_vector->v_idx;
-       struct ixgbevf_ring *rx_ring, *tx_ring;
-
-       r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
-       for (i = 0; i < q_vector->txr_count; i++) {
-               tx_ring = &(adapter->tx_ring[r_idx]);
-               ret_itr = ixgbevf_update_itr(adapter, q_vector->eitr,
-                                            q_vector->tx_itr,
-                                            tx_ring->total_packets,
-                                            tx_ring->total_bytes);
-               /* if the result for this queue would decrease interrupt
-                * rate for this vector then use that result */
-               q_vector->tx_itr = ((q_vector->tx_itr > ret_itr) ?
-                                   q_vector->tx_itr - 1 : ret_itr);
-               r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
-                                     r_idx + 1);
-       }
-
-       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-       for (i = 0; i < q_vector->rxr_count; i++) {
-               rx_ring = &(adapter->rx_ring[r_idx]);
-               ret_itr = ixgbevf_update_itr(adapter, q_vector->eitr,
-                                            q_vector->rx_itr,
-                                            rx_ring->total_packets,
-                                            rx_ring->total_bytes);
-               /* if the result for this queue would decrease interrupt
-                * rate for this vector then use that result */
-               q_vector->rx_itr = ((q_vector->rx_itr > ret_itr) ?
-                                   q_vector->rx_itr - 1 : ret_itr);
-               r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
-                                     r_idx + 1);
-       }
-
-       current_itr = max(q_vector->rx_itr, q_vector->tx_itr);
-
-       switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
-       case lowest_latency:
-               new_itr = 100000;
-               break;
-       case low_latency:
-               new_itr = 20000; /* aka hwitr = ~200 */
-               break;
-       case bulk_latency:
-       default:
-               new_itr = 8000;
-               break;
-       }
-
-       if (new_itr != q_vector->eitr) {
-               u32 itr_reg;
-
-               /* save the algorithm value here, not the smoothed one */
-               q_vector->eitr = new_itr;
-               /* do an exponential smoothing */
-               new_itr = ((q_vector->eitr * 90)/100) + ((new_itr * 10)/100);
-               itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr);
-               ixgbevf_write_eitr(adapter, v_idx, itr_reg);
-       }
-}
-
-static irqreturn_t ixgbevf_msix_mbx(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 eicr;
-       u32 msg;
-
-       eicr = IXGBE_READ_REG(hw, IXGBE_VTEICS);
-       IXGBE_WRITE_REG(hw, IXGBE_VTEICR, eicr);
-
-       if (!hw->mbx.ops.check_for_ack(hw)) {
-               /*
-                * checking for the ack clears the PFACK bit.  Place
-                * it back in the v2p_mailbox cache so that anyone
-                * polling for an ack will not miss it.  Also
-                * avoid the read below because the code to read
-                * the mailbox will also clear the ack bit.  This was
-                * causing lost acks.  Just cache the bit and exit
-                * the IRQ handler.
-                */
-               hw->mbx.v2p_mailbox |= IXGBE_VFMAILBOX_PFACK;
-               goto out;
-       }
-
-       /* Not an ack interrupt, go ahead and read the message */
-       hw->mbx.ops.read(hw, &msg, 1);
-
-       if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG)
-               mod_timer(&adapter->watchdog_timer,
-                         round_jiffies(jiffies + 1));
-
-out:
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t ixgbevf_msix_clean_tx(int irq, void *data)
-{
-       struct ixgbevf_q_vector *q_vector = data;
-       struct ixgbevf_adapter  *adapter = q_vector->adapter;
-       struct ixgbevf_ring     *tx_ring;
-       int i, r_idx;
-
-       if (!q_vector->txr_count)
-               return IRQ_HANDLED;
-
-       r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
-       for (i = 0; i < q_vector->txr_count; i++) {
-               tx_ring = &(adapter->tx_ring[r_idx]);
-               tx_ring->total_bytes = 0;
-               tx_ring->total_packets = 0;
-               ixgbevf_clean_tx_irq(adapter, tx_ring);
-               r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
-                                     r_idx + 1);
-       }
-
-       if (adapter->itr_setting & 1)
-               ixgbevf_set_itr_msix(q_vector);
-
-       return IRQ_HANDLED;
-}
-
-/**
- * ixgbevf_msix_clean_rx - single unshared vector rx clean (all queues)
- * @irq: unused
- * @data: pointer to our q_vector struct for this interrupt vector
- **/
-static irqreturn_t ixgbevf_msix_clean_rx(int irq, void *data)
-{
-       struct ixgbevf_q_vector *q_vector = data;
-       struct ixgbevf_adapter  *adapter = q_vector->adapter;
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct ixgbevf_ring  *rx_ring;
-       int r_idx;
-       int i;
-
-       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-       for (i = 0; i < q_vector->rxr_count; i++) {
-               rx_ring = &(adapter->rx_ring[r_idx]);
-               rx_ring->total_bytes = 0;
-               rx_ring->total_packets = 0;
-               r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
-                                     r_idx + 1);
-       }
-
-       if (!q_vector->rxr_count)
-               return IRQ_HANDLED;
-
-       r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-       rx_ring = &(adapter->rx_ring[r_idx]);
-       /* disable interrupts on this vector only */
-       IXGBE_WRITE_REG(hw, IXGBE_VTEIMC, rx_ring->v_idx);
-       napi_schedule(&q_vector->napi);
-
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t ixgbevf_msix_clean_many(int irq, void *data)
-{
-       ixgbevf_msix_clean_rx(irq, data);
-       ixgbevf_msix_clean_tx(irq, data);
-
-       return IRQ_HANDLED;
-}
-
-static inline void map_vector_to_rxq(struct ixgbevf_adapter *a, int v_idx,
-                                    int r_idx)
-{
-       struct ixgbevf_q_vector *q_vector = a->q_vector[v_idx];
-
-       set_bit(r_idx, q_vector->rxr_idx);
-       q_vector->rxr_count++;
-       a->rx_ring[r_idx].v_idx = 1 << v_idx;
-}
-
-static inline void map_vector_to_txq(struct ixgbevf_adapter *a, int v_idx,
-                                    int t_idx)
-{
-       struct ixgbevf_q_vector *q_vector = a->q_vector[v_idx];
-
-       set_bit(t_idx, q_vector->txr_idx);
-       q_vector->txr_count++;
-       a->tx_ring[t_idx].v_idx = 1 << v_idx;
-}
-
-/**
- * ixgbevf_map_rings_to_vectors - Maps descriptor rings to vectors
- * @adapter: board private structure to initialize
- *
- * This function maps descriptor rings to the queue-specific vectors
- * we were allotted through the MSI-X enabling code.  Ideally, we'd have
- * one vector per ring/queue, but on a constrained vector budget, we
- * group the rings as "efficiently" as possible.  You would add new
- * mapping configurations in here.
- **/
-static int ixgbevf_map_rings_to_vectors(struct ixgbevf_adapter *adapter)
-{
-       int q_vectors;
-       int v_start = 0;
-       int rxr_idx = 0, txr_idx = 0;
-       int rxr_remaining = adapter->num_rx_queues;
-       int txr_remaining = adapter->num_tx_queues;
-       int i, j;
-       int rqpv, tqpv;
-       int err = 0;
-
-       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       /*
-        * The ideal configuration...
-        * We have enough vectors to map one per queue.
-        */
-       if (q_vectors == adapter->num_rx_queues + adapter->num_tx_queues) {
-               for (; rxr_idx < rxr_remaining; v_start++, rxr_idx++)
-                       map_vector_to_rxq(adapter, v_start, rxr_idx);
-
-               for (; txr_idx < txr_remaining; v_start++, txr_idx++)
-                       map_vector_to_txq(adapter, v_start, txr_idx);
-               goto out;
-       }
-
-       /*
-        * If we don't have enough vectors for a 1-to-1
-        * mapping, we'll have to group them so there are
-        * multiple queues per vector.
-        */
-       /* Re-adjusting *qpv takes care of the remainder. */
-       for (i = v_start; i < q_vectors; i++) {
-               rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors - i);
-               for (j = 0; j < rqpv; j++) {
-                       map_vector_to_rxq(adapter, i, rxr_idx);
-                       rxr_idx++;
-                       rxr_remaining--;
-               }
-       }
-       for (i = v_start; i < q_vectors; i++) {
-               tqpv = DIV_ROUND_UP(txr_remaining, q_vectors - i);
-               for (j = 0; j < tqpv; j++) {
-                       map_vector_to_txq(adapter, i, txr_idx);
-                       txr_idx++;
-                       txr_remaining--;
-               }
-       }
-
-out:
-       return err;
-}
-
-/**
- * ixgbevf_request_msix_irqs - Initialize MSI-X interrupts
- * @adapter: board private structure
- *
- * ixgbevf_request_msix_irqs allocates MSI-X vectors and requests
- * interrupts from the kernel.
- **/
-static int ixgbevf_request_msix_irqs(struct ixgbevf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       irqreturn_t (*handler)(int, void *);
-       int i, vector, q_vectors, err;
-       int ri = 0, ti = 0;
-
-       /* Decrement for Other and TCP Timer vectors */
-       q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-#define SET_HANDLER(_v) (((_v)->rxr_count && (_v)->txr_count)          \
-                                         ? &ixgbevf_msix_clean_many : \
-                         (_v)->rxr_count ? &ixgbevf_msix_clean_rx   : \
-                         (_v)->txr_count ? &ixgbevf_msix_clean_tx   : \
-                         NULL)
-       for (vector = 0; vector < q_vectors; vector++) {
-               handler = SET_HANDLER(adapter->q_vector[vector]);
-
-               if (handler == &ixgbevf_msix_clean_rx) {
-                       sprintf(adapter->name[vector], "%s-%s-%d",
-                               netdev->name, "rx", ri++);
-               } else if (handler == &ixgbevf_msix_clean_tx) {
-                       sprintf(adapter->name[vector], "%s-%s-%d",
-                               netdev->name, "tx", ti++);
-               } else if (handler == &ixgbevf_msix_clean_many) {
-                       sprintf(adapter->name[vector], "%s-%s-%d",
-                               netdev->name, "TxRx", vector);
-               } else {
-                       /* skip this unused q_vector */
-                       continue;
-               }
-               err = request_irq(adapter->msix_entries[vector].vector,
-                                 handler, 0, adapter->name[vector],
-                                 adapter->q_vector[vector]);
-               if (err) {
-                       hw_dbg(&adapter->hw,
-                              "request_irq failed for MSIX interrupt "
-                              "Error: %d\n", err);
-                       goto free_queue_irqs;
-               }
-       }
-
-       sprintf(adapter->name[vector], "%s:mbx", netdev->name);
-       err = request_irq(adapter->msix_entries[vector].vector,
-                         &ixgbevf_msix_mbx, 0, adapter->name[vector], netdev);
-       if (err) {
-               hw_dbg(&adapter->hw,
-                      "request_irq for msix_mbx failed: %d\n", err);
-               goto free_queue_irqs;
-       }
-
-       return 0;
-
-free_queue_irqs:
-       for (i = vector - 1; i >= 0; i--)
-               free_irq(adapter->msix_entries[--vector].vector,
-                        &(adapter->q_vector[i]));
-       pci_disable_msix(adapter->pdev);
-       kfree(adapter->msix_entries);
-       adapter->msix_entries = NULL;
-       return err;
-}
-
-static inline void ixgbevf_reset_q_vectors(struct ixgbevf_adapter *adapter)
-{
-       int i, q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       for (i = 0; i < q_vectors; i++) {
-               struct ixgbevf_q_vector *q_vector = adapter->q_vector[i];
-               bitmap_zero(q_vector->rxr_idx, MAX_RX_QUEUES);
-               bitmap_zero(q_vector->txr_idx, MAX_TX_QUEUES);
-               q_vector->rxr_count = 0;
-               q_vector->txr_count = 0;
-               q_vector->eitr = adapter->eitr_param;
-       }
-}
-
-/**
- * ixgbevf_request_irq - initialize interrupts
- * @adapter: board private structure
- *
- * Attempts to configure interrupts using the best available
- * capabilities of the hardware and kernel.
- **/
-static int ixgbevf_request_irq(struct ixgbevf_adapter *adapter)
-{
-       int err = 0;
-
-       err = ixgbevf_request_msix_irqs(adapter);
-
-       if (err)
-               hw_dbg(&adapter->hw,
-                      "request_irq failed, Error %d\n", err);
-
-       return err;
-}
-
-static void ixgbevf_free_irq(struct ixgbevf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int i, q_vectors;
-
-       q_vectors = adapter->num_msix_vectors;
-
-       i = q_vectors - 1;
-
-       free_irq(adapter->msix_entries[i].vector, netdev);
-       i--;
-
-       for (; i >= 0; i--) {
-               free_irq(adapter->msix_entries[i].vector,
-                        adapter->q_vector[i]);
-       }
-
-       ixgbevf_reset_q_vectors(adapter);
-}
-
-/**
- * ixgbevf_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- **/
-static inline void ixgbevf_irq_disable(struct ixgbevf_adapter *adapter)
-{
-       int i;
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       IXGBE_WRITE_REG(hw, IXGBE_VTEIMC, ~0);
-
-       IXGBE_WRITE_FLUSH(hw);
-
-       for (i = 0; i < adapter->num_msix_vectors; i++)
-               synchronize_irq(adapter->msix_entries[i].vector);
-}
-
-/**
- * ixgbevf_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- **/
-static inline void ixgbevf_irq_enable(struct ixgbevf_adapter *adapter,
-                                     bool queues, bool flush)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 mask;
-       u64 qmask;
-
-       mask = (IXGBE_EIMS_ENABLE_MASK & ~IXGBE_EIMS_RTX_QUEUE);
-       qmask = ~0;
-
-       IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, mask);
-
-       if (queues)
-               ixgbevf_irq_enable_queues(adapter, qmask);
-
-       if (flush)
-               IXGBE_WRITE_FLUSH(hw);
-}
-
-/**
- * ixgbevf_configure_tx - Configure 82599 VF Transmit Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-static void ixgbevf_configure_tx(struct ixgbevf_adapter *adapter)
-{
-       u64 tdba;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 i, j, tdlen, txctrl;
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               struct ixgbevf_ring *ring = &adapter->tx_ring[i];
-               j = ring->reg_idx;
-               tdba = ring->dma;
-               tdlen = ring->count * sizeof(union ixgbe_adv_tx_desc);
-               IXGBE_WRITE_REG(hw, IXGBE_VFTDBAL(j),
-                               (tdba & DMA_BIT_MASK(32)));
-               IXGBE_WRITE_REG(hw, IXGBE_VFTDBAH(j), (tdba >> 32));
-               IXGBE_WRITE_REG(hw, IXGBE_VFTDLEN(j), tdlen);
-               IXGBE_WRITE_REG(hw, IXGBE_VFTDH(j), 0);
-               IXGBE_WRITE_REG(hw, IXGBE_VFTDT(j), 0);
-               adapter->tx_ring[i].head = IXGBE_VFTDH(j);
-               adapter->tx_ring[i].tail = IXGBE_VFTDT(j);
-               /* Disable Tx Head Writeback RO bit, since this hoses
-                * bookkeeping if things aren't delivered in order.
-                */
-               txctrl = IXGBE_READ_REG(hw, IXGBE_VFDCA_TXCTRL(j));
-               txctrl &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
-               IXGBE_WRITE_REG(hw, IXGBE_VFDCA_TXCTRL(j), txctrl);
-       }
-}
-
-#define IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT        2
-
-static void ixgbevf_configure_srrctl(struct ixgbevf_adapter *adapter, int index)
-{
-       struct ixgbevf_ring *rx_ring;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 srrctl;
-
-       rx_ring = &adapter->rx_ring[index];
-
-       srrctl = IXGBE_SRRCTL_DROP_EN;
-
-       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
-               u16 bufsz = IXGBEVF_RXBUFFER_2048;
-               /* grow the amount we can receive on large page machines */
-               if (bufsz < (PAGE_SIZE / 2))
-                       bufsz = (PAGE_SIZE / 2);
-               /* cap the bufsz at our largest descriptor size */
-               bufsz = min((u16)IXGBEVF_MAX_RXBUFFER, bufsz);
-
-               srrctl |= bufsz >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
-               srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
-               srrctl |= ((IXGBEVF_RX_HDR_SIZE <<
-                          IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) &
-                          IXGBE_SRRCTL_BSIZEHDR_MASK);
-       } else {
-               srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF;
-
-               if (rx_ring->rx_buf_len == MAXIMUM_ETHERNET_VLAN_SIZE)
-                       srrctl |= IXGBEVF_RXBUFFER_2048 >>
-                               IXGBE_SRRCTL_BSIZEPKT_SHIFT;
-               else
-                       srrctl |= rx_ring->rx_buf_len >>
-                               IXGBE_SRRCTL_BSIZEPKT_SHIFT;
-       }
-       IXGBE_WRITE_REG(hw, IXGBE_VFSRRCTL(index), srrctl);
-}
-
-/**
- * ixgbevf_configure_rx - Configure 82599 VF Receive Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
-{
-       u64 rdba;
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
-       int i, j;
-       u32 rdlen;
-       int rx_buf_len;
-
-       /* Decide whether to use packet split mode or not */
-       if (netdev->mtu > ETH_DATA_LEN) {
-               if (adapter->flags & IXGBE_FLAG_RX_PS_CAPABLE)
-                       adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
-               else
-                       adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
-       } else {
-               if (adapter->flags & IXGBE_FLAG_RX_1BUF_CAPABLE)
-                       adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
-               else
-                       adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
-       }
-
-       /* Set the RX buffer length according to the mode */
-       if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
-               /* PSRTYPE must be initialized in 82599 */
-               u32 psrtype = IXGBE_PSRTYPE_TCPHDR |
-                       IXGBE_PSRTYPE_UDPHDR |
-                       IXGBE_PSRTYPE_IPV4HDR |
-                       IXGBE_PSRTYPE_IPV6HDR |
-                       IXGBE_PSRTYPE_L2HDR;
-               IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, psrtype);
-               rx_buf_len = IXGBEVF_RX_HDR_SIZE;
-       } else {
-               IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, 0);
-               if (netdev->mtu <= ETH_DATA_LEN)
-                       rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-               else
-                       rx_buf_len = ALIGN(max_frame, 1024);
-       }
-
-       rdlen = adapter->rx_ring[0].count * sizeof(union ixgbe_adv_rx_desc);
-       /* Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring */
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               rdba = adapter->rx_ring[i].dma;
-               j = adapter->rx_ring[i].reg_idx;
-               IXGBE_WRITE_REG(hw, IXGBE_VFRDBAL(j),
-                               (rdba & DMA_BIT_MASK(32)));
-               IXGBE_WRITE_REG(hw, IXGBE_VFRDBAH(j), (rdba >> 32));
-               IXGBE_WRITE_REG(hw, IXGBE_VFRDLEN(j), rdlen);
-               IXGBE_WRITE_REG(hw, IXGBE_VFRDH(j), 0);
-               IXGBE_WRITE_REG(hw, IXGBE_VFRDT(j), 0);
-               adapter->rx_ring[i].head = IXGBE_VFRDH(j);
-               adapter->rx_ring[i].tail = IXGBE_VFRDT(j);
-               adapter->rx_ring[i].rx_buf_len = rx_buf_len;
-
-               ixgbevf_configure_srrctl(adapter, j);
-       }
-}
-
-static void ixgbevf_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       /* add VID to filter table */
-       if (hw->mac.ops.set_vfta)
-               hw->mac.ops.set_vfta(hw, vid, 0, true);
-       set_bit(vid, adapter->active_vlans);
-}
-
-static void ixgbevf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       /* remove VID from filter table */
-       if (hw->mac.ops.set_vfta)
-               hw->mac.ops.set_vfta(hw, vid, 0, false);
-       clear_bit(vid, adapter->active_vlans);
-}
-
-static void ixgbevf_restore_vlan(struct ixgbevf_adapter *adapter)
-{
-       u16 vid;
-
-       for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-               ixgbevf_vlan_rx_add_vid(adapter->netdev, vid);
-}
-
-static int ixgbevf_write_uc_addr_list(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       int count = 0;
-
-       if ((netdev_uc_count(netdev)) > 10) {
-               printk(KERN_ERR "Too many unicast filters - No Space\n");
-               return -ENOSPC;
-       }
-
-       if (!netdev_uc_empty(netdev)) {
-               struct netdev_hw_addr *ha;
-               netdev_for_each_uc_addr(ha, netdev) {
-                       hw->mac.ops.set_uc_addr(hw, ++count, ha->addr);
-                       udelay(200);
-               }
-       } else {
-               /*
-                * If the list is empty then send message to PF driver to
-                * clear all macvlans on this VF.
-                */
-               hw->mac.ops.set_uc_addr(hw, 0, NULL);
-       }
-
-       return count;
-}
-
-/**
- * ixgbevf_set_rx_mode - Multicast set
- * @netdev: network interface device structure
- *
- * The set_rx_method entry point is called whenever the multicast address
- * list or the network interface flags are updated.  This routine is
- * responsible for configuring the hardware for proper multicast mode.
- **/
-static void ixgbevf_set_rx_mode(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       /* reprogram multicast list */
-       if (hw->mac.ops.update_mc_addr_list)
-               hw->mac.ops.update_mc_addr_list(hw, netdev);
-
-       ixgbevf_write_uc_addr_list(netdev);
-}
-
-static void ixgbevf_napi_enable_all(struct ixgbevf_adapter *adapter)
-{
-       int q_idx;
-       struct ixgbevf_q_vector *q_vector;
-       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
-               struct napi_struct *napi;
-               q_vector = adapter->q_vector[q_idx];
-               if (!q_vector->rxr_count)
-                       continue;
-               napi = &q_vector->napi;
-               if (q_vector->rxr_count > 1)
-                       napi->poll = &ixgbevf_clean_rxonly_many;
-
-               napi_enable(napi);
-       }
-}
-
-static void ixgbevf_napi_disable_all(struct ixgbevf_adapter *adapter)
-{
-       int q_idx;
-       struct ixgbevf_q_vector *q_vector;
-       int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-
-       for (q_idx = 0; q_idx < q_vectors; q_idx++) {
-               q_vector = adapter->q_vector[q_idx];
-               if (!q_vector->rxr_count)
-                       continue;
-               napi_disable(&q_vector->napi);
-       }
-}
-
-static void ixgbevf_configure(struct ixgbevf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int i;
-
-       ixgbevf_set_rx_mode(netdev);
-
-       ixgbevf_restore_vlan(adapter);
-
-       ixgbevf_configure_tx(adapter);
-       ixgbevf_configure_rx(adapter);
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct ixgbevf_ring *ring = &adapter->rx_ring[i];
-               ixgbevf_alloc_rx_buffers(adapter, ring, ring->count);
-               ring->next_to_use = ring->count - 1;
-               writel(ring->next_to_use, adapter->hw.hw_addr + ring->tail);
-       }
-}
-
-#define IXGBE_MAX_RX_DESC_POLL 10
-static inline void ixgbevf_rx_desc_queue_enable(struct ixgbevf_adapter *adapter,
-                                               int rxr)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       int j = adapter->rx_ring[rxr].reg_idx;
-       int k;
-
-       for (k = 0; k < IXGBE_MAX_RX_DESC_POLL; k++) {
-               if (IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j)) & IXGBE_RXDCTL_ENABLE)
-                       break;
-               else
-                       msleep(1);
-       }
-       if (k >= IXGBE_MAX_RX_DESC_POLL) {
-               hw_dbg(hw, "RXDCTL.ENABLE on Rx queue %d "
-                      "not set within the polling period\n", rxr);
-       }
-
-       ixgbevf_release_rx_desc(&adapter->hw, &adapter->rx_ring[rxr],
-                               (adapter->rx_ring[rxr].count - 1));
-}
-
-static void ixgbevf_save_reset_stats(struct ixgbevf_adapter *adapter)
-{
-       /* Only save pre-reset stats if there are some */
-       if (adapter->stats.vfgprc || adapter->stats.vfgptc) {
-               adapter->stats.saved_reset_vfgprc += adapter->stats.vfgprc -
-                       adapter->stats.base_vfgprc;
-               adapter->stats.saved_reset_vfgptc += adapter->stats.vfgptc -
-                       adapter->stats.base_vfgptc;
-               adapter->stats.saved_reset_vfgorc += adapter->stats.vfgorc -
-                       adapter->stats.base_vfgorc;
-               adapter->stats.saved_reset_vfgotc += adapter->stats.vfgotc -
-                       adapter->stats.base_vfgotc;
-               adapter->stats.saved_reset_vfmprc += adapter->stats.vfmprc -
-                       adapter->stats.base_vfmprc;
-       }
-}
-
-static void ixgbevf_init_last_counter_stats(struct ixgbevf_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       adapter->stats.last_vfgprc = IXGBE_READ_REG(hw, IXGBE_VFGPRC);
-       adapter->stats.last_vfgorc = IXGBE_READ_REG(hw, IXGBE_VFGORC_LSB);
-       adapter->stats.last_vfgorc |=
-               (((u64)(IXGBE_READ_REG(hw, IXGBE_VFGORC_MSB))) << 32);
-       adapter->stats.last_vfgptc = IXGBE_READ_REG(hw, IXGBE_VFGPTC);
-       adapter->stats.last_vfgotc = IXGBE_READ_REG(hw, IXGBE_VFGOTC_LSB);
-       adapter->stats.last_vfgotc |=
-               (((u64)(IXGBE_READ_REG(hw, IXGBE_VFGOTC_MSB))) << 32);
-       adapter->stats.last_vfmprc = IXGBE_READ_REG(hw, IXGBE_VFMPRC);
-
-       adapter->stats.base_vfgprc = adapter->stats.last_vfgprc;
-       adapter->stats.base_vfgorc = adapter->stats.last_vfgorc;
-       adapter->stats.base_vfgptc = adapter->stats.last_vfgptc;
-       adapter->stats.base_vfgotc = adapter->stats.last_vfgotc;
-       adapter->stats.base_vfmprc = adapter->stats.last_vfmprc;
-}
-
-static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       int i, j = 0;
-       int num_rx_rings = adapter->num_rx_queues;
-       u32 txdctl, rxdctl;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               j = adapter->tx_ring[i].reg_idx;
-               txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j));
-               /* enable WTHRESH=8 descriptors, to encourage burst writeback */
-               txdctl |= (8 << 16);
-               IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j), txdctl);
-       }
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               j = adapter->tx_ring[i].reg_idx;
-               txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j));
-               txdctl |= IXGBE_TXDCTL_ENABLE;
-               IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j), txdctl);
-       }
-
-       for (i = 0; i < num_rx_rings; i++) {
-               j = adapter->rx_ring[i].reg_idx;
-               rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j));
-               rxdctl |= IXGBE_RXDCTL_ENABLE | IXGBE_RXDCTL_VME;
-               if (hw->mac.type == ixgbe_mac_X540_vf) {
-                       rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
-                       rxdctl |= ((netdev->mtu + ETH_HLEN + ETH_FCS_LEN) |
-                                  IXGBE_RXDCTL_RLPML_EN);
-               }
-               IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(j), rxdctl);
-               ixgbevf_rx_desc_queue_enable(adapter, i);
-       }
-
-       ixgbevf_configure_msix(adapter);
-
-       if (hw->mac.ops.set_rar) {
-               if (is_valid_ether_addr(hw->mac.addr))
-                       hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0);
-               else
-                       hw->mac.ops.set_rar(hw, 0, hw->mac.perm_addr, 0);
-       }
-
-       clear_bit(__IXGBEVF_DOWN, &adapter->state);
-       ixgbevf_napi_enable_all(adapter);
-
-       /* enable transmits */
-       netif_tx_start_all_queues(netdev);
-
-       ixgbevf_save_reset_stats(adapter);
-       ixgbevf_init_last_counter_stats(adapter);
-
-       /* bring the link up in the watchdog, this could race with our first
-        * link up interrupt but shouldn't be a problem */
-       adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
-       adapter->link_check_timeout = jiffies;
-       mod_timer(&adapter->watchdog_timer, jiffies);
-       return 0;
-}
-
-int ixgbevf_up(struct ixgbevf_adapter *adapter)
-{
-       int err;
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       ixgbevf_configure(adapter);
-
-       err = ixgbevf_up_complete(adapter);
-
-       /* clear any pending interrupts, may auto mask */
-       IXGBE_READ_REG(hw, IXGBE_VTEICR);
-
-       ixgbevf_irq_enable(adapter, true, true);
-
-       return err;
-}
-
-/**
- * ixgbevf_clean_rx_ring - Free Rx Buffers per Queue
- * @adapter: board private structure
- * @rx_ring: ring to free buffers from
- **/
-static void ixgbevf_clean_rx_ring(struct ixgbevf_adapter *adapter,
-                                 struct ixgbevf_ring *rx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned long size;
-       unsigned int i;
-
-       if (!rx_ring->rx_buffer_info)
-               return;
-
-       /* Free all the Rx ring sk_buffs */
-       for (i = 0; i < rx_ring->count; i++) {
-               struct ixgbevf_rx_buffer *rx_buffer_info;
-
-               rx_buffer_info = &rx_ring->rx_buffer_info[i];
-               if (rx_buffer_info->dma) {
-                       dma_unmap_single(&pdev->dev, rx_buffer_info->dma,
-                                        rx_ring->rx_buf_len,
-                                        DMA_FROM_DEVICE);
-                       rx_buffer_info->dma = 0;
-               }
-               if (rx_buffer_info->skb) {
-                       struct sk_buff *skb = rx_buffer_info->skb;
-                       rx_buffer_info->skb = NULL;
-                       do {
-                               struct sk_buff *this = skb;
-                               skb = skb->prev;
-                               dev_kfree_skb(this);
-                       } while (skb);
-               }
-               if (!rx_buffer_info->page)
-                       continue;
-               dma_unmap_page(&pdev->dev, rx_buffer_info->page_dma,
-                              PAGE_SIZE / 2, DMA_FROM_DEVICE);
-               rx_buffer_info->page_dma = 0;
-               put_page(rx_buffer_info->page);
-               rx_buffer_info->page = NULL;
-               rx_buffer_info->page_offset = 0;
-       }
-
-       size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count;
-       memset(rx_ring->rx_buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       if (rx_ring->head)
-               writel(0, adapter->hw.hw_addr + rx_ring->head);
-       if (rx_ring->tail)
-               writel(0, adapter->hw.hw_addr + rx_ring->tail);
-}
-
-/**
- * ixgbevf_clean_tx_ring - Free Tx Buffers
- * @adapter: board private structure
- * @tx_ring: ring to be cleaned
- **/
-static void ixgbevf_clean_tx_ring(struct ixgbevf_adapter *adapter,
-                                 struct ixgbevf_ring *tx_ring)
-{
-       struct ixgbevf_tx_buffer *tx_buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       if (!tx_ring->tx_buffer_info)
-               return;
-
-       /* Free all the Tx ring sk_buffs */
-
-       for (i = 0; i < tx_ring->count; i++) {
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               ixgbevf_unmap_and_free_tx_resource(adapter, tx_buffer_info);
-       }
-
-       size = sizeof(struct ixgbevf_tx_buffer) * tx_ring->count;
-       memset(tx_ring->tx_buffer_info, 0, size);
-
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-
-       if (tx_ring->head)
-               writel(0, adapter->hw.hw_addr + tx_ring->head);
-       if (tx_ring->tail)
-               writel(0, adapter->hw.hw_addr + tx_ring->tail);
-}
-
-/**
- * ixgbevf_clean_all_rx_rings - Free Rx Buffers for all queues
- * @adapter: board private structure
- **/
-static void ixgbevf_clean_all_rx_rings(struct ixgbevf_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               ixgbevf_clean_rx_ring(adapter, &adapter->rx_ring[i]);
-}
-
-/**
- * ixgbevf_clean_all_tx_rings - Free Tx Buffers for all queues
- * @adapter: board private structure
- **/
-static void ixgbevf_clean_all_tx_rings(struct ixgbevf_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               ixgbevf_clean_tx_ring(adapter, &adapter->tx_ring[i]);
-}
-
-void ixgbevf_down(struct ixgbevf_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 txdctl;
-       int i, j;
-
-       /* signal that we are down to the interrupt handler */
-       set_bit(__IXGBEVF_DOWN, &adapter->state);
-       /* disable receives */
-
-       netif_tx_disable(netdev);
-
-       msleep(10);
-
-       netif_tx_stop_all_queues(netdev);
-
-       ixgbevf_irq_disable(adapter);
-
-       ixgbevf_napi_disable_all(adapter);
-
-       del_timer_sync(&adapter->watchdog_timer);
-       /* can't call flush scheduled work here because it can deadlock
-        * if linkwatch_event tries to acquire the rtnl_lock which we are
-        * holding */
-       while (adapter->flags & IXGBE_FLAG_IN_WATCHDOG_TASK)
-               msleep(1);
-
-       /* disable transmits in the hardware now that interrupts are off */
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               j = adapter->tx_ring[i].reg_idx;
-               txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j));
-               IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j),
-                               (txdctl & ~IXGBE_TXDCTL_ENABLE));
-       }
-
-       netif_carrier_off(netdev);
-
-       if (!pci_channel_offline(adapter->pdev))
-               ixgbevf_reset(adapter);
-
-       ixgbevf_clean_all_tx_rings(adapter);
-       ixgbevf_clean_all_rx_rings(adapter);
-}
-
-void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       WARN_ON(in_interrupt());
-
-       while (test_and_set_bit(__IXGBEVF_RESETTING, &adapter->state))
-               msleep(1);
-
-       /*
-        * Check if PF is up before re-init.  If not then skip until
-        * later when the PF is up and ready to service requests from
-        * the VF via mailbox.  If the VF is up and running then the
-        * watchdog task will continue to schedule reset tasks until
-        * the PF is up and running.
-        */
-       if (!hw->mac.ops.reset_hw(hw)) {
-               ixgbevf_down(adapter);
-               ixgbevf_up(adapter);
-       }
-
-       clear_bit(__IXGBEVF_RESETTING, &adapter->state);
-}
-
-void ixgbevf_reset(struct ixgbevf_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-
-       if (hw->mac.ops.reset_hw(hw))
-               hw_dbg(hw, "PF still resetting\n");
-       else
-               hw->mac.ops.init_hw(hw);
-
-       if (is_valid_ether_addr(adapter->hw.mac.addr)) {
-               memcpy(netdev->dev_addr, adapter->hw.mac.addr,
-                      netdev->addr_len);
-               memcpy(netdev->perm_addr, adapter->hw.mac.addr,
-                      netdev->addr_len);
-       }
-}
-
-static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
-                                        int vectors)
-{
-       int err, vector_threshold;
-
-       /* We'll want at least 3 (vector_threshold):
-        * 1) TxQ[0] Cleanup
-        * 2) RxQ[0] Cleanup
-        * 3) Other (Link Status Change, etc.)
-        */
-       vector_threshold = MIN_MSIX_COUNT;
-
-       /* The more we get, the more we will assign to Tx/Rx Cleanup
-        * for the separate queues...where Rx Cleanup >= Tx Cleanup.
-        * Right now, we simply care about how many we'll get; we'll
-        * set them up later while requesting irq's.
-        */
-       while (vectors >= vector_threshold) {
-               err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
-                                     vectors);
-               if (!err) /* Success in acquiring all requested vectors. */
-                       break;
-               else if (err < 0)
-                       vectors = 0; /* Nasty failure, quit now */
-               else /* err == number of vectors we should try again with */
-                       vectors = err;
-       }
-
-       if (vectors < vector_threshold) {
-               /* Can't allocate enough MSI-X interrupts?  Oh well.
-                * This just means we'll go with either a single MSI
-                * vector or fall back to legacy interrupts.
-                */
-               hw_dbg(&adapter->hw,
-                      "Unable to allocate MSI-X interrupts\n");
-               kfree(adapter->msix_entries);
-               adapter->msix_entries = NULL;
-       } else {
-               /*
-                * Adjust for only the vectors we'll use, which is minimum
-                * of max_msix_q_vectors + NON_Q_VECTORS, or the number of
-                * vectors we were allocated.
-                */
-               adapter->num_msix_vectors = vectors;
-       }
-}
-
-/*
- * ixgbevf_set_num_queues: Allocate queues for device, feature dependent
- * @adapter: board private structure to initialize
- *
- * This is the top level queue allocation routine.  The order here is very
- * important, starting with the "most" number of features turned on at once,
- * and ending with the smallest set of features.  This way large combinations
- * can be allocated if they're turned on, and smaller combinations are the
- * fallthrough conditions.
- *
- **/
-static void ixgbevf_set_num_queues(struct ixgbevf_adapter *adapter)
-{
-       /* Start with base case */
-       adapter->num_rx_queues = 1;
-       adapter->num_tx_queues = 1;
-       adapter->num_rx_pools = adapter->num_rx_queues;
-       adapter->num_rx_queues_per_pool = 1;
-}
-
-/**
- * ixgbevf_alloc_queues - Allocate memory for all rings
- * @adapter: board private structure to initialize
- *
- * We allocate one ring per queue at run-time since we don't know the
- * number of queues at compile-time.  The polling_netdev array is
- * intended for Multiqueue, but should work fine with a single queue.
- **/
-static int ixgbevf_alloc_queues(struct ixgbevf_adapter *adapter)
-{
-       int i;
-
-       adapter->tx_ring = kcalloc(adapter->num_tx_queues,
-                                  sizeof(struct ixgbevf_ring), GFP_KERNEL);
-       if (!adapter->tx_ring)
-               goto err_tx_ring_allocation;
-
-       adapter->rx_ring = kcalloc(adapter->num_rx_queues,
-                                  sizeof(struct ixgbevf_ring), GFP_KERNEL);
-       if (!adapter->rx_ring)
-               goto err_rx_ring_allocation;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               adapter->tx_ring[i].count = adapter->tx_ring_count;
-               adapter->tx_ring[i].queue_index = i;
-               adapter->tx_ring[i].reg_idx = i;
-       }
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               adapter->rx_ring[i].count = adapter->rx_ring_count;
-               adapter->rx_ring[i].queue_index = i;
-               adapter->rx_ring[i].reg_idx = i;
-       }
-
-       return 0;
-
-err_rx_ring_allocation:
-       kfree(adapter->tx_ring);
-err_tx_ring_allocation:
-       return -ENOMEM;
-}
-
-/**
- * ixgbevf_set_interrupt_capability - set MSI-X or FAIL if not supported
- * @adapter: board private structure to initialize
- *
- * Attempt to configure the interrupts using the best available
- * capabilities of the hardware and the kernel.
- **/
-static int ixgbevf_set_interrupt_capability(struct ixgbevf_adapter *adapter)
-{
-       int err = 0;
-       int vector, v_budget;
-
-       /*
-        * It's easy to be greedy for MSI-X vectors, but it really
-        * doesn't do us much good if we have a lot more vectors
-        * than CPU's.  So let's be conservative and only ask for
-        * (roughly) twice the number of vectors as there are CPU's.
-        */
-       v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues,
-                      (int)(num_online_cpus() * 2)) + NON_Q_VECTORS;
-
-       /* A failure in MSI-X entry allocation isn't fatal, but it does
-        * mean we disable MSI-X capabilities of the adapter. */
-       adapter->msix_entries = kcalloc(v_budget,
-                                       sizeof(struct msix_entry), GFP_KERNEL);
-       if (!adapter->msix_entries) {
-               err = -ENOMEM;
-               goto out;
-       }
-
-       for (vector = 0; vector < v_budget; vector++)
-               adapter->msix_entries[vector].entry = vector;
-
-       ixgbevf_acquire_msix_vectors(adapter, v_budget);
-
-out:
-       return err;
-}
-
-/**
- * ixgbevf_alloc_q_vectors - Allocate memory for interrupt vectors
- * @adapter: board private structure to initialize
- *
- * We allocate one q_vector per queue interrupt.  If allocation fails we
- * return -ENOMEM.
- **/
-static int ixgbevf_alloc_q_vectors(struct ixgbevf_adapter *adapter)
-{
-       int q_idx, num_q_vectors;
-       struct ixgbevf_q_vector *q_vector;
-       int napi_vectors;
-       int (*poll)(struct napi_struct *, int);
-
-       num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-       napi_vectors = adapter->num_rx_queues;
-       poll = &ixgbevf_clean_rxonly;
-
-       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
-               q_vector = kzalloc(sizeof(struct ixgbevf_q_vector), GFP_KERNEL);
-               if (!q_vector)
-                       goto err_out;
-               q_vector->adapter = adapter;
-               q_vector->v_idx = q_idx;
-               q_vector->eitr = adapter->eitr_param;
-               if (q_idx < napi_vectors)
-                       netif_napi_add(adapter->netdev, &q_vector->napi,
-                                      (*poll), 64);
-               adapter->q_vector[q_idx] = q_vector;
-       }
-
-       return 0;
-
-err_out:
-       while (q_idx) {
-               q_idx--;
-               q_vector = adapter->q_vector[q_idx];
-               netif_napi_del(&q_vector->napi);
-               kfree(q_vector);
-               adapter->q_vector[q_idx] = NULL;
-       }
-       return -ENOMEM;
-}
-
-/**
- * ixgbevf_free_q_vectors - Free memory allocated for interrupt vectors
- * @adapter: board private structure to initialize
- *
- * This function frees the memory allocated to the q_vectors.  In addition if
- * NAPI is enabled it will delete any references to the NAPI struct prior
- * to freeing the q_vector.
- **/
-static void ixgbevf_free_q_vectors(struct ixgbevf_adapter *adapter)
-{
-       int q_idx, num_q_vectors;
-       int napi_vectors;
-
-       num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-       napi_vectors = adapter->num_rx_queues;
-
-       for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
-               struct ixgbevf_q_vector *q_vector = adapter->q_vector[q_idx];
-
-               adapter->q_vector[q_idx] = NULL;
-               if (q_idx < napi_vectors)
-                       netif_napi_del(&q_vector->napi);
-               kfree(q_vector);
-       }
-}
-
-/**
- * ixgbevf_reset_interrupt_capability - Reset MSIX setup
- * @adapter: board private structure
- *
- **/
-static void ixgbevf_reset_interrupt_capability(struct ixgbevf_adapter *adapter)
-{
-       pci_disable_msix(adapter->pdev);
-       kfree(adapter->msix_entries);
-       adapter->msix_entries = NULL;
-}
-
-/**
- * ixgbevf_init_interrupt_scheme - Determine if MSIX is supported and init
- * @adapter: board private structure to initialize
- *
- **/
-static int ixgbevf_init_interrupt_scheme(struct ixgbevf_adapter *adapter)
-{
-       int err;
-
-       /* Number of supported queues */
-       ixgbevf_set_num_queues(adapter);
-
-       err = ixgbevf_set_interrupt_capability(adapter);
-       if (err) {
-               hw_dbg(&adapter->hw,
-                      "Unable to setup interrupt capabilities\n");
-               goto err_set_interrupt;
-       }
-
-       err = ixgbevf_alloc_q_vectors(adapter);
-       if (err) {
-               hw_dbg(&adapter->hw, "Unable to allocate memory for queue "
-                      "vectors\n");
-               goto err_alloc_q_vectors;
-       }
-
-       err = ixgbevf_alloc_queues(adapter);
-       if (err) {
-               printk(KERN_ERR "Unable to allocate memory for queues\n");
-               goto err_alloc_queues;
-       }
-
-       hw_dbg(&adapter->hw, "Multiqueue %s: Rx Queue count = %u, "
-              "Tx Queue count = %u\n",
-              (adapter->num_rx_queues > 1) ? "Enabled" :
-              "Disabled", adapter->num_rx_queues, adapter->num_tx_queues);
-
-       set_bit(__IXGBEVF_DOWN, &adapter->state);
-
-       return 0;
-err_alloc_queues:
-       ixgbevf_free_q_vectors(adapter);
-err_alloc_q_vectors:
-       ixgbevf_reset_interrupt_capability(adapter);
-err_set_interrupt:
-       return err;
-}
-
-/**
- * ixgbevf_sw_init - Initialize general software structures
- * (struct ixgbevf_adapter)
- * @adapter: board private structure to initialize
- *
- * ixgbevf_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 __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       int err;
-
-       /* PCI config space info */
-
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-       hw->revision_id = pdev->revision;
-       hw->subsystem_vendor_id = pdev->subsystem_vendor;
-       hw->subsystem_device_id = pdev->subsystem_device;
-
-       hw->mbx.ops.init_params(hw);
-       hw->mac.max_tx_queues = MAX_TX_QUEUES;
-       hw->mac.max_rx_queues = MAX_RX_QUEUES;
-       err = hw->mac.ops.reset_hw(hw);
-       if (err) {
-               dev_info(&pdev->dev,
-                        "PF still in reset state, assigning new address\n");
-               dev_hw_addr_random(adapter->netdev, hw->mac.addr);
-       } else {
-               err = hw->mac.ops.init_hw(hw);
-               if (err) {
-                       printk(KERN_ERR "init_shared_code failed: %d\n", err);
-                       goto out;
-               }
-       }
-
-       /* Enable dynamic interrupt throttling rates */
-       adapter->eitr_param = 20000;
-       adapter->itr_setting = 1;
-
-       /* set defaults for eitr in MegaBytes */
-       adapter->eitr_low = 10;
-       adapter->eitr_high = 20;
-
-       /* set default ring sizes */
-       adapter->tx_ring_count = IXGBEVF_DEFAULT_TXD;
-       adapter->rx_ring_count = IXGBEVF_DEFAULT_RXD;
-
-       /* enable rx csum by default */
-       adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
-
-       set_bit(__IXGBEVF_DOWN, &adapter->state);
-
-out:
-       return err;
-}
-
-#define UPDATE_VF_COUNTER_32bit(reg, last_counter, counter)    \
-       {                                                       \
-               u32 current_counter = IXGBE_READ_REG(hw, reg);  \
-               if (current_counter < last_counter)             \
-                       counter += 0x100000000LL;               \
-               last_counter = current_counter;                 \
-               counter &= 0xFFFFFFFF00000000LL;                \
-               counter |= current_counter;                     \
-       }
-
-#define UPDATE_VF_COUNTER_36bit(reg_lsb, reg_msb, last_counter, counter) \
-       {                                                                \
-               u64 current_counter_lsb = IXGBE_READ_REG(hw, reg_lsb);   \
-               u64 current_counter_msb = IXGBE_READ_REG(hw, reg_msb);   \
-               u64 current_counter = (current_counter_msb << 32) |      \
-                       current_counter_lsb;                             \
-               if (current_counter < last_counter)                      \
-                       counter += 0x1000000000LL;                       \
-               last_counter = current_counter;                          \
-               counter &= 0xFFFFFFF000000000LL;                         \
-               counter |= current_counter;                              \
-       }
-/**
- * ixgbevf_update_stats - Update the board statistics counters.
- * @adapter: board private structure
- **/
-void ixgbevf_update_stats(struct ixgbevf_adapter *adapter)
-{
-       struct ixgbe_hw *hw = &adapter->hw;
-
-       UPDATE_VF_COUNTER_32bit(IXGBE_VFGPRC, adapter->stats.last_vfgprc,
-                               adapter->stats.vfgprc);
-       UPDATE_VF_COUNTER_32bit(IXGBE_VFGPTC, adapter->stats.last_vfgptc,
-                               adapter->stats.vfgptc);
-       UPDATE_VF_COUNTER_36bit(IXGBE_VFGORC_LSB, IXGBE_VFGORC_MSB,
-                               adapter->stats.last_vfgorc,
-                               adapter->stats.vfgorc);
-       UPDATE_VF_COUNTER_36bit(IXGBE_VFGOTC_LSB, IXGBE_VFGOTC_MSB,
-                               adapter->stats.last_vfgotc,
-                               adapter->stats.vfgotc);
-       UPDATE_VF_COUNTER_32bit(IXGBE_VFMPRC, adapter->stats.last_vfmprc,
-                               adapter->stats.vfmprc);
-
-       /* Fill out the OS statistics structure */
-       adapter->netdev->stats.multicast = adapter->stats.vfmprc -
-               adapter->stats.base_vfmprc;
-}
-
-/**
- * ixgbevf_watchdog - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void ixgbevf_watchdog(unsigned long data)
-{
-       struct ixgbevf_adapter *adapter = (struct ixgbevf_adapter *)data;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u64 eics = 0;
-       int i;
-
-       /*
-        * Do the watchdog outside of interrupt context due to the lovely
-        * delays that some of the newer hardware requires
-        */
-
-       if (test_bit(__IXGBEVF_DOWN, &adapter->state))
-               goto watchdog_short_circuit;
-
-       /* get one bit for every active tx/rx interrupt vector */
-       for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) {
-               struct ixgbevf_q_vector *qv = adapter->q_vector[i];
-               if (qv->rxr_count || qv->txr_count)
-                       eics |= (1 << i);
-       }
-
-       IXGBE_WRITE_REG(hw, IXGBE_VTEICS, (u32)eics);
-
-watchdog_short_circuit:
-       schedule_work(&adapter->watchdog_task);
-}
-
-/**
- * ixgbevf_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-static void ixgbevf_tx_timeout(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-
-       /* Do the reset outside of interrupt context */
-       schedule_work(&adapter->reset_task);
-}
-
-static void ixgbevf_reset_task(struct work_struct *work)
-{
-       struct ixgbevf_adapter *adapter;
-       adapter = container_of(work, struct ixgbevf_adapter, reset_task);
-
-       /* If we're already down or resetting, just bail */
-       if (test_bit(__IXGBEVF_DOWN, &adapter->state) ||
-           test_bit(__IXGBEVF_RESETTING, &adapter->state))
-               return;
-
-       adapter->tx_timeout_count++;
-
-       ixgbevf_reinit_locked(adapter);
-}
-
-/**
- * ixgbevf_watchdog_task - worker thread to bring link up
- * @work: pointer to work_struct containing our data
- **/
-static void ixgbevf_watchdog_task(struct work_struct *work)
-{
-       struct ixgbevf_adapter *adapter = container_of(work,
-                                                      struct ixgbevf_adapter,
-                                                      watchdog_task);
-       struct net_device *netdev = adapter->netdev;
-       struct ixgbe_hw *hw = &adapter->hw;
-       u32 link_speed = adapter->link_speed;
-       bool link_up = adapter->link_up;
-
-       adapter->flags |= IXGBE_FLAG_IN_WATCHDOG_TASK;
-
-       /*
-        * Always check the link on the watchdog because we have
-        * no LSC interrupt
-        */
-       if (hw->mac.ops.check_link) {
-               if ((hw->mac.ops.check_link(hw, &link_speed,
-                                           &link_up, false)) != 0) {
-                       adapter->link_up = link_up;
-                       adapter->link_speed = link_speed;
-                       netif_carrier_off(netdev);
-                       netif_tx_stop_all_queues(netdev);
-                       schedule_work(&adapter->reset_task);
-                       goto pf_has_reset;
-               }
-       } else {
-               /* always assume link is up, if no check link
-                * function */
-               link_speed = IXGBE_LINK_SPEED_10GB_FULL;
-               link_up = true;
-       }
-       adapter->link_up = link_up;
-       adapter->link_speed = link_speed;
-
-       if (link_up) {
-               if (!netif_carrier_ok(netdev)) {
-                       hw_dbg(&adapter->hw, "NIC Link is Up, %u Gbps\n",
-                              (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
-                              10 : 1);
-                       netif_carrier_on(netdev);
-                       netif_tx_wake_all_queues(netdev);
-               }
-       } else {
-               adapter->link_up = false;
-               adapter->link_speed = 0;
-               if (netif_carrier_ok(netdev)) {
-                       hw_dbg(&adapter->hw, "NIC Link is Down\n");
-                       netif_carrier_off(netdev);
-                       netif_tx_stop_all_queues(netdev);
-               }
-       }
-
-       ixgbevf_update_stats(adapter);
-
-pf_has_reset:
-       /* Reset the timer */
-       if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
-               mod_timer(&adapter->watchdog_timer,
-                         round_jiffies(jiffies + (2 * HZ)));
-
-       adapter->flags &= ~IXGBE_FLAG_IN_WATCHDOG_TASK;
-}
-
-/**
- * ixgbevf_free_tx_resources - Free Tx Resources per Queue
- * @adapter: board private structure
- * @tx_ring: Tx descriptor ring for a specific queue
- *
- * Free all transmit software resources
- **/
-void ixgbevf_free_tx_resources(struct ixgbevf_adapter *adapter,
-                              struct ixgbevf_ring *tx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       ixgbevf_clean_tx_ring(adapter, tx_ring);
-
-       vfree(tx_ring->tx_buffer_info);
-       tx_ring->tx_buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, tx_ring->size, tx_ring->desc,
-                         tx_ring->dma);
-
-       tx_ring->desc = NULL;
-}
-
-/**
- * ixgbevf_free_all_tx_resources - Free Tx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all transmit software resources
- **/
-static void ixgbevf_free_all_tx_resources(struct ixgbevf_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               if (adapter->tx_ring[i].desc)
-                       ixgbevf_free_tx_resources(adapter,
-                                                 &adapter->tx_ring[i]);
-
-}
-
-/**
- * ixgbevf_setup_tx_resources - allocate Tx resources (Descriptors)
- * @adapter: board private structure
- * @tx_ring:    tx descriptor ring (for a specific queue) to setup
- *
- * Return 0 on success, negative on failure
- **/
-int ixgbevf_setup_tx_resources(struct ixgbevf_adapter *adapter,
-                              struct ixgbevf_ring *tx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int size;
-
-       size = sizeof(struct ixgbevf_tx_buffer) * tx_ring->count;
-       tx_ring->tx_buffer_info = vzalloc(size);
-       if (!tx_ring->tx_buffer_info)
-               goto err;
-
-       /* round up to nearest 4K */
-       tx_ring->size = tx_ring->count * sizeof(union ixgbe_adv_tx_desc);
-       tx_ring->size = ALIGN(tx_ring->size, 4096);
-
-       tx_ring->desc = dma_alloc_coherent(&pdev->dev, tx_ring->size,
-                                          &tx_ring->dma, GFP_KERNEL);
-       if (!tx_ring->desc)
-               goto err;
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-       tx_ring->work_limit = tx_ring->count;
-       return 0;
-
-err:
-       vfree(tx_ring->tx_buffer_info);
-       tx_ring->tx_buffer_info = NULL;
-       hw_dbg(&adapter->hw, "Unable to allocate memory for the transmit "
-              "descriptor ring\n");
-       return -ENOMEM;
-}
-
-/**
- * ixgbevf_setup_all_tx_resources - allocate all queues Tx resources
- * @adapter: board private structure
- *
- * If this function returns with an error, then it's possible one or
- * more of the rings is populated (while the rest are not).  It is the
- * callers duty to clean those orphaned rings.
- *
- * Return 0 on success, negative on failure
- **/
-static int ixgbevf_setup_all_tx_resources(struct ixgbevf_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               err = ixgbevf_setup_tx_resources(adapter, &adapter->tx_ring[i]);
-               if (!err)
-                       continue;
-               hw_dbg(&adapter->hw,
-                      "Allocation for Tx Queue %u failed\n", i);
-               break;
-       }
-
-       return err;
-}
-
-/**
- * ixgbevf_setup_rx_resources - allocate Rx resources (Descriptors)
- * @adapter: board private structure
- * @rx_ring:    rx descriptor ring (for a specific queue) to setup
- *
- * Returns 0 on success, negative on failure
- **/
-int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
-                              struct ixgbevf_ring *rx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int size;
-
-       size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count;
-       rx_ring->rx_buffer_info = vzalloc(size);
-       if (!rx_ring->rx_buffer_info) {
-               hw_dbg(&adapter->hw,
-                      "Unable to vmalloc buffer memory for "
-                      "the receive descriptor ring\n");
-               goto alloc_failed;
-       }
-
-       /* Round up to nearest 4K */
-       rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
-       rx_ring->size = ALIGN(rx_ring->size, 4096);
-
-       rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
-                                          &rx_ring->dma, GFP_KERNEL);
-
-       if (!rx_ring->desc) {
-               hw_dbg(&adapter->hw,
-                      "Unable to allocate memory for "
-                      "the receive descriptor ring\n");
-               vfree(rx_ring->rx_buffer_info);
-               rx_ring->rx_buffer_info = NULL;
-               goto alloc_failed;
-       }
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       return 0;
-alloc_failed:
-       return -ENOMEM;
-}
-
-/**
- * ixgbevf_setup_all_rx_resources - allocate all queues Rx resources
- * @adapter: board private structure
- *
- * If this function returns with an error, then it's possible one or
- * more of the rings is populated (while the rest are not).  It is the
- * callers duty to clean those orphaned rings.
- *
- * Return 0 on success, negative on failure
- **/
-static int ixgbevf_setup_all_rx_resources(struct ixgbevf_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               err = ixgbevf_setup_rx_resources(adapter, &adapter->rx_ring[i]);
-               if (!err)
-                       continue;
-               hw_dbg(&adapter->hw,
-                      "Allocation for Rx Queue %u failed\n", i);
-               break;
-       }
-       return err;
-}
-
-/**
- * ixgbevf_free_rx_resources - Free Rx Resources
- * @adapter: board private structure
- * @rx_ring: ring to clean the resources from
- *
- * Free all receive software resources
- **/
-void ixgbevf_free_rx_resources(struct ixgbevf_adapter *adapter,
-                              struct ixgbevf_ring *rx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       ixgbevf_clean_rx_ring(adapter, rx_ring);
-
-       vfree(rx_ring->rx_buffer_info);
-       rx_ring->rx_buffer_info = NULL;
-
-       dma_free_coherent(&pdev->dev, rx_ring->size, rx_ring->desc,
-                         rx_ring->dma);
-
-       rx_ring->desc = NULL;
-}
-
-/**
- * ixgbevf_free_all_rx_resources - Free Rx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all receive software resources
- **/
-static void ixgbevf_free_all_rx_resources(struct ixgbevf_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               if (adapter->rx_ring[i].desc)
-                       ixgbevf_free_rx_resources(adapter,
-                                                 &adapter->rx_ring[i]);
-}
-
-/**
- * ixgbevf_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-static int ixgbevf_open(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       int err;
-
-       /* disallow open during test */
-       if (test_bit(__IXGBEVF_TESTING, &adapter->state))
-               return -EBUSY;
-
-       if (hw->adapter_stopped) {
-               ixgbevf_reset(adapter);
-               /* if adapter is still stopped then PF isn't up and
-                * the vf can't start. */
-               if (hw->adapter_stopped) {
-                       err = IXGBE_ERR_MBX;
-                       printk(KERN_ERR "Unable to start - perhaps the PF"
-                              " Driver isn't up yet\n");
-                       goto err_setup_reset;
-               }
-       }
-
-       /* allocate transmit descriptors */
-       err = ixgbevf_setup_all_tx_resources(adapter);
-       if (err)
-               goto err_setup_tx;
-
-       /* allocate receive descriptors */
-       err = ixgbevf_setup_all_rx_resources(adapter);
-       if (err)
-               goto err_setup_rx;
-
-       ixgbevf_configure(adapter);
-
-       /*
-        * Map the Tx/Rx rings to the vectors we were allotted.
-        * if request_irq will be called in this function map_rings
-        * must be called *before* up_complete
-        */
-       ixgbevf_map_rings_to_vectors(adapter);
-
-       err = ixgbevf_up_complete(adapter);
-       if (err)
-               goto err_up;
-
-       /* clear any pending interrupts, may auto mask */
-       IXGBE_READ_REG(hw, IXGBE_VTEICR);
-       err = ixgbevf_request_irq(adapter);
-       if (err)
-               goto err_req_irq;
-
-       ixgbevf_irq_enable(adapter, true, true);
-
-       return 0;
-
-err_req_irq:
-       ixgbevf_down(adapter);
-err_up:
-       ixgbevf_free_irq(adapter);
-err_setup_rx:
-       ixgbevf_free_all_rx_resources(adapter);
-err_setup_tx:
-       ixgbevf_free_all_tx_resources(adapter);
-       ixgbevf_reset(adapter);
-
-err_setup_reset:
-
-       return err;
-}
-
-/**
- * ixgbevf_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-static int ixgbevf_close(struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-
-       ixgbevf_down(adapter);
-       ixgbevf_free_irq(adapter);
-
-       ixgbevf_free_all_tx_resources(adapter);
-       ixgbevf_free_all_rx_resources(adapter);
-
-       return 0;
-}
-
-static int ixgbevf_tso(struct ixgbevf_adapter *adapter,
-                      struct ixgbevf_ring *tx_ring,
-                      struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
-{
-       struct ixgbe_adv_tx_context_desc *context_desc;
-       unsigned int i;
-       int err;
-       struct ixgbevf_tx_buffer *tx_buffer_info;
-       u32 vlan_macip_lens = 0, type_tucmd_mlhl;
-       u32 mss_l4len_idx, l4len;
-
-       if (skb_is_gso(skb)) {
-               if (skb_header_cloned(skb)) {
-                       err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                       if (err)
-                               return err;
-               }
-               l4len = tcp_hdrlen(skb);
-               *hdr_len += l4len;
-
-               if (skb->protocol == htons(ETH_P_IP)) {
-                       struct iphdr *iph = ip_hdr(skb);
-                       iph->tot_len = 0;
-                       iph->check = 0;
-                       tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                                iph->daddr, 0,
-                                                                IPPROTO_TCP,
-                                                                0);
-                       adapter->hw_tso_ctxt++;
-               } else if (skb_is_gso_v6(skb)) {
-                       ipv6_hdr(skb)->payload_len = 0;
-                       tcp_hdr(skb)->check =
-                           ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                            &ipv6_hdr(skb)->daddr,
-                                            0, IPPROTO_TCP, 0);
-                       adapter->hw_tso6_ctxt++;
-               }
-
-               i = tx_ring->next_to_use;
-
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               context_desc = IXGBE_TX_CTXTDESC_ADV(*tx_ring, i);
-
-               /* VLAN MACLEN IPLEN */
-               if (tx_flags & IXGBE_TX_FLAGS_VLAN)
-                       vlan_macip_lens |=
-                               (tx_flags & IXGBE_TX_FLAGS_VLAN_MASK);
-               vlan_macip_lens |= ((skb_network_offset(skb)) <<
-                                   IXGBE_ADVTXD_MACLEN_SHIFT);
-               *hdr_len += skb_network_offset(skb);
-               vlan_macip_lens |=
-                       (skb_transport_header(skb) - skb_network_header(skb));
-               *hdr_len +=
-                       (skb_transport_header(skb) - skb_network_header(skb));
-               context_desc->vlan_macip_lens = cpu_to_le32(vlan_macip_lens);
-               context_desc->seqnum_seed = 0;
-
-               /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
-               type_tucmd_mlhl = (IXGBE_TXD_CMD_DEXT |
-                                   IXGBE_ADVTXD_DTYP_CTXT);
-
-               if (skb->protocol == htons(ETH_P_IP))
-                       type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
-               type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
-               context_desc->type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);
-
-               /* MSS L4LEN IDX */
-               mss_l4len_idx =
-                       (skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT);
-               mss_l4len_idx |= (l4len << IXGBE_ADVTXD_L4LEN_SHIFT);
-               /* use index 1 for TSO */
-               mss_l4len_idx |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
-               context_desc->mss_l4len_idx = cpu_to_le32(mss_l4len_idx);
-
-               tx_buffer_info->time_stamp = jiffies;
-               tx_buffer_info->next_to_watch = i;
-
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-               tx_ring->next_to_use = i;
-
-               return true;
-       }
-
-       return false;
-}
-
-static bool ixgbevf_tx_csum(struct ixgbevf_adapter *adapter,
-                           struct ixgbevf_ring *tx_ring,
-                           struct sk_buff *skb, u32 tx_flags)
-{
-       struct ixgbe_adv_tx_context_desc *context_desc;
-       unsigned int i;
-       struct ixgbevf_tx_buffer *tx_buffer_info;
-       u32 vlan_macip_lens = 0, type_tucmd_mlhl = 0;
-
-       if (skb->ip_summed == CHECKSUM_PARTIAL ||
-           (tx_flags & IXGBE_TX_FLAGS_VLAN)) {
-               i = tx_ring->next_to_use;
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               context_desc = IXGBE_TX_CTXTDESC_ADV(*tx_ring, i);
-
-               if (tx_flags & IXGBE_TX_FLAGS_VLAN)
-                       vlan_macip_lens |= (tx_flags &
-                                           IXGBE_TX_FLAGS_VLAN_MASK);
-               vlan_macip_lens |= (skb_network_offset(skb) <<
-                                   IXGBE_ADVTXD_MACLEN_SHIFT);
-               if (skb->ip_summed == CHECKSUM_PARTIAL)
-                       vlan_macip_lens |= (skb_transport_header(skb) -
-                                           skb_network_header(skb));
-
-               context_desc->vlan_macip_lens = cpu_to_le32(vlan_macip_lens);
-               context_desc->seqnum_seed = 0;
-
-               type_tucmd_mlhl |= (IXGBE_TXD_CMD_DEXT |
-                                   IXGBE_ADVTXD_DTYP_CTXT);
-
-               if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                       switch (skb->protocol) {
-                       case __constant_htons(ETH_P_IP):
-                               type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
-                               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
-                                       type_tucmd_mlhl |=
-                                           IXGBE_ADVTXD_TUCMD_L4T_TCP;
-                               break;
-                       case __constant_htons(ETH_P_IPV6):
-                               /* XXX what about other V6 headers?? */
-                               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                                       type_tucmd_mlhl |=
-                                               IXGBE_ADVTXD_TUCMD_L4T_TCP;
-                               break;
-                       default:
-                               if (unlikely(net_ratelimit())) {
-                                       printk(KERN_WARNING
-                                              "partial checksum but "
-                                              "proto=%x!\n",
-                                              skb->protocol);
-                               }
-                               break;
-                       }
-               }
-
-               context_desc->type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);
-               /* use index zero for tx checksum offload */
-               context_desc->mss_l4len_idx = 0;
-
-               tx_buffer_info->time_stamp = jiffies;
-               tx_buffer_info->next_to_watch = i;
-
-               adapter->hw_csum_tx_good++;
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-               tx_ring->next_to_use = i;
-
-               return true;
-       }
-
-       return false;
-}
-
-static int ixgbevf_tx_map(struct ixgbevf_adapter *adapter,
-                         struct ixgbevf_ring *tx_ring,
-                         struct sk_buff *skb, u32 tx_flags,
-                         unsigned int first)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       struct ixgbevf_tx_buffer *tx_buffer_info;
-       unsigned int len;
-       unsigned int total = skb->len;
-       unsigned int offset = 0, size;
-       int count = 0;
-       unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
-       unsigned int f;
-       int i;
-
-       i = tx_ring->next_to_use;
-
-       len = min(skb_headlen(skb), total);
-       while (len) {
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               size = min(len, (unsigned int)IXGBE_MAX_DATA_PER_TXD);
-
-               tx_buffer_info->length = size;
-               tx_buffer_info->mapped_as_page = false;
-               tx_buffer_info->dma = dma_map_single(&adapter->pdev->dev,
-                                                    skb->data + offset,
-                                                    size, DMA_TO_DEVICE);
-               if (dma_mapping_error(&pdev->dev, tx_buffer_info->dma))
-                       goto dma_error;
-               tx_buffer_info->time_stamp = jiffies;
-               tx_buffer_info->next_to_watch = i;
-
-               len -= size;
-               total -= size;
-               offset += size;
-               count++;
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-       }
-
-       for (f = 0; f < nr_frags; f++) {
-               struct skb_frag_struct *frag;
-
-               frag = &skb_shinfo(skb)->frags[f];
-               len = min((unsigned int)frag->size, total);
-               offset = frag->page_offset;
-
-               while (len) {
-                       tx_buffer_info = &tx_ring->tx_buffer_info[i];
-                       size = min(len, (unsigned int)IXGBE_MAX_DATA_PER_TXD);
-
-                       tx_buffer_info->length = size;
-                       tx_buffer_info->dma = dma_map_page(&adapter->pdev->dev,
-                                                          frag->page,
-                                                          offset,
-                                                          size,
-                                                          DMA_TO_DEVICE);
-                       tx_buffer_info->mapped_as_page = true;
-                       if (dma_mapping_error(&pdev->dev, tx_buffer_info->dma))
-                               goto dma_error;
-                       tx_buffer_info->time_stamp = jiffies;
-                       tx_buffer_info->next_to_watch = i;
-
-                       len -= size;
-                       total -= size;
-                       offset += size;
-                       count++;
-                       i++;
-                       if (i == tx_ring->count)
-                               i = 0;
-               }
-               if (total == 0)
-                       break;
-       }
-
-       if (i == 0)
-               i = tx_ring->count - 1;
-       else
-               i = i - 1;
-       tx_ring->tx_buffer_info[i].skb = skb;
-       tx_ring->tx_buffer_info[first].next_to_watch = i;
-
-       return count;
-
-dma_error:
-       dev_err(&pdev->dev, "TX DMA map failed\n");
-
-       /* clear timestamp and dma mappings for failed tx_buffer_info map */
-       tx_buffer_info->dma = 0;
-       tx_buffer_info->time_stamp = 0;
-       tx_buffer_info->next_to_watch = 0;
-       count--;
-
-       /* clear timestamp and dma mappings for remaining portion of packet */
-       while (count >= 0) {
-               count--;
-               i--;
-               if (i < 0)
-                       i += tx_ring->count;
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               ixgbevf_unmap_and_free_tx_resource(adapter, tx_buffer_info);
-       }
-
-       return count;
-}
-
-static void ixgbevf_tx_queue(struct ixgbevf_adapter *adapter,
-                            struct ixgbevf_ring *tx_ring, int tx_flags,
-                            int count, u32 paylen, u8 hdr_len)
-{
-       union ixgbe_adv_tx_desc *tx_desc = NULL;
-       struct ixgbevf_tx_buffer *tx_buffer_info;
-       u32 olinfo_status = 0, cmd_type_len = 0;
-       unsigned int i;
-
-       u32 txd_cmd = IXGBE_TXD_CMD_EOP | IXGBE_TXD_CMD_RS | IXGBE_TXD_CMD_IFCS;
-
-       cmd_type_len |= IXGBE_ADVTXD_DTYP_DATA;
-
-       cmd_type_len |= IXGBE_ADVTXD_DCMD_IFCS | IXGBE_ADVTXD_DCMD_DEXT;
-
-       if (tx_flags & IXGBE_TX_FLAGS_VLAN)
-               cmd_type_len |= IXGBE_ADVTXD_DCMD_VLE;
-
-       if (tx_flags & IXGBE_TX_FLAGS_TSO) {
-               cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
-
-               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
-                       IXGBE_ADVTXD_POPTS_SHIFT;
-
-               /* use index 1 context for tso */
-               olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
-               if (tx_flags & IXGBE_TX_FLAGS_IPV4)
-                       olinfo_status |= IXGBE_TXD_POPTS_IXSM <<
-                               IXGBE_ADVTXD_POPTS_SHIFT;
-
-       } else if (tx_flags & IXGBE_TX_FLAGS_CSUM)
-               olinfo_status |= IXGBE_TXD_POPTS_TXSM <<
-                       IXGBE_ADVTXD_POPTS_SHIFT;
-
-       olinfo_status |= ((paylen - hdr_len) << IXGBE_ADVTXD_PAYLEN_SHIFT);
-
-       i = tx_ring->next_to_use;
-       while (count--) {
-               tx_buffer_info = &tx_ring->tx_buffer_info[i];
-               tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, i);
-               tx_desc->read.buffer_addr = cpu_to_le64(tx_buffer_info->dma);
-               tx_desc->read.cmd_type_len =
-                       cpu_to_le32(cmd_type_len | tx_buffer_info->length);
-               tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
-               i++;
-               if (i == tx_ring->count)
-                       i = 0;
-       }
-
-       tx_desc->read.cmd_type_len |= cpu_to_le32(txd_cmd);
-
-       /*
-        * Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64).
-        */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       writel(i, adapter->hw.hw_addr + tx_ring->tail);
-}
-
-static int __ixgbevf_maybe_stop_tx(struct net_device *netdev,
-                                  struct ixgbevf_ring *tx_ring, int size)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-
-       netif_stop_subqueue(netdev, tx_ring->queue_index);
-       /* Herbert's original patch had:
-        *  smp_mb__after_netif_stop_queue();
-        * but since that doesn't exist yet, just open code it. */
-       smp_mb();
-
-       /* We need to check again in a case another CPU has just
-        * made room available. */
-       if (likely(IXGBE_DESC_UNUSED(tx_ring) < size))
-               return -EBUSY;
-
-       /* A reprieve! - use start_queue because it doesn't call schedule */
-       netif_start_subqueue(netdev, tx_ring->queue_index);
-       ++adapter->restart_queue;
-       return 0;
-}
-
-static int ixgbevf_maybe_stop_tx(struct net_device *netdev,
-                                struct ixgbevf_ring *tx_ring, int size)
-{
-       if (likely(IXGBE_DESC_UNUSED(tx_ring) >= size))
-               return 0;
-       return __ixgbevf_maybe_stop_tx(netdev, tx_ring, size);
-}
-
-static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbevf_ring *tx_ring;
-       unsigned int first;
-       unsigned int tx_flags = 0;
-       u8 hdr_len = 0;
-       int r_idx = 0, tso;
-       int count = 0;
-
-       unsigned int f;
-
-       tx_ring = &adapter->tx_ring[r_idx];
-
-       if (vlan_tx_tag_present(skb)) {
-               tx_flags |= vlan_tx_tag_get(skb);
-               tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
-               tx_flags |= IXGBE_TX_FLAGS_VLAN;
-       }
-
-       /* four things can cause us to need a context descriptor */
-       if (skb_is_gso(skb) ||
-           (skb->ip_summed == CHECKSUM_PARTIAL) ||
-           (tx_flags & IXGBE_TX_FLAGS_VLAN))
-               count++;
-
-       count += TXD_USE_COUNT(skb_headlen(skb));
-       for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
-               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);
-
-       if (ixgbevf_maybe_stop_tx(netdev, tx_ring, count)) {
-               adapter->tx_busy++;
-               return NETDEV_TX_BUSY;
-       }
-
-       first = tx_ring->next_to_use;
-
-       if (skb->protocol == htons(ETH_P_IP))
-               tx_flags |= IXGBE_TX_FLAGS_IPV4;
-       tso = ixgbevf_tso(adapter, tx_ring, skb, tx_flags, &hdr_len);
-       if (tso < 0) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       if (tso)
-               tx_flags |= IXGBE_TX_FLAGS_TSO;
-       else if (ixgbevf_tx_csum(adapter, tx_ring, skb, tx_flags) &&
-                (skb->ip_summed == CHECKSUM_PARTIAL))
-               tx_flags |= IXGBE_TX_FLAGS_CSUM;
-
-       ixgbevf_tx_queue(adapter, tx_ring, tx_flags,
-                        ixgbevf_tx_map(adapter, tx_ring, skb, tx_flags, first),
-                        skb->len, hdr_len);
-
-       ixgbevf_maybe_stop_tx(netdev, tx_ring, DESC_NEEDED);
-
-       return NETDEV_TX_OK;
-}
-
-/**
- * ixgbevf_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-static int ixgbevf_set_mac(struct net_device *netdev, void *p)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       memcpy(hw->mac.addr, addr->sa_data, netdev->addr_len);
-
-       if (hw->mac.ops.set_rar)
-               hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0);
-
-       return 0;
-}
-
-/**
- * ixgbevf_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-       struct ixgbe_hw *hw = &adapter->hw;
-       int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
-       int max_possible_frame = MAXIMUM_ETHERNET_VLAN_SIZE;
-       u32 msg[2];
-
-       if (adapter->hw.mac.type == ixgbe_mac_X540_vf)
-               max_possible_frame = IXGBE_MAX_JUMBO_FRAME_SIZE;
-
-       /* MTU < 68 is an error and causes problems on some kernels */
-       if ((new_mtu < 68) || (max_frame > max_possible_frame))
-               return -EINVAL;
-
-       hw_dbg(&adapter->hw, "changing MTU from %d to %d\n",
-              netdev->mtu, new_mtu);
-       /* must set new MTU before calling down or up */
-       netdev->mtu = new_mtu;
-
-       msg[0] = IXGBE_VF_SET_LPE;
-       msg[1] = max_frame;
-       hw->mbx.ops.write_posted(hw, msg, 2);
-
-       if (netif_running(netdev))
-               ixgbevf_reinit_locked(adapter);
-
-       return 0;
-}
-
-static void ixgbevf_shutdown(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev)) {
-               ixgbevf_down(adapter);
-               ixgbevf_free_irq(adapter);
-               ixgbevf_free_all_tx_resources(adapter);
-               ixgbevf_free_all_rx_resources(adapter);
-       }
-
-#ifdef CONFIG_PM
-       pci_save_state(pdev);
-#endif
-
-       pci_disable_device(pdev);
-}
-
-static const struct net_device_ops ixgbe_netdev_ops = {
-       .ndo_open               = ixgbevf_open,
-       .ndo_stop               = ixgbevf_close,
-       .ndo_start_xmit         = ixgbevf_xmit_frame,
-       .ndo_set_rx_mode        = ixgbevf_set_rx_mode,
-       .ndo_set_multicast_list = ixgbevf_set_rx_mode,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_mac_address    = ixgbevf_set_mac,
-       .ndo_change_mtu         = ixgbevf_change_mtu,
-       .ndo_tx_timeout         = ixgbevf_tx_timeout,
-       .ndo_vlan_rx_add_vid    = ixgbevf_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = ixgbevf_vlan_rx_kill_vid,
-};
-
-static void ixgbevf_assign_netdev_ops(struct net_device *dev)
-{
-       dev->netdev_ops = &ixgbe_netdev_ops;
-       ixgbevf_set_ethtool_ops(dev);
-       dev->watchdog_timeo = 5 * HZ;
-}
-
-/**
- * ixgbevf_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in ixgbevf_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * ixgbevf_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-static int __devinit ixgbevf_probe(struct pci_dev *pdev,
-                                  const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct ixgbevf_adapter *adapter = NULL;
-       struct ixgbe_hw *hw = NULL;
-       const struct ixgbevf_info *ii = ixgbevf_info_tbl[ent->driver_data];
-       static int cards_found;
-       int err, pci_using_dac;
-
-       err = pci_enable_device(pdev);
-       if (err)
-               return err;
-
-       if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
-           !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-               pci_using_dac = 1;
-       } else {
-               err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-               if (err) {
-                       err = dma_set_coherent_mask(&pdev->dev,
-                                                   DMA_BIT_MASK(32));
-                       if (err) {
-                               dev_err(&pdev->dev, "No usable DMA "
-                                       "configuration, aborting\n");
-                               goto err_dma;
-                       }
-               }
-               pci_using_dac = 0;
-       }
-
-       err = pci_request_regions(pdev, ixgbevf_driver_name);
-       if (err) {
-               dev_err(&pdev->dev, "pci_request_regions failed 0x%x\n", err);
-               goto err_pci_reg;
-       }
-
-       pci_set_master(pdev);
-
-#ifdef HAVE_TX_MQ
-       netdev = alloc_etherdev_mq(sizeof(struct ixgbevf_adapter),
-                                  MAX_TX_QUEUES);
-#else
-       netdev = alloc_etherdev(sizeof(struct ixgbevf_adapter));
-#endif
-       if (!netdev) {
-               err = -ENOMEM;
-               goto err_alloc_etherdev;
-       }
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       pci_set_drvdata(pdev, netdev);
-       adapter = netdev_priv(netdev);
-
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       hw = &adapter->hw;
-       hw->back = adapter;
-       adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;
-
-       /*
-        * call save state here in standalone driver because it relies on
-        * adapter struct to exist, and needs to call netdev_priv
-        */
-       pci_save_state(pdev);
-
-       hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
-                             pci_resource_len(pdev, 0));
-       if (!hw->hw_addr) {
-               err = -EIO;
-               goto err_ioremap;
-       }
-
-       ixgbevf_assign_netdev_ops(netdev);
-
-       adapter->bd_number = cards_found;
-
-       /* Setup hw api */
-       memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
-       hw->mac.type  = ii->mac;
-
-       memcpy(&hw->mbx.ops, &ixgbevf_mbx_ops,
-              sizeof(struct ixgbe_mbx_operations));
-
-       adapter->flags &= ~IXGBE_FLAG_RX_PS_CAPABLE;
-       adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
-       adapter->flags |= IXGBE_FLAG_RX_1BUF_CAPABLE;
-
-       /* setup the private structure */
-       err = ixgbevf_sw_init(adapter);
-
-       netdev->features = NETIF_F_SG |
-                          NETIF_F_IP_CSUM |
-                          NETIF_F_HW_VLAN_TX |
-                          NETIF_F_HW_VLAN_RX |
-                          NETIF_F_HW_VLAN_FILTER;
-
-       netdev->features |= NETIF_F_IPV6_CSUM;
-       netdev->features |= NETIF_F_TSO;
-       netdev->features |= NETIF_F_TSO6;
-       netdev->features |= NETIF_F_GRO;
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_TSO6;
-       netdev->vlan_features |= NETIF_F_IP_CSUM;
-       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
-
-       if (pci_using_dac)
-               netdev->features |= NETIF_F_HIGHDMA;
-
-       /* The HW MAC address was set and/or determined in sw_init */
-       memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
-       memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->dev_addr)) {
-               printk(KERN_ERR "invalid MAC address\n");
-               err = -EIO;
-               goto err_sw_init;
-       }
-
-       init_timer(&adapter->watchdog_timer);
-       adapter->watchdog_timer.function = ixgbevf_watchdog;
-       adapter->watchdog_timer.data = (unsigned long)adapter;
-
-       INIT_WORK(&adapter->reset_task, ixgbevf_reset_task);
-       INIT_WORK(&adapter->watchdog_task, ixgbevf_watchdog_task);
-
-       err = ixgbevf_init_interrupt_scheme(adapter);
-       if (err)
-               goto err_sw_init;
-
-       /* pick up the PCI bus settings for reporting later */
-       if (hw->mac.ops.get_bus_info)
-               hw->mac.ops.get_bus_info(hw);
-
-       strcpy(netdev->name, "eth%d");
-
-       err = register_netdev(netdev);
-       if (err)
-               goto err_register;
-
-       adapter->netdev_registered = true;
-
-       netif_carrier_off(netdev);
-
-       ixgbevf_init_last_counter_stats(adapter);
-
-       /* print the MAC address */
-       hw_dbg(hw, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-              netdev->dev_addr[0],
-              netdev->dev_addr[1],
-              netdev->dev_addr[2],
-              netdev->dev_addr[3],
-              netdev->dev_addr[4],
-              netdev->dev_addr[5]);
-
-       hw_dbg(hw, "MAC: %d\n", hw->mac.type);
-
-       hw_dbg(hw, "LRO is disabled\n");
-
-       hw_dbg(hw, "Intel(R) 82599 Virtual Function\n");
-       cards_found++;
-       return 0;
-
-err_register:
-err_sw_init:
-       ixgbevf_reset_interrupt_capability(adapter);
-       iounmap(hw->hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_regions(pdev);
-err_pci_reg:
-err_dma:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * ixgbevf_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * ixgbevf_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-static void __devexit ixgbevf_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-
-       set_bit(__IXGBEVF_DOWN, &adapter->state);
-
-       del_timer_sync(&adapter->watchdog_timer);
-
-       cancel_work_sync(&adapter->reset_task);
-       cancel_work_sync(&adapter->watchdog_task);
-
-       if (adapter->netdev_registered) {
-               unregister_netdev(netdev);
-               adapter->netdev_registered = false;
-       }
-
-       ixgbevf_reset_interrupt_capability(adapter);
-
-       iounmap(adapter->hw.hw_addr);
-       pci_release_regions(pdev);
-
-       hw_dbg(&adapter->hw, "Remove complete\n");
-
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-
-       free_netdev(netdev);
-
-       pci_disable_device(pdev);
-}
-
-static struct pci_driver ixgbevf_driver = {
-       .name     = ixgbevf_driver_name,
-       .id_table = ixgbevf_pci_tbl,
-       .probe    = ixgbevf_probe,
-       .remove   = __devexit_p(ixgbevf_remove),
-       .shutdown = ixgbevf_shutdown,
-};
-
-/**
- * ixgbevf_init_module - Driver Registration Routine
- *
- * ixgbevf_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-static int __init ixgbevf_init_module(void)
-{
-       int ret;
-       printk(KERN_INFO "ixgbevf: %s - version %s\n", ixgbevf_driver_string,
-              ixgbevf_driver_version);
-
-       printk(KERN_INFO "%s\n", ixgbevf_copyright);
-
-       ret = pci_register_driver(&ixgbevf_driver);
-       return ret;
-}
-
-module_init(ixgbevf_init_module);
-
-/**
- * ixgbevf_exit_module - Driver Exit Cleanup Routine
- *
- * ixgbevf_exit_module is called just before the driver is removed
- * from memory.
- **/
-static void __exit ixgbevf_exit_module(void)
-{
-       pci_unregister_driver(&ixgbevf_driver);
-}
-
-#ifdef DEBUG
-/**
- * ixgbevf_get_hw_dev_name - return device name string
- * used by hardware layer to print debugging information
- **/
-char *ixgbevf_get_hw_dev_name(struct ixgbe_hw *hw)
-{
-       struct ixgbevf_adapter *adapter = hw->back;
-       return adapter->netdev->name;
-}
-
-#endif
-module_exit(ixgbevf_exit_module);
-
-/* ixgbevf_main.c */
diff --git a/drivers/net/ixgbevf/mbx.c b/drivers/net/ixgbevf/mbx.c
deleted file mode 100644 (file)
index 7a88331..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#include "mbx.h"
-
-/**
- *  ixgbevf_poll_for_msg - Wait for message notification
- *  @hw: pointer to the HW structure
- *
- *  returns 0 if it successfully received a message notification
- **/
-static s32 ixgbevf_poll_for_msg(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       while (countdown && mbx->ops.check_for_msg(hw)) {
-               countdown--;
-               udelay(mbx->udelay);
-       }
-
-       /* if we failed, all future posted messages fail until reset */
-       if (!countdown)
-               mbx->timeout = 0;
-
-       return countdown ? 0 : IXGBE_ERR_MBX;
-}
-
-/**
- *  ixgbevf_poll_for_ack - Wait for message acknowledgement
- *  @hw: pointer to the HW structure
- *
- *  returns 0 if it successfully received a message acknowledgement
- **/
-static s32 ixgbevf_poll_for_ack(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       int countdown = mbx->timeout;
-
-       while (countdown && mbx->ops.check_for_ack(hw)) {
-               countdown--;
-               udelay(mbx->udelay);
-       }
-
-       /* if we failed, all future posted messages fail until reset */
-       if (!countdown)
-               mbx->timeout = 0;
-
-       return countdown ? 0 : IXGBE_ERR_MBX;
-}
-
-/**
- *  ixgbevf_read_posted_mbx - Wait for message notification and receive message
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns 0 if it successfully received a message notification and
- *  copied it into the receive buffer.
- **/
-static s32 ixgbevf_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       ret_val = ixgbevf_poll_for_msg(hw);
-
-       /* if ack received read message, otherwise we timed out */
-       if (!ret_val)
-               ret_val = mbx->ops.read(hw, msg, size);
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_write_posted_mbx - Write a message to the mailbox, wait for ack
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns 0 if it successfully copied message into the buffer and
- *  received an ack to that message within delay * timeout period
- **/
-static s32 ixgbevf_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       s32 ret_val;
-
-       /* send msg */
-       ret_val = mbx->ops.write(hw, msg, size);
-
-       /* if msg sent wait until we receive an ack */
-       if (!ret_val)
-               ret_val = ixgbevf_poll_for_ack(hw);
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_read_v2p_mailbox - read v2p mailbox
- *  @hw: pointer to the HW structure
- *
- *  This function is used to read the v2p mailbox without losing the read to
- *  clear status bits.
- **/
-static u32 ixgbevf_read_v2p_mailbox(struct ixgbe_hw *hw)
-{
-       u32 v2p_mailbox = IXGBE_READ_REG(hw, IXGBE_VFMAILBOX);
-
-       v2p_mailbox |= hw->mbx.v2p_mailbox;
-       hw->mbx.v2p_mailbox |= v2p_mailbox & IXGBE_VFMAILBOX_R2C_BITS;
-
-       return v2p_mailbox;
-}
-
-/**
- *  ixgbevf_check_for_bit_vf - Determine if a status bit was set
- *  @hw: pointer to the HW structure
- *  @mask: bitmask for bits to be tested and cleared
- *
- *  This function is used to check for the read to clear bits within
- *  the V2P mailbox.
- **/
-static s32 ixgbevf_check_for_bit_vf(struct ixgbe_hw *hw, u32 mask)
-{
-       u32 v2p_mailbox = ixgbevf_read_v2p_mailbox(hw);
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (v2p_mailbox & mask)
-               ret_val = 0;
-
-       hw->mbx.v2p_mailbox &= ~mask;
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_check_for_msg_vf - checks to see if the PF has sent mail
- *  @hw: pointer to the HW structure
- *
- *  returns 0 if the PF has set the Status bit or else ERR_MBX
- **/
-static s32 ixgbevf_check_for_msg_vf(struct ixgbe_hw *hw)
-{
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (!ixgbevf_check_for_bit_vf(hw, IXGBE_VFMAILBOX_PFSTS)) {
-               ret_val = 0;
-               hw->mbx.stats.reqs++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_check_for_ack_vf - checks to see if the PF has ACK'd
- *  @hw: pointer to the HW structure
- *
- *  returns 0 if the PF has set the ACK bit or else ERR_MBX
- **/
-static s32 ixgbevf_check_for_ack_vf(struct ixgbe_hw *hw)
-{
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (!ixgbevf_check_for_bit_vf(hw, IXGBE_VFMAILBOX_PFACK)) {
-               ret_val = 0;
-               hw->mbx.stats.acks++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_check_for_rst_vf - checks to see if the PF has reset
- *  @hw: pointer to the HW structure
- *
- *  returns true if the PF has set the reset done bit or else false
- **/
-static s32 ixgbevf_check_for_rst_vf(struct ixgbe_hw *hw)
-{
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       if (!ixgbevf_check_for_bit_vf(hw, (IXGBE_VFMAILBOX_RSTD |
-                                        IXGBE_VFMAILBOX_RSTI))) {
-               ret_val = 0;
-               hw->mbx.stats.rsts++;
-       }
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_obtain_mbx_lock_vf - obtain mailbox lock
- *  @hw: pointer to the HW structure
- *
- *  return 0 if we obtained the mailbox lock
- **/
-static s32 ixgbevf_obtain_mbx_lock_vf(struct ixgbe_hw *hw)
-{
-       s32 ret_val = IXGBE_ERR_MBX;
-
-       /* Take ownership of the buffer */
-       IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_VFU);
-
-       /* reserve mailbox for vf use */
-       if (ixgbevf_read_v2p_mailbox(hw) & IXGBE_VFMAILBOX_VFU)
-               ret_val = 0;
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_write_mbx_vf - Write a message to the mailbox
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns 0 if it successfully copied message into the buffer
- **/
-static s32 ixgbevf_write_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size)
-{
-       s32 ret_val;
-       u16 i;
-
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       ret_val = ixgbevf_obtain_mbx_lock_vf(hw);
-       if (ret_val)
-               goto out_no_write;
-
-       /* flush msg and acks as we are overwriting the message buffer */
-       ixgbevf_check_for_msg_vf(hw);
-       ixgbevf_check_for_ack_vf(hw);
-
-       /* copy the caller specified message to the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               IXGBE_WRITE_REG_ARRAY(hw, IXGBE_VFMBMEM, i, msg[i]);
-
-       /* update stats */
-       hw->mbx.stats.msgs_tx++;
-
-       /* Drop VFU and interrupt the PF to tell it a message has been sent */
-       IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_REQ);
-
-out_no_write:
-       return ret_val;
-}
-
-/**
- *  ixgbevf_read_mbx_vf - Reads a message from the inbox intended for vf
- *  @hw: pointer to the HW structure
- *  @msg: The message buffer
- *  @size: Length of buffer
- *
- *  returns 0 if it successfuly read message from buffer
- **/
-static s32 ixgbevf_read_mbx_vf(struct ixgbe_hw *hw, u32 *msg, u16 size)
-{
-       s32 ret_val = 0;
-       u16 i;
-
-       /* lock the mailbox to prevent pf/vf race condition */
-       ret_val = ixgbevf_obtain_mbx_lock_vf(hw);
-       if (ret_val)
-               goto out_no_read;
-
-       /* copy the message from the mailbox memory buffer */
-       for (i = 0; i < size; i++)
-               msg[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_VFMBMEM, i);
-
-       /* Acknowledge receipt and release mailbox, then we're done */
-       IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_ACK);
-
-       /* update stats */
-       hw->mbx.stats.msgs_rx++;
-
-out_no_read:
-       return ret_val;
-}
-
-/**
- *  ixgbevf_init_mbx_params_vf - set initial values for vf mailbox
- *  @hw: pointer to the HW structure
- *
- *  Initializes the hw->mbx struct to correct values for vf mailbox
- */
-static s32 ixgbevf_init_mbx_params_vf(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-
-       /* start mailbox as timed out and let the reset_hw call set the timeout
-        * value to begin communications */
-       mbx->timeout = 0;
-       mbx->udelay = IXGBE_VF_MBX_INIT_DELAY;
-
-       mbx->size = IXGBE_VFMAILBOX_SIZE;
-
-       mbx->stats.msgs_tx = 0;
-       mbx->stats.msgs_rx = 0;
-       mbx->stats.reqs = 0;
-       mbx->stats.acks = 0;
-       mbx->stats.rsts = 0;
-
-       return 0;
-}
-
-struct ixgbe_mbx_operations ixgbevf_mbx_ops = {
-       .init_params   = ixgbevf_init_mbx_params_vf,
-       .read          = ixgbevf_read_mbx_vf,
-       .write         = ixgbevf_write_mbx_vf,
-       .read_posted   = ixgbevf_read_posted_mbx,
-       .write_posted  = ixgbevf_write_posted_mbx,
-       .check_for_msg = ixgbevf_check_for_msg_vf,
-       .check_for_ack = ixgbevf_check_for_ack_vf,
-       .check_for_rst = ixgbevf_check_for_rst_vf,
-};
-
diff --git a/drivers/net/ixgbevf/mbx.h b/drivers/net/ixgbevf/mbx.h
deleted file mode 100644 (file)
index ea393eb..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#ifndef _IXGBE_MBX_H_
-#define _IXGBE_MBX_H_
-
-#include "vf.h"
-
-#define IXGBE_VFMAILBOX_SIZE        16 /* 16 32 bit words - 64 bytes */
-#define IXGBE_ERR_MBX               -100
-
-#define IXGBE_VFMAILBOX             0x002FC
-#define IXGBE_VFMBMEM               0x00200
-
-/* Define mailbox register bits */
-#define IXGBE_VFMAILBOX_REQ      0x00000001 /* Request for PF Ready bit */
-#define IXGBE_VFMAILBOX_ACK      0x00000002 /* Ack PF message received */
-#define IXGBE_VFMAILBOX_VFU      0x00000004 /* VF owns the mailbox buffer */
-#define IXGBE_VFMAILBOX_PFU      0x00000008 /* PF owns the mailbox buffer */
-#define IXGBE_VFMAILBOX_PFSTS    0x00000010 /* PF wrote a message in the MB */
-#define IXGBE_VFMAILBOX_PFACK    0x00000020 /* PF ack the previous VF msg */
-#define IXGBE_VFMAILBOX_RSTI     0x00000040 /* PF has reset indication */
-#define IXGBE_VFMAILBOX_RSTD     0x00000080 /* PF has indicated reset done */
-#define IXGBE_VFMAILBOX_R2C_BITS 0x000000B0 /* All read to clear bits */
-
-#define IXGBE_PFMAILBOX(x)          (0x04B00 + (4 * x))
-#define IXGBE_PFMBMEM(vfn)          (0x13000 + (64 * vfn))
-
-#define IXGBE_PFMAILBOX_STS   0x00000001 /* Initiate message send to VF */
-#define IXGBE_PFMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
-#define IXGBE_PFMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
-#define IXGBE_PFMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
-#define IXGBE_PFMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
-
-#define IXGBE_MBVFICR_VFREQ_MASK 0x0000FFFF /* bits for VF messages */
-#define IXGBE_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
-#define IXGBE_MBVFICR_VFACK_MASK 0xFFFF0000 /* bits for VF acks */
-#define IXGBE_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
-
-
-/* If it's a IXGBE_VF_* msg then it originates in the VF and is sent to the
- * PF.  The reverse is true if it is IXGBE_PF_*.
- * Message ACK's are the value or'd with 0xF0000000
- */
-#define IXGBE_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
-                                              * this are the ACK */
-#define IXGBE_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
-                                              * this are the NACK */
-#define IXGBE_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
-                                              *  clear to send requests */
-#define IXGBE_VT_MSGINFO_SHIFT    16
-/* bits 23:16 are used for exra info for certain messages */
-#define IXGBE_VT_MSGINFO_MASK     (0xFF << IXGBE_VT_MSGINFO_SHIFT)
-
-#define IXGBE_VF_RESET            0x01 /* VF requests reset */
-#define IXGBE_VF_SET_MAC_ADDR     0x02 /* VF requests PF to set MAC addr */
-#define IXGBE_VF_SET_MULTICAST    0x03 /* VF requests PF to set MC addr */
-#define IXGBE_VF_SET_VLAN         0x04 /* VF requests PF to set VLAN */
-#define IXGBE_VF_SET_LPE          0x05 /* VF requests PF to set VMOLR.LPE */
-#define IXGBE_VF_SET_MACVLAN      0x06 /* VF requests PF for unicast filter */
-
-/* length of permanent address message returned from PF */
-#define IXGBE_VF_PERMADDR_MSG_LEN 4
-/* word in permanent address message with the current multicast type */
-#define IXGBE_VF_MC_TYPE_WORD     3
-
-#define IXGBE_PF_CONTROL_MSG      0x0100 /* PF control message */
-
-#define IXGBE_VF_MBX_INIT_TIMEOUT 2000 /* number of retries on mailbox */
-#define IXGBE_VF_MBX_INIT_DELAY   500  /* microseconds between retries */
-
-/* forward declaration of the HW struct */
-struct ixgbe_hw;
-
-#endif /* _IXGBE_MBX_H_ */
diff --git a/drivers/net/ixgbevf/regs.h b/drivers/net/ixgbevf/regs.h
deleted file mode 100644 (file)
index 189200e..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#ifndef _IXGBEVF_REGS_H_
-#define _IXGBEVF_REGS_H_
-
-#define IXGBE_VFCTRL           0x00000
-#define IXGBE_VFSTATUS         0x00008
-#define IXGBE_VFLINKS          0x00010
-#define IXGBE_VFFRTIMER        0x00048
-#define IXGBE_VFRXMEMWRAP      0x03190
-#define IXGBE_VTEICR           0x00100
-#define IXGBE_VTEICS           0x00104
-#define IXGBE_VTEIMS           0x00108
-#define IXGBE_VTEIMC           0x0010C
-#define IXGBE_VTEIAC           0x00110
-#define IXGBE_VTEIAM           0x00114
-#define IXGBE_VTEITR(x)        (0x00820 + (4 * x))
-#define IXGBE_VTIVAR(x)        (0x00120 + (4 * x))
-#define IXGBE_VTIVAR_MISC      0x00140
-#define IXGBE_VTRSCINT(x)      (0x00180 + (4 * x))
-#define IXGBE_VFRDBAL(x)       (0x01000 + (0x40 * x))
-#define IXGBE_VFRDBAH(x)       (0x01004 + (0x40 * x))
-#define IXGBE_VFRDLEN(x)       (0x01008 + (0x40 * x))
-#define IXGBE_VFRDH(x)         (0x01010 + (0x40 * x))
-#define IXGBE_VFRDT(x)         (0x01018 + (0x40 * x))
-#define IXGBE_VFRXDCTL(x)      (0x01028 + (0x40 * x))
-#define IXGBE_VFSRRCTL(x)      (0x01014 + (0x40 * x))
-#define IXGBE_VFRSCCTL(x)      (0x0102C + (0x40 * x))
-#define IXGBE_VFPSRTYPE        0x00300
-#define IXGBE_VFTDBAL(x)       (0x02000 + (0x40 * x))
-#define IXGBE_VFTDBAH(x)       (0x02004 + (0x40 * x))
-#define IXGBE_VFTDLEN(x)       (0x02008 + (0x40 * x))
-#define IXGBE_VFTDH(x)         (0x02010 + (0x40 * x))
-#define IXGBE_VFTDT(x)         (0x02018 + (0x40 * x))
-#define IXGBE_VFTXDCTL(x)      (0x02028 + (0x40 * x))
-#define IXGBE_VFTDWBAL(x)      (0x02038 + (0x40 * x))
-#define IXGBE_VFTDWBAH(x)      (0x0203C + (0x40 * x))
-#define IXGBE_VFDCA_RXCTRL(x)  (0x0100C + (0x40 * x))
-#define IXGBE_VFDCA_TXCTRL(x)  (0x0200c + (0x40 * x))
-#define IXGBE_VFGPRC           0x0101C
-#define IXGBE_VFGPTC           0x0201C
-#define IXGBE_VFGORC_LSB       0x01020
-#define IXGBE_VFGORC_MSB       0x01024
-#define IXGBE_VFGOTC_LSB       0x02020
-#define IXGBE_VFGOTC_MSB       0x02024
-#define IXGBE_VFMPRC           0x01034
-
-#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
-
-#define IXGBE_READ_REG(a, reg) readl((a)->hw_addr + (reg))
-
-#define IXGBE_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-    writel((value), ((a)->hw_addr + (reg) + ((offset) << 2))))
-
-#define IXGBE_READ_REG_ARRAY(a, reg, offset) ( \
-    readl((a)->hw_addr + (reg) + ((offset) << 2)))
-
-#define IXGBE_WRITE_FLUSH(a) (IXGBE_READ_REG(a, IXGBE_VFSTATUS))
-
-#endif /* _IXGBEVF_REGS_H_ */
diff --git a/drivers/net/ixgbevf/vf.c b/drivers/net/ixgbevf/vf.c
deleted file mode 100644 (file)
index aa3682e..0000000
+++ /dev/null
@@ -1,426 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#include "vf.h"
-
-/**
- *  ixgbevf_start_hw_vf - Prepare hardware for Tx/Rx
- *  @hw: pointer to hardware structure
- *
- *  Starts the hardware by filling the bus info structure and media type, clears
- *  all on chip counters, initializes receive address registers, multicast
- *  table, VLAN filter table, calls routine to set up link and flow control
- *  settings, and leaves transmit and receive units disabled and uninitialized
- **/
-static s32 ixgbevf_start_hw_vf(struct ixgbe_hw *hw)
-{
-       /* Clear adapter stopped flag */
-       hw->adapter_stopped = false;
-
-       return 0;
-}
-
-/**
- *  ixgbevf_init_hw_vf - virtual function hardware initialization
- *  @hw: pointer to hardware structure
- *
- *  Initialize the hardware by resetting the hardware and then starting
- *  the hardware
- **/
-static s32 ixgbevf_init_hw_vf(struct ixgbe_hw *hw)
-{
-       s32 status = hw->mac.ops.start_hw(hw);
-
-       hw->mac.ops.get_mac_addr(hw, hw->mac.addr);
-
-       return status;
-}
-
-/**
- *  ixgbevf_reset_hw_vf - Performs hardware reset
- *  @hw: pointer to hardware structure
- *
- *  Resets the hardware by reseting the transmit and receive units, masks and
- *  clears all interrupts.
- **/
-static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       u32 timeout = IXGBE_VF_INIT_TIMEOUT;
-       s32 ret_val = IXGBE_ERR_INVALID_MAC_ADDR;
-       u32 msgbuf[IXGBE_VF_PERMADDR_MSG_LEN];
-       u8 *addr = (u8 *)(&msgbuf[1]);
-
-       /* Call adapter stop to disable tx/rx and clear interrupts */
-       hw->mac.ops.stop_adapter(hw);
-
-       IXGBE_WRITE_REG(hw, IXGBE_VFCTRL, IXGBE_CTRL_RST);
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* we cannot reset while the RSTI / RSTD bits are asserted */
-       while (!mbx->ops.check_for_rst(hw) && timeout) {
-               timeout--;
-               udelay(5);
-       }
-
-       if (!timeout)
-               return IXGBE_ERR_RESET_FAILED;
-
-       /* mailbox timeout can now become active */
-       mbx->timeout = IXGBE_VF_MBX_INIT_TIMEOUT;
-
-       msgbuf[0] = IXGBE_VF_RESET;
-       mbx->ops.write_posted(hw, msgbuf, 1);
-
-       msleep(10);
-
-       /* set our "perm_addr" based on info provided by PF */
-       /* also set up the mc_filter_type which is piggy backed
-        * on the mac address in word 3 */
-       ret_val = mbx->ops.read_posted(hw, msgbuf, IXGBE_VF_PERMADDR_MSG_LEN);
-       if (ret_val)
-               return ret_val;
-
-       if (msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK))
-               return IXGBE_ERR_INVALID_MAC_ADDR;
-
-       memcpy(hw->mac.perm_addr, addr, IXGBE_ETH_LENGTH_OF_ADDRESS);
-       hw->mac.mc_filter_type = msgbuf[IXGBE_VF_MC_TYPE_WORD];
-
-       return 0;
-}
-
-/**
- *  ixgbevf_stop_hw_vf - Generic stop Tx/Rx units
- *  @hw: pointer to hardware structure
- *
- *  Sets the adapter_stopped flag within ixgbe_hw struct. Clears interrupts,
- *  disables transmit and receive units. The adapter_stopped flag is used by
- *  the shared code and drivers to determine if the adapter is in a stopped
- *  state and should not touch the hardware.
- **/
-static s32 ixgbevf_stop_hw_vf(struct ixgbe_hw *hw)
-{
-       u32 number_of_queues;
-       u32 reg_val;
-       u16 i;
-
-       /*
-        * Set the adapter_stopped flag so other driver functions stop touching
-        * the hardware
-        */
-       hw->adapter_stopped = true;
-
-       /* Disable the receive unit by stopped each queue */
-       number_of_queues = hw->mac.max_rx_queues;
-       for (i = 0; i < number_of_queues; i++) {
-               reg_val = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));
-               if (reg_val & IXGBE_RXDCTL_ENABLE) {
-                       reg_val &= ~IXGBE_RXDCTL_ENABLE;
-                       IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(i), reg_val);
-               }
-       }
-
-       IXGBE_WRITE_FLUSH(hw);
-
-       /* Clear interrupt mask to stop from interrupts being generated */
-       IXGBE_WRITE_REG(hw, IXGBE_VTEIMC, IXGBE_VF_IRQ_CLEAR_MASK);
-
-       /* Clear any pending interrupts */
-       IXGBE_READ_REG(hw, IXGBE_VTEICR);
-
-       /* Disable the transmit unit.  Each queue must be disabled. */
-       number_of_queues = hw->mac.max_tx_queues;
-       for (i = 0; i < number_of_queues; i++) {
-               reg_val = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(i));
-               if (reg_val & IXGBE_TXDCTL_ENABLE) {
-                       reg_val &= ~IXGBE_TXDCTL_ENABLE;
-                       IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(i), reg_val);
-               }
-       }
-
-       return 0;
-}
-
-/**
- *  ixgbevf_mta_vector - Determines bit-vector in multicast table to set
- *  @hw: pointer to hardware structure
- *  @mc_addr: the multicast address
- *
- *  Extracts the 12 bits, from a multicast address, to determine which
- *  bit-vector to set in the multicast table. The hardware uses 12 bits, from
- *  incoming rx multicast addresses, to determine the bit-vector to check in
- *  the MTA. Which of the 4 combination, of 12-bits, the hardware uses is set
- *  by the MO field of the MCSTCTRL. The MO field is set during initialization
- *  to mc_filter_type.
- **/
-static s32 ixgbevf_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)
-{
-       u32 vector = 0;
-
-       switch (hw->mac.mc_filter_type) {
-       case 0:   /* use bits [47:36] of the address */
-               vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
-               break;
-       case 1:   /* use bits [46:35] of the address */
-               vector = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
-               break;
-       case 2:   /* use bits [45:34] of the address */
-               vector = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
-               break;
-       case 3:   /* use bits [43:32] of the address */
-               vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
-               break;
-       default:  /* Invalid mc_filter_type */
-               break;
-       }
-
-       /* vector can only be 12-bits or boundary will be exceeded */
-       vector &= 0xFFF;
-       return vector;
-}
-
-/**
- *  ixgbevf_get_mac_addr_vf - Read device MAC address
- *  @hw: pointer to the HW structure
- *  @mac_addr: pointer to storage for retrieved MAC address
- **/
-static s32 ixgbevf_get_mac_addr_vf(struct ixgbe_hw *hw, u8 *mac_addr)
-{
-       memcpy(mac_addr, hw->mac.perm_addr, IXGBE_ETH_LENGTH_OF_ADDRESS);
-
-       return 0;
-}
-
-static s32 ixgbevf_set_uc_addr_vf(struct ixgbe_hw *hw, u32 index, u8 *addr)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[3];
-       u8 *msg_addr = (u8 *)(&msgbuf[1]);
-       s32 ret_val;
-
-       memset(msgbuf, 0, sizeof(msgbuf));
-       /*
-        * If index is one then this is the start of a new list and needs
-        * indication to the PF so it can do it's own list management.
-        * If it is zero then that tells the PF to just clear all of
-        * this VF's macvlans and there is no new list.
-        */
-       msgbuf[0] |= index << IXGBE_VT_MSGINFO_SHIFT;
-       msgbuf[0] |= IXGBE_VF_SET_MACVLAN;
-       if (addr)
-               memcpy(msg_addr, addr, 6);
-       ret_val = mbx->ops.write_posted(hw, msgbuf, 3);
-
-       if (!ret_val)
-               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
-
-       msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS;
-
-       if (!ret_val)
-               if (msgbuf[0] ==
-                   (IXGBE_VF_SET_MACVLAN | IXGBE_VT_MSGTYPE_NACK))
-                       ret_val = -ENOMEM;
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_set_rar_vf - set device MAC address
- *  @hw: pointer to hardware structure
- *  @index: Receive address register to write
- *  @addr: Address to put into receive address register
- *  @vmdq: Unused in this implementation
- **/
-static s32 ixgbevf_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr,
-                             u32 vmdq)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[3];
-       u8 *msg_addr = (u8 *)(&msgbuf[1]);
-       s32 ret_val;
-
-       memset(msgbuf, 0, sizeof(msgbuf));
-       msgbuf[0] = IXGBE_VF_SET_MAC_ADDR;
-       memcpy(msg_addr, addr, 6);
-       ret_val = mbx->ops.write_posted(hw, msgbuf, 3);
-
-       if (!ret_val)
-               ret_val = mbx->ops.read_posted(hw, msgbuf, 3);
-
-       msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS;
-
-       /* if nacked the address was rejected, use "perm_addr" */
-       if (!ret_val &&
-           (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK)))
-               ixgbevf_get_mac_addr_vf(hw, hw->mac.addr);
-
-       return ret_val;
-}
-
-/**
- *  ixgbevf_update_mc_addr_list_vf - Update Multicast addresses
- *  @hw: pointer to the HW structure
- *  @netdev: pointer to net device structure
- *
- *  Updates the Multicast Table Array.
- **/
-static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw,
-                                         struct net_device *netdev)
-{
-       struct netdev_hw_addr *ha;
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[IXGBE_VFMAILBOX_SIZE];
-       u16 *vector_list = (u16 *)&msgbuf[1];
-       u32 cnt, i;
-
-       /* Each entry in the list uses 1 16 bit word.  We have 30
-        * 16 bit words available in our HW msg buffer (minus 1 for the
-        * msg type).  That's 30 hash values if we pack 'em right.  If
-        * there are more than 30 MC addresses to add then punt the
-        * extras for now and then add code to handle more than 30 later.
-        * It would be unusual for a server to request that many multi-cast
-        * addresses except for in large enterprise network environments.
-        */
-
-       cnt = netdev_mc_count(netdev);
-       if (cnt > 30)
-               cnt = 30;
-       msgbuf[0] = IXGBE_VF_SET_MULTICAST;
-       msgbuf[0] |= cnt << IXGBE_VT_MSGINFO_SHIFT;
-
-       i = 0;
-       netdev_for_each_mc_addr(ha, netdev) {
-               if (i == cnt)
-                       break;
-               vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);
-       }
-
-       mbx->ops.write_posted(hw, msgbuf, IXGBE_VFMAILBOX_SIZE);
-
-       return 0;
-}
-
-/**
- *  ixgbevf_set_vfta_vf - Set/Unset vlan filter table address
- *  @hw: pointer to the HW structure
- *  @vlan: 12 bit VLAN ID
- *  @vind: unused by VF drivers
- *  @vlan_on: if true then set bit, else clear bit
- **/
-static s32 ixgbevf_set_vfta_vf(struct ixgbe_hw *hw, u32 vlan, u32 vind,
-                              bool vlan_on)
-{
-       struct ixgbe_mbx_info *mbx = &hw->mbx;
-       u32 msgbuf[2];
-
-       msgbuf[0] = IXGBE_VF_SET_VLAN;
-       msgbuf[1] = vlan;
-       /* Setting the 8 bit field MSG INFO to TRUE indicates "add" */
-       msgbuf[0] |= vlan_on << IXGBE_VT_MSGINFO_SHIFT;
-
-       return mbx->ops.write_posted(hw, msgbuf, 2);
-}
-
-/**
- *  ixgbevf_setup_mac_link_vf - Setup MAC link settings
- *  @hw: pointer to hardware structure
- *  @speed: Unused in this implementation
- *  @autoneg: Unused in this implementation
- *  @autoneg_wait_to_complete: Unused in this implementation
- *
- *  Do nothing and return success.  VF drivers are not allowed to change
- *  global settings.  Maintained for driver compatibility.
- **/
-static s32 ixgbevf_setup_mac_link_vf(struct ixgbe_hw *hw,
-                                    ixgbe_link_speed speed, bool autoneg,
-                                    bool autoneg_wait_to_complete)
-{
-       return 0;
-}
-
-/**
- *  ixgbevf_check_mac_link_vf - Get link/speed status
- *  @hw: pointer to hardware structure
- *  @speed: pointer to link speed
- *  @link_up: true is link is up, false otherwise
- *  @autoneg_wait_to_complete: true when waiting for completion is needed
- *
- *  Reads the links register to determine if link is up and the current speed
- **/
-static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw,
-                                    ixgbe_link_speed *speed,
-                                    bool *link_up,
-                                    bool autoneg_wait_to_complete)
-{
-       u32 links_reg;
-
-       if (!(hw->mbx.ops.check_for_rst(hw))) {
-               *link_up = false;
-               *speed = 0;
-               return -1;
-       }
-
-       links_reg = IXGBE_READ_REG(hw, IXGBE_VFLINKS);
-
-       if (links_reg & IXGBE_LINKS_UP)
-               *link_up = true;
-       else
-               *link_up = false;
-
-       if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
-           IXGBE_LINKS_SPEED_10G_82599)
-               *speed = IXGBE_LINK_SPEED_10GB_FULL;
-       else
-               *speed = IXGBE_LINK_SPEED_1GB_FULL;
-
-       return 0;
-}
-
-static struct ixgbe_mac_operations ixgbevf_mac_ops = {
-       .init_hw             = ixgbevf_init_hw_vf,
-       .reset_hw            = ixgbevf_reset_hw_vf,
-       .start_hw            = ixgbevf_start_hw_vf,
-       .get_mac_addr        = ixgbevf_get_mac_addr_vf,
-       .stop_adapter        = ixgbevf_stop_hw_vf,
-       .setup_link          = ixgbevf_setup_mac_link_vf,
-       .check_link          = ixgbevf_check_mac_link_vf,
-       .set_rar             = ixgbevf_set_rar_vf,
-       .update_mc_addr_list = ixgbevf_update_mc_addr_list_vf,
-       .set_uc_addr         = ixgbevf_set_uc_addr_vf,
-       .set_vfta            = ixgbevf_set_vfta_vf,
-};
-
-struct ixgbevf_info ixgbevf_82599_vf_info = {
-       .mac = ixgbe_mac_82599_vf,
-       .mac_ops = &ixgbevf_mac_ops,
-};
-
-struct ixgbevf_info ixgbevf_X540_vf_info = {
-       .mac = ixgbe_mac_X540_vf,
-       .mac_ops = &ixgbevf_mac_ops,
-};
diff --git a/drivers/net/ixgbevf/vf.h b/drivers/net/ixgbevf/vf.h
deleted file mode 100644 (file)
index 10306b4..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
-
-  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 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
-
-*******************************************************************************/
-
-#ifndef __IXGBE_VF_H__
-#define __IXGBE_VF_H__
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/netdevice.h>
-
-#include "defines.h"
-#include "regs.h"
-#include "mbx.h"
-
-struct ixgbe_hw;
-
-/* iterator type for walking multicast address lists */
-typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr,
-                                 u32 *vmdq);
-struct ixgbe_mac_operations {
-       s32 (*init_hw)(struct ixgbe_hw *);
-       s32 (*reset_hw)(struct ixgbe_hw *);
-       s32 (*start_hw)(struct ixgbe_hw *);
-       s32 (*clear_hw_cntrs)(struct ixgbe_hw *);
-       enum ixgbe_media_type (*get_media_type)(struct ixgbe_hw *);
-       u32 (*get_supported_physical_layer)(struct ixgbe_hw *);
-       s32 (*get_mac_addr)(struct ixgbe_hw *, u8 *);
-       s32 (*stop_adapter)(struct ixgbe_hw *);
-       s32 (*get_bus_info)(struct ixgbe_hw *);
-
-       /* Link */
-       s32 (*setup_link)(struct ixgbe_hw *, ixgbe_link_speed, bool, bool);
-       s32 (*check_link)(struct ixgbe_hw *, ixgbe_link_speed *, bool *, bool);
-       s32 (*get_link_capabilities)(struct ixgbe_hw *, ixgbe_link_speed *,
-                                    bool *);
-
-       /* RAR, Multicast, VLAN */
-       s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32);
-       s32 (*set_uc_addr)(struct ixgbe_hw *, u32, u8 *);
-       s32 (*init_rx_addrs)(struct ixgbe_hw *);
-       s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
-       s32 (*enable_mc)(struct ixgbe_hw *);
-       s32 (*disable_mc)(struct ixgbe_hw *);
-       s32 (*clear_vfta)(struct ixgbe_hw *);
-       s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
-};
-
-enum ixgbe_mac_type {
-       ixgbe_mac_unknown = 0,
-       ixgbe_mac_82599_vf,
-       ixgbe_mac_X540_vf,
-       ixgbe_num_macs
-};
-
-struct ixgbe_mac_info {
-       struct ixgbe_mac_operations ops;
-       u8 addr[6];
-       u8 perm_addr[6];
-
-       enum ixgbe_mac_type type;
-
-       s32  mc_filter_type;
-
-       bool get_link_status;
-       u32  max_tx_queues;
-       u32  max_rx_queues;
-       u32  max_msix_vectors;
-};
-
-struct ixgbe_mbx_operations {
-       s32 (*init_params)(struct ixgbe_hw *hw);
-       s32 (*read)(struct ixgbe_hw *, u32 *, u16);
-       s32 (*write)(struct ixgbe_hw *, u32 *, u16);
-       s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16);
-       s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16);
-       s32 (*check_for_msg)(struct ixgbe_hw *);
-       s32 (*check_for_ack)(struct ixgbe_hw *);
-       s32 (*check_for_rst)(struct ixgbe_hw *);
-};
-
-struct ixgbe_mbx_stats {
-       u32 msgs_tx;
-       u32 msgs_rx;
-
-       u32 acks;
-       u32 reqs;
-       u32 rsts;
-};
-
-struct ixgbe_mbx_info {
-       struct ixgbe_mbx_operations ops;
-       struct ixgbe_mbx_stats stats;
-       u32 timeout;
-       u32 udelay;
-       u32 v2p_mailbox;
-       u16 size;
-};
-
-struct ixgbe_hw {
-       void *back;
-
-       u8 __iomem *hw_addr;
-
-       struct ixgbe_mac_info mac;
-       struct ixgbe_mbx_info mbx;
-
-       u16 device_id;
-       u16 subsystem_vendor_id;
-       u16 subsystem_device_id;
-       u16 vendor_id;
-
-       u8  revision_id;
-       bool adapter_stopped;
-};
-
-struct ixgbevf_hw_stats {
-       u64 base_vfgprc;
-       u64 base_vfgptc;
-       u64 base_vfgorc;
-       u64 base_vfgotc;
-       u64 base_vfmprc;
-
-       u64 last_vfgprc;
-       u64 last_vfgptc;
-       u64 last_vfgorc;
-       u64 last_vfgotc;
-       u64 last_vfmprc;
-
-       u64 vfgprc;
-       u64 vfgptc;
-       u64 vfgorc;
-       u64 vfgotc;
-       u64 vfmprc;
-
-       u64 saved_reset_vfgprc;
-       u64 saved_reset_vfgptc;
-       u64 saved_reset_vfgorc;
-       u64 saved_reset_vfgotc;
-       u64 saved_reset_vfmprc;
-};
-
-struct ixgbevf_info {
-       enum ixgbe_mac_type             mac;
-       struct ixgbe_mac_operations     *mac_ops;
-};
-
-#endif /* __IXGBE_VF_H__ */
-